centaline-data-driven 1.6.55 → 1.6.57

package/package.json

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

package/release-log.md

@@ -1,3 +1,25 @@
+# v1.6.57
+2025-11-07
+
+优化
+
+ActionType添加执行客户端函数ExcuteClientFunction
+
+BUG
+
+列表关闭右侧会出现滚动条处理
+
+# v1.6.56
+2025-10-24
+
+优化
+
+列表columns添加：分组Id（主要用于 单元格 数据点击事件 传给API，传输参数名为 columnGroupId）
+
+列表上的路由添加侧边栏打开
+
+表单通过js设置字段隐藏属性没有隐藏处理
+
 # v1.6.55
 2025-10-11
 

package/src/SearchList.vue

@@ -33,14 +33,17 @@
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customerquery/publiccustcalltaskreferrallist/getLayoutOfSearch'"  :searchDataApi="'/customerquery/publiccustcalltaskreferrallist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/agentuserlist/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/agentuserlist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/EntranceNoticeInfoList/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/EntranceNoticeInfoList/getList'"></ct-searchlist> -->
+    <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/squareuploadlist/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/squareuploadlist/getList'"></ct-searchlist>
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/commissionquery/properformanceszjjbreport/getLayoutOfSearch'"  :searchDataApi="'/commissionquery/properformanceszjjbreport/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/employeelist/getLayoutOfSearch'"  :searchDataApi="'/employeelist/getList'"></ct-searchlist> -->
-    <ct-searchlist :apiParam="para" :searchConditionApi="'/estatemanage/estatlist/getLayoutOfSearch'"  :searchDataApi="'/estatemanage/estatlist/getList'"></ct-searchlist>
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/estatemanage/estatlist/getLayoutOfSearch'"  :searchDataApi="'/estatemanage/estatlist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/system/AreaList/getLayoutOfSearch'"  :searchDataApi="'/system/AreaList/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/roomtypelist/getLayoutOfSearch'"  :searchDataApi="'/roomtypelist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/priceuploadlist/getLayoutOfSearch'"  :searchDataApi="'//salemattersmanage/priceuploadlist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/app/workbenchdetails/getContractLayoutOfSearch'"  :searchDataApi="'/app/workbenchdetails/getContractList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/selectionactivitymanage/EvaluationActWorksList/getLayoutOfSearch'"  :searchDataApi="'/selectionactivitymanage/EvaluationActWorksList/getListOfSearchModel'"></ct-searchlist> -->
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/financesalemanage/finContractList/getLayoutOfSearch'"  :searchDataApi="'/financesalemanage/finContractList/getList'"></ct-searchlist> -->
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/financecommissionmanage/fincommissionapplylist/getLayoutOfSearch'"  :searchDataApi="'/financecommissionmanage/fincommissionapplylist/getList'"></ct-searchlist> -->
     <!-- CCES -->
 
     <!-- <ct-searchlist :apiParam="para"
@@ -94,60 +97,36 @@
       :searchStatsApi="'/PropertyOFIList/getListStats'">
     </ct-searchlist> -->
 
-    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/EstateList/getLayoutOfSearch'" :searchDataApi="'/EstateList/getListOfSearchModel'"></ct-searchlist> -->
-    
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/EstateList/getLayoutOfSearch'" :searchDataApi="'/EstateList/getListOfSearchModel'"></ct-searchlist> -->    
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/EstateBuildingList/getLayoutOfSearch'" :searchDataApi="'/EstateBuildingList/getListOfSearchModel'"></ct-searchlist> -->
-
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/DistrictList/getLayoutOfSearch'" :searchDataApi="'/DistrictList/getListOfSearchModel'"></ct-searchlist> -->
-
-    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/CustomerImportList/getLayoutOfSearch'" :searchDataApi="'/CustomerImportList/getListOfSearchModel'"></ct-searchlist> -->
-    
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/CustomerImportList/getLayoutOfSearch'" :searchDataApi="'/CustomerImportList/getListOfSearchModel'"></ct-searchlist> -->    
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/CustomerList/getLayoutOfSearch'" :searchStatsApi="'/CustomerList/getListStats'" :searchDataApi="'/CustomerList/getListOfSearchModel'"></ct-searchlist> -->
-
-    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/CallTaskList/getLayoutOfSearch'" :searchDataApi="'/CallTaskList/getListOfSearchModel'"></ct-searchlist> -->
-    
-    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/RoleList/getLayoutOfSearch'" :searchStatsApi="'/RoleList/getListStats'" :searchDataApi="'/RoleList/getListOfSearchModel'"></ct-searchlist> -->
-  
-    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/TaskList/getLayoutOfSearch'" :searchStatsApi="'/TaskList/getListStats'" :searchDataApi="'/TaskList/getListOfSearchModel'"></ct-searchlist> -->
-    
-    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/PropertyVRRealLookBalanceList/getLayoutOfSearchForOFI'" :searchDataApi="'/PropertyVRRealLookBalanceList/getListOfSearchModel'"></ct-searchlist> -->
- 
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/CallTaskList/getLayoutOfSearch'" :searchDataApi="'/CallTaskList/getListOfSearchModel'"></ct-searchlist> -->    
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/RoleList/getLayoutOfSearch'" :searchStatsApi="'/RoleList/getListStats'" :searchDataApi="'/RoleList/getListOfSearchModel'"></ct-searchlist> -->  
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/TaskList/getLayoutOfSearch'" :searchStatsApi="'/TaskList/getListStats'" :searchDataApi="'/TaskList/getListOfSearchModel'"></ct-searchlist> -->    
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/PropertyVRRealLookBalanceList/getLayoutOfSearchForOFI'" :searchDataApi="'/PropertyVRRealLookBalanceList/getListOfSearchModel'"></ct-searchlist> --> 
     <!-- <ct-searchlist :apiParam="para" :appRootUrl="appRootUrl" :searchConditionApi="'/PropertyRealLookList/getLayoutOfSearch'" :searchDataApi="'/PropertyRealLookList/getListOfSearchModel'"></ct-searchlist> -->
-
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/SystemParameterList/getLayoutOfSearch'" :searchDataApi="'/SystemParameterList/getListOfSearchModel'"></ct-searchlist> -->
-
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/EmployeeResourcesTranList/getLayoutOfSearch'" :searchDataApi="'/EmployeeResourcesTranList/getListOfSearchModel'"></ct-searchlist> -->
+    <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'" :searchDataApi="'/propertyPublishList/getListOfSearchModel'" :searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist> -->
 
-
-    <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
-:searchDataApi="'/propertyPublishList/getListOfSearchModel'"
-:searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist> -->
-
-
-    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/cache/getLayoutOfSearchForCache'" :searchDataApi="'/cache/getListOfSearchModelForCache'"></ct-searchlist> -->
-    
+    <!-- onecard -->
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/cache/getLayoutOfSearchForCache'" :searchDataApi="'/cache/getListOfSearchModelForCache'"></ct-searchlist> -->    
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/AttendanceClassList/getLayoutOfSearch'" :searchDataApi="'/AttendanceClassList/getListOfSearchModel'"></ct-searchlist> -->
-
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/ReportMonthAttendanceList/getLayoutOfSearch'" :searchDataApi="'/ReportMonthAttendanceList/getListOfSearchModel'"></ct-searchlist> -->
-
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/ReportAttendanceExceptionList/getLayoutOfSearch'" :searchDataApi="'/ReportAttendanceExceptionList/getListOfSearchModel'"></ct-searchlist> -->
-
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/PersonHolidayList/getLayoutOfSearch'" :searchDataApi="'/PersonHolidayList/getListOfSearchModel'"></ct-searchlist> -->
-
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/EmployeeAttendanceBillList/getLayoutOfSearch'" :searchDataApi="'/EmployeeAttendanceBillList/getListOfSearchModel'"></ct-searchlist> -->
-
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/HolidayTypeList/getLayoutOfSearch'" :searchDataApi="'/HolidayTypeList/getListOfSearchModel'"></ct-searchlist> -->
-
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/SystemLogList/getLayoutOfSearch'" :searchDataApi="'/SystemLogList/getListOfSearchModel'"></ct-searchlist> -->
-
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/AttendanceBalanceAlertList/getLayoutOfSearch'" :searchDataApi="'/AttendanceBalanceAlertList/getListOfSearchModel'"></ct-searchlist> -->
-
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/ReportWorkQuantifyList/getLayoutOfSearch'" :searchDataApi="'/ReportWorkQuantifyList/getListOfSearchModel'"></ct-searchlist> -->
-
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/OvertimeList/getLayoutOfSearch'" :searchDataApi="'/OvertimeList/getListOfSearchModel'"></ct-searchlist> -->
-
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/TrainingAllowanceTotalList/getLayoutOfSearch'" :searchDataApi="'/TrainingAllowanceTotalList/getListOfSearchModel'"></ct-searchlist> -->
 
+    <!-- ibs -->
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/EmployeeWorkLogList/ind/getLayoutOfSearch'" :searchDataApi="'/EmployeeWorkLogList/ind/getListOfSearchModel'"></ct-searchlist> -->
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>
@@ -162,7 +141,7 @@
         // appRootUrl:'http://10.88.22.13:6060/onecard-api/',
         appRootUrl:'',
         para:{
-          "type":"top"
+          
         },
       }
     },

package/src/centaline/common/index.js

@@ -735,6 +735,11 @@ const common = {
     }
     return '';
   },
+  getValueCaseInsensitive(obj, key) {
+    const searchKey = key.toLowerCase();
+    const foundKey = Object.keys(obj).find(k => k.toLowerCase() === searchKey);
+    return foundKey ? obj[foundKey] : undefined;
+  },
 
   /**
    * @method

package/src/centaline/dynamicMo/src/dynamicMo.vue

@@ -143,7 +143,7 @@
         var dropdown = self.$refs["pop"];
         this.unwatch1=self.$watch('model.options', function (newVal, oldVal) {
           self.$nextTick(() => {
-            if (typeof dropdown.popperJS !== 'undefined' && dropdown.popperJS) {
+            if (dropdown && typeof dropdown.popperJS !== 'undefined' && dropdown.popperJS) {
               dropdown.popperJS.destroy();
               dropdown.popperJS = null;
               dropdown.updatePopper();

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

@@ -17,13 +17,15 @@
       @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate" @closeSideBar="closeSideBar" 
       @rowClickHandle="rowClickHandle" @scrollHandle="scrollHandle" @refreshRowHandle="refreshRowHandle" @doClosePopoverHandle="doClosePopoverHandle" 
       @showTitle="showTitleHandler" @popupClickHandler="popupClickHandler" @simpleRouterRefreshHandler="simpleRouterRefreshHandler" @loadedError="tableLoadedError"
-      @drop="drop" @openSideBarHandler="openSideBarHandler" @closeSideBarHandler="closeSideBarHandler" :dragStartItem="dragStartItem" :dragStartName="dragStartName" @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged"
+      @drop="drop" @openSideBarHandler="openSideBarHandler" @closeSideBarHandler="closeSideBarHandler" :dragStartItem="dragStartItem" :dragStartName="dragStartName" 
+      @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged" @initSideBar="initSideBar"
       ></ct-searchtable>      
     </div>
     <div ref="sidebar" v-if="flagSideBar && flagSideBarOfData" 
     :style="{'height': pageHeight? pageHeight:'100%','width':sideBarWidth+'px',right:sideBarRight+'px'}" 
     class="sidebar">
       <ct-Detail ref="detail" :api="sideBarApi" :apiParam="sideBarApiParam" :pageType="sideBarPageType" 
+      :style="{'display': sideBarWidth && sideBarWidth>0 ?'block':'none'}" 
       :searchConditionApi="sideBarSearchConditionApi" :searchStatsApi="sideBarSearchStatsApi" :searchDataApi="sideBarSearchDataApi" :listHeight="listHeight"
       :selectIndex="selectIndex" :rowCount="rowCount" :key="detailKey" :drowerClose="drowerClose"
       @clickNextHandler="clickNextHandler" @clickPrevHandler="clickPrevHandler" @simpleRouterclickHandler="simpleRouterclickHandler"
@@ -121,12 +123,14 @@
         rowCount:0,
         detailKey:0,
         isIframe: false,
+
+        columnName:'',
+        columnGroupId:'',
         
         drowerClose:'',
         listHeight:0,
         pageHeightReal: '',
-        flagShow: true
-        
+        flagShow: true,        
       }
     },
     created() {
@@ -314,6 +318,64 @@
           this.showTitle=this.$refs.screen.model.flagShowTitle;
         }
       },
+      initSideBar(submitData) {
+        var self = this;
+        this.title=this.$refs.table.model.title;
+        if (typeof this.$refs.table.model.cellLayout !== "undefined") {
+          this.$refs.screen.LoadLayout();
+        }
+
+        this.pageDisabled=false;
+        this.flagSideBar=this.$refs.table.model.flagSideBar;
+        this.flagDefaultDisplaySideBar=this.$refs.table.model.flagDefaultDisplaySideBar;
+        if(this.$refs.table.model.rowSelectRouter){
+          this.sideBarApi=this.$refs.table.model.rowSelectRouter.action;
+          this.sideBarSearchConditionApi=this.$refs.table.model.rowSelectRouter.actionForSearchLayout;
+          this.sideBarSearchStatsApi=this.$refs.table.model.rowSelectRouter.actionForSearchStats;
+          this.sideBarSearchDataApi=this.$refs.table.model.rowSelectRouter.actionForSearch;
+          this.sideBarPageType=this.$refs.table.model.rowSelectRouter.actionSource;
+        }
+        else{
+          this.flagSideBar=false;
+        }
+        
+        if(this.$refs.table.model.listData.length>0){
+          this.flagSideBarOfData=true;
+
+          if(this.$refs.table.model.rowSelectRouter && this.$refs.table.model.rowSelectRouter.dialogWidth){
+            this.$refs.table.model.mainBarWidth = this.$refs.main.clientWidth-this.$refs.table.model.rowSelectRouter.dialogWidth;
+            this.$refs.table.model.sideBarWidth = this.$refs.table.model.rowSelectRouter.dialogWidth;
+          }
+
+          if(document.body.clientWidth && document.body.clientWidth<1024){
+            this.flagSideBar=false;
+          }
+
+          if(this.flagSideBar){
+            self.resizeSearchList();
+            this.selectIndex=-1;
+            this.sideBarStatus='';
+            if(this.$refs.sideMenu)this.$refs.sideMenu.setSide('open');
+            this.columnName=submitData.columnName?submitData.columnName:'';
+            this.columnGroupId=submitData.columnGroupId?submitData.columnGroupId:'';
+
+            if(this.flagDefaultDisplaySideBar && !this.sideBarStatus){
+              this.sideMenuClickHandler('close');
+            }
+            else{
+              let status='open';
+              if(this.sideBarStatus=='open')status='close';
+              else if(this.sideBarStatus=='close')status='open';
+              this.sideMenuClickHandler(status);
+            }
+            self.rowClickHandle();
+          }
+        }
+        else{
+          this.flagSideBarOfData=false;
+          this.searchWidth=0;
+        }        
+      },
       tableLoaded() {
         var self = this;
         this.title=this.$refs.table.model.title;
@@ -381,11 +443,20 @@
           if (this.sideBarStatus && this.sideBarStatus == "open") {
             self.selectIndex = self.$refs.table.model.selectIndex;
             self.sideBarApiParam = {};
-            if (self.$refs.table.model.rowSelectRouter.submitListField) {
+            if (self.$refs.table.model.rowSelectRouter.submitListField 
+            && self.$refs.table.model.listData 
+            && self.$refs.table.model.listData.length>0) {
               self.$refs.table.model.rowSelectRouter.submitListField.forEach((k) => {
                 self.sideBarApiParam[k] = self.$refs.table.model.listData[self.selectIndex][k];
               });
             }
+            if(self.columnName){
+              self.sideBarApiParam.columnName=this.columnName;
+            }
+            if(self.columnGroupId){
+              self.sideBarApiParam.columnGroupId=this.columnGroupId;
+            }
+
             self.sideBarApiParam.actionType = self.$refs.table.model.rowSelectRouter.actionType;
             self.detailKey = self.detailKey + 1;
           }
@@ -395,6 +466,12 @@
               self.$refs.table.model.rowSelectRouter.submitListField.forEach((k) => {                
                 ApiParam[k] = self.$refs.table.model.listData[self.$refs.table.model.selectIndex][k];
               });
+              if(self.columnName){
+                ApiParam.columnName=this.columnName;
+              }
+              if(self.columnGroupId){
+                ApiParam.columnGroupId=this.columnGroupId;
+              }
             }
             this.$emit("rowClickHandle", ApiParam, self.appID);
           }

package/src/centaline/dynamicSearchList/src/dynamicSearchSideMenu.vue

@@ -28,6 +28,9 @@
         else if(v=='open')this.side ='close';
         this.$emit('sideMenuClickHandler',v);
       },
+      setSide(v) {
+        this.side =v;
+      },
     }
   }
 </script>

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

@@ -166,9 +166,9 @@
                 <template v-else-if="column.router">
                   <div v-if="column.router.rightField && row[column.router.rightField] === 0" v-html="row[column.id]">
                   </div>
-                  <ct-tablecurrency v-else :ref="'router' + column.router.id + rowindex" :rowindex="rowindex"
+                  <ct-tablecurrency v-else :ref="'router' + column.router.id + rowindex" :rowindex="rowindex" :columnGroupId="column.groupId"
                     :align="column.attrs.align" :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'" :columnName="column.id"
-                    :router="column.router" :colValue="row[column.id]" :rowData="row" @click="rolRouterClickHandler">
+                    :router="column.router" :colValue="$common.getValueCaseInsensitive(row, column.id)" :rowData="row" @click="rolRouterClickHandler">
                   </ct-tablecurrency>
                 </template>
 
@@ -1152,7 +1152,7 @@ export default {
       });
       this.routerClickHandler(field, submitData, action);
     },
-    rolRouterClickHandler(field, rowData, rowindex, visible,columnName) {
+    rolRouterClickHandler(field, rowData, rowindex, visible,columnName,columnGroupId) {
       field.rowindex = rowindex;
       if (this.$refs["popover" + rowindex] && this.$refs["popover" + rowindex][0]) {
         this.$refs["popover" + rowindex][0].doClose();
@@ -1188,6 +1188,10 @@ export default {
         submitData.columnName=columnName;
       }
 
+      if(columnGroupId){
+        submitData.columnGroupId=columnGroupId;
+      }
+
       this.routerClickHandler(field, submitData, action);
     },
     routerClickHandler(field, submitData, action) {
@@ -1537,6 +1541,21 @@ export default {
               }
             }
           }
+          else if (field.isFormPageInSideBar || field.isSearchPageInSideBar) {
+            self.model.flagSideBar = true;
+            self.model.flagDefaultDisplaySideBar = true;
+            field.actionSource = field.isFormPageInSideBar ? 'Form':'SearchList';
+            self.model.rowSelectRouter = field;
+
+            var clientX = event.clientX;
+            setTimeout(() => {
+              if (window.innerWidth - 40 - field.dialogWidth < clientX) {
+                self.$refs.tableParent.scrollLeft = self.$refs.tableParent.scrollLeft + (clientX - (window.innerWidth - 40 - field.dialogWidth)) + 100;
+              }
+            }, 100);
+
+            self.$emit('initSideBar',submitData);
+          }
           else {
             //self.operationLoading = true;
 

package/src/centaline/dynamicSosTt/src/dynamicSosTt.vue

@@ -144,7 +144,7 @@
         var dropdown = self.$refs["pop"];
         this.unwatch=self.$watch('model.options', function (newVal, oldVal) {
           self.$nextTick(() => {
-            if (typeof dropdown.popperJS !== 'undefined' && dropdown.popperJS) {
+            if (dropdown && typeof dropdown.popperJS !== 'undefined' && dropdown.popperJS) {
               dropdown.popperJS.destroy();
               dropdown.popperJS = null;
               dropdown.updatePopper();

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

@@ -6,7 +6,7 @@
       :screenPara="screenPara"
       @search="search"
       @clickHandler="rolRouterClickHandler" 
-      @loaded="screenload"
+      @loaded="screenload" style="padding-left: 11px;"
     ></ct-searchtreescreen>
     <ct-tree
       ref="tree"

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

@@ -263,6 +263,10 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
 
             if (attrKey == 'hidden') {
               rtn1.source['show'] = !attrValue
+              rtn1['show'] = !attrValue
+            }
+            else if (attrKey == 'show') {
+              rtn1['show'] = attrValue
             }
             rtn1.source[attrKey] = attrValue;
             if (rtn1.source.controlType === 23) {

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

@@ -37,6 +37,9 @@ const Router = function (source) {
     get actionSource() {
       return source.actionSource;
     },
+    set actionSource(v) {
+      source.actionSource = v;
+    },
     get onClick() {
       return source.onChanged;
     },
@@ -99,7 +102,7 @@ const Router = function (source) {
       return source.pageStyle === Enum.PageStyle.BrowserNewTab;
     },
     get isClientFuntion() {
-      return source.pageStyle === Enum.PageStyle.ClientFunction;
+      return source.pageStyle === Enum.PageStyle.ClientFunction || source.actionType === Enum.ActionType.ExcuteClientFunction;
     },
     get isSearchPageWithList() {
       return source.pageStyle === Enum.PageStyle.SearchPageWithList;
@@ -119,6 +122,12 @@ const Router = function (source) {
     get isLayerInSystem() {
       return source.pageStyle === Enum.PageStyle.LayerInSystem;
     },
+    get isFormPageInSideBar() {
+      return source.pageStyle === Enum.PageStyle.FormPageInSideBar;
+    },
+    get isSearchPageInSideBar() {
+      return source.pageStyle === Enum.PageStyle.SearchPageInSideBar;
+    },
 
     //actionType
     get actionType() {

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

@@ -72,6 +72,10 @@ const SearchScreen = function (source, callBack, screenPara, prevParam) {
             }
             if (attrKey == 'hidden') {
               rtn1.source['show'] = !attrValue
+              rtn1['show'] = !attrValue
+            }
+            else if (attrKey == 'show') {
+              rtn1['show'] = attrValue
             }
             rtn1.source[attrKey] = attrValue;
             this.form.hatchHandle(id, attrKey, attrValue, rtn1);

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

@@ -18,6 +18,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       selectAll: 0,
       toolbarKey:0,
       searchAction:action?action:data,
+      OriginalColumns:source.content.columns?JSON.parse(JSON.stringify(source.content.columns)):[],
       get title() {
         return source.content.title;
       },
@@ -184,6 +185,12 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                 get flagHtml() {
                   return v.flagHtml;
                 },
+                 /**
+                 * 分组Id（主要用于 单元格 数据点击事件 传给API，传输参数名为 columnGroupId）
+                 */
+                get groupId() {
+                  return v.groupId;
+                },
               };
               if (col.show) {
                 //合并表头时暂不支持固定列
@@ -401,13 +408,17 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       get rowSelectRouter() {
         if (rtn._rowSelectRouter !== null) {
           return rtn._rowSelectRouter;
-        } else {
+        } 
+        else {
           if (source.content.rowSelectRouter && source.content.rowSelectRouter.key) {
             rtn._rowSelectRouter = Router(source.content.rowSelectRouter);
           }
           return rtn._rowSelectRouter;
         }
       },
+      set rowSelectRouter(v) {
+        rtn._rowSelectRouter = v;
+      },
       sortData: [],
       toSort: function (col, action, callback) {
         this.columns.forEach((v1) => {
@@ -556,7 +567,8 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
               if (typeof response.page.flagMoreData !== 'undefined') {
                 self.flagMoreData = response.page.flagMoreData;
               }
-              if (response.content.updateTableColumns&&response.page.pageIndex<=1) {
+              if (response.content.updateTableColumns && response.page.pageIndex<=1 
+                && JSON.stringify(rtn.OriginalColumns) !== JSON.stringify(response.content.columns)) {
                 self.columns = response.content.columns;
                 if (self.template) {
                   var tempLoader = template.loader(self.template).default;
@@ -691,7 +703,8 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
               if (typeof response.content.bottomText !== 'undefined') {
                 self.listFooter = response.content.bottomText;
               }
-              if (response.content.updateTableColumns&&response.page.pageIndex<=1) {
+              if (response.content.updateTableColumns && response.page.pageIndex<=1
+                && JSON.stringify(rtn.OriginalColumns) !== JSON.stringify(response.content.columns)) {
                 self.columns = response.content.columns;
                 if (self.template) {
                   var tempLoader = template.loader(self.template).default;
@@ -1427,9 +1440,15 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       get flagSideBar() {
         return source.content.flagSideBar || false;
       },
+      set flagSideBar(v) {
+        source.content.flagSideBar = v;
+      },
       get flagDefaultDisplaySideBar() {
         return source.content.flagDefaultDisplaySideBar || false;
       },
+      set flagDefaultDisplaySideBar(v) {
+        source.content.flagDefaultDisplaySideBar = v;
+      },
       get sideBarWidth() {
         return source.content.sideBarWidth || 360;
       },
@@ -1439,6 +1458,9 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       get mainBarWidth() {
         return source.content.mainBarWidth;
       },
+      set mainBarWidth(v) {
+        source.content.mainBarWidth = v;
+      },
       get selectedRowBackColor() {
         return source.content.selectedRowBackColor;
       },

package/src/centaline/loader/src/ctl/lib/Enum.js

@@ -483,6 +483,11 @@ const Enum = {
     /// </summary>
     UpdateColumns: 24,
 
+    /**
+     * 执行客户端函数
+     */
+    ExcuteClientFunction:27,
+
     /**
     * 打开百度地图
     */
@@ -666,6 +671,14 @@ const Enum = {
      * 在tab页打开 前端的VUE组件， 组件名称放在action参数里
      */
     OpenVueComponentInTab:122,
+    /**
+     * 表单在侧边栏打开
+     */
+     FormPageInSideBar:123,
+     /**
+      * 列表在侧边栏打开
+      */
+     SearchPageInSideBar:124,
   },
 
   /// <summary>

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

@@ -45,6 +45,7 @@
         type: [String, Number], // 现在 colValue 可以是对象或数字
       },
       columnName: String,
+      columnGroupId: String,
       rowindex: Number,
       isOperationalColumn: {
         type: Boolean,
@@ -105,10 +106,10 @@
             this.$refs.video.pause();
           }
           this.visible=!this.visible;
-          this.$emit('click', this.router, this.rowData,this.rowindex,this.visible,this.columnName);
+          this.$emit('click', this.router, this.rowData,this.rowindex,this.visible,this.columnName,this.columnGroupId);
         }
         else{
-          this.$emit('click', this.router, this.rowData,this.rowindex,null,this.columnName);
+          this.$emit('click', this.router, this.rowData,this.rowindex,null,this.columnName,this.columnGroupId);
         }
         this.labelColor='mazarine'
 

package/src/main.js

@@ -30,7 +30,7 @@ Vue.use(centaline, {
   // baseUrl: "http://10.25.10.67:9999/service-api/",
   // baseUrl: "http://10.25.10.69:8080/",
   // baseUrl: "https://ccesutest.centaline.com.cn/service-api/v1/form/router", 
-  baseUrl: "http://10.88.22.69:8080/", 
+  // baseUrl: "http://10.88.22.69:8080/", 
   // baseUrl: "http://10.88.22.42:9999/service-api/",
   // baseUrl: "http://10.1.245.111:38908/service-api/",
   // baseUrl: "http://10.1.245.111:31574/service-api/",
@@ -77,8 +77,8 @@ Vue.use(centaline, {
         estateId: '',
         appinfo:'{"appId":"8F184E91-2C73-45E3-B518-889491E07CDA","appName":"%E6%95%B0%E6%8D%AE%E9%A9%B1%E5%8A%A8%E7%AE%A1%E7%90%86%E5%90%8E%E5%8F%B0"}',
 
-        authObject: '{"currentEstate":{},"platform":1,"osVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"KAuXV9","time":1758521266777,"sign":"7b7b810344386d079c18a92a30bfb5e4","systemSource":"CCESU","empNo":"hqxtgl","empId":"2411121446336B97FBEB7FD54905A903","clientVersion":"12.5","empName":"hq%E7%B3%BB%E7%BB%9F%E7%AE%A1%E7%90%86","roleName":"%E7%B3%BB%E7%BB%9F%E7%AE%A1%E7%90%86%E5%91%98","deptFullName":"%E6%9C%AA%E5%8C%B9%E9%85%8DCCHR%E4%B8%ADHROC%E9%83%A8%E9%97%A8%2F%E9%9B%86%E5%9B%A2IT%2FCCES%E7%BB%84"}',
-        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjFjYzc4ZTY3LTM0YjAtNDNmMC1iN2U1LThmMzc3NGQxMmYyMyJ9.QrBgk0iLrBj9sDdDdfxBApNUXVH0DX1sYIsFgmIWxTwCWJU_RRbaGmHuZ_xV3Co_j_9GmDCNjRBeQWoRoiYaRg',
+        authObject: '{"currentEstate":{"estateId":"241113105409757BFF2887A7472E99D2","estateName":"U%E7%89%88%E6%A5%BC%E7%9B%98%E6%8C%89%E7%82%B9%E4%BD%8D","estDeptPath":"001.200.063.001"},"platform":1,"osVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"aRYECc","time":1762502469262,"sign":"3619227d847afa9c7dad6788b4b069d0","systemSource":"CCESU","empNo":"hqxtgl","empId":"2411121446336B97FBEB7FD54905A903","clientVersion":"12.5","empName":"hq%E7%B3%BB%E7%BB%9F%E7%AE%A1%E7%90%86","roleName":"%E7%B3%BB%E7%BB%9F%E7%AE%A1%E7%90%86%E5%91%98","deptFullName":"%E6%9C%AA%E5%8C%B9%E9%85%8DCCHR%E4%B8%ADHROC%E9%83%A8%E9%97%A8%2F%E9%9B%86%E5%9B%A2IT%2FCCES%E7%BB%84"}',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjdjMTVhNjcyLTI1OTAtNDJjOS05ZGY4LTlhMWZjOGU3NTc3NyJ9.l5OQ1vse_HTJrmceicNHas9HLyaLcyMHtoYqO8fQOqb8bmjMHoKlutaIjSIk_etQnWi85iF4JJh-ll2fwdkp-A',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作