修改bug

one_stop_public/tableCompon/index.jsx

@@ -145,7 +145,7 @@ export default class tableCom extends Component {
   excludeKeys = ["defaultValues", ""]
 
 
-  equal = (obj1, obj2, formula, sqlContent, depth) => {
+  equal = (obj1, obj2, json, sqlContent, depth) => {
 
 
     if (obj1 == null && obj2 != null) {
@@ -209,7 +209,9 @@ export default class tableCom extends Component {
         break;
       }
     
-      if (depth == 1 && ((this.props.json.sqlKey==null&&sqlContent == null && formula == null) || (sqlContent != null && sqlContent.indexOf(key) == -1) || (formula != null && formula.indexOf(key) == -1))) {
+      if (depth == 1 && ((this.props.json.sqlKey==null&&sqlContent == null && json.formula == null&& json.funcs == null) || (sqlContent != null && sqlContent.indexOf(key) == -1)
+       || ((json.formula != null && json.formula.indexOf(key) == -1)&&(json.funcs != null && json.funcs.indexOf(key) == -1))
+       )) {
 
         this.excludeKeys.push(key)
 
@@ -241,7 +243,7 @@ export default class tableCom extends Component {
 
           for (var i = 0; i < obj1[key].length; i++) {
 
-            if (!this.equal(obj1[key][i], obj2[key][i], formula, sqlContent, depth + 1)) {
+            if (!this.equal(obj1[key][i], obj2[key][i], json, sqlContent, depth + 1)) {
 
               xx = false
               break;
@@ -256,7 +258,7 @@ export default class tableCom extends Component {
 
       } else if (obj1[key] instanceof Object) {
 
-        const x = this.equal(obj1[key], obj2[key], formula, sqlContent, depth + 1)
+        const x = this.equal(obj1[key], obj2[key], json, sqlContent, depth + 1)
 
 
         if (!x) {
@@ -425,14 +427,15 @@ export default class tableCom extends Component {
       return;
     }
     const obj2 = props.form.getFieldsValue()
-    const bb = this.equal(this.obj, obj2, json.formula, this.state.sqlContent, 1)
+    const bb = this.equal(this.obj, obj2, json, this.state.sqlContent, 1)
     let bb2 = true
     let childObj2 = {}
     if (props.fatherCode) {
       if (obj2 != null && obj2[props.fatherCode]) {
         childObj2 = obj2[props.fatherCode][props.index];
-
-        bb2 = this.equal(this.childObj, childObj2, json.formula, this.state.sqlContent, 1)
+        
+        bb2 = this.equal(this.childObj, childObj2, json, this.state.sqlContent, 1)
+        
       }
 
 
@@ -1051,7 +1054,7 @@ export default class tableCom extends Component {
         },
 
       )
-
+     
       if (base52) {
         if (value != null && value == "norefeshxxxxxxxxxxxxxxxxxxxx") {
 
@@ -1065,6 +1068,13 @@ export default class tableCom extends Component {
           if (json.comName == "Button") {
 
             return value
+          } else if(json.optionType&&json.optionType=="func"){
+        
+        
+            if(value!=null&&!(typeof value === "function")){
+              this.setState({ options: value , selectDis: false });
+            }
+           
           } else if (json.comName == "Echart" || json.comName == "QRCode") {
             this.setState({ option: value })
           } else {