@nokecy/qc-ui 1.1.26 → 1.1.27

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

@@ -1293,9 +1293,8 @@ function AgGridPlus(props) {
       gridApi: apiRef.current,
       onSaveColumnState: onColumnStateChanged
     }),
-    /*#__PURE__*/
-    // 高级搜索（图标风格，位于设置右边）
-    _react.default.createElement(_antd.Popover, {
+    // 高级搜索（图标风格，位于设置右边）- 遵循 search 属性
+    search !== false ? /*#__PURE__*/_react.default.createElement(_antd.Popover, {
       key: "advanced-search-setting",
       content: /*#__PURE__*/_react.default.createElement("div", {
         style: {
@@ -1364,7 +1363,7 @@ function AgGridPlus(props) {
         fontSize: 16,
         cursor: "pointer"
       }
-    }, /*#__PURE__*/_react.default.createElement(_icons.FilterOutlined, null))))]
+    }, /*#__PURE__*/_react.default.createElement(_icons.FilterOutlined, null)))) : null].filter(Boolean)
   }), /*#__PURE__*/_react.default.createElement(_agGridReact.AgGridReact, _extends({
     theme: _theme.agGridTheme
   }, rest, {

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

@@ -167,6 +167,130 @@ var ColumnSetting = function ColumnSetting(_ref) {
     });
   }, [originalColumnDefs]);
 
+  /**
+   * 合并代码中新增的列到配置中
+   * 场景：用户保存列配置后，开发者在代码中新增了列，这些列应该显示在配置表格中
+   * 【增强】按照原始定义的顺序插入新增列，保留原始位置
+   */
+  var mergeNewColumns = (0, _react.useCallback)(function (config, originalDefs) {
+    if (!originalDefs || originalDefs.length === 0) {
+      return config;
+    }
+
+    // 创建 field -> config item 的映射（用于快速查找已保存的列配置）
+    var configByField = new Map();
+    config.filter(function (item) {
+      return item.type === 'column' && item.field;
+    }).forEach(function (item) {
+      configByField.set(item.field, item);
+    });
+
+    // 创建 groupId -> config item 的映射（用于快速查找已保存的分组配置）
+    var configByGroupId = new Map();
+    config.filter(function (item) {
+      return item.type === 'group' && item.groupId;
+    }).forEach(function (item) {
+      configByGroupId.set(item.groupId, item);
+    });
+    var result = [];
+    var order = 0;
+    var hasNewColumns = false;
+
+    /**
+     * 递归处理列定义，按原始顺序构建结果
+     * @param defs 列定义数组
+     * @param level 当前层级
+     * @param parentId 父节点 ID（如果有）
+     */
+    var processDefsInOrder = function processDefsInOrder(defs, level, parentId) {
+      var _iterator2 = _createForOfIteratorHelper(defs),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var def = _step2.value;
+          // 检查是否是分组
+          if ('children' in def && def.children && def.children.length > 0) {
+            var groupDef = def;
+            var groupIdValue = groupDef.groupId || groupDef.field || (0, _columnGroupUtils.generateId)();
+
+            // 查找已保存的分组配置
+            var existingGroup = configByGroupId.get(groupIdValue);
+            var groupItem = void 0;
+            if (existingGroup) {
+              // 使用已保存的分组配置，但更新 order 和 parentId
+              groupItem = _objectSpread(_objectSpread({}, existingGroup), {}, {
+                order: order++,
+                parentId: parentId,
+                level: level
+              });
+            } else {
+              // 新分组
+              hasNewColumns = true;
+              groupItem = {
+                id: (0, _columnGroupUtils.generateId)(),
+                type: 'group',
+                parentId: parentId,
+                level: level,
+                order: order++,
+                headerName: groupDef.headerName || '未命名分组',
+                originalHeaderName: groupDef.headerName || '未命名分组',
+                groupId: groupIdValue,
+                marryChildren: groupDef.marryChildren
+              };
+            }
+            result.push(groupItem);
+
+            // 递归处理子节点
+            processDefsInOrder(groupDef.children, level + 1, groupItem.id);
+          } else {
+            // 普通列
+            var colDef = def;
+            if (!colDef.field) continue;
+
+            // 查找已保存的列配置
+            var existingCol = configByField.get(colDef.field);
+            if (existingCol) {
+              // 使用已保存的列配置，但更新 order 和 parentId
+              result.push(_objectSpread(_objectSpread({}, existingCol), {}, {
+                order: order++,
+                parentId: parentId,
+                level: level
+              }));
+            } else {
+              // 新列
+              hasNewColumns = true;
+              result.push({
+                id: (0, _columnGroupUtils.generateId)(),
+                type: 'column',
+                parentId: parentId,
+                level: level,
+                order: order++,
+                field: colDef.field,
+                headerName: colDef.headerName || colDef.field || '未命名列',
+                originalHeaderName: colDef.headerName || colDef.field || '未命名列',
+                width: colDef.width,
+                hide: colDef.hide,
+                pinned: colDef.pinned === null || colDef.pinned === true || colDef.pinned === false ? 'notPinned' : colDef.pinned,
+                cellClass: colDef.cellClass,
+                flex: colDef.flex,
+                suppressHeaderFilterButton: colDef.suppressHeaderFilterButton
+              });
+            }
+          }
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+    };
+
+    // 从根级别开始处理
+    processDefsInOrder(originalDefs, 0);
+    if (hasNewColumns) {}
+    return result;
+  }, []);
+
   /**
    * 获取列数据 - 将 Grid 的列定义转换为扁平化配置
    * 新版本使用树形结构，兼容旧版本的 groupName 结构
@@ -175,7 +299,10 @@ var ColumnSetting = function ColumnSetting(_ref) {
     // 优先使用当前方案中保存的完整列配置(包含分组结构)
     if (currentScheme !== null && currentScheme !== void 0 && currentScheme.columnConfig) {
       // 【修复】修正 originalHeaderName,确保使用 initialColumnDefs 中的原始值
-      return fixOriginalHeaderName(currentScheme.columnConfig);
+      var config = fixOriginalHeaderName(currentScheme.columnConfig);
+      // 【修复】检测并追加代码中新增的列到配置末尾
+      config = mergeNewColumns(config, originalColumnDefs);
+      return config;
     }
 
     // 如果方案中没有 columnConfig,则从 Grid 读取
@@ -215,7 +342,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
       return item;
     });
     return flatConfig;
-  }, [gridApi, currentScheme, fixOriginalHeaderName, originalColumnDefs]);
+  }, [gridApi, currentScheme, fixOriginalHeaderName, originalColumnDefs, mergeNewColumns]);
 
   // 创建 Formily Form 实例
   var form = (0, _react.useMemo)(function () {
@@ -589,7 +716,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
   // 设置默认方案
   var handleSetDefault = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(schemeId) {
-      var scheme, _iterator2, _step2, s;
+      var scheme, _iterator3, _step3, s;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -602,15 +729,15 @@ var ColumnSetting = function ColumnSetting(_ref) {
               break;
             }
             // 将其他方案设为非默认
-            _iterator2 = _createForOfIteratorHelper(schemes);
+            _iterator3 = _createForOfIteratorHelper(schemes);
             _context4.prev = 4;
-            _iterator2.s();
+            _iterator3.s();
           case 6:
-            if ((_step2 = _iterator2.n()).done) {
+            if ((_step3 = _iterator3.n()).done) {
               _context4.next = 13;
               break;
             }
-            s = _step2.value;
+            s = _step3.value;
             if (!(s.isDefault && s.id !== schemeId)) {
               _context4.next = 11;
               break;
@@ -628,10 +755,10 @@ var ColumnSetting = function ColumnSetting(_ref) {
           case 15:
             _context4.prev = 15;
             _context4.t0 = _context4["catch"](4);
-            _iterator2.e(_context4.t0);
+            _iterator3.e(_context4.t0);
           case 18:
             _context4.prev = 18;
-            _iterator2.f();
+            _iterator3.f();
             return _context4.finish(18);
           case 21:
             _context4.next = 23;

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

@@ -1285,9 +1285,8 @@ function AgGridPlus(props) {
       gridApi: apiRef.current,
       onSaveColumnState: onColumnStateChanged
     }),
-    /*#__PURE__*/
-    // 高级搜索（图标风格，位于设置右边）
-    React.createElement(Popover, {
+    // 高级搜索（图标风格，位于设置右边）- 遵循 search 属性
+    search !== false ? /*#__PURE__*/React.createElement(Popover, {
       key: "advanced-search-setting",
       content: /*#__PURE__*/React.createElement("div", {
         style: {
@@ -1356,7 +1355,7 @@ function AgGridPlus(props) {
         fontSize: 16,
         cursor: "pointer"
       }
-    }, /*#__PURE__*/React.createElement(FilterOutlined, null))))]
+    }, /*#__PURE__*/React.createElement(FilterOutlined, null)))) : null].filter(Boolean)
   }), /*#__PURE__*/React.createElement(AgGridReact, _extends({
     theme: agGridTheme
   }, rest, {

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

@@ -26,7 +26,7 @@ import { AgGridReact } from 'ag-grid-react';
 import { agGridTheme } from "../theme";
 import { localeText } from "../locale";
 import { createForm, onFormInit } from '@formily/core';
-import { gridStateToFlatConfig, flatConfigToGridState, flatConfigToColumnState, isOldSchemeData, migrateOldScheme } from "./columnGroupUtils";
+import { gridStateToFlatConfig, flatConfigToGridState, flatConfigToColumnState, isOldSchemeData, migrateOldScheme, generateId } from "./columnGroupUtils";
 import ColumnConfigTable from "./ColumnConfigTable";
 import DraggableModal from "../../draggableModal";
 import { useGridSchemes } from "../context/useSchemeManager";
@@ -158,6 +158,130 @@ var ColumnSetting = function ColumnSetting(_ref) {
     });
   }, [originalColumnDefs]);
 
+  /**
+   * 合并代码中新增的列到配置中
+   * 场景：用户保存列配置后，开发者在代码中新增了列，这些列应该显示在配置表格中
+   * 【增强】按照原始定义的顺序插入新增列，保留原始位置
+   */
+  var mergeNewColumns = useCallback(function (config, originalDefs) {
+    if (!originalDefs || originalDefs.length === 0) {
+      return config;
+    }
+
+    // 创建 field -> config item 的映射（用于快速查找已保存的列配置）
+    var configByField = new Map();
+    config.filter(function (item) {
+      return item.type === 'column' && item.field;
+    }).forEach(function (item) {
+      configByField.set(item.field, item);
+    });
+
+    // 创建 groupId -> config item 的映射（用于快速查找已保存的分组配置）
+    var configByGroupId = new Map();
+    config.filter(function (item) {
+      return item.type === 'group' && item.groupId;
+    }).forEach(function (item) {
+      configByGroupId.set(item.groupId, item);
+    });
+    var result = [];
+    var order = 0;
+    var hasNewColumns = false;
+
+    /**
+     * 递归处理列定义，按原始顺序构建结果
+     * @param defs 列定义数组
+     * @param level 当前层级
+     * @param parentId 父节点 ID（如果有）
+     */
+    var processDefsInOrder = function processDefsInOrder(defs, level, parentId) {
+      var _iterator2 = _createForOfIteratorHelper(defs),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var def = _step2.value;
+          // 检查是否是分组
+          if ('children' in def && def.children && def.children.length > 0) {
+            var groupDef = def;
+            var groupIdValue = groupDef.groupId || groupDef.field || generateId();
+
+            // 查找已保存的分组配置
+            var existingGroup = configByGroupId.get(groupIdValue);
+            var groupItem = void 0;
+            if (existingGroup) {
+              // 使用已保存的分组配置，但更新 order 和 parentId
+              groupItem = _objectSpread(_objectSpread({}, existingGroup), {}, {
+                order: order++,
+                parentId: parentId,
+                level: level
+              });
+            } else {
+              // 新分组
+              hasNewColumns = true;
+              groupItem = {
+                id: generateId(),
+                type: 'group',
+                parentId: parentId,
+                level: level,
+                order: order++,
+                headerName: groupDef.headerName || '未命名分组',
+                originalHeaderName: groupDef.headerName || '未命名分组',
+                groupId: groupIdValue,
+                marryChildren: groupDef.marryChildren
+              };
+            }
+            result.push(groupItem);
+
+            // 递归处理子节点
+            processDefsInOrder(groupDef.children, level + 1, groupItem.id);
+          } else {
+            // 普通列
+            var colDef = def;
+            if (!colDef.field) continue;
+
+            // 查找已保存的列配置
+            var existingCol = configByField.get(colDef.field);
+            if (existingCol) {
+              // 使用已保存的列配置，但更新 order 和 parentId
+              result.push(_objectSpread(_objectSpread({}, existingCol), {}, {
+                order: order++,
+                parentId: parentId,
+                level: level
+              }));
+            } else {
+              // 新列
+              hasNewColumns = true;
+              result.push({
+                id: generateId(),
+                type: 'column',
+                parentId: parentId,
+                level: level,
+                order: order++,
+                field: colDef.field,
+                headerName: colDef.headerName || colDef.field || '未命名列',
+                originalHeaderName: colDef.headerName || colDef.field || '未命名列',
+                width: colDef.width,
+                hide: colDef.hide,
+                pinned: colDef.pinned === null || colDef.pinned === true || colDef.pinned === false ? 'notPinned' : colDef.pinned,
+                cellClass: colDef.cellClass,
+                flex: colDef.flex,
+                suppressHeaderFilterButton: colDef.suppressHeaderFilterButton
+              });
+            }
+          }
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+    };
+
+    // 从根级别开始处理
+    processDefsInOrder(originalDefs, 0);
+    if (hasNewColumns) {}
+    return result;
+  }, []);
+
   /**
    * 获取列数据 - 将 Grid 的列定义转换为扁平化配置
    * 新版本使用树形结构，兼容旧版本的 groupName 结构
@@ -166,7 +290,10 @@ var ColumnSetting = function ColumnSetting(_ref) {
     // 优先使用当前方案中保存的完整列配置(包含分组结构)
     if (currentScheme !== null && currentScheme !== void 0 && currentScheme.columnConfig) {
       // 【修复】修正 originalHeaderName,确保使用 initialColumnDefs 中的原始值
-      return fixOriginalHeaderName(currentScheme.columnConfig);
+      var config = fixOriginalHeaderName(currentScheme.columnConfig);
+      // 【修复】检测并追加代码中新增的列到配置末尾
+      config = mergeNewColumns(config, originalColumnDefs);
+      return config;
     }
 
     // 如果方案中没有 columnConfig,则从 Grid 读取
@@ -206,7 +333,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
       return item;
     });
     return flatConfig;
-  }, [gridApi, currentScheme, fixOriginalHeaderName, originalColumnDefs]);
+  }, [gridApi, currentScheme, fixOriginalHeaderName, originalColumnDefs, mergeNewColumns]);
 
   // 创建 Formily Form 实例
   var form = useMemo(function () {
@@ -580,7 +707,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
   // 设置默认方案
   var handleSetDefault = useCallback( /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(schemeId) {
-      var scheme, _iterator2, _step2, s;
+      var scheme, _iterator3, _step3, s;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -593,15 +720,15 @@ var ColumnSetting = function ColumnSetting(_ref) {
               break;
             }
             // 将其他方案设为非默认
-            _iterator2 = _createForOfIteratorHelper(schemes);
+            _iterator3 = _createForOfIteratorHelper(schemes);
             _context4.prev = 4;
-            _iterator2.s();
+            _iterator3.s();
           case 6:
-            if ((_step2 = _iterator2.n()).done) {
+            if ((_step3 = _iterator3.n()).done) {
               _context4.next = 13;
               break;
             }
-            s = _step2.value;
+            s = _step3.value;
             if (!(s.isDefault && s.id !== schemeId)) {
               _context4.next = 11;
               break;
@@ -619,10 +746,10 @@ var ColumnSetting = function ColumnSetting(_ref) {
           case 15:
             _context4.prev = 15;
             _context4.t0 = _context4["catch"](4);
-            _iterator2.e(_context4.t0);
+            _iterator3.e(_context4.t0);
           case 18:
             _context4.prev = 18;
-            _iterator2.f();
+            _iterator3.f();
             return _context4.finish(18);
           case 21:
             _context4.next = 23;