@nokecy/qc-ui 1.0.90 → 1.0.93

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

@@ -25,6 +25,9 @@ import { AllEnterpriseModule } from "ag-grid-enterprise";
 
 // AG-Grid v33+ 需要显式注册模块
 ModuleRegistry.registerModules([AllEnterpriseModule]);
+
+// 导入 AG-Grid v33 主题
+import { agGridTheme } from "./theme";
 import "./index.less";
 import FormRender from "./queryForm";
 import ToolBar from "./toolBar";
@@ -242,12 +245,44 @@ function AgGridPlus(props) {
     // 只在首次有数据时保存
     if (!firstRowDataRef.current && rowData.length > 0) {
       firstRowDataRef.current = rowData[0];
-      console.log('[AgGridPlus] 保存首行数据用于类型推断:', firstRowDataRef.current);
     }
   }, [rowData]);
 
-  // 测试列数据
-  // const restData = [{"id":"47","field":"code","headerName":"编码","width":110,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"code","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"48","field":"name","headerName":"名称","width":110,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"name","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"49","field":"abbName","headerName":"简称","width":110,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"abbName","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"50","field":"address","headerName":"地址","width":662,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"address","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":1},{"id":"51","field":"creator","headerName":"创建人","width":90,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"creator","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"52","field":"creationTime","headerName":"创建时间","width":160,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"creationTime","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"53","field":"lastModifier","headerName":"最后修改人","width":90,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"lastModifier","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"54","field":"lastModificationTime","headerName":"最后修改时间","width":160,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"lastModificationTime","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"55","field":"","headerName":"操作","width":160,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"0","pinned":"right","sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null}]
+  // 【修复】加载列方案时，合并原始列定义和方案配置
+  // 确保保留 cellRenderer、valueFormatter、valueEnum 等自定义属性
+  useEffect(function () {
+    if (!gridKey || !apiRef.current) return;
+    var currentScheme = columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme;
+
+    // 只有当有 columnConfig 时才应用方案
+    if (currentScheme !== null && currentScheme !== void 0 && currentScheme.columnConfig && currentScheme.columnConfig.length > 0) {
+      var _require = require("./setting/columnGroupUtils"),
+        flatConfigToGridState = _require.flatConfigToGridState;
+
+      // 【关键】使用 flatConfigToGridState 合并原始列定义和方案配置
+      // 这样可以保留原始列定义中的 cellRenderer、valueFormatter、valueEnum 等属性
+      var mergedColumnDefs = flatConfigToGridState(currentScheme.columnConfig, allColDefsRef.current // 传入原始完整的列定义
+      );
+
+      // 应用合并后的列定义
+      apiRef.current.setGridOption("columnDefs", mergedColumnDefs);
+
+      // 设置列样式
+      var _require2 = require("./setting/columnGroupUtils"),
+        flatConfigToColumnState = _require2.flatConfigToColumnState;
+      var _columnState = flatConfigToColumnState(currentScheme.columnConfig);
+      setColumnCellClass(handelgridPlusColumnState(_columnState));
+    }
+
+    // 应用过滤器状态
+    if (currentScheme !== null && currentScheme !== void 0 && currentScheme.filterModel) {
+      setTimeout(function () {
+        if (apiRef.current) {
+          apiRef.current.setFilterModel(currentScheme.filterModel);
+        }
+      }, 50);
+    }
+  }, [gridKey, apiRef.current, columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme, allColDefsRef.current]);
 
   // 加载列方案
   // 仅用于设置列样式,不改变列结构
@@ -258,16 +293,10 @@ 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);
-      console.log('[AgGridPlus] useEffect #1: 设置列样式', {
-        gridKey: gridKey,
-        schemeId: columnSchemeManager.currentScheme.id,
-        schemeName: columnSchemeManager.currentScheme.name,
-        columnCount: _columnState.length
-      });
-      setColumnCellClass(handelgridPlusColumnState(_columnState));
+      var _require3 = require("./setting/columnGroupUtils"),
+        flatConfigToColumnState = _require3.flatConfigToColumnState;
+      var _columnState2 = flatConfigToColumnState(columnSchemeManager.currentScheme.columnConfig);
+      setColumnCellClass(handelgridPlusColumnState(_columnState2));
 
       // 【重要】不再调用 applyColumnState
       // 原因:
@@ -279,6 +308,7 @@ function AgGridPlus(props) {
 
   // 【修复】使用 applyColumnState 来应用列的顺序、宽度、隐藏等状态
   // applyColumnState 是 AG-Grid 推荐的方式，专门用于控制列状态
+  // 【重要】使用 defaultState: false 确保只更新方案中保存的属性，保留其他原始列属性
   useEffect(function () {
     var currentScheme = columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme;
     if (!apiRef.current || !currentScheme) {
@@ -287,15 +317,18 @@ function AgGridPlus(props) {
 
     // 如果有 columnConfig，使用 applyColumnState 应用列状态
     if (currentScheme.columnConfig && currentScheme.columnConfig.length > 0) {
-      var _require2 = require("./setting/columnGroupUtils"),
-        flatConfigToColumnState = _require2.flatConfigToColumnState;
-      var _columnState2 = flatConfigToColumnState(currentScheme.columnConfig);
+      var _require4 = require("./setting/columnGroupUtils"),
+        flatConfigToColumnState = _require4.flatConfigToColumnState;
+      var _columnState3 = flatConfigToColumnState(currentScheme.columnConfig);
 
       // 使用 applyColumnState 应用列状态
-      // applyOrder: true 表示按照 state 数组的顺序重新排列列
+      // applyOrder: true - 按照 state 数组的顺序重新排列列
+      // defaultState: undefined - 【关键】不提供默认状态，只更新方案中指定的属性，保留其他原始列属性
       apiRef.current.applyColumnState({
-        state: _columnState2,
+        state: _columnState3,
         applyOrder: true
+        // 不设置 defaultState，这样只会更新 state 中指定的属性
+        // 保留列定义中的 cellRenderer、valueFormatter、headerName 等属性
       });
     }
 
@@ -474,14 +507,6 @@ function AgGridPlus(props) {
     var cols = getTableColumns([dataForTypeInference]);
     allColDefsRef.current = cols; // 同步更新 ref
 
-    console.log('[AgGridPlus] allColDefs 重新计算:', {
-      childrenCount: React.Children.count(children),
-      hasPropsColumnDefs: !!props.columnDefs,
-      extensibleColumnsCount: Object.keys(extensibleColumns || {}).length,
-      gridKey: gridKey,
-      colsCount: cols.length,
-      usingCachedData: !!firstRowDataRef.current
-    });
     return cols;
   }, [React.Children.count(children), props.columnDefs, extensibleColumns, gridKey]);
 
@@ -892,10 +917,12 @@ function AgGridPlus(props) {
     var currentScheme = columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme;
 
     // 【修复】优先使用方案的 columnConfig，避免被默认逻辑覆盖
+    // 【关键修复】传入 allColDefsRef.current 以保留 cellRenderer、valueEnum 等属性
     if (currentScheme !== null && currentScheme !== void 0 && currentScheme.columnConfig && currentScheme.columnConfig.length > 0) {
-      var _require3 = require("./setting/columnGroupUtils"),
-        flatConfigToGridState = _require3.flatConfigToGridState;
-      var gridColumnDefs = flatConfigToGridState(currentScheme.columnConfig);
+      var _require5 = require("./setting/columnGroupUtils"),
+        flatConfigToGridState = _require5.flatConfigToGridState;
+      var gridColumnDefs = flatConfigToGridState(currentScheme.columnConfig, allColDefsRef.current // 传入原始完整的列定义
+      );
       return gridColumnDefs;
     }
 
@@ -936,7 +963,8 @@ function AgGridPlus(props) {
     });
     var processedColumns = processColumnGroups(columnDefs);
     return processedColumns;
-  }, [columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme, React.Children.count(children), props.columnDefs, extensibleColumns, columnCellClass]);
+  }, [columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme, React.Children.count(children), props.columnDefs, extensibleColumns, columnCellClass, allColDefsRef.current // 添加到依赖项
+  ]);
 
   // 构建查询表单项（带 order 属性）
   var queryFormItems = useMemo(function () {
@@ -981,6 +1009,8 @@ function AgGridPlus(props) {
     return {
       extensibleColumns: extensibleColumns,
       columnState: gridPlusColumnState,
+      allColDefs: allColDefsRef.current,
+      // 【修复】传入原始完整的列定义
       onSaveColumnState: onSaveColumnState,
       applyToGlobal: applyToGlobal,
       resetCurrent: resetCurrent,
@@ -991,7 +1021,9 @@ function AgGridPlus(props) {
       updateQueryOrder: setQueryItemsOrder,
       queryFormItems: queryFormItems
     };
-  }, [extensibleColumns, gridPlusColumnState, onSaveColumnState, applyToGlobal, resetCurrent, resetAll, columnSchemeManager, querySchemeManager, queryItemsOrder, queryFormItems]);
+  }, [extensibleColumns, gridPlusColumnState, allColDefsRef.current,
+  // 【修复】添加到依赖数组
+  onSaveColumnState, applyToGlobal, resetCurrent, resetAll, columnSchemeManager, querySchemeManager, queryItemsOrder, queryFormItems]);
   return /*#__PURE__*/React.createElement(GridPlusContext.Provider, {
     value: gridPlusContextValue
   }, /*#__PURE__*/React.createElement(Spin, {
@@ -1061,12 +1093,13 @@ function AgGridPlus(props) {
       onSaveColumnState: onColumnStateChanged
     })]
   }), /*#__PURE__*/React.createElement(AgGridReact, _extends({
-    className: "ag-theme-custom"
+    theme: agGridTheme
   }, rest, {
     localeText: localeText,
     gridOptions: {
       enableCellTextSelection: true,
-      ensureDomOrder: true
+      ensureDomOrder: true,
+      columnHoverHighlight: true
     },
     overlayNoRowsTemplate: createSafeHtmlTemplate(overlayNoRowsTemplateText || '没有找到数据，试试调整筛选条件吧！'),
     enableRangeSelection: true,
@@ -1094,8 +1127,8 @@ function AgGridPlus(props) {
     onDragStopped: function onDragStopped(e) {
       if (apiRef.current) {
         var _apiRef$current5;
-        var _columnState3 = (_apiRef$current5 = apiRef.current) === null || _apiRef$current5 === void 0 ? void 0 : _apiRef$current5.getColumnState();
-        setColumnState(_columnState3);
+        var _columnState4 = (_apiRef$current5 = apiRef.current) === null || _apiRef$current5 === void 0 ? void 0 : _apiRef$current5.getColumnState();
+        setColumnState(_columnState4);
 
         // onColumnStateChanged && onColumnStateChanged(columnState)
       }

package/dist/esm/ag-grid-plus/context/gridContext.d.ts

@@ -10,6 +10,11 @@ export interface GridPlusContextValue {
      * 当前表格的列状态信息，包括列的显示/隐藏、顺序、宽度等
      */
     columnState: any;
+    /**
+     * 原始完整的列定义，包含所有自定义属性（cellRenderer、valueFormatter、valueEnum 等）
+     * 用于列方案应用时保留这些属性
+     */
+    allColDefs?: any[];
     /**
      * 保存当前表格的列状态到服务器（仅保存当前表格）
      * @param gridKey 表格唯一标识

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

@@ -2,7 +2,6 @@ import AgGridPlus from "./ag-gridPlus";
 import { AgGridColumn } from "./interface";
 import { GridPlusContext } from "./context/gridContext";
 import { useGridPlusColumnState } from "./hooks/useGridPlusColumnState";
-import "./ag-grid-theme-builder.css";
 export { AgGridPlus, AgGridColumn, GridPlusContext, useGridPlusColumnState };
 export { dateValueFormatter, dateTimeValueFormatter, convertFilterModel, convertSortModel, flattenTreeDeep, toTree, flatten } from "./utils";
 export { useColumnSchemes, LocalStorageAdapter, defaultStorageAdapter, validateScheme, validateSchemeName, validateSchemeDescription, checkDuplicateName, generateUniqueName, STORAGE_PREFIX, DEFAULT_SCHEME_NAME, MAX_SCHEMES_PER_GRID, MAX_SCHEME_NAME_LENGTH, SchemeSelector, SchemeManager } from "./schemes";

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

@@ -2,7 +2,6 @@ import AgGridPlus from "./ag-gridPlus";
 import { AgGridColumn } from "./interface";
 import { GridPlusContext } from "./context/gridContext";
 import { useGridPlusColumnState } from "./hooks/useGridPlusColumnState";
-import "./ag-grid-theme-builder.css";
 export { AgGridPlus, AgGridColumn, GridPlusContext, useGridPlusColumnState };
 export { dateValueFormatter, dateTimeValueFormatter, convertFilterModel, convertSortModel, flattenTreeDeep, toTree, flatten } from "./utils";
 

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

@@ -193,20 +193,6 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
   var updateItems = useCallback(function (newItems) {
     // 重新计算 order
     reorderItems(newItems);
-    console.log('[ColumnConfigTable] updateItems 调用,重新计算 order 后:', {
-      itemsCount: newItems.length,
-      items: newItems.map(function (item, idx) {
-        return {
-          index: idx,
-          id: item.id,
-          type: item.type,
-          headerName: item.headerName,
-          field: item.field,
-          order: item.order,
-          parentId: item.parentId
-        };
-      })
-    });
     setLocalItems(_toConsumableArray(newItems));
     onChange(_toConsumableArray(newItems));
   }, [onChange]);
@@ -253,10 +239,10 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
 
           // 计算表格可用高度 = Modal Content 高度 - Header - Footer - 容器之前的内容高度 - 底部留白
           var contentBeforeTable = containerRect.top - modalContentRect.top - headerHeight;
-          var availableHeight = modalContentRect.height - headerHeight - footerHeight - contentBeforeTable - 20;
+          var availableHeight = modalContentRect.height - headerHeight - footerHeight - contentBeforeTable - 55;
 
           // 设置最小高度为300px
-          var finalHeight = Math.max(100, availableHeight);
+          var finalHeight = Math.max(600, availableHeight);
           setTableHeight(finalHeight);
         }
       }
@@ -394,24 +380,6 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
    * 打开移动节点弹窗
    */
   var handleOpenMoveModal = useCallback(function (node) {
-    console.log('[ColumnConfigTable] 打开移动弹窗:', {
-      node: {
-        id: node.id,
-        headerName: node.headerName,
-        type: node.type,
-        parentId: node.parentId,
-        level: node.level
-      },
-      allItems: localItems.map(function (n) {
-        return {
-          id: n.id,
-          headerName: n.headerName,
-          type: n.type,
-          parentId: n.parentId,
-          level: n.level
-        };
-      })
-    });
     setCurrentMoveNode(node);
     setMoveModalVisible(true);
   }, [localItems]);
@@ -473,18 +441,6 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
       });
     };
     collectNodes(nodeId);
-    console.log('[ColumnConfigTable] 移动节点:', {
-      nodeId: nodeId,
-      targetParentId: targetParentId,
-      nodesToMoveCount: nodesToMove.length,
-      nodesToMove: nodesToMove.map(function (n) {
-        return {
-          id: n.id,
-          headerName: n.headerName,
-          parentId: n.parentId
-        };
-      })
-    });
 
     // 3.2 从原位置移除这些节点
     var remainingItems = newItems.filter(function (item) {
@@ -517,37 +473,12 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
       // 插入到根级别的末尾
       insertIndex = remainingItems.length;
     }
-    console.log('[ColumnConfigTable] 插入位置:', {
-      insertIndex: insertIndex,
-      targetParentId: targetParentId,
-      remainingItemsCount: remainingItems.length,
-      updatedNodesToMove: updatedNodesToMove.map(function (n) {
-        return {
-          id: n.id,
-          headerName: n.headerName,
-          parentId: n.parentId,
-          level: n.level
-        };
-      })
-    });
 
     // 3.6 插入节点
     remainingItems.splice.apply(remainingItems, [insertIndex, 0].concat(_toConsumableArray(updatedNodesToMove)));
 
     // 3.7 重新计算 order
     reorderItems(remainingItems);
-    console.log('[ColumnConfigTable] 移动完成后的数组:', {
-      totalCount: remainingItems.length,
-      items: remainingItems.map(function (n) {
-        return {
-          id: n.id,
-          headerName: n.headerName,
-          parentId: n.parentId,
-          level: n.level,
-          order: n.order
-        };
-      })
-    });
     updateItems(remainingItems);
     message.success("\u5DF2\u5C06\"".concat(currentMoveNode.headerName, "\"\u79FB\u52A8\u5230\u65B0\u4F4D\u7F6E"));
     handleCloseMoveModal();
@@ -663,25 +594,6 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
       };
       collectDescendants(draggedItem.id);
     }
-    console.log('[ColumnConfigTable] 拖动排序:', {
-      dragIndex: dragIndex,
-      hoverIndex: hoverIndex,
-      realDragIndex: realDragIndex,
-      realHoverIndex: realHoverIndex,
-      draggedItem: {
-        id: draggedItem.id,
-        headerName: draggedItem.headerName,
-        type: draggedItem.type
-      },
-      nodesToMoveCount: nodesToMove.length,
-      nodesToMove: nodesToMove.map(function (n) {
-        return {
-          id: n.id,
-          headerName: n.headerName,
-          parentId: n.parentId
-        };
-      })
-    });
 
     // 从原数组中移除所有要移动的节点
     var remainingItems = newItems.filter(function (item) {
@@ -700,20 +612,6 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
 
     // 在新位置插入所有节点
     remainingItems.splice.apply(remainingItems, [adjustedHoverIndex, 0].concat(nodesToMove));
-    console.log('[ColumnConfigTable] 拖动完成,准备更新:', {
-      remainingItemsCount: remainingItems.length,
-      items: remainingItems.map(function (item, idx) {
-        return {
-          index: idx,
-          id: item.id,
-          type: item.type,
-          headerName: item.headerName,
-          field: item.field,
-          order: item.order,
-          parentId: item.parentId
-        };
-      })
-    });
 
     // 使用 updateItems 来同时更新本地状态和通知父组件
     updateItems(remainingItems);