@nokecy/qc-ui 1.1.13 → 1.1.17

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

@@ -297,10 +297,10 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
   /**
    * 保存列配置
-   * 优化逻辑：先保存配置到存储，再通过 handleLoadScheme 统一加载
+   * 优化逻辑：先保存配置到存储，再直接应用到 Grid，不依赖 handleLoadScheme
    */
   var handleSaveColumns = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var values, flatConfig, configToSave, invalidColumns, filterModel, schemeIdToLoad, defaultScheme, newScheme;
+    var values, flatConfig, configToSave, invalidColumns, filterModel, savedScheme, defaultScheme, hasGroups, gridColumnDefs, columnState;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -335,16 +335,17 @@ var ColumnSetting = function ColumnSetting(_ref) {
             _context2.next = 17;
             break;
           }
-          _context2.next = 13;
-          return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, currentScheme), {}, {
+          // 如果有激活的方案，更新该方案
+          savedScheme = _objectSpread(_objectSpread({}, currentScheme), {}, {
             columnConfig: configToSave,
-            filterModel: filterModel,
-            updatedAt: Date.now()
-          }));
-        case 13:
-          schemeIdToLoad = currentScheme.id;
+            filterModel: filterModel
+            // updatedAt 由存储适配器自动生成
+          });
+          _context2.next = 14;
+          return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, savedScheme);
+        case 14:
           _antd.message.success('列配置已保存到方案');
-          _context2.next = 30;
+          _context2.next = 29;
           break;
         case 17:
           // 如果没有激活的方案，自动创建或更新默认方案
@@ -355,52 +356,96 @@ var ColumnSetting = function ColumnSetting(_ref) {
             _context2.next = 25;
             break;
           }
-          _context2.next = 21;
-          return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, defaultScheme), {}, {
+          // 更新默认方案
+          savedScheme = _objectSpread(_objectSpread({}, defaultScheme), {}, {
             columnConfig: configToSave,
-            filterModel: filterModel,
-            updatedAt: Date.now()
-          }));
-        case 21:
-          schemeIdToLoad = defaultScheme.id;
+            filterModel: filterModel
+            // updatedAt 由存储适配器自动生成
+          });
+          _context2.next = 22;
+          return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, savedScheme);
+        case 22:
           _antd.message.success('列配置已保存到默认方案');
-          _context2.next = 30;
+          _context2.next = 29;
           break;
         case 25:
           // 创建新的默认方案
-          newScheme = {
+          savedScheme = {
             id: (0, _uuid.v4)(),
             name: '默认配置',
             description: '自动创建的默认列配置',
             columnConfig: configToSave,
             filterModel: filterModel,
             isDefault: true,
-            isSystem: false,
-            createdAt: Date.now(),
-            updatedAt: Date.now()
+            isSystem: false
+            // createdAt 和 updatedAt 由存储适配器自动生成
           };
           _context2.next = 28;
-          return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, newScheme);
+          return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, savedScheme);
         case 28:
-          schemeIdToLoad = newScheme.id;
           _antd.message.success('已创建并保存到默认方案');
-        case 30:
-          _context2.next = 32;
-          return handleLoadScheme(schemeIdToLoad);
-        case 32:
-          _context2.next = 38;
+        case 29:
+          _context2.next = 31;
+          return new Promise(function (resolve) {
+            return setTimeout(resolve, 100);
+          });
+        case 31:
+          // 1. 检查是否包含分组配置
+          hasGroups = savedScheme.columnConfig.some(function (item) {
+            return item.type === 'group';
+          }); // 如果包含分组，先更新 columnDefs
+          if (!hasGroups) {
+            _context2.next = 37;
+            break;
+          }
+          gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(savedScheme.columnConfig, originalColumnDefs);
+          gridApi.setGridOption('columnDefs', gridColumnDefs);
+
+          // 等待 columnDefs 更新完成
+          _context2.next = 37;
+          return new Promise(function (resolve) {
+            return setTimeout(resolve, 100);
+          });
+        case 37:
+          columnState = (0, _columnGroupUtils.flatConfigToColumnState)(savedScheme.columnConfig);
+          gridApi.applyColumnState({
+            state: columnState,
+            applyOrder: true
+          });
+
+          // 3. 应用过滤器
+          if (savedScheme.filterModel) {
+            gridApi.setFilterModel(savedScheme.filterModel);
+          }
+
+          // 4. 设置为当前方案（如果不是当前方案）
+          if (!(!currentScheme || savedScheme.id !== currentScheme.id)) {
+            _context2.next = 43;
+            break;
+          }
+          _context2.next = 43;
+          return setCurrentColumnScheme === null || setCurrentColumnScheme === void 0 ? void 0 : setCurrentColumnScheme(gridKey, savedScheme.id);
+        case 43:
+          _context2.next = 45;
+          return new Promise(function (resolve) {
+            return setTimeout(resolve, 50);
+          });
+        case 45:
+          // 5. 关闭弹窗
+          onClose();
+          _context2.next = 52;
           break;
-        case 34:
-          _context2.prev = 34;
+        case 48:
+          _context2.prev = 48;
           _context2.t0 = _context2["catch"](8);
           console.error('保存列配置到方案失败:', _context2.t0);
           _antd.message.error('保存列配置失败');
-        case 38:
+        case 52:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[8, 34]]);
-  })), [form, gridApi, saveColumnScheme, setCurrentColumnScheme, currentScheme, schemes, gridKey, handleLoadScheme]);
+    }, _callee2, null, [[8, 48]]);
+  })), [form, gridApi, saveColumnScheme, setCurrentColumnScheme, currentScheme, schemes, gridKey, originalColumnDefs, onClose]);
 
   // 保存为新方案
   var handleSaveScheme = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
@@ -461,9 +506,8 @@ var ColumnSetting = function ColumnSetting(_ref) {
             columnConfig: columnConfigToSave,
             filterModel: filterModel,
             isDefault: false,
-            isSystem: false,
-            createdAt: Date.now(),
-            updatedAt: Date.now()
+            isSystem: false
+            // createdAt 和 updatedAt 由存储适配器自动生成
           };
           _context3.next = 23;
           return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, newScheme);
@@ -519,8 +563,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
             }
             _context4.next = 11;
             return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, s), {}, {
-              isDefault: false,
-              updatedAt: Date.now()
+              isDefault: false
             }));
           case 11:
             _context4.next = 6;
@@ -539,8 +582,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
           case 21:
             _context4.next = 23;
             return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, scheme), {}, {
-              isDefault: true,
-              updatedAt: Date.now()
+              isDefault: true
             }));
           case 23:
             _antd.message.success('已设置为默认方案');
@@ -633,8 +675,8 @@ var ColumnSetting = function ColumnSetting(_ref) {
           _context6.next = 7;
           return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, scheme), {}, {
             name: editingName.trim(),
-            description: editingDescription.trim() || undefined,
-            updatedAt: Date.now()
+            description: editingDescription.trim() || undefined
+            // updatedAt 由存储适配器自动生成
           }));
         case 7:
           _antd.message.success('更新成功');

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

@@ -213,8 +213,8 @@ var QuerySchemeManager = function QuerySchemeManager(_ref) {
           }
           _context.next = 7;
           return saveQueryScheme === null || saveQueryScheme === void 0 ? void 0 : saveQueryScheme(gridKey, _objectSpread(_objectSpread({}, currentScheme), {}, {
-            queryConfig: queryConfig,
-            updatedAt: Date.now()
+            queryConfig: queryConfig
+            // updatedAt 由存储适配器自动生成
           }));
         case 7:
           _antd.message.success('已应用新配置');
@@ -228,9 +228,8 @@ var QuerySchemeManager = function QuerySchemeManager(_ref) {
             description: '自动创建的默认查询方案',
             queryConfig: queryConfig,
             isDefault: true,
-            isSystem: false,
-            createdAt: Date.now(),
-            updatedAt: Date.now()
+            isSystem: false
+            // createdAt 和 updatedAt 由存储适配器自动生成
           };
           _context.next = 13;
           return saveQueryScheme === null || saveQueryScheme === void 0 ? void 0 : saveQueryScheme(gridKey, newScheme);
@@ -287,9 +286,8 @@ var QuerySchemeManager = function QuerySchemeManager(_ref) {
             description: '',
             queryConfig: queryConfig,
             isDefault: false,
-            isSystem: false,
-            createdAt: Date.now(),
-            updatedAt: Date.now()
+            isSystem: false
+            // createdAt 和 updatedAt 由存储适配器自动生成
           };
           _context2.next = 10;
           return saveQueryScheme === null || saveQueryScheme === void 0 ? void 0 : saveQueryScheme(gridKey, newScheme);
@@ -345,8 +343,8 @@ var QuerySchemeManager = function QuerySchemeManager(_ref) {
           _context3.next = 8;
           return saveQueryScheme === null || saveQueryScheme === void 0 ? void 0 : saveQueryScheme(gridKey, _objectSpread(_objectSpread({}, scheme), {}, {
             name: editingName.trim(),
-            description: editingDescription.trim() || undefined,
-            updatedAt: Date.now()
+            description: editingDescription.trim() || undefined
+            // updatedAt 由存储适配器自动生成
           }));
         case 8:
           _antd.message.success('更新成功');
@@ -429,8 +427,8 @@ var QuerySchemeManager = function QuerySchemeManager(_ref) {
             }
             _context5.next = 9;
             return saveQueryScheme === null || saveQueryScheme === void 0 ? void 0 : saveQueryScheme(gridKey, _objectSpread(_objectSpread({}, _scheme), {}, {
-              isDefault: false,
-              updatedAt: Date.now()
+              isDefault: false
+              // updatedAt 由存储适配器自动生成
             }));
           case 9:
             _context5.next = 4;
@@ -457,8 +455,8 @@ var QuerySchemeManager = function QuerySchemeManager(_ref) {
             }
             _context5.next = 23;
             return saveQueryScheme === null || saveQueryScheme === void 0 ? void 0 : saveQueryScheme(gridKey, _objectSpread(_objectSpread({}, scheme), {}, {
-              isDefault: true,
-              updatedAt: Date.now()
+              isDefault: true
+              // updatedAt 由存储适配器自动生成
             }));
           case 23:
             _antd.message.success("\u5DF2\u5C06\"".concat(schemeName, "\"\u8BBE\u4E3A\u9ED8\u8BA4\u65B9\u6848"));

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

@@ -33,10 +33,10 @@ export interface QueryScheme {
     isDefault: boolean;
     /** 是否为系统方案（不可删除） */
     isSystem: boolean;
-    /** 创建时间戳 */
-    createdAt: number;
-    /** 最后更新时间戳 */
-    updatedAt: number;
+    /** 创建时间戳（由存储适配器自动生成） */
+    createdAt?: number;
+    /** 最后更新时间戳（由存储适配器自动生成） */
+    updatedAt?: number;
     /** 创建用户ID（可选） */
     createdBy?: string;
 }
@@ -59,10 +59,10 @@ export interface ColumnScheme {
     isDefault: boolean;
     /** 是否为系统方案（不可删除） */
     isSystem: boolean;
-    /** 创建时间戳 */
-    createdAt: number;
-    /** 最后更新时间戳 */
-    updatedAt: number;
+    /** 创建时间戳（由存储适配器自动生成） */
+    createdAt?: number;
+    /** 最后更新时间戳（由存储适配器自动生成） */
+    updatedAt?: number;
     /** 创建用户ID（可选） */
     createdBy?: string;
 }

package/dist/cjs/array-table/index.js

@@ -56,10 +56,26 @@ var ArrayTableInner = (0, _react2.observer)(function (props) {
     gridApiState = _useState4[0],
     setGridApiState = _useState4[1];
   var dataSource = Array.isArray(field.value) ? field.value.slice() : [];
-  var sources = (0, _utils.useArrayTableSources)();
-  var actions = (0, _utils.useArrayTableActions)();
-  var columns = (0, _utils.useArrayTableColumns)(dataSource, field, sources);
   var schema = (0, _react2.useFieldSchema)();
+
+  // 获取 sources（每次渲染都会重新计算，返回新的数组引用）
+  var rawSources = (0, _utils.useArrayTableSources)();
+  var actions = (0, _utils.useArrayTableActions)();
+
+  // 【关键修复】使用 useMemo 基于内容稳定 sources 引用
+  // 通过 JSON.stringify 比较内容，只有内容真正变化时才返回新引用
+  var sourcesKey = (0, _react.useMemo)(function () {
+    return JSON.stringify(rawSources.map(function (s) {
+      return {
+        name: s.name,
+        display: s.display
+        // 只提取稳定的标识信息
+      };
+    }));
+  }, [rawSources]);
+  var sources = (0, _react.useMemo)(function () {
+    return rawSources;
+  }, [sourcesKey]);
   //@ts-ignore
   var onAdd = props.onAdd,
     onCopy = props.onCopy,
@@ -97,9 +113,25 @@ var ArrayTableInner = (0, _react2.observer)(function (props) {
   // 使用 ref 记录上次应用的方案状态，避免重复应用
   var lastAppliedSchemeRef = (0, _react.useRef)({
     id: null,
-    updatedAt: null
+    updatedAt: undefined
   });
 
+  /**
+   * 【关键优化】使用 useMemo 稳定 columnDefs 引用
+   * 只在基础列定义(sources)变化时更新，避免数据变化导致列重置
+   * 列的状态(宽度、顺序、隐藏等)由方案通过 applyColumnState 控制，不需要通过 columnDefs 传递
+   */
+  var stableColumnDefs = (0, _react.useMemo)(function () {
+    // 只依赖 sources，不依赖 dataSource 和 field.value
+    var cols = (0, _utils.useArrayTableColumns)([], field, sources);
+    //@ts-ignore
+    if (cols.length > 0 && props.onRowDrag) {
+      //@ts-ignore
+      cols[0].rowDrag = true;
+    }
+    return cols;
+  }, [sources, props.onRowDrag]); // 移除 field 依赖，避免数据变化时重新计算
+
   /**
    * 方案自动加载
    *
@@ -182,12 +214,6 @@ var ArrayTableInner = (0, _react2.observer)(function (props) {
       cancelled = true;
     };
   }, [props.gridKey, gridApiState, currentScheme === null || currentScheme === void 0 ? void 0 : currentScheme.id, currentScheme === null || currentScheme === void 0 ? void 0 : currentScheme.updatedAt]);
-
-  //@ts-ignore
-  if (columns.length > 0) {
-    //@ts-ignore
-    columns[0].rowDrag = props.onRowDrag ? true : false;
-  }
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     ref: ref,
     style: {
@@ -234,7 +260,7 @@ var ArrayTableInner = (0, _react2.observer)(function (props) {
     gridKey: props.gridKey,
     gridApi: apiRef.current,
     gridApiState: gridApiState,
-    allColDefs: columns,
+    allColDefs: stableColumnDefs,
     showQueryScheme: false
   })), /*#__PURE__*/_react.default.createElement("div", {
     style: {
@@ -256,7 +282,9 @@ var ArrayTableInner = (0, _react2.observer)(function (props) {
       suppressCopySingleCellRanges: true,
       enterNavigatesVertically: true,
       enterNavigatesVerticallyAfterEdit: true,
-      columnHoverHighlight: true
+      columnHoverHighlight: true,
+      // 【关键修复】保持用户设置的列顺序
+      maintainColumnOrder: true
     },
     onCellKeyDown: handleCellKeyDown,
     onCellClicked: function onCellClicked(event) {
@@ -313,7 +341,7 @@ var ArrayTableInner = (0, _react2.observer)(function (props) {
     ,
     rowHeight: 38,
     pagination: false,
-    columnDefs: columns,
+    columnDefs: stableColumnDefs,
     rowData: dataSource
   })), sources.map(function (column, key) {
     //专门用来承接对Column的状态管理

package/dist/cjs/array-table/utils.js

@@ -1,5 +1,6 @@
 "use strict";
 
+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); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -8,13 +9,15 @@ var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@formily/react");
 var _shared = require("@formily/shared");
 var _arrayBase = _interopRequireDefault(require("./arrayBase"));
+var _excluded = ["pinned", "width", "hide", "sort", "sortIndex"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 var isColumnComponent = exports.isColumnComponent = function isColumnComponent(schema) {
   var _schema$xComponent;
   return ((_schema$xComponent = schema['x-component']) === null || _schema$xComponent === void 0 ? void 0 : _schema$xComponent.indexOf('Column')) > -1;
@@ -106,12 +109,16 @@ var useArrayTableActions = exports.useArrayTableActions = function useArrayTable
   return schema.properties ? parseSources(schema.properties['actions'] || {}) : [];
 };
 var AgField = function AgField(_ref) {
+  var _ref2, _node$rowIndex;
   var value = _ref.value,
     record = _ref.data,
     dataSource = _ref.dataSource,
     schema = _ref.schema,
-    field = _ref.field;
-  var index = dataSource === null || dataSource === void 0 ? void 0 : dataSource.indexOf(record);
+    field = _ref.field,
+    node = _ref.node;
+  // 【修复】优先使用 AG-Grid 的 node.rowIndex，避免依赖 dataSource
+  // 这样即使 columnDefs 中的 dataSource 是空数组，也能正确获取索引
+  var index = (_ref2 = (_node$rowIndex = node === null || node === void 0 ? void 0 : node.rowIndex) !== null && _node$rowIndex !== void 0 ? _node$rowIndex : dataSource === null || dataSource === void 0 ? void 0 : dataSource.indexOf(record)) !== null && _ref2 !== void 0 ? _ref2 : -1;
   var children =
   /*#__PURE__*/
   //@ts-ignore
@@ -131,14 +138,23 @@ var AgField = function AgField(_ref) {
   return children;
 };
 var useArrayTableColumns = exports.useArrayTableColumns = function useArrayTableColumns(dataSource, field, sources) {
-  return sources.reduce(function (buf, _ref2, key) {
-    var name = _ref2.name,
-      columnProps = _ref2.columnProps,
-      schema = _ref2.schema,
-      display = _ref2.display;
+  return sources.reduce(function (buf, _ref3, key) {
+    var name = _ref3.name,
+      columnProps = _ref3.columnProps,
+      schema = _ref3.schema,
+      display = _ref3.display;
     if (display && display !== 'visible') return buf;
     if (!isColumnComponent(schema)) return buf;
-    return buf.concat(_objectSpread(_objectSpread({}, columnProps), {}, {
+
+    // 【关键修复】移除可能干扰用户列状态的属性
+    // 这些属性应该由用户通过列配置（applyColumnState）控制，而不是从 columnDefs 继承
+    var pinned = columnProps.pinned,
+      width = columnProps.width,
+      hide = columnProps.hide,
+      sort = columnProps.sort,
+      sortIndex = columnProps.sortIndex,
+      safeColumnProps = _objectWithoutProperties(columnProps, _excluded);
+    return buf.concat(_objectSpread(_objectSpread({}, safeColumnProps), {}, {
       //@ts-ignore
       headerName: columnProps.headerName || columnProps.title,
       field: name,