centaline-data-driven 1.5.30 → 1.5.31

package/src/centaline/common/index.js

@@ -429,7 +429,7 @@ const common = {
    * @desc 执行动态脚本，装载自定义方法和参数在window上(这样使用自定义对象时，不需要this.了)
    * @returns {obj} 返回值
    */
-  excute(code) {
+  excute(code) {
     var self = this;
     common.with(self);
     let rtn = eval(code);
@@ -620,11 +620,11 @@ const common = {
    * @return 格式化后的日期
    */
   formatDate: function (date, format) {
-    var v = "";
-    if (typeof date === "string") {
-      date = new Date(date)
+    var v = "";
+    if (typeof date === "string") {
+      date = new Date(date)
     }
-    if (typeof date === "string" || typeof date !== "object") {
+    if (typeof date === "string" || typeof date !== "object") {
       return;
     }
     if (date == null) return "";

package/src/centaline/dynamicBtn/src/dynamicBtn.vue

@@ -68,7 +68,7 @@
       <span v-else>{{model.label}}</span>
     </div>
     <el-dropdown-menu>
-      <el-dropdown-item>
+      <el-dropdown-item>
         <div style="width:100%;float: left;margin:10px 0;">
           <el-button style="float: left" v-for="(field, index) in SearchWhereButtons" :key="index" :type="field.isHyperLink ? 'text' : 'primary'" :disabled="field.locked" @click="SaveSearchWhere(field)">{{field.label}}</el-button>
           <span style="margin-left:10px;margin-top:3px;float:left" @click="SearchWhereManage" title="维维护已保存的查询条件，如：设置和取消默认、修改标签、删除等。"><i class="el-icon-s-tools" style=" font-size: 18px;"></i></span>
@@ -105,14 +105,14 @@
       optionApi:String,
       rowData: Object,
       rowindex:Number,
-      flagAppMode: Boolean,
+      flagAppMode: Boolean,
       actionRouters: Array,
     },
     mixins: [dynamicElement],
     data: function () {
-      return {
-        fieldSearchWhere: {},
-        SearchWhereList: [],
+      return {
+        fieldSearchWhere: {},
+        SearchWhereList: [],
         SearchWhereButtons:[],
         visible:false,
         message:'',
@@ -135,12 +135,12 @@
       }
       else {
         this.model = this.vmodel;
-      }
-      if (this.actionRouters && this.model.routerKey) {
+      }
+      if (this.actionRouters && this.model.routerKey) {
         this.fieldSearchWhere = this.actionRouters.find((b) => {
           return b.id === this.model.routerKey;
-        });
-      }
+        });
+      }
     },
     computed: {
       uploadData() {
@@ -199,43 +199,43 @@
         else{
           this.$emit('click',this.model,this.rowData,this.rowindex);
         }
-      },
-      clickHandleDropdown(v) {
-        if (v) {
-          this.getSearchWherList();
-        }
-      },
-      SaveSearchWhere(field) {
-        if (field.lock) {
-          return;
-        }
-        this.$refs.searchwhere.hide();
-        this.$emit('SaveSearchWhere', field);
-      },
-      getSearchWherList() {
-        if (this.model.routerKey) {
+      },
+      clickHandleDropdown(v) {
+        if (v) {
+          this.getSearchWherList();
+        }
+      },
+      SaveSearchWhere(field) {
+        if (field.lock) {
+          return;
+        }
+        this.$refs.searchwhere.hide();
+        this.$emit('SaveSearchWhere', field);
+      },
+      getSearchWherList() {
+        if (this.model.routerKey) {
           let field = this.actionRouters.find((b) => {
             return b.id === this.model.routerKey;
-          });
-          if (field) {
-            this.model.getApiData(this.loadSearchWher, field);
-          }
-        }
-      },
-      SearchWhereManage() {
-        this.$refs.searchwhere.hide();
-        this.$emit('SearchWhereManage', this.model);
-      },
-      clickDropdownItem(col) {
-        this.$refs.searchwhere.hide();
-        this.$emit('clichSearchWhere', col);
-      },
-      loadSearchWher(data, Buttons) {
-        this.SearchWhereList = [];
-        data.rows.forEach((row) => {
+          });
+          if (field) {
+            this.model.getApiData(this.loadSearchWher, field);
+          }
+        }
+      },
+      SearchWhereManage() {
+        this.$refs.searchwhere.hide();
+        this.$emit('SearchWhereManage', this.model);
+      },
+      clickDropdownItem(col) {
+        this.$refs.searchwhere.hide();
+        this.$emit('clichSearchWhere', col);
+      },
+      loadSearchWher(data, Buttons) {
+        this.SearchWhereList = [];
+        data.rows.forEach((row) => {
           this.SearchWhereList.push(row);
-        });
-        this.SearchWhereButtons = Buttons;
+        });
+        this.SearchWhereButtons = Buttons;
       },
       callTelClick(data){
         var self=this;
@@ -291,7 +291,7 @@
 .max-info:hover .subText{
   color: #fff;
 }
-  .max-search-btn-dropdown {
+  .max-search-btn-dropdown {
     margin-right:10px;
   }
 .max-search-btn-dropdown .el-dropdown__caret-button::before {
@@ -302,7 +302,7 @@
    border-radius: 5px 0 0 5px;
 }
  .max-search-btn-dropdown .el-dropdown__caret-button {
-    border-radius: 0 5px 5px 0;
+    border-radius: 0 5px 5px 0;
 }
     .max-search-btn-dropdown .el-button:first-child:focus {
       background-color: var(--chinaRed);
@@ -318,4 +318,4 @@
       border-bottom-color: var(--chinaRed);
     }
 
-</style>
+</style>

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -808,6 +808,10 @@
       },
       changeHandler(field) {
         var self = this;
+
+        self.model.hiddenHandle(field);
+        self.model.requiredHandle(field);
+        
         if (typeof field.change !== 'undefined') {
           if (typeof this.model.scripts !== 'undefined') {
             this.model.scripts.formData.setExcuteListData(this.model.fields);
@@ -817,8 +821,6 @@
         }
 
         self.model.isChanged = true;
-        self.model.hiddenHandle(field);
-        self.model.requiredHandle(field);
         //self.model.validMrf(field);
 
         if (field.onAfterChanged && field.type !== 4) {
@@ -1131,6 +1133,7 @@
 
   .ct-collapse-item-title .el-collapse-item__header {
     color: #303133 !important;
+    line-height: normal;
   }
 
   .el-collapse-saveLine .ct-collapse-item-title:last-child .el-collapse-item__wrap {

package/src/centaline/dynamicHyperLink/index.js

@@ -8,4 +8,4 @@ if (typeof window !== 'undefined' && window.Vue) {
   window.Vue.use(dynamicHyperLink);
 }
 
-export default dynamicHyperLink
+export default dynamicHyperLink

package/src/centaline/dynamicLayout/src/dynamicLayoutChildren.vue

@@ -1,12 +1,12 @@
-<template>
-  <el-container  v-if="model.routerKey&&model.visibility!='0'&&model.rightRouter&&model.value!=''"  :direction="model.orientation" :style="model.styleObject" ref="layoutchildren">
-    <div  @click="clickHandlerLayout($event)">
-      <component v-for="(item, index) in model.fields" :actionRouter="actionRouter" :rowdata="rowdata" :key="index" :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex" @click="clickHandler"></component>
-    </div>
-  </el-container>
-  <el-container  v-else-if="model.value!=''&&model.visibility!='0'" :direction="model.orientation" :style="model.styleObject" ref="layoutchildren">
-    <component v-for="(item, index) in model.fields" :actionRouter="actionRouter" :rowdata="rowdata" :key="index" :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex" @click="clickHandler"></component>
-  </el-container>
+<template>
+  <el-container  v-if="model.routerKey&&model.visibility!='0'&&model.rightRouter&&model.value!=''"  :direction="model.orientation" :style="model.styleObject" ref="layoutchildren">
+    <div  @click="clickHandlerLayout($event)">
+      <component v-for="(item, index) in model.fields" :actionRouter="actionRouter" :rowdata="rowdata" :key="index" :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex" @click="clickHandler"></component>
+    </div>
+  </el-container>
+  <el-container  v-else-if="model.value!=''&&model.visibility!='0'" :direction="model.orientation" :style="model.styleObject" ref="layoutchildren">
+    <component v-for="(item, index) in model.fields" :actionRouter="actionRouter" :rowdata="rowdata" :key="index" :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex" @click="clickHandler"></component>
+  </el-container>
 </template>
 <script>
   import dynamicElement from '../../mixins/dynamicElement'
@@ -37,13 +37,13 @@
       };
     },
     created() {
-      this.model = this.loaderObj.CellLayout(this.vmodel);
+      this.model = this.loaderObj.CellLayout(this.vmodel);
     },
     methods: {
       clickHandler(routerKey, rowindex, forname, forrowindex,flagHaveAlert) {
         this.$emit('click', routerKey, rowindex, forname, forrowindex,flagHaveAlert);
-      },
-      clickHandlerLayout(ev) {
+      },
+      clickHandlerLayout(ev) {
         this.$emit(
           "click",
           this.model.routerKey,
@@ -64,16 +64,16 @@
           for (const vn of vnodes) {
             destroyDeep(vn)
           }
-        }
-        if (typeof vnode.componentInstance !== 'undefined') {
-          vnode.componentInstance.$destroy()
+        }
+        if (typeof vnode.componentInstance !== 'undefined') {
+          vnode.componentInstance.$destroy()
         }
         setTimeout(() => {
           vnode.componentInstance = undefined
           vnode.elm.innerHTML = ''
         }, 0)
       }
-      destroyDeep(this._vnode)
+      destroyDeep(this._vnode)
     },
   }
-</script>
+</script>

package/src/centaline/dynamicLayout/src/dynamicLayoutChildrenFor.vue

@@ -41,16 +41,16 @@
           for (const vn of vnodes) {
             destroyDeep(vn)
           }
-        }
-        if (typeof vnode.componentInstance !== 'undefined') {
-          vnode.componentInstance.$destroy()
+        }
+        if (typeof vnode.componentInstance !== 'undefined') {
+          vnode.componentInstance.$destroy()
         }
         setTimeout(() => {
           vnode.componentInstance = undefined
           vnode.elm.innerHTML = ''
         }, 0)
       }
-      destroyDeep(this._vnode)
+      destroyDeep(this._vnode)
     },
   }
 </script>

package/src/centaline/dynamicLayout/src/dynamicLayoutImage.vue

@@ -109,16 +109,16 @@
           for (const vn of vnodes) {
             destroyDeep(vn)
           }
-        }
-        if (typeof vnode.componentInstance !== 'undefined') {
-          vnode.componentInstance.$destroy()
+        }
+        if (typeof vnode.componentInstance !== 'undefined') {
+          vnode.componentInstance.$destroy()
         }
         setTimeout(() => {
           vnode.componentInstance = undefined
           vnode.elm.innerHTML = ''
         }, 0)
       }
-      destroyDeep(this._vnode)
+      destroyDeep(this._vnode)
     },
   }
 </script>

package/src/centaline/dynamicPlaceHolder/index.js

@@ -8,4 +8,4 @@ if (typeof window !== 'undefined' && window.Vue) {
   window.Vue.use(dynamicPlaceHolder);
 }
 
-export default dynamicPlaceHolder
+export default dynamicPlaceHolder

package/src/centaline/dynamicRepeat/src/dynamicRepeat.vue

@@ -110,25 +110,27 @@
       },
       validExcute() {
         var self = this;
-        var rtnBool = true;
-        if (!self.fieldsValidExcute()) {
-          rtnBool = false;
-        }
-        else if (this.model.tableData.length < this.model.min) {
-          self.$message({
-            message: this.model.title + " 最少需要" + this.model.min+"条数据",
-            type: 'warning',
-            showClose: true,
-          });
-          rtnBool = false;
-        }
-        if (rtnBool && self.model.required && this.model.tableData.length === 0) {
-          self.$message({
-            message: this.model.title + " 表格不能为空",
-            type: 'warning',
-            showClose:true,
-          });
-          rtnBool = false;
+        var rtnBool = true;
+        if (this.model.show) {
+          if (!self.fieldsValidExcute()) {
+            rtnBool = false;
+          }
+          else if (this.model.tableData.length < this.model.min) {
+            self.$message({
+              message: this.model.title + " 最少需要" + this.model.min + "条数据",
+              type: 'warning',
+              showClose: true,
+            });
+            rtnBool = false;
+          }
+          if (rtnBool && self.model.required && this.model.tableData.length === 0) {
+            self.$message({
+              message: this.model.title + " 表格不能为空",
+              type: 'warning',
+              showClose: true,
+            });
+            rtnBool = false;
+          }
         }
         return rtnBool;
       },

package/src/centaline/dynamicSearchList/src/dynamicSearchScreen.vue

@@ -46,7 +46,7 @@ import dynamicElement from '../../mixins/dynamicElement';
       },
     },
     data() {
-      return {
+      return {
         LabelName:'',
         isLoading: true,
         screenRow: [],
@@ -59,7 +59,7 @@ import dynamicElement from '../../mixins/dynamicElement';
     mounted() {
       var self = this;
       if(self.categoryLoaded){
-        this.$nextTick(function () {
+        this.$nextTick(function () {
           if (typeof self.api !== 'undefined') {
             self.loaderObj.SearchScreen(self.api, self.load, self.screenPara);
           }
@@ -73,7 +73,7 @@ import dynamicElement from '../../mixins/dynamicElement';
       }
     },
     methods: {
-      clickHandler(model) {
+      clickHandler(model) {
         switch (model.action) {
           case 'showHigh':
             this.$set(this, 'highScreen', !this.highScreen);
@@ -99,44 +99,44 @@ import dynamicElement from '../../mixins/dynamicElement';
             }
             break;
         }
-      },
-      clichSearchWhere(col) {
-        if (typeof col.scripts !== 'undefined') {
-          this.model.reset();
-          this.model.scripts.formData = this.model.formData;
-          this.model.scripts.formData.form = this.model;
-          this.model.scripts.formData.excuteData = this.model.screen;
-          this.model.scripts.formData.fieldsDic = this.model.screenDic;
-          this.$common.excute.call(this.model.scripts, col.scripts);
-          this.$emit('search', this.model.scripts.formData.form);
-        }
-      },
-      SaveSearchWhere(field) {
-        if (this.model.searchDataOfShow.fields.length == 0) {
+      },
+      clichSearchWhere(col) {
+        if (typeof col.scripts !== 'undefined') {
+          this.model.reset();
+          this.model.scripts.formData = this.model.formData;
+          this.model.scripts.formData.form = this.model;
+          this.model.scripts.formData.excuteData = this.model.screen;
+          this.model.scripts.formData.fieldsDic = this.model.screenDic;
+          this.$common.excute.call(this.model.scripts, col.scripts);
+          this.$emit('search', this.model.scripts.formData.form);
+        }
+      },
+      SaveSearchWhere(field) {
+        if (this.model.searchDataOfShow.fields.length == 0) {
           this.$message({
             message: "没有选择任何搜索条件，无需保存！",
             type: 'warning',
             showClose: true,
-          });
-          return;
-        }
-        var submitData = {};
-        submitData["jsonData"] = JSON.stringify(this.model.searchData.fields);
-        this.clickHandlerfield(field, submitData)
-      },
-      SearchWhereManage(model) {
+          });
+          return;
+        }
+        var submitData = {};
+        submitData["jsonData"] = JSON.stringify(this.model.searchData.fields);
+        this.clickHandlerfield(field, submitData)
+      },
+      SearchWhereManage(model) {
         let field = this.model.actionRouters.find((b) => {
           return b.id === model.routerKey;
-        });
-        this.clickHandlerfieldManage(field);
-      },
+        });
+        this.clickHandlerfieldManage(field);
+      },
       clickHandlerfield(field, submitData) {
         var self = this;
         this.model.scripts.$fd = field.id;
         this.model.scripts.$result = [];
 
         var clickAcion = function (field) {
-          //若不是客户端方法，则直接访问接口
+          //若不是客户端方法，则直接访问接口
           if (!field.isClientFuntion) {
             let verified = true;
             if (field.isSubmit) {
@@ -545,19 +545,19 @@ import dynamicElement from '../../mixins/dynamicElement';
         else {
           clickAcion(field, submitData);
         }
-      },
+      },
       clickHandlerfieldManage(field, submitData) {
         var self = this;
-        var clickAcion = function (field) {
+        var clickAcion = function (field) {
           //若不是客户端方法，则直接访问接口
-          if (!field.isClientFuntion) {
-            if (!submitData) {
+          if (!field.isClientFuntion) {
+            if (!submitData) {
               submitData = {};
-              field.getSearchPara().fields.forEach((f) => {
+              field.getSearchPara().fields.forEach((f) => {
                 submitData[common.initialsToLowerCase(f.fieldName1)] = f.searchValue1;
-              });
+              });
               submitData["sourceFrom"] = "setting";
-            }
+            }
             var dialogOption = {
               title: field.pageTitle,
               pane: self.$common.getParentPane(self),
@@ -604,7 +604,7 @@ import dynamicElement from '../../mixins/dynamicElement';
         else {
           clickAcion(field, submitData);
         }
-      },
+      },
       loadScreen() {
         var self = this;
         var hasParent = self.model.screen.filter((v) => {
@@ -669,17 +669,17 @@ import dynamicElement from '../../mixins/dynamicElement';
         self.model.$vue = self;
         self.loadScreen();
         self.loadHighScreen();
-        self.setScreenShow();
-        if (self.model.onload) {
-          self.model.scripts.formData = self.model.formData;
-          self.model.scripts.formData.form = self.model;
-          self.model.scripts.formData.excuteData = self.model.screen;
+        self.setScreenShow();
+        if (self.model.onload) {
+          self.model.scripts.formData = self.model.formData;
+          self.model.scripts.formData.form = self.model;
+          self.model.scripts.formData.excuteData = self.model.screen;
           self.model.scripts.formData.fieldsDic = self.model.screenDic;
           self.$common.excute.call(self.model.scripts, self.model.onload);
-        }
+        }
         self.isLoading = false;
         self.$emit('loaded', self.model.defaultSearch);
-        self.$emit('showTitle');
+        self.$emit('showTitle');
       },
       searchComplate() {
         var self = this;

package/src/centaline/dynamicSos/src/dynamicSos.vue

@@ -78,12 +78,12 @@
       else {
         this.model = this.vmodel;
       }
-      this.$watch('model.value', (n, o) => {
-        if (typeof this.model.child !== 'undefined' && this.model.enableRelationFields) {
-          for (var item of this.model.child) {
+      this.$watch('model.value', (n, o) => {
+        if (typeof this.model.child !== 'undefined' && this.model.enableRelationFields) {
+          for (var item of this.model.child) {
             item.value = item.defaultValue || '';
-            item.text = item.defaultText || '';
-            item.enableRelationFields = this.model.enableRelationFields;
+            item.text = item.defaultText || '';
+            item.enableRelationFields = this.model.enableRelationFields;
           }
         }
       });
@@ -147,11 +147,11 @@
         var self = this;
         this.model.getOptions(this.api, self.searchText);
       },
-      soChange: function () {
-        var self = this;
+      soChange: function () {
+        var self = this;
         this.model.enableRelationFields = true;
         if (typeof this.model.child !== 'undefined') {
-          for (var item of this.model.child) {
+          for (var item of this.model.child) {
             item.value = item.defaultValue || '';
             item.text = item.defaultText || '';
           }