centaline-data-driven 1.5.59 → 1.5.60

package/src/SearchList.vue

@@ -1,21 +1,13 @@
 <template>
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
-
     <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/transaction-workflow/getLayoutOfSearch'" :searchDataApi="'/api/third-dept-tran/transaction-workflow/list'"></ct-searchlist> -->
 
-    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/tran-list/layout'"  :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist> -->
+     <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> 
     
-    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/profit-return/layout'"  :searchDataApi="'/api/third-dept-tran/profit-return'"></ct-searchlist> -->
-
-    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-layout'"  :searchDataApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-list'"></ct-searchlist> -->
-
-    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/finance/tran-commission-allocate/process-layout'"  :searchDataApi="'/api/finance/tran-commission-allocate/process-list'"></ct-searchlist> -->
-
-    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/shift-approver/layout'"  :searchDataApi="'/api/shift-approver/list'"></ct-searchlist> -->
-
-
-     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/filemanage/batchdownlist/getLayoutOfSearch'"  :searchDataApi="'/filemanage/batchdownlist/getList'"></ct-searchlist> -->
-
+    <!-- <ct-searchlist :apiParam="para"
+      :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" 
+      :searchDataApi="'/api/third-dept-tran/tran-list'">
+    </ct-searchlist> -->
 
     <!-- <ct-searchlist :apiParam="para"
       :searchConditionApi="'/api/transaction/adjustRecord/getLayoutOfSearch'" 
@@ -45,16 +37,16 @@
       :searchStatsApi="'/ProfileWorklistList/getListStats'">
     </ct-searchlist> -->
 
-    <!-- <ct-searchlist :apiParam="para"
-      :searchConditionApi="'/RightValueList/getLayoutOfSearch'" 
-      :searchDataApi="'/RightValueList/getListOfSearchModel'">
-    </ct-searchlist> -->
+     <!--<ct-searchlist :apiParam="para"
+      :searchConditionApi="'/CallTaskList/getLayoutOfSearch'" 
+      :searchDataApi="'/CallTaskList/getListOfSearchModel'">
+    </ct-searchlist>--> 
 
-    <!-- <ct-searchlist 
+    <!--<ct-searchlist 
       :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'" 
       :searchConditionApi="'/PropertyPublishList/getLayoutOfSearchForRET'" :searchStatsApi="'/PropertyPublishList/getListStatsForRET'"
       :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'">
-    </ct-searchlist> -->
+    </ct-searchlist>-->
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
@@ -68,17 +60,17 @@
       :searchStatsApi="'/PropertyOFIList/getListStats'">
     </ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/EstateList/getLayoutOfSearch'" :searchDataApi="'/EstateList/getListOfSearchModel'"></ct-searchlist> -->
-    
-    <!-- <ct-searchlist :searchConditionApi="'/EstateBuildingList/getLayoutOfSearch'" :searchDataApi="'/EstateBuildingList/getListOfSearchModel'"></ct-searchlist> -->
-
-    <!-- <ct-searchlist :searchConditionApi="'/DistrictList/getLayoutOfSearch'" :searchDataApi="'/DistrictList/getListOfSearchModel'"></ct-searchlist> -->
-
-    <!-- <ct-searchlist :searchConditionApi="'/CustomerImportList/getLayoutOfSearch'" :searchDataApi="'/CustomerImportList/getListOfSearchModel'"></ct-searchlist> -->
+    <!-- <ct-searchlist :searchConditionApi="'/EstateList/getLayoutOfSearch'"
+      :searchDataApi="'/EstateList/getListOfSearchModel'">
+    </ct-searchlist> -->
     
-    <ct-searchlist :searchConditionApi="'/CustomerList/getLayoutOfSearch'" :searchStatsApi="'/CustomerList/getListStats'" :searchDataApi="'/CustomerList/getListOfSearchModel'"></ct-searchlist>
+    <!-- <ct-searchlist :searchConditionApi="'/EstateBuildingList/getLayoutOfSearch'"
+      :searchDataApi="'/EstateBuildingList/getListOfSearchModel'">
+    </ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/CallTaskList/getLayoutOfSearch'" :searchDataApi="'/CallTaskList/getListOfSearchModel'"></ct-searchlist> -->
+    <!-- <ct-searchlist :searchConditionApi="'/DistrictList/getLayoutOfSearch'"
+      :searchDataApi="'/DistrictList/getListOfSearchModel'">
+    </ct-searchlist> -->
     
     <!-- <ct-searchlist :searchConditionApi="'/RoleList/getLayoutOfSearch'" :searchStatsApi="'/RoleList/getListStats'" :searchDataApi="'/RoleList/getListOfSearchModel'"></ct-searchlist> -->
 

package/src/SearchTree.vue

@@ -1,8 +1,8 @@
 <template>
   <div id="app-Tree" style="height:100%;position: fixed;width:100%">
     <ct-treelist :flagsearch="true" :apiParam="apiParam" :leftWidth="'280'"
-                 :searchConditionApi="'/SystemParameterCatalogList/getLayoutOfSearch'"
-                 :searchDataApi="'/SystemParameterCatalogList/getListOfSearchModel'" @loaded="loaded"></ct-treelist>
+                 :searchConditionApi="'/DepartmentList/getLayoutOfSearch'"
+                 :searchDataApi="'/DepartmentList/getListOfSearchModel'" @loaded="loaded"></ct-treelist>
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>

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/dynamicInputNumber/src/dynamicInputNumber.vue

@@ -159,7 +159,9 @@
     transition: border-color .2s cubic-bezier(.645,.045,.355,1);
     width: 100%;
   }
-
+  .ct-inputNumber .ct-input__inner:hover{
+  border-color:var(--centalineBlue);
+}
   .ct-inputNumber {
     font-size: 12px;
   }

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/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

@@ -184,18 +184,21 @@ export default {
     fieldsValidExcute() {
       var self = this;
       var rtnBool = true;
+      self.validMessage='';
       if (typeof self.$refs.Fields !== "undefined") {
         self.$refs.Fields.forEach((f) => {
           if (typeof f.validExcute !== "undefined") {
             if (!f.validExcute()) {
-              if (f.validMessage) {
-                if (f.validMessage == "必填") {
-                  self.validMessage= "【"+self.model.label+"-" + f.model.label + "】" + f.validMessage;
+              if(!self.validMessage){
+                if (f.validMessage) {
+                  if (f.validMessage == "必填") {
+                    self.validMessage= "【"+self.model.label+"-" + f.model.label + "】" + f.validMessage;
+                  } else {
+                    self.validMessage= f.validMessage;
+                  }
                 } else {
-                   self.validMessage= f.validMessage;
+                    self.validMessage="【"+self.model.label+"-" + f.model.label + "】不能为空！";
                 }
-              } else {
-                  self.validMessage="【"+self.model.label+"-" + f.model.label + "】不能为空！";
               }
               rtnBool = false;
             }

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 || '';
           }

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

@@ -1,7 +1,7 @@
 import base from '../../index';
-import Base from './Base';
-import common from '../../../common';
-import Router from './Router';
+import Base from './Base';
+import common from '../../../common';
+import Router from './Router';
 import Vue from 'vue';
 const Button = function (source, router) {
   var rtn = {
@@ -15,7 +15,7 @@ const Button = function (source, router) {
     },
     set label(v) {
       source.controlLabel = v;
-    },
+    },
     get routerKey() {
       return source.routerKey;
     },
@@ -24,8 +24,8 @@ const Button = function (source, router) {
         return router.isHyperLink;
       }
       return false;
-    },
-    get isSearchRouterKey() {
+    },
+    get isSearchRouterKey() {
       if (source.controlType == 16 && source.routerKey) {
         return true;
       }
@@ -48,10 +48,10 @@ const Button = function (source, router) {
     get borderColor() {
       return source.borderColor ? source.borderColor + '' : (source.bgColor ? source.bgColor + '' : '');
     },
-    icon: '',
-    getApiData(callback, field) {
+    icon: '',
+    getApiData(callback, field) {
       var params = {
-        action: field.actionForSearch,
+        action: field.actionForSearch,
         para: {
           searchFields: field.getSearchPara(),
           pageAttribute: {
@@ -59,11 +59,11 @@ const Button = function (source, router) {
           },
           flagSearch: true
         }
-      };
+      };
       Vue.prototype.$api.postHandler(common.globalUri(), params).then((response) => {
-        if (response.rtnCode === 200) {
-          var Buttons = [];
-          if (response.content.toolButtons) {
+        if (response.rtnCode === 200) {
+          var Buttons = [];
+          if (response.content.toolButtons) {
             response.content.toolButtons.forEach((v) => {
               var button = Router(v);
               button.is = "ct-btn";
@@ -72,11 +72,11 @@ const Button = function (source, router) {
                 class: 'max-btn-gray'
               }
               Buttons.push(button);
-            });
-          }
+            });
+          }
           callback(response.content, Buttons);
         }
-      });
+      });
     },
   };
   if(router){

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

@@ -1,5 +1,5 @@
 import base from '../../index';
-import Base from './Base';
+import Base from './Base';
 
 const PlaceHolder = function (source) {
   var rtn = {
@@ -14,4 +14,4 @@ const PlaceHolder = function (source) {
   return rtn;
 };
 
-export default PlaceHolder;
+export default PlaceHolder;

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

@@ -6,7 +6,7 @@ import common from '../../../common';
 import Vue from 'vue';
 const Sos = function (source, moreActionRouter) {
   var rtn = {
-    options: [{ code: source.code1, name: source.name1 }],
+    options: [{ code: source.code1, name: source.name1 }],
     enableRelationFields: true,
     get text() {
       if (source.isList && source.name1 && rtn.attrs.placeholder && rtn.displayLabelAfterSelected) {
@@ -31,7 +31,7 @@ const Sos = function (source, moreActionRouter) {
     },
     get parentName() {
       return source.parentField;
-    },
+    },
     reset() {
       this.value = this.defaultValue;
       this.text = this.defaultText;

package/src/centaline/templateControls/src/dynamicTableCurrency.vue

@@ -34,7 +34,7 @@
   </div>
 </template>
 
-<script>
+<script>
   import Cookies from 'js-cookie';
   export default {
     name: 'ct-tablecurrency',
@@ -67,8 +67,8 @@
         return false;
       },
     },
-    created() {
-      this.isVisited();
+    created() {
+      this.isVisited();
     },    
     data() {
       return {
@@ -98,8 +98,8 @@
         }
         this.labelColor='mazarine'
 
-      },
-      isVisited() {
+      },
+      isVisited() {
         var key = this.router.action + this.rowData.chanceID;
         if (typeof Cookies.get(key) !== "undefined") {
           this.labelColor = 'mazarine'

package/src/main.js

@@ -14,14 +14,14 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
+  baseUrl: "http://10.88.22.66:17070/max-uplink-api/",
   // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
   // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
-  // baseUrl: "http://10.25.10.63:9999/service-api/v1/form/router",
+  // baseUrl: "http://10.25.10.67:9999/service-api/v1/form/router",
   // baseUrl: "http://10.25.10.67:8080/",
   // baseUrl: "http://10.88.22.42:9999/service-api/v1/form/router", 
   // baseUrl: "http://10.88.22.69:8080/api/", 
-  // baseUrl: "http://10.88.22.16:8080/",
+  // baseUrl: "http://10.88.22.40:8080/api/",
   // baseUrl: "http://10.58.2.108:8080/",
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // baseUrl: "http://tjcpuat.centaline.com.cn:9090/",
@@ -37,9 +37,6 @@ Vue.use(centaline, {
     openTabSearch: function (field, submitData) {
       alert("打开tab页Search:" + field.action)
     },
-    openTabSearchRouter: function (action) {
-      alert("打开tab页:" + action)
-    },
     openDetail: function (action) {
       alert("打开tab页:" + action)
     },
@@ -56,16 +53,16 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'aed9a1f3-c668-4d9e-aa6d-47ebe2b4eedb',
+        oldToken: '11c12506-253c-4995-83fb-84cf51cb23a0',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
-        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOgzAQBe_impVs72Kv6bANTQ6BDDYSqaIAUqIod89HSZc-U7ximnk3se6jaETkVlLoEUKna6Boa2h7y-ADs_TaInke3Af4MV8GpchZZTponQ1AhhBYBYZAJlAfOww-ikqUy0k0yjiUaJhcJZa0vYV2taSX2NdyPpTrP84dt-WZtTmnWU8IM08aqB41sEYNORuZik0qWxT3BwAAAP__.OaHsKNbZPKHHLfNzajh-v0slwZc0WeyUnjVhsMXKtkE"}',
+        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrsOgkAQRf9laibZx7A7Qwez0PgRBGFNsDICicb472rUzt5T3OI0595g2fZQQeLakHYetXUlUool1l1kbJTZNC56ariXD_hjvvTWkkQbWqwlKlIgj2yVUSkodan12iQoIF9OUNkgnmJJxhQwD-tbeBbzEtuSz7t8_ce54zo_sy6MPHkJmMkOSG6aULwzGETyQcxI1ka4PwAAAP__.JHGPVLXu2vkxt79ZfugBlTdpl7tarN5jqYRkEyWZ8Kc"}',
 
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201806071109550C867184E8BCA56EC3","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"}',
         estateId: '201806071109550C867184E8BCA56EC3',
 
-        // authObject: '{"currentEstate":{},"platform":1,"osVersion":"","clientVersion":"","machineCode":"470cac848b892484b949c6135dff97d6","token":"","random":"IVMfRJ","time":1689822719042,"sign":"19a04c54292bd44dfa5187983e27c530"}',
-        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6Ijc5OTlkYWY4LTAzN2ItNDMyMi1iMTRmLTA1OGU4OTgxMzk3OCJ9.6ltiN_svSpuTIi45IHktKTVZLpP2Y1w3oJsjPGFKaNaZ51XDvhhqkEe_0GhnNsJWLxQc4FX4Lpfhgne0SmJjHA',
+        // authObject: '{"currentEstate":{"estateId":"20191114134322C29C9B83A84F192964","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"ce04f173da7df2e78a9da25595111387","token":"","random":"XNEYyu","time":1683686365201,"sign":"79be68006872c6a088eb49f7e3dab45a"}',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjYyOTk5ZDhjLTYwY2MtNGM0OS05MzM4LWY1MTBhNjI5OGVjYiJ9.A7lCMb4mBHjse6DlvFLVV5jEQSWzREtlbeZJ6StCW4kVyyRG4RlkhRl2FJvaBZEdtoEItI52IEgBsX4X_H1m4w',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作