@nokecy/qc-ui 1.0.70 → 1.0.71

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

@@ -1,9 +1,9 @@
-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); }
 import _sumBy from "lodash/sumBy";
 import _uniqueId from "lodash/uniqueId";
 import _isArray from "lodash/isArray";
-var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children", "defaultSearchExpand", "overlayNoRowsTemplateText", "queryDefaultRows", "onSelectedRowsChange"];
+var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children", "defaultSearchExpand", "overlayNoRowsTemplateText", "queryDefaultRows", "onSelectedRowsChange", "enableQuerySchemes", "querySchemeStorageAdapter", "enableColumnSchemes", "columnSchemeStorageAdapter"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+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; }
@@ -34,12 +34,19 @@ import processColumnGroups from "./_utils/processColumnGroups";
 import flattenColumnState from "./_utils/processFormColumnState";
 import { Select } from '@formily/antd-v5';
 import { localeText } from "./locale";
-var Paragraph = Typography.Paragraph,
-  Text = Typography.Text;
+import { GridPlusContext } from "./context/gridContext";
+import { useQuerySchemes, useQueryOrderManager } from "./querySchemes";
+import { useColumnSchemes } from "./schemes";
+import { createSafeHtmlTemplate } from "./utils/sanitize";
+import { GridPlusError, ErrorType, ErrorSeverity } from "./errors";
+import { logger } from "./utils/logger";
+import { message } from 'antd';
+var Text = Typography.Text;
 var getSort = function getSort(columnState) {
   return columnState ? "".concat(columnState.colId, " ").concat(columnState.sort) : "";
 };
 function AgGridPlus(props) {
+  var _querySchemeManager$c;
   var style = props.style,
     loadingProps = props.loading,
     gridParams = props.params,
@@ -60,6 +67,12 @@ function AgGridPlus(props) {
     overlayNoRowsTemplateText = props.overlayNoRowsTemplateText,
     queryDefaultRows = props.queryDefaultRows,
     onSelectedRowsChange = props.onSelectedRowsChange,
+    _props$enableQuerySch = props.enableQuerySchemes,
+    enableQuerySchemes = _props$enableQuerySch === void 0 ? false : _props$enableQuerySch,
+    querySchemeStorageAdapter = props.querySchemeStorageAdapter,
+    _props$enableColumnSc = props.enableColumnSchemes,
+    enableColumnSchemes = _props$enableColumnSc === void 0 ? true : _props$enableColumnSc,
+    columnSchemeStorageAdapter = props.columnSchemeStorageAdapter,
     rest = _objectWithoutProperties(props, _excluded);
   var _useGridPlusColumnSta = useGridPlusColumnState(),
     onSaveColumnState = _useGridPlusColumnSta.onSaveColumnState,
@@ -111,6 +124,39 @@ function AgGridPlus(props) {
     _useState18 = _slicedToArray(_useState17, 2),
     pagination = _useState18[0],
     setPagination = _useState18[1];
+
+  // ============ 查询方案管理 ============
+  var _useState19 = useState([]),
+    _useState20 = _slicedToArray(_useState19, 2),
+    queryItemsOrder = _useState20[0],
+    setQueryItemsOrder = _useState20[1];
+
+  // 初始化查询方案管理器
+  var querySchemeManager = enableQuerySchemes && gridKey ? useQuerySchemes({
+    gridId: gridKey,
+    storageAdapter: querySchemeStorageAdapter,
+    onSchemeChange: function onSchemeChange(scheme) {
+      if (scheme) {
+        setQueryItemsOrder(scheme.itemsOrder);
+      }
+    }
+  }) : undefined;
+
+  // ============ 列配置方案管理 ============
+  // 初始化列配置方案管理器
+  var columnSchemeManager = enableColumnSchemes && gridKey ? useColumnSchemes({
+    gridId: gridKey,
+    storageAdapter: columnSchemeStorageAdapter,
+    enableAutoSave: true,
+    onSchemeChange: function onSchemeChange(scheme) {
+      if (scheme && apiRef.current) {
+        apiRef.current.applyColumnState({
+          state: scheme.columnState,
+          applyOrder: true
+        });
+      }
+    }
+  }) : undefined;
   useImperativeHandle(propsGridRef, function () {
     return gridRef.current;
   });
@@ -165,27 +211,42 @@ function AgGridPlus(props) {
     };
   }, []);
 
-  //请求数据
-  useEffect(function () {
-    if (ready && request) {
-      onRequest(queryFilter);
-    }
-  }, [ready, JSON.stringify(gridParams), JSON.stringify(sortColumn), pagination.pageSize, pagination.current]);
   // 测试列数据
   // const restData = [{"id":"47","field":"code","headerName":"编码","width":110,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"code","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"48","field":"name","headerName":"名称","width":110,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"name","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"49","field":"abbName","headerName":"简称","width":110,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"abbName","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"50","field":"address","headerName":"地址","width":662,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"address","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":1},{"id":"51","field":"creator","headerName":"创建人","width":90,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"creator","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"52","field":"creationTime","headerName":"创建时间","width":160,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"creationTime","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"53","field":"lastModifier","headerName":"最后修改人","width":90,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"lastModifier","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"54","field":"lastModificationTime","headerName":"最后修改时间","width":160,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"lastModificationTime","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"55","field":"","headerName":"操作","width":160,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"0","pinned":"right","sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null}]
 
   // 加载列方案
   useEffect(function () {
-    if (gridPlusColumnState && gridKey && gridPlusColumnState[gridKey] && apiRef.current) {
-      setColumnCellClass(handelgridPlusColumnState(gridPlusColumnState[gridKey]));
-      setTimeout(function () {
-        apiRef.current.applyColumnState({
-          state: gridPlusColumnState[gridKey],
-          applyOrder: true
-        });
-      }, 10);
-    }
-  }, [gridPlusColumnState, apiRef.current]);
+    if (!gridPlusColumnState || !gridKey || !apiRef.current) return;
+    var currentState = gridPlusColumnState[gridKey];
+    if (!currentState) return;
+    setColumnCellClass(handelgridPlusColumnState(currentState));
+    var timer = setTimeout(function () {
+      var _apiRef$current;
+      (_apiRef$current = apiRef.current) === null || _apiRef$current === void 0 || _apiRef$current.applyColumnState({
+        state: currentState,
+        applyOrder: true
+      });
+    }, 10);
+    return function () {
+      return clearTimeout(timer);
+    };
+  }, [gridPlusColumnState, gridKey]);
+
+  // 当 gridApi 就绪且有当前方案时，应用列方案
+  useEffect(function () {
+    var currentScheme = columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme;
+    if (!apiRef.current || !currentScheme) return;
+    var timer = setTimeout(function () {
+      var _apiRef$current2;
+      (_apiRef$current2 = apiRef.current) === null || _apiRef$current2 === void 0 || _apiRef$current2.applyColumnState({
+        state: currentScheme.columnState,
+        applyOrder: true
+      });
+    }, 10);
+    return function () {
+      return clearTimeout(timer);
+    };
+  }, [columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme]);
   useEffect(function () {
     setRowData(dataSource || propRowData || []);
   }, [dataSource, propRowData]);
@@ -194,49 +255,252 @@ function AgGridPlus(props) {
   useEffect(function () {
     loadingProps !== undefined && setLoading(loadingProps);
   }, [loadingProps]);
+
+  // 辅助函数: 获取数据类型
+  var getDataType = function getDataType(data, colName, valueEnum) {
+    if (typeof data[colName] === 'number') {
+      // 如果有枚举值，说明是分类数据，不进行计算;否则默认求和
+      var shouldCalculate = !valueEnum || valueEnum.length === 0;
+      return {
+        type: "number",
+        calculateType: shouldCalculate ? "sum" : false
+      };
+    }
+    return undefined;
+  };
+
+  // 辅助函数: 自定义单元格渲染器
+  var cellRenderer = function cellRenderer(params) {
+    var value = params.value,
+      node = params.node,
+      colDef = params.colDef;
+    //@ts-ignore
+    if (node.isRowPinned() || !colDef.customCellRenderer) {
+      return value;
+    }
+    //@ts-ignore
+    return colDef.customCellRenderer(params);
+  };
+
+  // 获取表格列定义
+  var getTableColumns = function getTableColumns(rowDataList) {
+    var data = rowDataList.length > 0 ? rowDataList[0] : {};
+    var columnProps = React.Children.map(children, function (child, index) {
+      return _objectSpread({}, child.props);
+    });
+    var columnDefs = !columnProps ? props.columnDefs ? props.columnDefs : [] : columnProps;
+    columnDefs = columnDefs.map(function (col) {
+      var dataType = getDataType(data, col.field || '', col.valueEnum);
+      if (col.valueEnum && Array.isArray(col.valueEnum)) {
+        var _defaultItems$0$value, _defaultItems$;
+        // 统计默认值
+        var valueEnum = col.valueEnum; // 保存引用以便TypeScript理解
+        var defaultItems = valueEnum.filter(function (item) {
+          return item.default;
+        });
+        var isMultiple = defaultItems.length > 1;
+        var defaultValue = isMultiple ? defaultItems.map(function (item) {
+          return item.value;
+        }) : (_defaultItems$0$value = (_defaultItems$ = defaultItems[0]) === null || _defaultItems$ === void 0 ? void 0 : _defaultItems$.value) !== null && _defaultItems$0$value !== void 0 ? _defaultItems$0$value : undefined;
+        var valueFormatter = function valueFormatter(params) {
+          var match = valueEnum.find(function (item) {
+            return item.value == params.value;
+          });
+          return match ? match.label : params.value;
+        };
+        return _objectSpread(_objectSpread(_objectSpread({}, dataType), col), {}, {
+          cellRenderer: function cellRenderer(params) {
+            var match = valueEnum.find(function (item) {
+              return item.value == params.value;
+            });
+            if (match) {
+              var color = match.color || '#ffffff';
+              return /*#__PURE__*/React.createElement("span", {
+                style: {
+                  color: color,
+                  backgroundColor: 'transparent',
+                  fontWeight: 500
+                }
+              }, match.label);
+            }
+            return params.value;
+          },
+          filterParams: _objectSpread(_objectSpread({}, col.filterParams || {}), {}, {
+            valueFormatter: valueFormatter
+          }),
+          searchComponent: Select,
+          searchComponentProps: {
+            options: col.valueEnum.map(function (item) {
+              return {
+                label: item.label,
+                value: item.value
+              };
+            }),
+            mode: isMultiple ? "multiple" : undefined,
+            defaultValue: defaultValue
+          }
+        });
+      }
+      if (col.type || typeof col.cellRenderer == "string") {
+        return _objectSpread({}, col);
+      }
+      //@ts-ignore
+      if (col !== null && col !== void 0 && col.ellipsis) {
+        return _objectSpread(_objectSpread({}, col), {}, {
+          cellRenderer: function cellRenderer(_ref) {
+            var value = _ref.value;
+            return /*#__PURE__*/React.createElement(Text, {
+              ellipsis: {
+                tooltip: value
+              },
+              style: {
+                display: 'flex',
+                justifyContent: 'center',
+                alignItems: 'center'
+              }
+            }, value);
+          }
+        });
+      }
+      if (col.cellRenderer) {
+        return _objectSpread(_objectSpread({}, col), {}, {
+          customCellRenderer: col.cellRenderer,
+          cellRenderer: cellRenderer
+        });
+      }
+      return _objectSpread(_objectSpread(_objectSpread({}, dataType), col), {}, {
+        customCellRenderer: col.cellRenderer,
+        cellRenderer: cellRenderer
+      });
+    });
+    extensibleColumns && gridKey && extensibleColumns[gridKey] && extensibleColumns[gridKey].map(function (column) {
+      columnDefs.push({
+        field: column.name,
+        headerName: column.displayName,
+        type: column.propertyType,
+        width: column.width,
+        customCellRenderer: column.cellRenderer,
+        cellRenderer: cellRenderer
+      });
+    });
+    return columnDefs;
+  };
+
+  // 计算所有列定义(包括隐藏的列)
+  var allColDefs = useMemo(function () {
+    return getTableColumns(rowData);
+  }, [React.Children.count(children), props.columnDefs, extensibleColumns, rowData, gridKey]);
+
+  // 稳定化 gridParams 和 sortColumn 的引用
+  var stableGridParams = useMemo(function () {
+    return gridParams;
+  }, [JSON.stringify(gridParams)]);
+  var stableSortColumn = useMemo(function () {
+    return sortColumn;
+  }, [JSON.stringify(sortColumn)]);
   var onGridReady = useCallback(function (params) {
-    var _apiRef$current;
+    var _apiRef$current3;
     apiRef.current = params.api;
     onReady && onReady(params);
     ///@ts-ignore
     dataSource && setRowData(dataSource);
-    setColumnState((_apiRef$current = apiRef.current) === null || _apiRef$current === void 0 ? void 0 : _apiRef$current.getColumnState());
+    setColumnState((_apiRef$current3 = apiRef.current) === null || _apiRef$current3 === void 0 ? void 0 : _apiRef$current3.getColumnState());
     sortChanged(params.api);
     setReady(true);
   }, [dataSource]);
-  var onRequest = function onRequest(queryFilter) {
+  var onRequest = useCallback(function (queryFilter) {
+    if (!request) return;
     setLoading(true);
-    var filter = convertFilterModel(queryFilter, allColDefs);
-    var params = _objectSpread(_objectSpread({
-      filter: filter
-    }, gridParams), {}, {
-      current: pagination.current,
-      skipCount: pagination.current == 1 ? 0 : (pagination.current - 1) * pagination.pageSize,
-      maxResultCount: pagination.pageSize,
-      sorter: getSort(sortColumn)
+    logger.debug('开始请求数据', {
+      queryFilter: queryFilter,
+      pagination: pagination
     });
-    request && request(params, undefined, queryFilter).then(function (response) {
-      var _apiRef$current2;
-      var rowData = response.data;
-      var rowCount = response.total;
-      setRowData(rowData);
-      // 刷新所有单元格
-      (_apiRef$current2 = apiRef.current) === null || _apiRef$current2 === void 0 || _apiRef$current2.refreshCells({
-        force: true
+    try {
+      var filter = convertFilterModel(queryFilter, allColDefs);
+      var params = _objectSpread(_objectSpread({
+        filter: filter
+      }, stableGridParams), {}, {
+        current: pagination.current,
+        skipCount: pagination.current == 1 ? 0 : (pagination.current - 1) * pagination.pageSize,
+        maxResultCount: pagination.pageSize,
+        sorter: getSort(stableSortColumn)
       });
-      setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
-        total: rowCount
-      }));
-      setLoading(false);
-    }).catch(function () {
+      request(params, undefined, queryFilter).then(function (response) {
+        var _apiRef$current4;
+        // 验证响应数据格式
+        if (!response || _typeof(response) !== 'object') {
+          throw new GridPlusError('服务器返回数据格式错误', ErrorType.DATA_FORMAT_ERROR, ErrorSeverity.HIGH, {
+            response: response
+          });
+        }
+        if (!Array.isArray(response.data)) {
+          throw new GridPlusError('返回的数据列表格式错误', ErrorType.DATA_FORMAT_ERROR, ErrorSeverity.HIGH, {
+            responseData: response.data
+          });
+        }
+        var rowData = response.data;
+        var rowCount = response.total;
+        setRowData(rowData);
+        // 刷新所有单元格
+        (_apiRef$current4 = apiRef.current) === null || _apiRef$current4 === void 0 || _apiRef$current4.refreshCells({
+          force: true
+        });
+        setPagination(function (prev) {
+          return _objectSpread(_objectSpread({}, prev), {}, {
+            total: rowCount
+          });
+        });
+        setLoading(false);
+        logger.info('数据请求成功', {
+          rowCount: rowCount
+        });
+      }).catch(function (error) {
+        setLoading(false);
+
+        // 包装错误为 GridPlusError
+        var gridError = error instanceof GridPlusError ? error : new GridPlusError(error.message || '数据加载失败', error.name === 'NetworkError' || error.code === 'ECONNABORTED' ? ErrorType.NETWORK_ERROR : ErrorType.SERVER_ERROR, ErrorSeverity.MEDIUM, {
+          params: params,
+          originalError: error
+        }, error);
+
+        // 记录错误
+        logger.error('数据请求失败', gridError.getDetails());
+
+        // 显示用户友好的错误提示
+        message.error(gridError.getUserMessage());
+
+        // 如果用户提供了错误处理回调,调用它
+        if (props.onError) {
+          props.onError(gridError);
+        }
+      });
+    } catch (error) {
       setLoading(false);
-    });
-  };
+
+      // 处理同步错误(如 convertFilterModel 抛出的错误)
+      var gridError = new GridPlusError(error instanceof Error ? error.message : '数据处理失败', ErrorType.DATA_FORMAT_ERROR, ErrorSeverity.HIGH, {
+        queryFilter: queryFilter,
+        allColDefs: allColDefs
+      }, error instanceof Error ? error : undefined);
+      logger.error('数据请求处理失败', gridError.getDetails());
+      message.error(gridError.getUserMessage());
+      if (props.onError) {
+        props.onError(gridError);
+      }
+    }
+  }, [request, stableGridParams, stableSortColumn, pagination.pageSize, pagination.current, allColDefs, props.onError]);
+
+  // 请求数据 - 当 ready 状态变化或 request 函数变化时触发
+  useEffect(function () {
+    if (ready && request) {
+      onRequest(queryFilter);
+    }
+  }, [ready, request, queryFilter, onRequest]);
   var handelgridPlusColumnState = function handelgridPlusColumnState(columnState) {
     var cellMap = {};
     if (_isArray(columnState)) {
-      columnState.map(function (item) {
-        if (item.cellClass || item.suppressHeaderFilterButton !== undefined) {
+      columnState.forEach(function (item) {
+        if (item.field && (item.cellClass || item.suppressHeaderFilterButton !== undefined || item.groupName)) {
           // 使用对象存储多个字段的值
           cellMap[item.field] = {
             cellClass: item.cellClass,
@@ -256,19 +520,21 @@ function AgGridPlus(props) {
     });
     setSortColumn(sortedColumn);
   };
-  var onRefresh = function onRefresh() {
-    request && onRequest(queryFilter);
-  };
+  var onRefresh = useCallback(function () {
+    if (request) {
+      onRequest(queryFilter);
+    }
+  }, [request, onRequest, queryFilter]);
   useEffect(function () {
     gridRef.current = {
-      onRefresh: function onRefresh() {
-        request && onRequest(queryFilter);
-      }
+      onRefresh: onRefresh
     };
-  }, [queryFilter, JSON.stringify(gridParams), JSON.stringify(sortColumn), pagination]);
+  }, [onRefresh]);
   var onRowChanged = useCallback(function (e) {
-    props.onSelectionChanged && props.onSelectionChanged(e);
-  }, []);
+    if (props.onSelectionChanged) {
+      props.onSelectionChanged(e);
+    }
+  }, [props.onSelectionChanged]);
   var onRowSelected = useCallback(function (e) {
     setSelectRow(e.data);
 
@@ -309,8 +575,10 @@ function AgGridPlus(props) {
       });
       onSelectedRowsChange(visibleSelectedRows);
     }
-    props.onRowSelected && props.onRowSelected(e);
-  }, [onSelectedRowsChange, props.getRowId]);
+    if (props.onRowSelected) {
+      props.onRowSelected(e);
+    }
+  }, [onSelectedRowsChange, props.getRowId, props.onRowSelected]);
   var onColumnStateChanged = function onColumnStateChanged(columnState) {
     if (gridKey) {
       onSaveColumnState && onSaveColumnState(gridKey, columnState);
@@ -362,24 +630,27 @@ function AgGridPlus(props) {
       maximumFractionDigits: 2
     });
   };
-
   // sum 求和  avg 平均值  standardDeviation 标准差
   var calculatefun = function calculatefun(calcColFields, displayedData) {
     var calculateArrCopy = [];
     var calculateData = {
       id: _uniqueId()
     };
-    calcColFields.map(function (i) {
+    calcColFields.forEach(function (i) {
       if (!i.cellRenderer) {
         switch (i.calculateType) {
           case "sum":
-            calculateData[i.field] = i.formatWithCommas ? handelNumber(sumFun(i.field, displayedData).toFixed(i.transactionAmount)) : Number(sumFun(i.field, displayedData).toFixed(i.transactionAmount));
+            var sumPrecision = typeof i.transactionAmount === 'number' ? i.transactionAmount : 2;
+            var sumValue = Number(sumFun(i.field, displayedData).toFixed(sumPrecision));
+            calculateData[i.field] = i.formatWithCommas ? handelNumber(sumValue) : sumValue;
             break;
           case "avg":
-            calculateData[i.field] = Number(avgFun(i.field, displayedData).toFixed(i.transactionAmount));
+            var avgPrecision = typeof i.transactionAmount === 'number' ? i.transactionAmount : 2;
+            calculateData[i.field] = Number(avgFun(i.field, displayedData).toFixed(avgPrecision));
             break;
           case "standardDeviation":
-            calculateData[i.field] = Number(standardDeviationFun(i.field, displayedData).toFixed(i.transactionAmount));
+            var stdPrecision = typeof i.transactionAmount === 'number' ? i.transactionAmount : 2;
+            calculateData[i.field] = Number(standardDeviationFun(i.field, displayedData).toFixed(stdPrecision));
             break;
           default:
             break;
@@ -391,131 +662,7 @@ function AgGridPlus(props) {
     }
     return calculateArrCopy;
   };
-  var getDataType = function getDataType(data, colName, valueEnum) {
-    if (typeof data[colName] === 'number') {
-      // 如果有枚举值，说明是分类数据，不进行计算；否则默认求和
-      var shouldCalculate = !valueEnum || valueEnum.length === 0;
-      return {
-        type: "number",
-        calculateType: shouldCalculate ? "sum" : false
-        // cellStyle: { 'text-align': 'right' } 
-      };
-    }
-    return undefined;
-  };
-  var cellRenderer = function cellRenderer(params) {
-    var value = params.value,
-      node = params.node,
-      colDef = params.colDef;
-    //@ts-ignore
-    if (node.isRowPinned() || !colDef.customCellRenderer) {
-      return value;
-    }
-    //@ts-ignore
-    return colDef.customCellRenderer(params);
-  };
-  var getTableColumns = function getTableColumns(rowDataList) {
-    var data = rowDataList.length > 0 ? rowDataList[0] : {};
-    var columnProps = React.Children.map(children, function (child, index) {
-      return _objectSpread({}, child.props);
-    });
-    var columnDefs = !columnProps ? props.columnDefs ? props.columnDefs : [] : columnProps;
-    columnDefs = columnDefs.map(function (col) {
-      var dataType = getDataType(data, col.field, col.valueEnum);
-      if (col.valueEnum && Array.isArray(col.valueEnum)) {
-        var _defaultItems$0$value, _defaultItems$;
-        // 统计默认值
-        var defaultItems = col.valueEnum.filter(function (item) {
-          return item.default;
-        });
-        var isMultiple = defaultItems.length > 1;
-        var defaultValue = isMultiple ? defaultItems.map(function (item) {
-          return item.value;
-        }) : (_defaultItems$0$value = (_defaultItems$ = defaultItems[0]) === null || _defaultItems$ === void 0 ? void 0 : _defaultItems$.value) !== null && _defaultItems$0$value !== void 0 ? _defaultItems$0$value : undefined;
-        var valueFormatter = function valueFormatter(params) {
-          var match = col.valueEnum.find(function (item) {
-            return item.value == params.value;
-          });
-          return match ? match.label : params.value;
-        };
-        return _objectSpread(_objectSpread(_objectSpread({}, dataType), col), {}, {
-          cellRenderer: function cellRenderer(params) {
-            var match = col.valueEnum.find(function (item) {
-              return item.value == params.value;
-            });
-            if (match) {
-              var color = match.color || '#ffffff';
-              return /*#__PURE__*/React.createElement("span", {
-                style: {
-                  color: color,
-                  backgroundColor: 'transparent',
-                  fontWeight: 500
-                }
-              }, match.label);
-            }
-            return params.value;
-          },
-          filterParams: _objectSpread(_objectSpread({}, col.filterParams || {}), {}, {
-            valueFormatter: valueFormatter
-          }),
-          searchComponent: Select,
-          searchComponentProps: {
-            options: col.valueEnum.map(function (item) {
-              return {
-                label: item.label,
-                value: item.value
-              };
-            }),
-            mode: isMultiple ? "multiple" : undefined,
-            defaultValue: defaultValue
-          }
-        });
-      }
-      if (col.type || typeof col.cellRenderer == "string") {
-        return _objectSpread({}, col);
-      }
-      //@ts-ignore
-      if (col !== null && col !== void 0 && col.ellipsis) {
-        return _objectSpread(_objectSpread({}, col), {}, {
-          cellRenderer: function cellRenderer(_ref) {
-            var value = _ref.value;
-            return /*#__PURE__*/React.createElement(Text, {
-              ellipsis: {
-                tooltip: value
-              },
-              style: {
-                display: 'flex',
-                justifyContent: 'center',
-                alignItems: 'center'
-              }
-            }, value);
-          }
-        });
-      }
-      if (col.cellRenderer) {
-        return _objectSpread(_objectSpread({}, col), {}, {
-          customCellRenderer: col.cellRenderer,
-          cellRenderer: cellRenderer
-        });
-      }
-      return _objectSpread(_objectSpread(_objectSpread({}, dataType), col), {}, {
-        customCellRenderer: col.cellRenderer,
-        cellRenderer: cellRenderer
-      });
-    });
-    extensibleColumns && gridKey && extensibleColumns[gridKey] && extensibleColumns[gridKey].map(function (column) {
-      columnDefs.push({
-        field: column.name,
-        headerName: column.displayName,
-        type: column.propertyType,
-        width: column.width,
-        customCellRenderer: column.cellRenderer,
-        cellRenderer: cellRenderer
-      });
-    });
-    return columnDefs;
-  };
-  var calculateSum = function calculateSum() {
+  var calculateSum = useCallback(function () {
     var displayedData = [];
     if (apiRef.current) {
       apiRef.current.forEachNodeAfterFilter(function (node) {
@@ -523,8 +670,8 @@ function AgGridPlus(props) {
       });
     }
     if (!allColDefs || displayedData.length === 0) {
-      var _apiRef$current3;
-      (_apiRef$current3 = apiRef.current) === null || _apiRef$current3 === void 0 || _apiRef$current3.setGridOption('pinnedBottomRowData', undefined);
+      var _apiRef$current5;
+      (_apiRef$current5 = apiRef.current) === null || _apiRef$current5 === void 0 || _apiRef$current5.setGridOption('pinnedBottomRowData', undefined);
       return;
     }
     var calcColFields = allColDefs.filter(function (col) {
@@ -538,11 +685,11 @@ function AgGridPlus(props) {
       };
     });
     if (calcColFields.length > 0) {
-      var _apiRef$current4;
+      var _apiRef$current6;
       var calculatedValues = calculatefun(calcColFields, displayedData);
-      (_apiRef$current4 = apiRef.current) === null || _apiRef$current4 === void 0 || _apiRef$current4.setGridOption('pinnedBottomRowData', calculatedValues);
+      (_apiRef$current6 = apiRef.current) === null || _apiRef$current6 === void 0 || _apiRef$current6.setGridOption('pinnedBottomRowData', calculatedValues);
     }
-  };
+  }, [allColDefs, calculatefun]);
   var onFilterChanged = function onFilterChanged(event) {
     calculateSum();
   };
@@ -567,16 +714,38 @@ function AgGridPlus(props) {
     });
     var processedColumns = processColumnGroups(columnDefs);
     return processedColumns;
-  }, [children === null || children === void 0 ? void 0 : children.length, props.columnDefs, extensibleColumns, columnCellClass]);
-  var allColDefs = useMemo(function () {
-    return getTableColumns(rowData);
-  }, [children === null || children === void 0 ? void 0 : children.length, props.columnDefs, extensibleColumns]);
+  }, [React.Children.count(children), props.columnDefs, extensibleColumns, columnCellClass, rowData]);
+
+  // 构建查询表单项（带 order 属性）
+  var queryFormItems = useMemo(function () {
+    var _allColDefs$filter;
+    var items = (allColDefs === null || allColDefs === void 0 || (_allColDefs$filter = allColDefs.filter(function (col) {
+      return col.filter !== false && !col.hideInSearch;
+    })) === null || _allColDefs$filter === void 0 ? void 0 : _allColDefs$filter.map(function (col) {
+      var _col$queryField, _col$searchSort;
+      return _objectSpread({
+        field: (_col$queryField = col.queryField) !== null && _col$queryField !== void 0 ? _col$queryField : col.field,
+        headerName: col.headerName,
+        order: (_col$searchSort = col.searchSort) !== null && _col$searchSort !== void 0 ? _col$searchSort : 999
+      }, col);
+    })) || [];
+    console.log('[AgGridPlus] queryFormItems构建:', {
+      allColDefsLength: allColDefs === null || allColDefs === void 0 ? void 0 : allColDefs.length,
+      queryFormItemsLength: items.length,
+      queryFormItems: items
+    });
+    return items;
+  }, [allColDefs]);
+
+  // 使用顺序管理器处理排序
+  var _useQueryOrderManager = useQueryOrderManager(queryFormItems, (querySchemeManager === null || querySchemeManager === void 0 || (_querySchemeManager$c = querySchemeManager.currentScheme) === null || _querySchemeManager$c === void 0 ? void 0 : _querySchemeManager$c.itemsOrder) || queryItemsOrder),
+    orderedFormItems = _useQueryOrderManager.orderedFormItems;
   useEffect(function () {
     calculateSum();
-  }, [allColDefs, rowData]);
+  }, [calculateSum]);
   var rowDataMemo = useMemo(function () {
     return props.treeData ? flatten(toTree(rowData, treeKeyName !== null && treeKeyName !== void 0 ? treeKeyName : "id", treeParentName !== null && treeParentName !== void 0 ? treeParentName : "parentId"), treeKeyName !== null && treeKeyName !== void 0 ? treeKeyName : "id") : rowData;
-  }, [rowData, props.treeData]);
+  }, [rowData, props.treeData, treeKeyName, treeParentName]);
   var actionDom = toolBarRender && toolBarRender(apiRef.current, convertFilterModel(queryFilter, allColDefs), queryFilter, {
     current: pagination.current,
     skipCount: pagination.current == 1 ? 0 : (pagination.current - 1) * pagination.pageSize,
@@ -588,7 +757,27 @@ function AgGridPlus(props) {
       cellRenderer: CustomGroupCellRenderer
     });
   }, [props.autoGroupColumnDef]);
-  return /*#__PURE__*/React.createElement(Spin, {
+
+  // 准备 GridPlusContext 的值
+  var gridPlusContextValue = useMemo(function () {
+    var _querySchemeManager$c2;
+    return {
+      extensibleColumns: extensibleColumns,
+      columnState: gridPlusColumnState,
+      onSaveColumnState: onSaveColumnState,
+      applyToGlobal: applyToGlobal,
+      resetCurrent: resetCurrent,
+      resetAll: resetAll,
+      schemeManager: columnSchemeManager,
+      querySchemeManager: querySchemeManager,
+      currentQueryOrder: (querySchemeManager === null || querySchemeManager === void 0 || (_querySchemeManager$c2 = querySchemeManager.currentScheme) === null || _querySchemeManager$c2 === void 0 ? void 0 : _querySchemeManager$c2.itemsOrder) || queryItemsOrder,
+      updateQueryOrder: setQueryItemsOrder,
+      queryFormItems: queryFormItems
+    };
+  }, [extensibleColumns, gridPlusColumnState, onSaveColumnState, applyToGlobal, resetCurrent, resetAll, columnSchemeManager, querySchemeManager, queryItemsOrder, queryFormItems]);
+  return /*#__PURE__*/React.createElement(GridPlusContext.Provider, {
+    value: gridPlusContextValue
+  }, /*#__PURE__*/React.createElement(Spin, {
     spinning: loading,
     wrapperClassName: "grid-spin"
   }, /*#__PURE__*/React.createElement("div", {
@@ -600,7 +789,7 @@ function AgGridPlus(props) {
       height: "100%"
     }
   }, search == false ? null : /*#__PURE__*/React.createElement(FormRender, {
-    colDefs: flattenColumnState(allColDefs),
+    colDefs: flattenColumnState(orderedFormItems),
     defaultRows: queryDefaultRows,
     columnStates: columnState || [],
     defaultExpand: defaultSearchExpand,
@@ -662,7 +851,7 @@ function AgGridPlus(props) {
       enableCellTextSelection: true,
       ensureDomOrder: true
     },
-    overlayNoRowsTemplate: "<span style=\"\n                                        display: flex; \n                                        justify-content: center; \n                                        align-items: center; \n                                        height: 100%; \n                                        font-size: 14px; \n                                        color: #aaa; \n                                        line-height: 1.5;\n                                        text-align: center;\">\n                                        ".concat(overlayNoRowsTemplateText || '没有找到数据，试试调整筛选条件吧！', "\n                                        </span>"),
+    overlayNoRowsTemplate: createSafeHtmlTemplate(overlayNoRowsTemplateText || '没有找到数据，试试调整筛选条件吧！'),
     enableRangeSelection: true,
     suppressCopyRowsToClipboard: true,
     autoGroupColumnDef: autoGroupColumnDef
@@ -684,8 +873,8 @@ function AgGridPlus(props) {
     onRowSelected: onRowSelected,
     onDragStopped: function onDragStopped(e) {
       if (apiRef.current) {
-        var _apiRef$current5;
-        var _columnState = (_apiRef$current5 = apiRef.current) === null || _apiRef$current5 === void 0 ? void 0 : _apiRef$current5.getColumnState();
+        var _apiRef$current7;
+        var _columnState = (_apiRef$current7 = apiRef.current) === null || _apiRef$current7 === void 0 ? void 0 : _apiRef$current7.getColumnState();
         setColumnState(_columnState);
 
         // onColumnStateChanged && onColumnStateChanged(columnState)
@@ -732,6 +921,6 @@ function AgGridPlus(props) {
     pageSizeOptions: props.pageSizeOptions || [10, 20, 50, 100, 200, 500, 1000, 10000],
     hideOnSinglePage: false,
     showQuickJumper: false
-  })))));
+  }))))));
 }
 export default AgGridPlus;