@nokecy/qc-ui 1.1.2 → 1.1.4

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

@@ -29,6 +29,7 @@ var _locale = require("./locale");
 var _gridContext = require("./context/gridContext");
 var _useSchemeManager = require("./context/useSchemeManager");
 var _useSchemeDataFlow = require("./context/useSchemeDataFlow");
+var _schemeDataMigration = require("./shared/utils/schemeDataMigration");
 var _sanitize = require("./utils/sanitize");
 var _errors = require("./errors");
 var _logger = require("./utils/logger");
@@ -1063,7 +1064,8 @@ function AgGridPlus(props) {
 
   // 使用顺序管理器处理排序
   var orderedFormItems = (0, _react.useMemo)(function () {
-    var itemsOrder = (currentQueryScheme === null || currentQueryScheme === void 0 ? void 0 : currentQueryScheme.itemsOrder) || queryItemsOrder;
+    // 从查询方案提取字段顺序
+    var itemsOrder = currentQueryScheme ? (0, _schemeDataMigration.extractItemsOrder)(currentQueryScheme) : queryItemsOrder;
     if (!itemsOrder || itemsOrder.length === 0) {
       return queryFormItems;
     }
@@ -1078,18 +1080,19 @@ function AgGridPlus(props) {
       return indexA - indexB;
     });
     return ordered;
-  }, [queryFormItems, currentQueryScheme === null || currentQueryScheme === void 0 ? void 0 : currentQueryScheme.itemsOrder, queryItemsOrder]);
+  }, [queryFormItems, currentQueryScheme, queryItemsOrder]);
 
   // 根据方案的隐藏字段过滤表单项
   var visibleFormItems = (0, _react.useMemo)(function () {
-    var hiddenFields = (currentQueryScheme === null || currentQueryScheme === void 0 ? void 0 : currentQueryScheme.hiddenFields) || [];
+    // 从查询方案提取隐藏字段
+    var hiddenFields = currentQueryScheme ? (0, _schemeDataMigration.extractHiddenFields)(currentQueryScheme) : [];
     if (hiddenFields.length === 0) {
       return orderedFormItems;
     }
     return orderedFormItems.filter(function (item) {
       return !hiddenFields.includes(item.field);
     });
-  }, [orderedFormItems, currentQueryScheme === null || currentQueryScheme === void 0 ? void 0 : currentQueryScheme.hiddenFields]);
+  }, [orderedFormItems, currentQueryScheme]);
   (0, _react.useEffect)(function () {
     calculateSum();
   }, [calculateSum]);
@@ -1119,7 +1122,7 @@ function AgGridPlus(props) {
       applyToGlobal: applyToGlobal,
       resetCurrent: resetCurrent,
       resetAll: resetAll,
-      currentQueryOrder: (currentQueryScheme === null || currentQueryScheme === void 0 ? void 0 : currentQueryScheme.itemsOrder) || queryItemsOrder,
+      currentQueryOrder: currentQueryScheme ? (0, _schemeDataMigration.extractItemsOrder)(currentQueryScheme) : queryItemsOrder,
       updateQueryOrder: setQueryItemsOrder,
       queryFormItems: queryFormItems,
       // ========== 方案管理 API（透传给子组件） ==========
@@ -1141,7 +1144,7 @@ function AgGridPlus(props) {
     };
   }, [extensibleColumns, gridPlusColumnState, allColDefsRef.current,
   // 【修复】添加到依赖数组
-  onSaveColumnState, applyToGlobal, resetCurrent, resetAll, currentQueryScheme === null || currentQueryScheme === void 0 ? void 0 : currentQueryScheme.itemsOrder, queryItemsOrder, queryFormItems,
+  onSaveColumnState, applyToGlobal, resetCurrent, resetAll, currentQueryScheme, queryItemsOrder, queryFormItems,
   // 方案管理依赖
   columnSchemes, querySchemes, currentSchemes, schemesLoading, lastSyncTime, saveColumnScheme, deleteColumnScheme, saveQueryScheme, deleteQueryScheme, setCurrentColumnScheme, setCurrentQueryScheme, refreshSchemes, getColumnSchemes, getQuerySchemes, getCurrentScheme]);
   return /*#__PURE__*/_react.default.createElement(_gridContext.GridPlusContext.Provider, {

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

@@ -225,7 +225,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
    * 将扁平化配置转换回 Grid State 并应用到 AG-Grid
    */
   var handleSaveColumns = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var values, flatConfig, configToSave, gridColumnDefs, columnState;
+    var values, flatConfig, configToSave, invalidColumns, gridColumnDefs, columnState;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -243,16 +243,28 @@ var ColumnSetting = function ColumnSetting(_ref) {
             _antd.message.info('检测到旧版本配置，已自动迁移到新格式');
           }
 
+          // 【修复】验证数据完整性，过滤掉无效的列配置
+          invalidColumns = configToSave.filter(function (item) {
+            return item.type === 'column' && !item.field;
+          });
+          if (invalidColumns.length > 0) {
+            _antd.message.warning("\u68C0\u6D4B\u5230 ".concat(invalidColumns.length, " \u4E2A\u5217\u7F3A\u5C11 field \u5B57\u6BB5\uFF0C\u5DF2\u81EA\u52A8\u8FC7\u6EE4"));
+            console.warn('[ColumnSetting] 无效的列配置:', invalidColumns);
+            configToSave = configToSave.filter(function (item) {
+              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 = 10;
+          _context2.next = 12;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 100);
           });
-        case 10:
+        case 12:
           // 【修复】然后应用列状态（宽度、隐藏、顺序等）
           columnState = (0, _columnGroupUtils.flatConfigToColumnState)(configToSave);
           gridApi.applyColumnState({
@@ -344,7 +356,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
           // message.success 已经在上面的逻辑中处理了
           onClose();
-        case 15:
+        case 17:
         case "end":
           return _context2.stop();
       }

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

@@ -14,6 +14,7 @@ var _reactDndHtml5Backend = require("react-dnd-html5-backend");
 var _useSchemeManager = require("../context/useSchemeManager");
 var _gridContext = require("../context/gridContext");
 var _uuid = require("uuid");
+var _schemeDataMigration = require("../shared/utils/schemeDataMigration");
 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; }
@@ -195,8 +196,8 @@ var QuerySchemeManager = function QuerySchemeManager(_ref2) {
         setEditingOrder(defaultOrder);
       }
 
-      // 初始化隐藏字段
-      setHiddenFields((currentScheme === null || currentScheme === void 0 ? void 0 : currentScheme.hiddenFields) || []);
+      // 初始化隐藏字段 - 使用新格式提取器
+      setHiddenFields(currentScheme ? (0, _schemeDataMigration.extractHiddenFields)(currentScheme) : []);
     }
   }, [visible, currentQueryOrder, queryFormItems, currentScheme]);
 
@@ -244,68 +245,67 @@ var QuerySchemeManager = function QuerySchemeManager(_ref2) {
    * 应用当前顺序和隐藏设置
    */
   var handleApplyOrder = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var newScheme;
+    var queryConfig, newScheme;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.prev = 0;
+          // 构建新格式的配置
+          queryConfig = (0, _schemeDataMigration.buildQueryConfig)(editingOrder, hiddenFields); // 如果有当前方案,更新方案
           if (!currentScheme) {
-            _context.next = 7;
+            _context.next = 8;
             break;
           }
-          _context.next = 4;
+          _context.next = 5;
           return saveQueryScheme === null || saveQueryScheme === void 0 ? void 0 : saveQueryScheme(gridKey, _objectSpread(_objectSpread({}, currentScheme), {}, {
-            itemsOrder: editingOrder,
-            hiddenFields: hiddenFields,
+            queryConfig: queryConfig,
             updatedAt: Date.now()
           }));
-        case 4:
+        case 5:
           _antd.message.success('已应用新配置');
-          _context.next = 13;
+          _context.next = 14;
           break;
-        case 7:
+        case 8:
           // 创建新方案
           newScheme = {
             id: (0, _uuid.v4)(),
             name: '默认方案',
             description: '自动创建的默认查询方案',
-            itemsOrder: editingOrder,
-            hiddenFields: hiddenFields,
-            formValues: {},
+            queryConfig: queryConfig,
             isDefault: true,
             isSystem: false,
             createdAt: Date.now(),
             updatedAt: Date.now()
           };
-          _context.next = 10;
+          _context.next = 11;
           return saveQueryScheme === null || saveQueryScheme === void 0 ? void 0 : saveQueryScheme(gridKey, newScheme);
-        case 10:
-          _context.next = 12;
+        case 11:
+          _context.next = 13;
           return setCurrentQueryScheme === null || setCurrentQueryScheme === void 0 ? void 0 : setCurrentQueryScheme(gridKey, newScheme.id);
-        case 12:
-          _antd.message.success('已自动创建并应用默认方案');
         case 13:
+          _antd.message.success('已自动创建并应用默认方案');
+        case 14:
           // 应用顺序到表单
           updateQueryOrder === null || updateQueryOrder === void 0 || updateQueryOrder(editingOrder);
           onClose();
-          _context.next = 20;
+          _context.next = 21;
           break;
-        case 17:
-          _context.prev = 17;
+        case 18:
+          _context.prev = 18;
           _context.t0 = _context["catch"](0);
           _antd.message.error(_context.t0.message || '应用失败');
-        case 20:
+        case 21:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0, 17]]);
+    }, _callee, null, [[0, 18]]);
   })), [editingOrder, hiddenFields, currentScheme, saveQueryScheme, gridKey, updateQueryOrder, onClose, setCurrentQueryScheme]);
 
   /**
    * 保存为新方案
    */
   var handleSaveAsNew = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var newScheme;
+    var queryConfig, newScheme;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -317,34 +317,34 @@ var QuerySchemeManager = function QuerySchemeManager(_ref2) {
           return _context2.abrupt("return");
         case 3:
           _context2.prev = 3;
+          // 构建新格式的配置
+          queryConfig = (0, _schemeDataMigration.buildQueryConfig)(editingOrder, hiddenFields);
           newScheme = {
             id: (0, _uuid.v4)(),
             name: schemeName.trim(),
             description: '',
-            itemsOrder: editingOrder,
-            hiddenFields: hiddenFields,
-            formValues: {},
+            queryConfig: queryConfig,
             isDefault: false,
             isSystem: false,
             createdAt: Date.now(),
             updatedAt: Date.now()
           };
-          _context2.next = 7;
+          _context2.next = 8;
           return saveQueryScheme === null || saveQueryScheme === void 0 ? void 0 : saveQueryScheme(gridKey, newScheme);
-        case 7:
+        case 8:
           _antd.message.success('保存成功');
           setSchemeName('');
-          _context2.next = 14;
+          _context2.next = 15;
           break;
-        case 11:
-          _context2.prev = 11;
+        case 12:
+          _context2.prev = 12;
           _context2.t0 = _context2["catch"](3);
           _antd.message.error(_context2.t0.message || '保存失败');
-        case 14:
+        case 15:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[3, 11]]);
+    }, _callee2, null, [[3, 12]]);
   })), [schemeName, editingOrder, hiddenFields, saveQueryScheme, gridKey]);
 
   /**
@@ -523,7 +523,7 @@ var QuerySchemeManager = function QuerySchemeManager(_ref2) {
    */
   var handleApply = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(schemeId) {
-      var scheme;
+      var scheme, itemsOrder;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
@@ -534,9 +534,13 @@ var QuerySchemeManager = function QuerySchemeManager(_ref2) {
             scheme = schemes.find(function (s) {
               return s.id === schemeId;
             });
-            if (scheme && scheme.itemsOrder) {
-              updateQueryOrder === null || updateQueryOrder === void 0 || updateQueryOrder(scheme.itemsOrder);
-              _antd.message.success('方案已应用');
+            if (scheme) {
+              // 使用新格式提取器获取顺序
+              itemsOrder = (0, _schemeDataMigration.extractItemsOrder)(scheme);
+              if (itemsOrder.length > 0) {
+                updateQueryOrder === null || updateQueryOrder === void 0 || updateQueryOrder(itemsOrder);
+                _antd.message.success('方案已应用');
+              }
             }
             _context6.next = 10;
             break;
@@ -646,7 +650,6 @@ var QuerySchemeManager = function QuerySchemeManager(_ref2) {
       children: /*#__PURE__*/_react.default.createElement(_antd.List, {
         dataSource: schemes,
         renderItem: function renderItem(scheme) {
-          var _scheme$itemsOrder;
           return /*#__PURE__*/_react.default.createElement(_antd.List.Item, {
             actions: [/*#__PURE__*/_react.default.createElement(_antd.Button, {
               key: "apply",
@@ -734,7 +737,7 @@ var QuerySchemeManager = function QuerySchemeManager(_ref2) {
             }, "\u5F53\u524D"), scheme.isSystem && /*#__PURE__*/_react.default.createElement(_antd.Tag, {
               color: "default"
             }, "\u7CFB\u7EDF")),
-            description: scheme.description || "".concat(((_scheme$itemsOrder = scheme.itemsOrder) === null || _scheme$itemsOrder === void 0 ? void 0 : _scheme$itemsOrder.length) || 0, " \u4E2A\u67E5\u8BE2\u9879")
+            description: scheme.description || "".concat((0, _schemeDataMigration.extractItemsOrder)(scheme).length || 0, " \u4E2A\u67E5\u8BE2\u9879")
           }));
         }
       })

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

@@ -322,6 +322,9 @@ function flatConfigToColumnState(flatConfig) {
   return flatConfig.filter(function (item) {
     return item.type === 'column';
   }) // 只处理列节点，分组不在 columnState 中
+  .filter(function (item) {
+    return item.field;
+  }) // 【修复】过滤掉没有 field 的列，防止 colId 为 undefined
   .sort(function (a, b) {
     return a.order - b.order;
   }) // 按 order 字段排序

package/dist/cjs/ag-grid-plus/shared/storage/backendApiAdapter.js

@@ -210,19 +210,13 @@ var BackendApiSchemeAdapter = exports.BackendApiSchemeAdapter = /*#__PURE__*/fun
                 });
               }
 
-              // 将所有查询方案的字段从字符串解析为数组和对象
+              // 将所有查询方案的 queryConfig 字段从字符串解析为对象
               if (response.querySchemes) {
                 Object.keys(response.querySchemes).forEach(function (gridId) {
                   response.querySchemes[gridId] = response.querySchemes[gridId].map(function (scheme) {
                     var parsedScheme = _objectSpread({}, scheme);
-                    if (typeof parsedScheme.itemsOrder === 'string') {
-                      parsedScheme.itemsOrder = JSON.parse(parsedScheme.itemsOrder);
-                    }
-                    if (typeof parsedScheme.hiddenFields === 'string') {
-                      parsedScheme.hiddenFields = JSON.parse(parsedScheme.hiddenFields);
-                    }
-                    if (typeof parsedScheme.formValues === 'string') {
-                      parsedScheme.formValues = JSON.parse(parsedScheme.formValues);
+                    if (typeof parsedScheme.queryConfig === 'string') {
+                      parsedScheme.queryConfig = JSON.parse(parsedScheme.queryConfig);
                     }
                     return parsedScheme;
                   });
@@ -361,11 +355,9 @@ var BackendApiSchemeAdapter = exports.BackendApiSchemeAdapter = /*#__PURE__*/fun
               _context5.prev = 0;
               this.log("\u4FDD\u5B58\u67E5\u8BE2\u65B9\u6848: ".concat(gridId, " - ").concat(scheme.name));
 
-              // 将数组和对象字段转换为 JSON 字符串
+              // 将 queryConfig 对象字段转换为 JSON 字符串
               schemeForBackend = _objectSpread(_objectSpread({}, scheme), {}, {
-                itemsOrder: scheme.itemsOrder ? JSON.stringify(scheme.itemsOrder) : undefined,
-                hiddenFields: scheme.hiddenFields ? JSON.stringify(scheme.hiddenFields) : undefined,
-                formValues: scheme.formValues ? JSON.stringify(scheme.formValues) : undefined
+                queryConfig: scheme.queryConfig ? JSON.stringify(scheme.queryConfig) : undefined
               });
               url = "".concat(this.config.apiBaseUrl, "/api/extra-object/table-scheme/save-query-scheme");
               _context5.next = 6;
@@ -384,18 +376,10 @@ var BackendApiSchemeAdapter = exports.BackendApiSchemeAdapter = /*#__PURE__*/fun
               }
               throw new Error(response.message || '保存失败');
             case 9:
-              // 将返回的字符串字段解析为数组和对象
+              // 将返回的 queryConfig 字符串字段解析为对象
               savedScheme = response.scheme;
-              if (savedScheme) {
-                if (typeof savedScheme.itemsOrder === 'string') {
-                  savedScheme.itemsOrder = JSON.parse(savedScheme.itemsOrder);
-                }
-                if (typeof savedScheme.hiddenFields === 'string') {
-                  savedScheme.hiddenFields = JSON.parse(savedScheme.hiddenFields);
-                }
-                if (typeof savedScheme.formValues === 'string') {
-                  savedScheme.formValues = JSON.parse(savedScheme.formValues);
-                }
+              if (savedScheme && typeof savedScheme.queryConfig === 'string') {
+                savedScheme.queryConfig = JSON.parse(savedScheme.queryConfig);
               }
               this.log('保存成功', savedScheme);
               return _context5.abrupt("return", savedScheme);

package/dist/cjs/ag-grid-plus/shared/storage/schemeStorageAdapter.d.ts

@@ -1,4 +1,22 @@
 import type { FlatColumnItem } from '../../setting/columnGroupTypes';
+/**
+ * 查询项配置
+ */
+export interface QueryItem {
+    /** 字段名 */
+    field: string;
+    /** 是否隐藏 */
+    hidden?: boolean;
+}
+/**
+ * 查询配置结构
+ */
+export interface QueryConfig {
+    /** 查询项配置列表 (按顺序排列) */
+    items: QueryItem[];
+    /** 查询表单默认值 */
+    defaultValues?: Record<string, any>;
+}
 /**
  * 查询方案
  */
@@ -9,12 +27,8 @@ export interface QueryScheme {
     name: string;
     /** 方案描述 */
     description?: string;
-    /** 查询表单字段排序 */
-    itemsOrder?: string[];
-    /** 隐藏的字段列表 */
-    hiddenFields?: string[];
-    /** 查询表单值 */
-    formValues?: Record<string, any>;
+    /** 查询配置 */
+    queryConfig: QueryConfig;
     /** 是否为默认方案 */
     isDefault: boolean;
     /** 是否为系统方案（不可删除） */

package/dist/cjs/ag-grid-plus/shared/utils/schemeDataMigration.d.ts

@@ -0,0 +1,27 @@
+import type { QueryScheme, QueryConfig } from '../storage/schemeStorageAdapter';
+/**
+ * 从查询方案提取字段顺序数组
+ * @param scheme 查询方案对象
+ * @returns 字段顺序数组
+ */
+export declare function extractItemsOrder(scheme: QueryScheme): string[];
+/**
+ * 从查询方案提取隐藏字段数组
+ * @param scheme 查询方案对象
+ * @returns 隐藏字段数组
+ */
+export declare function extractHiddenFields(scheme: QueryScheme): string[];
+/**
+ * 从查询方案提取表单默认值
+ * @param scheme 查询方案对象
+ * @returns 表单默认值对象
+ */
+export declare function extractFormValues(scheme: QueryScheme): Record<string, any>;
+/**
+ * 构建 QueryConfig 对象
+ * @param itemsOrder 字段顺序数组
+ * @param hiddenFields 隐藏字段数组
+ * @param formValues 表单默认值
+ * @returns QueryConfig 对象
+ */
+export declare function buildQueryConfig(itemsOrder: string[], hiddenFields?: string[], formValues?: Record<string, any>): QueryConfig;

package/dist/cjs/ag-grid-plus/shared/utils/schemeDataMigration.js

@@ -0,0 +1,63 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.buildQueryConfig = buildQueryConfig;
+exports.extractFormValues = extractFormValues;
+exports.extractHiddenFields = extractHiddenFields;
+exports.extractItemsOrder = extractItemsOrder;
+/**
+ * 从查询方案提取字段顺序数组
+ * @param scheme 查询方案对象
+ * @returns 字段顺序数组
+ */
+function extractItemsOrder(scheme) {
+  return scheme.queryConfig.items.map(function (item) {
+    return item.field;
+  });
+}
+
+/**
+ * 从查询方案提取隐藏字段数组
+ * @param scheme 查询方案对象
+ * @returns 隐藏字段数组
+ */
+function extractHiddenFields(scheme) {
+  return scheme.queryConfig.items.filter(function (item) {
+    return item.hidden;
+  }).map(function (item) {
+    return item.field;
+  });
+}
+
+/**
+ * 从查询方案提取表单默认值
+ * @param scheme 查询方案对象
+ * @returns 表单默认值对象
+ */
+function extractFormValues(scheme) {
+  return scheme.queryConfig.defaultValues || {};
+}
+
+/**
+ * 构建 QueryConfig 对象
+ * @param itemsOrder 字段顺序数组
+ * @param hiddenFields 隐藏字段数组
+ * @param formValues 表单默认值
+ * @returns QueryConfig 对象
+ */
+function buildQueryConfig(itemsOrder) {
+  var hiddenFields = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var formValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  var items = itemsOrder.map(function (field) {
+    return {
+      field: field,
+      hidden: hiddenFields.includes(field)
+    };
+  });
+  return {
+    items: items,
+    defaultValues: Object.keys(formValues).length > 0 ? formValues : undefined
+  };
+}

package/dist/cjs/draggableModal/index.js

@@ -42,7 +42,6 @@ var DraggableModal = function DraggableModal(props) {
     bounds = _useState4[0],
     setBounds = _useState4[1];
   var draggleRef = (0, _react.useRef)(null);
-  var modalContentRef = (0, _react.useRef)(null);
 
   // 调整大小相关状态
   var _useState5 = (0, _react.useState)(false),

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

@@ -48,6 +48,7 @@ import { localeText } from "./locale";
 import { GridPlusContext } from "./context/gridContext";
 import { useGridSchemes } from "./context/useSchemeManager";
 import { useSchemeDataFlow } from "./context/useSchemeDataFlow";
+import { extractItemsOrder, extractHiddenFields } from "./shared/utils/schemeDataMigration";
 import { createSafeHtmlTemplate } from "./utils/sanitize";
 import { GridPlusError, ErrorType, ErrorSeverity } from "./errors";
 import { logger } from "./utils/logger";
@@ -1055,7 +1056,8 @@ function AgGridPlus(props) {
 
   // 使用顺序管理器处理排序
   var orderedFormItems = useMemo(function () {
-    var itemsOrder = (currentQueryScheme === null || currentQueryScheme === void 0 ? void 0 : currentQueryScheme.itemsOrder) || queryItemsOrder;
+    // 从查询方案提取字段顺序
+    var itemsOrder = currentQueryScheme ? extractItemsOrder(currentQueryScheme) : queryItemsOrder;
     if (!itemsOrder || itemsOrder.length === 0) {
       return queryFormItems;
     }
@@ -1070,18 +1072,19 @@ function AgGridPlus(props) {
       return indexA - indexB;
     });
     return ordered;
-  }, [queryFormItems, currentQueryScheme === null || currentQueryScheme === void 0 ? void 0 : currentQueryScheme.itemsOrder, queryItemsOrder]);
+  }, [queryFormItems, currentQueryScheme, queryItemsOrder]);
 
   // 根据方案的隐藏字段过滤表单项
   var visibleFormItems = useMemo(function () {
-    var hiddenFields = (currentQueryScheme === null || currentQueryScheme === void 0 ? void 0 : currentQueryScheme.hiddenFields) || [];
+    // 从查询方案提取隐藏字段
+    var hiddenFields = currentQueryScheme ? extractHiddenFields(currentQueryScheme) : [];
     if (hiddenFields.length === 0) {
       return orderedFormItems;
     }
     return orderedFormItems.filter(function (item) {
       return !hiddenFields.includes(item.field);
     });
-  }, [orderedFormItems, currentQueryScheme === null || currentQueryScheme === void 0 ? void 0 : currentQueryScheme.hiddenFields]);
+  }, [orderedFormItems, currentQueryScheme]);
   useEffect(function () {
     calculateSum();
   }, [calculateSum]);
@@ -1111,7 +1114,7 @@ function AgGridPlus(props) {
       applyToGlobal: applyToGlobal,
       resetCurrent: resetCurrent,
       resetAll: resetAll,
-      currentQueryOrder: (currentQueryScheme === null || currentQueryScheme === void 0 ? void 0 : currentQueryScheme.itemsOrder) || queryItemsOrder,
+      currentQueryOrder: currentQueryScheme ? extractItemsOrder(currentQueryScheme) : queryItemsOrder,
       updateQueryOrder: setQueryItemsOrder,
       queryFormItems: queryFormItems,
       // ========== 方案管理 API（透传给子组件） ==========
@@ -1133,7 +1136,7 @@ function AgGridPlus(props) {
     };
   }, [extensibleColumns, gridPlusColumnState, allColDefsRef.current,
   // 【修复】添加到依赖数组
-  onSaveColumnState, applyToGlobal, resetCurrent, resetAll, currentQueryScheme === null || currentQueryScheme === void 0 ? void 0 : currentQueryScheme.itemsOrder, queryItemsOrder, queryFormItems,
+  onSaveColumnState, applyToGlobal, resetCurrent, resetAll, currentQueryScheme, queryItemsOrder, queryFormItems,
   // 方案管理依赖
   columnSchemes, querySchemes, currentSchemes, schemesLoading, lastSyncTime, saveColumnScheme, deleteColumnScheme, saveQueryScheme, deleteQueryScheme, setCurrentColumnScheme, setCurrentQueryScheme, refreshSchemes, getColumnSchemes, getQuerySchemes, getCurrentScheme]);
   return /*#__PURE__*/React.createElement(GridPlusContext.Provider, {

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

@@ -216,7 +216,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
    * 将扁平化配置转换回 Grid State 并应用到 AG-Grid
    */
   var handleSaveColumns = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var values, flatConfig, configToSave, gridColumnDefs, columnState;
+    var values, flatConfig, configToSave, invalidColumns, gridColumnDefs, columnState;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -234,16 +234,28 @@ var ColumnSetting = function ColumnSetting(_ref) {
             message.info('检测到旧版本配置，已自动迁移到新格式');
           }
 
+          // 【修复】验证数据完整性，过滤掉无效的列配置
+          invalidColumns = configToSave.filter(function (item) {
+            return item.type === 'column' && !item.field;
+          });
+          if (invalidColumns.length > 0) {
+            message.warning("\u68C0\u6D4B\u5230 ".concat(invalidColumns.length, " \u4E2A\u5217\u7F3A\u5C11 field \u5B57\u6BB5\uFF0C\u5DF2\u81EA\u52A8\u8FC7\u6EE4"));
+            console.warn('[ColumnSetting] 无效的列配置:', invalidColumns);
+            configToSave = configToSave.filter(function (item) {
+              return item.type === 'group' || item.type === 'column' && item.field;
+            });
+          }
+
           // 【修复】转换为 AG-Grid 的列定义，传入原始列定义以保留自定义属性
           gridColumnDefs = flatConfigToGridState(configToSave, originalColumnDefs); // 【关键修复】先更新 columnDefs（处理分组结构变化）
           gridApi.setGridOption('columnDefs', gridColumnDefs);
 
           // 等待 columnDefs 更新完成
-          _context2.next = 10;
+          _context2.next = 12;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 100);
           });
-        case 10:
+        case 12:
           // 【修复】然后应用列状态（宽度、隐藏、顺序等）
           columnState = flatConfigToColumnState(configToSave);
           gridApi.applyColumnState({
@@ -335,7 +347,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
           // message.success 已经在上面的逻辑中处理了
           onClose();
-        case 15:
+        case 17:
         case "end":
           return _context2.stop();
       }