@nokecy/qc-ui 1.1.49 → 1.1.50

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/utils.js

@@ -9,6 +9,7 @@ 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"];
@@ -190,6 +191,54 @@ 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;
+    var path = arrayField.address.concat(index).concat(dataKey);
+    var self = {
+      path: path,
+      address: path,
+      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 +268,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 +295,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",

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 展示和编辑

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

@@ -1,9 +1,4 @@
 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 _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); }
@@ -11,6 +6,11 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 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 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 与扁平化配置之间的转换
@@ -25,6 +25,39 @@ export var generateId = function generateId() {
   return uniqueId('col_');
 };
 
+/**
+ * 去掉只做查询条件的列（hideInTable），含分组内的
+ * 这类列只进查询表单，不是表格列：列方案的还原、新增列检测都不能把它带进表格
+ * @author nokecy
+ */
+export 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
+ */
+export 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 展示和编辑
@@ -134,6 +167,10 @@ export function gridStateToFlatConfig(columnDefs, originalColumnDefs) {
  * @returns AG-Grid 列定义数组
  */
 export function flatConfigToGridState(flatConfig, originalColumnDefs) {
+  // 只做查询条件的列不进表格：方案里存过的剔除，也不当新增列补回 @author nokecy
+  flatConfig = dropQueryOnlyItems(flatConfig, originalColumnDefs);
+  originalColumnDefs = excludeQueryOnlyColumns(originalColumnDefs);
+
   /**
    * 从原始列定义中查找指定字段的列定义（支持递归查找分组内的列）
    */
@@ -451,6 +488,10 @@ export function isOldSchemeData(data) {
  * @returns AG-Grid columnState 数组
  */
 export function flatConfigToColumnState(flatConfig, originalColumnDefs) {
+  // 只做查询条件的列不进表格：方案里存过的剔除，也不当新增列补回 @author nokecy
+  flatConfig = dropQueryOnlyItems(flatConfig, originalColumnDefs);
+  originalColumnDefs = excludeQueryOnlyColumns(originalColumnDefs);
+
   /**
    * 递归收集所有列定义（包括分组内的列）
    */

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

@@ -9,8 +9,9 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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; }
 import React from 'react';
 import { theme } from 'antd';
-import { useField, useFieldSchema, RecursionField, Observer } from '@formily/react';
-import { isArr } from '@formily/shared';
+import { useField, useFieldSchema, RecursionField, Observer, useExpressionScope } from '@formily/react';
+import { isArr, lazyMerge } from '@formily/shared';
+import { Schema } from '@formily/json-schema';
 import ArrayBase from "./arrayBase";
 import { getReadOnlyFormatter } from "./readOnlyFormatters";
 var isColumnComponent = function isColumnComponent(schema) {
@@ -183,6 +184,54 @@ 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;
+    var path = arrayField.address.concat(index).concat(dataKey);
+    var self = {
+      path: path,
+      address: path,
+      index: index,
+      form: form,
+      parent: arrayField,
+      get value() {
+        return readByFieldPath(record, dataKey);
+      },
+      query: function query(pattern) {
+        return form.query(pattern);
+      }
+    };
+    var result = Schema.shallowCompile(own, 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;
+  }
+};
+
 /**
  * 懒挂载单元格渲染器(可编辑列)。
  *
@@ -212,6 +261,7 @@ var LazyAgField = function LazyAgField(params) {
   // hook 必须在下面的条件 return 之前调用
   var _theme$useToken = theme.useToken(),
     token = _theme$useToken.token;
+  var scope = 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) {
@@ -238,7 +288,9 @@ var 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.createElement("span", {
         className: "ag-array-table-lazy-placeholder",