Merge pull request #57 from WeBankFinTech/branch_joy

Branch joy

Author: mayinrain

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fesjs/traction-widget",
-  "version": "1.11.2",
+  "version": "1.12.0",
   "description": "集合大型中台项目使用到的通用组件和工具函数",
   "scripts": {
     "docs:dev": "npm run build && node docs/.vitepress/scripts/generate-doc.js && vitepress dev docs",

packages/traction-widget/components/TableHeaderConfig/TableHeaderConfig.vue

@@ -138,7 +138,12 @@ try {
         const cacheConfig = localStorage.getItem(`${props.type}_table_config`);
         if (cacheConfig != null) {
             console.log('存在表格配置的缓存信息: ', cacheConfig);
-            tableHeaders.value = JSON.parse(cacheConfig).active;
+            const cachedProps = JSON.parse(cacheConfig).active;
+            // 使用缓存的prop去匹配用户传入的完整配置
+            tableHeaders.value = cachedProps.map(cached => {
+                const matchedHeader = originTableHeaders.value.find(header => header.prop === cached.prop);
+                return matchedHeader || cached; // 如果找不到匹配项，使用缓存数据作为后备
+            });
         } else {
             for (let i = 0; i < originTableHeaders.value.length; i++) {
                 if (!(originTableHeaders.value[i].hidden ?? false)) {
@@ -168,7 +173,6 @@ try {
 } catch (err) {
     console.warn(err);
 }
-
 const ACTIVES = tableHeaders.value.map((item) => {
     const target = originTableHeaders.value.find((subItem) => {
         return subItem.prop === item.prop;

packages/traction-widget/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fesjs/traction-widget",
-  "version": "1.11.2",
+  "version": "1.12.0",
   "description": "集合大型中台项目使用到的通用组件和工具函数",
   "main": "dist/traction-widget.min.js",
   "module": "es/components/index.js",