@nokecy/qc-ui 1.1.10 → 1.1.11

package/dist/cjs/ag-grid-plus/setting/ColumnSetting.js

@@ -220,20 +220,95 @@ var ColumnSetting = function ColumnSetting(_ref) {
     onClose();
   }, [snapshotColumnDefs, gridApi, onClose]);
 
+  /**
+   * 加载方案
+   * 应用方案到 Grid，并更新表单数据
+   */
+  var handleLoadScheme = (0, _react.useCallback)( /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(schemeId) {
+      var scheme, gridColumnDefs, columnState;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            _context.next = 3;
+            return setCurrentColumnScheme === null || setCurrentColumnScheme === void 0 ? void 0 : setCurrentColumnScheme(gridKey, schemeId);
+          case 3:
+            // 应用方案到 Grid
+            scheme = schemes.find(function (s) {
+              return s.id === schemeId;
+            });
+            if (!(scheme && gridApi)) {
+              _context.next = 12;
+              break;
+            }
+            // 【关键修复】先更新 columnDefs（处理分组结构）
+            gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(scheme.columnConfig, originalColumnDefs);
+            gridApi.setGridOption('columnDefs', gridColumnDefs);
+
+            // 等待 columnDefs 更新完成
+            _context.next = 9;
+            return new Promise(function (resolve) {
+              return setTimeout(resolve, 100);
+            });
+          case 9:
+            // 【修复】然后应用列状态（宽度、隐藏、顺序等）
+            columnState = (0, _columnGroupUtils.flatConfigToColumnState)(scheme.columnConfig);
+            gridApi.applyColumnState({
+              state: columnState,
+              applyOrder: true // 强制应用列顺序
+            });
+
+            // 应用过滤器
+            if (scheme.filterModel) {
+              gridApi.setFilterModel(scheme.filterModel);
+            }
+          case 12:
+            _antd.message.success('方案已加载');
+
+            // 等待Grid状态更新后再刷新表单
+            setTimeout(function () {
+              if (form) {
+                var newData = getColumnData();
+                form.setValues({
+                  items: newData
+                });
+              }
+            }, 100);
+
+            // 自动关闭弹窗,让用户看到Grid的变化
+            onClose();
+            _context.next = 20;
+            break;
+          case 17:
+            _context.prev = 17;
+            _context.t0 = _context["catch"](0);
+            _antd.message.error(_context.t0.message || '加载方案失败');
+          case 20:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[0, 17]]);
+    }));
+    return function (_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }(), [setCurrentColumnScheme, gridKey, schemes, gridApi, originalColumnDefs, form, getColumnData, onClose]);
+
   /**
    * 保存列配置
-   * 将扁平化配置转换回 Grid State 并应用到 AG-Grid
+   * 优化逻辑：先保存配置到存储，再通过 handleLoadScheme 统一加载
    */
-  var handleSaveColumns = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var values, flatConfig, configToSave, invalidColumns, gridColumnDefs, columnState, filterModel, defaultScheme, newScheme;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+  var handleSaveColumns = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var values, flatConfig, configToSave, invalidColumns, filterModel, schemeIdToLoad, defaultScheme, newScheme;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
         case 0:
           if (form) {
-            _context.next = 2;
+            _context2.next = 2;
             break;
           }
-          return _context.abrupt("return");
+          return _context2.abrupt("return");
         case 2:
           values = form.values;
           flatConfig = values.items || []; // 检查是否是旧版本数据，如果是则先迁移
@@ -243,7 +318,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
             _antd.message.info('检测到旧版本配置，已自动迁移到新格式');
           }
 
-          // 【修复】验证数据完整性，过滤掉无效的列配置
+          // 验证数据完整性，过滤掉无效的列配置
           invalidColumns = configToSave.filter(function (item) {
             return item.type === 'column' && item.field !== "" && !item.field;
           });
@@ -254,68 +329,45 @@ var ColumnSetting = function ColumnSetting(_ref) {
               return item.type === 'group' || item.type === 'column' && item.field;
             });
           }
-
-          // 【修复】转换为 AG-Grid 的列定义，传入原始列定义以保留自定义属性
-          gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(configToSave, originalColumnDefs); // 【关键修复】先更新 columnDefs（处理分组结构变化）
-          _context.next = 11;
-          return new Promise(function (resolve) {
-            return setTimeout(resolve, 100);
-          });
-        case 11:
-          // 【修复】然后应用列状态（宽度、隐藏、顺序等）
-          columnState = (0, _columnGroupUtils.flatConfigToColumnState)(configToSave);
-          gridApi.applyColumnState({
-            state: columnState,
-            applyOrder: true // 强制应用列顺序
-          });
-
-          // 【关键修复】等待 Grid 状态更新完成后再保存到方案
-          // 使用 await 确保保存完成后再关闭弹窗，避免生产环境竞态条件
-          _context.next = 15;
-          return new Promise(function (resolve) {
-            return setTimeout(resolve, 50);
-          });
-        case 15:
-          _context.prev = 15;
+          _context2.prev = 8;
           filterModel = gridApi.getFilterModel();
           if (!currentScheme) {
-            _context.next = 23;
+            _context2.next = 17;
             break;
           }
-          _context.next = 20;
+          _context2.next = 13;
           return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, currentScheme), {}, {
             columnConfig: configToSave,
             filterModel: filterModel,
             updatedAt: Date.now()
           }));
-        case 20:
+        case 13:
+          schemeIdToLoad = currentScheme.id;
           _antd.message.success('列配置已保存到方案');
-          _context.next = 38;
+          _context2.next = 30;
           break;
-        case 23:
-          // 如果没有激活的方案，自动创建默认方案
+        case 17:
+          // 如果没有激活的方案，自动创建或更新默认方案
           defaultScheme = schemes.find(function (s) {
             return s.isDefault;
           });
           if (!defaultScheme) {
-            _context.next = 32;
+            _context2.next = 25;
             break;
           }
-          _context.next = 27;
+          _context2.next = 21;
           return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, defaultScheme), {}, {
             columnConfig: configToSave,
             filterModel: filterModel,
             updatedAt: Date.now()
           }));
-        case 27:
-          _context.next = 29;
-          return setCurrentColumnScheme === null || setCurrentColumnScheme === void 0 ? void 0 : setCurrentColumnScheme(gridKey, defaultScheme.id);
-        case 29:
+        case 21:
+          schemeIdToLoad = defaultScheme.id;
           _antd.message.success('列配置已保存到默认方案');
-          _context.next = 38;
+          _context2.next = 30;
           break;
-        case 32:
-          // 创建新的默认方案并激活
+        case 25:
+          // 创建新的默认方案
           newScheme = {
             id: (0, _uuid.v4)(),
             name: '默认配置',
@@ -327,55 +379,45 @@ var ColumnSetting = function ColumnSetting(_ref) {
             createdAt: Date.now(),
             updatedAt: Date.now()
           };
-          _context.next = 35;
+          _context2.next = 28;
           return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, newScheme);
-        case 35:
-          _context.next = 37;
-          return setCurrentColumnScheme === null || setCurrentColumnScheme === void 0 ? void 0 : setCurrentColumnScheme(gridKey, newScheme.id);
-        case 37:
+        case 28:
+          schemeIdToLoad = newScheme.id;
           _antd.message.success('已创建并保存到默认方案');
-        case 38:
-          _context.next = 40;
-          return new Promise(function (resolve) {
-            return setTimeout(resolve, 100);
-          });
-        case 40:
-          _context.next = 46;
+        case 30:
+          _context2.next = 32;
+          return handleLoadScheme(schemeIdToLoad);
+        case 32:
+          _context2.next = 38;
           break;
-        case 42:
-          _context.prev = 42;
-          _context.t0 = _context["catch"](15);
-          console.error('保存列配置到方案失败:', _context.t0);
+        case 34:
+          _context2.prev = 34;
+          _context2.t0 = _context2["catch"](8);
+          console.error('保存列配置到方案失败:', _context2.t0);
           _antd.message.error('保存列配置失败');
-        case 46:
-          // 【修复】保存成功后清除快照
-          setSnapshotColumnDefs(null);
-
-          // 【关键修复】确保在方案保存完成并传播后才关闭弹窗
-          onClose();
-        case 48:
+        case 38:
         case "end":
-          return _context.stop();
+          return _context2.stop();
       }
-    }, _callee, null, [[15, 42]]);
-  })), [form, gridApi, onSaveColumnState, onClose, saveColumnScheme, setCurrentColumnScheme, currentScheme, schemes, gridKey, originalColumnDefs]);
+    }, _callee2, null, [[8, 34]]);
+  })), [form, gridApi, saveColumnScheme, setCurrentColumnScheme, currentScheme, schemes, gridKey, handleLoadScheme]);
 
   // 保存为新方案
-  var handleSaveScheme = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+  var handleSaveScheme = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
     var columnConfigToSave, values, gridColumnDefs, columnState, _values, filterModel, newScheme;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
           if (schemeName.trim()) {
-            _context2.next = 3;
+            _context3.next = 3;
             break;
           }
           _antd.message.warning('请输入方案名称');
-          return _context2.abrupt("return");
+          return _context3.abrupt("return");
         case 3:
-          _context2.prev = 3;
+          _context3.prev = 3;
           if (!(activeTab === 'columns' && form)) {
-            _context2.next = 17;
+            _context3.next = 17;
             break;
           }
           values = form.values;
@@ -385,7 +427,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
           gridApi.setGridOption('columnDefs', gridColumnDefs);
 
           // 等待 columnDefs 更新完成
-          _context2.next = 11;
+          _context3.next = 11;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 100);
           });
@@ -398,12 +440,12 @@ var ColumnSetting = function ColumnSetting(_ref) {
           });
 
           // 等待状态更新
-          _context2.next = 15;
+          _context3.next = 15;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 50);
           });
         case 15:
-          _context2.next = 19;
+          _context3.next = 19;
           break;
         case 17:
           // 如果在"方案管理"标签页，使用当前表单数据
@@ -423,7 +465,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
             createdAt: Date.now(),
             updatedAt: Date.now()
           };
-          _context2.next = 23;
+          _context3.next = 23;
           return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, newScheme);
         case 23:
           _antd.message.success('方案保存成功');
@@ -433,91 +475,19 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
           // 切换到方案管理标签页,显示新创建的方案
           setActiveTab('schemes');
-          _context2.next = 33;
+          _context3.next = 33;
           break;
         case 30:
-          _context2.prev = 30;
-          _context2.t0 = _context2["catch"](3);
-          _antd.message.error(_context2.t0.message || '保存方案失败');
+          _context3.prev = 30;
+          _context3.t0 = _context3["catch"](3);
+          _antd.message.error(_context3.t0.message || '保存方案失败');
         case 33:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2, null, [[3, 30]]);
+    }, _callee3, null, [[3, 30]]);
   })), [gridApi, saveColumnScheme, gridKey, schemeName, schemeDescription, activeTab, form, originalColumnDefs]);
 
-  // 加载方案
-  var handleLoadScheme = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(schemeId) {
-      var scheme, gridColumnDefs, columnState;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
-          case 0:
-            _context3.prev = 0;
-            _context3.next = 3;
-            return setCurrentColumnScheme === null || setCurrentColumnScheme === void 0 ? void 0 : setCurrentColumnScheme(gridKey, schemeId);
-          case 3:
-            // 应用方案到 Grid
-            scheme = schemes.find(function (s) {
-              return s.id === schemeId;
-            });
-            if (!(scheme && gridApi)) {
-              _context3.next = 12;
-              break;
-            }
-            // 【关键修复】先更新 columnDefs（处理分组结构）
-            gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(scheme.columnConfig, originalColumnDefs);
-            gridApi.setGridOption('columnDefs', gridColumnDefs);
-
-            // 等待 columnDefs 更新完成
-            _context3.next = 9;
-            return new Promise(function (resolve) {
-              return setTimeout(resolve, 100);
-            });
-          case 9:
-            // 【修复】然后应用列状态（宽度、隐藏、顺序等）
-            columnState = (0, _columnGroupUtils.flatConfigToColumnState)(scheme.columnConfig);
-            gridApi.applyColumnState({
-              state: columnState,
-              applyOrder: true // 强制应用列顺序
-            });
-
-            // 应用过滤器
-            if (scheme.filterModel) {
-              gridApi.setFilterModel(scheme.filterModel);
-            }
-          case 12:
-            _antd.message.success('方案已加载');
-
-            // 等待Grid状态更新后再刷新表单
-            setTimeout(function () {
-              if (form) {
-                var newData = getColumnData();
-                form.setValues({
-                  items: newData
-                });
-              }
-            }, 100);
-
-            // 自动关闭弹窗,让用户看到Grid的变化
-            onClose();
-            _context3.next = 20;
-            break;
-          case 17:
-            _context3.prev = 17;
-            _context3.t0 = _context3["catch"](0);
-            _antd.message.error(_context3.t0.message || '加载方案失败');
-          case 20:
-          case "end":
-            return _context3.stop();
-        }
-      }, _callee3, null, [[0, 17]]);
-    }));
-    return function (_x) {
-      return _ref4.apply(this, arguments);
-    };
-  }(), [setCurrentColumnScheme, gridKey, schemes, gridApi, originalColumnDefs, form, getColumnData, onClose]);
-
   // 设置默认方案
   var handleSetDefault = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(schemeId) {