centaline-data-driven 1.2.14 → 1.2.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.2.14",
+  "version": "1.2.17",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue

@@ -1028,7 +1028,6 @@
               margin-right: 10px;
             }
             .user-name {
-              margin-top: 5px;
               display: flex;
             }
             .text {

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -544,17 +544,17 @@
         var router = this.model.actionRouters.find((v) => {
           return v.id === field.id;
         });
-        if(router==undefined){
-            router = this.model.actionRoutersMoreList.find((v) => {
+        if(router==undefined && this.model.actionRoutersMoreList){
+          router = this.model.actionRoutersMoreList.find((v) => {
             return v.id === field.id;
           });
         }
-        if(router==undefined){
+        if(router==undefined && this.model.otherTradeActionRouter){
           if(field.id===this.model.otherTradeActionRouter.id){
             router = this.model.otherTradeActionRouter
           }
         }
-        if(router==undefined){
+        if(router==undefined && this.model.operationRouters){
             router = this.model.operationRouters.find((v) => {
               return v.id === field.id;
             });
@@ -656,7 +656,12 @@
               window.open(field.action + query, "_blank");
             }
             else{
-              
+              field.doAction(submitData, (data) => {
+                self.model.doAction(data,field);
+                if(callBack){
+                  callBack();
+                }
+              })
             }
           }
           //执行客户端脚本
@@ -1114,7 +1119,6 @@
               margin-right: 10px;
             }
             .user-name {
-              margin-top: 5px;
               display: flex;
             }
             .text {

package/src/centaline/dynamicL/src/dynamicL.vue

@@ -17,7 +17,12 @@
             {{model.label}}
           </div>
         </div>
-        <label class="ct-lable">
+        <span v-if="model.flagJson">
+          <span class="el-tag el-tag--info el-tag--mini" v-for="item in model.labelValue" :key="item" style="box-sizing: border-box;border-color: transparent;margin: 2px 0 2px 6px;">
+            <span class="el-select__tags-text">{{item}}</span>
+          </span>
+        </span>
+        <label v-else class="ct-lable">
           {{model.labelValue}}
         </label>
         <span slot="suffix" v-if="model.unitName" class="ct-unitnameLable">{{model.unitName}}</span>

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

@@ -28,7 +28,7 @@
           <thead ref="tableHead">
             <tr class="ct-tr" ref="headTr" v-for="(columns,columnsIndex) in model.columnsArr">
               <th v-if="model.isMulti && columnsIndex === 0" ref="headLeftThs" class="ct-td left-fixation-th checkbox-td" :class="[model.tdClass]">
-                <label class="el-checkbox"><span class="el-checkbox__input" :class="headAllCheckClass">
+                <label class="el-checkbox"><span class="el-checkbox__input" :class="model.selectAllType">
                   <span class="el-checkbox__inner"></span>
                   <!-- <input type="checkbox" aria-hidden="false" class="el-checkbox__original" value=""> -->
                   <input type="checkbox" @click="selectAll($event)" v-model="model.selectAll" class="el-checkbox__original checkbox-td-1" aria-hidden="false" />
@@ -164,23 +164,7 @@
       }
     },
     computed: {
-       headAllCheckClass() {
 
-         if(this.selectAllType==1)
-         {
-           return '';
-         }
-         else if(this.selectAllType==2)
-         {
-           return 'is-indeterminate';
-         }
-         else if(this.selectAllType==3)
-         {
-           return 'is-checked';
-         }
-        return '';
-       },
-      
     },
     data() {
       return {

package/src/centaline/loader/src/ctl/Detail.js

@@ -294,24 +294,25 @@ const Detail = function (source,para ,callBack) {
             response = response.responseData;
           }
           if(field.id=='Follow' 
-          || field.id=='Trust'
+          || field.id=='Trust' || field.id=='TrustZJJ' || field.id=='TrustDJ' || field.id=='TrustPT'
           || field.id=='RealLook'
           || field.id=='StatusAdjust'
-          || field.id=='OperationKey'
-          || field.id=='OperationKeyCommon'
-          || field.id=='OperationKeyPassword'
+          || field.id=='OperationKey' || field.id=='OperationKeyCommon' || field.id=='OperationKeyPassword'
           || field.id=='Key'){
             let id=field.id;
-            if(field.id=='OperationKey' 
-            || field.id=='OperationKeyCommon' 
-            || field.id=='OperationKeyPassword'){
+            if(field.id=='OperationKey'  || field.id=='OperationKeyCommon' || field.id=='OperationKeyPassword'){
               id='Key';
             }
+            else if(field.id=='TrustZJJ' || field.id=='TrustDJ' || field.id=='TrustPT'){
+              id='Trust';
+            }
             var advIndex = rtn.tags1.findIndex((v) => {
               return v.appID === id;
             });
             rtn.$vue.handleSelect({index:advIndex.toString()});
           }
+          else{
+          }
         },
         //检查是否关闭tab后触发来源页面操作
         checkCloseTabThen(notification) {

package/src/centaline/loader/src/ctl/L.js

@@ -2,7 +2,24 @@ import base from '../../index';
 import Base from './Base';
 const T = function (source) {
   var rtn = {
+    flagJson:false,
     get labelValue() {
+      let value = [];
+      if(source.code1){
+        try{
+          let obj=JSON.parse(source.code1);
+          if (typeof obj == 'object' && obj) {
+            obj.forEach((v) => {
+              value.push(v.name);
+            });
+            rtn.flagJson=true;
+            return value;
+          }
+        } 
+        catch(e){
+        }
+      }
+
       var val = ""; 
       var lst = [];
       var joinChar = source.joinChar == undefined ? '' : source.joinChar;
@@ -27,8 +44,6 @@ const T = function (source) {
           lst.push(fieldVal);
         }
       }
-
-
     }
   };
   rtn = base.copy(Base(source), rtn);

package/src/centaline/loader/src/ctl/SearchTable.js

@@ -247,6 +247,13 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       set flagMoreData(v1) {
         source.page.flagMoreData = v1;
       },
+      get selectAllType() {
+        return source.selectAllType||'';
+      },
+      set selectAllType(v1) {
+        source.selectAllType = v1;
+      },
+      
       getSelectRowData(router) {
         if (rtn.listData.length === 0) {
           return null;
@@ -268,7 +275,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         }
       },
       setSelectAll() {
-        debugger
+       
         if (rtn.listData.length === 0) {
           return;
         }
@@ -280,6 +287,9 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             if(!rtnData||rtnData.length>0)
             {
               this.selectAll = 0;
+            }else
+            {
+              this.selectAll = 1;
             }
           }
       },
@@ -287,7 +297,8 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       getSelectAll()
       {
         if (rtn.listData.length === 0) {
-          return 1;
+          rtn.selectAllType='is-disabled';
+          return;
         }
         if (rtn.isMulti) {
             //找出没有被选中的框
@@ -296,18 +307,20 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             });
             if(rtnData.length<=0)//没有找到未选中的复选框
             {
-              return 3;
+              rtn.selectAllType='is-checked';
+              return;
             }
             if(rtnData.length>0&&rtnData.length<rtn.listData.length)//部分选中
             {
-              return 2;
+              rtn.selectAllType='is-indeterminate';
+              return;
             }
             if(rtnData.length>0&&rtnData.length==rtn.listData.length)//没选中
             {
-              return 1;
+              rtn.selectAllType='';
+              return;
             }
         }
-        return 1;
       },
       _buttons: null,
       get buttons() {
@@ -492,6 +505,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                 rtn.dataDictionary = response.content.rows;
                 //self.listData = self.listData.concat(response.content.Rows);
               }
+              rtn.getSelectAll();
               source.page.rows = response.page.rows;
               source.page.rowCount = response.page.rowCount;
               if (typeof response.content.foot !== 'undefined') {