@nokecy/qc-ui 1.0.81 → 1.0.83

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

@@ -7,7 +7,6 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { SettingOutlined } from '@ant-design/icons';
 import { Dropdown } from 'antd';
 import React, { useState, useContext } from "react";
-import { useGridPlusColumnState } from "../hooks/useGridPlusColumnState";
 import { GridPlusContext } from "../context/gridContext";
 import { QuerySchemesManager } from "../querySchemes/components/QuerySchemesManager";
 import ColumnSetting from "./ColumnSetting";
@@ -16,10 +15,9 @@ var Setting = function Setting(props) {
     gridApi = props.gridApi,
     gridApiState = props.gridApiState,
     onSaveColumnState = props.onSaveColumnState;
-  var _useGridPlusColumnSta = useGridPlusColumnState(),
-    resetCurrent = _useGridPlusColumnSta.resetCurrent;
   var gridPlusContext = useContext(GridPlusContext);
-  var schemeManager = gridPlusContext === null || gridPlusContext === void 0 ? void 0 : gridPlusContext.schemeManager;
+  // 优先使用外部传入的 schemeManager，否则使用 Context 中的
+  var schemeManager = props.schemeManager || (gridPlusContext === null || gridPlusContext === void 0 ? void 0 : gridPlusContext.schemeManager);
   var querySchemeManager = gridPlusContext === null || gridPlusContext === void 0 ? void 0 : gridPlusContext.querySchemeManager;
   var currentQueryOrder = (gridPlusContext === null || gridPlusContext === void 0 ? void 0 : gridPlusContext.currentQueryOrder) || [];
   var updateQueryOrder = gridPlusContext === null || gridPlusContext === void 0 ? void 0 : gridPlusContext.updateQueryOrder;
@@ -43,14 +41,7 @@ var Setting = function Setting(props) {
       onClick: function onClick() {
         return setColumnSettingVisible(true);
       }
-    }, "\u5217\u8BBE\u7F6E")
-  }, {
-    key: 'reset',
-    label: /*#__PURE__*/React.createElement("a", {
-      onClick: function onClick() {
-        gridKey && resetCurrent(gridKey);
-      }
-    }, "\u6062\u590D\u9ED8\u8BA4")
+    }, "\u5217\u65B9\u6848\u7BA1\u7406")
   }];
 
   // 如果存在 querySchemeManager,添加查询方案相关菜单项
@@ -86,7 +77,8 @@ var Setting = function Setting(props) {
     onClose: function onClose() {
       return setColumnSettingVisible(false);
     },
-    onSaveColumnState: onSaveColumnState,
+    onSaveColumnState: onSaveColumnState || function () {} // 保留兼容性，但 formArrayTable 不再使用
+    ,
     schemeManager: schemeManager,
     type: props.type
   }), querySchemeManager && gridApi && updateQueryOrder && /*#__PURE__*/React.createElement(QuerySchemesManager, {

package/dist/esm/ag-grid-plus/storage/SchemeSyncManager.d.ts

@@ -116,7 +116,8 @@ export declare class SchemeSyncManager {
     private applyServerVersion;
     /**
      * 反序列化从后端接收的方案数据
-     * 将 columnState 和 itemsOrder 从 JSON 字符串转换为数组
+     * 将 columnState(后端字段) 映射为 columnConfig 并从 JSON 字符串转换为数组
+     * 将 itemsOrder 从 JSON 字符串转换为数组
      */
     private deserializeSchemesData;
     /**

package/dist/esm/ag-grid-plus/storage/SchemeSyncManager.js

@@ -73,7 +73,7 @@ export var SchemeSyncManager = /*#__PURE__*/function () {
             schemes = _ref2[1];
           serializedColumnSchemes[gridId] = schemes.map(function (scheme) {
             return _objectSpread(_objectSpread({}, scheme), {}, {
-              columnState: JSON.stringify(scheme.columnState)
+              columnState: JSON.stringify(scheme.columnConfig)
             });
           });
         });
@@ -593,15 +593,15 @@ export var SchemeSyncManager = /*#__PURE__*/function () {
                 if (types.has('current')) dirtyCurrentGrids.add(gridId);
               });
 
-              // 添加列方案数据（将 columnState 序列化为 JSON 字符串）
+              // 添加列方案数据（将 columnConfig 序列化为 JSON 字符串并映射到 columnState 字段）
               if (dirtyColumnGrids.size > 0) {
                 requestData.columnSchemes = {};
                 dirtyColumnGrids.forEach(function (gridId) {
                   var schemes = _this4.allData.columnSchemes[gridId] || [];
-                  // 将每个方案的 columnState 从数组转换为 JSON 字符串
+                  // 将每个方案的 columnConfig 从数组转换为 JSON 字符串,并映射到 columnState 字段
                   requestData.columnSchemes[gridId] = schemes.map(function (scheme) {
                     return _objectSpread(_objectSpread({}, scheme), {}, {
-                      columnState: JSON.stringify(scheme.columnState)
+                      columnState: JSON.stringify(scheme.columnConfig)
                     });
                   });
                 });
@@ -771,7 +771,8 @@ export var SchemeSyncManager = /*#__PURE__*/function () {
 
     /**
      * 反序列化从后端接收的方案数据
-     * 将 columnState 和 itemsOrder 从 JSON 字符串转换为数组
+     * 将 columnState(后端字段) 映射为 columnConfig 并从 JSON 字符串转换为数组
+     * 将 itemsOrder 从 JSON 字符串转换为数组
      */
   }, {
     key: "deserializeSchemesData",
@@ -787,10 +788,12 @@ export var SchemeSyncManager = /*#__PURE__*/function () {
           gridId = _ref6[0],
           schemes = _ref6[1];
         result.columnSchemes[gridId] = schemes.map(function (scheme) {
-          // 如果 columnState 是字符串，则解析为数组
-          var columnState = typeof scheme.columnState === 'string' ? JSON.parse(scheme.columnState) : scheme.columnState;
+          // 后端返回的数据中,columnState 字段存储的是 columnConfig 的 JSON 字符串
+          // 需要将其解析为数组并映射到 columnConfig 字段
+          var schemeWithState = scheme; // 类型断言处理后端数据
+          var columnConfig = typeof schemeWithState.columnState === 'string' ? JSON.parse(schemeWithState.columnState) : schemeWithState.columnState;
           return _objectSpread(_objectSpread({}, scheme), {}, {
-            columnState: columnState
+            columnConfig: columnConfig
           });
         });
       });

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

@@ -146,6 +146,8 @@ export interface ExtendedColDef extends ColDef {
     formatWithCommas?: boolean;
     /** 自定义单元格渲染器 (用于跳过计算) */
     customCellRenderer?: (params: any) => any;
+    /** 列分组的子列 (支持列分组功能) */
+    children?: ExtendedColDef[];
 }
 /**
  * 扩展的列状态 (包含 AG-Grid 列状态 + 自定义属性)

package/dist/esm/array-table/index.js

@@ -11,7 +11,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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; }
-import React, { Fragment, useEffect, useRef, useState, useCallback } from "react";
+import React, { Fragment, useEffect, useRef, useState } from "react";
 import { AgGridReact } from "ag-grid-react";
 import { useField, observer, RecursionField } from "@formily/react";
 import { useFieldSchema } from "@formily/react";
@@ -25,47 +25,7 @@ import PreviewArrayTable from "./preview";
 import { Space } from "antd";
 import Setting from "../ag-grid-plus/setting";
 import { useGridPlusColumnState } from "../ag-grid-plus/hooks/useGridPlusColumnState";
-
-/**
- * ArrayTable 内置的列状态管理 Hook
- * 使用 localStorage 进行持久化存储
- */
-var useArrayTableColumnState = function useArrayTableColumnState(gridKey) {
-  var STORAGE_KEY = 'array-table-column-state';
-
-  // 从 localStorage 读取所有列状态
-  var getColumnStateFromStorage = useCallback(function () {
-    try {
-      var stored = localStorage.getItem(STORAGE_KEY);
-      return stored ? JSON.parse(stored) : {};
-    } catch (error) {
-      console.error('Failed to read column state from localStorage:', error);
-      return {};
-    }
-  }, []);
-
-  // 保存列状态到 localStorage
-  var saveColumnStateToStorage = useCallback(function (key, state) {
-    try {
-      var allStates = getColumnStateFromStorage();
-      allStates[key] = state;
-      localStorage.setItem(STORAGE_KEY, JSON.stringify(allStates));
-    } catch (error) {
-      console.error('Failed to save column state to localStorage:', error);
-    }
-  }, [getColumnStateFromStorage]);
-
-  // 获取指定 gridKey 的列状态
-  var getColumnState = useCallback(function (key) {
-    if (!key) return undefined;
-    var allStates = getColumnStateFromStorage();
-    return allStates[key];
-  }, [getColumnStateFromStorage]);
-  return {
-    getColumnState: getColumnState,
-    saveColumnState: saveColumnStateToStorage
-  };
-};
+import { useColumnSchemes } from "../ag-grid-plus/schemes/hooks/useColumnSchemes";
 
 //@ts-ignore
 var ArrayTable = observer(function (props) {
@@ -97,10 +57,14 @@ var ArrayTable = observer(function (props) {
   // 尝试从 Context 获取列状态管理（如果被 Provider 包裹）
   var contextColumnState = useGridPlusColumnState();
 
-  // 使用内置的列状态管理作为后备方案
-  var _useArrayTableColumnS = useArrayTableColumnState(props.gridKey),
-    getColumnState = _useArrayTableColumnS.getColumnState,
-    saveColumnState = _useArrayTableColumnS.saveColumnState;
+  // ArrayTable 内部集成列方案管理（统一使用 AgGridPlus 的方案系统）
+  var internalSchemeManager = useColumnSchemes({
+    gridId: props.gridKey || 'array-table-default',
+    enableAutoSave: false // 手动控制保存时机
+  });
+
+  // 使用 Context 的 schemeManager 或内部的 schemeManager
+  var schemeManager = (contextColumnState === null || contextColumnState === void 0 ? void 0 : contextColumnState.schemeManager) || internalSchemeManager;
 
   // 使用自定义 hooks
   var _useCellFocus = useCellFocus(),
@@ -110,45 +74,36 @@ var ArrayTable = observer(function (props) {
   var _useRowDrag = useRowDrag(field),
     handleRowDragMove = _useRowDrag.handleRowDragMove;
 
-  // 恢复列状态（优先使用 Context，否则使用内置的 localStorage）
+  // 恢复列状态（从方案系统）
   useEffect(function () {
-    var _contextColumnState$c;
-    if (!props.gridKey || !gridApiState) {
+    if (!props.gridKey || !gridApiState || !schemeManager) {
       return;
     }
-    var stateToApply = null;
-    var hasRealProvider = (contextColumnState === null || contextColumnState === void 0 ? void 0 : contextColumnState.columnState) !== undefined;
 
-    // 优先使用 Context 中的列状态（但只有在有真正的 Provider 时）
-    if (hasRealProvider && contextColumnState !== null && contextColumnState !== void 0 && (_contextColumnState$c = contextColumnState.columnState) !== null && _contextColumnState$c !== void 0 && _contextColumnState$c[props.gridKey]) {
-      stateToApply = contextColumnState.columnState[props.gridKey];
-    }
-    // 后备方案：使用内置的 localStorage 列状态
-    else {
-      stateToApply = getColumnState(props.gridKey);
-    }
-    if (stateToApply && Array.isArray(stateToApply)) {
-      // 转换为 AG-Grid 需要的格式
-      var formattedState = stateToApply.map(function (col) {
+    // 使用方案系统恢复列状态
+    // schemeManager 会自动加载默认方案或最后使用的方案
+    var currentScheme = schemeManager.currentScheme;
+    if (currentScheme && currentScheme.columnConfig) {
+      // 从 columnConfig (FlatColumnItem[]) 提取列状态
+      var columnState = currentScheme.columnConfig.filter(function (item) {
+        return item.type === 'column' && item.field;
+      }).map(function (item) {
         return {
-          colId: col.colId || col.field,
-          width: col.width,
-          hide: col.hide,
-          pinned: col.pinned === 'notPinned' ? null : col.pinned,
-          sort: col.sort,
-          sortIndex: col.sortIndex,
-          aggFunc: col.aggFunc,
-          flex: col.flex
+          colId: item.field,
+          width: item.width,
+          hide: item.hide,
+          pinned: item.pinned === 'notPinned' ? null : item.pinned,
+          flex: item.flex
         };
       });
       setTimeout(function () {
         gridApiState.applyColumnState({
-          state: formattedState,
+          state: columnState,
           applyOrder: true
         });
       }, 100);
     }
-  }, [props.gridKey, gridApiState, contextColumnState === null || contextColumnState === void 0 ? void 0 : contextColumnState.columnState, getColumnState]);
+  }, [props.gridKey, gridApiState, schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.currentScheme]);
 
   //@ts-ignore
   if (columns.length > 0) {
@@ -156,22 +111,9 @@ var ArrayTable = observer(function (props) {
     columns[0].rowDrag = props.onRowDrag ? true : false;
   }
 
-  // 保存列状态（优先使用 Context，否则使用内置的 localStorage）
-  var onColumnStateChanged = function onColumnStateChanged(columnState) {
-    if (!props.gridKey) return;
+  // 不再需要 onColumnStateChanged 回调
+  // 保存逻辑统一由 ColumnSetting 通过 schemeManager 处理
 
-    // 判断是否有真正的 Provider：检查 columnState 是否不是 undefined（默认值）
-    var hasRealProvider = (contextColumnState === null || contextColumnState === void 0 ? void 0 : contextColumnState.columnState) !== undefined;
-
-    // 优先使用 Context 的保存方法（但只有在有真正的 Provider 时）
-    if (hasRealProvider && contextColumnState !== null && contextColumnState !== void 0 && contextColumnState.onSaveColumnState) {
-      contextColumnState.onSaveColumnState(props.gridKey, columnState);
-    }
-    // 后备方案：使用内置的 localStorage 保存
-    else {
-      saveColumnState(props.gridKey, columnState);
-    }
-  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     ref: ref,
     style: {
@@ -219,7 +161,7 @@ var ArrayTable = observer(function (props) {
     gridApi: apiRef.current,
     gridApiState: gridApiState,
     type: 'formArrayTable',
-    onSaveColumnState: onColumnStateChanged
+    schemeManager: schemeManager
   })), /*#__PURE__*/React.createElement("div", {
     style: {
       flex: 1,
@@ -231,37 +173,7 @@ var ArrayTable = observer(function (props) {
       apiRef.current = params.api;
       setGridApiState(params.api);
 
-      // 立即尝试恢复列状态
-      if (props.gridKey) {
-        var _contextColumnState$c2;
-        var hasRealProvider = (contextColumnState === null || contextColumnState === void 0 ? void 0 : contextColumnState.columnState) !== undefined;
-        var stateToApply = null;
-        if (hasRealProvider && contextColumnState !== null && contextColumnState !== void 0 && (_contextColumnState$c2 = contextColumnState.columnState) !== null && _contextColumnState$c2 !== void 0 && _contextColumnState$c2[props.gridKey]) {
-          stateToApply = contextColumnState.columnState[props.gridKey];
-        } else {
-          stateToApply = getColumnState(props.gridKey);
-        }
-        if (stateToApply && Array.isArray(stateToApply)) {
-          var formattedState = stateToApply.map(function (col) {
-            return {
-              colId: col.colId || col.field,
-              width: col.width,
-              hide: col.hide,
-              pinned: col.pinned === 'notPinned' ? null : col.pinned,
-              sort: col.sort,
-              sortIndex: col.sortIndex,
-              aggFunc: col.aggFunc,
-              flex: col.flex
-            };
-          });
-          setTimeout(function () {
-            params.api.applyColumnState({
-              state: formattedState,
-              applyOrder: true
-            });
-          }, 50);
-        }
-      }
+      // 恢复列状态将由 useEffect 处理（使用方案系统）
     },
     suppressColumnVirtualisation: true,
     gridOptions: {

package/dist/esm/draggableModal/index.d.ts

@@ -2,7 +2,7 @@ import { ModalProps } from 'antd/lib/modal';
 import React from 'react';
 import "./style.less";
 /**
- * 可拖拽Modal
+ * 可拖拽Modal - 支持拖拽、全屏切换和缩放
  * @param props
  * @returns
  */