@nokecy/qc-ui 1.1.49 → 1.1.51

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

@@ -305,7 +305,8 @@ var ColumnSetting = function ColumnSetting(_ref) {
       // 【修复】修正 originalHeaderName,确保使用 initialColumnDefs 中的原始值
       var config = fixOriginalHeaderName(currentScheme.columnConfig);
       // 【修复】检测并追加代码中新增的列到配置末尾
-      config = mergeNewColumns(config, originalColumnDefs);
+      // 只做查询条件的列不进列配置：方案里存过的剔除，也不当新增列追加 @author nokecy
+      config = mergeNewColumns((0, _columnGroupUtils.dropQueryOnlyItems)(config, originalColumnDefs), (0, _columnGroupUtils.excludeQueryOnlyColumns)(originalColumnDefs));
       // 【修复】按 order 字段排序，确保配置弹窗显示的列顺序与保存时一致
       config = _toConsumableArray(config).sort(function (a, b) {
         return a.order - b.order;

package/dist/cjs/ag-grid-plus/setting/columnGroupUtils.d.ts

@@ -8,6 +8,18 @@ import type { FlatColumnItem, OldColumnState } from './columnGroupTypes';
  * 生成唯一 ID
  */
 export declare const generateId: () => string;
+/**
+ * 去掉只做查询条件的列（hideInTable），含分组内的
+ * 这类列只进查询表单，不是表格列：列方案的还原、新增列检测都不能把它带进表格
+ * @author nokecy
+ */
+export declare function excludeQueryOnlyColumns<T extends ColDef | ColGroupDef>(defs?: T[]): T[] | undefined;
+/**
+ * 从已存的列方案中去掉只做查询条件的列
+ * 旧版本方案会把它们当新增列存进去，还原时要按当前列定义剔除
+ * @author nokecy
+ */
+export declare function dropQueryOnlyItems(flatConfig: FlatColumnItem[], originalColumnDefs?: (ColDef | ColGroupDef)[]): FlatColumnItem[];
 /**
  * Grid State → 扁平化配置
  * 将 AG-Grid 的树形结构转换为扁平化数组，用于 UI 展示和编辑

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

@@ -1,10 +1,11 @@
 "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
 });
 exports.checkIsLastChild = checkIsLastChild;
+exports.dropQueryOnlyItems = dropQueryOnlyItems;
+exports.excludeQueryOnlyColumns = excludeQueryOnlyColumns;
 exports.findLastDescendantIndex = findLastDescendantIndex;
 exports.flatConfigToColumnState = flatConfigToColumnState;
 exports.flatConfigToGridState = flatConfigToGridState;
@@ -15,18 +16,19 @@ exports.migrateOldScheme = migrateOldScheme;
 exports.reorderItems = reorderItems;
 var _lodash = require("lodash");
 var _logger = require("../utils/logger");
-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 _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."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; } /**
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+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); } /**
  * 表头分组配置工具函数
  * 负责 Grid State 与扁平化配置之间的转换
  */
@@ -37,6 +39,39 @@ var generateId = exports.generateId = function generateId() {
   return (0, _lodash.uniqueId)('col_');
 };
 
+/**
+ * 去掉只做查询条件的列（hideInTable），含分组内的
+ * 这类列只进查询表单，不是表格列：列方案的还原、新增列检测都不能把它带进表格
+ * @author nokecy
+ */
+function excludeQueryOnlyColumns(defs) {
+  return defs === null || defs === void 0 ? void 0 : defs.filter(function (def) {
+    return !def.hideInTable;
+  }).map(function (def) {
+    return 'children' in def && def.children ? _objectSpread(_objectSpread({}, def), {}, {
+      children: excludeQueryOnlyColumns(def.children)
+    }) : def;
+  });
+}
+
+/**
+ * 从已存的列方案中去掉只做查询条件的列
+ * 旧版本方案会把它们当新增列存进去，还原时要按当前列定义剔除
+ * @author nokecy
+ */
+function dropQueryOnlyItems(flatConfig, originalColumnDefs) {
+  var queryOnlyFields = new Set();
+  var collect = function collect(defs) {
+    return defs.forEach(function (def) {
+      if ('children' in def && def.children) collect(def.children);else if (def.hideInTable && def.field) queryOnlyFields.add(def.field);
+    });
+  };
+  collect(originalColumnDefs !== null && originalColumnDefs !== void 0 ? originalColumnDefs : []);
+  return flatConfig.filter(function (item) {
+    return item.type !== 'column' || !item.field || !queryOnlyFields.has(item.field);
+  });
+}
+
 /**
  * Grid State → 扁平化配置
  * 将 AG-Grid 的树形结构转换为扁平化数组，用于 UI 展示和编辑
@@ -146,6 +181,10 @@ function gridStateToFlatConfig(columnDefs, originalColumnDefs) {
  * @returns AG-Grid 列定义数组
  */
 function flatConfigToGridState(flatConfig, originalColumnDefs) {
+  // 只做查询条件的列不进表格：方案里存过的剔除，也不当新增列补回 @author nokecy
+  flatConfig = dropQueryOnlyItems(flatConfig, originalColumnDefs);
+  originalColumnDefs = excludeQueryOnlyColumns(originalColumnDefs);
+
   /**
    * 从原始列定义中查找指定字段的列定义（支持递归查找分组内的列）
    */
@@ -463,6 +502,10 @@ function isOldSchemeData(data) {
  * @returns AG-Grid columnState 数组
  */
 function flatConfigToColumnState(flatConfig, originalColumnDefs) {
+  // 只做查询条件的列不进表格：方案里存过的剔除，也不当新增列补回 @author nokecy
+  flatConfig = dropQueryOnlyItems(flatConfig, originalColumnDefs);
+  originalColumnDefs = excludeQueryOnlyColumns(originalColumnDefs);
+
   /**
    * 递归收集所有列定义（包括分组内的列）
    */

package/dist/cjs/array-table/columnGroup.d.ts

@@ -0,0 +1,39 @@
+/**
+ * ArrayTable 分组表头(多级表头)。
+ *
+ * 背景:schema 里的每个 ArrayTable.Column 被抽成「扁平」列定义(buildArrayTableColumns),
+ * 内部一批逻辑(懒挂载列识别、列方案还原、首列拖拽等)都按扁平列取值,不能改。
+ * 所以分组只在「交给 AG-Grid 的那一份 columnDefs」上做:
+ *  1. buildArrayTableColumns 生成列定义时,用 markHeaderGroup 把列声明的 headerGroup 记下来;
+ *  2. index.tsx 把扁平列定义交给 groupColumnDefs,得到含列组的 columnDefs 传给 AgGridReact。
+ *
+ * 分组名记在模块内的 WeakMap 里,不往 colDef 上塞自定义字段——AG-Grid 会把未知属性当作错误告警。
+ *
+ * 只支持一级分组;分组名相同但不相邻的列各自成组。
+ *
+ * @author nokecy
+ */
+import type { ColDef, ColGroupDef } from 'ag-grid-community';
+/**
+ * 记下列定义所属的表头分组。
+ * headerGroup 不是非空字符串(没声明、空串、纯空白)时不做任何事,该列按无分组处理。
+ * 返回传入的 colDef 本身,方便链式使用。
+ */
+export declare const markHeaderGroup: <T extends object>(colDef: T, headerGroup: unknown) => T;
+/**
+ * 把扁平列定义按「相邻且 headerGroup 相同」合并成 AG-Grid 列组。
+ *
+ *  - 相邻同名的列 -> 一个 { headerName, groupId, children } 列组;
+ *  - 同名但被别的列隔开 -> 各自成组,groupId 各不相同;
+ *  - 没声明分组的列原样保留(同一个对象);
+ *  - 一个分组也没有时直接返回传入的数组本身,没用到分组的表格行为零变化。
+ *
+ * groupId 由分组名派生(同名第 N 次出现追加 _N),同样的输入永远得到同样的 id:
+ * columnDefs 因别的原因重建时,AG-Grid 靠 groupId 认出还是那个列组,列组状态不丢。
+ *
+ * 有意不设 marryChildren:设了以后,任何打破组内相邻的列顺序(用户旧的扁平列方案、
+ * 列设置面板里跨组拖动的实时预览)都会被 AG-Grid 整体丢弃并报 error #39;不设则顺序照常生效,
+ * 组被隔开时表头显示成多段。
+ * openByDefault:列组默认展开(只对配了 columnGroupShow 的可折叠列组有意义)。
+ */
+export declare const groupColumnDefs: (colDefs: ColDef[]) => (ColDef | ColGroupDef)[];

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

@@ -0,0 +1,106 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.markHeaderGroup = exports.groupColumnDefs = void 0;
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+/**
+ * ArrayTable 分组表头(多级表头)。
+ *
+ * 背景:schema 里的每个 ArrayTable.Column 被抽成「扁平」列定义(buildArrayTableColumns),
+ * 内部一批逻辑(懒挂载列识别、列方案还原、首列拖拽等)都按扁平列取值,不能改。
+ * 所以分组只在「交给 AG-Grid 的那一份 columnDefs」上做:
+ *  1. buildArrayTableColumns 生成列定义时,用 markHeaderGroup 把列声明的 headerGroup 记下来;
+ *  2. index.tsx 把扁平列定义交给 groupColumnDefs,得到含列组的 columnDefs 传给 AgGridReact。
+ *
+ * 分组名记在模块内的 WeakMap 里,不往 colDef 上塞自定义字段——AG-Grid 会把未知属性当作错误告警。
+ *
+ * 只支持一级分组;分组名相同但不相邻的列各自成组。
+ *
+ * @author nokecy
+ */
+
+/** 列定义 -> 它在 schema 里声明的 headerGroup */
+var headerGroupOf = new WeakMap();
+
+/** 列组 id 前缀,与列方案里生成的 col_N 区分开 */
+var GROUP_ID_PREFIX = 'arrayTableGroup_';
+
+/**
+ * 记下列定义所属的表头分组。
+ * headerGroup 不是非空字符串(没声明、空串、纯空白)时不做任何事,该列按无分组处理。
+ * 返回传入的 colDef 本身,方便链式使用。
+ */
+var markHeaderGroup = exports.markHeaderGroup = function markHeaderGroup(colDef, headerGroup) {
+  if (typeof headerGroup === 'string' && headerGroup.trim() !== '') {
+    headerGroupOf.set(colDef, headerGroup);
+  }
+  return colDef;
+};
+
+/**
+ * 把扁平列定义按「相邻且 headerGroup 相同」合并成 AG-Grid 列组。
+ *
+ *  - 相邻同名的列 -> 一个 { headerName, groupId, children } 列组;
+ *  - 同名但被别的列隔开 -> 各自成组,groupId 各不相同;
+ *  - 没声明分组的列原样保留(同一个对象);
+ *  - 一个分组也没有时直接返回传入的数组本身,没用到分组的表格行为零变化。
+ *
+ * groupId 由分组名派生(同名第 N 次出现追加 _N),同样的输入永远得到同样的 id:
+ * columnDefs 因别的原因重建时,AG-Grid 靠 groupId 认出还是那个列组,列组状态不丢。
+ *
+ * 有意不设 marryChildren:设了以后,任何打破组内相邻的列顺序(用户旧的扁平列方案、
+ * 列设置面板里跨组拖动的实时预览)都会被 AG-Grid 整体丢弃并报 error #39;不设则顺序照常生效,
+ * 组被隔开时表头显示成多段。
+ * openByDefault:列组默认展开(只对配了 columnGroupShow 的可折叠列组有意义)。
+ */
+var groupColumnDefs = exports.groupColumnDefs = function groupColumnDefs(colDefs) {
+  if (!colDefs.some(function (colDef) {
+    return headerGroupOf.has(colDef);
+  })) return colDefs;
+  var usedGroupIds = new Set();
+  var makeGroupId = function makeGroupId(name) {
+    var id = "".concat(GROUP_ID_PREFIX).concat(name);
+    for (var n = 2; usedGroupIds.has(id); n++) {
+      id = "".concat(GROUP_ID_PREFIX).concat(name, "_").concat(n);
+    }
+    usedGroupIds.add(id);
+    return id;
+  };
+  var result = [];
+  var current = null;
+  var _iterator = _createForOfIteratorHelper(colDefs),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var colDef = _step.value;
+      var name = headerGroupOf.get(colDef);
+      if (name === undefined) {
+        current = null;
+        result.push(colDef);
+      } else if (current && current.name === name) {
+        current.group.children.push(colDef);
+      } else {
+        var group = {
+          headerName: name,
+          groupId: makeGroupId(name),
+          openByDefault: true,
+          children: [colDef]
+        };
+        current = {
+          name: name,
+          group: group
+        };
+        result.push(group);
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return result;
+};

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

@@ -10,6 +10,7 @@ var _agGridReact = require("ag-grid-react");
 var _react2 = require("@formily/react");
 var _uniqueId = _interopRequireDefault(require("lodash/uniqueId"));
 var _utils = require("./utils");
+var _columnGroup = require("./columnGroup");
 var _hooks = require("./hooks");
 var _arrayBase = _interopRequireDefault(require("./arrayBase"));
 var _arrayAddBtn = _interopRequireDefault(require("./arrayAddBtn"));
@@ -82,14 +83,16 @@ var ArrayTableInner = (0, _react2.observer)(function (props) {
   // 通过 JSON.stringify 比较内容，只有内容真正变化时才返回新引用
   var sourcesKey = (0, _react.useMemo)(function () {
     return JSON.stringify(rawSources.map(function (s) {
-      var _s$columnProps$header, _s$columnProps, _s$columnProps2;
+      var _s$columnProps$header, _s$columnProps, _s$columnProps2, _s$columnProps3;
       return {
         name: s.name,
         display: s.display,
         // 列标题可由 reactions 运行时改写,纳入 key 才能让 stableColumnDefs 跟着重建。
         // 宽度/隐藏/固定由 applyColumnState(方案)管,故意不纳入,避免行编辑时列状态被重置。
         // 可编辑性:带 x-reactions 的列在 buildArrayTableColumns 里已强制走 AgField 全树(尊重运行时 pattern),无需进 key。@author nokecy
-        headerName: (_s$columnProps$header = (_s$columnProps = s.columnProps) === null || _s$columnProps === void 0 ? void 0 : _s$columnProps.headerName) !== null && _s$columnProps$header !== void 0 ? _s$columnProps$header : (_s$columnProps2 = s.columnProps) === null || _s$columnProps2 === void 0 ? void 0 : _s$columnProps2.title
+        headerName: (_s$columnProps$header = (_s$columnProps = s.columnProps) === null || _s$columnProps === void 0 ? void 0 : _s$columnProps.headerName) !== null && _s$columnProps$header !== void 0 ? _s$columnProps$header : (_s$columnProps2 = s.columnProps) === null || _s$columnProps2 === void 0 ? void 0 : _s$columnProps2.title,
+        // 分组名变了列组结构就变,同样要重建。@author nokecy
+        headerGroup: (_s$columnProps3 = s.columnProps) === null || _s$columnProps3 === void 0 ? void 0 : _s$columnProps3.headerGroup
       };
     }));
   }, [rawSources]);
@@ -150,6 +153,12 @@ var ArrayTableInner = (0, _react2.observer)(function (props) {
     return cols;
   }, [sources, props.onRowDrag]); // 移除 field 依赖，避免数据变化时重新计算
 
+  // 交给 AgGridReact 的列定义:按 x-component-props.headerGroup 把相邻同组的列合并成列组(多级表头)。
+  // stableColumnDefs 保持扁平,懒列识别、列方案还原等内部逻辑仍用它;只有喂给 AG-Grid 的这一份带分组。@author nokecy
+  var gridColumnDefs = (0, _react.useMemo)(function () {
+    return (0, _columnGroup.groupColumnDefs)(stableColumnDefs);
+  }, [stableColumnDefs]);
+
   // 懒挂载:把激活态 Set 通过 AG-Grid context 暴露给 LazyAgField(引用稳定,原地 mutate)。@author nokecy
   var gridContext = (0, _react.useMemo)(function () {
     return {
@@ -226,8 +235,8 @@ var ArrayTableInner = (0, _react2.observer)(function (props) {
       if (hasGroups) {
         // 传入 stableColumnDefs 作为原始定义,保留 cellRenderer(AgField/LazyAgField)及其
         // cellRendererParams——否则分组方案重建出的是裸列,单元格退化为纯文本、编辑失效。@author nokecy
-        var gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(currentScheme.columnConfig, stableColumnDefs);
-        gridApiState.setGridOption('columnDefs', gridColumnDefs);
+        var _gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(currentScheme.columnConfig, stableColumnDefs);
+        gridApiState.setGridOption('columnDefs', _gridColumnDefs);
       }
 
       // 2. 应用列状态（列顺序、宽度、隐藏、固定等）
@@ -420,7 +429,7 @@ var ArrayTableInner = (0, _react2.observer)(function (props) {
     ,
     rowHeight: 38,
     pagination: false,
-    columnDefs: stableColumnDefs,
+    columnDefs: gridColumnDefs,
     rowData: dataSource
   })), sources.map(function (column, key) {
     //专门用来承接对Column的状态管理

package/dist/cjs/array-table/interface.d.ts

@@ -3,9 +3,28 @@ import { FieldDisplayTypes, GeneralField } from "@formily/core";
 import { Schema } from "@formily/json-schema";
 import { AgGridReactProps } from "ag-grid-react";
 import React from "react";
+/**
+ * ArrayTable.Column 的 x-component-props 里 qc-ui 自己认的扩展属性;
+ * 其余属性(width、headerName、pinned 等)按 AG-Grid 列定义处理。
+ *
+ * @author nokecy
+ */
+interface ArrayTableColumnProps {
+    /**
+     * 表头分组名(多级表头,仅一级)。
+     * 相邻且 headerGroup 相同的列合并成一个列组,分组名作为组头;
+     * 同名但不相邻的列各自成组;不写则该列不分组。
+     */
+    headerGroup?: string;
+    /**
+     * 默认隐藏:为 true 时该列首次出现时是隐藏的,用户可在列设置里打开,列方案(applyColumnState)优先。
+     * 对应 AG-Grid 的 initialHide。注意 hide 在 ArrayTable 里不生效(状态归列方案管),要默认隐藏请用它。
+     */
+    defaultHide?: boolean;
+}
 interface ObservableColumnSource {
     field: GeneralField;
-    columnProps: any;
+    columnProps: ArrayTableColumnProps & Record<string, any>;
     schema: Schema;
     display: FieldDisplayTypes;
     name: string;
@@ -13,4 +32,4 @@ interface ObservableColumnSource {
 type ComposedArrayTable = React.FC<React.PropsWithChildren<AgGridReactProps>> & ArrayBaseMixins & {
     Column?: any;
 };
-export { ComposedArrayTable, ObservableColumnSource };
+export { ComposedArrayTable, ObservableColumnSource, ArrayTableColumnProps };

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

@@ -9,9 +9,11 @@ var _react = _interopRequireDefault(require("react"));
 var _antd = require("antd");
 var _react2 = require("@formily/react");
 var _shared = require("@formily/shared");
+var _jsonSchema = require("@formily/json-schema");
 var _arrayBase = _interopRequireDefault(require("./arrayBase"));
 var _readOnlyFormatters = require("./readOnlyFormatters");
-var _excluded = ["hide", "sort", "sortIndex", "forceAgField"];
+var _columnGroup = require("./columnGroup");
+var _excluded = ["hide", "sort", "sortIndex", "forceAgField", "headerGroup", "defaultHide"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }
@@ -190,6 +192,56 @@ var resolveEmptyPlaceholder = function resolveEmptyPlaceholder(fieldSchema) {
   return SELECT_LIKE.has(fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component']) ? '请选择' : '请输入';
 };
 
+/** Formily 字段的四种 pattern;x-pattern 求出来不在其中,视为「求不出」 */
+var CELL_PATTERNS = new Set(['editable', 'disabled', 'readOnly', 'readPretty']);
+
+/**
+ * 懒挂载格此刻的 pattern。
+ *
+ * 懒挂载不创建 Formily 字段,拿不到字段实例上求好的 pattern,只能按同一套规则自己求:
+ * 字段自己的 x-pattern 优先(表达式按本行本格的作用域求值,$self 只提供 path/index/value/form/parent/query),
+ * 没写则继承整表 pattern。表达式用到本格没有的能力、抛错或求出非法值时返回 undefined,
+ * 调用方按「可编辑」处理,保持原有提示。@author nokecy
+ */
+var resolveLazyCellPattern = function resolveLazyCellPattern(arrayField, record, dataKey, fieldSchema, scope) {
+  var own = fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-pattern'];
+  if (own == null) return arrayField === null || arrayField === void 0 ? void 0 : arrayField.pattern;
+  if (typeof own !== 'string') return undefined;
+  if (CELL_PATTERNS.has(own)) return own;
+  var form = arrayField === null || arrayField === void 0 ? void 0 : arrayField.form;
+  if (!form || !dataKey) return undefined;
+  try {
+    var _arrayField$value$ind, _arrayField$value, _arrayField$value$ind2;
+    var index = (_arrayField$value$ind = (_arrayField$value = arrayField.value) === null || _arrayField$value === void 0 || (_arrayField$value$ind2 = _arrayField$value.indexOf) === null || _arrayField$value$ind2 === void 0 ? void 0 : _arrayField$value$ind2.call(_arrayField$value, record)) !== null && _arrayField$value$ind !== void 0 ? _arrayField$value$ind : -1;
+    // 与真字段一致:path 是数据路径(不含 void 容器),address 含 void 容器;表达式里 getValuesIn($self.path...) 靠前者
+    var path = arrayField.path.concat(index).concat(dataKey);
+    var address = arrayField.address.concat(index).concat(dataKey);
+    var self = {
+      path: path,
+      address: address,
+      index: index,
+      form: form,
+      parent: arrayField,
+      get value() {
+        return readByFieldPath(record, dataKey);
+      },
+      query: function query(pattern) {
+        return form.query(pattern);
+      }
+    };
+    var result = _jsonSchema.Schema.shallowCompile(own, (0, _shared.lazyMerge)(scope !== null && scope !== void 0 ? scope : {}, {
+      $form: form,
+      $values: form.values,
+      $self: self,
+      $record: record,
+      $index: index
+    }));
+    return CELL_PATTERNS.has(result) ? result : undefined;
+  } catch (_unused) {
+    return undefined;
+  }
+};
+
 /**
  * 懒挂载单元格渲染器(可编辑列)。
  *
@@ -219,6 +271,7 @@ var LazyAgField = exports.LazyAgField = function LazyAgField(params) {
   // hook 必须在下面的条件 return 之前调用
   var _theme$useToken = _antd.theme.useToken(),
     token = _theme$useToken.token;
+  var scope = (0, _react2.useExpressionScope)();
   var key = "".concat(node === null || node === void 0 ? void 0 : node.id, ":").concat(colDef === null || colDef === void 0 ? void 0 : colDef.field);
   var activated = (record === null || record === void 0 ? void 0 : record._isNew) === true || (context === null || context === void 0 || (_context$activeCells = context.activeCells) === null || _context$activeCells === void 0 || (_context$activeCells$ = _context$activeCells.has) === null || _context$activeCells$ === void 0 ? void 0 : _context$activeCells$.call(_context$activeCells, key)) === true;
   if (activated) {
@@ -245,7 +298,9 @@ var LazyAgField = exports.LazyAgField = function LazyAgField(params) {
       fieldSchema: fieldSchema
     }) : liveValue == null ? '' : String(liveValue);
     // 纯文本占满单元格,点击交给 AG-Grid onCellClicked 激活;样式尽量贴近 Editable 只读态避免点开跳动
-    if (text === '') {
+    // 只读态(readPretty/disabled/readOnly)的空格不出编辑提示,留空与只读快路径一致
+    var pattern = text === '' ? resolveLazyCellPattern(field, record, dataKey, fieldSchema, scope) : undefined;
+    if (text === '' && (pattern == null || pattern === 'editable')) {
       // 空值:出淡灰 placeholder,让用户看得出这格能填(颜色取 antd 输入框 placeholder 的 token,自动跟随暗色主题)
       return /*#__PURE__*/_react.default.createElement("span", {
         className: "ag-array-table-lazy-placeholder",
@@ -368,6 +423,8 @@ var buildArrayTableColumns = exports.buildArrayTableColumns = function buildArra
       sort = columnProps.sort,
       sortIndex = columnProps.sortIndex,
       forceAgField = columnProps.forceAgField,
+      headerGroup = columnProps.headerGroup,
+      defaultHide = columnProps.defaultHide,
       safeColumnProps = _objectWithoutProperties(columnProps, _excluded);
     var base = _objectSpread(_objectSpread({}, safeColumnProps), {}, {
       // 保留 width 作为列的初始宽度
@@ -375,7 +432,15 @@ var buildArrayTableColumns = exports.buildArrayTableColumns = function buildArra
       //@ts-ignore
       headerName: columnProps.headerName || columnProps.title,
       field: name
-    });
+    }, defaultHide === true ? {
+      initialHide: true
+    } : {});
+
+    // 记下分组名再输出列定义;真正合并成列组在 index.tsx 交给 AG-Grid 之前(groupColumnDefs)做,
+    // 这里产出的仍是扁平列定义。@author nokecy
+    var emit = function emit(colDef) {
+      return buf.concat((0, _columnGroup.markHeaderGroup)(colDef, headerGroup));
+    };
 
     // 三分流渲染策略:@author nokecy
     //   ① 只读纯文本(永不可编辑):只读列 + 有格式化器 -> valueFormatter,不挂 Formily 树。
@@ -411,7 +476,7 @@ var buildArrayTableColumns = exports.buildArrayTableColumns = function buildArra
       // 读 AG-Grid 缓存值不刷新 → 反应式只读渲染。整表 readPretty(明细/详情页,数据 setValues 整体加载、
       // 行引用整体替换、AG-Grid 自然刷新)仍走更廉价的静态 valueFormatter 快路径。@author nokecy
       if (arrayPattern !== 'readPretty') {
-        return buf.concat(_objectSpread(_objectSpread(_objectSpread({}, base), valueGetter ? {
+        return emit(_objectSpread(_objectSpread(_objectSpread({}, base), valueGetter ? {
           valueGetter: valueGetter
         } : {}), {}, {
           cellRenderer: LazyReadOnlyText,
@@ -422,7 +487,7 @@ var buildArrayTableColumns = exports.buildArrayTableColumns = function buildArra
           }
         }));
       }
-      return buf.concat(_objectSpread(_objectSpread(_objectSpread({}, base), valueGetter ? {
+      return emit(_objectSpread(_objectSpread(_objectSpread({}, base), valueGetter ? {
         valueGetter: valueGetter
       } : {}), {}, {
         // 显式清掉可能从 safeColumnProps 漏带的 cellRenderer(AG-Grid 中 renderer 优先级高于 formatter)
@@ -438,7 +503,7 @@ var buildArrayTableColumns = exports.buildArrayTableColumns = function buildArra
 
     // ② 可编辑懒挂载(排除单击直控的 Switch/Checkbox:须 eager 出真控件)
     if (!readOnly && formatter && !hasReactions && !forceEager && !isInlineToggle && canFastPath) {
-      return buf.concat(_objectSpread(_objectSpread(_objectSpread({}, base), valueGetter ? {
+      return emit(_objectSpread(_objectSpread(_objectSpread({}, base), valueGetter ? {
         valueGetter: valueGetter
       } : {}), {}, {
         cellRenderer: LazyAgField,
@@ -455,7 +520,7 @@ var buildArrayTableColumns = exports.buildArrayTableColumns = function buildArra
     }
 
     // ③ 兜底全树
-    return buf.concat(_objectSpread(_objectSpread({}, base), {}, {
+    return emit(_objectSpread(_objectSpread({}, base), {}, {
       cellRendererParams: {
         dataSource: dataSource,
         schema: schema,

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

@@ -33,7 +33,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, generateId } from "./columnGroupUtils";
+import { gridStateToFlatConfig, flatConfigToGridState, flatConfigToColumnState, dropQueryOnlyItems, excludeQueryOnlyColumns, isOldSchemeData, migrateOldScheme, generateId } from "./columnGroupUtils";
 import ColumnConfigTable from "./ColumnConfigTable";
 import DraggableModal from "../../draggableModal";
 import { useGridSchemes } from "../context/useSchemeManager";
@@ -298,7 +298,8 @@ var ColumnSetting = function ColumnSetting(_ref) {
       // 【修复】修正 originalHeaderName,确保使用 initialColumnDefs 中的原始值
       var config = fixOriginalHeaderName(currentScheme.columnConfig);
       // 【修复】检测并追加代码中新增的列到配置末尾
-      config = mergeNewColumns(config, originalColumnDefs);
+      // 只做查询条件的列不进列配置：方案里存过的剔除，也不当新增列追加 @author nokecy
+      config = mergeNewColumns(dropQueryOnlyItems(config, originalColumnDefs), excludeQueryOnlyColumns(originalColumnDefs));
       // 【修复】按 order 字段排序，确保配置弹窗显示的列顺序与保存时一致
       config = _toConsumableArray(config).sort(function (a, b) {
         return a.order - b.order;

package/dist/esm/ag-grid-plus/setting/columnGroupUtils.d.ts

@@ -8,6 +8,18 @@ import type { FlatColumnItem, OldColumnState } from './columnGroupTypes';
  * 生成唯一 ID
  */
 export declare const generateId: () => string;
+/**
+ * 去掉只做查询条件的列（hideInTable），含分组内的
+ * 这类列只进查询表单，不是表格列：列方案的还原、新增列检测都不能把它带进表格
+ * @author nokecy
+ */
+export declare function excludeQueryOnlyColumns<T extends ColDef | ColGroupDef>(defs?: T[]): T[] | undefined;
+/**
+ * 从已存的列方案中去掉只做查询条件的列
+ * 旧版本方案会把它们当新增列存进去，还原时要按当前列定义剔除
+ * @author nokecy
+ */
+export declare function dropQueryOnlyItems(flatConfig: FlatColumnItem[], originalColumnDefs?: (ColDef | ColGroupDef)[]): FlatColumnItem[];
 /**
  * Grid State → 扁平化配置
  * 将 AG-Grid 的树形结构转换为扁平化数组，用于 UI 展示和编辑