@nokecy/qc-ui 1.0.81 → 1.0.82

package/dist/esm/ag-grid-plus/querySchemes/components/QuerySchemesManager.js

@@ -188,76 +188,104 @@ export var QuerySchemesManager = function QuerySchemesManager(_ref2) {
   /**
    * 应用当前顺序
    */
-  var handleApplyOrder = useCallback(function () {
-    onOrderChange(editingOrder);
-    message.success('已应用新顺序');
-  }, [editingOrder, onOrderChange]);
+  var handleApplyOrder = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.prev = 0;
+          if (!currentScheme) {
+            _context.next = 4;
+            break;
+          }
+          _context.next = 4;
+          return saveScheme({
+            itemsOrder: editingOrder
+          });
+        case 4:
+          // 应用顺序到表单
+          onOrderChange(editingOrder);
+          message.success('已应用新顺序');
+
+          // 关闭弹窗,让用户看到效果
+          onClose();
+          _context.next = 12;
+          break;
+        case 9:
+          _context.prev = 9;
+          _context.t0 = _context["catch"](0);
+          message.error(_context.t0.message || '应用失败');
+        case 12:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[0, 9]]);
+  })), [editingOrder, onOrderChange, currentScheme, saveScheme, onClose]);
 
   /**
    * 保存为新方案
    */
-  var handleSaveAsNew = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+  var handleSaveAsNew = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
         case 0:
           if (schemeName.trim()) {
-            _context.next = 3;
+            _context2.next = 3;
             break;
           }
           message.warning('请输入方案名称');
-          return _context.abrupt("return");
+          return _context2.abrupt("return");
         case 3:
-          _context.prev = 3;
-          _context.next = 6;
+          _context2.prev = 3;
+          _context2.next = 6;
           return createScheme(schemeName, editingOrder);
         case 6:
           message.success('保存成功');
           setSchemeName('');
-          _context.next = 13;
+          _context2.next = 13;
           break;
         case 10:
-          _context.prev = 10;
-          _context.t0 = _context["catch"](3);
-          message.error(_context.t0.message || '保存失败');
+          _context2.prev = 10;
+          _context2.t0 = _context2["catch"](3);
+          message.error(_context2.t0.message || '保存失败');
         case 13:
         case "end":
-          return _context.stop();
+          return _context2.stop();
       }
-    }, _callee, null, [[3, 10]]);
+    }, _callee2, null, [[3, 10]]);
   })), [schemeName, editingOrder, createScheme]);
 
   /**
    * 更新当前方案
    */
-  var handleUpdateCurrent = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+  var handleUpdateCurrent = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
           if (currentScheme) {
-            _context2.next = 3;
+            _context3.next = 3;
             break;
           }
           message.warning('请先选择一个方案');
-          return _context2.abrupt("return");
+          return _context3.abrupt("return");
         case 3:
-          _context2.prev = 3;
-          _context2.next = 6;
+          _context3.prev = 3;
+          _context3.next = 6;
           return saveScheme({
             itemsOrder: editingOrder
           });
         case 6:
           message.success('更新成功');
-          _context2.next = 12;
+          _context3.next = 12;
           break;
         case 9:
-          _context2.prev = 9;
-          _context2.t0 = _context2["catch"](3);
-          message.error(_context2.t0.message || '更新失败');
+          _context3.prev = 9;
+          _context3.t0 = _context3["catch"](3);
+          message.error(_context3.t0.message || '更新失败');
         case 12:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2, null, [[3, 9]]);
+    }, _callee3, null, [[3, 9]]);
   })), [currentScheme, editingOrder, saveScheme]);
 
   /**
@@ -272,18 +300,18 @@ export var QuerySchemesManager = function QuerySchemesManager(_ref2) {
   /**
    * 保存编辑
    */
-  var handleSaveEdit = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+  var handleSaveEdit = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
         case 0:
           if (editingId) {
-            _context3.next = 2;
+            _context4.next = 2;
             break;
           }
-          return _context3.abrupt("return");
+          return _context4.abrupt("return");
         case 2:
-          _context3.prev = 2;
-          _context3.next = 5;
+          _context4.prev = 2;
+          _context4.next = 5;
           return updateScheme(editingId, {
             name: editingName.trim(),
             description: editingDescription.trim() || undefined
@@ -291,17 +319,17 @@ export var QuerySchemesManager = function QuerySchemesManager(_ref2) {
         case 5:
           message.success('更新成功');
           setEditingId(null);
-          _context3.next = 12;
+          _context4.next = 12;
           break;
         case 9:
-          _context3.prev = 9;
-          _context3.t0 = _context3["catch"](2);
-          message.error(_context3.t0.message || '更新失败');
+          _context4.prev = 9;
+          _context4.t0 = _context4["catch"](2);
+          message.error(_context4.t0.message || '更新失败');
         case 12:
         case "end":
-          return _context3.stop();
+          return _context4.stop();
       }
-    }, _callee3, null, [[2, 9]]);
+    }, _callee4, null, [[2, 9]]);
   })), [editingId, editingName, editingDescription, updateScheme]);
 
   /**
@@ -317,29 +345,29 @@ export var QuerySchemesManager = function QuerySchemesManager(_ref2) {
    * 删除方案
    */
   var handleDelete = useCallback( /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(schemeId, schemeName) {
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(schemeId, schemeName) {
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            _context4.prev = 0;
-            _context4.next = 3;
+            _context5.prev = 0;
+            _context5.next = 3;
             return deleteScheme(schemeId);
           case 3:
             message.success("\u65B9\u6848\"".concat(schemeName, "\"\u5DF2\u5220\u9664"));
-            _context4.next = 9;
+            _context5.next = 9;
             break;
           case 6:
-            _context4.prev = 6;
-            _context4.t0 = _context4["catch"](0);
-            message.error(_context4.t0.message || '删除失败');
+            _context5.prev = 6;
+            _context5.t0 = _context5["catch"](0);
+            message.error(_context5.t0.message || '删除失败');
           case 9:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4, null, [[0, 6]]);
+      }, _callee5, null, [[0, 6]]);
     }));
     return function (_x, _x2) {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }(), [deleteScheme]);
 
@@ -347,29 +375,29 @@ export var QuerySchemesManager = function QuerySchemesManager(_ref2) {
    * 设置为默认方案
    */
   var handleSetDefault = useCallback( /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(schemeId, schemeName) {
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(schemeId, schemeName) {
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
-            _context5.prev = 0;
-            _context5.next = 3;
+            _context6.prev = 0;
+            _context6.next = 3;
             return setDefaultScheme(schemeId);
           case 3:
             message.success("\u5DF2\u5C06\"".concat(schemeName, "\"\u8BBE\u4E3A\u9ED8\u8BA4\u65B9\u6848"));
-            _context5.next = 9;
+            _context6.next = 9;
             break;
           case 6:
-            _context5.prev = 6;
-            _context5.t0 = _context5["catch"](0);
-            message.error(_context5.t0.message || '设置失败');
+            _context6.prev = 6;
+            _context6.t0 = _context6["catch"](0);
+            message.error(_context6.t0.message || '设置失败');
           case 9:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
-      }, _callee5, null, [[0, 6]]);
+      }, _callee6, null, [[0, 6]]);
     }));
     return function (_x3, _x4) {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }(), [setDefaultScheme]);
 
@@ -377,13 +405,13 @@ export var QuerySchemesManager = function QuerySchemesManager(_ref2) {
    * 应用方案
    */
   var handleApply = useCallback( /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(schemeId) {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(schemeId) {
       var scheme;
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            _context6.prev = 0;
-            _context6.next = 3;
+            _context7.prev = 0;
+            _context7.next = 3;
             return loadScheme(schemeId);
           case 3:
             scheme = schemes.find(function (s) {
@@ -393,20 +421,20 @@ export var QuerySchemesManager = function QuerySchemesManager(_ref2) {
               onOrderChange(scheme.itemsOrder);
               message.success('方案已应用');
             }
-            _context6.next = 10;
+            _context7.next = 10;
             break;
           case 7:
-            _context6.prev = 7;
-            _context6.t0 = _context6["catch"](0);
-            message.error(_context6.t0.message || '应用失败');
+            _context7.prev = 7;
+            _context7.t0 = _context7["catch"](0);
+            message.error(_context7.t0.message || '应用失败');
           case 10:
           case "end":
-            return _context6.stop();
+            return _context7.stop();
         }
-      }, _callee6, null, [[0, 7]]);
+      }, _callee7, null, [[0, 7]]);
     }));
     return function (_x5) {
-      return _ref8.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }(), [loadScheme, schemes, onOrderChange]);
   return /*#__PURE__*/React.createElement(Modal, {
@@ -428,6 +456,30 @@ export var QuerySchemesManager = function QuerySchemesManager(_ref2) {
       children: /*#__PURE__*/React.createElement("div", {
         className: "query-order-editor"
       }, /*#__PURE__*/React.createElement("div", {
+        style: {
+          marginBottom: 16,
+          padding: '12px 16px',
+          background: currentScheme ? '#e6f7ff' : '#f5f5f5',
+          borderRadius: 4,
+          border: '1px solid',
+          borderColor: currentScheme ? '#91d5ff' : '#d9d9d9'
+        }
+      }, currentScheme ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+        style: {
+          fontWeight: 600,
+          marginBottom: 4,
+          color: '#1890ff'
+        }
+      }, "\u5F53\u524D\u65B9\u6848: ", currentScheme.name), currentScheme.description && /*#__PURE__*/React.createElement("div", {
+        style: {
+          fontSize: 12,
+          color: '#666'
+        }
+      }, currentScheme.description)) : /*#__PURE__*/React.createElement("div", {
+        style: {
+          color: '#666'
+        }
+      }, "\u672A\u9009\u62E9\u65B9\u6848 - \u4F7F\u7528\u4E34\u65F6\u914D\u7F6E")), /*#__PURE__*/React.createElement("div", {
         className: "query-order-tips",
         style: {
           marginBottom: 16,

package/dist/esm/ag-grid-plus/setting/ColumnSetting.d.ts

@@ -11,7 +11,7 @@ interface ColumnSettingProps {
     type?: string;
 }
 /**
- * 列设置组件 - 集成列配置和列方案管理
+ * 列方案管理组件 - 集成列配置和列方案管理
  */
 declare const ColumnSetting: React.FC<ColumnSettingProps>;
 export default ColumnSetting;

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

@@ -38,7 +38,7 @@ var SchemaField = createSchemaField({
 });
 
 /**
- * 列设置组件 - 集成列配置和列方案管理
+ * 列方案管理组件 - 集成列配置和列方案管理
  */
 var ColumnSetting = function ColumnSetting(_ref) {
   var gridKey = _ref.gridKey,
@@ -570,7 +570,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
     onRowDrag: true
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Modal, {
-    title: "\u5217\u8BBE\u7F6E",
+    title: "\u5217\u65B9\u6848\u7BA1\u7406",
     open: visible,
     onCancel: onClose,
     width: 1100,

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,8 +15,6 @@ 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;
   var querySchemeManager = gridPlusContext === null || gridPlusContext === void 0 ? void 0 : gridPlusContext.querySchemeManager;
@@ -43,14 +40,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,添加查询方案相关菜单项