gcs-ui-lib 1.2.24 → 1.2.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gcs-ui-lib",
-  "version": "1.2.24",
+  "version": "1.2.26",
   "private": false,
   "main": "./lib/gcs-ui-lib.common.js",
   "scripts": {

package/packages/StreamRefill/src/demo/index.vue

@@ -214,16 +214,25 @@ export default {
         label: item.label || item.prop,
       }));
     },
-    // 显示列勾选状态（返回数组，默认全选）
+    // 显示列勾选状态
     checkColumns() {
-      return this.mergedColumns.length ? this.mergedColumns : this.columns;
+      const savedColumns = this.$refs.fillList?.displayColumns;
+      const baseColumns = this.mergedColumns.length ? this.mergedColumns : this.columns;
+      
+      if (!savedColumns?.length) {
+        return baseColumns;
+      }
+
+      const savedProps = new Set(savedColumns.map(c => c.prop));
+      const newColumns = baseColumns.filter(c => !savedProps.has(c.prop));
+      return [...savedColumns, ...newColumns];
     },
   },
   methods: {
     // 显示列设置回调 - 将显示列设置同步回表格
     setChange(list) {
       this.$refs.fillList.setColumns(list);
-      this.showColumnVisible = false; // 手动关闭弹窗
+      this.showColumnVisible = false;
     },
     // 接收合并后的列配置
     handleColumnsChange(columns) {

package/packages/StreamRefill/src/main.vue

@@ -26,8 +26,8 @@
           align="center"
         />
         <el-table-column
-          v-for="item in displayColumns"
-          :key="item.prop"
+          v-for="(item, index) in displayColumns"
+          :key="`${item.prop}-${index}`"
           v-bind="item"
           header-align="center"
           min-width="250"
@@ -212,11 +212,12 @@ export default {
         return {
           ...rest,
           label: item.label || item.prop,
+          slotName,
         };
       });
     },
   },
-  watch: {
+    watch: {
     tableData: {
       handler() {
         this.formData.tableData = this.tableData;
@@ -226,9 +227,7 @@ export default {
     },
     mergedColumns: {
       handler(newVal) {
-        if (!this.displayColumns.length && newVal.length) {
-          this.displayColumns = newVal;
-        }
+        this.displayColumns = newVal;
         this.$emit("columns-change", newVal);
       },
       immediate: true,
@@ -251,7 +250,7 @@ export default {
       //获取固定分组数据必填字段
       this.setFieldHeader(Field);
       //获取拓展字段分组数据必填字段
-      this.setExTHeader(exField);
+      await this.setExTHeader(exField);
     },
     setFieldHeader(Field) {
       for (let i of Field) {
@@ -339,12 +338,14 @@ export default {
       });
     },
     setColumns(columns) {
-      // 确保每列都有 label 属性用于显示
       this.displayColumns = columns.map((col) => ({
         ...col,
         label: col.label || col.label2 || col.prop,
-        label2: col.label2 || col.label || col.prop,
       }));
+      this.$forceUpdate();
+      this.$nextTick(() => {
+        this.$refs['t-box']?.doLayout();
+      });
     },
   },
   activated() {},