@nokecy/qc-ui 1.0.94 → 1.0.95

package/dist/cjs/ag-grid-plus/setting/QuerySchemeManager.d.ts

@@ -0,0 +1,11 @@
+import React from 'react';
+interface QuerySchemeManagerProps {
+    gridKey: string;
+    visible: boolean;
+    onClose: () => void;
+}
+/**
+ * 查询方案管理组件
+ */
+declare const QuerySchemeManager: React.FC<QuerySchemeManagerProps>;
+export default QuerySchemeManager;

package/dist/cjs/ag-grid-plus/{querySchemes/components/QuerySchemesManager.js → setting/QuerySchemeManager.js}

@@ -4,18 +4,26 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.QuerySchemesManager = void 0;
+exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
-var _draggableModal = _interopRequireDefault(require("../../../draggableModal"));
+var _draggableModal = _interopRequireDefault(require("../../draggableModal"));
 var _icons = require("@ant-design/icons");
 var _reactDnd = require("react-dnd");
 var _reactDndHtml5Backend = require("react-dnd-html5-backend");
-require("./QuerySchemesManager.less");
+var _useSchemeManager = require("../context/useSchemeManager");
+var _gridContext = require("../context/gridContext");
+var _uuid = require("uuid");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+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; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -80,7 +88,6 @@ var DraggableQueryItem = function DraggableQueryItem(_ref) {
   preview(ref);
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: ref,
-    className: "query-item-draggable",
     style: {
       opacity: isDragging ? 0.5 : hidden ? 0.6 : 1,
       padding: '12px 16px',
@@ -122,28 +129,30 @@ var DraggableQueryItem = function DraggableQueryItem(_ref) {
 /**
  * 查询方案管理组件
  */
-var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesManager(_ref2) {
-  var schemeManager = _ref2.schemeManager,
-    formItems = _ref2.formItems,
-    currentOrder = _ref2.currentOrder,
+var QuerySchemeManager = function QuerySchemeManager(_ref2) {
+  var gridKey = _ref2.gridKey,
     visible = _ref2.visible,
-    onClose = _ref2.onClose,
-    onOrderChange = _ref2.onOrderChange;
-  // 调试日志
-  console.log('[QuerySchemesManager] Props:', {
-    formItems: formItems,
-    formItemsLength: formItems === null || formItems === void 0 ? void 0 : formItems.length,
-    currentOrder: currentOrder,
-    visible: visible
+    onClose = _ref2.onClose;
+  // 获取方案管理 API
+  var _useGridSchemes = (0, _useSchemeManager.useGridSchemes)(),
+    querySchemes = _useGridSchemes.querySchemes,
+    currentSchemes = _useGridSchemes.currentSchemes,
+    saveQueryScheme = _useGridSchemes.saveQueryScheme,
+    deleteQueryScheme = _useGridSchemes.deleteQueryScheme,
+    setCurrentQueryScheme = _useGridSchemes.setCurrentQueryScheme;
+
+  // 从 Context 获取查询表单项和当前顺序
+  var _React$useContext = _react.default.useContext(_gridContext.GridPlusContext),
+    queryFormItems = _React$useContext.queryFormItems,
+    currentQueryOrder = _React$useContext.currentQueryOrder,
+    updateQueryOrder = _React$useContext.updateQueryOrder;
+
+  // 获取当前表格的查询方案列表
+  var schemes = (querySchemes === null || querySchemes === void 0 ? void 0 : querySchemes[gridKey]) || [];
+  var currentScheme = schemes.find(function (s) {
+    var _currentSchemes$gridK;
+    return s.id === (currentSchemes === null || currentSchemes === void 0 || (_currentSchemes$gridK = currentSchemes[gridKey]) === null || _currentSchemes$gridK === void 0 ? void 0 : _currentSchemes$gridK.querySchemeId);
   });
-  var schemes = schemeManager.schemes,
-    currentScheme = schemeManager.currentScheme,
-    deleteScheme = schemeManager.deleteScheme,
-    updateScheme = schemeManager.updateScheme,
-    setDefaultScheme = schemeManager.setDefaultScheme,
-    loadScheme = schemeManager.loadScheme,
-    createScheme = schemeManager.createScheme,
-    saveScheme = schemeManager.saveScheme;
   var _useState = (0, _react.useState)('order'),
     _useState2 = _slicedToArray(_useState, 2),
     activeTab = _useState2[0],
@@ -176,33 +185,31 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
   // 初始化编辑顺序和隐藏字段
   _react.default.useEffect(function () {
     if (visible) {
-      // 如果有当前顺序，使用当前顺序
-      if (currentOrder && currentOrder.length > 0) {
-        setEditingOrder(_toConsumableArray(currentOrder));
-      } else {
-        // 否则根据 formItems 的 order 属性生成默认顺序
-        var defaultOrder = _toConsumableArray(formItems).sort(function (a, b) {
-          return (a.order || 999) - (b.order || 999);
-        }).map(function (item) {
+      // 使用当前顺序或从 queryFormItems 生成默认顺序
+      if (currentQueryOrder && currentQueryOrder.length > 0) {
+        setEditingOrder(_toConsumableArray(currentQueryOrder));
+      } else if (queryFormItems && queryFormItems.length > 0) {
+        var defaultOrder = queryFormItems.map(function (item) {
           return item.field;
         });
         setEditingOrder(defaultOrder);
-        console.log('[QuerySchemesManager] 使用默认顺序:', defaultOrder);
       }
 
       // 初始化隐藏字段
       setHiddenFields((currentScheme === null || currentScheme === void 0 ? void 0 : currentScheme.hiddenFields) || []);
     }
-  }, [visible, currentOrder, formItems, currentScheme]);
+  }, [visible, currentQueryOrder, queryFormItems, currentScheme]);
 
   // 构建字段标签映射
   var fieldLabelMap = (0, _react.useMemo)(function () {
     var map = new Map();
-    formItems.forEach(function (item) {
-      map.set(item.field, item.headerName || item.field);
-    });
+    if (queryFormItems) {
+      queryFormItems.forEach(function (item) {
+        map.set(item.field, item.headerName || item.field);
+      });
+    }
     return map;
-  }, [formItems]);
+  }, [queryFormItems]);
 
   /**
    * 拖拽移动项目
@@ -224,10 +231,8 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
   var handleToggleHidden = (0, _react.useCallback)(function (field, hidden) {
     setHiddenFields(function (prev) {
       if (hidden) {
-        // 添加到隐藏列表
         return [].concat(_toConsumableArray(prev), [field]);
       } else {
-        // 从隐藏列表移除
         return prev.filter(function (f) {
           return f !== field;
         });
@@ -239,6 +244,7 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
    * 应用当前顺序和隐藏设置
    */
   var handleApplyOrder = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var newScheme;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -248,44 +254,58 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
             break;
           }
           _context.next = 4;
-          return saveScheme({
+          return saveQueryScheme === null || saveQueryScheme === void 0 ? void 0 : saveQueryScheme(gridKey, _objectSpread(_objectSpread({}, currentScheme), {}, {
             itemsOrder: editingOrder,
-            hiddenFields: hiddenFields
-          });
+            hiddenFields: hiddenFields,
+            updatedAt: Date.now()
+          }));
         case 4:
           _antd.message.success('已应用新配置');
-          _context.next = 10;
+          _context.next = 13;
           break;
         case 7:
-          _context.next = 9;
-          return createScheme('默认方案', editingOrder, {
-            hiddenFields: hiddenFields
-          });
-        case 9:
-          _antd.message.success('已自动创建并应用默认方案');
+          // 创建新方案
+          newScheme = {
+            id: (0, _uuid.v4)(),
+            name: '默认方案',
+            description: '自动创建的默认查询方案',
+            itemsOrder: editingOrder,
+            hiddenFields: hiddenFields,
+            formValues: {},
+            isDefault: true,
+            isSystem: false,
+            createdAt: Date.now(),
+            updatedAt: Date.now()
+          };
+          _context.next = 10;
+          return saveQueryScheme === null || saveQueryScheme === void 0 ? void 0 : saveQueryScheme(gridKey, newScheme);
         case 10:
+          _context.next = 12;
+          return setCurrentQueryScheme === null || setCurrentQueryScheme === void 0 ? void 0 : setCurrentQueryScheme(gridKey, newScheme.id);
+        case 12:
+          _antd.message.success('已自动创建并应用默认方案');
+        case 13:
           // 应用顺序到表单
-          onOrderChange(editingOrder);
-
-          // 关闭弹窗,让用户看到效果
+          updateQueryOrder === null || updateQueryOrder === void 0 || updateQueryOrder(editingOrder);
           onClose();
-          _context.next = 17;
+          _context.next = 20;
           break;
-        case 14:
-          _context.prev = 14;
+        case 17:
+          _context.prev = 17;
           _context.t0 = _context["catch"](0);
           _antd.message.error(_context.t0.message || '应用失败');
-        case 17:
+        case 20:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0, 14]]);
-  })), [editingOrder, hiddenFields, onOrderChange, currentScheme, saveScheme, createScheme, onClose]);
+    }, _callee, null, [[0, 17]]);
+  })), [editingOrder, hiddenFields, currentScheme, saveQueryScheme, gridKey, updateQueryOrder, onClose, setCurrentQueryScheme]);
 
   /**
    * 保存为新方案
    */
   var handleSaveAsNew = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var newScheme;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -297,25 +317,35 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
           return _context2.abrupt("return");
         case 3:
           _context2.prev = 3;
-          _context2.next = 6;
-          return createScheme(schemeName, editingOrder, {
-            hiddenFields: hiddenFields
-          });
-        case 6:
+          newScheme = {
+            id: (0, _uuid.v4)(),
+            name: schemeName.trim(),
+            description: '',
+            itemsOrder: editingOrder,
+            hiddenFields: hiddenFields,
+            formValues: {},
+            isDefault: false,
+            isSystem: false,
+            createdAt: Date.now(),
+            updatedAt: Date.now()
+          };
+          _context2.next = 7;
+          return saveQueryScheme === null || saveQueryScheme === void 0 ? void 0 : saveQueryScheme(gridKey, newScheme);
+        case 7:
           _antd.message.success('保存成功');
           setSchemeName('');
-          _context2.next = 13;
+          _context2.next = 14;
           break;
-        case 10:
-          _context2.prev = 10;
+        case 11:
+          _context2.prev = 11;
           _context2.t0 = _context2["catch"](3);
           _antd.message.error(_context2.t0.message || '保存失败');
-        case 13:
+        case 14:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[3, 10]]);
-  })), [schemeName, editingOrder, hiddenFields, createScheme]);
+    }, _callee2, null, [[3, 11]]);
+  })), [schemeName, editingOrder, hiddenFields, saveQueryScheme, gridKey]);
 
   /**
    * 开始编辑方案
@@ -330,6 +360,7 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
    * 保存编辑
    */
   var handleSaveEdit = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var scheme;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -340,26 +371,36 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
           return _context3.abrupt("return");
         case 2:
           _context3.prev = 2;
-          _context3.next = 5;
-          return updateScheme(editingId, {
-            name: editingName.trim(),
-            description: editingDescription.trim() || undefined
+          scheme = schemes.find(function (s) {
+            return s.id === editingId;
           });
-        case 5:
+          if (scheme) {
+            _context3.next = 6;
+            break;
+          }
+          return _context3.abrupt("return");
+        case 6:
+          _context3.next = 8;
+          return saveQueryScheme === null || saveQueryScheme === void 0 ? void 0 : saveQueryScheme(gridKey, _objectSpread(_objectSpread({}, scheme), {}, {
+            name: editingName.trim(),
+            description: editingDescription.trim() || undefined,
+            updatedAt: Date.now()
+          }));
+        case 8:
           _antd.message.success('更新成功');
           setEditingId(null);
-          _context3.next = 12;
+          _context3.next = 15;
           break;
-        case 9:
-          _context3.prev = 9;
+        case 12:
+          _context3.prev = 12;
           _context3.t0 = _context3["catch"](2);
           _antd.message.error(_context3.t0.message || '更新失败');
-        case 12:
+        case 15:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[2, 9]]);
-  })), [editingId, editingName, editingDescription, updateScheme]);
+    }, _callee3, null, [[2, 12]]);
+  })), [editingId, editingName, editingDescription, schemes, saveQueryScheme, gridKey]);
 
   /**
    * 取消编辑
@@ -380,7 +421,7 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
           case 0:
             _context4.prev = 0;
             _context4.next = 3;
-            return deleteScheme(schemeId);
+            return deleteQueryScheme === null || deleteQueryScheme === void 0 ? void 0 : deleteQueryScheme(gridKey, schemeId);
           case 3:
             _antd.message.success("\u65B9\u6848\"".concat(schemeName, "\"\u5DF2\u5220\u9664"));
             _context4.next = 9;
@@ -398,37 +439,84 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
     return function (_x, _x2) {
       return _ref6.apply(this, arguments);
     };
-  }(), [deleteScheme]);
+  }(), [deleteQueryScheme, gridKey]);
 
   /**
    * 设置为默认方案
    */
   var handleSetDefault = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(schemeId, schemeName) {
+      var _iterator, _step, _scheme, scheme;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
             _context5.prev = 0;
-            _context5.next = 3;
-            return setDefaultScheme(schemeId);
-          case 3:
-            _antd.message.success("\u5DF2\u5C06\"".concat(schemeName, "\"\u8BBE\u4E3A\u9ED8\u8BA4\u65B9\u6848"));
+            // 清除所有方案的 isDefault 标记
+            _iterator = _createForOfIteratorHelper(schemes);
+            _context5.prev = 2;
+            _iterator.s();
+          case 4:
+            if ((_step = _iterator.n()).done) {
+              _context5.next = 11;
+              break;
+            }
+            _scheme = _step.value;
+            if (!(_scheme.isDefault && _scheme.id !== schemeId)) {
+              _context5.next = 9;
+              break;
+            }
             _context5.next = 9;
-            break;
-          case 6:
-            _context5.prev = 6;
-            _context5.t0 = _context5["catch"](0);
-            _antd.message.error(_context5.t0.message || '设置失败');
+            return saveQueryScheme === null || saveQueryScheme === void 0 ? void 0 : saveQueryScheme(gridKey, _objectSpread(_objectSpread({}, _scheme), {}, {
+              isDefault: false,
+              updatedAt: Date.now()
+            }));
           case 9:
+            _context5.next = 4;
+            break;
+          case 11:
+            _context5.next = 16;
+            break;
+          case 13:
+            _context5.prev = 13;
+            _context5.t0 = _context5["catch"](2);
+            _iterator.e(_context5.t0);
+          case 16:
+            _context5.prev = 16;
+            _iterator.f();
+            return _context5.finish(16);
+          case 19:
+            // 设置新的默认方案
+            scheme = schemes.find(function (s) {
+              return s.id === schemeId;
+            });
+            if (!scheme) {
+              _context5.next = 24;
+              break;
+            }
+            _context5.next = 23;
+            return saveQueryScheme === null || saveQueryScheme === void 0 ? void 0 : saveQueryScheme(gridKey, _objectSpread(_objectSpread({}, scheme), {}, {
+              isDefault: true,
+              updatedAt: Date.now()
+            }));
+          case 23:
+            _antd.message.success("\u5DF2\u5C06\"".concat(schemeName, "\"\u8BBE\u4E3A\u9ED8\u8BA4\u65B9\u6848"));
+          case 24:
+            _context5.next = 29;
+            break;
+          case 26:
+            _context5.prev = 26;
+            _context5.t1 = _context5["catch"](0);
+            _antd.message.error(_context5.t1.message || '设置失败');
+          case 29:
           case "end":
             return _context5.stop();
         }
-      }, _callee5, null, [[0, 6]]);
+      }, _callee5, null, [[0, 26], [2, 13, 16, 19]]);
     }));
     return function (_x3, _x4) {
       return _ref7.apply(this, arguments);
     };
-  }(), [setDefaultScheme]);
+  }(), [schemes, saveQueryScheme, gridKey]);
 
   /**
    * 应用方案
@@ -441,13 +529,13 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
           case 0:
             _context6.prev = 0;
             _context6.next = 3;
-            return loadScheme(schemeId);
+            return setCurrentQueryScheme === null || setCurrentQueryScheme === void 0 ? void 0 : setCurrentQueryScheme(gridKey, schemeId);
           case 3:
             scheme = schemes.find(function (s) {
               return s.id === schemeId;
             });
-            if (scheme) {
-              onOrderChange(scheme.itemsOrder);
+            if (scheme && scheme.itemsOrder) {
+              updateQueryOrder === null || updateQueryOrder === void 0 || updateQueryOrder(scheme.itemsOrder);
               _antd.message.success('方案已应用');
             }
             _context6.next = 10;
@@ -465,7 +553,7 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
     return function (_x5) {
       return _ref8.apply(this, arguments);
     };
-  }(), [loadScheme, schemes, onOrderChange]);
+  }(), [setCurrentQueryScheme, gridKey, schemes, updateQueryOrder]);
   return /*#__PURE__*/_react.default.createElement(_draggableModal.default, {
     title: /*#__PURE__*/_react.default.createElement("span", null, "\u67E5\u8BE2\u65B9\u6848\u8BBE\u7F6E", currentScheme && /*#__PURE__*/_react.default.createElement("span", {
       style: {
@@ -482,16 +570,14 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
       key: "close",
       onClick: onClose
     }, "\u5173\u95ED")],
-    className: "query-schemes-manager-modal"
+    destroyOnClose: true
   }, /*#__PURE__*/_react.default.createElement(_antd.Tabs, {
     activeKey: activeTab,
     onChange: setActiveTab,
     items: [{
       key: 'order',
       label: '调整顺序',
-      children: /*#__PURE__*/_react.default.createElement("div", {
-        className: "query-order-editor"
-      }, /*#__PURE__*/_react.default.createElement("div", {
+      children: /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("div", {
         style: {
           marginBottom: 16,
           padding: '12px 16px',
@@ -516,16 +602,13 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
           color: '#666'
         }
       }, "\u672A\u9009\u62E9\u65B9\u6848 - \u4F7F\u7528\u4E34\u65F6\u914D\u7F6E")), /*#__PURE__*/_react.default.createElement("div", {
-        className: "query-order-tips",
         style: {
           marginBottom: 16,
           color: '#666'
         }
       }, "\u62D6\u62FD\u4E0B\u65B9\u67E5\u8BE2\u9879\u8C03\u6574\u987A\u5E8F\uFF0C\u4F7F\u7528\u5F00\u5173\u63A7\u5236\u663E\u793A/\u9690\u85CF\uFF0C\u5B8C\u6210\u540E\u53EF\u5E94\u7528\u6216\u4FDD\u5B58\u4E3A\u65B9\u6848"), /*#__PURE__*/_react.default.createElement(_reactDnd.DndProvider, {
         backend: _reactDndHtml5Backend.HTML5Backend
-      }, /*#__PURE__*/_react.default.createElement("div", {
-        className: "query-items-container"
-      }, editingOrder.map(function (field, index) {
+      }, /*#__PURE__*/_react.default.createElement("div", null, editingOrder.map(function (field, index) {
         return /*#__PURE__*/_react.default.createElement(DraggableQueryItem, {
           key: field,
           field: field,
@@ -563,6 +646,7 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
       children: /*#__PURE__*/_react.default.createElement(_antd.List, {
         dataSource: schemes,
         renderItem: function renderItem(scheme) {
+          var _scheme$itemsOrder;
           return /*#__PURE__*/_react.default.createElement(_antd.List.Item, {
             actions: [/*#__PURE__*/_react.default.createElement(_antd.Button, {
               key: "apply",
@@ -650,10 +734,11 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
             }, "\u5F53\u524D"), scheme.isSystem && /*#__PURE__*/_react.default.createElement(_antd.Tag, {
               color: "default"
             }, "\u7CFB\u7EDF")),
-            description: scheme.description || "".concat(scheme.itemsOrder.length, " \u4E2A\u67E5\u8BE2\u9879")
+            description: scheme.description || "".concat(((_scheme$itemsOrder = scheme.itemsOrder) === null || _scheme$itemsOrder === void 0 ? void 0 : _scheme$itemsOrder.length) || 0, " \u4E2A\u67E5\u8BE2\u9879")
           }));
         }
       })
     }]
   }));
-};
+};
+var _default = exports.default = QuerySchemeManager;

package/dist/cjs/ag-grid-plus/setting/index.d.ts

@@ -4,8 +4,8 @@ declare const Setting: (props: {
     gridKey?: string | undefined;
     gridApi?: GridApi<any> | undefined;
     gridApiState?: GridApi<any> | undefined;
-    type?: string | undefined;
+    allColDefs?: any[] | undefined;
     onSaveColumnState?: ((state: any) => void) | undefined;
-    schemeManager?: any;
+    showQueryScheme?: boolean | undefined;
 }) => React.JSX.Element | null;
 export default Setting;