@nokecy/qc-ui 1.1.2 → 1.1.4

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

@@ -27,6 +27,7 @@ import { HTML5Backend } from 'react-dnd-html5-backend';
 import { useGridSchemes } from "../context/useSchemeManager";
 import { GridPlusContext } from "../context/gridContext";
 import { v4 as uuidv4 } from 'uuid';
+import { extractItemsOrder, extractHiddenFields, buildQueryConfig } from "../shared/utils/schemeDataMigration";
 var DRAG_TYPE = 'QUERY_ITEM';
 /**
  * 可拖拽的查询项组件
@@ -186,8 +187,8 @@ var QuerySchemeManager = function QuerySchemeManager(_ref2) {
         setEditingOrder(defaultOrder);
       }
 
-      // 初始化隐藏字段
-      setHiddenFields((currentScheme === null || currentScheme === void 0 ? void 0 : currentScheme.hiddenFields) || []);
+      // 初始化隐藏字段 - 使用新格式提取器
+      setHiddenFields(currentScheme ? extractHiddenFields(currentScheme) : []);
     }
   }, [visible, currentQueryOrder, queryFormItems, currentScheme]);
 
@@ -235,68 +236,67 @@ var QuerySchemeManager = function QuerySchemeManager(_ref2) {
    * 应用当前顺序和隐藏设置
    */
   var handleApplyOrder = 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 = 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:
           message.success('已应用新配置');
-          _context.next = 13;
+          _context.next = 14;
           break;
-        case 7:
+        case 8:
           // 创建新方案
           newScheme = {
             id: uuidv4(),
             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:
-          message.success('已自动创建并应用默认方案');
         case 13:
+          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);
           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 = 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:
@@ -308,34 +308,34 @@ var QuerySchemeManager = function QuerySchemeManager(_ref2) {
           return _context2.abrupt("return");
         case 3:
           _context2.prev = 3;
+          // 构建新格式的配置
+          queryConfig = buildQueryConfig(editingOrder, hiddenFields);
           newScheme = {
             id: uuidv4(),
             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:
           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);
           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]);
 
   /**
@@ -514,7 +514,7 @@ var QuerySchemeManager = function QuerySchemeManager(_ref2) {
    */
   var handleApply = 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:
@@ -525,9 +525,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);
-              message.success('方案已应用');
+            if (scheme) {
+              // 使用新格式提取器获取顺序
+              itemsOrder = extractItemsOrder(scheme);
+              if (itemsOrder.length > 0) {
+                updateQueryOrder === null || updateQueryOrder === void 0 || updateQueryOrder(itemsOrder);
+                message.success('方案已应用');
+              }
             }
             _context6.next = 10;
             break;
@@ -637,7 +641,6 @@ var QuerySchemeManager = function QuerySchemeManager(_ref2) {
       children: /*#__PURE__*/React.createElement(List, {
         dataSource: schemes,
         renderItem: function renderItem(scheme) {
-          var _scheme$itemsOrder;
           return /*#__PURE__*/React.createElement(List.Item, {
             actions: [/*#__PURE__*/React.createElement(Button, {
               key: "apply",
@@ -725,7 +728,7 @@ var QuerySchemeManager = function QuerySchemeManager(_ref2) {
             }, "\u5F53\u524D"), scheme.isSystem && /*#__PURE__*/React.createElement(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(extractItemsOrder(scheme).length || 0, " \u4E2A\u67E5\u8BE2\u9879")
           }));
         }
       })

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

@@ -306,6 +306,9 @@ export 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/esm/ag-grid-plus/shared/storage/backendApiAdapter.js

@@ -211,19 +211,13 @@ export var BackendApiSchemeAdapter = /*#__PURE__*/function () {
                 });
               }
 
-              // 将所有查询方案的字段从字符串解析为数组和对象
+              // 将所有查询方案的 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;
                   });
@@ -362,11 +356,9 @@ export var BackendApiSchemeAdapter = /*#__PURE__*/function () {
               _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;
@@ -385,18 +377,10 @@ export var BackendApiSchemeAdapter = /*#__PURE__*/function () {
               }
               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/esm/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/esm/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/esm/ag-grid-plus/shared/utils/schemeDataMigration.js

@@ -0,0 +1,54 @@
+/**
+ * 从查询方案提取字段顺序数组
+ * @param scheme 查询方案对象
+ * @returns 字段顺序数组
+ */
+export function extractItemsOrder(scheme) {
+  return scheme.queryConfig.items.map(function (item) {
+    return item.field;
+  });
+}
+
+/**
+ * 从查询方案提取隐藏字段数组
+ * @param scheme 查询方案对象
+ * @returns 隐藏字段数组
+ */
+export function extractHiddenFields(scheme) {
+  return scheme.queryConfig.items.filter(function (item) {
+    return item.hidden;
+  }).map(function (item) {
+    return item.field;
+  });
+}
+
+/**
+ * 从查询方案提取表单默认值
+ * @param scheme 查询方案对象
+ * @returns 表单默认值对象
+ */
+export function extractFormValues(scheme) {
+  return scheme.queryConfig.defaultValues || {};
+}
+
+/**
+ * 构建 QueryConfig 对象
+ * @param itemsOrder 字段顺序数组
+ * @param hiddenFields 隐藏字段数组
+ * @param formValues 表单默认值
+ * @returns QueryConfig 对象
+ */
+export 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/esm/draggableModal/index.js

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