@nokecy/qc-ui 1.0.97 → 1.0.99

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

@@ -55,43 +55,46 @@ export declare function useSchemeManager(config: UseSchemeManagerConfig): {
 /**
  * 在组件中使用集中式方案管理
  *
- * 支持两种模式（根据 Context 配置自动选择）:
- * 1. Backend API 模式: Context 提供 backendApiConfig，使用后端适配器
- * 2. LocalStorage 模式: 不提供配置，使用本地存储适配器
+ * ⚠️ 必须在 Provider 中传入 SchemeManager 状态，否则抛出错误
  *
  * @example
  * ```tsx
- * // 模式1：提供后端 API 配置
- * <GridPlusContext.Provider value={{
- *   extensibleColumns: [],
- *   columnState: undefined,
- *   onSaveColumnState: () => {},
- *   applyToGlobal: () => {},
- *   resetCurrent: () => {},
- *   resetAll: () => {},
- *   queryFormItems: [],
- *   backendApiConfig: {
- *     apiBaseUrl: 'https://api.example.com',
- *     getToken: () => localStorage.getItem('token'),
- *     getUserId: () => localStorage.getItem('userId')
- *   }
- * }}>
- *   <MyGrid />
- * </GridPlusContext.Provider>
+ * // 1. 创建适配器和方案管理器
+ * function App() {
+ *   const adapter = useMemo(
+ *     () => new BackendApiSchemeAdapter({
+ *       apiBaseUrl: 'https://api.example.com',
+ *       getToken: () => localStorage.getItem('token'),
+ *       getUserId: () => localStorage.getItem('userId')
+ *     }),
+ *     []
+ *   );
+ *
+ *   const schemeManager = useSchemeManager({
+ *     adapter,
+ *     autoLoad: true,
+ *     showErrorMessage: true,
+ *     currentUserId: currentUser?.id
+ *   });
  *
- * // 模式2：无配置，自动使用 LocalStorage
- * <GridPlusContext.Provider value={{
- *   extensibleColumns: [],
- *   columnState: undefined,
- *   onSaveColumnState: () => {},
- *   applyToGlobal: () => {},
- *   resetCurrent: () => {},
- *   resetAll: () => {},
- *   queryFormItems: []
- * }}>
- *   <MyGrid />
- * </GridPlusContext.Provider>
+ *   // 2. 传入 Provider
+ *   return (
+ *     <GridPlusContext.Provider value={{
+ *       extensibleColumns: [],
+ *       columnState: undefined,
+ *       onSaveColumnState: () => {},
+ *       applyToGlobal: () => {},
+ *       resetCurrent: () => {},
+ *       resetAll: () => {},
+ *       queryFormItems: [],
+ *       ...schemeManager  // 展开方案管理状态
+ *     }}>
+ *       <MyGrid />
+ *     </GridPlusContext.Provider>
+ *   );
+ * }
  *
+ * // 3. 在子组件中使用
  * function MyGrid() {
  *   const {
  *     columnSchemes,

package/dist/esm/ag-grid-plus/context/useSchemeManager.js

@@ -475,93 +475,49 @@ export function useSchemeManager(config) {
   };
 }
 
-/**
- * Fallback 模式：根据后端 API 配置自动选择适配器
- */
-function useFallbackSchemeManager(backendApiConfig, currentUserId) {
-  // 根据配置选择适配器
-  var adapter = useRef(function () {
-    if (backendApiConfig) {
-      // 如果提供了后端 API 配置，使用后端适配器
-      var _require = require("../shared/storage/backendApiAdapter"),
-        BackendApiSchemeAdapter = _require.BackendApiSchemeAdapter;
-      console.log('[useFallbackSchemeManager] 使用后端 API 适配器');
-      return new BackendApiSchemeAdapter(_objectSpread(_objectSpread({}, backendApiConfig), {}, {
-        enableDebugLog: false
-      }));
-    } else {
-      // 否则使用本地存储适配器
-      var _require2 = require("../shared/storage/localStorageAdapter"),
-        LocalStorageSchemeAdapter = _require2.LocalStorageSchemeAdapter;
-      console.log('[useFallbackSchemeManager] 使用本地存储适配器');
-      return new LocalStorageSchemeAdapter({
-        storageKey: 'ag-grid-plus-schemes',
-        enableDebugLog: false
-      });
-    }
-  }).current();
-
-  // 使用选定的适配器进行状态管理
-  var manager = useSchemeManager({
-    adapter: adapter,
-    autoLoad: true,
-    showErrorMessage: true,
-    currentUserId: currentUserId
-  });
-
-  // 返回与 Context 相同的接口
-  return _objectSpread({
-    // 保留必需的默认值
-    extensibleColumns: [],
-    columnState: undefined,
-    onSaveColumnState: function onSaveColumnState() {},
-    applyToGlobal: function applyToGlobal() {},
-    resetCurrent: function resetCurrent() {},
-    resetAll: function resetAll() {},
-    queryFormItems: []
-  }, manager);
-}
-
 /**
  * 在组件中使用集中式方案管理
  *
- * 支持两种模式（根据 Context 配置自动选择）:
- * 1. Backend API 模式: Context 提供 backendApiConfig，使用后端适配器
- * 2. LocalStorage 模式: 不提供配置，使用本地存储适配器
+ * ⚠️ 必须在 Provider 中传入 SchemeManager 状态，否则抛出错误
  *
  * @example
  * ```tsx
- * // 模式1：提供后端 API 配置
- * <GridPlusContext.Provider value={{
- *   extensibleColumns: [],
- *   columnState: undefined,
- *   onSaveColumnState: () => {},
- *   applyToGlobal: () => {},
- *   resetCurrent: () => {},
- *   resetAll: () => {},
- *   queryFormItems: [],
- *   backendApiConfig: {
- *     apiBaseUrl: 'https://api.example.com',
- *     getToken: () => localStorage.getItem('token'),
- *     getUserId: () => localStorage.getItem('userId')
- *   }
- * }}>
- *   <MyGrid />
- * </GridPlusContext.Provider>
+ * // 1. 创建适配器和方案管理器
+ * function App() {
+ *   const adapter = useMemo(
+ *     () => new BackendApiSchemeAdapter({
+ *       apiBaseUrl: 'https://api.example.com',
+ *       getToken: () => localStorage.getItem('token'),
+ *       getUserId: () => localStorage.getItem('userId')
+ *     }),
+ *     []
+ *   );
  *
- * // 模式2：无配置，自动使用 LocalStorage
- * <GridPlusContext.Provider value={{
- *   extensibleColumns: [],
- *   columnState: undefined,
- *   onSaveColumnState: () => {},
- *   applyToGlobal: () => {},
- *   resetCurrent: () => {},
- *   resetAll: () => {},
- *   queryFormItems: []
- * }}>
- *   <MyGrid />
- * </GridPlusContext.Provider>
+ *   const schemeManager = useSchemeManager({
+ *     adapter,
+ *     autoLoad: true,
+ *     showErrorMessage: true,
+ *     currentUserId: currentUser?.id
+ *   });
  *
+ *   // 2. 传入 Provider
+ *   return (
+ *     <GridPlusContext.Provider value={{
+ *       extensibleColumns: [],
+ *       columnState: undefined,
+ *       onSaveColumnState: () => {},
+ *       applyToGlobal: () => {},
+ *       resetCurrent: () => {},
+ *       resetAll: () => {},
+ *       queryFormItems: [],
+ *       ...schemeManager  // 展开方案管理状态
+ *     }}>
+ *       <MyGrid />
+ *     </GridPlusContext.Provider>
+ *   );
+ * }
+ *
+ * // 3. 在子组件中使用
  * function MyGrid() {
  *   const {
  *     columnSchemes,
@@ -581,10 +537,11 @@ function useFallbackSchemeManager(backendApiConfig, currentUserId) {
 export function useGridSchemes() {
   var context = useContext(GridPlusContext);
 
-  // 根据后端 API 配置自动选择适配器
-  var adapterType = context !== null && context !== void 0 && context.backendApiConfig ? '后端 API' : 'LocalStorage';
-  console.log("[useGridSchemes] \u4F7F\u7528 ".concat(adapterType, " \u9002\u914D\u5668"));
-
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  return useFallbackSchemeManager(context === null || context === void 0 ? void 0 : context.backendApiConfig, context === null || context === void 0 ? void 0 : context.currentUserId);
+  // 检查是否传入了方案管理状态
+  var hasSchemeManagement = !!((context === null || context === void 0 ? void 0 : context.columnSchemes) !== undefined || context !== null && context !== void 0 && context.saveColumnScheme || context !== null && context !== void 0 && context.deleteColumnScheme);
+  if (!hasSchemeManagement) {
+    throw new Error('[useGridSchemes] 必须在 GridPlusContext.Provider 中传入 SchemeManager 状态。\n' + '请使用 useSchemeManager hook 创建方案管理器，然后通过 Provider 传递：\n' + '  const schemeManager = useSchemeManager({ adapter, ... });\n' + '  <GridPlusContext.Provider value={{ ...otherValues, ...schemeManager }}>');
+  }
+  console.log('[useGridSchemes] 使用 Context 中的方案管理状态');
+  return context;
 }

package/dist/esm/ag-grid-plus/shared/storage/backendApiAdapter.js

@@ -199,23 +199,55 @@ export var BackendApiSchemeAdapter = /*#__PURE__*/function () {
               return this.request(url);
             case 5:
               response = _context2.sent;
+              // 将所有列方案的 columnConfig 从字符串解析为对象数组
+              if (response.columnSchemes) {
+                Object.keys(response.columnSchemes).forEach(function (gridId) {
+                  response.columnSchemes[gridId] = response.columnSchemes[gridId].map(function (scheme) {
+                    if (typeof scheme.columnConfig === 'string') {
+                      return _objectSpread(_objectSpread({}, scheme), {}, {
+                        columnConfig: JSON.parse(scheme.columnConfig)
+                      });
+                    }
+                    return scheme;
+                  });
+                });
+              }
+
+              // 将所有查询方案的字段从字符串解析为数组和对象
+              if (response.querySchemes) {
+                Object.keys(response.querySchemes).forEach(function (gridId) {
+                  response.querySchemes[gridId] = response.querySchemes[gridId].map(function (scheme) {
+                    var parsedScheme = _objectSpread({}, scheme);
+                    if (typeof parsedScheme.itemsOrder === 'string') {
+                      parsedScheme.itemsOrder = JSON.parse(parsedScheme.itemsOrder);
+                    }
+                    if (typeof parsedScheme.hiddenFields === 'string') {
+                      parsedScheme.hiddenFields = JSON.parse(parsedScheme.hiddenFields);
+                    }
+                    if (typeof parsedScheme.formValues === 'string') {
+                      parsedScheme.formValues = JSON.parse(parsedScheme.formValues);
+                    }
+                    return parsedScheme;
+                  });
+                });
+              }
               this.log('加载完成', {
                 columnSchemes: Object.keys(response.columnSchemes || {}).length,
                 querySchemes: Object.keys(response.querySchemes || {}).length,
                 version: response.version
               });
               return _context2.abrupt("return", response);
-            case 10:
-              _context2.prev = 10;
+            case 12:
+              _context2.prev = 12;
               _context2.t0 = _context2["catch"](0);
               console.error('[BackendApiAdapter] 加载方案失败:', _context2.t0);
               message.error('加载方案失败');
               throw _context2.t0;
-            case 15:
+            case 17:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[0, 10]]);
+        }, _callee2, this, [[0, 12]]);
       }));
       function loadAllSchemes() {
         return _loadAllSchemes.apply(this, arguments);
@@ -226,42 +258,52 @@ export var BackendApiSchemeAdapter = /*#__PURE__*/function () {
     key: "saveColumnScheme",
     value: function () {
       var _saveColumnScheme = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(gridId, scheme) {
-        var url, response;
+        var schemeForBackend, url, response, savedScheme;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               _context3.prev = 0;
               this.log("\u4FDD\u5B58\u5217\u65B9\u6848: ".concat(gridId, " - ").concat(scheme.name));
+
+              // 将 columnConfig 转换为 JSON 字符串
+              schemeForBackend = _objectSpread(_objectSpread({}, scheme), {}, {
+                columnConfig: JSON.stringify(scheme.columnConfig)
+              });
               url = "".concat(this.config.apiBaseUrl, "/api/extra-object/table-scheme/save-column-scheme");
-              _context3.next = 5;
+              _context3.next = 6;
               return this.request(url, {
                 method: 'POST',
                 body: JSON.stringify({
                   gridId: gridId,
-                  scheme: scheme
+                  scheme: schemeForBackend
                 })
               });
-            case 5:
+            case 6:
               response = _context3.sent;
               if (response.success) {
-                _context3.next = 8;
+                _context3.next = 9;
                 break;
               }
               throw new Error(response.message || '保存失败');
-            case 8:
-              this.log('保存成功', response.scheme);
-              return _context3.abrupt("return", response.scheme);
-            case 12:
-              _context3.prev = 12;
+            case 9:
+              // 将返回的 columnConfig 从字符串解析为对象数组
+              savedScheme = response.scheme;
+              if (savedScheme && typeof savedScheme.columnConfig === 'string') {
+                savedScheme.columnConfig = JSON.parse(savedScheme.columnConfig);
+              }
+              this.log('保存成功', savedScheme);
+              return _context3.abrupt("return", savedScheme);
+            case 15:
+              _context3.prev = 15;
               _context3.t0 = _context3["catch"](0);
               console.error('[BackendApiAdapter] 保存列方案失败:', _context3.t0);
               message.error('保存列方案失败');
               throw _context3.t0;
-            case 17:
+            case 20:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[0, 12]]);
+        }, _callee3, this, [[0, 15]]);
       }));
       function saveColumnScheme(_x2, _x3) {
         return _saveColumnScheme.apply(this, arguments);
@@ -315,42 +357,62 @@ export var BackendApiSchemeAdapter = /*#__PURE__*/function () {
     key: "saveQueryScheme",
     value: function () {
       var _saveQueryScheme = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(gridId, scheme) {
-        var url, response;
+        var schemeForBackend, url, response, savedScheme;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               _context5.prev = 0;
               this.log("\u4FDD\u5B58\u67E5\u8BE2\u65B9\u6848: ".concat(gridId, " - ").concat(scheme.name));
+
+              // 将数组和对象字段转换为 JSON 字符串
+              schemeForBackend = _objectSpread(_objectSpread({}, scheme), {}, {
+                itemsOrder: scheme.itemsOrder ? JSON.stringify(scheme.itemsOrder) : undefined,
+                hiddenFields: scheme.hiddenFields ? JSON.stringify(scheme.hiddenFields) : undefined,
+                formValues: scheme.formValues ? JSON.stringify(scheme.formValues) : undefined
+              });
               url = "".concat(this.config.apiBaseUrl, "/api/extra-object/table-scheme/save-query-scheme");
-              _context5.next = 5;
+              _context5.next = 6;
               return this.request(url, {
                 method: 'POST',
                 body: JSON.stringify({
                   gridId: gridId,
-                  scheme: scheme
+                  scheme: schemeForBackend
                 })
               });
-            case 5:
+            case 6:
               response = _context5.sent;
               if (response.success) {
-                _context5.next = 8;
+                _context5.next = 9;
                 break;
               }
               throw new Error(response.message || '保存失败');
-            case 8:
-              this.log('保存成功', response.scheme);
-              return _context5.abrupt("return", response.scheme);
-            case 12:
-              _context5.prev = 12;
+            case 9:
+              // 将返回的字符串字段解析为数组和对象
+              savedScheme = response.scheme;
+              if (savedScheme) {
+                if (typeof savedScheme.itemsOrder === 'string') {
+                  savedScheme.itemsOrder = JSON.parse(savedScheme.itemsOrder);
+                }
+                if (typeof savedScheme.hiddenFields === 'string') {
+                  savedScheme.hiddenFields = JSON.parse(savedScheme.hiddenFields);
+                }
+                if (typeof savedScheme.formValues === 'string') {
+                  savedScheme.formValues = JSON.parse(savedScheme.formValues);
+                }
+              }
+              this.log('保存成功', savedScheme);
+              return _context5.abrupt("return", savedScheme);
+            case 15:
+              _context5.prev = 15;
               _context5.t0 = _context5["catch"](0);
               console.error('[BackendApiAdapter] 保存查询方案失败:', _context5.t0);
               message.error('保存查询方案失败');
               throw _context5.t0;
-            case 17:
+            case 20:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[0, 12]]);
+        }, _callee5, this, [[0, 15]]);
       }));
       function saveQueryScheme(_x6, _x7) {
         return _saveQueryScheme.apply(this, arguments);