zmdms-webui 1.8.8 → 1.9.0

package/dist/es/table/interface.d.ts

@@ -228,7 +228,7 @@ interface IColumnType<RecordType> extends Omit<ColumnType<RecordType>, "render">
     /**
      * 添加角标
      */
-    badge?: IBadgeProps | ((record: any) => IBadgeProps);
+    badge?: IBadgeProps | ((record: any) => IBadgeProps | undefined);
 }
 interface IRenderOptions {
     insertTableFromClipboard: IFuncInsertTableFromClipboard;

package/dist/es/table/useSummary.js

@@ -2,7 +2,7 @@ import { __assign } from '../_virtual/_tslib.js';
 import { jsx } from 'react/jsx-runtime';
 import { useCallback } from 'react';
 import { Table } from 'antd';
-import { plus } from 'zmdms-utils';
+import { plus, addThousedSeparator } from 'zmdms-utils';
 import { IS_SUMMARY } from './constant.js';
 
 function useSummary(summaryConfig, columns, options) {
@@ -144,6 +144,10 @@ function getSubtotalObj(fields, dataSource) {
                 summaryTotalObj[field] = summaryItem
                     ? plus(summaryItem, dataItem)
                     : dataItem;
+                // 合计添加千分符
+                if (summaryTotalObj[field]) {
+                    summaryTotalObj[field] = addThousedSeparator(summaryTotalObj[field]);
+                }
             }
             else {
                 var key = field.key, showKey = field.showKey, toFixedNum_1 = field.toFixedNum, value = field.value, callback = field.callback;
@@ -236,6 +240,10 @@ function getSubtotalObj(fields, dataSource) {
                 summaryTotalConfigObj[key] = {
                     align: field === null || field === void 0 ? void 0 : field.align,
                 };
+                // 合计添加千分符
+                if (summaryTotalObj[key]) {
+                    summaryTotalObj[key] = addThousedSeparator(summaryTotalObj[key]);
+                }
             }
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-webui",
-  "version": "1.8.8",
+  "version": "1.9.0",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",