centaline-data-driven 1.5.89 → 1.5.91

package/package.json

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

package/release-log.md

@@ -1,3 +1,16 @@
+# v1.5.91
+2024-01-03
+
+bug修复
+
+表格刷新列， 重置时，统计栏条件未带过去
+
+# v1.5.90
+2024-01-03
+优化
+
+列表行样式优化
+
 # v1.5.89
 2023-12-29
 优化

package/src/SearchList.vue

@@ -30,6 +30,9 @@
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/distribution/standing-book/layout'"  :searchDataApi="'/api/distribution/standing-book/list'"></ct-searchlist> -->
 
 
+    <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/agentuserlist/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/agentuserlist/getList'"></ct-searchlist>
+
+
     <!-- <ct-searchlist :apiParam="para"
       :searchConditionApi="'/api/transaction/adjustRecord/getLayoutOfSearch'" 
       :searchDataApi="'/api/transaction/adjustRecord/getTableList'">

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

@@ -648,7 +648,7 @@ export default {
       
       this.model.getPage(index, next);
       self.$nextTick(() => {
-        self.loadStats();
+       // self.loadStats();
       });
     },
     toSort(ev, col, action) {
@@ -2157,6 +2157,8 @@ export default {
         self.scrollTop = 0;
         self.scrollLeft = 0;
       }
+      let searchStats = this.$refs.tableStats.getsearchStats(); 
+    
       if (data) {
         self.loaderObj.SearchTable(data, self.load, self.model.searchModel, true, false, null, self.api)
       }
@@ -2165,6 +2167,7 @@ export default {
       }
       this.updateTableColumnsKey = this.updateTableColumnsKey + 1;
       this.model.toolbarKey = this.updateTableColumnsKey;
+      self.model.searchStats = searchStats;
     },
     popupClickHandler() {
       var tempListData = this.model.getSelectRowData({ isMulti: this.model.isMulti });
@@ -2312,7 +2315,7 @@ export default {
   padding: 2px 20px;
   cursor: default;
   background-color: #ffffff;
-  color: var(--centalineBlack);
+  // color: var(--centalineBlack);
 }
 
 .ct-searchtable .ct-tr>.ct-td1 {

package/src/centaline/dynamicSearchList/src/dynamicTableStats.vue

@@ -1,13 +1,9 @@
 <template>
-  <div class="ct-table-Statistics" :class="[flagDisabled?'domDisabled':'']" ref="tableStatistics">
+  <div class="ct-table-Statistics" :class="[flagDisabled ? 'domDisabled' : '']" ref="tableStatistics">
     <!--计算占用宽度-->
     <div style="position: relative" v-if="FlagStatistics">
       <div style="position: absolute; left: -10000px" class="tab-list">
-        <label
-          v-for="(item, index) in data"
-          class="btnTab"
-          :ref="'StatisticsItem' + index"
-        >
+        <label v-for="(item, index) in data" class="btnTab" :ref="'StatisticsItem' + index">
           {{ item.controlLabel }}
         </label>
       </div>
@@ -15,109 +11,78 @@
     <!--展示-->
     <div v-if="FlagStatistics" class="tab-list">
       <template v-if="showData.length === 1">
-        <div
-          v-for="(item, index) in showData[0]"
-          @click="handleClick($event, item,true)"
-        >
+        <div v-for="(item, index) in showData[0]" @click="handleClick($event, item, true)">
           <ul class="btnTab">
-            <div :style="{'width':(item.width ? item.width + 'px' : '' )}">
-            <li
-              :class="[
-                selectStats ==item.key
+            <div :style="{ 'width': (item.width ? item.width + 'px' : '') }">
+              <li :class="[
+                selectStats == item.key
                   ? 'activecolor'
                   : '',
-              ]"
-            >
-              {{ item.controlLabel }}
-            </li>
-            <li class="tdcenter">
-              <span
-                :class="[
+              ]">
+                {{ item.controlLabel }}
+              </li>
+              <li class="tdcenter">
+                <span :class="[
                   selectStats == item.key
                     ? 'active'
                     : '',
-                ]"
-              ></span>
-            </li>
-           </div>
+                ]"></span>
+              </li>
+            </div>
           </ul>
         </div>
       </template>
       <template v-else-if="showData.length > 1">
-        <div
-          v-for="(item, index) in showData[0]"
-          @click="handleClick($event, item,true)"
-        >
-          <ul class="btnTab" :style="{'width':(index == showData[0].length-1 ? lastWidth + 'px' : '' ),}">
-            <div :style="{'width':(item.width ? item.width + 'px' : '' ),'white-space': 'nowrap' }">
-            <li
-              :class="[
-                selectStats ==item.key
+        <div v-for="(item, index) in showData[0]" @click="handleClick($event, item, true)">
+          <ul class="btnTab" :style="{ 'width': (index == showData[0].length - 1 ? lastWidth + 'px' : ''), }">
+            <div :style="{ 'width': (item.width ? item.width + 'px' : ''), 'white-space': 'nowrap' }">
+              <li :class="[
+                selectStats == item.key
                   ? 'activecolor'
                   : '',
-              ]"
-            >
-              {{ item.controlLabel }}
-            </li>
-            <li class="tdcenter">
-              <span
-                :class="[
+              ]">
+                {{ item.controlLabel }}
+              </li>
+              <li class="tdcenter">
+                <span :class="[
                   selectStats == item.key
                     ? 'active'
                     : '',
-                ]"
-              ></span>
-            </li>
+                ]"></span>
+              </li>
             </div>
           </ul>
         </div>
-        <el-popover
-          :append-to-table="option.appendId ? option.appendId : ''"
-          class="Stats-popover more-dropdown"
-          popper-class="el-popover1"
-          :placement="option.placement ? option.placement : 'left'"
-          :trigger="option.trigger ? option.trigger : ''"
-        >
-          <div
-            v-if="FlagStatistics"
-            class="tab-list"
-            style="border-bottom: none"
-          >
-            <div
-              class="popovertablf"
-              v-for="(item, index) in showData[1]"
-              @click="handleClick($event, item,true,1,index)"
-            >
+        <el-popover :append-to-table="option.appendId ? option.appendId : ''" class="Stats-popover more-dropdown"
+          popper-class="el-popover1" :placement="option.placement ? option.placement : 'left'"
+          :trigger="option.trigger ? option.trigger : ''">
+          <div v-if="FlagStatistics" class="tab-list" style="border-bottom: none">
+            <div class="popovertablf" v-for="(item, index) in showData[1]"
+              @click="handleClick($event, item, true, 1, index)">
               <ul class="popoverbtnTab" style="padding: 0px">
-                <li
-                  :class="[
-                    selectStats == item.key
-                      ? 'activecolor'
-                      : '',
-                  ]"
-                >
+                <li :class="[
+                  selectStats == item.key
+                    ? 'activecolor'
+                    : '',
+                ]">
                   {{ item.controlLabel }}
                 </li>
                 <li class="tdcenter">
-                  <span
-                    :class="[
-                      selectStats == item.key
-                        ? 'active'
-                        : '',
-                    ]"
-                  ></span>
+                  <span :class="[
+                    selectStats == item.key
+                      ? 'active'
+                      : '',
+                  ]"></span>
                 </li>
               </ul>
               <br />
             </div>
           </div>
           <!-- <span slot="reference" class="icon-more"></span> -->
-          <span
-            slot="reference"
-            style="font-family: Comic Sans MS; font-size: 14px">
-			<!-- <div class="my-icon-more"></div> -->
+          <span slot="reference" style="font-family: Comic Sans MS; font-size: 14px">
+            <!-- <div class="my-icon-more"></div> -->
             <img :src="iconSort" alt="" width="100%" />
-			</span>
+          </span>
         </el-popover>
       </template>
     </div>
@@ -144,7 +109,7 @@ export default {
       selectStats: [],
       data: [],
       showData: [],
-      lastWidth:0,
+      lastWidth: 0,
       sortData: null,
       sliceIndex: null,
       flagClick: false,
@@ -155,7 +120,7 @@ export default {
         trigger: "click", //触发方式，传值可查看Popper UI组件trigger属性
         placement: "bottom-start", //方向，传值可查看Popper UI组件placement属性
       },
-	  iconSort: require("../../../assets/sort.png"),
+      iconSort: require("../../../assets/sort.png"),
     };
   },
   mounted() {
@@ -166,9 +131,9 @@ export default {
     });
   },
   methods: {
-    replabel(labelName){
-      let pattern =/（[^（）]*）$|\([^(（]*\)|$/; // 匹配最后一个括号及其内部内容
-       return labelName.replace(pattern, "");
+    replabel(labelName) {
+      let pattern = /（[^（）]*）$|\([^(（]*\)|$/; // 匹配最后一个括号及其内部内容
+      return labelName.replace(pattern, "");
     },
     load(data) {
       var self = this;
@@ -176,22 +141,22 @@ export default {
       self.FlagStatistics = false;
       // self.data = data.source.content;
       self.selectVa = "";
-     if (data.source.content.length > 0) {
+      if (data.source.content.length > 0) {
         if (self.sortData == null) {
           self.sortData = {};
-          data.source.content.forEach((item, index) => { 
+          data.source.content.forEach((item, index) => {
             item.sort = index;
-            item.key=item.fieldName1 + "*" + self.replabel(item.controlLabel);
+            item.key = item.fieldName1 + "*" + self.replabel(item.controlLabel);
             self.sortData[item.key] = index;
           });
         }
         else {
           data.source.content.forEach((item, index) => {
-            item.key=item.fieldName1 + "*" + self.replabel(item.controlLabel);
-            if(self.sortData[item.key]==undefined){
+            item.key = item.fieldName1 + "*" + self.replabel(item.controlLabel);
+            if (self.sortData[item.key] == undefined) {
               item.sort = index;
-            }else{      
-             item.sort = self.sortData[item.key];
+            } else {
+              item.sort = self.sortData[item.key];
             }
           }
           );
@@ -205,12 +170,12 @@ export default {
         });
         self.data = data.source.content;
         let i = self.data.findIndex(
-          (v) => self.selectStats === v.key 
+          (v) => self.selectStats === v.key
         );
         if (i == -1 || self.selectStats == []) {
           self.handleClick(null, self.data[0], false);
         }
-    
+
         self.FlagStatistics = true;
         self.showStats();
       }
@@ -222,45 +187,43 @@ export default {
           var showIndex = 0;
           var sumWidth = 0;
           for (var i = 0; i < self.data.length; i++) {
-            self.data[i].width= self.$refs["StatisticsItem" + i][0].getBoundingClientRect().width-36;
+            self.data[i].width = self.$refs["StatisticsItem" + i][0].getBoundingClientRect().width - 36;
           }
-          
-          if(self.flagClick&&self.sliceIndex!==null)
-          {
-            showIndex= self.sliceIndex;
+
+          if (self.flagClick && self.sliceIndex !== null) {
+            showIndex = self.sliceIndex;
           }
-          else
-          {
+          else {
             for (var i = 0; i < self.data.length; i++) {
-            var moreWidth = 20;
-            // sumWidth =
-            //   sumWidth + self.$refs["StatisticsItem" + i][0].offsetWidth;
+              var moreWidth = 20;
+              // sumWidth =
+              //   sumWidth + self.$refs["StatisticsItem" + i][0].offsetWidth;
               sumWidth += self.$refs["StatisticsItem" + i][0].getBoundingClientRect().width;
-              sumWidth = Math.ceil(sumWidth * 100) / 100 ;
-            var nextWidth = 0;
-            if (i + 1 < self.data.length) {
-              try {
-                // nextWidth = self.$refs["StatisticsItem" + (i + 1)][0].offsetWidth;
-                nextWidth = self.$refs["StatisticsItem" + (i + 1)][0].getBoundingClientRect().width;
-                nextWidth = Math.ceil(nextWidth * 100) / 100;
-              } catch (e) {}
-            } else {
-              moreWidth = 0;
+              sumWidth = Math.ceil(sumWidth * 100) / 100;
+              var nextWidth = 0;
+              if (i + 1 < self.data.length) {
+                try {
+                  // nextWidth = self.$refs["StatisticsItem" + (i + 1)][0].offsetWidth;
+                  nextWidth = self.$refs["StatisticsItem" + (i + 1)][0].getBoundingClientRect().width;
+                  nextWidth = Math.ceil(nextWidth * 100) / 100;
+                } catch (e) { }
+              } else {
+                moreWidth = 0;
+              }
+              if (self.showWidth - i < sumWidth + moreWidth) {
+                showIndex = i;
+                break;
+              } else if (self.showWidth - i < nextWidth + moreWidth) {
+                showIndex = i + 1;
+                break;
+              }
             }
-            if (self.showWidth -i < sumWidth + moreWidth) {
-              showIndex = i;
-              break;
-            } else if (self.showWidth -i < nextWidth + moreWidth) {
-              showIndex = i + 1;
-              break;
-            }
-          }
           }
           if (showIndex > 0) {
-            self.sliceIndex=showIndex;
-            const ExceptShowIndexWidth = self.$refs["StatisticsItem"+(showIndex)][0].offsetLeft;
-            const preShowIndexWidth =self.$refs["StatisticsItem" + (showIndex-1)][0].getBoundingClientRect().width;
-           self.lastWidth=self.showWidth-ExceptShowIndexWidth + preShowIndexWidth -20;
+            self.sliceIndex = showIndex;
+            const ExceptShowIndexWidth = self.$refs["StatisticsItem" + (showIndex)][0].offsetLeft;
+            const preShowIndexWidth = self.$refs["StatisticsItem" + (showIndex - 1)][0].getBoundingClientRect().width;
+            self.lastWidth = self.showWidth - ExceptShowIndexWidth + preShowIndexWidth - 20;
             self.showData = [
               self.data.slice(0, showIndex),
               self.data.slice(showIndex),
@@ -273,11 +236,25 @@ export default {
         self.$emit("setTableHeight");
       });
     },
-    handleClick(ev, obj, flagRefreshTable,type,index) {
+    handleClick(ev, obj, flagRefreshTable, type, index) {
       var self = this;
-      self.flagClick=true;
+      self.flagClick = true;
       self.FlagStatistics = false;
       self.selectStats = obj.key;
+
+      var model = this.getSearchFields(obj)
+      self.$emit("searchStats", model, flagRefreshTable);
+      if (type === 1) {
+        let lastItemIndex = self.showData[0].length - 1;
+        let lastItem = self.showData[0][lastItemIndex];
+        self.showData[0][lastItemIndex] = obj;
+        self.showData[1][index] = lastItem;
+        self.sortData[lastItem.key] = obj.sort;
+        self.sortData[obj.key] = lastItem.sort;
+      }
+    },
+    getSearchFields(obj) {
+      var self = this;
       var fields = self.model.searchData(
         obj.fieldName1,
         obj.code1,
@@ -287,21 +264,13 @@ export default {
       var model = {
         searchData: fields,
       };
-      self.$emit("searchStats", model, flagRefreshTable);
-      if (type===1) {
-       let lastItemIndex = self.showData[0].length - 1;
-       let lastItem = self.showData[0][lastItemIndex];
-       self.showData[0][lastItemIndex]=obj;
-       self.showData[1][index]=lastItem;
-       self.sortData[lastItem.key]=obj.sort;
-       self.sortData[obj.key]=lastItem.sort;
-      }
+      return model;
     },
-    searchStatsComplate(selectItem) {
+    searchStatsComplate() {
       var self = this;
       this.$nextTick(function () {
         if (typeof self.api !== "undefined") {
-          self.loaderObj.SearchStats(self.api, self.load, this.searchModel);
+          self.loaderObj.SearchStats(self.api, self.load, this.searchModel, null);
         }
         if (typeof self.source !== "undefined") {
           self.load(self.loaderObj.SearchStats(self.source));
@@ -311,24 +280,38 @@ export default {
         }
       });
     },
+    getsearchStats() {
+      var self = this;
+      let model = [];
+      if (this.selectStats != []) {
+        let n = self.data.find(
+          (v) => self.selectStats === v.key
+        );
+
+        if (n) {
+          model = self.getSearchFields(n);
+        }
+      }
+      return model;
+    }
   },
   watch: {
     showWidth: function (newVal, oldVal) {
-      this.sliceIndex=null;
+      this.sliceIndex = null;
       this.flagClick = false;
       this.showStats();
     },
   },
 };
 </script>
-<style>
-</style>
+<style></style>
 
 <style>
 .ct-table-Statistics {
   height: 20px;
   margin-bottom: 10px;
 }
+
 .tab-list {
   position: relative;
   margin-bottom: 10px;
@@ -419,12 +402,13 @@ export default {
   cursor: pointer;
 }
 
- .Stats-popover {
+.Stats-popover {
   /* float: left; */
   /* margin-top: 4px; */
   margin-left: 4px;
   height: 16px;
 }
+
 .more-dropdown {
   position: absolute;
   width: 16px;
@@ -434,6 +418,7 @@ export default {
   right: 0px;
   cursor: pointer;
 }
+
 .my-icon-more {
   width: 14px;
   height: 15px;

package/src/main.js

@@ -17,13 +17,13 @@ Vue.use(centaline, {
   // baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
   // baseUrl: "http://10.88.22.46:6060/onecard-api/",
   // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
-  baseUrl: "http://10.88.22.13:6060/onecard-api/",
+  // baseUrl: "http://10.88.22.13:6060/onecard-api/",
   // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
   // baseUrl: "http://10.25.10.63:22026/service-api/v1/form/router",
   // baseUrl: "http://10.25.10.67:8080/",
   // baseUrl: "https://ccesutest.centaline.com.cn/service-api/v1/form/router", 
   // baseUrl: "http://10.88.22.69:8080/api/", 
-  // baseUrl: "http://10.88.22.42:9999/service-api/",
+  baseUrl: "http://10.88.22.42:9999/service-api/",
   // baseUrl: "http://10.1.245.111:38028/",
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // baseUrl: "http://tjcpuat.centaline.com.cn:9090/",
@@ -60,11 +60,11 @@ Vue.use(centaline, {
         authObject: '{token:"1080-1740569404179091456"}',
 
         // originalRequestURL: 'http://10.88.22.67:8080',
-        EstateInfo: '{"estateId":"2209221422412F69767A067443EEAAD6","estateName":"U%E7%89%88%E6%B5%8B%E8%AF%95%E6%A5%BC%E7%9B%98%E6%A5%BC%E4%BB%B7"}',
+        EstateInfo: ' {"estateId":"20111129152318499305689117E3B934","estateName":"%E9%BC%8E%E5%B3%B0.%E5%9B%BD%E6%B1%87%E5%B1%B1","estDeptPath":"009.010.007"}',
         estateId: '',
 
-        // authObject: '{"currentEstate":{"estateId":"2209221422412F69767A067443EEAAD6","estateName":"U%E7%89%88%E6%B5%8B%E8%AF%95%E6%A5%BC%E7%9B%98%E6%A5%BC%E4%BB%B7"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"9233406a0587299328ce14a5e25c25d0","token":"","random":"2rZX3X","time":1702453245882,"sign":"72a8148b2cb78d18103a52402a9794dd"}',
-        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImQyOGI3MDY4LWU2ZmEtNGE1ZS05NDQ4LThjMDNhMzdiYmEwMyJ9.jMT6z3DTexsztWQytc5UTLJUXOs-2dieFW397jNrfe5BfXzX50vY7qZsQ1ou1d0NfueYQzVMv9yOZqeX4q-tZQ',
+        authObject: '{"currentEstate":{"estateId":"20111129152318499305689117E3B934","estateName":"%E9%BC%8E%E5%B3%B0.%E5%9B%BD%E6%B1%87%E5%B1%B1","estDeptPath":"009.010.007"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"9233406a0587299328ce14a5e25c25d0","token":"","random":"v9WVnK","time":1703832144841,"sign":"425035fc7fbb05a157106ae015b0e184"}',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6Ijk5N2NhMDY3LWI2M2EtNGE0Mi1hOTczLTY0N2EzZTA2OTZiYyJ9.lh7zmru5RGWXyZq-DvFxt4squt0M7hokv5jmBIBENKeNnMfjRJ-AntnJW9YOvmwwjGvoSk3J885H03Wjed8Pug',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作