@nokecy/qc-ui 1.1.57 → 1.1.58

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

@@ -441,11 +441,10 @@ function AgGridPlus(props) {
   // 辅助函数: 获取数据类型
   var getDataType = function getDataType(data, colName, valueEnum) {
     if (typeof data[colName] === 'number') {
-      // 如果有枚举值，说明是分类数据，不进行计算;否则默认求和
-      var shouldCalculate = !valueEnum || valueEnum.length === 0;
+      // 数值只用于列对齐；底部合计必须由 calculateType 显式声明。@author nokecy
       return {
         type: "number",
-        calculateType: shouldCalculate ? "sum" : false
+        calculateType: valueEnum !== null && valueEnum !== void 0 && valueEnum.length ? false : undefined
       };
     }
     return undefined;
@@ -473,11 +472,11 @@ function AgGridPlus(props) {
       return (0, _columnProcessors.processEnumColumn)(col, dataType);
     }
     if (col.type || typeof col.cellRenderer == "string") {
-      return _objectSpread({}, col);
+      return (0, _columnProcessors.mergeInferredColumnType)(col, dataType);
     }
     //@ts-ignore
     if (col !== null && col !== void 0 && col.ellipsis) {
-      return _objectSpread(_objectSpread({}, col), {}, {
+      return _objectSpread(_objectSpread({}, (0, _columnProcessors.mergeInferredColumnType)(col, dataType)), {}, {
         cellRenderer: function cellRenderer(_ref) {
           var value = _ref.value;
           return /*#__PURE__*/_react.default.createElement(Text, {
@@ -494,12 +493,12 @@ function AgGridPlus(props) {
       });
     }
     if (col.cellRenderer) {
-      return _objectSpread(_objectSpread({}, col), {}, {
+      return _objectSpread(_objectSpread({}, (0, _columnProcessors.mergeInferredColumnType)(col, dataType)), {}, {
         customCellRenderer: col.cellRenderer,
         cellRenderer: cellRenderer
       });
     }
-    return _objectSpread(_objectSpread(_objectSpread({}, (0, _columnProcessors.toColumnType)(dataType)), col), {}, {
+    return _objectSpread(_objectSpread({}, (0, _columnProcessors.mergeInferredColumnType)(col, dataType)), {}, {
       customCellRenderer: col.cellRenderer,
       cellRenderer: cellRenderer
     });
@@ -949,6 +948,7 @@ function AgGridPlus(props) {
     }
   };
   var calculateSum = (0, _react.useCallback)(function () {
+    if (props.pinnedBottomRowData !== undefined) return;
     var displayedData = [];
     if (apiRef.current) {
       apiRef.current.forEachNodeAfterFilter(function (node) {
@@ -960,22 +960,16 @@ function AgGridPlus(props) {
       (_apiRef$current4 = apiRef.current) === null || _apiRef$current4 === void 0 || _apiRef$current4.setGridOption('pinnedBottomRowData', undefined);
       return;
     }
-    var calcColFields = allColDefs.filter(function (col) {
-      return col.calculateType;
-    }).map(function (col) {
-      return {
-        field: col.field,
-        calculateType: col.calculateType,
-        transactionAmount: col.transactionAmount || 2,
-        formatWithCommas: col.formatWithCommas
-      };
-    });
+    var calcColFields = (0, _aggregation.getCalculationColumns)(allColDefs);
     if (calcColFields.length > 0) {
       var _apiRef$current5;
       var calculatedValues = (0, _aggregation.computeAggregationRow)(calcColFields, displayedData);
       (_apiRef$current5 = apiRef.current) === null || _apiRef$current5 === void 0 || _apiRef$current5.setGridOption('pinnedBottomRowData', calculatedValues);
+    } else {
+      var _apiRef$current6;
+      (_apiRef$current6 = apiRef.current) === null || _apiRef$current6 === void 0 || _apiRef$current6.setGridOption('pinnedBottomRowData', undefined);
     }
-  }, [allColDefs]);
+  }, [allColDefs, props.pinnedBottomRowData]);
   var onFilterChanged = function onFilterChanged(event) {
     calculateSum();
   };
@@ -1369,8 +1363,8 @@ function AgGridPlus(props) {
     },
     onDragStopped: function onDragStopped(e) {
       if (apiRef.current) {
-        var _apiRef$current6;
-        var _columnState = (_apiRef$current6 = apiRef.current) === null || _apiRef$current6 === void 0 ? void 0 : _apiRef$current6.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)

package/dist/cjs/ag-grid-plus/utils/aggregation.d.ts

@@ -9,6 +9,15 @@ export interface CalculationColumnConfig {
     formatWithCommas?: boolean;
     cellRenderer?: any;
 }
+export interface CalculationColumnDefinition {
+    field?: string;
+    calculateType?: CalculationColumnConfig['calculateType'] | false;
+    transactionAmount?: number;
+    formatWithCommas?: boolean;
+    children?: CalculationColumnDefinition[];
+}
+/** 分组表头只是展示结构；原生固定合计行要读取所有叶子数值列。@author nokecy */
+export declare const getCalculationColumns: (columns: CalculationColumnDefinition[]) => CalculationColumnConfig[];
 export declare const isValidNumber: (value: any) => boolean;
 export declare const sumField: (field: string, data: any[]) => number;
 export declare const avgField: (field: string, data: any[]) => number;

package/dist/cjs/ag-grid-plus/utils/aggregation.js

@@ -4,7 +4,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.sumField = exports.stdDevField = exports.isValidNumber = exports.formatWithCommas = exports.computeAggregationRow = exports.avgField = void 0;
+exports.sumField = exports.stdDevField = exports.isValidNumber = exports.getCalculationColumns = exports.formatWithCommas = exports.computeAggregationRow = exports.avgField = void 0;
 var _lodash = _interopRequireWildcard(require("lodash"));
 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; }
@@ -13,6 +13,20 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  * @author nokecy
  */
 
+/** 分组表头只是展示结构；原生固定合计行要读取所有叶子数值列。@author nokecy */
+var getCalculationColumns = exports.getCalculationColumns = function getCalculationColumns(columns) {
+  return columns.flatMap(function (column) {
+    var _column$transactionAm;
+    if (column.children) return getCalculationColumns(column.children);
+    if (!column.field || !column.calculateType) return [];
+    return [{
+      field: column.field,
+      calculateType: column.calculateType,
+      transactionAmount: (_column$transactionAm = column.transactionAmount) !== null && _column$transactionAm !== void 0 ? _column$transactionAm : 2,
+      formatWithCommas: column.formatWithCommas
+    }];
+  });
+};
 var isValidNumber = exports.isValidNumber = function isValidNumber(value) {
   return typeof value === 'number' && !isNaN(value);
 };

package/dist/cjs/ag-grid-plus/utils/columnProcessors.d.ts

@@ -56,8 +56,8 @@ export declare function inferDataType(data: any, colName: string, valueEnum?: Va
  * 早先是把整个 dataType 摊进 colDef，等于给列设了 type:"number"——而注册的 columnTypes 里
  * 根本没有叫 number 的类型，这个字段一直没生效。
  *
- * 数量型数值列真正该有的是右对齐：位数对齐了才能一眼比大小。只有 calculateType 为真
- * （可求和的数量型）才右对齐；用 valueEnum 表示分类的数值列（状态码之类）不动。
+ * 普通数值列右对齐；合计另由 calculateType 显式控制。
+ * 用 valueEnum 表示分类的数值列（状态码之类）不动。
  *
  * @author nokecy
  */
@@ -65,6 +65,8 @@ export declare function toColumnType(dataType?: DataTypeInference): {
     calculateType?: any;
     type?: string;
 };
+/** 显式列类型只控制显示方式，不遮蔽数值对齐或显式合计配置。@author nokecy */
+export declare function mergeInferredColumnType<T extends object>(column: T, dataType?: DataTypeInference): T & ReturnType<typeof toColumnType>;
 /**
  * 处理枚举列定义 —— **枚举列渲染的唯一实现**。
  *

package/dist/cjs/ag-grid-plus/utils/columnProcessors.js

@@ -9,6 +9,7 @@ exports.createCellRenderer = createCellRenderer;
 exports.filterHiddenColumns = filterHiddenColumns;
 exports.handleGridPlusColumnState = handleGridPlusColumnState;
 exports.inferDataType = inferDataType;
+exports.mergeInferredColumnType = mergeInferredColumnType;
 exports.processEllipsisColumn = processEllipsisColumn;
 exports.processEnumColumn = processEnumColumn;
 exports.toColumnType = toColumnType;
@@ -75,11 +76,10 @@ function handleGridPlusColumnState(columnState) {
 function inferDataType(data, colName, valueEnum) {
   var value = data[colName];
   if (typeof value === 'number') {
-    // 如果有枚举值，说明是分类数据，不进行计算
-    var shouldCalculate = !valueEnum || valueEnum.length === 0;
+    // 数值只决定对齐；合计必须由列定义显式声明。@author nokecy
     return {
       type: 'number',
-      calculateType: shouldCalculate ? 'sum' : false
+      calculateType: valueEnum !== null && valueEnum !== void 0 && valueEnum.length ? false : undefined
     };
   }
   if (typeof value === 'boolean') {
@@ -104,17 +104,19 @@ function inferDataType(data, colName, valueEnum) {
  * 早先是把整个 dataType 摊进 colDef，等于给列设了 type:"number"——而注册的 columnTypes 里
  * 根本没有叫 number 的类型，这个字段一直没生效。
  *
- * 数量型数值列真正该有的是右对齐：位数对齐了才能一眼比大小。只有 calculateType 为真
- * （可求和的数量型）才右对齐；用 valueEnum 表示分类的数值列（状态码之类）不动。
+ * 普通数值列右对齐；合计另由 calculateType 显式控制。
+ * 用 valueEnum 表示分类的数值列（状态码之类）不动。
  *
  * @author nokecy
  */
 function toColumnType(dataType) {
   if (!dataType) return {};
-  if (dataType.type === 'number' && dataType.calculateType) {
-    return {
+  if (dataType.type === 'number' && dataType.calculateType !== false) {
+    return dataType.calculateType ? {
       calculateType: dataType.calculateType,
       type: 'rightAligned'
+    } : {
+      type: 'rightAligned'
     };
   }
   return {
@@ -122,6 +124,11 @@ function toColumnType(dataType) {
   };
 }
 
+/** 显式列类型只控制显示方式，不遮蔽数值对齐或显式合计配置。@author nokecy */
+function mergeInferredColumnType(column, dataType) {
+  return _objectSpread(_objectSpread({}, toColumnType(dataType)), column);
+}
+
 /**
  * 处理枚举列定义 —— **枚举列渲染的唯一实现**。
  *

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

@@ -36,7 +36,7 @@ import ToolBar from "./toolBar";
 import SettingItem from "./settingItem";
 import { RedoOutlined, FilterOutlined } from '@ant-design/icons';
 import { convertFilterModel, dateTimeValueFormatter, dateValueFormatter, flatten, toTree } from "./utils";
-import { processEnumColumn, toColumnType } from "./utils/columnProcessors";
+import { mergeInferredColumnType, processEnumColumn } from "./utils/columnProcessors";
 import AdvancedQueryBuilder from "./queryForm/AdvancedQueryBuilder";
 import { v4 as uuidv4 } from 'uuid';
 import Setting from "./setting";
@@ -55,7 +55,7 @@ import { QueryFormContext } from "./context/queryFormContext";
 import { useGridSchemes } from "./context/useSchemeManager";
 import { useSchemeDataFlow } from "./context/useSchemeDataFlow";
 import { extractItemsOrder, extractHiddenFields } from "./shared/utils/schemeDataMigration";
-import { computeAggregationRow } from "./utils/aggregation";
+import { computeAggregationRow, getCalculationColumns } from "./utils/aggregation";
 import { sortFormItemsByOrder, filterHiddenFormItems } from "./utils/queryFormDerivation";
 import { filterVisibleSelectedRows } from "./utils/rowSelection";
 import { buildFilterString, pageToSkipCount } from "./utils/requestParams";
@@ -433,11 +433,10 @@ function AgGridPlus(props) {
   // 辅助函数: 获取数据类型
   var getDataType = function getDataType(data, colName, valueEnum) {
     if (typeof data[colName] === 'number') {
-      // 如果有枚举值，说明是分类数据，不进行计算;否则默认求和
-      var shouldCalculate = !valueEnum || valueEnum.length === 0;
+      // 数值只用于列对齐；底部合计必须由 calculateType 显式声明。@author nokecy
       return {
         type: "number",
-        calculateType: shouldCalculate ? "sum" : false
+        calculateType: valueEnum !== null && valueEnum !== void 0 && valueEnum.length ? false : undefined
       };
     }
     return undefined;
@@ -465,11 +464,11 @@ function AgGridPlus(props) {
       return processEnumColumn(col, dataType);
     }
     if (col.type || typeof col.cellRenderer == "string") {
-      return _objectSpread({}, col);
+      return mergeInferredColumnType(col, dataType);
     }
     //@ts-ignore
     if (col !== null && col !== void 0 && col.ellipsis) {
-      return _objectSpread(_objectSpread({}, col), {}, {
+      return _objectSpread(_objectSpread({}, mergeInferredColumnType(col, dataType)), {}, {
         cellRenderer: function cellRenderer(_ref) {
           var value = _ref.value;
           return /*#__PURE__*/React.createElement(Text, {
@@ -486,12 +485,12 @@ function AgGridPlus(props) {
       });
     }
     if (col.cellRenderer) {
-      return _objectSpread(_objectSpread({}, col), {}, {
+      return _objectSpread(_objectSpread({}, mergeInferredColumnType(col, dataType)), {}, {
         customCellRenderer: col.cellRenderer,
         cellRenderer: cellRenderer
       });
     }
-    return _objectSpread(_objectSpread(_objectSpread({}, toColumnType(dataType)), col), {}, {
+    return _objectSpread(_objectSpread({}, mergeInferredColumnType(col, dataType)), {}, {
       customCellRenderer: col.cellRenderer,
       cellRenderer: cellRenderer
     });
@@ -941,6 +940,7 @@ function AgGridPlus(props) {
     }
   };
   var calculateSum = useCallback(function () {
+    if (props.pinnedBottomRowData !== undefined) return;
     var displayedData = [];
     if (apiRef.current) {
       apiRef.current.forEachNodeAfterFilter(function (node) {
@@ -952,22 +952,16 @@ function AgGridPlus(props) {
       (_apiRef$current4 = apiRef.current) === null || _apiRef$current4 === void 0 || _apiRef$current4.setGridOption('pinnedBottomRowData', undefined);
       return;
     }
-    var calcColFields = allColDefs.filter(function (col) {
-      return col.calculateType;
-    }).map(function (col) {
-      return {
-        field: col.field,
-        calculateType: col.calculateType,
-        transactionAmount: col.transactionAmount || 2,
-        formatWithCommas: col.formatWithCommas
-      };
-    });
+    var calcColFields = getCalculationColumns(allColDefs);
     if (calcColFields.length > 0) {
       var _apiRef$current5;
       var calculatedValues = computeAggregationRow(calcColFields, displayedData);
       (_apiRef$current5 = apiRef.current) === null || _apiRef$current5 === void 0 || _apiRef$current5.setGridOption('pinnedBottomRowData', calculatedValues);
+    } else {
+      var _apiRef$current6;
+      (_apiRef$current6 = apiRef.current) === null || _apiRef$current6 === void 0 || _apiRef$current6.setGridOption('pinnedBottomRowData', undefined);
     }
-  }, [allColDefs]);
+  }, [allColDefs, props.pinnedBottomRowData]);
   var onFilterChanged = function onFilterChanged(event) {
     calculateSum();
   };
@@ -1361,8 +1355,8 @@ function AgGridPlus(props) {
     },
     onDragStopped: function onDragStopped(e) {
       if (apiRef.current) {
-        var _apiRef$current6;
-        var _columnState = (_apiRef$current6 = apiRef.current) === null || _apiRef$current6 === void 0 ? void 0 : _apiRef$current6.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)

package/dist/esm/ag-grid-plus/utils/aggregation.d.ts

@@ -9,6 +9,15 @@ export interface CalculationColumnConfig {
     formatWithCommas?: boolean;
     cellRenderer?: any;
 }
+export interface CalculationColumnDefinition {
+    field?: string;
+    calculateType?: CalculationColumnConfig['calculateType'] | false;
+    transactionAmount?: number;
+    formatWithCommas?: boolean;
+    children?: CalculationColumnDefinition[];
+}
+/** 分组表头只是展示结构；原生固定合计行要读取所有叶子数值列。@author nokecy */
+export declare const getCalculationColumns: (columns: CalculationColumnDefinition[]) => CalculationColumnConfig[];
 export declare const isValidNumber: (value: any) => boolean;
 export declare const sumField: (field: string, data: any[]) => number;
 export declare const avgField: (field: string, data: any[]) => number;

package/dist/esm/ag-grid-plus/utils/aggregation.js

@@ -5,6 +5,20 @@ import _, { uniqueId } from 'lodash';
  * @author nokecy
  */
 
+/** 分组表头只是展示结构；原生固定合计行要读取所有叶子数值列。@author nokecy */
+export var getCalculationColumns = function getCalculationColumns(columns) {
+  return columns.flatMap(function (column) {
+    var _column$transactionAm;
+    if (column.children) return getCalculationColumns(column.children);
+    if (!column.field || !column.calculateType) return [];
+    return [{
+      field: column.field,
+      calculateType: column.calculateType,
+      transactionAmount: (_column$transactionAm = column.transactionAmount) !== null && _column$transactionAm !== void 0 ? _column$transactionAm : 2,
+      formatWithCommas: column.formatWithCommas
+    }];
+  });
+};
 export var isValidNumber = function isValidNumber(value) {
   return typeof value === 'number' && !isNaN(value);
 };

package/dist/esm/ag-grid-plus/utils/columnProcessors.d.ts

@@ -56,8 +56,8 @@ export declare function inferDataType(data: any, colName: string, valueEnum?: Va
  * 早先是把整个 dataType 摊进 colDef，等于给列设了 type:"number"——而注册的 columnTypes 里
  * 根本没有叫 number 的类型，这个字段一直没生效。
  *
- * 数量型数值列真正该有的是右对齐：位数对齐了才能一眼比大小。只有 calculateType 为真
- * （可求和的数量型）才右对齐；用 valueEnum 表示分类的数值列（状态码之类）不动。
+ * 普通数值列右对齐；合计另由 calculateType 显式控制。
+ * 用 valueEnum 表示分类的数值列（状态码之类）不动。
  *
  * @author nokecy
  */
@@ -65,6 +65,8 @@ export declare function toColumnType(dataType?: DataTypeInference): {
     calculateType?: any;
     type?: string;
 };
+/** 显式列类型只控制显示方式，不遮蔽数值对齐或显式合计配置。@author nokecy */
+export declare function mergeInferredColumnType<T extends object>(column: T, dataType?: DataTypeInference): T & ReturnType<typeof toColumnType>;
 /**
  * 处理枚举列定义 —— **枚举列渲染的唯一实现**。
  *

package/dist/esm/ag-grid-plus/utils/columnProcessors.js

@@ -60,11 +60,10 @@ export function handleGridPlusColumnState(columnState) {
 export function inferDataType(data, colName, valueEnum) {
   var value = data[colName];
   if (typeof value === 'number') {
-    // 如果有枚举值，说明是分类数据，不进行计算
-    var shouldCalculate = !valueEnum || valueEnum.length === 0;
+    // 数值只决定对齐；合计必须由列定义显式声明。@author nokecy
     return {
       type: 'number',
-      calculateType: shouldCalculate ? 'sum' : false
+      calculateType: valueEnum !== null && valueEnum !== void 0 && valueEnum.length ? false : undefined
     };
   }
   if (typeof value === 'boolean') {
@@ -89,17 +88,19 @@ export function inferDataType(data, colName, valueEnum) {
  * 早先是把整个 dataType 摊进 colDef，等于给列设了 type:"number"——而注册的 columnTypes 里
  * 根本没有叫 number 的类型，这个字段一直没生效。
  *
- * 数量型数值列真正该有的是右对齐：位数对齐了才能一眼比大小。只有 calculateType 为真
- * （可求和的数量型）才右对齐；用 valueEnum 表示分类的数值列（状态码之类）不动。
+ * 普通数值列右对齐；合计另由 calculateType 显式控制。
+ * 用 valueEnum 表示分类的数值列（状态码之类）不动。
  *
  * @author nokecy
  */
 export function toColumnType(dataType) {
   if (!dataType) return {};
-  if (dataType.type === 'number' && dataType.calculateType) {
-    return {
+  if (dataType.type === 'number' && dataType.calculateType !== false) {
+    return dataType.calculateType ? {
       calculateType: dataType.calculateType,
       type: 'rightAligned'
+    } : {
+      type: 'rightAligned'
     };
   }
   return {
@@ -107,6 +108,11 @@ export function toColumnType(dataType) {
   };
 }
 
+/** 显式列类型只控制显示方式，不遮蔽数值对齐或显式合计配置。@author nokecy */
+export function mergeInferredColumnType(column, dataType) {
+  return _objectSpread(_objectSpread({}, toColumnType(dataType)), column);
+}
+
 /**
  * 处理枚举列定义 —— **枚举列渲染的唯一实现**。
  *