@nokecy/qc-ui 1.0.84 → 1.0.86

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

@@ -251,14 +251,34 @@ function AgGridPlus(props) {
 
     // 优先使用方案中的 columnConfig（用户在列配置界面调整后的数据）
     if (columnSchemeManager !== null && columnSchemeManager !== void 0 && (_columnSchemeManager$ = columnSchemeManager.currentScheme) !== null && _columnSchemeManager$ !== void 0 && _columnSchemeManager$.columnConfig) {
-      var _require = require("./setting/columnGroupUtils"),
-        flatConfigToColumnState = _require.flatConfigToColumnState;
-      var _columnState = flatConfigToColumnState(columnSchemeManager.currentScheme.columnConfig);
-      setColumnCellClass(handelgridPlusColumnState(_columnState));
+      // 【关键修复】检查是否包含分组结构
+      var hasGroups = columnSchemeManager.currentScheme.columnConfig.some(function (item) {
+        return item.type === 'group';
+      });
+
+      // 如果包含分组结构,跳过 applyColumnState
+      // 原因: 分组结构由下面的 useEffect #2 通过 setGridOption("columnDefs") 处理
+      // applyColumnState 只能设置列属性,会把分组子列当作独立列,破坏分组结构
+      if (hasGroups) {
+        console.log('[AgGridPlus] useEffect #1: 检测到分组结构,跳过 applyColumnState');
+
+        // 仍然需要设置列样式
+        var _require = require("./setting/columnGroupUtils"),
+          _flatConfigToColumnState = _require.flatConfigToColumnState;
+        var _columnState = _flatConfigToColumnState(columnSchemeManager.currentScheme.columnConfig);
+        setColumnCellClass(handelgridPlusColumnState(_columnState));
+        return;
+      }
+
+      // 没有分组时,使用 applyColumnState 应用列配置
+      var _require2 = require("./setting/columnGroupUtils"),
+        flatConfigToColumnState = _require2.flatConfigToColumnState;
+      var _columnState2 = flatConfigToColumnState(columnSchemeManager.currentScheme.columnConfig);
+      setColumnCellClass(handelgridPlusColumnState(_columnState2));
       var timer = setTimeout(function () {
         var _apiRef$current;
         (_apiRef$current = apiRef.current) === null || _apiRef$current === void 0 || _apiRef$current.applyColumnState({
-          state: _columnState,
+          state: _columnState2,
           applyOrder: true
         });
       }, 10);
@@ -305,8 +325,8 @@ function AgGridPlus(props) {
     var timer = setTimeout(function () {
       // 优先使用 columnConfig(包含完整的分组结构)
       if (currentScheme.columnConfig) {
-        var _require2 = require("./setting/columnGroupUtils"),
-          flatConfigToGridState = _require2.flatConfigToGridState;
+        var _require3 = require("./setting/columnGroupUtils"),
+          flatConfigToGridState = _require3.flatConfigToGridState;
         var gridColumnDefs = flatConfigToGridState(currentScheme.columnConfig);
         console.log('[AgGridPlus] useEffect: 应用方案的 columnConfig:', {
           columnConfig: currentScheme.columnConfig,
@@ -1122,8 +1142,8 @@ function AgGridPlus(props) {
     onDragStopped: function onDragStopped(e) {
       if (apiRef.current) {
         var _apiRef$current7;
-        var _columnState2 = (_apiRef$current7 = apiRef.current) === null || _apiRef$current7 === void 0 ? void 0 : _apiRef$current7.getColumnState();
-        setColumnState(_columnState2);
+        var _columnState3 = (_apiRef$current7 = apiRef.current) === null || _apiRef$current7 === void 0 ? void 0 : _apiRef$current7.getColumnState();
+        setColumnState(_columnState3);
 
         // onColumnStateChanged && onColumnStateChanged(columnState)
       }

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _debounce2 = _interopRequireDefault(require("lodash/debounce"));
 var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
 var _icons = require("@ant-design/icons");
@@ -13,14 +14,9 @@ var _reactDndHtml5Backend = require("react-dnd-html5-backend");
 var _columnGroupUtils = require("./columnGroupUtils");
 var _MoveNodeModal = _interopRequireDefault(require("./MoveNodeModal"));
 var _excluded = ["record", "index", "moveRow", "children"];
-/**
- * 列配置表格组件
- * 使用简单的 Ant Design Table 替代 Formily ArrayTable
- * 通过 React useState 直接管理数据状态,确保 type 字段不会丢失
- */
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+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; }
 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; }
@@ -31,24 +27,79 @@ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread n
 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 _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; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 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 _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-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; }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } /**
+ * 列配置表格组件
+ * 使用简单的 Ant Design Table 替代 Formily ArrayTable
+ * 通过 React useState 直接管理数据状态,确保 type 字段不会丢失
+ */
 var DRAG_TYPE = 'COLUMN_ROW';
+/**
+ * 受控的名称输入组件 - 解决光标跳出问题
+ * 通过内部维护输入状态,只在失去焦点时同步到父组件
+ */
+var NameInput = function NameInput(_ref) {
+  var value = _ref.value,
+    onChange = _ref.onChange,
+    placeholder = _ref.placeholder,
+    isNew = _ref.isNew;
+  var _useState = (0, _react.useState)(value),
+    _useState2 = _slicedToArray(_useState, 2),
+    localValue = _useState2[0],
+    setLocalValue = _useState2[1];
+
+  // 同步外部变化到本地状态
+  (0, _react.useEffect)(function () {
+    setLocalValue(value);
+  }, [value]);
+
+  // 处理输入变化 - 只更新本地状态
+  var handleChange = function handleChange(e) {
+    setLocalValue(e.target.value);
+  };
+
+  // 失去焦点时同步到父组件
+  var handleBlur = function handleBlur() {
+    if (localValue !== value) {
+      onChange(localValue);
+    }
+  };
+
+  // 按回车键时也同步并失去焦点
+  var handlePressEnter = function handlePressEnter() {
+    if (localValue !== value) {
+      onChange(localValue);
+    }
+  };
+  return /*#__PURE__*/_react.default.createElement(_antd.Input, {
+    value: localValue,
+    onChange: handleChange,
+    onBlur: handleBlur,
+    onPressEnter: handlePressEnter,
+    bordered: false,
+    placeholder: placeholder,
+    style: {
+      flex: 1,
+      background: isNew ? '#fff7e6' : 'transparent'
+    }
+  });
+};
+
 /**
  * 可拖拽的表格行组件
  */
-var DraggableRow = function DraggableRow(_ref) {
-  var record = _ref.record,
-    index = _ref.index,
-    moveRow = _ref.moveRow,
-    children = _ref.children,
-    restProps = _objectWithoutProperties(_ref, _excluded);
+var DraggableRow = function DraggableRow(_ref2) {
+  var record = _ref2.record,
+    index = _ref2.index,
+    moveRow = _ref2.moveRow,
+    children = _ref2.children,
+    restProps = _objectWithoutProperties(_ref2, _excluded);
   var ref = (0, _react.useRef)(null);
   var _useDrag = (0, _reactDnd.useDrag)({
       type: DRAG_TYPE,
@@ -114,26 +165,26 @@ var DraggableRow = function DraggableRow(_ref) {
 /**
  * 列配置表格组件
  */
-var ColumnConfigTable = function ColumnConfigTable(_ref2) {
-  var items = _ref2.items,
-    onChange = _ref2.onChange,
-    _ref2$simple = _ref2.simple,
-    simple = _ref2$simple === void 0 ? false : _ref2$simple;
+var ColumnConfigTable = function ColumnConfigTable(_ref3) {
+  var items = _ref3.items,
+    onChange = _ref3.onChange,
+    _ref3$simple = _ref3.simple,
+    simple = _ref3$simple === void 0 ? false : _ref3$simple;
   // 本地状态管理(用于优化性能)
-  var _useState = (0, _react.useState)(items),
-    _useState2 = _slicedToArray(_useState, 2),
-    localItems = _useState2[0],
-    setLocalItems = _useState2[1];
+  var _useState3 = (0, _react.useState)(items),
+    _useState4 = _slicedToArray(_useState3, 2),
+    localItems = _useState4[0],
+    setLocalItems = _useState4[1];
 
   // 移动节点弹窗状态
-  var _useState3 = (0, _react.useState)(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    moveModalVisible = _useState4[0],
-    setMoveModalVisible = _useState4[1];
-  var _useState5 = (0, _react.useState)(null),
+  var _useState5 = (0, _react.useState)(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    currentMoveNode = _useState6[0],
-    setCurrentMoveNode = _useState6[1];
+    moveModalVisible = _useState6[0],
+    setMoveModalVisible = _useState6[1];
+  var _useState7 = (0, _react.useState)(null),
+    _useState8 = _slicedToArray(_useState7, 2),
+    currentMoveNode = _useState8[0],
+    setCurrentMoveNode = _useState8[1];
 
   /**
    * 同步更新本地状态和通知父组件
@@ -159,6 +210,24 @@ var ColumnConfigTable = function ColumnConfigTable(_ref2) {
     onChange(_toConsumableArray(newItems));
   }, [onChange]);
 
+  /**
+   * 防抖的更新函数 - 用于输入框等高频更新场景
+   * 延迟 300ms 后才通知父组件,减少不必要的重渲染
+   */
+  var debouncedUpdateItems = (0, _react.useMemo)(function () {
+    return (0, _debounce2.default)(function (newItems) {
+      (0, _columnGroupUtils.reorderItems)(newItems);
+      onChange(_toConsumableArray(newItems));
+    }, 300);
+  }, [onChange]);
+
+  // 组件卸载时清理防抖函数
+  (0, _react.useEffect)(function () {
+    return function () {
+      debouncedUpdateItems.cancel();
+    };
+  }, [debouncedUpdateItems]);
+
   /**
    * 切换分组的折叠/展开状态
    */
@@ -456,8 +525,10 @@ var ColumnConfigTable = function ColumnConfigTable(_ref2) {
 
   /**
    * 更新节点属性
+   * @param immediate 是否立即更新父组件(非输入框类更新需要立即生效)
    */
   var handleUpdateNode = (0, _react.useCallback)(function (nodeId, updates) {
+    var immediate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     var newItems = localItems.map(function (item) {
       if (item.id === nodeId) {
         // ⚠️ 关键:确保 type 字段不会被覆盖
@@ -469,8 +540,20 @@ var ColumnConfigTable = function ColumnConfigTable(_ref2) {
       }
       return item;
     });
-    updateItems(newItems);
-  }, [localItems, updateItems]);
+
+    // 立即更新本地状态(保证输入框显示最新内容)
+    setLocalItems(_toConsumableArray(newItems));
+
+    // 根据场景选择立即更新或防抖更新
+    if (immediate) {
+      // 非文本输入的更新(如开关、选择器等)需要立即生效
+      (0, _columnGroupUtils.reorderItems)(newItems);
+      onChange(_toConsumableArray(newItems));
+    } else {
+      // 文本输入使用防抖,避免频繁触发父组件更新
+      debouncedUpdateItems(newItems);
+    }
+  }, [localItems, onChange, debouncedUpdateItems]);
 
   /**
    * 处理拖拽排序
@@ -642,19 +725,15 @@ var ColumnConfigTable = function ColumnConfigTable(_ref2) {
         margin: 0,
         flexShrink: 0
       }
-    }, record.type === 'group' ? '分组' : '列'), /*#__PURE__*/_react.default.createElement(_antd.Input, {
+    }, record.type === 'group' ? '分组' : '列'), /*#__PURE__*/_react.default.createElement(NameInput, {
       value: text,
-      onChange: function onChange(e) {
+      onChange: function onChange(newValue) {
         return handleUpdateNode(record.id, {
-          headerName: e.target.value
-        });
+          headerName: newValue
+        }, true);
       },
-      bordered: false,
       placeholder: record.type === 'group' ? '请输入分组名称' : '请输入列名称',
-      style: {
-        flex: 1,
-        background: record._isNew ? '#fff7e6' : 'transparent'
-      }
+      isNew: record._isNew
     }));
   }, [getIndentSymbol, handleUpdateNode, handleToggleCollapse]);
 
@@ -759,7 +838,7 @@ var ColumnConfigTable = function ColumnConfigTable(_ref2) {
           onChange: function onChange(newValue) {
             return handleUpdateNode(record.id, {
               width: newValue || undefined
-            });
+            }, true);
           },
           min: 50,
           max: 1000,
@@ -781,7 +860,7 @@ var ColumnConfigTable = function ColumnConfigTable(_ref2) {
           onChange: function onChange(newValue) {
             return handleUpdateNode(record.id, {
               flex: newValue
-            });
+            }, true);
           },
           style: {
             width: '100%'
@@ -808,7 +887,7 @@ var ColumnConfigTable = function ColumnConfigTable(_ref2) {
           onChange: function onChange(newValue) {
             return handleUpdateNode(record.id, {
               pinned: newValue
-            });
+            }, true);
           },
           style: {
             width: '100%'
@@ -838,7 +917,7 @@ var ColumnConfigTable = function ColumnConfigTable(_ref2) {
           onChange: function onChange(checked) {
             return handleUpdateNode(record.id, {
               hide: checked
-            });
+            }, true);
           }
         });
       }
@@ -855,7 +934,7 @@ var ColumnConfigTable = function ColumnConfigTable(_ref2) {
           onChange: function onChange(newValue) {
             return handleUpdateNode(record.id, {
               cellClass: newValue
-            });
+            }, true);
           },
           style: {
             width: '100%'
@@ -885,7 +964,7 @@ var ColumnConfigTable = function ColumnConfigTable(_ref2) {
           onChange: function onChange(checked) {
             return handleUpdateNode(record.id, {
               suppressHeaderFilterButton: !checked
-            });
+            }, true);
           }
         });
       }

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

@@ -244,14 +244,34 @@ function AgGridPlus(props) {
 
     // 优先使用方案中的 columnConfig（用户在列配置界面调整后的数据）
     if (columnSchemeManager !== null && columnSchemeManager !== void 0 && (_columnSchemeManager$ = columnSchemeManager.currentScheme) !== null && _columnSchemeManager$ !== void 0 && _columnSchemeManager$.columnConfig) {
-      var _require = require("./setting/columnGroupUtils"),
-        flatConfigToColumnState = _require.flatConfigToColumnState;
-      var _columnState = flatConfigToColumnState(columnSchemeManager.currentScheme.columnConfig);
-      setColumnCellClass(handelgridPlusColumnState(_columnState));
+      // 【关键修复】检查是否包含分组结构
+      var hasGroups = columnSchemeManager.currentScheme.columnConfig.some(function (item) {
+        return item.type === 'group';
+      });
+
+      // 如果包含分组结构,跳过 applyColumnState
+      // 原因: 分组结构由下面的 useEffect #2 通过 setGridOption("columnDefs") 处理
+      // applyColumnState 只能设置列属性,会把分组子列当作独立列,破坏分组结构
+      if (hasGroups) {
+        console.log('[AgGridPlus] useEffect #1: 检测到分组结构,跳过 applyColumnState');
+
+        // 仍然需要设置列样式
+        var _require = require("./setting/columnGroupUtils"),
+          _flatConfigToColumnState = _require.flatConfigToColumnState;
+        var _columnState = _flatConfigToColumnState(columnSchemeManager.currentScheme.columnConfig);
+        setColumnCellClass(handelgridPlusColumnState(_columnState));
+        return;
+      }
+
+      // 没有分组时,使用 applyColumnState 应用列配置
+      var _require2 = require("./setting/columnGroupUtils"),
+        flatConfigToColumnState = _require2.flatConfigToColumnState;
+      var _columnState2 = flatConfigToColumnState(columnSchemeManager.currentScheme.columnConfig);
+      setColumnCellClass(handelgridPlusColumnState(_columnState2));
       var timer = setTimeout(function () {
         var _apiRef$current;
         (_apiRef$current = apiRef.current) === null || _apiRef$current === void 0 || _apiRef$current.applyColumnState({
-          state: _columnState,
+          state: _columnState2,
           applyOrder: true
         });
       }, 10);
@@ -298,8 +318,8 @@ function AgGridPlus(props) {
     var timer = setTimeout(function () {
       // 优先使用 columnConfig(包含完整的分组结构)
       if (currentScheme.columnConfig) {
-        var _require2 = require("./setting/columnGroupUtils"),
-          flatConfigToGridState = _require2.flatConfigToGridState;
+        var _require3 = require("./setting/columnGroupUtils"),
+          flatConfigToGridState = _require3.flatConfigToGridState;
         var gridColumnDefs = flatConfigToGridState(currentScheme.columnConfig);
         console.log('[AgGridPlus] useEffect: 应用方案的 columnConfig:', {
           columnConfig: currentScheme.columnConfig,
@@ -1115,8 +1135,8 @@ function AgGridPlus(props) {
     onDragStopped: function onDragStopped(e) {
       if (apiRef.current) {
         var _apiRef$current7;
-        var _columnState2 = (_apiRef$current7 = apiRef.current) === null || _apiRef$current7 === void 0 ? void 0 : _apiRef$current7.getColumnState();
-        setColumnState(_columnState2);
+        var _columnState3 = (_apiRef$current7 = apiRef.current) === null || _apiRef$current7 === void 0 ? void 0 : _apiRef$current7.getColumnState();
+        setColumnState(_columnState3);
 
         // onColumnStateChanged && onColumnStateChanged(columnState)
       }