centaline-data-driven 1.5.36 → 1.5.37

package/package.json

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

package/release-log.md

@@ -1,14 +1,34 @@
-## v1.5.34
+## v1.5.37
+2023-07-17
+
+优化
+
+表单关闭tab优化
+
+合并行选择效果优化
+
+## v1.5.36
 2023-07-14
 
 bug修复
+
 树组件 展开聚焦下一级节点
 
+合并行bug处理
 
-优化
+code2赋值优化
 
 上传文件浏览状态下逻辑处理
 
+树组件赋值时新增非空优化
+
+树组件滚动条样式
+
+## v1.5.35
+2023-07-14
+
+优化
+
 树组件 层级多了，显示横向滚动条
 
 ## v1.5.34

package/src/SearchList.vue

@@ -6,7 +6,7 @@
     
     <!-- <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/third-dept-tran/profit-return/layout'"  :searchDataApi="'/api/third-dept-tran/profit-return'"></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> -->
 
@@ -71,6 +71,8 @@
     <!-- <ct-searchlist :searchConditionApi="'/DistrictList/getLayoutOfSearch'" :searchDataApi="'/DistrictList/getListOfSearchModel'"></ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/CustomerImportList/getLayoutOfSearch'" :searchDataApi="'/CustomerImportList/getListOfSearchModel'"></ct-searchlist> -->
+    
+    <ct-searchlist :searchConditionApi="'/CustomerList/getLayoutOfSearch'" :searchStatsApi="'/CustomerList/getListStats'" :searchDataApi="'/CustomerList/getListOfSearchModel'"></ct-searchlist>
 
     <!-- <ct-searchlist :searchConditionApi="'/CallTaskList/getLayoutOfSearch'" :searchDataApi="'/CallTaskList/getListOfSearchModel'"></ct-searchlist> -->
     

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

@@ -410,7 +410,8 @@
                           }
                           else {
                             if (self.$common.dialogList && self.$common.dialogList.List.length === 0  && self.openType !=='detail'
-                              && field.actionType && field.actionType===2 && data.notification !== 17) {
+                              && field.actionType && field.actionType===2 && data.notification !== 17 && data.notification !== 13
+                              && data.notification !== 14 && data.notification !== 15 && data.notification !== 16) {
                               if (typeof self.$common.getDataDrivenOpts().handler.closeTab === 'function') {
                                 self.$common.getDataDrivenOpts().handler.closeTab();
                               }

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

@@ -93,12 +93,15 @@
                   colHasWidth[colIndex],
                   model.tdClass,
                   rowindex === model.selectIndex ? 'select' : null,
+                  model.rowMergedColumns && model.rowMergedColumns.includes(column.id) 
+                  && row.$rowsMerged && row.$rowsMerged.includes(model.selectIndex) ? 'selectMerged' : null,
                   colIndex === leftShadow ? 'shadowLeft' : null,
                   colIndex === rightShadow ? 'shadowRight' : null,
                   column.fixed === 'left' ? 'left-fixation' : null,
                   column.width === undefined ? 'ct-table-auto' : null,
                   column.fixed === 'right' ? 'right-fixation' : null,
-                ]" v-bind="column.attrs">
+                ]" v-bind="column.attrs" :style="model.selectedRowBackColor && model.rowMergedColumns && model.rowMergedColumns.includes(column.id) 
+                  && row.$rowsMerged && row.$rowsMerged.includes(model.selectIndex) ? {'background-color':model.selectedRowBackColor+'!important'} : ''">
                 <!--操作列-->
                 <div v-if="column.id === 'operation'" class="div_allinline" :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'" style="float: left;">
                   <template v-for="(router, rowRouterIndex) in getRowRouterShow(row)" >
@@ -210,8 +213,8 @@ import dynamicElement from "../../mixins/dynamicElement";
 import dynamicTableTip from "./dynamicTableTip.vue";
 import dynamicTableToolbar from "./dynamicTableToolbar.vue";
 import dynamicTableStats from "./dynamicTableStats.vue";
-  import dynamicLayout from "../../dynamicLayout/src/dynamicLayout.vue";
-  import Cookies from 'js-cookie';
+import dynamicLayout from "../../dynamicLayout/src/dynamicLayout.vue";
+import Cookies from 'js-cookie';
 export default {
   name: "ct-searchtable",
   mixins: [dynamicElement],
@@ -822,7 +825,9 @@ export default {
       if (typeof this.$refs["rows." + index] !== "undefined" && this.currentRow !== this.$refs["rows." + index][0]) {
         if (this.currentRow !== null) {
           for (var i = 0; i < this.currentRow.children.length; i++) {
-            this.currentRow.children[i].style.backgroundColor = '';
+            if(!this.currentRow.children[i].classList.contains('selectMerged')){
+              this.currentRow.children[i].style.backgroundColor = '';
+            }
             this.currentRow.children[i].classList.remove("select");
           }
         }
@@ -2059,11 +2064,17 @@ export default {
 .ct-table .ct-td.select {
   background-color: #ecf5ff !important;
 }
-
 .ct-table .ct-tr:hover .ct-td.select {
   background-color: #ecf5ff !important;
 }
 
+.ct-table .ct-td.selectMerged {
+  background-color: #ecf5ff !important;
+}
+.ct-table .ct-tr:hover .ct-td.selectMerged {
+  background-color: #ecf5ff !important;
+}
+
 .ct-table .ct-td.asc>.caret-wrapper>.sort-caret.ascending {
   border-bottom-color: #409eff;
   top: 5px;

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

@@ -126,7 +126,9 @@ export default {
       if(firstLoad)
       {
        self.$nextTick(() => {
-       self.$refs.Tree.setCurrentKey(self.model.modeltree[0].code)
+        if (self.model.modeltree&&self.model.modeltree[0]&&self.model.modeltree[0].code) {
+          self.$refs.Tree.setCurrentKey(self.model.modeltree[0].code)
+        }
      });
      self.handleNodeClick(self.model.modeltree[0],true);
 
@@ -144,8 +146,7 @@ export default {
     handleNodeClick(data,formType) {
       this.foo();
       var self = this; 
-      if(formType)
-      {
+      if(data&&formType){
       self.$refs.Tree.setCurrentKey(data.code)
       }
       if (self.LastClickNode != data) {
@@ -153,11 +154,15 @@ export default {
         var rowRouter = self.model.rowSelectRouter;
         var SearchData = {};
         rowRouter.submitFormField.forEach(v => {
-          SearchData[v] = data[v];
+          if (data && data[v]) {
+            SearchData[v] = data[v];
+          }
         })
         this.model.getCurrentRowApiData(rowRouter.action, SearchData, function (rowdata) {
           var newdata = self.$common.deepClone(data);
-          newdata.rowRouter = rowdata
+          if (rowdata) {
+            newdata.rowRouter = rowdata
+          }
           self.$emit('loaded', newdata);
         });
       }
@@ -318,10 +323,22 @@ export default {
 .mytree {
   height: 100%;
 }
-.el-tree {
+.mytree .el-tree {
   min-width: 100%;
   display: inline-block;
 }
+.mytree::-webkit-scrollbar-thumb {
+  background-color: #bebebe;/* 设置滚动条滑块颜色 */
+    height: 5px;
+    border-radius: 4px;
+    display: block;
+}
+.mytree::-webkit-scrollbar {
+    width: 6px;  
+    height: 6px;   /* 设置滚动条高度 */
+    background-color: #f1f1f1;
+    display: block;
+}
 .mytree .el-tree-node.is-current>.el-tree-node__content {
   color: var(--centalineBlue) !important;
   background-color: #f5f7fa;

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

@@ -789,12 +789,14 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         });
       },
       _lastRowspan: null,
+      _lastRowIndex: null,
       //设置合并行
       setMergeRow(rows) {
         if (rtn.rowMergedColumns.length === 0) {
           return;
         }
         rtn._lastRowspan=null;
+        rtn._lastRowIndex=-1;
 
         for (let i = 0; i < rows.length; i++) {
           let row = rows[i];
@@ -814,16 +816,24 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             if (equalNum === rtn.rowMergedColumns.length) {
               row.$rowspan = 0;
               rtn._lastRowspan.$rowspan++;
-              // rtn._lastRowspan.$rowsMerged.push(i);
+              if(rtn._lastRowspan.$rowsMerged==undefined){
+                rtn._lastRowspan.$rowsMerged=[];
+                if(rtn._lastRowIndex>-1){
+                  rtn._lastRowspan.$rowsMerged.push(rtn._lastRowIndex);
+                }
+              }
+              rtn._lastRowspan.$rowsMerged.push(i);
             } 
             else {
               row.$rowspan = 1;
               rtn._lastRowspan = row;
+              rtn._lastRowIndex = i;
             }
           } 
           else {
             row.$rowspan = 1;
             rtn._lastRowspan = row;
+            rtn._lastRowIndex = i;
           }
         }
       },

package/src/main.js

@@ -14,7 +14,7 @@ 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.46: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.67:9999/service-api/v1/form/router",
@@ -23,7 +23,7 @@ Vue.use(centaline, {
   // baseUrl: "http://10.88.22.69:8080/api/", 
   // baseUrl: "http://10.88.22.40:8080/api/",
   // baseUrl: "http://10.58.2.108:8080/",
-  baseUrl: "http://tjcptest.centaline.com.cn/", 
+  // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // baseUrl: "http://tjcpuat.centaline.com.cn:9090/",
   flagRouterSelf: true,
   zindex: 999,
@@ -58,7 +58,7 @@ Vue.use(centaline, {
       return {
         oldToken: '17e65eee-8740-4808-8cf8-6f4cfdf871c3',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
-        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZMwu7O7M3TsAI2HIGAwwcoIJBrj3dUEO3tf8YvXvP-AZRuhgkbqkq3zaK0LyE0KWHdJMJtImV3ynKXXHfwxX3oi1kSxxVqTIUf2KGSCxtG4a1pvuYECptsFKoqiXkOgUMA8rLsolT5iW6brYbr_49x5nd_ZkeWUlBVFPCFzCDjqkNB5d5TBiTIRPF8AAAD__w.NUV5u-NV_yD83ZMi_x8fsIEWKMLSe_dezqmRLaozgSY"}',
+        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgkAQRP_lajbhuN27XTtuDxo_ggA5EqyMQKIx_rsYtbN3iileMW_uZtkGczCJ6xK1daBNRYApENRtYIjKXMYqOIzcySfwo77prEUJ1jdQS1BAjw7YKoOiV2xT4zQmU5h8PZuD9SweUTwVZu7XNyBieoFtyZdjvv3j3Gmddy3ZTML9BOOAuzZL3sdGCyTi-zxRsCOZxxMAAP__.a6xuZjTna2q6Dinrhj_5n50l0kwxyYMZe_w-qdSqENc"}',
 
         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"}',

package/wwwroot/static/centaline/centaline-data-driven.js

@@ -5428,7 +5428,7 @@ module.exports = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABX
 "use strict";
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicForm_vue__ = __webpack_require__(188);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_d6fd77bc_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicForm_vue__ = __webpack_require__(488);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_81c690b6_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicForm_vue__ = __webpack_require__(488);
 function injectStyle (ssrContext) {
   __webpack_require__(482)
 }
@@ -5448,7 +5448,7 @@ var __vue_scopeId__ = null
 var __vue_module_identifier__ = null
 var Component = normalizeComponent(
   __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicForm_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_d6fd77bc_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicForm_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_81c690b6_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicForm_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -16670,7 +16670,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 "use strict";
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicSearchTable_vue__ = __webpack_require__(163);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_0b592163_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTable_vue__ = __webpack_require__(454);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_712338f1_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTable_vue__ = __webpack_require__(454);
 function injectStyle (ssrContext) {
   __webpack_require__(416)
 }
@@ -16690,7 +16690,7 @@ var __vue_scopeId__ = null
 var __vue_module_identifier__ = null
 var Component = normalizeComponent(
   __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicSearchTable_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_0b592163_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTable_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_712338f1_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTable_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -16925,6 +16925,9 @@ var Component = normalizeComponent(
 //
 //
 //
+//
+//
+//
 
 
 
@@ -17506,7 +17509,9 @@ var Component = normalizeComponent(
       if (typeof this.$refs["rows." + index] !== "undefined" && this.currentRow !== this.$refs["rows." + index][0]) {
         if (this.currentRow !== null) {
           for (var i = 0; i < this.currentRow.children.length; i++) {
-            this.currentRow.children[i].style.backgroundColor = '';
+            if (!this.currentRow.children[i].classList.contains('selectMerged')) {
+              this.currentRow.children[i].style.backgroundColor = '';
+            }
             this.currentRow.children[i].classList.remove("select");
           }
         }
@@ -23258,7 +23263,7 @@ module.exports = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAANEAAADICAYAAAB2
                             self.init();
                           });
                         } else {
-                          if (self.$common.dialogList && self.$common.dialogList.List.length === 0 && self.openType !== 'detail' && field.actionType && field.actionType === 2 && data.notification !== 17) {
+                          if (self.$common.dialogList && self.$common.dialogList.List.length === 0 && self.openType !== 'detail' && field.actionType && field.actionType === 2 && data.notification !== 17 && data.notification !== 13 && data.notification !== 14 && data.notification !== 15 && data.notification !== 16) {
                             if (typeof self.$common.getDataDrivenOpts().handler.closeTab === 'function') {
                               self.$common.getDataDrivenOpts().handler.closeTab();
                             }
@@ -34753,12 +34758,14 @@ var SearchTable = function SearchTable(data, callBack, searchModel, flagSearch,
       },
 
       _lastRowspan: null,
+      _lastRowIndex: null,
       //设置合并行
       setMergeRow: function setMergeRow(rows) {
         if (rtn.rowMergedColumns.length === 0) {
           return;
         }
         rtn._lastRowspan = null;
+        rtn._lastRowIndex = -1;
 
         for (var i = 0; i < rows.length; i++) {
           var row = rows[i];
@@ -34777,14 +34784,22 @@ var SearchTable = function SearchTable(data, callBack, searchModel, flagSearch,
             if (equalNum === rtn.rowMergedColumns.length) {
               row.$rowspan = 0;
               rtn._lastRowspan.$rowspan++;
-              // rtn._lastRowspan.$rowsMerged.push(i);
+              if (rtn._lastRowspan.$rowsMerged == undefined) {
+                rtn._lastRowspan.$rowsMerged = [];
+                if (rtn._lastRowIndex > -1) {
+                  rtn._lastRowspan.$rowsMerged.push(rtn._lastRowIndex);
+                }
+              }
+              rtn._lastRowspan.$rowsMerged.push(i);
             } else {
               row.$rowspan = 1;
               rtn._lastRowspan = row;
+              rtn._lastRowIndex = i;
             }
           } else {
             row.$rowspan = 1;
             rtn._lastRowspan = row;
+            rtn._lastRowIndex = i;
           }
         }
       },
@@ -42656,7 +42671,9 @@ var ctSpan = { //临时的span组件对象，用于vue双向绑定，强制更
                 self.menuVisible = false;
                 if (firstLoad) {
                   self.$nextTick(function () {
-                    self.$refs.Tree.setCurrentKey(self.model.modeltree[0].code);
+                    if (self.model.modeltree && self.model.modeltree[0] && self.model.modeltree[0].code) {
+                      self.$refs.Tree.setCurrentKey(self.model.modeltree[0].code);
+                    }
                   });
                   self.handleNodeClick(self.model.modeltree[0], true);
                 }
@@ -42680,7 +42697,7 @@ var ctSpan = { //临时的span组件对象，用于vue双向绑定，强制更
     handleNodeClick: function handleNodeClick(data, formType) {
       this.foo();
       var self = this;
-      if (formType) {
+      if (data && formType) {
         self.$refs.Tree.setCurrentKey(data.code);
       }
       if (self.LastClickNode != data) {
@@ -42688,11 +42705,15 @@ var ctSpan = { //临时的span组件对象，用于vue双向绑定，强制更
         var rowRouter = self.model.rowSelectRouter;
         var SearchData = {};
         rowRouter.submitFormField.forEach(function (v) {
-          SearchData[v] = data[v];
+          if (data && data[v]) {
+            SearchData[v] = data[v];
+          }
         });
         this.model.getCurrentRowApiData(rowRouter.action, SearchData, function (rowdata) {
           var newdata = self.$common.deepClone(data);
-          newdata.rowRouter = rowdata;
+          if (rowdata) {
+            newdata.rowRouter = rowdata;
+          }
           self.$emit('loaded', newdata);
         });
       }
@@ -48314,7 +48335,7 @@ var content = __webpack_require__(417);
 if(typeof content === 'string') content = [[module.i, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
-var update = __webpack_require__(2)("45a45888", content, true, {});
+var update = __webpack_require__(2)("4939c9f5", content, true, {});
 
 /***/ }),
 /* 417 */
@@ -48326,7 +48347,7 @@ exports = module.exports = __webpack_require__(1)(false);
 
 
 // module
-exports.push([module.i, ".ct-tableParent{overflow:auto;border-bottom:1px solid #ebeef5;width:100%;outline:0;border-top:1px solid #ebeef5}.ct-searchtable .ct-table{min-width:100%;border-collapse:collapse}.ct-searchtable .ct-table-Shadow{border-collapse:separate}.ct-searchtable .ct-table th{background-color:#f1f2f4!important}.ct-searchtable .ct-tr>.ct-td{padding:2px 20px;cursor:default;background-color:#fff;color:var(--centalineBlack)}.ct-searchtable .ct-tr>.ct-td1{border-right:1px solid #e7e8eb;border-left:1px solid #e7e8eb}.ct-searchtable .ct-tr:last-child>.ct-td1,.ct-searchtable .ct-tr>.ct-td2{border-bottom:1px solid #e7e8eb}.ct-searchtable .ct-tr>.ct-td3{border:1px solid #e7e8eb}.shadowLeft{-webkit-box-shadow:2px 0 3px -1px rgba(0,0,0,.1);box-shadow:2px 0 3px -1px rgba(0,0,0,.1)}.shadowRight{-webkit-box-shadow:-2px 0 3px -1px rgba(0,0,0,.1);box-shadow:-2px 0 3px -1px rgba(0,0,0,.1)}.ct-searchtable body:last-child>.ct-td{border-bottom:0}.ct-searchtable .ct-tr>.ct-td.nowidth{white-space:nowrap}.ct-table{color:#1f2233;font-size:18px;line-height:40px;min-height:40px}.ct-table-mini{font-size:12px;line-height:26px;min-height:28px}.ct-table-small{font-size:14px;line-height:32px;min-height:32px}.ct-table-medium{font-size:16px;line-height:36px;min-height:36px}.ct-table .ct-td>.caret-wrapper{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:34px;width:10px;vertical-align:middle;cursor:pointer;overflow:initial;position:relative}.ct-table .ct-td>.caret-wrapper>.sort-caret{width:0;height:0;border:5px solid transparent;position:absolute;left:7px}.ct-table .ct-td>.caret-wrapper>.sort-caret.ascending{border-bottom-color:#c0c4cc;top:5px}.ct-table .ct-td>.caret-wrapper>.sort-caret.descending{border-top-color:#c0c4cc;bottom:7px}.ct-table .ct-td.select,.ct-table .ct-tr:hover .ct-td.select{background-color:#ecf5ff!important}.ct-table .ct-td.asc>.caret-wrapper>.sort-caret.ascending{border-bottom-color:#409eff;top:5px}.ct-table .ct-td.desc>.caret-wrapper>.sort-caret.descending{border-top-color:#409eff;bottom:7px}.ct-table .cell{text-overflow:ellipsis;overflow:hidden;overflow-wrap:break-word;word-wrap:break-word;-ms-word-break:break-all;word-break:break-all;word-break:break-word;-ms-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}.ct-table .lineFeedCell{min-width:40px}.ct-table .left-fixation,.ct-table .right-fixation{position:-webkit-sticky;position:sticky}.ct-table .left-fixation-th,.ct-table .right-fixation-th{position:-webkit-sticky;position:sticky;top:0;z-index:99}.ct-table .right-no-fixation-th{position:-webkit-sticky;position:sticky;top:0;z-index:50}.ct-table .checkbox-td{min-width:20px;width:20px;left:0}.ct-table .checkbox-td .checkbox-td-1{vertical-align:inherit}.tab-list{position:relative;margin-bottom:0!important;height:auto!important;display:block;padding-left:8px;padding-right:4px}.tab-list .subdiv_allinline{float:none;display:block;width:-webkit-fill-available;cursor:pointer}.div_allinline .Stats-popover{float:right;margin-top:3px;margin-left:0;height:16px}.icon-more{background:url(" + escape(__webpack_require__(418)) + ") no-repeat;background-size:100% 100%;width:16px;height:16px;display:table-caption;cursor:pointer}.el-popover1{min-width:inherit!important}.ct-searchtable .ct-search-table-tag{background-color:#fdf6ec;border-color:#faecd8;width:100%;-webkit-box-shadow:0 2px 10px 0 rgb(0 0 0/10%);box-shadow:0 2px 10px 0 rgb(0 0 0/10%);margin-bottom:4px}.theadLine{position:relative}.theadLine:before{position:absolute;top:50%;-webkit-transform:translatey(-50%);transform:translatey(-50%);right:0;content:\"\";width:1px;height:18px;background-color:#919296}.theadLine:last-child:before{width:0!important}.theadTitle{z-index:999;border-radius:4px;color:var(--centalineBlack);border:1px solid var(--centalineBlack);font-weight:500;white-space:nowrap}.box-card,.theadTitle{position:absolute;padding:1px 6px;background-color:#fff;font-size:12px}.box-card{z-index:1000;border-radius:4px;color:#606266;border:1px solid;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}", ""]);
+exports.push([module.i, ".ct-tableParent{overflow:auto;border-bottom:1px solid #ebeef5;width:100%;outline:0;border-top:1px solid #ebeef5}.ct-searchtable .ct-table{min-width:100%;border-collapse:collapse}.ct-searchtable .ct-table-Shadow{border-collapse:separate}.ct-searchtable .ct-table th{background-color:#f1f2f4!important}.ct-searchtable .ct-tr>.ct-td{padding:2px 20px;cursor:default;background-color:#fff;color:var(--centalineBlack)}.ct-searchtable .ct-tr>.ct-td1{border-right:1px solid #e7e8eb;border-left:1px solid #e7e8eb}.ct-searchtable .ct-tr:last-child>.ct-td1,.ct-searchtable .ct-tr>.ct-td2{border-bottom:1px solid #e7e8eb}.ct-searchtable .ct-tr>.ct-td3{border:1px solid #e7e8eb}.shadowLeft{-webkit-box-shadow:2px 0 3px -1px rgba(0,0,0,.1);box-shadow:2px 0 3px -1px rgba(0,0,0,.1)}.shadowRight{-webkit-box-shadow:-2px 0 3px -1px rgba(0,0,0,.1);box-shadow:-2px 0 3px -1px rgba(0,0,0,.1)}.ct-searchtable body:last-child>.ct-td{border-bottom:0}.ct-searchtable .ct-tr>.ct-td.nowidth{white-space:nowrap}.ct-table{color:#1f2233;font-size:18px;line-height:40px;min-height:40px}.ct-table-mini{font-size:12px;line-height:26px;min-height:28px}.ct-table-small{font-size:14px;line-height:32px;min-height:32px}.ct-table-medium{font-size:16px;line-height:36px;min-height:36px}.ct-table .ct-td>.caret-wrapper{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:34px;width:10px;vertical-align:middle;cursor:pointer;overflow:initial;position:relative}.ct-table .ct-td>.caret-wrapper>.sort-caret{width:0;height:0;border:5px solid transparent;position:absolute;left:7px}.ct-table .ct-td>.caret-wrapper>.sort-caret.ascending{border-bottom-color:#c0c4cc;top:5px}.ct-table .ct-td>.caret-wrapper>.sort-caret.descending{border-top-color:#c0c4cc;bottom:7px}.ct-table .ct-td.select,.ct-table .ct-td.selectMerged,.ct-table .ct-tr:hover .ct-td.select,.ct-table .ct-tr:hover .ct-td.selectMerged{background-color:#ecf5ff!important}.ct-table .ct-td.asc>.caret-wrapper>.sort-caret.ascending{border-bottom-color:#409eff;top:5px}.ct-table .ct-td.desc>.caret-wrapper>.sort-caret.descending{border-top-color:#409eff;bottom:7px}.ct-table .cell{text-overflow:ellipsis;overflow:hidden;overflow-wrap:break-word;word-wrap:break-word;-ms-word-break:break-all;word-break:break-all;word-break:break-word;-ms-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}.ct-table .lineFeedCell{min-width:40px}.ct-table .left-fixation,.ct-table .right-fixation{position:-webkit-sticky;position:sticky}.ct-table .left-fixation-th,.ct-table .right-fixation-th{position:-webkit-sticky;position:sticky;top:0;z-index:99}.ct-table .right-no-fixation-th{position:-webkit-sticky;position:sticky;top:0;z-index:50}.ct-table .checkbox-td{min-width:20px;width:20px;left:0}.ct-table .checkbox-td .checkbox-td-1{vertical-align:inherit}.tab-list{position:relative;margin-bottom:0!important;height:auto!important;display:block;padding-left:8px;padding-right:4px}.tab-list .subdiv_allinline{float:none;display:block;width:-webkit-fill-available;cursor:pointer}.div_allinline .Stats-popover{float:right;margin-top:3px;margin-left:0;height:16px}.icon-more{background:url(" + escape(__webpack_require__(418)) + ") no-repeat;background-size:100% 100%;width:16px;height:16px;display:table-caption;cursor:pointer}.el-popover1{min-width:inherit!important}.ct-searchtable .ct-search-table-tag{background-color:#fdf6ec;border-color:#faecd8;width:100%;-webkit-box-shadow:0 2px 10px 0 rgb(0 0 0/10%);box-shadow:0 2px 10px 0 rgb(0 0 0/10%);margin-bottom:4px}.theadLine{position:relative}.theadLine:before{position:absolute;top:50%;-webkit-transform:translatey(-50%);transform:translatey(-50%);right:0;content:\"\";width:1px;height:18px;background-color:#919296}.theadLine:last-child:before{width:0!important}.theadTitle{z-index:999;border-radius:4px;color:var(--centalineBlack);border:1px solid var(--centalineBlack);font-weight:500;white-space:nowrap}.box-card,.theadTitle{position:absolute;padding:1px 6px;background-color:#fff;font-size:12px}.box-card{z-index:1000;border-radius:4px;color:#606266;border:1px solid;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}", ""]);
 
 // exports
 
@@ -48961,11 +48982,14 @@ var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._sel
                 _vm.colHasWidth[colIndex],
                 _vm.model.tdClass,
                 rowindex === _vm.model.selectIndex ? 'select' : null,
+                _vm.model.rowMergedColumns && _vm.model.rowMergedColumns.includes(column.id) 
+                && row.$rowsMerged && row.$rowsMerged.includes(_vm.model.selectIndex) ? 'selectMerged' : null,
                 colIndex === _vm.leftShadow ? 'shadowLeft' : null,
                 colIndex === _vm.rightShadow ? 'shadowRight' : null,
                 column.fixed === 'left' ? 'left-fixation' : null,
                 column.width === undefined ? 'ct-table-auto' : null,
-                column.fixed === 'right' ? 'right-fixation' : null ],attrs:{"rowspan":_vm.tdRowspan(column, row)}},'td',column.attrs,false),[(column.id === 'operation')?_c('div',{staticClass:"div_allinline",class:column.autoRowHeight ? 'lineFeedCell' : 'cell',staticStyle:{"float":"left"}},[_vm._l((_vm.getRowRouterShow(row)),function(router,rowRouterIndex){return [(router.isCallTel)?[(!router.rightField || !row[router.rightField] || row[router.rightField] == 1)?_c(router.is,{key:rowRouterIndex,ref:'router'+router.id+rowindex,refInFor:true,tag:"component",attrs:{"rowData":row,"rowindex":rowindex,"vmodel":router,"api":_vm.model.optionApi},on:{"click":_vm.rolRouterClickHandler}}):_vm._e()]:[(!router.rightField || row[router.rightField] == 1)?_c('ct-tablecurrency',{key:rowRouterIndex,ref:'router' + router.id + rowindex,refInFor:true,attrs:{"rowData":row,"rowindex":rowindex,"isOperationalColumn":true,"router":router,"colValue":router.label},on:{"click":_vm.rolRouterClickHandler}}):_vm._e()]]}),_vm._v(" "),(_vm.getRowRouterDisplay(row).length > 0)?_c('el-popover',{ref:'popover' + rowindex,refInFor:true,staticClass:"Stats-popover",attrs:{"append-to-table":_vm.option.appendId ? _vm.option.appendId : '',"popper-class":"el-popover1","placement":_vm.option.placement ? _vm.option.placement : 'left',"trigger":_vm.option.trigger ? _vm.option.trigger : ''}},[_c('div',{staticClass:"tab-list",staticStyle:{"border-bottom":"none"}},[_vm._l((_vm.getRowRouterDisplay(row)),function(router,rowRouterIndex){return [(router.isCallTel)?[(!router.rightField || !row[router.rightField] || row[router.rightField] == 1)?_c(router.is,{key:rowRouterIndex,ref:'router'+router.id+rowindex,refInFor:true,tag:"component",attrs:{"rowData":row,"rowindex":rowindex,"vmodel":router,"api":_vm.model.optionApi},on:{"click":_vm.rolRouterClickHandler}}):_vm._e()]:[(!router.rightField || row[router.rightField] == 1)?_c('ct-tablecurrency',{key:rowRouterIndex,ref:'router' + router.id + rowindex,refInFor:true,attrs:{"rowData":row,"rowindex":rowindex,"isOperationalColumn":true,"router":router,"colValue":router.label,"isShowImg":false},on:{"click":_vm.rolRouterClickHandler}}):_vm._e()]]})],2),_vm._v(" "),_c('span',{staticClass:"icon-more",attrs:{"slot":_vm.getRowRouterDisplay(row).length > 0 ? 'reference' : ''},slot:_vm.getRowRouterDisplay(row).length > 0 ? 'reference' : ''})]):_vm._e()],2):(column.id === 'voice')?_c('ct-tablecurrency',{class:column.autoRowHeight ? 'lineFeedCell' : 'cell',attrs:{"isShowVoice":true,"router":column.router,"colValue":column.router.label,"rowindex":rowindex,"rowData":row},on:{"click":_vm.rolRouterClickHandler}}):(column.router)?[(column.router.rightField && row[column.router.rightField] === 0)?_c('div',{domProps:{"innerHTML":_vm._s(row[column.id])}}):_c('ct-tablecurrency',{ref:'router' + column.router.id + rowindex,refInFor:true,class:column.autoRowHeight ? 'lineFeedCell' : 'cell',attrs:{"rowindex":rowindex,"align":column.attrs.align,"router":column.router,"colValue":row[column.id],"rowData":row},on:{"click":_vm.rolRouterClickHandler}})]:(column.flagHtml)?_c('div',{class:column.autoRowHeight ? 'lineFeedCell' : 'cell',style:(column.style ? column.style : ''),domProps:{"innerHTML":_vm._s(row[column.id])}}):(typeof column.template === 'undefined')?_c('div',{class:column.autoRowHeight ? 'lineFeedCell' : 'cell',style:(column.style ? column.style : '')},[_vm._v("\n                "+_vm._s(_vm.$common.getDataOfUpperLower(row, column.id))+"\n              ")]):_vm._e()],2):_vm._e()})],2):_c('tr',{style:({ height: (row.$heigth || 31) + 'px' })})}))])]):_c('div',_vm._l((_vm.model.listData),function(row,rowindex){return _c('div',{key:rowindex},[_c('ct-layout',{key:_vm.tableComplate,ref:'layout' + rowindex,refInFor:true,attrs:{"vmodel":row,"cellLayout":_vm.model.cellLayout,"rowindex":rowindex,"actionRouter":_vm.model.actionRouter},on:{"click":_vm.rolRouterCellClickHandler}})],1)}))]):_vm._e(),_vm._v(" "),(!_vm.isLoading && !_vm.isLayout && _vm.model)?_c('ct-tabletip',{ref:"listFooter",staticClass:"ct-search-table-list-footer",attrs:{"tip":_vm.model.listFooter}}):_vm._e(),_vm._v(" "),(!_vm.isLoading && !_vm.isLayout && _vm.model)?_c('ct-tabletip',{ref:"footer",staticClass:"ct-search-table-footer",attrs:{"tip":_vm.model.footer}}):_vm._e(),_vm._v(" "),(_vm.flagPopupSearchlist)?_c('div',{ref:"popupButton",staticStyle:{"margin-top":"10px","width":"100%","display":"inline-block","height":"30px","margin-bottom":"10px"}},[_c('el-button',{staticClass:"max-search-btn",staticStyle:{"float":"right"},attrs:{"size":"mini","type":"primary"},on:{"click":function($event){_vm.popupClickHandler()}}},[_vm._v("\n      确认\n    ")])],1):_vm._e(),_vm._v(" "),(_vm.isLoading && _vm.searchLoading)?_c('div',{directives:[{name:"loading",rawName:"v-loading",value:(_vm.isLoading),expression:"isLoading"}],staticStyle:{"top":"30px"}}):_vm._e(),_vm._v(" "),_c('iframe',{staticStyle:{"height":"0px","width":"0px","border-width":"0px","position":"absolute","bottom":"0px","display":"none"},attrs:{"src":_vm.downloadUrl}})],1)}
+                column.fixed === 'right' ? 'right-fixation' : null ],style:(_vm.model.selectedRowBackColor && _vm.model.rowMergedColumns && _vm.model.rowMergedColumns.includes(column.id) 
+                && row.$rowsMerged && row.$rowsMerged.includes(_vm.model.selectIndex) ? {'background-color':_vm.model.selectedRowBackColor+'!important'} : ''),attrs:{"rowspan":_vm.tdRowspan(column, row)}},'td',column.attrs,false),[(column.id === 'operation')?_c('div',{staticClass:"div_allinline",class:column.autoRowHeight ? 'lineFeedCell' : 'cell',staticStyle:{"float":"left"}},[_vm._l((_vm.getRowRouterShow(row)),function(router,rowRouterIndex){return [(router.isCallTel)?[(!router.rightField || !row[router.rightField] || row[router.rightField] == 1)?_c(router.is,{key:rowRouterIndex,ref:'router'+router.id+rowindex,refInFor:true,tag:"component",attrs:{"rowData":row,"rowindex":rowindex,"vmodel":router,"api":_vm.model.optionApi},on:{"click":_vm.rolRouterClickHandler}}):_vm._e()]:[(!router.rightField || row[router.rightField] == 1)?_c('ct-tablecurrency',{key:rowRouterIndex,ref:'router' + router.id + rowindex,refInFor:true,attrs:{"rowData":row,"rowindex":rowindex,"isOperationalColumn":true,"router":router,"colValue":router.label},on:{"click":_vm.rolRouterClickHandler}}):_vm._e()]]}),_vm._v(" "),(_vm.getRowRouterDisplay(row).length > 0)?_c('el-popover',{ref:'popover' + rowindex,refInFor:true,staticClass:"Stats-popover",attrs:{"append-to-table":_vm.option.appendId ? _vm.option.appendId : '',"popper-class":"el-popover1","placement":_vm.option.placement ? _vm.option.placement : 'left',"trigger":_vm.option.trigger ? _vm.option.trigger : ''}},[_c('div',{staticClass:"tab-list",staticStyle:{"border-bottom":"none"}},[_vm._l((_vm.getRowRouterDisplay(row)),function(router,rowRouterIndex){return [(router.isCallTel)?[(!router.rightField || !row[router.rightField] || row[router.rightField] == 1)?_c(router.is,{key:rowRouterIndex,ref:'router'+router.id+rowindex,refInFor:true,tag:"component",attrs:{"rowData":row,"rowindex":rowindex,"vmodel":router,"api":_vm.model.optionApi},on:{"click":_vm.rolRouterClickHandler}}):_vm._e()]:[(!router.rightField || row[router.rightField] == 1)?_c('ct-tablecurrency',{key:rowRouterIndex,ref:'router' + router.id + rowindex,refInFor:true,attrs:{"rowData":row,"rowindex":rowindex,"isOperationalColumn":true,"router":router,"colValue":router.label,"isShowImg":false},on:{"click":_vm.rolRouterClickHandler}}):_vm._e()]]})],2),_vm._v(" "),_c('span',{staticClass:"icon-more",attrs:{"slot":_vm.getRowRouterDisplay(row).length > 0 ? 'reference' : ''},slot:_vm.getRowRouterDisplay(row).length > 0 ? 'reference' : ''})]):_vm._e()],2):(column.id === 'voice')?_c('ct-tablecurrency',{class:column.autoRowHeight ? 'lineFeedCell' : 'cell',attrs:{"isShowVoice":true,"router":column.router,"colValue":column.router.label,"rowindex":rowindex,"rowData":row},on:{"click":_vm.rolRouterClickHandler}}):(column.router)?[(column.router.rightField && row[column.router.rightField] === 0)?_c('div',{domProps:{"innerHTML":_vm._s(row[column.id])}}):_c('ct-tablecurrency',{ref:'router' + column.router.id + rowindex,refInFor:true,class:column.autoRowHeight ? 'lineFeedCell' : 'cell',attrs:{"rowindex":rowindex,"align":column.attrs.align,"router":column.router,"colValue":row[column.id],"rowData":row},on:{"click":_vm.rolRouterClickHandler}})]:(column.flagHtml)?_c('div',{class:column.autoRowHeight ? 'lineFeedCell' : 'cell',style:(column.style ? column.style : ''),domProps:{"innerHTML":_vm._s(row[column.id])}}):(typeof column.template === 'undefined')?_c('div',{class:column.autoRowHeight ? 'lineFeedCell' : 'cell',style:(column.style ? column.style : '')},[_vm._v("\n                "+_vm._s(_vm.$common.getDataOfUpperLower(row, column.id))+"\n              ")]):_vm._e()],2):_vm._e()})],2):_c('tr',{style:({ height: (row.$heigth || 31) + 'px' })})}))])]):_c('div',_vm._l((_vm.model.listData),function(row,rowindex){return _c('div',{key:rowindex},[_c('ct-layout',{key:_vm.tableComplate,ref:'layout' + rowindex,refInFor:true,attrs:{"vmodel":row,"cellLayout":_vm.model.cellLayout,"rowindex":rowindex,"actionRouter":_vm.model.actionRouter},on:{"click":_vm.rolRouterCellClickHandler}})],1)}))]):_vm._e(),_vm._v(" "),(!_vm.isLoading && !_vm.isLayout && _vm.model)?_c('ct-tabletip',{ref:"listFooter",staticClass:"ct-search-table-list-footer",attrs:{"tip":_vm.model.listFooter}}):_vm._e(),_vm._v(" "),(!_vm.isLoading && !_vm.isLayout && _vm.model)?_c('ct-tabletip',{ref:"footer",staticClass:"ct-search-table-footer",attrs:{"tip":_vm.model.footer}}):_vm._e(),_vm._v(" "),(_vm.flagPopupSearchlist)?_c('div',{ref:"popupButton",staticStyle:{"margin-top":"10px","width":"100%","display":"inline-block","height":"30px","margin-bottom":"10px"}},[_c('el-button',{staticClass:"max-search-btn",staticStyle:{"float":"right"},attrs:{"size":"mini","type":"primary"},on:{"click":function($event){_vm.popupClickHandler()}}},[_vm._v("\n      确认\n    ")])],1):_vm._e(),_vm._v(" "),(_vm.isLoading && _vm.searchLoading)?_c('div',{directives:[{name:"loading",rawName:"v-loading",value:(_vm.isLoading),expression:"isLoading"}],staticStyle:{"top":"30px"}}):_vm._e(),_vm._v(" "),_c('iframe',{staticStyle:{"height":"0px","width":"0px","border-width":"0px","position":"absolute","bottom":"0px","display":"none"},attrs:{"src":_vm.downloadUrl}})],1)}
 var staticRenderFns = []
 var esExports = { render: render, staticRenderFns: staticRenderFns }
 /* harmony default export */ __webpack_exports__["a"] = (esExports);
@@ -49566,7 +49590,7 @@ var content = __webpack_require__(483);
 if(typeof content === 'string') content = [[module.i, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
-var update = __webpack_require__(2)("6835b91f", content, true, {});
+var update = __webpack_require__(2)("0b9898c5", content, true, {});
 
 /***/ }),
 /* 483 */
@@ -57161,7 +57185,7 @@ var Component = normalizeComponent(
 "use strict";
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicTree_vue__ = __webpack_require__(268);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_66422a58_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicTree_vue__ = __webpack_require__(692);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_80e935fa_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicTree_vue__ = __webpack_require__(692);
 function injectStyle (ssrContext) {
   __webpack_require__(688)
 }
@@ -57181,7 +57205,7 @@ var __vue_scopeId__ = null
 var __vue_module_identifier__ = null
 var Component = normalizeComponent(
   __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicTree_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_66422a58_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicTree_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_80e935fa_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicTree_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -57202,7 +57226,7 @@ var content = __webpack_require__(689);
 if(typeof content === 'string') content = [[module.i, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
-var update = __webpack_require__(2)("7136d50a", content, true, {});
+var update = __webpack_require__(2)("95cd90bc", content, true, {});
 
 /***/ }),
 /* 689 */
@@ -57214,7 +57238,7 @@ exports = module.exports = __webpack_require__(1)(false);
 
 
 // module
-exports.push([module.i, ".mytree{height:100%}.el-tree{min-width:100%;display:inline-block}.mytree .el-tree-node.is-current>.el-tree-node__content{color:var(--centalineBlue)!important;background-color:#f5f7fa}.tree-line:first-child div{overflow:hidden}.el-tree-node{position:relative}.el-tree-node,.el-tree-node__children{padding-left:16px}.el-tree-node__content{padding-left:0!important;padding-right:2px!important}.el-tree-node:before{content:\"\";height:100%;width:1px;position:absolute;left:27px;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:15px}.el-tree-node:after{content:\"\";width:12px;height:20px;position:absolute;left:27px;top:12px;right:2px;border-width:1px;border-top:1px dashed #52627c}.el-tree-node__expand-icon{font-size:16px}.tree>.el-tree-node:first-child:after{border-top:none}.tree>.is-leaf{color:transparent}.el-tree .el-tree-node__expand-icon.expanded{-webkit-transform:rotate(0deg);transform:rotate(0deg)}.el-tree .el-icon-caret-right:before{background:url(" + escape(__webpack_require__(690)) + ") no-repeat;content:\"\";display:block;width:12px;height:12px;font-size:12px;background-size:10px}.el-tree .el-tree-node__expand-icon.expanded.el-icon-caret-right:before{background:url(" + escape(__webpack_require__(691)) + ") no-repeat;content:\"\";display:block;width:12px;height:12px;font-size:12px;background-size:10px}.el-tree .el-tree-node__expand-icon.is-leaf:before{background:transparent no-repeat 0 3px;content:\"\";display:block;width:12px;height:12px;font-size:12px;background-size:10px}.box-menu{width:150px;position:absolute;z-index:1000;background-color:#fff;-webkit-box-shadow:0 0 10px #ccc,0 0 20px #ccc,0 0 30px #ccc;box-shadow:0 0 10px #ccc,0 0 20px #ccc,0 0 30px #ccc;padding:10px}.box-menu div{cursor:pointer}.box-menu .opertion{cursor:pointer;line-height:30px}.box-menu .opertion:hover{color:var(--btnHoverRed)}", ""]);
+exports.push([module.i, ".mytree{height:100%}.mytree .el-tree{min-width:100%;display:inline-block}.mytree::-webkit-scrollbar-thumb{background-color:#bebebe;height:5px;border-radius:4px;display:block}.mytree::-webkit-scrollbar{width:6px;height:6px;background-color:#f1f1f1;display:block}.mytree .el-tree-node.is-current>.el-tree-node__content{color:var(--centalineBlue)!important;background-color:#f5f7fa}.tree-line:first-child div{overflow:hidden}.el-tree-node{position:relative}.el-tree-node,.el-tree-node__children{padding-left:16px}.el-tree-node__content{padding-left:0!important;padding-right:2px!important}.el-tree-node:before{content:\"\";height:100%;width:1px;position:absolute;left:27px;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:15px}.el-tree-node:after{content:\"\";width:12px;height:20px;position:absolute;left:27px;top:12px;right:2px;border-width:1px;border-top:1px dashed #52627c}.el-tree-node__expand-icon{font-size:16px}.tree>.el-tree-node:first-child:after{border-top:none}.tree>.is-leaf{color:transparent}.el-tree .el-tree-node__expand-icon.expanded{-webkit-transform:rotate(0deg);transform:rotate(0deg)}.el-tree .el-icon-caret-right:before{background:url(" + escape(__webpack_require__(690)) + ") no-repeat;content:\"\";display:block;width:12px;height:12px;font-size:12px;background-size:10px}.el-tree .el-tree-node__expand-icon.expanded.el-icon-caret-right:before{background:url(" + escape(__webpack_require__(691)) + ") no-repeat;content:\"\";display:block;width:12px;height:12px;font-size:12px;background-size:10px}.el-tree .el-tree-node__expand-icon.is-leaf:before{background:transparent no-repeat 0 3px;content:\"\";display:block;width:12px;height:12px;font-size:12px;background-size:10px}.box-menu{width:150px;position:absolute;z-index:1000;background-color:#fff;-webkit-box-shadow:0 0 10px #ccc,0 0 20px #ccc,0 0 30px #ccc;box-shadow:0 0 10px #ccc,0 0 20px #ccc,0 0 30px #ccc;padding:10px}.box-menu div{cursor:pointer}.box-menu .opertion{cursor:pointer;line-height:30px}.box-menu .opertion:hover{color:var(--btnHoverRed)}", ""]);
 
 // exports