@nokecy/qc-ui 1.1.9 → 1.1.11

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

@@ -220,12 +220,87 @@ 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 _callee2() {
-    var values, flatConfig, configToSave, invalidColumns, gridColumnDefs, columnState;
+    var values, flatConfig, configToSave, invalidColumns, filterModel, schemeIdToLoad, defaultScheme, newScheme;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -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,114 +329,78 @@ var ColumnSetting = function ColumnSetting(_ref) {
               return item.type === 'group' || item.type === 'column' && item.field;
             });
           }
-
-          // 【修复】转换为 AG-Grid 的列定义，传入原始列定义以保留自定义属性
-          gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(configToSave, originalColumnDefs); // 【关键修复】先更新 columnDefs（处理分组结构变化）
-          gridApi.setGridOption('columnDefs', gridColumnDefs);
-
-          // 等待 columnDefs 更新完成
-          _context2.next = 12;
-          return new Promise(function (resolve) {
-            return setTimeout(resolve, 100);
-          });
-        case 12:
-          // 【修复】然后应用列状态（宽度、隐藏、顺序等）
-          columnState = (0, _columnGroupUtils.flatConfigToColumnState)(configToSave);
-          gridApi.applyColumnState({
-            state: columnState,
-            applyOrder: true // 强制应用列顺序
-          });
-
-          // 等待 Grid 状态更新完成后再保存到方案
-          setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-            var filterModel, defaultScheme, newScheme;
-            return _regeneratorRuntime().wrap(function _callee$(_context) {
-              while (1) switch (_context.prev = _context.next) {
-                case 0:
-                  _context.prev = 0;
-                  filterModel = gridApi.getFilterModel();
-                  if (!currentScheme) {
-                    _context.next = 8;
-                    break;
-                  }
-                  _context.next = 5;
-                  return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, currentScheme), {}, {
-                    columnConfig: configToSave,
-                    filterModel: filterModel,
-                    updatedAt: Date.now()
-                  }));
-                case 5:
-                  _antd.message.success('列配置已保存到方案');
-                  _context.next = 23;
-                  break;
-                case 8:
-                  // 如果没有激活的方案，自动创建默认方案
-                  defaultScheme = schemes.find(function (s) {
-                    return s.isDefault;
-                  });
-                  if (!defaultScheme) {
-                    _context.next = 17;
-                    break;
-                  }
-                  _context.next = 12;
-                  return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, defaultScheme), {}, {
-                    columnConfig: configToSave,
-                    filterModel: filterModel,
-                    updatedAt: Date.now()
-                  }));
-                case 12:
-                  _context.next = 14;
-                  return setCurrentColumnScheme === null || setCurrentColumnScheme === void 0 ? void 0 : setCurrentColumnScheme(gridKey, defaultScheme.id);
-                case 14:
-                  _antd.message.success('列配置已保存到默认方案');
-                  _context.next = 23;
-                  break;
-                case 17:
-                  // 创建新的默认方案并激活
-                  newScheme = {
-                    id: (0, _uuid.v4)(),
-                    name: '默认配置',
-                    description: '自动创建的默认列配置',
-                    columnConfig: configToSave,
-                    filterModel: filterModel,
-                    isDefault: true,
-                    isSystem: false,
-                    createdAt: Date.now(),
-                    updatedAt: Date.now()
-                  };
-                  _context.next = 20;
-                  return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, newScheme);
-                case 20:
-                  _context.next = 22;
-                  return setCurrentColumnScheme === null || setCurrentColumnScheme === void 0 ? void 0 : setCurrentColumnScheme(gridKey, newScheme.id);
-                case 22:
-                  _antd.message.success('已创建并保存到默认方案');
-                case 23:
-                  _context.next = 29;
-                  break;
-                case 25:
-                  _context.prev = 25;
-                  _context.t0 = _context["catch"](0);
-                  console.error('保存列配置到方案失败:', _context.t0);
-                  _antd.message.error('保存列配置失败');
-                case 29:
-                case "end":
-                  return _context.stop();
-              }
-            }, _callee, null, [[0, 25]]);
-          })), 50);
-
-          // 【修复】保存成功后清除快照
-          setSnapshotColumnDefs(null);
-
-          // message.success 已经在上面的逻辑中处理了
-          onClose();
+          _context2.prev = 8;
+          filterModel = gridApi.getFilterModel();
+          if (!currentScheme) {
+            _context2.next = 17;
+            break;
+          }
+          _context2.next = 13;
+          return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, currentScheme), {}, {
+            columnConfig: configToSave,
+            filterModel: filterModel,
+            updatedAt: Date.now()
+          }));
+        case 13:
+          schemeIdToLoad = currentScheme.id;
+          _antd.message.success('列配置已保存到方案');
+          _context2.next = 30;
+          break;
         case 17:
+          // 如果没有激活的方案，自动创建或更新默认方案
+          defaultScheme = schemes.find(function (s) {
+            return s.isDefault;
+          });
+          if (!defaultScheme) {
+            _context2.next = 25;
+            break;
+          }
+          _context2.next = 21;
+          return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, defaultScheme), {}, {
+            columnConfig: configToSave,
+            filterModel: filterModel,
+            updatedAt: Date.now()
+          }));
+        case 21:
+          schemeIdToLoad = defaultScheme.id;
+          _antd.message.success('列配置已保存到默认方案');
+          _context2.next = 30;
+          break;
+        case 25:
+          // 创建新的默认方案
+          newScheme = {
+            id: (0, _uuid.v4)(),
+            name: '默认配置',
+            description: '自动创建的默认列配置',
+            columnConfig: configToSave,
+            filterModel: filterModel,
+            isDefault: true,
+            isSystem: false,
+            createdAt: Date.now(),
+            updatedAt: Date.now()
+          };
+          _context2.next = 28;
+          return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, newScheme);
+        case 28:
+          schemeIdToLoad = newScheme.id;
+          _antd.message.success('已创建并保存到默认方案');
+        case 30:
+          _context2.next = 32;
+          return handleLoadScheme(schemeIdToLoad);
+        case 32:
+          _context2.next = 38;
+          break;
+        case 34:
+          _context2.prev = 34;
+          _context2.t0 = _context2["catch"](8);
+          console.error('保存列配置到方案失败:', _context2.t0);
+          _antd.message.error('保存列配置失败');
+        case 38:
         case "end":
           return _context2.stop();
       }
-    }, _callee2);
-  })), [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 _callee3() {
@@ -449,128 +488,56 @@ var ColumnSetting = function ColumnSetting(_ref) {
     }, _callee3, null, [[3, 30]]);
   })), [gridApi, saveColumnScheme, gridKey, schemeName, schemeDescription, activeTab, form, originalColumnDefs]);
 
-  // 加载方案
-  var handleLoadScheme = (0, _react.useCallback)( /*#__PURE__*/function () {
+  // 设置默认方案
+  var handleSetDefault = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(schemeId) {
-      var scheme, gridColumnDefs, columnState;
+      var scheme, _iterator, _step, s;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             _context4.prev = 0;
-            _context4.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)) {
-              _context4.next = 12;
-              break;
-            }
-            // 【关键修复】先更新 columnDefs（处理分组结构）
-            gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(scheme.columnConfig, originalColumnDefs);
-            gridApi.setGridOption('columnDefs', gridColumnDefs);
-
-            // 等待 columnDefs 更新完成
-            _context4.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();
-            _context4.next = 20;
-            break;
-          case 17:
-            _context4.prev = 17;
-            _context4.t0 = _context4["catch"](0);
-            _antd.message.error(_context4.t0.message || '加载方案失败');
-          case 20:
-          case "end":
-            return _context4.stop();
-        }
-      }, _callee4, null, [[0, 17]]);
-    }));
-    return function (_x) {
-      return _ref5.apply(this, arguments);
-    };
-  }(), [setCurrentColumnScheme, gridKey, schemes, gridApi, originalColumnDefs, form, getColumnData, onClose]);
-
-  // 设置默认方案
-  var handleSetDefault = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(schemeId) {
-      var scheme, _iterator, _step, s;
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
-          case 0:
-            _context5.prev = 0;
             scheme = schemes.find(function (s) {
               return s.id === schemeId;
             });
             if (!scheme) {
-              _context5.next = 24;
+              _context4.next = 24;
               break;
             }
             // 将其他方案设为非默认
             _iterator = _createForOfIteratorHelper(schemes);
-            _context5.prev = 4;
+            _context4.prev = 4;
             _iterator.s();
           case 6:
             if ((_step = _iterator.n()).done) {
-              _context5.next = 13;
+              _context4.next = 13;
               break;
             }
             s = _step.value;
             if (!(s.isDefault && s.id !== schemeId)) {
-              _context5.next = 11;
+              _context4.next = 11;
               break;
             }
-            _context5.next = 11;
+            _context4.next = 11;
             return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, s), {}, {
               isDefault: false,
               updatedAt: Date.now()
             }));
           case 11:
-            _context5.next = 6;
+            _context4.next = 6;
             break;
           case 13:
-            _context5.next = 18;
+            _context4.next = 18;
             break;
           case 15:
-            _context5.prev = 15;
-            _context5.t0 = _context5["catch"](4);
-            _iterator.e(_context5.t0);
+            _context4.prev = 15;
+            _context4.t0 = _context4["catch"](4);
+            _iterator.e(_context4.t0);
           case 18:
-            _context5.prev = 18;
+            _context4.prev = 18;
             _iterator.f();
-            return _context5.finish(18);
+            return _context4.finish(18);
           case 21:
-            _context5.next = 23;
+            _context4.next = 23;
             return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, scheme), {}, {
               isDefault: true,
               updatedAt: Date.now()
@@ -578,37 +545,37 @@ var ColumnSetting = function ColumnSetting(_ref) {
           case 23:
             _antd.message.success('已设置为默认方案');
           case 24:
-            _context5.next = 29;
+            _context4.next = 29;
             break;
           case 26:
-            _context5.prev = 26;
-            _context5.t1 = _context5["catch"](0);
-            _antd.message.error(_context5.t1.message || '设置失败');
+            _context4.prev = 26;
+            _context4.t1 = _context4["catch"](0);
+            _antd.message.error(_context4.t1.message || '设置失败');
           case 29:
           case "end":
-            return _context5.stop();
+            return _context4.stop();
         }
-      }, _callee5, null, [[0, 26], [4, 15, 18, 21]]);
+      }, _callee4, null, [[0, 26], [4, 15, 18, 21]]);
     }));
     return function (_x2) {
-      return _ref6.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }(), [schemes, saveColumnScheme, gridKey]);
 
   // 删除方案
   var handleDeleteScheme = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(schemeId, schemeName) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(schemeId, schemeName) {
       var _currentSchemes$gridK2, isCurrentScheme, defaultScheme;
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            _context6.prev = 0;
+            _context5.prev = 0;
             // 检查是否删除的是当前方案
             isCurrentScheme = schemeId === (currentSchemes === null || currentSchemes === void 0 || (_currentSchemes$gridK2 = currentSchemes[gridKey]) === null || _currentSchemes$gridK2 === void 0 ? void 0 : _currentSchemes$gridK2.columnSchemeId); // 查找默认方案
             defaultScheme = schemes.find(function (s) {
               return s.isDefault && s.id !== schemeId;
             });
-            _context6.next = 5;
+            _context5.next = 5;
             return deleteColumnScheme === null || deleteColumnScheme === void 0 ? void 0 : deleteColumnScheme(gridKey, schemeId);
           case 5:
             // 根据情况显示不同的提示消息
@@ -619,20 +586,20 @@ var ColumnSetting = function ColumnSetting(_ref) {
             } else {
               _antd.message.success("\u65B9\u6848\"".concat(schemeName, "\"\u5DF2\u5220\u9664"));
             }
-            _context6.next = 11;
+            _context5.next = 11;
             break;
           case 8:
-            _context6.prev = 8;
-            _context6.t0 = _context6["catch"](0);
-            _antd.message.error(_context6.t0.message || '删除失败');
+            _context5.prev = 8;
+            _context5.t0 = _context5["catch"](0);
+            _antd.message.error(_context5.t0.message || '删除失败');
           case 11:
           case "end":
-            return _context6.stop();
+            return _context5.stop();
         }
-      }, _callee6, null, [[0, 8]]);
+      }, _callee5, null, [[0, 8]]);
     }));
     return function (_x3, _x4) {
-      return _ref7.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }(), [deleteColumnScheme, gridKey, schemes, currentSchemes]);
 
@@ -644,26 +611,26 @@ var ColumnSetting = function ColumnSetting(_ref) {
   }, []);
 
   // 保存编辑
-  var handleSaveEdit = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+  var handleSaveEdit = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
     var scheme;
-    return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-      while (1) switch (_context7.prev = _context7.next) {
+    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
         case 0:
           if (editingId) {
-            _context7.next = 2;
+            _context6.next = 2;
             break;
           }
-          return _context7.abrupt("return");
+          return _context6.abrupt("return");
         case 2:
-          _context7.prev = 2;
+          _context6.prev = 2;
           scheme = schemes.find(function (s) {
             return s.id === editingId;
           });
           if (!scheme) {
-            _context7.next = 9;
+            _context6.next = 9;
             break;
           }
-          _context7.next = 7;
+          _context6.next = 7;
           return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, scheme), {}, {
             name: editingName.trim(),
             description: editingDescription.trim() || undefined,
@@ -673,17 +640,17 @@ var ColumnSetting = function ColumnSetting(_ref) {
           _antd.message.success('更新成功');
           setEditingId(null);
         case 9:
-          _context7.next = 14;
+          _context6.next = 14;
           break;
         case 11:
-          _context7.prev = 11;
-          _context7.t0 = _context7["catch"](2);
-          _antd.message.error(_context7.t0.message || '更新失败');
+          _context6.prev = 11;
+          _context6.t0 = _context6["catch"](2);
+          _antd.message.error(_context6.t0.message || '更新失败');
         case 14:
         case "end":
-          return _context7.stop();
+          return _context6.stop();
       }
-    }, _callee7, null, [[2, 11]]);
+    }, _callee6, null, [[2, 11]]);
   })), [schemes, saveColumnScheme, gridKey, editingId, editingName, editingDescription]);
 
   // 筛选方案列表