@nokecy/qc-ui 1.0.82 → 1.0.84

package/dist/cjs/ag-grid-plus/_utils/processColumnGroups.d.ts

@@ -1,2 +1,11 @@
+/**
+ * 处理列分组配置
+ * 兼容新旧两种数据格式：
+ * 1. 新格式：FlatColumnItem[] (带有 type, parentId, level)
+ * 2. 旧格式：{ groupName: string } (简单的分组名称)
+ *
+ * @param columns 列配置数组
+ * @returns AG-Grid 列定义
+ */
 declare const processColumnGroups: (columns: any[]) => any;
 export default processColumnGroups;

package/dist/cjs/ag-grid-plus/_utils/processColumnGroups.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _columnGroupUtils = require("../setting/columnGroupUtils");
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -16,7 +17,49 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/**
+ * 处理列分组配置
+ * 兼容新旧两种数据格式：
+ * 1. 新格式：FlatColumnItem[] (带有 type, parentId, level)
+ * 2. 旧格式：{ groupName: string } (简单的分组名称)
+ *
+ * @param columns 列配置数组
+ * @returns AG-Grid 列定义
+ */
 var processColumnGroups = function processColumnGroups(columns) {
+  // 如果是空数组，直接返回
+  if (!columns || columns.length === 0) {
+    return [];
+  }
+
+  // 检查是否已经是标准 AG-Grid 格式（带 children 的分组）
+  // 如果列定义中有 children 属性，说明已经是 AG-Grid 标准格式，直接返回
+  var hasStandardGroups = columns.some(function (col) {
+    return col.children && Array.isArray(col.children);
+  });
+  if (hasStandardGroups) {
+    // 标准格式：直接返回，不做任何处理
+    return columns;
+  }
+
+  // 检查是否是新格式（FlatColumnItem）
+  var isNewFormat = columns.some(function (col) {
+    return col.type !== undefined;
+  });
+  if (isNewFormat) {
+    // 新格式：使用 flatConfigToGridState 转换
+    return (0, _columnGroupUtils.flatConfigToGridState)(columns);
+  }
+
+  // 旧格式：使用旧的处理逻辑
+  // 检查是否需要迁移
+  if ((0, _columnGroupUtils.isOldSchemeData)(columns)) {
+    // 先迁移到新格式，再转换
+    var migrated = (0, _columnGroupUtils.migrateOldScheme)(columns);
+    return (0, _columnGroupUtils.flatConfigToGridState)(migrated);
+  }
+
+  // 兼容最原始的格式（groupName）
   var groupMap = new Map();
   var result = [];
   var ungrouped = [];

package/dist/cjs/ag-grid-plus/ag-gridPlus.js

@@ -58,7 +58,7 @@ var getSort = function getSort(columnState) {
   return columnState ? "".concat(columnState.colId, " ").concat(columnState.sort) : "";
 };
 function AgGridPlus(props) {
-  var _querySchemeManager$c;
+  var _columnSchemeManager$2, _querySchemeManager$c;
   var style = props.style,
     loadingProps = props.loading,
     gridParams = props.params,
@@ -172,12 +172,16 @@ function AgGridPlus(props) {
     storageAdapter: globalColumnAdapter || columnSchemeStorageAdapter,
     enableAutoSave: true,
     onSchemeChange: function onSchemeChange(scheme) {
-      if (scheme && apiRef.current) {
-        apiRef.current.applyColumnState({
-          state: scheme.columnState,
-          applyOrder: true
-        });
-      }
+      console.log('[AgGridPlus] onSchemeChange 被调用:', {
+        hasScheme: !!scheme,
+        hasApiRef: !!apiRef.current,
+        schemeId: scheme === null || scheme === void 0 ? void 0 : scheme.id,
+        schemeName: scheme === null || scheme === void 0 ? void 0 : scheme.name,
+        hasColumnConfig: !!(scheme !== null && scheme !== void 0 && scheme.columnConfig)
+      });
+
+      // 注意: 方案应用已由 useEffect 处理
+      // useEffect 会在 apiRef 和 currentScheme 都准备好时自动应用方案
     }
   }) : undefined;
 
@@ -242,37 +246,121 @@ function AgGridPlus(props) {
 
   // 加载列方案
   (0, _react.useEffect)(function () {
-    if (!gridPlusColumnState || !gridKey || !apiRef.current) return;
-    var currentState = gridPlusColumnState[gridKey];
-    if (!currentState) return;
-    setColumnCellClass(handelgridPlusColumnState(currentState));
-    var timer = setTimeout(function () {
-      var _apiRef$current;
-      (_apiRef$current = apiRef.current) === null || _apiRef$current === void 0 || _apiRef$current.applyColumnState({
-        state: currentState,
-        applyOrder: true
-      });
-    }, 10);
-    return function () {
-      return clearTimeout(timer);
-    };
-  }, [gridPlusColumnState, gridKey]);
+    var _columnSchemeManager$;
+    if (!gridKey || !apiRef.current) return;
 
-  // 当 gridApi 就绪且有当前方案时，应用列方案
+    // 优先使用方案中的 columnConfig（用户在列配置界面调整后的数据）
+    if (columnSchemeManager !== null && columnSchemeManager !== void 0 && (_columnSchemeManager$ = columnSchemeManager.currentScheme) !== null && _columnSchemeManager$ !== void 0 && _columnSchemeManager$.columnConfig) {
+      var _require = require("./setting/columnGroupUtils"),
+        flatConfigToColumnState = _require.flatConfigToColumnState;
+      var _columnState = flatConfigToColumnState(columnSchemeManager.currentScheme.columnConfig);
+      setColumnCellClass(handelgridPlusColumnState(_columnState));
+      var timer = setTimeout(function () {
+        var _apiRef$current;
+        (_apiRef$current = apiRef.current) === null || _apiRef$current === void 0 || _apiRef$current.applyColumnState({
+          state: _columnState,
+          applyOrder: true
+        });
+      }, 10);
+      return function () {
+        return clearTimeout(timer);
+      };
+    }
+    // 后备方案：使用旧的 gridPlusColumnState
+    else if (gridPlusColumnState !== null && gridPlusColumnState !== void 0 && gridPlusColumnState[gridKey]) {
+      var currentState = gridPlusColumnState[gridKey];
+      setColumnCellClass(handelgridPlusColumnState(currentState));
+      var _timer = setTimeout(function () {
+        var _apiRef$current2;
+        (_apiRef$current2 = apiRef.current) === null || _apiRef$current2 === void 0 || _apiRef$current2.applyColumnState({
+          state: currentState,
+          applyOrder: true
+        });
+      }, 10);
+      return function () {
+        return clearTimeout(_timer);
+      };
+    }
+  }, [gridKey, columnSchemeManager === null || columnSchemeManager === void 0 || (_columnSchemeManager$2 = columnSchemeManager.currentScheme) === null || _columnSchemeManager$2 === void 0 ? void 0 : _columnSchemeManager$2.columnConfig, gridPlusColumnState]);
+
+  // 同步 apiRef 和 currentScheme,确保方案在两者都准备好时应用
   (0, _react.useEffect)(function () {
+    var _currentScheme$column;
     var currentScheme = columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme;
-    if (!apiRef.current || !currentScheme) return;
-    var timer = setTimeout(function () {
-      var _apiRef$current2;
-      (_apiRef$current2 = apiRef.current) === null || _apiRef$current2 === void 0 || _apiRef$current2.applyColumnState({
-        state: currentScheme.columnState,
-        applyOrder: true
+
+    // 两个依赖都不存在时,直接返回
+    if (!apiRef.current || !currentScheme) {
+      console.log('[AgGridPlus] useEffect: 等待依赖准备', {
+        hasApiRef: !!apiRef.current,
+        hasCurrentScheme: !!currentScheme
       });
+      return;
+    }
+    console.log('[AgGridPlus] useEffect: 两个依赖都准备好,应用方案', {
+      schemeId: currentScheme.id,
+      schemeName: currentScheme.name,
+      hasColumnConfig: !!currentScheme.columnConfig,
+      columnConfigCount: ((_currentScheme$column = currentScheme.columnConfig) === null || _currentScheme$column === void 0 ? void 0 : _currentScheme$column.length) || 0
+    });
+    var timer = setTimeout(function () {
+      // 优先使用 columnConfig(包含完整的分组结构)
+      if (currentScheme.columnConfig) {
+        var _require2 = require("./setting/columnGroupUtils"),
+          flatConfigToGridState = _require2.flatConfigToGridState;
+        var gridColumnDefs = flatConfigToGridState(currentScheme.columnConfig);
+        console.log('[AgGridPlus] useEffect: 应用方案的 columnConfig:', {
+          columnConfig: currentScheme.columnConfig,
+          columnConfigLength: currentScheme.columnConfig.length,
+          gridColumnDefs: gridColumnDefs,
+          gridColumnDefsLength: gridColumnDefs.length,
+          columnConfigDetail: currentScheme.columnConfig.map(function (item) {
+            return {
+              type: item.type,
+              field: item.field,
+              headerName: item.headerName,
+              order: item.order,
+              parentId: item.parentId
+            };
+          }),
+          gridColumnDefsDetail: gridColumnDefs.map(function (def, idx) {
+            var _def$children;
+            return {
+              index: idx,
+              field: def.field,
+              headerName: def.headerName,
+              groupId: def.groupId,
+              children: (_def$children = def.children) === null || _def$children === void 0 ? void 0 : _def$children.length
+            };
+          })
+        });
+
+        // 1. 先设置列定义(包含分组结构)
+        if (apiRef.current) {
+          apiRef.current.setGridOption("columnDefs", gridColumnDefs);
+
+          // 等待 columnDefs 应用完成后再设置过滤器
+          // 原因: setGridOption("columnDefs") 会触发 Grid 重新渲染,可能重置内部状态
+          // 必须在下一个渲染周期后应用 filterModel,否则会被覆盖
+          if (currentScheme.filterModel) {
+            requestAnimationFrame(function () {
+              if (apiRef.current) {
+                console.log('[AgGridPlus] 应用过滤器状态:', currentScheme.filterModel);
+                apiRef.current.setFilterModel(currentScheme.filterModel);
+              }
+            });
+          }
+        }
+
+        // 2. 【重要修改】使用 columnConfig 时，不应用 columnState
+        // 原因：columnConfig 已经包含了完整的列配置（宽度、隐藏、顺序、分组等）
+        // 如果再应用 columnState，会导致分组子列被视为独立列，破坏分组结构
+        console.log('[AgGridPlus] useEffect: 使用 columnConfig，跳过 columnState 应用');
+      }
     }, 10);
     return function () {
       return clearTimeout(timer);
     };
-  }, [columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme]);
+  }, [apiRef.current, columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme]);
   (0, _react.useEffect)(function () {
     setRowData(dataSource || propRowData || []);
   }, [dataSource, propRowData]);
@@ -308,96 +396,116 @@ function AgGridPlus(props) {
     return colDef.customCellRenderer(params);
   };
 
-  // 获取表格列定义
-  var getTableColumns = function getTableColumns(rowDataList) {
-    var data = rowDataList.length > 0 ? rowDataList[0] : {};
-    var columnProps = _react.default.Children.map(children, function (child, index) {
-      return _objectSpread({}, child.props);
-    });
-    var columnDefs = !columnProps ? props.columnDefs ? props.columnDefs : [] : columnProps;
-    columnDefs = columnDefs.map(function (col) {
-      var dataType = getDataType(data, col.field || '', col.valueEnum);
-      if (col.valueEnum && Array.isArray(col.valueEnum)) {
-        var _defaultItems$0$value, _defaultItems$;
-        // 统计默认值
-        var valueEnum = col.valueEnum; // 保存引用以便TypeScript理解
-        var defaultItems = valueEnum.filter(function (item) {
-          return item.default;
+  // 辅助函数: 处理单个列配置
+  var processColumnConfig = function processColumnConfig(col, data) {
+    var dataType = getDataType(data, col.field || '', col.valueEnum);
+    if (col.valueEnum && Array.isArray(col.valueEnum)) {
+      var _defaultItems$0$value, _defaultItems$;
+      // 统计默认值
+      var valueEnum = col.valueEnum; // 保存引用以便TypeScript理解
+      var defaultItems = valueEnum.filter(function (item) {
+        return item.default;
+      });
+      var isMultiple = defaultItems.length > 1;
+      var defaultValue = isMultiple ? defaultItems.map(function (item) {
+        return item.value;
+      }) : (_defaultItems$0$value = (_defaultItems$ = defaultItems[0]) === null || _defaultItems$ === void 0 ? void 0 : _defaultItems$.value) !== null && _defaultItems$0$value !== void 0 ? _defaultItems$0$value : undefined;
+      var valueFormatter = function valueFormatter(params) {
+        var match = valueEnum.find(function (item) {
+          return item.value == params.value;
         });
-        var isMultiple = defaultItems.length > 1;
-        var defaultValue = isMultiple ? defaultItems.map(function (item) {
-          return item.value;
-        }) : (_defaultItems$0$value = (_defaultItems$ = defaultItems[0]) === null || _defaultItems$ === void 0 ? void 0 : _defaultItems$.value) !== null && _defaultItems$0$value !== void 0 ? _defaultItems$0$value : undefined;
-        var valueFormatter = function valueFormatter(params) {
+        return match ? match.label : params.value;
+      };
+      return _objectSpread(_objectSpread(_objectSpread({}, dataType), col), {}, {
+        cellRenderer: function cellRenderer(params) {
           var match = valueEnum.find(function (item) {
             return item.value == params.value;
           });
-          return match ? match.label : params.value;
-        };
-        return _objectSpread(_objectSpread(_objectSpread({}, dataType), col), {}, {
-          cellRenderer: function cellRenderer(params) {
-            var match = valueEnum.find(function (item) {
-              return item.value == params.value;
-            });
-            if (match) {
-              var color = match.color || '#ffffff';
-              return /*#__PURE__*/_react.default.createElement("span", {
-                style: {
-                  color: color,
-                  backgroundColor: 'transparent',
-                  fontWeight: 500
-                }
-              }, match.label);
-            }
-            return params.value;
-          },
-          filterParams: _objectSpread(_objectSpread({}, col.filterParams || {}), {}, {
-            valueFormatter: valueFormatter
-          }),
-          searchComponent: _antdV.Select,
-          searchComponentProps: {
-            options: col.valueEnum.map(function (item) {
-              return {
-                label: item.label,
-                value: item.value
-              };
-            }),
-            mode: isMultiple ? "multiple" : undefined,
-            defaultValue: defaultValue
-          }
-        });
-      }
-      if (col.type || typeof col.cellRenderer == "string") {
-        return _objectSpread({}, col);
-      }
-      //@ts-ignore
-      if (col !== null && col !== void 0 && col.ellipsis) {
-        return _objectSpread(_objectSpread({}, col), {}, {
-          cellRenderer: function cellRenderer(_ref) {
-            var value = _ref.value;
-            return /*#__PURE__*/_react.default.createElement(Text, {
-              ellipsis: {
-                tooltip: value
-              },
+          if (match) {
+            var color = match.color || '#ffffff';
+            return /*#__PURE__*/_react.default.createElement("span", {
               style: {
-                display: 'flex',
-                justifyContent: 'center',
-                alignItems: 'center'
+                color: color,
+                backgroundColor: 'transparent',
+                fontWeight: 500
               }
-            }, value);
+            }, match.label);
           }
-        });
-      }
-      if (col.cellRenderer) {
-        return _objectSpread(_objectSpread({}, col), {}, {
-          customCellRenderer: col.cellRenderer,
-          cellRenderer: cellRenderer
-        });
-      }
-      return _objectSpread(_objectSpread(_objectSpread({}, dataType), col), {}, {
+          return params.value;
+        },
+        filterParams: _objectSpread(_objectSpread({}, col.filterParams || {}), {}, {
+          valueFormatter: valueFormatter
+        }),
+        searchComponent: _antdV.Select,
+        searchComponentProps: {
+          options: col.valueEnum.map(function (item) {
+            return {
+              label: item.label,
+              value: item.value
+            };
+          }),
+          mode: isMultiple ? "multiple" : undefined,
+          defaultValue: defaultValue
+        }
+      });
+    }
+    if (col.type || typeof col.cellRenderer == "string") {
+      return _objectSpread({}, col);
+    }
+    //@ts-ignore
+    if (col !== null && col !== void 0 && col.ellipsis) {
+      return _objectSpread(_objectSpread({}, col), {}, {
+        cellRenderer: function cellRenderer(_ref) {
+          var value = _ref.value;
+          return /*#__PURE__*/_react.default.createElement(Text, {
+            ellipsis: {
+              tooltip: value
+            },
+            style: {
+              display: 'flex',
+              justifyContent: 'center',
+              alignItems: 'center'
+            }
+          }, value);
+        }
+      });
+    }
+    if (col.cellRenderer) {
+      return _objectSpread(_objectSpread({}, col), {}, {
         customCellRenderer: col.cellRenderer,
         cellRenderer: cellRenderer
       });
+    }
+    return _objectSpread(_objectSpread(_objectSpread({}, dataType), col), {}, {
+      customCellRenderer: col.cellRenderer,
+      cellRenderer: cellRenderer
+    });
+  };
+
+  // 获取表格列定义
+  var getTableColumns = function getTableColumns(rowDataList) {
+    var data = rowDataList.length > 0 ? rowDataList[0] : {};
+    var columnProps = _react.default.Children.map(children, function (child, index) {
+      return _objectSpread({}, child.props);
+    });
+    var columnDefs = !columnProps ? props.columnDefs ? props.columnDefs : [] : columnProps;
+
+    // 递归处理列配置（包括分组的 children）
+    var processColumnDefRecursively = function processColumnDefRecursively(col) {
+      // 如果有 children（分组列），递归处理每个子列
+      if (col.children && Array.isArray(col.children)) {
+        return _objectSpread(_objectSpread({}, col), {}, {
+          children: col.children.map(function (child) {
+            return processColumnDefRecursively(child);
+          })
+        });
+      }
+
+      // 处理普通列
+      return processColumnConfig(col, data);
+    };
+    columnDefs = columnDefs.map(function (col) {
+      return processColumnDefRecursively(col);
     });
     extensibleColumns && gridKey && extensibleColumns[gridKey] && extensibleColumns[gridKey].map(function (column) {
       columnDefs.push({
@@ -472,7 +580,14 @@ function AgGridPlus(props) {
     };
   }, [propsRowSelection, enableClickSelection]);
   var onGridReady = (0, _react.useCallback)(function (params) {
-    var _apiRef$current3;
+    var _columnSchemeManager$3, _columnSchemeManager$4, _columnSchemeManager$5, _apiRef$current3;
+    console.log('[AgGridPlus] onGridReady 被调用:', {
+      hasColumnSchemeManager: !!columnSchemeManager,
+      hasCurrentScheme: !!(columnSchemeManager !== null && columnSchemeManager !== void 0 && columnSchemeManager.currentScheme),
+      currentSchemeId: columnSchemeManager === null || columnSchemeManager === void 0 || (_columnSchemeManager$3 = columnSchemeManager.currentScheme) === null || _columnSchemeManager$3 === void 0 ? void 0 : _columnSchemeManager$3.id,
+      currentSchemeName: columnSchemeManager === null || columnSchemeManager === void 0 || (_columnSchemeManager$4 = columnSchemeManager.currentScheme) === null || _columnSchemeManager$4 === void 0 ? void 0 : _columnSchemeManager$4.name,
+      hasColumnConfig: !!(columnSchemeManager !== null && columnSchemeManager !== void 0 && (_columnSchemeManager$5 = columnSchemeManager.currentScheme) !== null && _columnSchemeManager$5 !== void 0 && _columnSchemeManager$5.columnConfig)
+    });
     apiRef.current = params.api;
     onReady && onReady(params);
     ///@ts-ignore
@@ -480,7 +595,10 @@ function AgGridPlus(props) {
     setColumnState((_apiRef$current3 = apiRef.current) === null || _apiRef$current3 === void 0 ? void 0 : _apiRef$current3.getColumnState());
     sortChanged(params.api);
     setReady(true);
-  }, [dataSource]);
+
+    // 注意: 方案应用已由 useEffect 处理,无需在这里重复应用
+    // useEffect 会在 apiRef 和 currentScheme 都准备好时自动应用方案
+  }, [dataSource, columnSchemeManager]);
   var onRequest = (0, _react.useCallback)(function (queryFilter) {
     if (!requestRef.current) return;
     setLoading(true);
@@ -814,21 +932,34 @@ function AgGridPlus(props) {
   };
   var colDefs = (0, _react.useMemo)(function () {
     var columnDefs = getTableColumns(rowData);
-    columnDefs = columnDefs.map(function (i) {
-      var cellConfig = columnCellClass[i.field];
+
+    // 递归应用 columnCellClass 配置
+    var applyCellConfig = function applyCellConfig(col) {
+      // 如果有 children,递归处理
+      if (col.children && Array.isArray(col.children)) {
+        return _objectSpread(_objectSpread({}, col), {}, {
+          children: col.children.map(applyCellConfig).filter(function (x) {
+            return !x.hideInTable;
+          })
+        });
+      }
+
+      // 处理普通列
+      var cellConfig = columnCellClass[col.field];
       if (cellConfig) {
         if (cellConfig.cellClass) {
-          i.cellClass = cellConfig.cellClass;
+          col.cellClass = cellConfig.cellClass;
         }
         if (cellConfig.groupName) {
-          i.groupName = cellConfig.groupName;
+          col.groupName = cellConfig.groupName;
         }
         if (cellConfig.suppressHeaderFilterButton !== undefined) {
-          i.suppressHeaderFilterButton = !cellConfig.suppressHeaderFilterButton;
+          col.suppressHeaderFilterButton = !cellConfig.suppressHeaderFilterButton;
         }
       }
-      return i;
-    }).filter(function (x) {
+      return col;
+    };
+    columnDefs = columnDefs.map(applyCellConfig).filter(function (x) {
       return !x.hideInTable;
     });
     var processedColumns = (0, _processColumnGroups.default)(columnDefs);
@@ -991,8 +1122,8 @@ function AgGridPlus(props) {
     onDragStopped: function onDragStopped(e) {
       if (apiRef.current) {
         var _apiRef$current7;
-        var _columnState = (_apiRef$current7 = apiRef.current) === null || _apiRef$current7 === void 0 ? void 0 : _apiRef$current7.getColumnState();
-        setColumnState(_columnState);
+        var _columnState2 = (_apiRef$current7 = apiRef.current) === null || _apiRef$current7 === void 0 ? void 0 : _apiRef$current7.getColumnState();
+        setColumnState(_columnState2);
 
         // onColumnStateChanged && onColumnStateChanged(columnState)
       }

package/dist/cjs/ag-grid-plus/querySchemes/components/QuerySchemesManager.js

@@ -7,10 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.QuerySchemesManager = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
+var _draggableModal = _interopRequireDefault(require("../../../draggableModal"));
 var _icons = require("@ant-design/icons");
 var _reactDnd = require("react-dnd");
 var _reactDndHtml5Backend = require("react-dnd-html5-backend");
 require("./QuerySchemesManager.less");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
@@ -202,7 +204,7 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
         case 0:
           _context.prev = 0;
           if (!currentScheme) {
-            _context.next = 4;
+            _context.next = 7;
             break;
           }
           _context.next = 4;
@@ -210,24 +212,32 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
             itemsOrder: editingOrder
           });
         case 4:
+          _antd.message.success('已应用新顺序');
+          _context.next = 10;
+          break;
+        case 7:
+          _context.next = 9;
+          return createScheme('默认方案', editingOrder);
+        case 9:
+          _antd.message.success('已自动创建并应用默认方案');
+        case 10:
           // 应用顺序到表单
           onOrderChange(editingOrder);
-          _antd.message.success('已应用新顺序');
 
           // 关闭弹窗,让用户看到效果
           onClose();
-          _context.next = 12;
+          _context.next = 17;
           break;
-        case 9:
-          _context.prev = 9;
+        case 14:
+          _context.prev = 14;
           _context.t0 = _context["catch"](0);
           _antd.message.error(_context.t0.message || '应用失败');
-        case 12:
+        case 17:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0, 9]]);
-  })), [editingOrder, onOrderChange, currentScheme, saveScheme, onClose]);
+    }, _callee, null, [[0, 14]]);
+  })), [editingOrder, onOrderChange, currentScheme, saveScheme, createScheme, onClose]);
 
   /**
    * 保存为新方案
@@ -445,7 +455,7 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
       return _ref9.apply(this, arguments);
     };
   }(), [loadScheme, schemes, onOrderChange]);
-  return /*#__PURE__*/_react.default.createElement(_antd.Modal, {
+  return /*#__PURE__*/_react.default.createElement(_draggableModal.default, {
     title: "\u67E5\u8BE2\u65B9\u6848\u8BBE\u7F6E",
     open: visible,
     onCancel: onClose,

package/dist/cjs/ag-grid-plus/querySchemes/hooks/useQuerySchemes.js

@@ -329,18 +329,40 @@ function useQuerySchemes(config) {
             _context5.next = 12;
             return saveSchemesToStorage(updatedSchemes);
           case 12:
+            // 自动激活新创建的方案
+            setCurrentScheme(newScheme);
+            setIsDirty(false);
+
+            // 保存当前方案ID，用于刷新后恢复
+            if (!storageAdapter.saveCurrentSchemeId) {
+              _context5.next = 23;
+              break;
+            }
+            _context5.prev = 15;
+            _context5.next = 18;
+            return storageAdapter.saveCurrentSchemeId(gridId, newScheme.id);
+          case 18:
+            _context5.next = 23;
+            break;
+          case 20:
+            _context5.prev = 20;
+            _context5.t0 = _context5["catch"](15);
+            console.error('[useQuerySchemes] 保存当前方案ID失败:', _context5.t0);
+          case 23:
+            // 触发方案变更回调
+            onSchemeChange === null || onSchemeChange === void 0 || onSchemeChange(newScheme);
             onSchemeSave === null || onSchemeSave === void 0 || onSchemeSave(newScheme);
             return _context5.abrupt("return", newScheme);
-          case 14:
+          case 26:
           case "end":
             return _context5.stop();
         }
-      }, _callee5);
+      }, _callee5, null, [[15, 20]]);
     }));
     return function (_x4, _x5, _x6) {
       return _ref5.apply(this, arguments);
     };
-  }(), [schemes, saveSchemesToStorage, onSchemeSave]);
+  }(), [schemes, gridId, storageAdapter, saveSchemesToStorage, onSchemeChange, onSchemeSave]);
 
   /**
    * 更新方案信息（不影响 itemsOrder）