@nokecy/qc-ui 1.1.37 → 1.1.39

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

@@ -10,13 +10,13 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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); }
-/**
- * 列配置类型定义
+/**
+ * 列配置类型定义
  */
 
-/**
- * 文本列配置
- * 用于显示和编辑文本内容
+/**
+ * 文本列配置
+ * 用于显示和编辑文本内容
  */
 var createTextColumn = exports.createTextColumn = function createTextColumn(config) {
   return _objectSpread({
@@ -29,9 +29,9 @@ var createTextColumn = exports.createTextColumn = function createTextColumn(conf
   }, config);
 };
 
-/**
- * 数字列配置
- * 用于显示和编辑数字内容
+/**
+ * 数字列配置
+ * 用于显示和编辑数字内容
  */
 var createNumberColumn = exports.createNumberColumn = function createNumberColumn(config) {
   return _objectSpread({
@@ -43,9 +43,9 @@ var createNumberColumn = exports.createNumberColumn = function createNumberColum
   }, config);
 };
 
-/**
- * 日期列配置
- * 用于显示和编辑日期内容
+/**
+ * 日期列配置
+ * 用于显示和编辑日期内容
  */
 var createDateColumn = exports.createDateColumn = function createDateColumn(config) {
   return _objectSpread({
@@ -57,9 +57,9 @@ var createDateColumn = exports.createDateColumn = function createDateColumn(conf
   }, config);
 };
 
-/**
- * 选择列配置
- * 用于下拉选择类型的列
+/**
+ * 选择列配置
+ * 用于下拉选择类型的列
  */
 var createSelectColumn = exports.createSelectColumn = function createSelectColumn(config) {
   return _objectSpread({
@@ -71,9 +71,9 @@ var createSelectColumn = exports.createSelectColumn = function createSelectColum
   }, config);
 };
 
-/**
- * 操作列配置
- * 用于行操作按钮列
+/**
+ * 操作列配置
+ * 用于行操作按钮列
  */
 var createOperationColumn = exports.createOperationColumn = function createOperationColumn(config) {
   return _objectSpread({
@@ -87,9 +87,9 @@ var createOperationColumn = exports.createOperationColumn = function createOpera
   }, config);
 };
 
-/**
- * 序号列配置
- * 用于显示行序号
+/**
+ * 序号列配置
+ * 用于显示行序号
  */
 var createIndexColumn = exports.createIndexColumn = function createIndexColumn(config) {
   return _objectSpread({
@@ -104,9 +104,9 @@ var createIndexColumn = exports.createIndexColumn = function createIndexColumn(c
   }, config);
 };
 
-/**
- * 只读列配置
- * 用于显示不可编辑的内容
+/**
+ * 只读列配置
+ * 用于显示不可编辑的内容
  */
 var createReadOnlyColumn = exports.createReadOnlyColumn = function createReadOnlyColumn(config) {
   return _objectSpread({
@@ -116,8 +116,8 @@ var createReadOnlyColumn = exports.createReadOnlyColumn = function createReadOnl
   }, config);
 };
 
-/**
- * 固定左侧列配置
+/**
+ * 固定左侧列配置
  */
 var createPinnedLeftColumn = exports.createPinnedLeftColumn = function createPinnedLeftColumn(config) {
   return _objectSpread(_objectSpread({}, config), {}, {
@@ -125,8 +125,8 @@ var createPinnedLeftColumn = exports.createPinnedLeftColumn = function createPin
   });
 };
 
-/**
- * 固定右侧列配置
+/**
+ * 固定右侧列配置
  */
 var createPinnedRightColumn = exports.createPinnedRightColumn = function createPinnedRightColumn(config) {
   return _objectSpread(_objectSpread({}, config), {}, {
@@ -134,9 +134,9 @@ var createPinnedRightColumn = exports.createPinnedRightColumn = function createP
   });
 };
 
-/**
- * 百分比列配置
- * 用于显示百分比数值
+/**
+ * 百分比列配置
+ * 用于显示百分比数值
  */
 var createPercentColumn = exports.createPercentColumn = function createPercentColumn(config) {
   return _objectSpread({
@@ -148,9 +148,9 @@ var createPercentColumn = exports.createPercentColumn = function createPercentCo
   }, config);
 };
 
-/**
- * 货币列配置
- * 用于显示货币金额
+/**
+ * 货币列配置
+ * 用于显示货币金额
  */
 var createCurrencyColumn = exports.createCurrencyColumn = function createCurrencyColumn(config) {
   return _objectSpread({
@@ -162,10 +162,10 @@ var createCurrencyColumn = exports.createCurrencyColumn = function createCurrenc
   }, config);
 };
 
-/**
- * 批量创建列配置
- * @param columns 列配置数组
- * @returns 标准化的列配置数组
+/**
+ * 批量创建列配置
+ * @param columns 列配置数组
+ * @returns 标准化的列配置数组
  */
 var createColumns = exports.createColumns = function createColumns(columns) {
   return columns.map(function (col) {
@@ -177,8 +177,8 @@ var createColumns = exports.createColumns = function createColumns(columns) {
   });
 };
 
-/**
- * 列配置预设
+/**
+ * 列配置预设
  */
 var ColumnPresets = exports.ColumnPresets = {
   /** 文本列 */
@@ -205,10 +205,10 @@ var ColumnPresets = exports.ColumnPresets = {
   currency: createCurrencyColumn
 };
 
-/**
- * 转换为 AG-Grid 列定义
- * @param config 列配置
- * @returns AG-Grid ColDef
+/**
+ * 转换为 AG-Grid 列定义
+ * @param config 列配置
+ * @returns AG-Grid ColDef
  */
 var toAgGridColDef = exports.toAgGridColDef = function toAgGridColDef(config) {
   var headerName = config.headerName,

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,12 +5,15 @@ 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; }
-/**
- * 单元格聚焦 Hook
- * 处理 Editable 包装和普通输入框的聚焦逻辑
+// 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 包装和普通输入框的聚焦逻辑
  */
 var useCellFocus = exports.useCellFocus = function useCellFocus() {
   var focusInputInCell = (0, _react.useCallback)(function (cell) {
@@ -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 () {
@@ -92,11 +95,11 @@ var useCellFocus = exports.useCellFocus = function useCellFocus() {
   };
 };
 
-/**
- * 键盘导航 Hook
- * 处理方向键在表格单元格间的导航
+/**
+ * 键盘导航 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,15 +174,15 @@ var useKeyboardNavigation = exports.useKeyboardNavigation = function useKeyboard
       keyEvent.preventDefault();
       keyEvent.stopPropagation();
     }
-  }, [dataSource, focusInputInCell, ref]);
+  }, [dataSource, focusInputInCell, ref, activateCell]);
   return {
     handleCellKeyDown: handleCellKeyDown
   };
 };
 
-/**
- * 行拖拽 Hook
- * 处理行拖拽排序逻辑
+/**
+ * 行拖拽 Hook
+ * 处理行拖拽排序逻辑
  */
 var useRowDrag = exports.useRowDrag = function useRowDrag(field) {
   var handleRowDragMove = (0, _react.useCallback)(function (event) {
@@ -215,6 +195,8 @@ var useRowDrag = exports.useRowDrag = function useRowDrag(field) {
       var dataSourceCopy = Array.isArray(field.value) ? field.value.slice() : [];
       var fromIndex = dataSourceCopy.indexOf(movingData);
       var toIndex = dataSourceCopy.indexOf(overData);
+      // 防护:任一索引未命中(引用不一致)时直接返回,避免 splice(-1) 误删末行 @author nokecy
+      if (fromIndex < 0 || toIndex < 0) return;
       var newStore = dataSourceCopy.slice();
 
       // 移动数组元素