1111

one_stop_public/models/DataColumn.js

@@ -9,7 +9,7 @@ export default {
   namespace: 'DataColumn',
 
   state: {
-    isShowModal:false,
+    isShowModal:{},
 
     list: [],
     refs: [],

one_stop_public/tableCompon/index.jsx

@@ -151,20 +151,24 @@ export default class tableCom extends Component {
     },
   };
   excludeKeys = ['defaultValues', ''];
-  closeModal = callback => {
+  closeModal = (fk,callback) => {
     const { dispatch } = this.props;
-
+    const x = this.props.DataColumn.isShowModal
+    x[fk]=false
     dispatch({
       type: 'DataColumn/showModal',
-      payload: { isShowModal: false },
+      payload: { isShowModal:x },
       callback: callback,
     });
   };
   showModal = (fk, title, data, modalProps) => {
+    
     const { dispatch } = this.props;
+    const x = this.props.DataColumn.isShowModal
+    x[fk]=true
     dispatch({
       type: 'DataColumn/showModal',
-      payload: { isShowModal: true },
+      payload: { isShowModal:x},
       callback: () => {
         this.setState({
           modalInit: data,
@@ -2935,7 +2939,7 @@ export default class tableCom extends Component {
                   ? json.vlds
                   : [{ required: required, message: '请输入' + title }],
             })(
-              <CronEditor/>
+              <CronEditor style={{width:600}}/>
             );
             break;
         case 'LocationCom':
@@ -3116,8 +3120,8 @@ export default class tableCom extends Component {
             {modalCode ? (
               <FormModal
                 {...modalProps}
-                visible={this.props.DataColumn.isShowModal}
-                handleCancel={this.closeModal}
+                visible={this.props.DataColumn.isShowModal[modalCode]}
+                handleCancel={this.closeModal.bind(this,modalCode)}
                 title={modalTitle}
               >
                 <ZdyTable
@@ -3197,8 +3201,8 @@ export default class tableCom extends Component {
               {modalCode ? (
                 <FormModal
                   {...modalProps}
-                  visible={this.props.DataColumn.isShowModal}
-                  handleCancel={this.closeModal}
+                  visible={this.props.DataColumn.isShowModal[modalCode]}
+                  handleCancel={this.closeModal.bind(this,modalCode)}
                   title={modalTitle}
                 >
                   <ZdyTable
@@ -3233,8 +3237,8 @@ export default class tableCom extends Component {
               {modalCode ? (
                 <FormModal
                   {...modalProps}
-                  visible={this.props.DataColumn.isShowModal}
-                  handleCancel={this.closeModal}
+                  visible={this.props.DataColumn.isShowModal[modalCode]}
+                  handleCancel={this.closeModal.bind(this,modalCode)}
                   title={modalTitle}
                 >
                   <ZdyTable
@@ -3276,8 +3280,8 @@ export default class tableCom extends Component {
             {modalCode ? (
               <FormModal
                 {...modalProps}
-                visible={this.props.DataColumn.isShowModal}
-                handleCancel={this.closeModal}
+                visible={this.props.DataColumn.isShowModal[modalCode]}
+                handleCancel={this.closeModal.bind(this,modalCode)}
                 title={modalTitle}
               >
                 <ZdyTable
@@ -3313,8 +3317,8 @@ export default class tableCom extends Component {
           {modalCode ? (
             <FormModal
               {...modalProps}
-              visible={this.props.DataColumn.isShowModal}
-              handleCancel={this.closeModal}
+              visible={this.props.DataColumn.isShowModal[modalCode]}
+              handleCancel={this.closeModal.bind(this,modalCode)}
               title={modalTitle}
             >
               <ZdyTable