@nokecy/qc-ui 1.0.80 → 1.0.81

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

@@ -154,114 +154,152 @@ var ColumnSetting = function ColumnSetting(_ref) {
   }, [schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.currentScheme, visible, form, getColumnData]);
 
   // 保存列配置
-  var handleSaveColumns = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var values, processedColumns, currentState, 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, processedColumns;
+    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;
           onSaveColumnState && onSaveColumnState(values.items);
-          processedColumns = (0, _processColumnGroups.default)(values.items); // 如果启用了列方案管理，自动保存到当前方案或创建/更新默认方案
-          if (!(schemeManager && gridKey)) {
-            _context.next = 31;
-            break;
-          }
-          _context.prev = 6;
-          currentState = gridApi.getColumnState();
-          if (!schemeManager.currentScheme) {
-            _context.next = 13;
-            break;
-          }
-          _context.next = 11;
-          return schemeManager.saveScheme({
-            columnState: currentState
-          });
-        case 11:
-          _context.next = 26;
-          break;
-        case 13:
-          // 如果没有激活的方案，查找或创建"默认配置"方案
-          defaultScheme = schemeManager.schemes.find(function (s) {
-            return s.isDefault;
-          });
-          if (!defaultScheme) {
-            _context.next = 21;
-            break;
-          }
-          _context.next = 17;
-          return schemeManager.loadScheme(defaultScheme.id);
-        case 17:
-          _context.next = 19;
-          return schemeManager.saveScheme({
-            columnState: currentState
-          });
-        case 19:
-          _context.next = 26;
-          break;
-        case 21:
-          _context.next = 23;
-          return schemeManager.createScheme('默认配置', currentState, {
-            isDefault: true,
-            description: '自动保存的默认列配置'
-          });
-        case 23:
-          newScheme = _context.sent;
-          _context.next = 26;
-          return schemeManager.loadScheme(newScheme.id);
-        case 26:
-          _context.next = 31;
-          break;
-        case 28:
-          _context.prev = 28;
-          _context.t0 = _context["catch"](6);
-          console.error('[ColumnSetting] 保存列配置到方案失败:', _context.t0);
-          // 即使保存到方案失败，也继续应用到 Grid
-        case 31:
+          processedColumns = (0, _processColumnGroups.default)(values.items); // 先应用列配置到 Grid
           if (type !== 'formArrayTable') {
             gridApi.setGridOption("columnDefs", processedColumns);
           }
-          setTimeout(function () {
-            gridApi.applyColumnState({
-              state: processedColumns,
-              applyOrder: true
-            });
-          }, 10);
+
+          // 应用列状态（包括顺序、宽度、隐藏等）
+          gridApi.applyColumnState({
+            state: processedColumns,
+            applyOrder: true
+          });
+
+          // 等待 Grid 状态更新完成后再保存到方案
+          setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+            var updatedState, defaultScheme, newScheme;
+            return _regeneratorRuntime().wrap(function _callee$(_context) {
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  if (!(schemeManager && gridKey)) {
+                    _context.next = 26;
+                    break;
+                  }
+                  _context.prev = 1;
+                  // 从 Grid 获取应用后的最新列状态
+                  updatedState = gridApi.getColumnState();
+                  if (!schemeManager.currentScheme) {
+                    _context.next = 8;
+                    break;
+                  }
+                  _context.next = 6;
+                  return schemeManager.saveScheme({
+                    columnState: updatedState
+                  });
+                case 6:
+                  _context.next = 21;
+                  break;
+                case 8:
+                  // 如果没有激活的方案，查找或创建"默认配置"方案
+                  defaultScheme = schemeManager.schemes.find(function (s) {
+                    return s.isDefault;
+                  });
+                  if (!defaultScheme) {
+                    _context.next = 16;
+                    break;
+                  }
+                  _context.next = 12;
+                  return schemeManager.loadScheme(defaultScheme.id);
+                case 12:
+                  _context.next = 14;
+                  return schemeManager.saveScheme({
+                    columnState: updatedState
+                  });
+                case 14:
+                  _context.next = 21;
+                  break;
+                case 16:
+                  _context.next = 18;
+                  return schemeManager.createScheme('默认配置', updatedState, {
+                    isDefault: true,
+                    description: '自动保存的默认列配置'
+                  });
+                case 18:
+                  newScheme = _context.sent;
+                  _context.next = 21;
+                  return schemeManager.loadScheme(newScheme.id);
+                case 21:
+                  _context.next = 26;
+                  break;
+                case 23:
+                  _context.prev = 23;
+                  _context.t0 = _context["catch"](1);
+                  console.error('[ColumnSetting] 保存列配置到方案失败:', _context.t0);
+                case 26:
+                case "end":
+                  return _context.stop();
+              }
+            }, _callee, null, [[1, 23]]);
+          })), 50);
           _antd.message.success('列配置已保存');
           onClose();
-        case 35:
+        case 10:
         case "end":
-          return _context.stop();
+          return _context2.stop();
       }
-    }, _callee, null, [[6, 28]]);
+    }, _callee2);
   })), [form, gridApi, onSaveColumnState, type, onClose, schemeManager, gridKey]);
 
   // 保存为新方案
-  var handleSaveScheme = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var currentState, newScheme;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+  var handleSaveScheme = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var columnStateToSave, values, processedColumns, newScheme;
+    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:
-          currentState = gridApi.getColumnState();
-          _context2.prev = 4;
-          _context2.next = 7;
-          return schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.createScheme(schemeName.trim(), currentState, {
+          _context3.prev = 3;
+          if (!(activeTab === 'columns' && form)) {
+            _context3.next = 14;
+            break;
+          }
+          values = form.values;
+          processedColumns = (0, _processColumnGroups.default)(values.items); // 先应用到 Grid
+          if (type !== 'formArrayTable') {
+            gridApi.setGridOption("columnDefs", processedColumns);
+          }
+          gridApi.applyColumnState({
+            state: processedColumns,
+            applyOrder: true
+          });
+
+          // 等待状态更新，然后获取最新状态
+          _context3.next = 11;
+          return new Promise(function (resolve) {
+            return setTimeout(resolve, 50);
+          });
+        case 11:
+          columnStateToSave = gridApi.getColumnState();
+          _context3.next = 15;
+          break;
+        case 14:
+          // 如果在"方案管理"标签页，直接获取当前 Grid 状态
+          columnStateToSave = gridApi.getColumnState();
+        case 15:
+          _context3.next = 17;
+          return schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.createScheme(schemeName.trim(), columnStateToSave, {
             description: schemeDescription.trim() || "\u521B\u5EFA\u4E8E ".concat(new Date().toLocaleString())
           });
-        case 7:
-          newScheme = _context2.sent;
+        case 17:
+          newScheme = _context3.sent;
           _antd.message.success('方案保存成功');
           setSaveSchemeVisible(false);
           setSchemeName('');
@@ -269,27 +307,27 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
           // 切换到方案管理标签页,显示新创建的方案
           setActiveTab('schemes');
-          _context2.next = 18;
+          _context3.next = 28;
           break;
-        case 15:
-          _context2.prev = 15;
-          _context2.t0 = _context2["catch"](4);
-          _antd.message.error(_context2.t0.message || '保存方案失败');
-        case 18:
+        case 25:
+          _context3.prev = 25;
+          _context3.t0 = _context3["catch"](3);
+          _antd.message.error(_context3.t0.message || '保存方案失败');
+        case 28:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2, null, [[4, 15]]);
-  })), [gridApi, schemeManager, schemeName, schemeDescription]);
+    }, _callee3, null, [[3, 25]]);
+  })), [gridApi, schemeManager, schemeName, schemeDescription, activeTab, form, type]);
 
   // 加载方案
   var handleLoadScheme = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(schemeId) {
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(schemeId) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            _context3.prev = 0;
-            _context3.next = 3;
+            _context4.prev = 0;
+            _context4.next = 3;
             return schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.loadScheme(schemeId);
           case 3:
             _antd.message.success('方案已加载');
@@ -306,76 +344,76 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
             // 自动关闭弹窗,让用户看到Grid的变化
             onClose();
-            _context3.next = 11;
+            _context4.next = 11;
             break;
           case 8:
-            _context3.prev = 8;
-            _context3.t0 = _context3["catch"](0);
-            _antd.message.error(_context3.t0.message || '加载方案失败');
+            _context4.prev = 8;
+            _context4.t0 = _context4["catch"](0);
+            _antd.message.error(_context4.t0.message || '加载方案失败');
           case 11:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3, null, [[0, 8]]);
+      }, _callee4, null, [[0, 8]]);
     }));
     return function (_x) {
-      return _ref4.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }(), [schemeManager, form, getColumnData, onClose]);
 
   // 设置默认方案
   var handleSetDefault = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(schemeId) {
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(schemeId) {
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            _context4.prev = 0;
-            _context4.next = 3;
+            _context5.prev = 0;
+            _context5.next = 3;
             return schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.setDefaultScheme(schemeId);
           case 3:
             _antd.message.success('已设置为默认方案');
-            _context4.next = 9;
+            _context5.next = 9;
             break;
           case 6:
-            _context4.prev = 6;
-            _context4.t0 = _context4["catch"](0);
-            _antd.message.error(_context4.t0.message || '设置失败');
+            _context5.prev = 6;
+            _context5.t0 = _context5["catch"](0);
+            _antd.message.error(_context5.t0.message || '设置失败');
           case 9:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4, null, [[0, 6]]);
+      }, _callee5, null, [[0, 6]]);
     }));
     return function (_x2) {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }(), [schemeManager]);
 
   // 删除方案
   var handleDeleteScheme = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(schemeId, schemeName) {
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(schemeId, schemeName) {
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
-            _context5.prev = 0;
-            _context5.next = 3;
+            _context6.prev = 0;
+            _context6.next = 3;
             return schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.deleteScheme(schemeId);
           case 3:
             _antd.message.success("\u65B9\u6848\"".concat(schemeName, "\"\u5DF2\u5220\u9664"));
-            _context5.next = 9;
+            _context6.next = 9;
             break;
           case 6:
-            _context5.prev = 6;
-            _context5.t0 = _context5["catch"](0);
-            _antd.message.error(_context5.t0.message || '删除失败');
+            _context6.prev = 6;
+            _context6.t0 = _context6["catch"](0);
+            _antd.message.error(_context6.t0.message || '删除失败');
           case 9:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
-      }, _callee5, null, [[0, 6]]);
+      }, _callee6, null, [[0, 6]]);
     }));
     return function (_x3, _x4) {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }(), [schemeManager]);
 
@@ -387,18 +425,18 @@ var ColumnSetting = function ColumnSetting(_ref) {
   }, []);
 
   // 保存编辑
-  var handleSaveEdit = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-      while (1) switch (_context6.prev = _context6.next) {
+  var handleSaveEdit = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+    return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+      while (1) switch (_context7.prev = _context7.next) {
         case 0:
           if (editingId) {
-            _context6.next = 2;
+            _context7.next = 2;
             break;
           }
-          return _context6.abrupt("return");
+          return _context7.abrupt("return");
         case 2:
-          _context6.prev = 2;
-          _context6.next = 5;
+          _context7.prev = 2;
+          _context7.next = 5;
           return schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.updateScheme(editingId, {
             name: editingName.trim(),
             description: editingDescription.trim() || undefined
@@ -406,17 +444,17 @@ var ColumnSetting = function ColumnSetting(_ref) {
         case 5:
           _antd.message.success('更新成功');
           setEditingId(null);
-          _context6.next = 12;
+          _context7.next = 12;
           break;
         case 9:
-          _context6.prev = 9;
-          _context6.t0 = _context6["catch"](2);
-          _antd.message.error(_context6.t0.message || '更新失败');
+          _context7.prev = 9;
+          _context7.t0 = _context7["catch"](2);
+          _antd.message.error(_context7.t0.message || '更新失败');
         case 12:
         case "end":
-          return _context6.stop();
+          return _context7.stop();
       }
-    }, _callee6, null, [[2, 9]]);
+    }, _callee7, null, [[2, 9]]);
   })), [schemeManager, editingId, editingName, editingDescription]);
 
   // 筛选方案列表