agilebuilder-ui 1.0.90-tmp20 → 1.0.90-tmp21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.0.90-tmp20",
+  "version": "1.0.90-tmp21",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/super-grid/src/apis.js

@@ -1494,23 +1494,31 @@ const apis = {
     // console.log('dynamicControlTableEdit----gridParams.options.customRules333-----', gridParams.options.customRules)
   },
   doLayout(hiddenColumns, listCode) {
+    if(!listCode){
+      listCode = this.code
+    }
+    const gridParams = store.get(listCode)
+    const orgHiddenColumns = gridParams.hiddenColumns
+    console.log('doLayout----orgHiddenColumns=', orgHiddenColumns)
     if(hiddenColumns && hiddenColumns.length > 0){
-      if(!this.options.hiddenColumns){
-        this.options.hiddenColumns = []
+      let hiddenColumnsResult = orgHiddenColumns
+      if(!hiddenColumnsResult){
+        hiddenColumnsResult = []
       }
-      if(this.options.hiddenColumns.length = 0){
-        this.options.hiddenColumns = hiddenColumns
+      if(hiddenColumnsResult.length === 0){
+        hiddenColumnsResult = hiddenColumns
       } else {
         hiddenColumns.forEach(prop=>{
-          if(this.options.hiddenColumns.indexOf(prop) < 0) {
+          if(hiddenColumnsResult.indexOf(prop) < 0) {
             // 去重处理
-            this.options.hiddenColumns.push(prop)
+            hiddenColumnsResult.push(prop)
           }
         })
       }
+      console.log('doLayout----hiddenColumnsResult=', hiddenColumnsResult)
+      this.options.hiddenColumns = hiddenColumnsResult
     } else {
-      const gridParams = store.get(listCode)
-      this.options.hiddenColumns = gridParams.options.hiddenColumns
+      this.options.hiddenColumns = orgHiddenColumns
     }
     if (this.$refs && this.$refs.superGrid) {
       this.$refs.superGrid.doLayout()

package/packages/super-grid/src/super-grid-service.js

@@ -176,6 +176,7 @@ const superGridService = {
                 gridParams.pagination = this.pagination
                 gridParams.pageContext = this.pageContext
                 gridParams.configureObj = this.configureObj
+                gridParams.hiddenColumns = this.options.hiddenColumns?JSON.parse(JSON.stringify(this.options.hiddenColumns)):[]
                 if (this.pagination) {
                   // 监控每行显示多少条变量使用
                   this.pageSize = this.pagination.pageSize