合并

one_stop_public/Table/index.jsx

@@ -9,7 +9,7 @@ import { Row, Col ,Input,message} from 'antd'
 import TableCom from '../tableCompon'
 import {Toast} from 'antd-mobile'
 import router from 'umi/router'
-
+import { formulaList }  from '../excelInitFuc/functionList';
 
 export default class ZdyTable extends Component {
     constructor(props){
@@ -36,7 +36,19 @@ export default class ZdyTable extends Component {
     }
 
     componentDidMount(){
-
+        if(!window.functionObj){ // 检查是否注册
+            /**
+             * 注册全局函数集
+             * 动态生成表单配置函数所使用
+             */
+            let functionObj = {}
+            formulaList.map(item => {
+                item.children.map(arr=> {
+                    functionObj[arr.callKey] = arr.function
+                })
+            })
+            window.functionObj = functionObj
+        }
         let {
                 postData, // 数据源
                 isCg, // 用户点击草稿页面进入

one_stop_public/libs/ChildForm.jsx

@@ -145,7 +145,7 @@ export default class ChildForm extends React.Component {
                             <ZdyTable formConfig={datas} key={r} fatherCode={base52} isEdit={isEdit} index={r} obj={objs[r]} init={objs} isChild={true} get="web" form={form} mapData={mapData} sqlData={sqlData} {...datas} defaultValues={defaultValues} />
 
                             {rights.includes("delete") && isEdit ? <Button size="small"
-                                style={{ position: "absolute", right: 0, top: 0 }}
+                                style={{ position: "absolute", right: 10, top: '50%',transform:'translateY(-50%)' }}
                                 type='danger' onClick={this.delete.bind(this, r)}>{deleteName || "删除"}</Button> : ""}
 
                         </Col>

one_stop_public/libs/rollTab.jsx

@@ -15,6 +15,13 @@ export default class rollTab extends Component {
         }
     }
     componentDidMount(){
+        let functionObj = {}
+        formulaList.map(item => {
+            item.children.map(arr=> {
+                functionObj[arr.callKey] = arr.function
+            })
+        })
+        window.functionObj = functionObj
         this.setState({
             tabList:formulaList
         },()=>{