@nokecy/qc-ui 1.0.87 → 1.0.89

package/dist/esm/ag-grid-plus/schemes/hooks/useColumnSchemes.js

@@ -1,8 +1,11 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["activate"];
 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."); }
 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 _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 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; }
@@ -331,7 +334,7 @@ export function useColumnSchemes(config) {
    */
   var createScheme = useCallback( /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(name, columnConfig, options) {
-      var nameValidation, uniqueName, newScheme, updatedSchemes;
+      var nameValidation, uniqueName, _ref6, activate, schemeOptions, newScheme, updatedSchemes;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -350,14 +353,15 @@ export function useColumnSchemes(config) {
             throw new Error("\u65B9\u6848\u6570\u91CF\u5DF2\u8FBE\u4E0A\u9650\uFF08".concat(MAX_SCHEMES_PER_GRID, "\u4E2A\uFF09\uFF0C\u8BF7\u5220\u9664\u4E00\u4E9B\u65B9\u6848\u540E\u518D\u8BD5"));
           case 5:
             // 处理重名情况
-            uniqueName = checkDuplicateName(name, schemes) ? generateUniqueName(name, schemes) : name;
+            uniqueName = checkDuplicateName(name, schemes) ? generateUniqueName(name, schemes) : name; // 提取 activate 选项
+            _ref6 = options || {}, activate = _ref6.activate, schemeOptions = _objectWithoutProperties(_ref6, _excluded);
             newScheme = _objectSpread({
               id: uuidv4(),
               name: uniqueName,
               createdAt: Date.now(),
               updatedAt: Date.now(),
               columnConfig: columnConfig
-            }, options); // 如果设置为默认方案，取消其他方案的默认标记
+            }, schemeOptions); // 如果设置为默认方案，取消其他方案的默认标记
             updatedSchemes = schemes;
             if (newScheme.isDefault) {
               updatedSchemes = schemes.map(function (s) {
@@ -367,27 +371,52 @@ export function useColumnSchemes(config) {
               });
             }
             updatedSchemes = [].concat(_toConsumableArray(updatedSchemes), [newScheme]);
-            _context5.next = 12;
+            _context5.next = 13;
             return saveSchemesToStorage(updatedSchemes);
-          case 12:
+          case 13:
+            if (!activate) {
+              _context5.next = 26;
+              break;
+            }
+            setCurrentScheme(newScheme);
+            setIsDirty(false);
+
+            // 保存当前方案ID
+            if (!storageAdapter.saveCurrentSchemeId) {
+              _context5.next = 25;
+              break;
+            }
+            _context5.prev = 17;
+            _context5.next = 20;
+            return storageAdapter.saveCurrentSchemeId(gridId, newScheme.id);
+          case 20:
+            _context5.next = 25;
+            break;
+          case 22:
+            _context5.prev = 22;
+            _context5.t0 = _context5["catch"](17);
+            console.error('[useColumnSchemes] 保存当前方案ID失败:', _context5.t0);
+          case 25:
+            onSchemeChange === null || onSchemeChange === void 0 || onSchemeChange(newScheme);
+          case 26:
             onSchemeSave === null || onSchemeSave === void 0 || onSchemeSave(newScheme);
             return _context5.abrupt("return", newScheme);
-          case 14:
+          case 28:
           case "end":
             return _context5.stop();
         }
-      }, _callee5);
+      }, _callee5, null, [[17, 22]]);
     }));
     return function (_x4, _x5, _x6) {
       return _ref5.apply(this, arguments);
     };
-  }(), [schemes, saveSchemesToStorage, onSchemeSave]);
+  }(), [schemes, gridId, storageAdapter, saveSchemesToStorage, onSchemeChange, onSchemeSave]);
 
   /**
    * 更新方案信息（不影响 columnState）
    */
   var updateScheme = useCallback( /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(schemeId, updates) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(schemeId, updates) {
       var scheme, nameValidation, updatedScheme, updatedSchemes;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
@@ -451,7 +480,7 @@ export function useColumnSchemes(config) {
       }, _callee6);
     }));
     return function (_x7, _x8) {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }(), [schemes, currentScheme, saveSchemesToStorage]);
 
@@ -459,7 +488,7 @@ export function useColumnSchemes(config) {
    * 删除方案
    */
   var deleteScheme = useCallback( /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(schemeId) {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(schemeId) {
       var scheme, updatedSchemes;
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
@@ -518,7 +547,7 @@ export function useColumnSchemes(config) {
       }, _callee7, null, [[12, 17]]);
     }));
     return function (_x9) {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }(), [schemes, currentScheme, gridId, storageAdapter, saveSchemesToStorage, onSchemeChange, onSchemeDelete]);
 
@@ -537,7 +566,7 @@ export function useColumnSchemes(config) {
    * 设置默认方案
    */
   var setDefaultScheme = useCallback( /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(schemeId) {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(schemeId) {
       var updatedSchemes;
       return _regeneratorRuntime().wrap(function _callee8$(_context8) {
         while (1) switch (_context8.prev = _context8.next) {
@@ -556,7 +585,7 @@ export function useColumnSchemes(config) {
       }, _callee8);
     }));
     return function (_x10) {
-      return _ref8.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }(), [schemes, saveSchemesToStorage]);
 

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

@@ -109,7 +109,9 @@ export interface UseColumnSchemesReturn {
     /** 保存当前方案（更新现有方案） */
     saveScheme: (updates?: Partial<ColumnScheme>) => Promise<void>;
     /** 创建新方案 */
-    createScheme: (name: string, columnConfig: FlatColumnItem[], options?: Partial<ColumnScheme>) => Promise<ColumnScheme>;
+    createScheme: (name: string, columnConfig: FlatColumnItem[], options?: Partial<ColumnScheme> & {
+        activate?: boolean;
+    }) => Promise<ColumnScheme>;
     /** 更新方案信息（不影响 columnConfig） */
     updateScheme: (schemeId: string, updates: Partial<Omit<ColumnScheme, 'id' | 'columnConfig'>>) => Promise<void>;
     /** 删除方案 */

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

@@ -245,7 +245,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
                   if (!(schemeManager && gridKey)) {
-                    _context.next = 29;
+                    _context.next = 27;
                     break;
                   }
                   _context.prev = 1;
@@ -278,7 +278,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
                     filterModel: filterModel
                   });
                 case 8:
-                  _context.next = 24;
+                  _context.next = 22;
                   break;
                 case 10:
                   // 如果没有激活的方案，查找或创建"默认配置"方案
@@ -299,7 +299,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
                     filterModel: filterModel
                   });
                 case 16:
-                  _context.next = 24;
+                  _context.next = 22;
                   break;
                 case 18:
                   _context.next = 20;
@@ -308,33 +308,29 @@ var ColumnSetting = function ColumnSetting(_ref) {
                   {
                     isDefault: true,
                     description: '自动保存的默认列配置',
-                    filterModel: filterModel
+                    filterModel: filterModel,
+                    activate: true // 立即激活该方案
                   });
                 case 20:
                   newScheme = _context.sent;
-                  console.log('[ColumnSetting] 创建默认方案成功,准备应用:', {
+                  console.log('[ColumnSetting] 创建默认方案成功并已激活:', {
                     schemeId: newScheme.id,
                     schemeName: newScheme.name,
                     hasColumnConfig: !!newScheme.columnConfig,
                     columnConfigLength: ((_newScheme$columnConf = newScheme.columnConfig) === null || _newScheme$columnConf === void 0 ? void 0 : _newScheme$columnConf.length) || 0
                   });
-
-                  // 【修复】直接加载方案,确保立即应用
-                  // loadScheme 会设置 currentScheme 并触发 onSchemeChange
-                  _context.next = 24;
-                  return schemeManager.loadScheme(newScheme.id);
-                case 24:
-                  _context.next = 29;
+                case 22:
+                  _context.next = 27;
                   break;
-                case 26:
-                  _context.prev = 26;
+                case 24:
+                  _context.prev = 24;
                   _context.t0 = _context["catch"](1);
                   console.error('[ColumnSetting] 保存列配置到方案失败:', _context.t0);
-                case 29:
+                case 27:
                 case "end":
                   return _context.stop();
               }
-            }, _callee, null, [[1, 26]]);
+            }, _callee, null, [[1, 24]]);
           })), 50);
 
           // 保存成功后清除备份

package/dist/esm/standardFormDialog/withStandardForm.d.ts

@@ -173,7 +173,7 @@ export declare const createSelectField: (title: string, options: {
 export declare const createCascaderField: (title: string, options: any[], config?: {
     required?: boolean | undefined;
     changeOnSelect?: boolean | undefined;
-    expandTrigger?: "click" | "hover" | undefined;
+    expandTrigger?: "hover" | "click" | undefined;
     placeholder?: string | undefined;
 }) => {
     type: string;
@@ -187,7 +187,7 @@ export declare const createCascaderField: (title: string, options: any[], config
         };
         options: any[];
         changeOnSelect: boolean;
-        expandTrigger: "click" | "hover";
+        expandTrigger: "hover" | "click";
     };
 };
 export default withStandardForm;