Merge branch 'master' of http://scjoyedu.eicp.net:9121/front-team/webPublic

one_stop_public/Table/index.jsx

@@ -34,6 +34,7 @@ export default class ZdyTable extends Component {
       init: this.props.init || {},
       datas: {},
       isEdit: true,
+      isRowCol:false,
       isReady: false,
       formConfig: {},
     };
@@ -90,6 +91,7 @@ export default class ZdyTable extends Component {
           datas: obj.datas,
           width: this.props.table ? obj.datas[val.formKey].width : xxx.width,
           isBorder: this.props.table ? obj.datas[val.formKey].isBorder : xxx.isBorder,
+          isRowCol:this.props.table ? obj.datas[val.formKey].isRowCol : xxx.isRowCol,
           mapData,
           currentFormKey: this.props.table ? val.formKey : obj.init,
           sqlData,
@@ -145,6 +147,7 @@ export default class ZdyTable extends Component {
           currentFormKey: obj.init,
           width: xxx.width,
           isBorder: xxx.isBorder,
+          isRowCol:xxx.isRowCol,
           mapData,
           sqlData,
           defaultValues: val.unifiedServicePatternModel.defaultValues,
@@ -210,6 +213,7 @@ export default class ZdyTable extends Component {
             : xxx.defaultBinds,
           width: this.props.table ? obj.datas[val.taskFormKey].width : xxx.width,
           isBorder: this.props.table ? obj.datas[val.taskFormKey].isBorder : xxx.isBorder,
+          isRowCol: this.props.table ? obj.datas[val.taskFormKey].isRowCol : xxx.isRowCol,
           items: this.props.table ? obj.datas[val.taskFormKey].items : xxx.items,
           isReady: true,
           init: { ...this.state.init, ...(val.isSecond ? this.props.obj : {}) },
@@ -276,6 +280,7 @@ export default class ZdyTable extends Component {
         this.setState({
           datas: obj.datas,
           width: this.props.table ? obj.datas[val.formKey].width : xxx.width,
+          isRowCol: this.props.table ? obj.datas[val.formKey].isRowCol : xxx.isRowCol,
           isBorder: this.props.table ? obj.datas[val.formKey].isBorder : xxx.isBorder,
           mapData,
           currentFormKey: this.props.table ? val.formKey : obj.init,
@@ -319,6 +324,7 @@ export default class ZdyTable extends Component {
           currentFormKey: obj.init,
           width: xxx.width,
           isBorder: xxx.isBorder,
+          isRowCol:xxx.isRowCol,
           mapData,
           sqlData,
           defaultValues: val.unifiedServicePatternModel.defaultValues,
@@ -366,6 +372,7 @@ export default class ZdyTable extends Component {
         defaultBinds: this.props.table ? obj.datas[val.taskFormKey].defaultBinds : xxx.defaultBinds,
         width: this.props.table ? obj.datas[val.taskFormKey].width : xxx.width,
         isBorder: this.props.table ? obj.datas[val.taskFormKey].isBorder : xxx.isBorder,
+        isRowCol: this.props.table ? obj.datas[val.taskFormKey].isRowCol: xxx.isRowCol,
         items: this.props.table ? obj.datas[val.taskFormKey].items : xxx.items,
         isReady: true,
         init: { ...this.state.init, ...(val.isSecond ? this.props.obj : {}) },