@nokecy/qc-ui 1.1.24 → 1.1.25

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

@@ -35,7 +35,7 @@ var _schemeDataMigration = require("./shared/utils/schemeDataMigration");
 var _sanitize = require("./utils/sanitize");
 var _errors = require("./errors");
 var _logger = require("./utils/logger");
-var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children", "defaultSearchExpand", "overlayNoRowsTemplateText", "queryDefaultRows", "onSelectedRowsChange", "enableClickSelection", "rowSelection"];
+var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children", "defaultSearchExpand", "overlayNoRowsTemplateText", "queryDefaultRows", "onSelectedRowsChange", "enableClickSelection", "rowSelection", "useNativeTreeFilter"];
 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 }; }
@@ -91,6 +91,8 @@ function AgGridPlus(props) {
     _props$enableClickSel = props.enableClickSelection,
     enableClickSelection = _props$enableClickSel === void 0 ? true : _props$enableClickSel,
     propsRowSelection = props.rowSelection,
+    _props$useNativeTreeF = props.useNativeTreeFilter,
+    useNativeTreeFilter = _props$useNativeTreeF === void 0 ? false : _props$useNativeTreeF,
     rest = _objectWithoutProperties(props, _excluded);
   var _useGridPlusColumnSta = (0, _.useGridPlusColumnState)(),
     onSaveColumnState = _useGridPlusColumnSta.onSaveColumnState,
@@ -1146,8 +1148,14 @@ function AgGridPlus(props) {
     calculateSum();
   }, [calculateSum]);
   var rowDataMemo = (0, _react.useMemo)(function () {
-    return props.treeData ? (0, _utils.flatten)((0, _utils.toTree)(rowData, treeKeyName !== null && treeKeyName !== void 0 ? treeKeyName : "id", treeParentName !== null && treeParentName !== void 0 ? treeParentName : "parentId"), treeKeyName !== null && treeKeyName !== void 0 ? treeKeyName : "id") : rowData;
-  }, [rowData, props.treeData, treeKeyName, treeParentName]);
+    // 【兼容】根据 useNativeTreeFilter 决定是否使用原生树形过滤
+    // - useNativeTreeFilter=true: 直接传入原始数据，由 AG-Grid 原生处理树形结构（支持列头过滤所有层级）
+    // - useNativeTreeFilter=false: 使用旧的 flatten(toTree()) 逻辑（默认，保持兼容）
+    if (props.treeData && !useNativeTreeFilter) {
+      return (0, _utils.flatten)((0, _utils.toTree)(rowData, treeKeyName !== null && treeKeyName !== void 0 ? treeKeyName : "id", treeParentName !== null && treeParentName !== void 0 ? treeParentName : "parentId"), treeKeyName !== null && treeKeyName !== void 0 ? treeKeyName : "id");
+    }
+    return rowData;
+  }, [rowData, props.treeData, treeKeyName, treeParentName, useNativeTreeFilter]);
   var actionDom = toolBarRender && toolBarRender(apiRef.current, (0, _utils.convertFilterModel)(queryFilter, allColDefsRef.current), queryFilter, {
     current: pagination.current,
     skipCount: pagination.current == 1 ? 0 : (pagination.current - 1) * pagination.pageSize,
@@ -1370,6 +1378,10 @@ function AgGridPlus(props) {
     enableRangeSelection: true,
     suppressCopyRowsToClipboard: true,
     autoGroupColumnDef: autoGroupColumnDef
+    // 【兼容】原生树形数据配置：只有 useNativeTreeFilter=true 时才启用
+    // 使用 treeDataParentIdField 让 AG-Grid 原生处理树形结构，支持列头过滤所有层级
+    ,
+    treeDataParentIdField: props.treeData && useNativeTreeFilter ? treeParentName !== null && treeParentName !== void 0 ? treeParentName : "parentId" : undefined
     //指定客户端模式
     ,
     rowModelType: "clientSide",

package/dist/cjs/ag-grid-plus/interface.d.ts

@@ -87,6 +87,14 @@ interface GridProps extends AgGridReactProps {
      * - 兼容旧的字符串 API（'single' | 'multiple'）
      */
     enableClickSelection?: boolean;
+    /**
+     * 是否使用 AG-Grid 原生树形数据过滤
+     * - true: 使用原生 treeDataParentIdField 配置，列头过滤器可以过滤所有层级的数据
+     * - false: 使用旧的 flatten(toTree()) 逻辑（默认，保持兼容）
+     *
+     * @default false
+     */
+    useNativeTreeFilter?: boolean;
 }
 interface AgGridColumnPropsClone extends ColDef {
     /**

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

@@ -360,7 +360,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
    * 优化逻辑：先保存配置到存储，再直接应用到 Grid，不依赖 handleLoadScheme
    */
   var handleSaveColumns = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var values, flatConfig, configToSave, invalidColumns, filterModel, savedScheme, createdAt, updatedAt, schemeWithoutTimestamps, defaultScheme, _createdAt, _updatedAt, _schemeWithoutTimestamps, hasGroups, gridColumnDefs, columnState;
+    var values, flatConfig, configToSave, invalidColumns, filterModel, savedScheme, createdAt, updatedAt, schemeWithoutTimestamps, defaultScheme, _createdAt, _updatedAt, _schemeWithoutTimestamps, gridColumnDefs, columnState;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -452,23 +452,15 @@ var ColumnSetting = function ColumnSetting(_ref) {
             return setTimeout(resolve, 100);
           });
         case 33:
-          // 1. 检查是否包含分组配置
-          hasGroups = savedScheme.columnConfig.some(function (item) {
-            return item.type === 'group';
-          }); // 如果包含分组，先更新 columnDefs
-          if (!hasGroups) {
-            _context2.next = 39;
-            break;
-          }
           gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(savedScheme.columnConfig, allColDefs);
           gridApi.setGridOption('columnDefs', gridColumnDefs);
 
           // 等待 columnDefs 更新完成
-          _context2.next = 39;
+          _context2.next = 37;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 100);
           });
-        case 39:
+        case 37:
           columnState = (0, _columnGroupUtils.flatConfigToColumnState)(savedScheme.columnConfig);
           gridApi.applyColumnState({
             state: columnState,
@@ -482,31 +474,31 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
           // 4. 设置为当前方案（如果不是当前方案）
           if (!(!currentScheme || savedScheme.id !== currentScheme.id)) {
-            _context2.next = 45;
+            _context2.next = 43;
             break;
           }
-          _context2.next = 45;
+          _context2.next = 43;
           return setCurrentColumnScheme === null || setCurrentColumnScheme === void 0 ? void 0 : setCurrentColumnScheme(gridKey, savedScheme.id);
-        case 45:
-          _context2.next = 47;
+        case 43:
+          _context2.next = 45;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 50);
           });
-        case 47:
+        case 45:
           // 5. 关闭弹窗
           onClose();
-          _context2.next = 54;
+          _context2.next = 52;
           break;
-        case 50:
-          _context2.prev = 50;
+        case 48:
+          _context2.prev = 48;
           _context2.t0 = _context2["catch"](8);
           console.error('保存列配置到方案失败:', _context2.t0);
           _antd.message.error('保存列配置失败');
-        case 54:
+        case 52:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[8, 50]]);
+    }, _callee2, null, [[8, 48]]);
   })), [form, gridApi, saveColumnScheme, setCurrentColumnScheme, currentScheme, schemes, gridKey, allColDefs, onClose]);
 
   // 保存为新方案

package/dist/cjs/draggableModal/style.less

@@ -25,15 +25,20 @@
       flex-shrink: 0;
     }
   }
+
+  // 确保 Modal 内容不会阻止 resize-handle 的鼠标事件
+  .ant-modal-content {
+    pointer-events: auto;
+  }
 }
 
 // 拖动调整大小的手柄样式
 .resize-handle {
   position: absolute;
-  z-index: 10;
+  z-index: 9999;  // 确保在 Modal 内容之上
   background: transparent;
   transition: all 0.2s ease;
-  pointer-events: auto;
+  pointer-events: auto !important;  // 确保可以接收鼠标事件
   opacity: 0;
 
   &:hover {
@@ -43,8 +48,9 @@
 }
 
 // 当鼠标悬停在 modal 上时显示手柄
-.ant-modal:hover .resize-handle {
-  opacity: 1;
+.ant-modal:hover .resize-handle,
+div:hover > .resize-handle {
+  opacity: 0.5;
   background: rgba(24, 144, 255, 0.15);
 }
 

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

@@ -1,7 +1,7 @@
 import _sumBy from "lodash/sumBy";
 import _uniqueId from "lodash/uniqueId";
 import _isArray from "lodash/isArray";
-var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children", "defaultSearchExpand", "overlayNoRowsTemplateText", "queryDefaultRows", "onSelectedRowsChange", "enableClickSelection", "rowSelection"];
+var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children", "defaultSearchExpand", "overlayNoRowsTemplateText", "queryDefaultRows", "onSelectedRowsChange", "enableClickSelection", "rowSelection", "useNativeTreeFilter"];
 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 _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."); }
@@ -83,6 +83,8 @@ function AgGridPlus(props) {
     _props$enableClickSel = props.enableClickSelection,
     enableClickSelection = _props$enableClickSel === void 0 ? true : _props$enableClickSel,
     propsRowSelection = props.rowSelection,
+    _props$useNativeTreeF = props.useNativeTreeFilter,
+    useNativeTreeFilter = _props$useNativeTreeF === void 0 ? false : _props$useNativeTreeF,
     rest = _objectWithoutProperties(props, _excluded);
   var _useGridPlusColumnSta = useGridPlusColumnState(),
     onSaveColumnState = _useGridPlusColumnSta.onSaveColumnState,
@@ -1138,8 +1140,14 @@ function AgGridPlus(props) {
     calculateSum();
   }, [calculateSum]);
   var rowDataMemo = useMemo(function () {
-    return props.treeData ? flatten(toTree(rowData, treeKeyName !== null && treeKeyName !== void 0 ? treeKeyName : "id", treeParentName !== null && treeParentName !== void 0 ? treeParentName : "parentId"), treeKeyName !== null && treeKeyName !== void 0 ? treeKeyName : "id") : rowData;
-  }, [rowData, props.treeData, treeKeyName, treeParentName]);
+    // 【兼容】根据 useNativeTreeFilter 决定是否使用原生树形过滤
+    // - useNativeTreeFilter=true: 直接传入原始数据，由 AG-Grid 原生处理树形结构（支持列头过滤所有层级）
+    // - useNativeTreeFilter=false: 使用旧的 flatten(toTree()) 逻辑（默认，保持兼容）
+    if (props.treeData && !useNativeTreeFilter) {
+      return flatten(toTree(rowData, treeKeyName !== null && treeKeyName !== void 0 ? treeKeyName : "id", treeParentName !== null && treeParentName !== void 0 ? treeParentName : "parentId"), treeKeyName !== null && treeKeyName !== void 0 ? treeKeyName : "id");
+    }
+    return rowData;
+  }, [rowData, props.treeData, treeKeyName, treeParentName, useNativeTreeFilter]);
   var actionDom = toolBarRender && toolBarRender(apiRef.current, convertFilterModel(queryFilter, allColDefsRef.current), queryFilter, {
     current: pagination.current,
     skipCount: pagination.current == 1 ? 0 : (pagination.current - 1) * pagination.pageSize,
@@ -1362,6 +1370,10 @@ function AgGridPlus(props) {
     enableRangeSelection: true,
     suppressCopyRowsToClipboard: true,
     autoGroupColumnDef: autoGroupColumnDef
+    // 【兼容】原生树形数据配置：只有 useNativeTreeFilter=true 时才启用
+    // 使用 treeDataParentIdField 让 AG-Grid 原生处理树形结构，支持列头过滤所有层级
+    ,
+    treeDataParentIdField: props.treeData && useNativeTreeFilter ? treeParentName !== null && treeParentName !== void 0 ? treeParentName : "parentId" : undefined
     //指定客户端模式
     ,
     rowModelType: "clientSide",

package/dist/esm/ag-grid-plus/interface.d.ts

@@ -87,6 +87,14 @@ interface GridProps extends AgGridReactProps {
      * - 兼容旧的字符串 API（'single' | 'multiple'）
      */
     enableClickSelection?: boolean;
+    /**
+     * 是否使用 AG-Grid 原生树形数据过滤
+     * - true: 使用原生 treeDataParentIdField 配置，列头过滤器可以过滤所有层级的数据
+     * - false: 使用旧的 flatten(toTree()) 逻辑（默认，保持兼容）
+     *
+     * @default false
+     */
+    useNativeTreeFilter?: boolean;
 }
 interface AgGridColumnPropsClone extends ColDef {
     /**

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

@@ -351,7 +351,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
    * 优化逻辑：先保存配置到存储，再直接应用到 Grid，不依赖 handleLoadScheme
    */
   var handleSaveColumns = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var values, flatConfig, configToSave, invalidColumns, filterModel, savedScheme, createdAt, updatedAt, schemeWithoutTimestamps, defaultScheme, _createdAt, _updatedAt, _schemeWithoutTimestamps, hasGroups, gridColumnDefs, columnState;
+    var values, flatConfig, configToSave, invalidColumns, filterModel, savedScheme, createdAt, updatedAt, schemeWithoutTimestamps, defaultScheme, _createdAt, _updatedAt, _schemeWithoutTimestamps, gridColumnDefs, columnState;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -443,23 +443,15 @@ var ColumnSetting = function ColumnSetting(_ref) {
             return setTimeout(resolve, 100);
           });
         case 33:
-          // 1. 检查是否包含分组配置
-          hasGroups = savedScheme.columnConfig.some(function (item) {
-            return item.type === 'group';
-          }); // 如果包含分组，先更新 columnDefs
-          if (!hasGroups) {
-            _context2.next = 39;
-            break;
-          }
           gridColumnDefs = flatConfigToGridState(savedScheme.columnConfig, allColDefs);
           gridApi.setGridOption('columnDefs', gridColumnDefs);
 
           // 等待 columnDefs 更新完成
-          _context2.next = 39;
+          _context2.next = 37;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 100);
           });
-        case 39:
+        case 37:
           columnState = flatConfigToColumnState(savedScheme.columnConfig);
           gridApi.applyColumnState({
             state: columnState,
@@ -473,31 +465,31 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
           // 4. 设置为当前方案（如果不是当前方案）
           if (!(!currentScheme || savedScheme.id !== currentScheme.id)) {
-            _context2.next = 45;
+            _context2.next = 43;
             break;
           }
-          _context2.next = 45;
+          _context2.next = 43;
           return setCurrentColumnScheme === null || setCurrentColumnScheme === void 0 ? void 0 : setCurrentColumnScheme(gridKey, savedScheme.id);
-        case 45:
-          _context2.next = 47;
+        case 43:
+          _context2.next = 45;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 50);
           });
-        case 47:
+        case 45:
           // 5. 关闭弹窗
           onClose();
-          _context2.next = 54;
+          _context2.next = 52;
           break;
-        case 50:
-          _context2.prev = 50;
+        case 48:
+          _context2.prev = 48;
           _context2.t0 = _context2["catch"](8);
           console.error('保存列配置到方案失败:', _context2.t0);
           message.error('保存列配置失败');
-        case 54:
+        case 52:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[8, 50]]);
+    }, _callee2, null, [[8, 48]]);
   })), [form, gridApi, saveColumnScheme, setCurrentColumnScheme, currentScheme, schemes, gridKey, allColDefs, onClose]);
 
   // 保存为新方案

package/dist/esm/draggableModal/style.less

@@ -25,15 +25,20 @@
       flex-shrink: 0;
     }
   }
+
+  // 确保 Modal 内容不会阻止 resize-handle 的鼠标事件
+  .ant-modal-content {
+    pointer-events: auto;
+  }
 }
 
 // 拖动调整大小的手柄样式
 .resize-handle {
   position: absolute;
-  z-index: 10;
+  z-index: 9999;  // 确保在 Modal 内容之上
   background: transparent;
   transition: all 0.2s ease;
-  pointer-events: auto;
+  pointer-events: auto !important;  // 确保可以接收鼠标事件
   opacity: 0;
 
   &:hover {
@@ -43,8 +48,9 @@
 }
 
 // 当鼠标悬停在 modal 上时显示手柄
-.ant-modal:hover .resize-handle {
-  opacity: 1;
+.ant-modal:hover .resize-handle,
+div:hover > .resize-handle {
+  opacity: 0.5;
   background: rgba(24, 144, 255, 0.15);
 }