ztxkui 4.2.18-69 → 4.2.18-70

package/dist/components/Table/hooks/useColumns.js

@@ -296,6 +296,7 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
     _columns.forEach(function (col, index) {
         var _column = __assign({}, col);
         var columnTitle = _column.title;
+        var dataIndex = col.dataIndex || col.key;
         var align = _column.align;
         // 这里解决一个bug，对于dataSource.slice().reverse() 之后。scu配置的字段并不会更新 render中的index
         if (_column.shouldCellUpdate) {
@@ -418,7 +419,7 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
         if (!_column.hideColumn) {
             _newColumns.push(_column);
         }
-        if (tableNumberFormatter === null || tableNumberFormatter === void 0 ? void 0 : tableNumberFormatter(columnTitle)) {
+        if (tableNumberFormatter === null || tableNumberFormatter === void 0 ? void 0 : tableNumberFormatter(columnTitle, dataIndex, _column)) {
             _column.align = 'right';
         }
         // 添加render字段
@@ -579,7 +580,7 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
                                 selfResult = customDecimalFieldRender === null || customDecimalFieldRender === void 0 ? void 0 : customDecimalFieldRender(text, record, index);
                             }
                         }
-                        if (!(tableNumberFormatter === null || tableNumberFormatter === void 0 ? void 0 : tableNumberFormatter(title))) {
+                        if (!(tableNumberFormatter === null || tableNumberFormatter === void 0 ? void 0 : tableNumberFormatter(title, dataIndex, _column))) {
                             return selfResult;
                         }
                         if (typeof selfResult === 'string' ||
@@ -624,6 +625,7 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
             if (isNumber(newValue)) {
                 return getResultCom(newValue);
             }
+            return selfResult;
         }
         // 20250623 如果text返回的是数字形数据，那么转成带千分符的值
         function isNumber(val) {
@@ -677,12 +679,12 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
                         // 去掉千分符 还是数字的话
                         var newValue_1 = typeof value === 'string' ? (_a = value === null || value === void 0 ? void 0 : value.replace) === null || _a === void 0 ? void 0 : _a.call(value, /,/g, '') : value;
                         if (isNumber(newValue_1) && isNumber(text)) {
-                            return (tableNumberFormatter === null || tableNumberFormatter === void 0 ? void 0 : tableNumberFormatter(title))
+                            return (tableNumberFormatter === null || tableNumberFormatter === void 0 ? void 0 : tableNumberFormatter(title, dataIndex, _column))
                                 ? getResultCom(customDecimalFieldRender === null || customDecimalFieldRender === void 0 ? void 0 : customDecimalFieldRender(text, record, index))
                                 : customDecimalFieldRender === null || customDecimalFieldRender === void 0 ? void 0 : customDecimalFieldRender(text, record, index);
                         }
                     }
-                    if (!(tableNumberFormatter === null || tableNumberFormatter === void 0 ? void 0 : tableNumberFormatter(title))) {
+                    if (!(tableNumberFormatter === null || tableNumberFormatter === void 0 ? void 0 : tableNumberFormatter(title, dataIndex, _column))) {
                         return value;
                     }
                     if (isPercentage(value) && isNumberInputAlignRight) {

package/dist/components/utils/ZtxkContext.d.ts

@@ -12,7 +12,7 @@ export interface IZtxkConfig {
      * 规则2：字段中包含：单价、总价、金额、数量的需要加上
      * 前提条件是，字段值是数字类型(这个规则组件内部会实现)
      */
-    tableNumberFormatter?: (text: string) => boolean | null | undefined | void;
+    tableNumberFormatter?: (text: string, fieldName?: string, column?: any) => boolean | null | undefined | void;
     /**
      * 处理显示的自定义小数位字段
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "4.2.18-69",
+  "version": "4.2.18-70",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",