@nokecy/qc-ui 1.1.38 → 1.1.39

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _logger = require("../utils/logger");
 var _antd = require("antd");
 var _icons = require("@ant-design/icons");
 var _agGridReact = require("ag-grid-react");
@@ -286,6 +287,9 @@ var ColumnSetting = function ColumnSetting(_ref) {
     // 从根级别开始查找新增列
     findNewColumns(originalDefs, 0);
     if (newItems.length > 0) {
+      _logger.logger.debug('[getColumnData] 检测到新增列/分组，已追加到末尾:', newItems.map(function (i) {
+        return i.field || i.groupId;
+      }));
       return [].concat(_toConsumableArray(config), newItems);
     }
     return config;
@@ -430,19 +434,20 @@ var ColumnSetting = function ColumnSetting(_ref) {
               return s.id === schemeId;
             });
             if (!(scheme && gridApi)) {
-              _context.next = 12;
+              _context.next = 13;
               break;
             }
             // 【关键修复】先更新 columnDefs（处理分组结构），使用 allColDefs 保留自定义属性
             gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(scheme.columnConfig, allColDefs);
+            _logger.logger.debug('[ColumnSetting] 加载方案 - 更新 columnDefs');
             gridApi.setGridOption('columnDefs', gridColumnDefs);
 
             // 等待 columnDefs 更新完成
-            _context.next = 9;
+            _context.next = 10;
             return new Promise(function (resolve) {
               return setTimeout(resolve, 100);
             });
-          case 9:
+          case 10:
             // 【修复】然后应用列状态（宽度、隐藏、顺序等）
             columnState = (0, _columnGroupUtils.flatConfigToColumnState)(scheme.columnConfig);
             gridApi.applyColumnState({
@@ -454,7 +459,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
             if (scheme.filterModel) {
               gridApi.setFilterModel(scheme.filterModel);
             }
-          case 12:
+          case 13:
             _antd.message.success('方案已加载');
 
             // 等待Grid状态更新后再刷新表单
@@ -469,17 +474,17 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
             // 自动关闭弹窗,让用户看到Grid的变化
             onClose();
-            _context.next = 20;
+            _context.next = 21;
             break;
-          case 17:
-            _context.prev = 17;
+          case 18:
+            _context.prev = 18;
             _context.t0 = _context["catch"](0);
             _antd.message.error(_context.t0.message || '加载方案失败');
-          case 20:
+          case 21:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 17]]);
+      }, _callee, null, [[0, 18]]);
     }));
     return function (_x) {
       return _ref2.apply(this, arguments);
@@ -597,15 +602,24 @@ var ColumnSetting = function ColumnSetting(_ref) {
             return setTimeout(resolve, 100);
           });
         case 39:
+          // 【关键修复】直接应用方案到 Grid，不通过 handleLoadScheme
+          // 这样可以避免依赖 Context 状态更新的时序问题
+          _logger.logger.debug('[ColumnSetting] 保存后直接应用方案到 Grid');
+
+          // 【修复】始终更新 columnDefs，确保 cellClass 等属性能即时生效
+          // 原逻辑只在有分组时才更新 columnDefs，导致对齐方式保存后无法即时生效
+          _logger.logger.debug('[ColumnSetting] 更新 columnDefs');
           gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(savedScheme.columnConfig, allColDefs);
           gridApi.setGridOption('columnDefs', gridColumnDefs);
 
           // 等待 columnDefs 更新完成
-          _context2.next = 43;
+          _context2.next = 45;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 100);
           });
-        case 43:
+        case 45:
+          // 2. 应用列状态（列顺序、宽度、隐藏、固定等）
+          _logger.logger.debug('[ColumnSetting] 应用列状态');
           columnState = (0, _columnGroupUtils.flatConfigToColumnState)(savedScheme.columnConfig);
           gridApi.applyColumnState({
             state: columnState,
@@ -614,36 +628,37 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
           // 3. 应用过滤器
           if (savedScheme.filterModel) {
+            _logger.logger.debug('[ColumnSetting] 应用 filterModel');
             gridApi.setFilterModel(savedScheme.filterModel);
           }
 
           // 4. 设置为当前方案（如果不是当前方案）
           if (!(!currentScheme || savedScheme.id !== currentScheme.id)) {
-            _context2.next = 49;
+            _context2.next = 52;
             break;
           }
-          _context2.next = 49;
+          _context2.next = 52;
           return setCurrentColumnScheme === null || setCurrentColumnScheme === void 0 ? void 0 : setCurrentColumnScheme(gridKey, savedScheme.id);
-        case 49:
-          _context2.next = 51;
+        case 52:
+          _context2.next = 54;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 50);
           });
-        case 51:
+        case 54:
           // 5. 关闭弹窗
           onClose();
-          _context2.next = 58;
+          _context2.next = 61;
           break;
-        case 54:
-          _context2.prev = 54;
+        case 57:
+          _context2.prev = 57;
           _context2.t0 = _context2["catch"](8);
           console.error('保存列配置到方案失败:', _context2.t0);
           _antd.message.error('保存列配置失败');
-        case 58:
+        case 61:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[8, 54]]);
+    }, _callee2, null, [[8, 57]]);
   })), [form, gridApi, saveColumnScheme, setCurrentColumnScheme, currentScheme, schemes, gridKey, allColDefs, onClose]);
 
   // 保存为新方案
@@ -661,21 +676,22 @@ var ColumnSetting = function ColumnSetting(_ref) {
         case 3:
           _context3.prev = 3;
           if (!(activeTab === 'columns' && form)) {
-            _context3.next = 17;
+            _context3.next = 18;
             break;
           }
           values = form.values;
           columnConfigToSave = values.items; // 直接使用 FlatColumnItem[] 数据
           // 【修复】传入 allColDefs 以保留自定义属性（cellRenderer 等）
           gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(values.items, allColDefs); // 【关键修复】先更新 columnDefs（处理分组结构变化）
+          _logger.logger.debug('[ColumnSetting] 另存为方案 - 更新 columnDefs');
           gridApi.setGridOption('columnDefs', gridColumnDefs);
 
           // 等待 columnDefs 更新完成
-          _context3.next = 11;
+          _context3.next = 12;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 100);
           });
-        case 11:
+        case 12:
           // 【修复】然后应用列状态（宽度、隐藏、顺序等）
           columnState = (0, _columnGroupUtils.flatConfigToColumnState)(values.items);
           gridApi.applyColumnState({
@@ -684,18 +700,18 @@ var ColumnSetting = function ColumnSetting(_ref) {
           });
 
           // 等待状态更新
-          _context3.next = 15;
+          _context3.next = 16;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 50);
           });
-        case 15:
-          _context3.next = 19;
+        case 16:
+          _context3.next = 20;
           break;
-        case 17:
+        case 18:
           // 如果在"方案管理"标签页，使用当前表单数据
           _values = form === null || form === void 0 ? void 0 : form.values;
           columnConfigToSave = (_values === null || _values === void 0 ? void 0 : _values.items) || [];
-        case 19:
+        case 20:
           // 获取过滤器模型
           filterModel = gridApi.getFilterModel();
           newScheme = {
@@ -708,9 +724,9 @@ var ColumnSetting = function ColumnSetting(_ref) {
             isSystem: false
             // createdAt 和 updatedAt 由存储适配器自动生成
           };
-          _context3.next = 23;
+          _context3.next = 24;
           return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, newScheme);
-        case 23:
+        case 24:
           _antd.message.success('方案保存成功');
           setSaveSchemeVisible(false);
           setSchemeName('');
@@ -718,17 +734,17 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
           // 切换到方案管理标签页,显示新创建的方案
           setActiveTab('schemes');
-          _context3.next = 33;
+          _context3.next = 34;
           break;
-        case 30:
-          _context3.prev = 30;
+        case 31:
+          _context3.prev = 31;
           _context3.t0 = _context3["catch"](3);
           _antd.message.error(_context3.t0.message || '保存方案失败');
-        case 33:
+        case 34:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[3, 30]]);
+    }, _callee3, null, [[3, 31]]);
   })), [gridApi, saveColumnScheme, gridKey, schemeName, schemeDescription, activeTab, form, allColDefs]);
 
   // 设置默认方案

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

@@ -14,6 +14,7 @@ exports.isOldSchemeData = isOldSchemeData;
 exports.migrateOldScheme = migrateOldScheme;
 exports.reorderItems = reorderItems;
 var _uniqueId2 = _interopRequireDefault(require("lodash/uniqueId"));
+var _logger = require("../utils/logger");
 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; }
@@ -26,12 +27,10 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 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; } /**
  * 表头分组配置工具函数
  * 负责 Grid State 与扁平化配置之间的转换
  */
-
 /**
  * 生成唯一 ID
  */
@@ -283,6 +282,12 @@ function flatConfigToGridState(flatConfig, originalColumnDefs) {
       }
     });
     if (newColumnsWithIndex.length > 0) {
+      _logger.logger.debug('[flatConfigToGridState] 检测到新增列，将插入到原始位置:', {
+        newColumnFields: newColumnsWithIndex.map(function (item) {
+          return item.col.field;
+        })
+      });
+
       // 将新增列插入到正确位置（基于其在原始定义中的相对位置）
       var _iterator4 = _createForOfIteratorHelper(newColumnsWithIndex),
         _step4;
@@ -531,6 +536,12 @@ function flatConfigToColumnState(flatConfig, originalColumnDefs) {
       }
     });
     if (newColumnsWithIndex.length > 0) {
+      _logger.logger.debug('[flatConfigToColumnState] 检测到新增列，将插入到原始位置:', {
+        newColumnFields: newColumnsWithIndex.map(function (item) {
+          return item.col.field;
+        })
+      });
+
       // 将新增列插入到正确位置（基于其在原始定义中的相对位置）
       var _iterator6 = _createForOfIteratorHelper(newColumnsWithIndex),
         _step6;

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

@@ -11,8 +11,11 @@ var _builtins__ = require("@formily/antd-v5/lib/__builtins__");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _icons = require("@ant-design/icons");
 var _shared = require("@formily/shared");
+var _excluded = ["arrayField", "schema", "method", "defaultValue", "onAdd", "title", "icon", "className", "onClick"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+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 getSchemaDefaultValue = function getSchemaDefaultValue(schema) {
   if ((schema === null || schema === void 0 ? void 0 : schema.type) === 'array') return [];
   if ((schema === null || schema === void 0 ? void 0 : schema.type) === 'object') return {};
@@ -30,34 +33,40 @@ var getDefaultValue = function getDefaultValue(defaultValue, schema) {
 };
 var ArrayAddBtn = function ArrayAddBtn(props) {
   var self = (0, _react2.useField)();
+  // 解构出所有非 DOM 属性,只把 rest 透传给 Button,避免 arrayField/schema/method 等漏到 DOM 触发 React 警告。@author nokecy
   var arrayField = props.arrayField,
-    schema = props.schema;
+    schema = props.schema,
+    method = props.method,
+    defaultValue = props.defaultValue,
+    onAdd = props.onAdd,
+    title = props.title,
+    icon = props.icon,
+    className = props.className,
+    _onClick = props.onClick,
+    rest = _objectWithoutProperties(props, _excluded);
   var prefixCls = (0, _builtins__.usePrefixCls)("formily-array-base");
   if (!arrayField) return null;
   if (arrayField.pattern !== "editable" && arrayField.pattern !== "disabled") return null;
   return /*#__PURE__*/_react.default.createElement(_antd.Button, _extends({
     type: "primary"
-  }, props, {
+  }, rest, {
     disabled: self === null || self === void 0 ? void 0 : self.disabled,
-    className: (0, _classnames.default)("".concat(prefixCls, "-addition"), props.className),
+    className: (0, _classnames.default)("".concat(prefixCls, "-addition"), className),
     onClick: function onClick(e) {
       if (arrayField !== null && arrayField !== void 0 && arrayField.disabled) return;
-      var defaultValue = getDefaultValue(props.defaultValue, schema);
-      if (props.method === "unshift") {
-        var _arrayField$unshift, _props$onAdd;
-        (_arrayField$unshift = arrayField.unshift) === null || _arrayField$unshift === void 0 || _arrayField$unshift.call(arrayField, defaultValue);
-        props === null || props === void 0 || (_props$onAdd = props.onAdd) === null || _props$onAdd === void 0 || _props$onAdd.call(props, 0);
+      var dv = getDefaultValue(defaultValue, schema);
+      if (method === "unshift") {
+        var _arrayField$unshift;
+        (_arrayField$unshift = arrayField.unshift) === null || _arrayField$unshift === void 0 || _arrayField$unshift.call(arrayField, dv);
+        onAdd === null || onAdd === void 0 || onAdd(0);
       } else {
-        var _arrayField$push, _props$onAdd2, _arrayField$value;
-        (_arrayField$push = arrayField.push) === null || _arrayField$push === void 0 || _arrayField$push.call(arrayField, defaultValue);
-        props === null || props === void 0 || (_props$onAdd2 = props.onAdd) === null || _props$onAdd2 === void 0 || _props$onAdd2.call(props, (arrayField === null || arrayField === void 0 || (_arrayField$value = arrayField.value) === null || _arrayField$value === void 0 ? void 0 : _arrayField$value.length) - 1);
-      }
-      if (props.onClick) {
-        //@ts-ignore
-        props.onClick(e);
+        var _arrayField$push, _arrayField$value;
+        (_arrayField$push = arrayField.push) === null || _arrayField$push === void 0 || _arrayField$push.call(arrayField, dv);
+        onAdd === null || onAdd === void 0 || onAdd((arrayField === null || arrayField === void 0 || (_arrayField$value = arrayField.value) === null || _arrayField$value === void 0 ? void 0 : _arrayField$value.length) - 1);
       }
+      _onClick === null || _onClick === void 0 || _onClick(e);
     },
-    icon: (0, _shared.isUndef)(props.icon) ? /*#__PURE__*/_react.default.createElement(_icons.PlusOutlined, null) : props.icon
-  }), props.title || self.title);
+    icon: (0, _shared.isUndef)(icon) ? /*#__PURE__*/_react.default.createElement(_icons.PlusOutlined, null) : icon
+  }), title || self.title);
 };
 var _default = exports.default = ArrayAddBtn;

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

@@ -1,4 +1,5 @@
 import { RefObject } from 'react';
+import { GridApi } from 'ag-grid-community';
 import { ArrayField } from '@formily/core';
 /**
  * 单元格聚焦 Hook
@@ -11,7 +12,7 @@ export declare const useCellFocus: () => {
  * 键盘导航 Hook
  * 处理方向键在表格单元格间的导航
  */
-export declare const useKeyboardNavigation: (ref: RefObject<any>, dataSource: any[], focusInputInCell: (cell: Element) => void) => {
+export declare const useKeyboardNavigation: (ref: RefObject<any>, dataSource: any[], focusInputInCell: (cell: Element) => void, activateCell?: ((api: GridApi, node: any, colId: string) => boolean) | undefined) => {
     handleCellKeyDown: (event: any) => void;
 };
 /**

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

@@ -5,9 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useRowDrag = exports.useKeyboardNavigation = exports.useCellFocus = void 0;
 var _react = require("react");
-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; }
+// setSelectionRange 仅 textarea 与 text/search/url/tel/password 类型 input 支持;
+// checkbox/number/date 等调用会抛 InvalidStateError,故用白名单守卫。@author nokecy
+var supportsSelectionRange = function supportsSelectionRange(el) {
+  return el.tagName === 'TEXTAREA' || /^(text|search|url|tel|password)$/i.test(el.type || 'text');
+};
+
 /**
  * 单元格聚焦 Hook
  * 处理 Editable 包装和普通输入框的聚焦逻辑
@@ -24,7 +27,7 @@ var useCellFocus = exports.useCellFocus = function useCellFocus() {
         var existingInput = editableElement.querySelector('input:not([readonly]):not([disabled]), textarea:not([readonly]):not([disabled])');
         if (existingInput) {
           existingInput.focus();
-          if ('setSelectionRange' in existingInput && existingInput.type !== 'number' && existingInput.type !== 'date') {
+          if (supportsSelectionRange(existingInput)) {
             var _existingInput$value;
             var length = ((_existingInput$value = existingInput.value) === null || _existingInput$value === void 0 ? void 0 : _existingInput$value.length) || 0;
             setTimeout(function () {
@@ -45,7 +48,7 @@ var useCellFocus = exports.useCellFocus = function useCellFocus() {
           var newInput = editableElement.querySelector('input:not([readonly]):not([disabled]), textarea:not([readonly]):not([disabled])');
           if (newInput) {
             newInput.focus();
-            if ('setSelectionRange' in newInput && newInput.type !== 'number' && newInput.type !== 'date') {
+            if (supportsSelectionRange(newInput)) {
               var _newInput$value;
               var _length = ((_newInput$value = newInput.value) === null || _newInput$value === void 0 ? void 0 : _newInput$value.length) || 0;
               setTimeout(function () {
@@ -74,7 +77,7 @@ var useCellFocus = exports.useCellFocus = function useCellFocus() {
         inputElement.focus();
 
         // 将光标定位到末尾
-        if ('setSelectionRange' in inputElement && inputElement.type !== 'number' && inputElement.type !== 'date') {
+        if (supportsSelectionRange(inputElement)) {
           var _inputElement$value;
           var _length2 = ((_inputElement$value = inputElement.value) === null || _inputElement$value === void 0 ? void 0 : _inputElement$value.length) || 0;
           setTimeout(function () {
@@ -96,7 +99,7 @@ var useCellFocus = exports.useCellFocus = function useCellFocus() {
  * 键盘导航 Hook
  * 处理方向键在表格单元格间的导航
  */
-var useKeyboardNavigation = exports.useKeyboardNavigation = function useKeyboardNavigation(ref, dataSource, focusInputInCell) {
+var useKeyboardNavigation = exports.useKeyboardNavigation = function useKeyboardNavigation(ref, dataSource, focusInputInCell, activateCell) {
   var handleCellKeyDown = (0, _react.useCallback)(function (event) {
     var keyEvent = event.event,
       node = event.node,
@@ -147,46 +150,23 @@ var useKeyboardNavigation = exports.useKeyboardNavigation = function useKeyboard
       if (isValidTarget) {
         // 延迟执行以确保当前编辑完成
         setTimeout(function () {
+          var _api$getDisplayedRowA;
           api.setFocusedCell(targetRowIndex, targetColId);
 
+          // 懒挂载:目标格若是懒列存量格,先激活挂树(refreshCells),下方 150ms 内完成挂载再聚焦 @author nokecy
+          var targetNode = (_api$getDisplayedRowA = api.getDisplayedRowAtIndex) === null || _api$getDisplayedRowA === void 0 ? void 0 : _api$getDisplayedRowA.call(api, targetRowIndex);
+          if (activateCell && targetNode) {
+            activateCell(api, targetNode, targetColId);
+          }
+
           // 不使用原生startEditingCell,而是手动触发编辑状态
-          // 使用DOM选择器查找目标单元格
+          // v33 themeQuartz 容器不再有 .ag-theme-alpine 类;且行虚拟化下 DOM 顺序与 rowIndex 不一致,
+          // 改为直接在 ref 容器内按 row-index + col-id 属性定位目标单元格 @author nokecy
           setTimeout(function () {
             var _ref$current;
-            // 通过ref获取网格容器
-            var gridContainer = (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.querySelector('.ag-theme-alpine');
-            if (gridContainer) {
-              // 尝试通过行和列分步查找目标单元格
-              var rows = gridContainer.querySelectorAll('.ag-row');
-              if (rows[targetRowIndex]) {
-                var targetRow = rows[targetRowIndex];
-
-                // 在行内查找指定列的单元格
-                var targetCell = targetRow.querySelector(".ag-cell[col-id=\"".concat(targetColId, "\"]"));
-                if (!targetCell) {
-                  // 如果通过col-id找不到,遍历所有单元格查找匹配的列
-                  var cells = targetRow.querySelectorAll('.ag-cell');
-                  var _iterator = _createForOfIteratorHelper(cells),
-                    _step;
-                  try {
-                    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                      var _cell = _step.value;
-                      var colId = _cell.getAttribute('col-id') || _cell.getAttribute('data-col-id');
-                      if (colId === targetColId) {
-                        targetCell = _cell;
-                        break;
-                      }
-                    }
-                  } catch (err) {
-                    _iterator.e(err);
-                  } finally {
-                    _iterator.f();
-                  }
-                }
-                if (targetCell) {
-                  focusInputInCell(targetCell);
-                }
-              }
+            var targetCell = (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.querySelector(".ag-row[row-index=\"".concat(targetRowIndex, "\"] .ag-cell[col-id=\"").concat(targetColId, "\"]"));
+            if (targetCell) {
+              focusInputInCell(targetCell);
             }
           }, 150);
         }, 10);
@@ -194,7 +174,7 @@ var useKeyboardNavigation = exports.useKeyboardNavigation = function useKeyboard
       keyEvent.preventDefault();
       keyEvent.stopPropagation();
     }
-  }, [dataSource, focusInputInCell, ref]);
+  }, [dataSource, focusInputInCell, ref, activateCell]);
   return {
     handleCellKeyDown: handleCellKeyDown
   };