@nokecy/qc-ui 1.0.35 → 1.0.37

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

@@ -11,6 +11,9 @@ var _core = require("@formily/core");
 var _react2 = _interopRequireWildcard(require("react"));
 var _icons = require("@ant-design/icons");
 var _arrayTable = _interopRequireDefault(require("../../array-table"));
+var _antd = require("antd");
+var _diySetting = _interopRequireDefault(require("./diySetting"));
+var _ = require("..");
 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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -28,6 +31,10 @@ var Setting = function Setting(props) {
     gridApi = props.gridApi,
     gridApiState = props.gridApiState,
     onSaveColumnState = props.onSaveColumnState;
+  var _useGridPlusColumnSta = (0, _.useGridPlusColumnState)(),
+    applyToGlobal = _useGridPlusColumnSta.applyToGlobal,
+    resetCurrent = _useGridPlusColumnSta.resetCurrent,
+    resetAll = _useGridPlusColumnSta.resetAll;
   var SchemaField = (0, _react2.useMemo)(function () {
     return (0, _react.createSchemaField)({
       components: {
@@ -77,8 +84,49 @@ var Setting = function Setting(props) {
   var tableProps = {
     onRowDrag: true
   };
+  var items = [{
+    key: '1',
+    label: /*#__PURE__*/_react2.default.createElement(_diySetting.default, {
+      gridKey: gridKey,
+      gridApi: gridApi,
+      onSaveColumnState: onSaveColumnState
+    })
+  }, {
+    key: '2',
+    label: /*#__PURE__*/_react2.default.createElement("a", {
+      target: "_blank",
+      rel: "noopener noreferrer",
+      onClick: function onClick() {
+        applyToGlobal(gridKey);
+      }
+    }, "\u5E94\u7528\u5230\u5168\u5C40")
+  }, {
+    key: '3',
+    label: /*#__PURE__*/_react2.default.createElement("a", {
+      target: "_blank",
+      rel: "noopener noreferrer",
+      onClick: function onClick() {
+        resetCurrent(gridKey);
+      }
+    }, "\u6062\u590D\u9ED8\u8BA4")
+  }, {
+    key: '3',
+    label: /*#__PURE__*/_react2.default.createElement("a", {
+      target: "_blank",
+      rel: "noopener noreferrer",
+      onClick: function onClick() {
+        resetAll();
+      }
+    }, "\u5168\u5C40\u6062\u590D\u9ED8\u8BA4")
+  }];
   return /*#__PURE__*/_react2.default.createElement(_antdV.FormDialog.Portal, {
     id: portalId
+  }, /*#__PURE__*/_react2.default.createElement(_antd.Dropdown, {
+    menu: {
+      items: items
+    },
+    placement: "bottomRight",
+    trigger: ['click']
   }, /*#__PURE__*/_react2.default.createElement("div", {
     style: {
       margin: "0 4px",
@@ -87,160 +135,14 @@ var Setting = function Setting(props) {
       cursor: "pointer"
     },
     onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var formDialog;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            formDialog = (0, _antdV.FormDialog)({
-              title: "个性化设置",
-              width: 960
-            }, portalId, function () {
-              return /*#__PURE__*/_react2.default.createElement(_antdV.FormLayout, null, /*#__PURE__*/_react2.default.createElement(SchemaField, null, /*#__PURE__*/_react2.default.createElement(SchemaField.Void, {
-                "x-component": "FormGrid",
-                "x-component-props": {
-                  maxColumns: [1, 3],
-                  strictAutoFit: true
-                }
-              }, /*#__PURE__*/_react2.default.createElement(SchemaField.Array, {
-                name: "items",
-                title: "",
-                "x-component": "ArrayTable",
-                "x-component-props": tableProps,
-                "x-validator": [{
-                  message: ""
-                }],
-                "x-decorator": "FormItem",
-                "x-decorator-props": {
-                  gridSpan: 3
-                }
-              }, /*#__PURE__*/_react2.default.createElement(SchemaField.Object, null, /*#__PURE__*/_react2.default.createElement(SchemaField.Void, {
-                "x-component": "ArrayTable.Column",
-                "x-component-props": {
-                  width: 80,
-                  title: "排序"
-                }
-              }, /*#__PURE__*/_react2.default.createElement(SchemaField.Void, {
-                "x-decorator": "FormItem",
-                required: true,
-                "x-component": "ArrayTable.SortHandle"
-              })), /*#__PURE__*/_react2.default.createElement(SchemaField.Void, {
-                "x-component": "ArrayTable.Column",
-                "x-component-props": {
-                  width: 280,
-                  title: "列名"
-                }
-              }, /*#__PURE__*/_react2.default.createElement(SchemaField.String, {
-                name: "headerName",
-                "x-decorator": "FormItem",
-                "x-component": "Input",
-                "x-read-pretty": true
-              })), /*#__PURE__*/_react2.default.createElement(SchemaField.Void, {
-                "x-component": "ArrayTable.Column",
-                "x-component-props": {
-                  width: 80,
-                  title: "列过滤"
-                }
-              }, /*#__PURE__*/_react2.default.createElement(SchemaField.String, {
-                name: "suppressHeaderFilterButton",
-                "x-decorator": "FormItem",
-                "x-component": "Switch"
-              })), /*#__PURE__*/_react2.default.createElement(SchemaField.Void, {
-                "x-component": "ArrayTable.Column",
-                "x-component-props": {
-                  width: 120,
-                  title: '内容布局'
-                }
-              }, /*#__PURE__*/_react2.default.createElement(SchemaField.String, {
-                name: "cellClass",
-                "x-decorator": "FormItem",
-                "x-component": "Select",
-                default: "custom-cell-left",
-                enum: [{
-                  value: "custom-cell-left",
-                  label: "左对齐"
-                }, {
-                  value: "custom-cell-right",
-                  label: "右对齐"
-                }, {
-                  value: 'custom-cell-centered',
-                  label: "居中对齐"
-                }]
-              })), /*#__PURE__*/_react2.default.createElement(SchemaField.Void, {
-                "x-component": "ArrayTable.Column",
-                "x-component-props": {
-                  width: 100,
-                  title: "宽度"
-                }
-              }, /*#__PURE__*/_react2.default.createElement(SchemaField.String, {
-                name: "width",
-                "x-decorator": "FormItem",
-                "x-component": "NumberPicker"
-              })), /*#__PURE__*/_react2.default.createElement(SchemaField.Void, {
-                "x-component": "ArrayTable.Column",
-                "x-component-props": {
-                  width: 100,
-                  title: "占满"
-                }
-              }, /*#__PURE__*/_react2.default.createElement(SchemaField.String, {
-                name: "flex",
-                "x-decorator": "FormItem",
-                "x-component": "Select",
-                enum: [{
-                  value: 1,
-                  label: "占满"
-                }, {
-                  value: 0,
-                  label: "不占满"
-                }]
-              })), /*#__PURE__*/_react2.default.createElement(SchemaField.Void, {
-                "x-component": "ArrayTable.Column",
-                "x-component-props": {
-                  width: 100,
-                  title: '固定位置'
-                }
-              }, /*#__PURE__*/_react2.default.createElement(SchemaField.String, {
-                name: "pinned",
-                "x-decorator": "FormItem",
-                "x-component": "Select",
-                enum: [{
-                  value: "left",
-                  label: "左固定"
-                }, {
-                  value: "right",
-                  label: "右固定"
-                }, {
-                  value: 'notPinned',
-                  label: "不固定"
-                }]
-              })), /*#__PURE__*/_react2.default.createElement(SchemaField.Void, {
-                "x-component": "ArrayTable.Column",
-                "x-component-props": {
-                  title: '隐藏'
-                }
-              }, /*#__PURE__*/_react2.default.createElement(SchemaField.String, {
-                name: "hide",
-                "x-decorator": "FormItem",
-                "x-component": "Switch"
-              })))))));
-            });
-            formDialog.forConfirm(function (payload, next) {
-              var values = payload.values;
-              onSaveColumnState && onSaveColumnState(values.items);
-              gridApi.setGridOption("columnDefs", values.items);
-              setTimeout(function () {
-                gridApi.applyColumnState({
-                  state: values.items,
-                  applyOrder: true
-                });
-              }, 10);
-              next(payload);
-            }).open(formProps);
-          case 2:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }))
-  }, /*#__PURE__*/_react2.default.createElement(_icons.SettingOutlined, null)));
+  }, /*#__PURE__*/_react2.default.createElement(_icons.SettingOutlined, null))));
 };
 var _default = exports.default = Setting;

package/dist/esm/ag-grid-plus/_utils/processColumnGroups.d.ts

@@ -0,0 +1,2 @@
+declare const processColumnGroups: (columns: any[]) => any;
+export default processColumnGroups;

package/dist/esm/ag-grid-plus/_utils/processColumnGroups.js

@@ -0,0 +1,44 @@
+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); }
+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); }
+var processColumnGroups = function processColumnGroups(columns) {
+  var groupMap = new Map();
+  var result = [];
+
+  // 第一次遍历：创建分组结构
+  columns.forEach(function (col) {
+    if (col.groupName) {
+      if (!groupMap.has(col.groupName)) {
+        groupMap.set(col.groupName, {
+          headerName: col.groupName,
+          field: "".concat(col.groupName, "header"),
+          children: []
+        });
+      }
+    }
+  });
+
+  // 第二次遍历：按原始顺序处理列
+  columns.forEach(function (col) {
+    if (col.groupName) {
+      var groupCol = _objectSpread({}, col);
+      // delete groupCol.groupName;
+
+      // 如果这是该组的第一个元素，将组添加到结果中
+      if (groupMap.get(col.groupName).children.length === 0) {
+        result.push(groupMap.get(col.groupName));
+      }
+
+      // 将列添加到对应的组中
+      groupMap.get(col.groupName).children.push(groupCol);
+    } else {
+      // 未分组的列直接添加到结果中
+      result.push(col);
+    }
+  });
+  return result;
+};
+export default processColumnGroups;

package/dist/esm/ag-grid-plus/ag-gridPlus.js

@@ -30,6 +30,7 @@ import { convertFilterModel, dateTimeValueFormatter, dateValueFormatter, flatten
 import Setting from "./setting";
 import { useGridPlusColumnState } from '.';
 import CustomGroupCellRenderer from "./_utils/customGroupCellRenderer";
+import processColumnGroups from "./_utils/processColumnGroups";
 var Paragraph = Typography.Paragraph,
   Text = Typography.Text;
 var getSort = function getSort(columnState) {
@@ -58,7 +59,10 @@ function AgGridPlus(props) {
   var _useGridPlusColumnSta = useGridPlusColumnState(),
     onSaveColumnState = _useGridPlusColumnSta.onSaveColumnState,
     gridPlusColumnState = _useGridPlusColumnSta.columnState,
-    extensibleColumns = _useGridPlusColumnSta.extensibleColumns;
+    extensibleColumns = _useGridPlusColumnSta.extensibleColumns,
+    applyToGlobal = _useGridPlusColumnSta.applyToGlobal,
+    resetCurrent = _useGridPlusColumnSta.resetCurrent,
+    resetAll = _useGridPlusColumnSta.resetAll;
   var gridRef = useRef();
   var apiRef = useRef();
   var _useState = useState(false),
@@ -168,10 +172,12 @@ function AgGridPlus(props) {
   useEffect(function () {
     if (gridPlusColumnState && gridKey && gridPlusColumnState[gridKey] && apiRef.current) {
       setColumnCellClass(handelgridPlusColumnState(gridPlusColumnState[gridKey]));
-      apiRef.current.applyColumnState({
-        state: gridPlusColumnState[gridKey],
-        applyOrder: true
-      });
+      setTimeout(function () {
+        apiRef.current.applyColumnState({
+          state: gridPlusColumnState[gridKey],
+          applyOrder: true
+        });
+      }, 10);
     }
   }, [gridPlusColumnState, apiRef.current]);
   useEffect(function () {
@@ -224,11 +230,14 @@ function AgGridPlus(props) {
           cellMap[item.field] = {
             cellClass: item.cellClass,
             // 单元格默认样式类
-            suppressHeaderFilterButton: item.suppressHeaderFilterButton // 是否显示过滤按钮
+            suppressHeaderFilterButton: item.suppressHeaderFilterButton,
+            // 是否显示过滤按钮
+            groupName: item.groupName // 分组名称
           };
         }
       });
     }
+    console.log('record1 columnState 3', cellMap);
     return cellMap;
   };
   var sortChanged = function sortChanged(columnApi) {
@@ -363,6 +372,7 @@ function AgGridPlus(props) {
       return _objectSpread({}, child.props);
     });
     var columnDefs = !columnProps ? props.columnDefs ? props.columnDefs : [] : columnProps;
+    console.log('record1 columnDefs 2', columnDefs);
     columnDefs = columnDefs.map(function (col) {
       var dataType = getDataType(data, col.field);
       if (col.type || typeof col.cellRenderer == "string") {
@@ -443,6 +453,9 @@ function AgGridPlus(props) {
         if (cellConfig.cellClass) {
           i.cellClass = cellConfig.cellClass;
         }
+        if (cellConfig.groupName) {
+          i.groupName = cellConfig.groupName;
+        }
         if (cellConfig.suppressHeaderFilterButton !== undefined) {
           i.suppressHeaderFilterButton = !cellConfig.suppressHeaderFilterButton;
         }
@@ -451,7 +464,9 @@ function AgGridPlus(props) {
     }).filter(function (x) {
       return !x.hideInTable;
     });
-    return columnDefs;
+    var processedColumns = processColumnGroups(columnDefs);
+    console.log('record1 columnDefs 1', processedColumns);
+    return processedColumns;
   }, [children === null || children === void 0 ? void 0 : children.length, props.columnDefs, extensibleColumns, columnCellClass]);
   var allColDefs = useMemo(function () {
     return getTableColumns(rowData);
@@ -601,7 +616,7 @@ function AgGridPlus(props) {
     showTotal: function showTotal(total, range) {
       return "\u7B2C ".concat(range[0], "-").concat(range[1], " \u6761/\u603B\u5171 ").concat(total, " \u6761");
     },
-    pageSizeOptions: props.pageSizeOptions || [10, 100, 200, 500, 1000, 10000],
+    pageSizeOptions: props.pageSizeOptions || [10, 20, 50, 100, 200, 500, 1000, 10000],
     hideOnSinglePage: false,
     showQuickJumper: false
   })))));

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

@@ -1,12 +1,31 @@
-import React from 'react';
+import React from "react";
 export declare const GridPlusContext: React.Context<{
     /**
-     * 扩展列运行时动态添加
+     * 扩展列，允许运行时动态添加，用于展示用户自定义的列
      */
     extensibleColumns: any;
     /**
-     * 用户自定义的列状态信息
+     * 当前表格的列状态信息，包括列的显示/隐藏、顺序、宽度等
      */
     columnState: any;
+    /**
+     * 保存当前表格的列状态到服务器（仅保存当前表格）
+     * @param gridKey 表格唯一标识
+     * @param columnState 当前列状态数组
+     */
     onSaveColumnState: (gridKey: string, columnState: any[]) => void;
+    /**
+     * 将当前列配置应用为“全局默认”，影响所有表格
+     * @param columnState 要应用的列配置
+     */
+    applyToGlobal: (gridKey: string) => void;
+    /**
+     * 恢复当前表格为“默认列配置”
+     * @param gridKey 表格唯一标识
+     */
+    resetCurrent: (gridKey: string) => void;
+    /**
+     * 全局恢复所有表格为默认列配置
+     */
+    resetAll: () => void;
 }>;

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

@@ -1,6 +1,9 @@
-import React from 'react';
+import React from "react";
 export var GridPlusContext = /*#__PURE__*/React.createContext({
   extensibleColumns: [],
   columnState: undefined,
-  onSaveColumnState: function onSaveColumnState(gridKey, columnState) {}
+  onSaveColumnState: function onSaveColumnState() {},
+  applyToGlobal: function applyToGlobal() {},
+  resetCurrent: function resetCurrent() {},
+  resetAll: function resetAll() {}
 });

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

@@ -6,6 +6,9 @@ export declare const useGridPlusColumnState: () => {
     extensibleColumns: any;
     columnState: any;
     onSaveColumnState: (gridKey: string, columnState: any[]) => void;
+    applyToGlobal: (gridKey: string) => void;
+    resetCurrent: (gridKey: string) => void;
+    resetAll: () => void;
 };
 export { AgGridPlus, AgGridColumn, GridPlusContext };
 export { dateValueFormatter, dateTimeValueFormatter, convertFilterModel, convertSortModel, flattenTreeDeep, toTree, flatten } from "./utils";

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

@@ -0,0 +1,9 @@
+import { GridApi } from 'ag-grid-community';
+import React from "react";
+declare const DiySetting: (props: {
+    gridKey?: string | undefined;
+    gridApi?: GridApi<any> | undefined;
+    gridApiState?: GridApi<any> | undefined;
+    onSaveColumnState: (state: any) => void;
+}) => React.JSX.Element | null;
+export default DiySetting;