ztxkui 10.0.75 → 10.0.77

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

@@ -401,7 +401,7 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
             _newColumns.push(_column);
         }
         // 添加render字段
-        appendRender(_column);
+        appendRender(_column, col.title);
         // 添加表头提示信息
         if (_column.headTooltip) {
             _column.title = (React.createElement(TableHeadTooltip, { headTooltip: _column.headTooltip }, _column.title));
@@ -456,27 +456,27 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
         _newColumns: _newColumns,
         _dynamicColumns: _dynamicColumns,
     };
-    function appendRender(_column) {
+    function appendRender(_column, title) {
         if (!_column.render) {
             if (_column.children) {
                 _column.children.forEach(function (item) {
-                    appendRender(item);
+                    appendRender(item, item.title);
                 });
             }
             else {
-                _column.render = returnRender(_column);
+                _column.render = returnRender(_column, title);
             }
         }
-        function returnRender(_column) {
+        function returnRender(_column, title) {
             return function (text, record, index) {
                 var value = text;
                 if (text == null || text === '')
                     return '— —';
-                if (_column.title.includes('单价')) {
+                if (typeof title === 'string' && title.includes('单价')) {
                     return priceOrAmountFormat(text, _column.precision || precisions.price);
                 }
-                else if (_column.title.includes('金额') ||
-                    _column.title.includes('税额')) {
+                else if (typeof title === 'string' &&
+                    (title.includes('金额') || title.includes('税额'))) {
                     return priceOrAmountFormat(text, _column.precision || precisions.amount);
                 }
                 if (_column.dateFormat)

package/dist/components/business/NewList/item.js

@@ -9,12 +9,30 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import React from 'react';
+import React, { useContext } from 'react';
 import { Col } from 'antd';
 import classNames from 'classnames';
+import { toThousand, exactRound } from 'ztxkutils/dist/tools';
+import ZtxkContext from '../../utils/ZtxkContext';
+function priceOrAmountFormat(text, precision) {
+    text = text === null || text === void 0 ? void 0 : text.replaceAll(',', '');
+    return toThousand(exactRound(text, precision));
+}
 var Item = function (_a) {
     var children = _a.children, className = _a.className, title = _a.title, _b = _a.colon, colon = _b === void 0 ? true : _b, span = _a.span, titleSpan = _a.titleSpan, titleProps = _a.titleProps, textProps = _a.textProps, showDiff = _a.showDiff, _c = _a.isEllipsis, isEllipsis = _c === void 0 ? true : _c, isBlod = _a.isBlod;
     var classes = classNames('zt-new-grid-item', className);
+    var precisions = useContext(ZtxkContext).precisions;
+    function getChildren() {
+        if (title.includes('单价')) {
+            return priceOrAmountFormat(children, precisions.price);
+        }
+        else if (title.includes('金额') || title.includes('税额')) {
+            return priceOrAmountFormat(children, precisions.amount);
+        }
+        else {
+            return children;
+        }
+    }
     return (React.createElement(React.Fragment, null,
         React.createElement(Col, __assign({ className: classes + ' zt-new-grid-item--title', 
             // span={titleSpan ? titleSpan : Math.ceil(span * 0.3)}
@@ -33,6 +51,6 @@ var Item = function (_a) {
                         ? ' zt-new-grid-item--text-ellipsis'
                         : ' zt-new-grid-item--text-noellipsis')), 
             // span={titleSpan ? span - titleSpan : span - Math.ceil(span * 0.3)}
-            span: titleSpan ? span - titleSpan : span - 3, title: typeof children === 'string' ? children : undefined, style: { fontWeight: isBlod ? 'bold' : 'normal' } }, textProps), children)));
+            span: titleSpan ? span - titleSpan : span - 3, title: typeof children === 'string' ? children : undefined, style: { fontWeight: isBlod ? 'bold' : 'normal' } }, textProps), getChildren())));
 };
 export default Item;

package/package.json

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