centaline-data-driven-v3 0.1.11 → 0.1.12

package/src/loader/src/Form.js

@@ -93,7 +93,12 @@ function loadFromModel(source, isFormList) {
             && attrValue != undefined && attrValue != null && attrValue != '') {
             rtn1.jsSetFile(attrValue, rtn1);
           }
+          if (attrKey == 'hidden') {
+            rtn1['show'] = !attrValue
+          }
+
           rtn1[attrKey] = attrValue;
+
           if (rtn1.controlType === Enum.ControlType.Tags) {
             rtn1["value"] = JSON.parse(attrValue);
           }
@@ -139,6 +144,7 @@ function loadFromModel(source, isFormList) {
             }
           }
           hiddenHandle(rtn1, this.form);
+          displayHandle(rtn1, this.form);
           requiredHandle(rtn1, this.form);
         }
       },
@@ -155,6 +161,7 @@ function loadFromModel(source, isFormList) {
           if (typeof rtn1.code1 !== 'undefined') {
             rtn1.code1 = code1;
             hiddenHandle(rtn1);//隐藏关联的
+            displayHandle(rtn1);
           }
           if (typeof rtn1.code2 !== 'undefined') {
             rtn1.code2 = code2;
@@ -552,6 +559,7 @@ function loadFromModel(source, isFormList) {
 
       }
       allhiddenHandle(rtn);
+      alldisplayHandle(rtn);
       allRequiredHandle(rtn);//必填关联组件
       return rtn._fields;
     },
@@ -723,7 +731,7 @@ function loadFromModel(source, isFormList) {
         return rtn._scripts;
       }
       else {
-        if (source&&typeof source.scripts !== 'undefined') {
+        if (source && typeof source.scripts !== 'undefined') {
           rtn._scripts = base.common.eval(source.scripts);
           return rtn._scripts;
         }
@@ -881,12 +889,28 @@ function hiddenHandle(item, model) {
         field = model.fields[i];
         if (field) {
           let hiddenValueArr = field.hiddenRelationFieldValue.split(',');
-          if (hiddenValueArr.indexOf(item.code1) > -1) {
-            field.show = false;
+          if (item.controlType == Enum.ControlType.MultiSelectWithSearch || item.controlType == Enum.ControlType.MultiSelectNoSearch) {
+            field.show = true;
+            var value = item.code1 === '' ? [''] : JSON.parse(item.code1)
+            if (value.length > 0) {
+              value.forEach((v) => {
+                if (v.flagDeleted !== true) {
+                  if (hiddenValueArr.indexOf(v.code) > -1) {
+                    field.show = false;
+                  }
+                }
+              });
+            }
           }
           else {
-            field.show = true;
+            if (hiddenValueArr.indexOf(item.code1) > -1) {
+              field.show = false;
+            }
+            else {
+              field.show = true;
+            }
           }
+
           //本组件隐藏，子组件必须隐藏
           hiddenHandlesource(field, model);
           if (!item.show && item.controlType !== Enum.ControlType.Hidden) field.show = false;
@@ -898,12 +922,28 @@ function hiddenHandle(item, model) {
             field1 = model.fields[i].fields[i1];
             if (field1) {
               let hiddenValueArr1 = field1.hiddenRelationFieldValue.split(',');
-              if (hiddenValueArr1.indexOf(item.code1) > -1) {
-                field1.show = false;
+              if (item.controlType == Enum.ControlType.MultiSelectWithSearch || item.controlType == Enum.ControlType.MultiSelectNoSearch) {
+                field1.show = true;
+                var value = item.code1 === '' ? [''] : JSON.parse(item.code1)
+                if (value.length > 0) {
+                  value.forEach((v) => {
+                    if (v.flagDeleted !== true) {
+                      if (hiddenValueArr1.indexOf(v.code) > -1) {
+                        field1.show = false;
+                      }
+                    }
+                  });
+                }
               }
               else {
-                field1.show = true;
+                if (hiddenValueArr1.indexOf(item.code1) > -1) {
+                  field1.show = false;
+                }
+                else {
+                  field1.show = true;
+                }
               }
+
             }
           }
         }
@@ -921,6 +961,88 @@ function hiddenHandlesource(item, model) {
     hiddenHandle(field[0], model);
   }
 }
+//初始化显示关联组件
+function alldisplayHandle(model) {
+  model.fields.forEach(v => {
+    displayHandle(v, model);
+    if (v.controlType == Enum.ControlType.Compound || v.controlType == Enum.ControlType.ContainerControl) {
+      v.fields.forEach(v1 => {
+        displayHandle(v1, model);
+      });
+    }
+  });
+}
+//显示关联组件
+function displayHandle(item, model) {
+  if (item.fieldName1) {
+    let field = null;
+    let field1 = null;
+    for (var i in model.fields) {
+      if (!model.fields[i].hiddenRelationField && model.fields[i].displayRelationField === item.fieldName1) {
+        field = model.fields[i];
+        if (field) {
+          let displayValueArr = field.displayRelationFieldValue.split(',');
+          if (item.controlType == Enum.ControlType.MultiSelectWithSearch || item.controlType == Enum.ControlType.MultiSelectNoSearch) {
+            field.show = false;
+            var value = item.code1 === '' ? [''] : JSON.parse(item.code1)
+            if (value.length > 0) {
+              value.forEach((v) => {
+                if (v.flagDeleted !== true) {
+                  if (displayValueArr.indexOf(v.code) > -1) {
+                    field.show = true;
+                  }
+                }
+              });
+            }
+          }
+          else {
+            if (displayValueArr.indexOf(item.code1) > -1) {
+              field.show = true;
+            }
+            else {
+              field.show = false;
+            }
+          }
+          if (!item.show && item.controlType !== Enum.ControlType.Hidden) field.show = false;
+        }
+      }
+      if (model.fields[i].controlType == Enum.ControlType.Compound || model.fields[i].controlType == Enum.ControlType.ContainerControl) {
+        for (var i1 in model.fields[i].fields) {
+          if (!model.fields[i].fields[i1].hiddenRelationField && model.fields[i].fields[i1].displayRelationField === item.fieldName1) {
+            field1 = model.fields[i].fields[i1];
+            if (field1) {
+              let displayValueArr1 = field1.displayRelationFieldValue.split(',');
+              if (item.controlType == Enum.ControlType.MultiSelectWithSearch || item.controlType == Enum.ControlType.MultiSelectNoSearch) {
+                field1.show = false;
+                var value = item.code1 === '' ? [''] : JSON.parse(item.code1)
+                if (value.length > 0) {
+                  value.forEach((v) => {
+                    if (v.flagDeleted !== true) {
+                      if (displayValueArr1.indexOf(v.code) > -1) {
+                        field1.show = true;
+                      }
+                    }
+                  });
+                }
+              }
+              else {
+                if (displayValueArr1.indexOf(item.code1) > -1) {
+                  field1.show = true;
+                }
+                else {
+                  field1.show = false;
+                }
+              }
+
+            }
+          }
+        }
+      }
+
+    }
+
+  }
+}
 //初始化必填关联组件
 function allRequiredHandle(model) {
   model.fields.forEach(v => {
@@ -938,11 +1060,26 @@ function requiredHandle(item, model) {
         field = model.fields[i];
         if (field) {
           let requiredValueArr = field.requiredRelationFieldValue.split(',');
-          if (requiredValueArr.indexOf(value) > -1) {
-            field.required = true;
+          if (item.controlType == Enum.ControlType.MultiSelectWithSearch || item.controlType == Enum.ControlType.MultiSelectNoSearch) {
+            field.required = false;
+            var arrValue = item.code1 === '' ? [''] : JSON.parse(item.code1)
+            if (arrValue.length > 0) {
+              arrValue.forEach((v) => {
+                if (v.flagDeleted !== true) {
+                  if (requiredValueArr.indexOf(v.code) > -1) {
+                    field.required = true;
+                  }
+                }
+              });
+            }
           }
           else {
-            field.required = false;
+            if (requiredValueArr.indexOf(value) > -1) {
+              field.required = true;
+            }
+            else {
+              field.required = false;
+            }
           }
         }
       }
@@ -952,12 +1089,28 @@ function requiredHandle(item, model) {
             field1 = model.fields[i].fields[i1];
             if (field1) {
               let requiredValueArr = field1.requiredRelationFieldValue.split(',');
-              if (requiredValueArr.indexOf(item.code1) > -1) {
-                field1.required = true;
+              if (item.controlType == Enum.ControlType.MultiSelectWithSearch || item.controlType == Enum.ControlType.MultiSelectNoSearch) {
+                field1.required = false;
+                var arrValue = item.code1 === '' ? [''] : JSON.parse(item.code1)
+                if (arrValue.length > 0) {
+                  arrValue.forEach((v) => {
+                    if (v.flagDeleted !== true) {
+                      if (requiredValueArr.indexOf(v.code) > -1) {
+                        field1.required = true;
+                      }
+                    }
+                  });
+                }
               }
               else {
-                field1.required = false;
+                if (requiredValueArr.indexOf(item.code1) > -1) {
+                  field1.required = true;
+                }
+                else {
+                  field1.required = false;
+                }
               }
+
             }
           }
         }
@@ -1254,6 +1407,7 @@ function getFileData(field, model) {
 }
 function changeHandler(field, model) {
   hiddenHandle(field, model);
+  displayHandle(field, model);
   requiredHandle(field, model);
   clearRelatedHandle(field, model.fields)
   if (field.onChanged) {
@@ -1331,6 +1485,7 @@ const Form = {
   loadFormApi,
   loadFromModel,
   hiddenHandle,
+  displayHandle,
   requiredHandle,
   clearRelatedHandle,
   doAction,