centaline-data-driven 1.4.85 → 1.4.87

package/package.json

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

package/src/SearchList.vue

@@ -4,10 +4,10 @@
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
     
-    <!-- <ct-searchlist :apiParam="para"
+    <ct-searchlist :apiParam="para"
       :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" 
       :searchDataApi="'/api/third-dept-tran/tran-list'">
-    </ct-searchlist> -->
+    </ct-searchlist>
 
 
     <!-- <ct-searchlist :apiParam="para"
@@ -28,11 +28,11 @@
       :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'">
     </ct-searchlist> -->
 
-    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
+    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
       :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
       :searchStatsApi="'/PropertyRETList/getListStats'">
-    </ct-searchlist>
+    </ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyOFIList/getListOfSearchModel'"

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

@@ -24,7 +24,7 @@
          @keydown.down="rowKeyDownHandle($event, 1)" tabindex="-1">
       <div class="ct-table-content" v-if="!isLayout">
         <table border="0" cellpadding="0" cellspacing="0"
-               :class="['ct-table', model.attrs.size ? 'ct-table-' + model.attrs.size : '',]">
+               :class="['ct-table', model.attrs.size ? 'ct-table-' + model.attrs.size : '',leftShadow>-1 || rightShadow>-1 ? 'ct-table-Shadow' : '',]">
           <!--表头-->
           <thead ref="tableHead" class="right-no-fixation-th">
             <tr class="ct-tr" ref="headTr" v-for="(columns, columnsIndex) in model.columnsArr" :key="columnsIndex">
@@ -1813,6 +1813,9 @@ export default {
   min-width: 100%;
   border-collapse: collapse;
 }
+.ct-searchtable .ct-table-Shadow {
+  border-collapse: separate;
+}
 
 .ct-searchtable .ct-table th {
   background-color: #f4f7fa !important;
@@ -1846,7 +1849,7 @@ export default {
 }
 
 .shadowLeft {
-  border-right: 1px solid #e7e8eb;
+  /* border-right: 1px solid #e7e8eb; */
   box-shadow: 2px 0 3px -1px rgba(0, 0, 0, 0.1);
 }
 

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

@@ -246,7 +246,8 @@
         var option = this.globalOptions.find((v) => { return v[self.model.optionAttrs.value] === value });
         if (option) {
           return option[self.model.optionAttrs.label];
-        } else {
+        } 
+        else {
           return "";
         }
       },

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

@@ -49,6 +49,11 @@ const Tags = function (source, moreActionRouter) {
         var tempV1 = JSON.parse(source.code1);
         tempV1.forEach((v1) => {
           if (v.findIndex((op) => { return op[rtn.optionAttrs.value] === v1[rtn.optionAttrs.value] }) !== -1) {
+            v.forEach((op)=>{
+              if(op[rtn.optionAttrs.value] === v1[rtn.optionAttrs.value]){
+                v1[rtn.optionAttrs.label] = op[rtn.optionAttrs.label];
+              }
+            });
             v1[rtn.optionAttrs.flagDeleted] = false;
             v.splice(v.findIndex((op) => { return op[rtn.optionAttrs.value] === v1[rtn.optionAttrs.value] }), 1);
           }
@@ -74,8 +79,7 @@ const Tags = function (source, moreActionRouter) {
       }
       return '';
     },
-    get labelValue() {
-     
+    get labelValue() {     
       if (source.code1) {
         var rtnLabelValue = '';
         JSON.parse(source.code1).forEach((op) => {

package/src/main.js

@@ -12,14 +12,14 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: "http://10.88.22.13:7070/max-uplink-api/v1/form/router",
+  // baseUrl: "http://10.88.22.13:9004/max-uplink-api/v1/form/router",
   // baseUrl: "http://10.6.1.162:17070/max-uplink-api/v1/form/router",
   // baseUrl: "http://10.25.10.63:9999/v1/form/router",
   // baseUrl: "http://10.88.22.42:9999/v1/form/router", 
   // baseUrl: "http://10.88.22.69:8080/api/", 
   // baseUrl: "http://10.88.22.40:8080/api/",
-  // baseUrl: "http://tjcptest.centaline.com.cn/", 
-  // flagRouterSelf: true,
+  baseUrl: "http://tjcptest.centaline.com.cn/", 
+  flagRouterSelf: true,
   zindex: 999,
   showRequestSuccessMessage: true,
   showRequestErrorMessage: true,
@@ -47,8 +47,8 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '038e4dcf-1976-4fca-a66a-93611ea1b18c',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEzksKwjAUheG9ZOyF5L7jLG3sxEWI1RR0JFZBEfduxUU4_Qb_Oa8w38ewDhlNnZmg33QEXItBpylCr7lI8YLayU4HqYhmQDY49CkSIJYK0asNVCmrxV3lXByX0kJLCdMGvKMCKOxMg3A2CavQHpewTuqJRKPQKpz2tx-gZv3CfW7XbXv-49z5dlpmR0t8lDiBWGvAqSnsZZogjkqCaTocyMP7AwAA__8.S8HluKh69E2SDbM5s5Ff9U6dYD3vC_g9UbVQZOyLRGM',
+        oldToken: '6353c005-4466-4fc6-b6f6-fb4f88c03f8a',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZM4zOzujJ0u2HgIssAWWBmBRGO8uxqho_cVr3jN_08Y5xb2EBZwQyuNLeCGVhoisUC-xoOFiOKFUSkqRvFRTlXN8VhBAfl-hT15JXZm7AoY0vQLZWD3DfOYb-f8-Me5yzR8Zn2nLoeUsCXuUUgVVazDMgnt2Po2iIfXGwAA__8.HBO2CVtY9G5noVhElgHNtMUaUzW8DY-BlKm3gGLL6uM',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',