centaline-data-driven 1.1.41 → 1.1.46

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

@@ -223,7 +223,7 @@
         var self = this;
         this.model.scripts.$fd = field.id;
         this.model.scripts.$result = [];
-
+        
         var clickAcion = function (field) {  
           if (field.isSubmit) {
             let verified = true;
@@ -376,9 +376,11 @@
       changeHandler(field) {
         var self = this;
         if (typeof field.change !== 'undefined') {
+          if (typeof this.model.scripts !== 'undefined') {
+            this.model.scripts.formData.setExcuteListData(this.model.fields);
+          }
           this.model.scripts.$fd = field.id;
           this.$common.excute.call(this.model.scripts, field.change);
-
         }
 
         self.model.isChanged = true;
@@ -389,12 +391,17 @@
       },
       changeCallBackHandler(field, callBackFunName, callBackPara) {
         var self = this;
-        this.model.scripts.$fd = field.id;
-        this.$common.excuteFunStr.call(this.model.scripts, callBackFunName, callBackPara);
+        if(callBackFunName){
+          this.model.scripts.$fd = field.id;
+          this.$common.excuteFunStr.call(this.model.scripts, callBackFunName, callBackPara);
+        }
         self.$forceUpdate();
       },
       inputHandler(field) {
         if (typeof field.input !== 'undefined') {
+          if (typeof this.model.scripts !== 'undefined') {
+            this.model.scripts.formData.setExcuteListData(this.model.fields);
+          }
           this.model.scripts.$fd = field.id;
           this.$common.excute.call(this.model.scripts, field.input);
         }
@@ -439,7 +446,7 @@
             },
             on: {
               submit(option) {
-                if (typeof callBack === "function") {
+                if (typeof callBack === "function" && !router.callBackFunName) {
                   callBack(option);
                 }
 
@@ -510,8 +517,7 @@
           }
         });
       },
-      getFormObj()
-      {
+      getFormObj(){
         let formData=this.model.getFormObj();
         if(this.$route && this.$route.query && this.$route.query.pageStyle)
         {
@@ -523,3 +529,8 @@
     }
   }
 </script>
+<style scoped>
+.el-collapse{
+  border-top: none;
+}
+</style>

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

@@ -187,7 +187,7 @@
     }
   .ct-form-list.ct-form-list-mini, .ct-form-list.ct-form-list-mini td {
     min-height: 28px;
-    line-height: 28px;
+    line-height: 26px;
     font-size: 12px;
   }
   .ct-form-list.ct-form-list-small, .ct-form-list.ct-form-list-small td {

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

@@ -130,7 +130,6 @@
       },
       //修改
       saveRow(row, index, isCancel) {
-        console.log(row);
         let app = this;
         if (app.model.dialogEdit) {
           this.editRow(row.$sourceIndex);
@@ -247,7 +246,6 @@
         this.model.change = field.change;
         this.model.currentRowIndex = index;
         this.model.currentEventField = field;
-
         self.$emit('change');
 
         //如果有汇总列，触发重新计算汇总

package/src/centaline/dynamicInputNumber/src/dynamicInputNumber.vue

@@ -139,7 +139,7 @@
     box-sizing: border-box;
     color: #606266;
     display: inline-block;
-    height: 28px;
+    height: 26px;
     outline: 0;
     padding: 0 15px;
     -webkit-transition: border-color .2s cubic-bezier(.645,.045,.355,1);

package/src/centaline/dynamicMo/src/dynamicMo.vue

@@ -17,7 +17,7 @@
             </span>
           </div>
           <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']"
-                      :trigger="'click'" :disabled="model.lock">
+                      :trigger="(model.popupSearchListType > 0 || model.lock) ? 'manual' : 'click'" :disabled="model.lock">
             <div>
               <ct-select-option :model="model" :optionRowCount="optionRowCount" @click="selectOption($event)"></ct-select-option>
             </div>
@@ -43,8 +43,8 @@
         </transition>
       </div>
       <div v-if="model.popupSearchListType === 1 && !model.lock">
-        <el-button v-if="!model.moreActionBtnName" size="mini" type="primary" icon="el-icon-search" @click="popupSearchListHandle"></el-button>
-        <el-button v-else size="mini" type="primary" @click="popupSearchListHandle">{{model.moreActionBtnName}}</el-button>
+        <el-button v-if="!model.moreActionBtnName" class="h26" size="mini" type="primary" icon="el-icon-search" @click="popupSearchListHandle"></el-button>
+        <el-button v-else size="mini" type="primary" class="h26" @click="popupSearchListHandle">{{model.moreActionBtnName}}</el-button>
       </div>
     </div>
   </div>
@@ -71,7 +71,7 @@
       return {
         focus: false,
         showDrop: false,
-        inputHeight: 28,
+        inputHeight: 26,
         tagsWidth: 175,
         showClear: false,
         globalOptions: []
@@ -110,7 +110,7 @@
         get: function () {
           switch (this.model.attrs.size) {
             case 'mini':
-              return 28;
+              return 26;
             case 'small':
               return 32;
             case 'medium':
@@ -271,9 +271,9 @@
       selectOptionArr(optionArr) {
         var self = this;
         optionArr.forEach((s) => {
-          if (!self.model.value.find((v) => { return v === s.Code })) {
+          if (!self.model.value.find((v) => { return v === s[self.model.optionAttrs.value] })) {
             self.model.options.push(s);
-            self.model.value.push(s.Code);
+            self.model.value.push(s[self.model.optionAttrs.value]);
           }
         });
 
@@ -335,7 +335,7 @@
       color: transparent;
       display: inline-block;
       font-size: inherit;
-      line-height: 28px;
+      line-height: 26px;
       outline: 0;
       padding: 0 15px;
       padding-right: 30px;
@@ -412,4 +412,7 @@
   .ct-mo-value-label {
     padding-left:15px;
   }
+  .h26{
+  height: 26px;
+}
 </style>

package/src/centaline/dynamicPopupSearchList/src/dynamicPopupSearchList.vue

@@ -107,12 +107,21 @@
       searchData() {
         this.$refs.table.searchComplate(this.model);
       },
+      reset() {
+        this.model.fields.forEach((v) => {
+          v.reset();
+        });
+      },
       getClickHandler(action) {
         var fun = {};
         switch (action) {
           case 'search':
             this.searchData();
             break;
+          case 'reset':
+            this.reset();
+            this.searchData();
+            break;
           default:
             break;
         }

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -192,10 +192,11 @@
             self.colHasWidth[vi] = 'nowidth';
           }
         });
+        debugger;
         self.isLoading = false;
         self.$forceUpdate();
         this.model.scripts.formData = this.model.formData;
-        this.model.scripts.formData.form = this.model;
+        this.model.scripts.formData.formTable = this.model;
 
         self.$emit('loaded');
         self.$emit('showTitle');
@@ -764,6 +765,7 @@
             // let parm={submitData:submitData,field:field}
             // self.$common.excuteFunStr.call(self.model.scripts, field.action,parm);
             let title=field.pageTitle==undefined ?field.label:field.pageTitle;
+            submitData.actionType=field.actionType;
             var fun =self.$common.getDataDrivenOpts().handler[action];
             fun(submitData,title,self.model);
             // var fun = self.model.scripts.formData[action];
@@ -923,7 +925,7 @@
 
   .ct-table-mini {
     font-size: 12px;
-    line-height: 28px;
+    line-height: 26px;
     min-height: 28px;
   }
 

package/src/centaline/dynamicSearchList/src/dynamicTableTip.vue

@@ -28,7 +28,7 @@
     }
   .ct-table-tip-mini {
     font-size: 12px;
-    line-height: 28px;
+    line-height: 26px;
     min-height: 0px;
   }
 

package/src/centaline/dynamicSeg/src/dynamicSeg.vue

@@ -81,7 +81,7 @@
     border-radius: 4px;
     /*border: 1px solid #dcdfe6;*/
     line-height: 40px;
-    padding-left: 15px;
+    /* padding-left: 15px; */
   }
     .ct-Seg .ct-radios:hover {
       border-color: #c0c4cc;
@@ -91,7 +91,7 @@
     }*/
     .ct-Seg .ct-radios .el-radio {
       margin-left: 0px;
-      margin-right: 10px;
+      margin-right: 15px;
     }
 
   .ct-Seg .ct-radios .ct-Seg-label {

package/src/centaline/dynamicSo/src/dynamicSo.vue

@@ -32,8 +32,8 @@
         </span>
       </transition>
       <div v-if="!model.lock && model.popupSearchListType === 1">
-        <el-button v-if="!model.moreActionBtnName" size="mini" type="primary" icon="el-icon-search" @click="popupSearchListHandle"></el-button>
-        <el-button v-else size="mini" type="primary" @click="popupSearchListHandle">{{model.moreActionBtnName}}</el-button>
+        <el-button v-if="!model.moreActionBtnName" size="mini" type="primary" class="h26" icon="el-icon-search" @click="popupSearchListHandle"></el-button>
+        <el-button v-else size="mini" type="primary" class="h26" @click="popupSearchListHandle">{{model.moreActionBtnName}}</el-button>
       </div>
     </div>
   </div>
@@ -62,7 +62,7 @@
       return {
         focus: false,
         showDrop: false,
-        inputHeight: 28,
+        inputHeight: 26,
         showClear:false
       }
     },
@@ -99,7 +99,7 @@
         get: function () {
           switch (this.model.attrs.size) {
             case 'mini':
-              return 28;
+              return 26;
             case 'small':
               return 32;
             case 'medium':
@@ -186,10 +186,7 @@
         self.$emit('popupSearchList', true, self.model, self.model.moreActionRouter, (option) => {
           self.model.value = option[self.model.optionAttrs.value];
           self.model.text = option[self.model.optionAttrs.label];
-          self.model.options.push({
-            code: self.model.value,
-            name: self.model.text
-          });
+          self.model.options.push(option);
 
           self.soChange();
         });
@@ -254,7 +251,7 @@
       color: #606266;
       display: inline-block;
       font-size: inherit;
-      line-height: 28px;
+      line-height: 26px;
       outline: 0;
       padding: 0 15px;
       padding-right: 30px;
@@ -327,4 +324,7 @@
   .ct-so .ct-close > .el-select__caret.is-show-close:hover {
     color: #909399;
   }
+  .h26{
+    height: 26px;
+  }
 </style>

package/src/centaline/dynamicSos/src/dynamicSos - /345/244/215/345/210/266.vue"

@@ -54,7 +54,7 @@
       return {
         focus: false,
         showDrop: false,
-        inputHeight: 28,
+        inputHeight: 26,
         showClear: false,
         searchText: ""
       }
@@ -92,7 +92,7 @@
         get: function () {
           switch (this.model.attrs.size) {
             case 'mini':
-              return 28;
+              return 26;
             case 'small':
               return 32;
             case 'medium':

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

@@ -35,8 +35,8 @@
         </span>
       </transition>
       <div v-if="!model.lock && model.popupSearchListType === 1">
-        <el-button v-if="!model.moreActionBtnName" size="mini" type="primary" icon="el-icon-search" @click="popupSearchListHandle"></el-button>
-        <el-button v-else size="mini" type="primary" @click="popupSearchListHandle">{{model.moreActionBtnName}}</el-button>
+        <el-button v-if="!model.moreActionBtnName" size="mini" class="h26" type="primary" icon="el-icon-search" @click="popupSearchListHandle"></el-button>
+        <el-button v-else size="mini" type="primary" class="h26" @click="popupSearchListHandle">{{model.moreActionBtnName}}</el-button>
       </div>
     </div>
   </div>
@@ -65,7 +65,7 @@
       return {
         focus: false,
         showDrop: false,
-        inputHeight: 28,
+        inputHeight: 26,
         showClear: false,
         searchText: ""
       }
@@ -103,7 +103,7 @@
         get: function () {
           switch (this.model.attrs.size) {
             case 'mini':
-              return 28;
+              return 26;
             case 'small':
               return 32;
             case 'medium':
@@ -196,10 +196,7 @@
           if (option) {
             self.model.value = option[self.model.optionAttrs.value];
             self.model.text = option[self.model.optionAttrs.label];
-            self.model.options.push({
-              Code: self.model.value,
-              Name: self.model.text
-            });
+            self.model.options.push(option);
 
             self.soChange();
           }
@@ -262,4 +259,7 @@
   }
 </script>
 <style>
+.h26{
+  height: 26px;
+}
 </style>

package/src/centaline/dynamicTags/src/dynamicTags - /345/244/215/345/210/266.vue"

@@ -64,7 +64,7 @@
       return {
         focus: false,
         showDrop: false,
-        inputHeight: 28,
+        inputHeight: 26,
         tagsWidth: 175,
         showClear: false,
         searchText: "",
@@ -104,7 +104,7 @@
         get: function () {
           switch (this.model.attrs.size) {
             case 'mini':
-              return 28;
+              return 26;
             case 'small':
               return 32;
             case 'medium':
@@ -303,7 +303,7 @@
       color: transparent;
       display: inline-block;
       font-size: inherit;
-      line-height: 28px;
+      line-height: 26px;
       outline: 0;
       padding: 0 15px;
       padding-right: 30px;

package/src/centaline/dynamicTags/src/dynamicTags.vue

@@ -17,7 +17,7 @@
                 </span>
               </span>
             </div>
-            <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel1?'showLabel':'']" :trigger="(model.popupSearchListType === 2 || model.lock) ? 'manual' : 'click'">
+            <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel1?'showLabel':'']" :trigger="(model.popupSearchListType > 0 || model.lock) ? 'manual' : 'click'">
               <div>
                 <div>
                   <el-input ref="searchInput" :size="model.attrs.size" suffix-icon="el-icon-search" v-model="searchText" @input="searchInputHandle"></el-input>
@@ -46,8 +46,8 @@
       </div>
 
       <div v-if="model.popupSearchListType === 1 && !model.lock">
-        <el-button v-if="!model.moreActionBtnName" size="mini" type="primary" icon="el-icon-search" @click="popupSearchListHandle"></el-button>
-        <el-button v-else size="mini" type="primary" @click="popupSearchListHandle">{{model.moreActionBtnName}}</el-button>
+        <el-button v-if="!model.moreActionBtnName" class="h26" size="mini" type="primary" icon="el-icon-search" @click="popupSearchListHandle"></el-button>
+        <el-button v-else size="mini" type="primary" class="h26" @click="popupSearchListHandle">{{model.moreActionBtnName}}</el-button>
       </div>
     </div>
   </div>
@@ -76,7 +76,7 @@
       return {
         focus: false,
         showDrop: false,
-        inputHeight: 28,
+        inputHeight: 26,
         tagsWidth: 175,
         showClear: false,
         searchText: "",
@@ -116,7 +116,7 @@
         get: function () {
           switch (this.model.attrs.size) {
             case 'mini':
-              return 28;
+              return 26;
             case 'small':
               return 32;
             case 'medium':
@@ -205,7 +205,7 @@
       },
       popupSearchListHandle: function () {
         var self = this;
-
+        self.showDrop=false;
         self.$emit('popupSearchList', false, self.model, self.model.moreActionRouter, (optionArr) => {
           self.selectOptionArr(optionArr);
         });
@@ -280,9 +280,9 @@
       selectOptionArr(optionArr) {
         var self = this;
         optionArr.forEach((s) => {
-          if (!self.model.value.find((v) => { return v === s.Code })) {
+          if (!self.model.value.find((v) => { return v === s[self.model.optionAttrs.value] })) {
             self.model.options.push(s);
-            self.model.value.push(s.Code);
+            self.model.value.push(s[self.model.optionAttrs.value]);
           }
         });
 
@@ -418,4 +418,7 @@
   .ct-tags-value-label {
     padding-left: 15px;
   }
+  .h26{
+  height: 26px;
+}
 </style>

package/src/centaline/dynamicTree/src/dynamicTree.vue

@@ -109,7 +109,9 @@
   }
 </script>
 <style lang="scss">
-
+  .tree-line:first-child div{
+    overflow: hidden;
+  }
     .el-tree-node {
       position: relative;
       padding-left: 16px;
@@ -129,13 +131,27 @@
       width: 1px;
       position: absolute;
       left: 27px;
-      top: -33px;
+      top: -1px;
+      border-width: 1px;
+      border-left: 1px dashed #52627C;
+    }
+
+    .tree-line .el-tree-node:before:last-child{
+      top: -35px;
+    }
+    .el-tree-node__children .el-tree-node::before {
+      content: "";
+      height: 100%;
+      width: 1px;
+      position: absolute;
+      left: 27px;
+      top: -2px;
       border-width: 1px;
       border-left: 1px dashed #52627C;
     }
     /* 当前最后一个接点的竖线高度 */
     .el-tree-node:last-child::before {
-      height: 46px; /*可以自己调整 */
+      height: 15px; /*可以自己调整 */
     }
 
     /* 横线 */
@@ -152,7 +168,7 @@
     }
 
     .el-tree:first-child .el-tree-node:before {
-      height: 46px; /*可以自己调整 */
+      // height: 46px; /*可以自己调整 */
     }
 
     .el-tree-node__expand-icon {
@@ -164,7 +180,7 @@
     }
 
     .el-tree > .el-tree-node:first-child:before {
-      border-left: none;
+      // border-left: none;
     }
 
     .tree > .is-leaf {

package/src/centaline/dynamicTree/src/dynamicTreeList.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app-Tree" style="height:100%;">
     <el-container style="height:  calc(100vh - 98px);border: 1px solid #eee">
-      <el-aside width="14%" style="background-color:white">
+      <el-aside width="15%" style="background-color:white">
         <ct-searchtree :flagsearch="true" :searchConditionApi="searchConditionApi" :searchDataApi="searchDataApi" @loaded="loaded"></ct-searchtree>
       </el-aside>
       <el-main v-if="isShowSearchlist">

package/src/centaline/formData/index.js

@@ -11,6 +11,7 @@ const formData = {
     common: common,
     Axios: Axios,
     form: null,
+    formTable:null,
     excuteData: null,//fields
     fieldsDic: null,//fieldsDic
     _excuteListData: undefined,
@@ -43,6 +44,7 @@ const formData = {
         var rtn1 = this.fieldsDic[id];
         if (rtn1) {
             rtn1.source[attrKey] = attrValue;
+            console.log(this.form)
             this.form.hatchHandle(id, attrKey, attrValue, rtn1);
             //this.form.hiddenHandle(rtn1);//隐藏关联的
 
@@ -74,21 +76,30 @@ const formData = {
     //获取列表数据
     get excuteListData() {
         if (this._excuteListData) {
-        return this._excuteListData;
+            return this._excuteListData;
         }
         else {
-        if (this.excuteData !== null) {
-            this._excuteListData = this.excuteData.filter((v) => {
-            return typeof v.is !== undefined && v.is === 'ct-form-list-table';
-            });
-        }
+            if (this.excuteData !== null) {
+                this._excuteListData = this.excuteData.filter((v) => {
+                    return typeof v.is !== undefined && v.is === 'ct-form-list-table';
+                });
+            }
         }
         return this._excuteListData;
     },
+    setExcuteListData(fields) {
+        this._excuteListData=null;
+        if (fields !== null) {
+            this.excuteData=fields;
+            this._excuteListData = fields.filter((v) => {
+                return typeof v.is !== undefined && v.is === 'ct-form-list-table';
+            });
+        }
+    },
     //获取列表的Field
     getListField(tableName, rowNum, fiedlId) {
         let listData = this.excuteListData.find((v) => {
-        return v.id === tableName;
+            return v.id === tableName;
         });
         if (listData) {
             let field = null;
@@ -164,7 +175,7 @@ const formData = {
     },
     //设置表格某行某列的值
     setListFieldValue(value, tableName, rowNum, fiedlId, attrName) {
-        value = value.toString();
+        value = value==undefined?"":value.toString();
         tableName = tableName ? tableName : this.form.scripts.$fd;
         let data = this.getListField(tableName, rowNum, fiedlId);