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

one_stop_public/models/DataColumn.js

@@ -2,21 +2,29 @@
 
 import {apiRequest} from "../utils/request";
 import {Base16Encode} from "../Base16/index"
-import baseX from 'base-x'
-var BASE16 = '0123456789abcdef'
-var bs16 = baseX(BASE16)
+
 
 const api="/DataColumnApi"
 export default {
   namespace: 'DataColumn',
 
   state: {
+    isShowModal:false,
 
     list: [],
     refs: [],
   },
 
   effects: {
+   
+    *showModal({ payload, callback }, { call, put }) {
+
+      yield put({
+        type: 'show',
+        payload: payload,
+      });
+      if (callback) callback();
+    },
     *clear({ payload, callback }, { call, put }) {
 
       yield put({
@@ -233,5 +241,11 @@ export default {
 
 
     },
+    show (state,{ payload }) {
+      return {...state,isShowModal:payload.isShowModal };
+
+
+    },
+   
   },
 };

one_stop_public/models/DataObj.js

 import { apiRequest } from '../utils/request';
 const api = '/DataObjApi';
 import {Base16Encode} from "../Base16/index"
-import baseX from 'base-x'
-var BASE16 = '0123456789abcdef'
-var bs16 = baseX(BASE16)
+
 export default {
   namespace: 'DataObj',
 

one_stop_public/models/DataRight.js

@@ -2,9 +2,7 @@
 
 import {apiRequest} from "../utils/request";
 import {Base16Encode} from "../Base16/index"
-import baseX from 'base-x'
-var BASE16 = '0123456789abcdef'
-var bs16 = baseX(BASE16)
+
 const api="/DataRightApi"
 
 export default {

one_stop_public/models/affairModels.js

@@ -3,12 +3,9 @@
  * 2019年9月20日
  * 事务相关接口
  */
-import { queryApiActionPath } from '../utils/queryConfig';
 import { uaaRequest } from '../utils/request';
 import {Base16Encode} from "../Base16/index"
-import baseX from 'base-x'
-var BASE16 = '0123456789abcdef'
-var bs16 = baseX(BASE16)
+
 const api = '/UnifiedAppFormApi';
 const myCollect = {
   namespace: 'affair',

one_stop_public/tableCompon/index.jsx

@@ -135,7 +135,7 @@ export default class tableCom extends Component {
     sqlModel: {},
     columns: [],
     sqlContent: null,
-    isShowModal:false,
+   
     modalTitle:"",
     modalInit:{},
     modalCode:null,
@@ -145,17 +145,29 @@ export default class tableCom extends Component {
     },
   };
   excludeKeys = ["defaultValues", ""]
-  handleCancel=()=>{
-    this.setState({isShowModal:false})
+  closeModal=(callback)=>{
+    const { dispatch } = this.props
+ 
+      dispatch({
+        type: 'DataColumn/showModal',
+        payload: {isShowModal:false },
+        callback:callback
+      })
+ 
  }
  showModal=(fk,title,data)=>{
+  const { dispatch } = this.props
+ 
+  dispatch({
+    type: 'DataColumn/showModal',
+    payload: { isShowModal:true },
+    callback:()=>{
+      this.setState({modalInit:data,modalTitle:title,modalCode:fk})
+    }
+  })
  
- this.setState({isShowModal:true,modalInit:data,modalTitle:title,modalCode:fk})
 }
-closeModal=(callback)=>{
 
-  this.setState({isShowModal:false},()=>{if(callback)callback()})
- }
   equal = (obj1, obj2, json, sqlContent, depth) => {
 
 
@@ -1474,7 +1486,7 @@ closeModal=(callback)=>{
      * obj为查看详情用户输入值
      */
     let { json, obj, mapData, init, sqlData, defaultValues, get, formKey, isEdit, datas } = this.props;
-    const { options, labels, selectDis,modalCode,modalTitle,isShowModal,modalInit } = this.state;
+    const { options, labels, selectDis,modalCode,modalTitle,modalInit } = this.state;
     const { getFieldDecorator, getFieldError, getFieldProps } = this.props.form;
     const disabled = json != null ? json.disabled : false
     if (json == null) {
@@ -2771,7 +2783,7 @@ closeModal=(callback)=>{
          * 卡片类型
          */
         return (<Card style={{ margin: 5, border: '1px solid #ccc' }}>
-          {modalCode?<FormModal visible={isShowModal} handleCancel={this.handleCancel} title={modalTitle}>
+          {modalCode?<FormModal visible={this.props.DataColumn.isShowModal} handleCancel={this.closeModal} title={modalTitle}>
               <ZdyTable modalInit={modalInit} key={modalCode} datas={datas} get={get} isChild={true} currentFormKey={modalCode} isEdit={isEdit} obj={obj} init={init} form={this.props.form} mapData={mapData} sqlData={sqlData} {...datas[modalCode]} defaultValues={defaultValues} />
               
               </FormModal>:""}
@@ -2832,7 +2844,7 @@ closeModal=(callback)=>{
               >
                 {cm}
             </Col>
-            {modalCode?<FormModal visible={isShowModal} handleCancel={this.handleCancel} title={modalTitle}>
+            {modalCode?<FormModal visible={this.props.DataColumn.isShowModal} handleCancel={this.closeModal} title={modalTitle}>
               <ZdyTable modalInit={modalInit} key={modalCode} datas={datas} get={get} isChild={true} currentFormKey={modalCode} isEdit={isEdit} obj={obj} init={init} form={this.props.form} mapData={mapData} sqlData={sqlData} {...datas[modalCode]} defaultValues={defaultValues} />
               
               </FormModal>:""}
@@ -2840,7 +2852,7 @@ closeModal=(callback)=>{
           )
         } else {
           return (
-            <>{modalCode?<FormModal visible={isShowModal} handleCancel={this.handleCancel} title={modalTitle}>
+            <>{modalCode?<FormModal visible={this.props.DataColumn.isShowModal} handleCancel={this.closeModal} title={modalTitle}>
               <ZdyTable modalInit={modalInit} key={modalCode} datas={datas} get={get} isChild={true} currentFormKey={modalCode} isEdit={isEdit} obj={obj} init={init} form={this.props.form} mapData={mapData} sqlData={sqlData} {...datas[modalCode]} defaultValues={defaultValues} />
               
               </FormModal>:""}
@@ -2854,7 +2866,7 @@ closeModal=(callback)=>{
           )
         }
       } else {
-        return  <>{modalCode?<FormModal visible={isShowModal} handleCancel={this.handleCancel} title={modalTitle}>
+        return  <>{modalCode?<FormModal visible={this.props.DataColumn.isShowModal} handleCancel={this.closeModal} title={modalTitle}>
         <ZdyTable modalInit={modalInit} key={modalCode} datas={datas} get={get} isChild={true} currentFormKey={modalCode} isEdit={isEdit} obj={obj} init={init} form={this.props.form} mapData={mapData} sqlData={sqlData} {...datas[modalCode]} defaultValues={defaultValues} />
         
         </FormModal>:""}{cm}</>
@@ -2862,7 +2874,7 @@ closeModal=(callback)=>{
       }
     } else {
       return (
-        <>{modalCode?<FormModal visible={isShowModal} handleCancel={this.handleCancel} title={modalTitle}>
+        <>{modalCode?<FormModal visible={this.props.DataColumn.isShowModal} handleCancel={this.closeModal} title={modalTitle}>
               <ZdyTable modalInit={modalInit} key={modalCode} datas={datas} get={get} isChild={true} currentFormKey={modalCode} isEdit={isEdit} obj={obj} init={init} form={this.props.form} mapData={mapData} sqlData={sqlData} {...datas[modalCode]} defaultValues={defaultValues} />
               
               </FormModal>:""}