centaline-data-driven-v3 0.1.10 → 0.1.12

package/src/components/web/TextBox.vue

@@ -1,20 +1,22 @@
 <template>
     <ct-field :vmodel="model">
         <template #Control>
-          <div v-if="model.controlType === Enum.ControlType.MultiLineText" style="width: 100%;">
-            <el-input :type="model.inputType" v-model="model.code1" v-bind="model.attrs" @input="input()" @change="change()"
-                :disabled="model.locked" :rows="model.rows" :readonly="model.readonly"
-                :show-password="model.inputType == 'password'" autocomplete="on" :maxlength="model.maxValue1"
-                :show-word-limit="model.showWordLimit" clearable @keyup.enter.native="search()" class="fieldControl">
-                <template #suffix>
-                    <span v-if="model.unitName1">{{ model.unitName1 }}</span>
-                </template>
-            </el-input>
-            <span v-if="model.sufLabel1" class="sufLabel" v-html="model.sufLabel1"></span>
-          </div>
-          <el-input v-else :type="model.inputType" v-model="model.code1" v-bind="model.attrs" @input="input()" @change="change()"
-                :disabled="model.locked" :rows="model.rows" :readonly="model.readonly"
-                :show-password="model.inputType == 'password'" autocomplete="on" :maxlength="model.maxValue1"
+            <div v-if="model.controlType === Enum.ControlType.MultiLineText" style="width: 100%;">
+                <el-input :type="model.inputType" v-model="model.code1" v-bind="model.attrs" @input="input()"
+                    @change="change()" :disabled="model.locked" :rows="model.rows" :readonly="model.readonly"
+                    :show-password="model.inputType == 'password'" autocomplete="on" :maxlength="model.maxValue1"
+                    :show-word-limit="model.showWordLimit" clearable @keyup.enter.native="search()"
+                    class="fieldControl">
+                    <template #suffix>
+                        <span v-if="model.unitName1">{{ model.unitName1 }}</span>
+                    </template>
+                </el-input>
+                <span v-if="model.sufLabel1" class="sufLabel" v-html="model.sufLabel1"></span>
+            </div>
+            <el-input v-else :type="model.inputType" v-model="model.code1" v-bind="model.attrs" @input="input()"
+                @change="change()" :disabled="model.locked" :rows="model.rows" :readonly="model.readonly"
+                :show-password="model.inputType == 'password'" autocomplete="on"
+                :maxlength="model.controlType !== Enum.ControlType.NumericTextBox ? model.maxValue1 : ''"
                 :show-word-limit="model.showWordLimit" clearable @keyup.enter.native="search()" class="fieldControl">
                 <template #suffix>
                     <span v-if="model.unitName1">{{ model.unitName1 }}</span>
@@ -35,7 +37,7 @@
 import { initData, changeHandler } from '../../utils/mixins';
 import TextBox from '../../loader/src/TextBox';
 import Enum from '../../utils/Enum'
-const emit = defineEmits(['input', 'change', 'click','search','popupSearchList'])
+const emit = defineEmits(['input', 'change', 'click', 'search', 'popupSearchList'])
 const props = defineProps({
     parameterAction: String,
     vmodel: Object,
@@ -46,25 +48,37 @@ const props = defineProps({
     },
 })
 const model = initData(props, TextBox)
+model.value.selfValidExcute = () => {
+    model.value.valid = true;
+    if (model.value.controlType === Enum.ControlType.NumericTextBox) {
+        if (model.value.minValue1 && model.value.code1 < parseFloat(model.value.minValue1)) {
+            model.value.validMessage = "最小值为" + model.value.minValue1 + "";
+            model.value.valid = false;
+            return false;
+        }
+
+    }
+    return model.value.valid;
+}
 function search() {
-    if (model.value.autoSearch||props.from=='tree') {
+    if (model.value.autoSearch || props.from == 'tree') {
         emit('search');
     }
 }
 function input() {
-  if(model.value.controlType===Enum.ControlType.MultiLineText || model.value.controlType===Enum.ControlType.TextBox){
-  }
-  else{
-    change();
-  }
-} 
+    if (model.value.controlType === Enum.ControlType.MultiLineText || model.value.controlType === Enum.ControlType.TextBox) {
+    }
+    else {
+        change();
+    }
+}
 function change() {
-  changeHandler(model.value, emit);
-  if (props.from == 'tree') { emit('search'); }
+    changeHandler(model.value, emit);
+    if (props.from == 'tree') { emit('search'); }
 }
 //弹出选择列表
 function popupSearchListHandle() {
-    let isSingle=model.value.moreActionRouter.isSingle
+    let isSingle = model.value.moreActionRouter.isSingle
     emit('popupSearchList', isSingle, model, model.value.moreActionRouter);
 }
 defineExpose({

package/src/loader/src/Field.js

@@ -93,6 +93,20 @@ const Base = function (source, moreActionRouter) {
         set hiddenRelationFieldValue(v) {
             source.hiddenRelationFieldValue = v;
         },
+        //决定其显示相关的字段
+        get displayRelationField() {
+            return source.displayRelationField;
+        },
+        set displayRelationField(v) {
+            source.displayRelationField = v;
+        },
+        //决定其显示相关字段的值
+        get displayRelationFieldValue() {
+            return source.displayRelationFieldValue;
+        },
+        set displayRelationFieldValue(v) {
+            source.displayRelationFieldValue = v;
+        },
         //决定其必填相关的字段
         get requiredRelationField() {
             return source.requiredRelationField;
@@ -801,11 +815,21 @@ const Base = function (source, moreActionRouter) {
             if (typeof source.show !== "undefined") {
                 return source.show;
             }
+            if (source.hidden) {
+                return !source.hidden;
+            }
             return true;
         },
         set show(v) {
             source.show = v;
         },
+        //是否显示
+        get hidden() {
+            return source.hidden;
+        },
+        set hidden(v) {
+            source.hidden = v;
+        },
         //重置
         reset() {
             if (this.controlType === Enum.ControlType.Hidden
@@ -829,10 +853,10 @@ const Base = function (source, moreActionRouter) {
                     }
                     else {
                         this.value = this.defaultCode1
-                        if(this.searchName){
-                            this.searchName=''
-                            this.searchValue=''
-                            this.searchValue1=''
+                        if (this.searchName) {
+                            this.searchName = ''
+                            this.searchValue = ''
+                            this.searchValue1 = ''
                         }
                     }
 
@@ -853,8 +877,8 @@ const Base = function (source, moreActionRouter) {
                 this.code1 = this.defaultCode1 || '';
                 this.code2 = this.defaultCode2 || '';
                 this.name1 = this.defaultName1 || '';
-                if(this.controlType === Enum.ControlType.SearchListBox && this.defaultCode1 && this.defaultName1){
-                  this.options=[{ value: this.code1, label: this.name1 }]
+                if (this.controlType === Enum.ControlType.SearchListBox && this.defaultCode1 && this.defaultName1) {
+                    this.options = [{ value: this.code1, label: this.name1 }]
                 }
             }
             else {
@@ -971,7 +995,7 @@ const Base = function (source, moreActionRouter) {
         getFormParentFieldPara() {
             if (rtn.form && typeof rtn.parentFields !== 'undefined' && rtn.parentFields.length > 0) {
                 if (typeof rtn.form.getRefFieldPara === 'function') {
-                    return rtn.form.getParentFieldPara(rtn.parentFields,rtn.form);
+                    return rtn.form.getParentFieldPara(rtn.parentFields, rtn.form);
                 }
             }
             return null;

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,