ztxkui 4.2.23-601 → 4.2.23-603

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

@@ -359,6 +359,7 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
         _columns.forEach(function (column) {
             var dataIndex = column.dataIndex || column.key;
             if (typeof dataIndex === 'string' &&
+                !column.disablePrecisionControl &&
                 (isCustomDecimalField === null || isCustomDecimalField === void 0 ? void 0 : isCustomDecimalField(dataIndex, column))) {
                 autoDecimalFieldsRef.current[dataIndex] = {
                     autoDecimal: true,
@@ -379,7 +380,10 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
         // 当前字段是否需要控制小数位(前提是必须要有物料描述字段并且传入了部门参数)
         var isDecimal = false;
         var dataIndex = col.dataIndex || col.key;
-        if (materialDescField && isDecimalField && typeof dataIndex === 'string') {
+        if (materialDescField &&
+            isDecimalField &&
+            typeof dataIndex === 'string' &&
+            !col.disablePrecisionControl) {
             isDecimal = isDecimalField(dataIndex, col);
         }
         // 自定义设置小数位数
@@ -503,6 +507,7 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
                         isHasFilterRef: isHasFilterRef,
                         getPrecision: getPrecision,
                         disableExeclCopy: disableExeclCopy_1,
+                        disablePrecisionControl: _column.disablePrecisionControl,
                     });
                 } });
             // 兼容下拉框滚动行为
@@ -769,15 +774,20 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
                 _column.render = function (text, record, index) {
                     var percisionResult = getPrecision ? getPrecision === null || getPrecision === void 0 ? void 0 : getPrecision(record) : null;
                     var renderOption = {};
-                    if (percisionResult) {
+                    if (percisionResult != null) {
                         renderOption.precision = percisionResult;
                     }
+                    else if (_column.disablePrecisionControl &&
+                        typeof _column.precision === 'number') {
+                        renderOption.precision = _column.precision;
+                    }
                     var selfResult = selfRender_1(text, record, index, renderOption);
                     try {
                         // 如果命中了自定义显示字段，并且命中了是数字
                         var dataIndex = _column.dataIndex || _column.key;
                         var title = columnTitle !== null && columnTitle !== void 0 ? columnTitle : _column.title;
-                        if (isCustomDecimalField === null || isCustomDecimalField === void 0 ? void 0 : isCustomDecimalField(dataIndex, __assign(__assign({}, _column), { title: title }))) {
+                        if (!_column.disablePrecisionControl &&
+                            (isCustomDecimalField === null || isCustomDecimalField === void 0 ? void 0 : isCustomDecimalField(dataIndex, __assign(__assign({}, _column), { title: title })))) {
                             // 去掉千分符 还是数字的话
                             var newValue = typeof selfResult === 'string'
                                 ? selfResult.replace(/,/g, '')
@@ -870,10 +880,10 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
                 else if (_column.dateFormat) {
                     return dayjs(text).format(_column.dateFormat);
                 }
-                if (percisionResult) {
+                if (percisionResult != null) {
                     value = exactRound(text, percisionResult);
                 }
-                else if (_column.precision) {
+                else if (_column.precision != null) {
                     value = exactRound(text, _column.precision);
                 }
                 if (_column.thousand) {
@@ -883,7 +893,8 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
                     // 如果命中了自定义显示字段，并且命中了是数字
                     var dataIndex = _column.dataIndex || _column.key;
                     var title = columnTitle !== null && columnTitle !== void 0 ? columnTitle : _column.title;
-                    if (isCustomDecimalField === null || isCustomDecimalField === void 0 ? void 0 : isCustomDecimalField(dataIndex, __assign(__assign({}, _column), { title: title }))) {
+                    if (!_column.disablePrecisionControl &&
+                        (isCustomDecimalField === null || isCustomDecimalField === void 0 ? void 0 : isCustomDecimalField(dataIndex, __assign(__assign({}, _column), { title: title })))) {
                         // 去掉千分符 还是数字的话
                         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)) {

package/dist/components/Table/index.d.ts

@@ -55,6 +55,8 @@ export interface IColumnType<RecordType> extends Omit<ColumnType<RecordType>, 'r
     dateFormat?: string;
     /**精度 */
     precision?: number;
+    /**是否禁用精度控制（包括isDecimalField、precisionHandle、isCustomDecimalField等动态精度处理）*/
+    disablePrecisionControl?: boolean;
     /**是否加上千分符 */
     thousand?: boolean;
     /**表头别名 */

package/dist/components/Table/table-enhance-cell.d.ts

@@ -56,6 +56,8 @@ interface IEditableCellProps {
     onTableChange: any;
     currentpage: ICurrentPage;
     noTdWrap?: boolean;
+    /**是否禁用动态精度控制（保留静态 precision）*/
+    disablePrecisionControl?: boolean;
     [props: string]: any;
 }
 declare const _default: React.NamedExoticComponent<IEditableCellProps>;

package/dist/components/Table/table-enhance-cell.js

@@ -137,7 +137,7 @@ export function transformData(data, config) {
     return newData;
 }
 var TableEnhanceCell = function (_a) {
-    var title = _a.title, index = _a.index, editable = _a.editable, editableConfig = _a.editableConfig, children = _a.children, dataIndex = _a.dataIndex, record = _a.record, handleSave = _a.handleSave, dataSource = _a.dataSource, onTableChange = _a.onTableChange, columns = _a.columns, currentpage = _a.currentpage, onMouseEnter = _a.onMouseEnter, onMouseLeave = _a.onMouseLeave, rowKey = _a.rowKey, expandableChildrenColumnName = _a.expandableChildrenColumnName, isHasFilterRef = _a.isHasFilterRef, getPrecision = _a.getPrecision, disableExeclCopy = _a.disableExeclCopy, noTdWrap = _a.noTdWrap, restProps = __rest(_a, ["title", "index", "editable", "editableConfig", "children", "dataIndex", "record", "handleSave", "dataSource", "onTableChange", "columns", "currentpage", "onMouseEnter", "onMouseLeave", "rowKey", "expandableChildrenColumnName", "isHasFilterRef", "getPrecision", "disableExeclCopy", "noTdWrap"]);
+    var title = _a.title, index = _a.index, editable = _a.editable, editableConfig = _a.editableConfig, children = _a.children, dataIndex = _a.dataIndex, record = _a.record, handleSave = _a.handleSave, dataSource = _a.dataSource, onTableChange = _a.onTableChange, columns = _a.columns, currentpage = _a.currentpage, onMouseEnter = _a.onMouseEnter, onMouseLeave = _a.onMouseLeave, rowKey = _a.rowKey, expandableChildrenColumnName = _a.expandableChildrenColumnName, isHasFilterRef = _a.isHasFilterRef, getPrecision = _a.getPrecision, disableExeclCopy = _a.disableExeclCopy, disablePrecisionControl = _a.disablePrecisionControl, noTdWrap = _a.noTdWrap, restProps = __rest(_a, ["title", "index", "editable", "editableConfig", "children", "dataIndex", "record", "handleSave", "dataSource", "onTableChange", "columns", "currentpage", "onMouseEnter", "onMouseLeave", "rowKey", "expandableChildrenColumnName", "isHasFilterRef", "getPrecision", "disableExeclCopy", "disablePrecisionControl", "noTdWrap"]);
     var tdRef = useRef();
     var valueRef = useRef({});
     var _b = useState(), val = _b[0], setVal = _b[1];
@@ -378,15 +378,20 @@ var TableEnhanceCell = function (_a) {
             selectData = data();
         }
         var precisionResult = precision;
-        // 这个配置的优先级最高
-        if (getPrecisionRef.current) {
-            try {
-                precisionResult = getPrecisionRef.current(record) || precision;
+        // 禁用动态精度控制时，直接使用静态 precision
+        if (!disablePrecisionControl) {
+            // 这个配置的优先级最高
+            if (getPrecisionRef.current) {
+                try {
+                    var dynamicPrecision = getPrecisionRef.current(record);
+                    precisionResult =
+                        dynamicPrecision != null ? dynamicPrecision : precision;
+                }
+                catch (err) { }
+            }
+            else if (precisionHandle) {
+                precisionResult = precisionHandle(record);
             }
-            catch (err) { }
-        }
-        else if (precisionHandle) {
-            precisionResult = precisionHandle(record);
         }
         if (maxHandle && maxHandle instanceof Function) {
             var result = maxHandle(record, { precision: precisionResult });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "4.2.23-601",
+  "version": "4.2.23-603",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",
@@ -111,4 +111,4 @@
     "react-dom": ">=16.9.0",
     "ztxkutils": ">=2.1.1"
   }
-}
+}