ztxkui 10.0.74 → 10.0.76

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

@@ -14,10 +14,10 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
         to[j] = from[i];
     return to;
 };
-import React, { useCallback, useState, useRef, useMemo } from 'react';
+import React, { useCallback, useState, useRef, useMemo, useContext, } from 'react';
 import { unstable_batchedUpdates } from 'react-dom';
 import Button from '../../Button';
-import { Popconfirm } from '../../../index';
+import { Popconfirm, ZtxkContext } from '../../../index';
 import { PicRightOutlined, MinusSquareOutlined } from '@ant-design/icons';
 import TableAddDelColumn from '../table-adddel-column';
 import TableHeadTooltip from '../table-headTooltip';
@@ -211,7 +211,7 @@ export function setDynamicKey(dynamicStorageKey, value) {
     localStorage.setItem(LOCALSTORAGE_LRU_KEY, JSON.stringify(lruKeys));
 }
 function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig) {
-    var columns = basicConfig.columns, newColumnsRef = basicConfig.newColumnsRef, showColumnDynamic = basicConfig.showColumnDynamic, showColumnDynamicKey = basicConfig.showColumnDynamicKey, configInfo = basicConfig.configInfo, currentDataSource = basicConfig.currentDataSource, preDataSource = basicConfig.preDataSource, rowKey = basicConfig.rowKey, dataSourceRef = basicConfig.dataSourceRef, expandableChildrenColumnName = basicConfig.expandableChildrenColumnName, upDateColumnsRef = basicConfig.upDateColumnsRef, setUpDateColumnsRef = basicConfig.setUpDateColumnsRef, isUpDateColumnsRef = basicConfig.isUpDateColumnsRef, setIsUpDateColumnsRef = basicConfig.setIsUpDateColumnsRef;
+    var columns = basicConfig.columns, newColumnsRef = basicConfig.newColumnsRef, showColumnDynamic = basicConfig.showColumnDynamic, showColumnDynamicKey = basicConfig.showColumnDynamicKey, configInfo = basicConfig.configInfo, currentDataSource = basicConfig.currentDataSource, preDataSource = basicConfig.preDataSource, rowKey = basicConfig.rowKey, dataSourceRef = basicConfig.dataSourceRef, expandableChildrenColumnName = basicConfig.expandableChildrenColumnName, upDateColumnsRef = basicConfig.upDateColumnsRef, setUpDateColumnsRef = basicConfig.setUpDateColumnsRef, isUpDateColumnsRef = basicConfig.isUpDateColumnsRef, setIsUpDateColumnsRef = basicConfig.setIsUpDateColumnsRef, precisions = basicConfig.precisions;
     var onEditableSave = editableConfig.onEditableSave, onTableChange = editableConfig.onTableChange, currentPage = editableConfig.currentPage;
     var ColumnDynamicCom = dynamicConfig.ColumnDynamicCom, DelAllCom = dynamicConfig.DelAllCom, onAddAndDelHandleMemo = dynamicConfig.onAddAndDelHandleMemo, onAddAndDelHandle = dynamicConfig.onAddAndDelHandle, hideAddIcon = dynamicConfig.hideAddIcon, addIconText = dynamicConfig.addIconText, hideDelIcon = dynamicConfig.hideDelIcon, delIconText = dynamicConfig.delIconText;
     var copyByKey = otherConfig.copyByKey, myCatchColumns = otherConfig.myCatchColumns, customSortHandle = otherConfig.customSortHandle, customOrder = otherConfig.customOrder, setCustomOrder = otherConfig.setCustomOrder, isSort = otherConfig.isSort, menuShow = otherConfig.menuShow, getMenuInfoByCell = otherConfig.getMenuInfoByCell;
@@ -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,23 +456,30 @@ 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 '— —';
-                else if (_column.dateFormat)
+                if (typeof title === 'string' && title.includes('单价')) {
+                    return priceOrAmountFormat(text, _column.precision || precisions.price);
+                }
+                else if (typeof title === 'string' &&
+                    (title.includes('金额') || title.includes('税额'))) {
+                    return priceOrAmountFormat(text, _column.precision || precisions.amount);
+                }
+                if (_column.dateFormat)
                     return dayjs(text).format(_column.dateFormat);
                 if (_column.precision)
                     value = exactRound(text, _column.precision);
@@ -481,10 +488,15 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
                 return value;
             };
         }
+        function priceOrAmountFormat(text, precision) {
+            text = text === null || text === void 0 ? void 0 : text.replaceAll(',', '');
+            return toThousand(exactRound(text, precision));
+        }
     }
 }
 function useColumns(props) {
     var columns = props.columns, hiddenColumnDynamicIcon = props.hiddenColumnDynamicIcon, showColumnDynamic = props.showColumnDynamic, showColumnDynamicKey = props.showColumnDynamicKey, onAddAndDelHandle = props.onAddAndDelHandle, hideAddIcon = props.hideAddIcon, showDelAllBtn = props.showDelAllBtn, delAllChange = props.delAllChange, addIconText = props.addIconText, hideDelIcon = props.hideDelIcon, delIconText = props.delIconText, showDynamicHandle = props.showDynamicHandle, onEditableSave = props.onEditableSave, configInfo = props.configInfo, copyByKey = props.copyByKey, onTableChange = props.onTableChange, currentPage = props.currentPage, currentDataSource = props.currentDataSource, preDataSource = props.preDataSource, rowKey = props.rowKey, dataSourceRef = props.dataSourceRef, expandableChildrenColumnName = props.expandableChildrenColumnName, customSortHandle = props.customSortHandle, customOrder = props.customOrder, setCustomOrder = props.setCustomOrder, isSort = props.isSort, menuShow = props.menuShow, getMenuInfoByCell = props.getMenuInfoByCell;
+    var precisions = useContext(ZtxkContext).precisions;
     var newColumnsRef = useRef();
     var _a = useAsyncSetValue(columns), upDateColumnsRef = _a[0], setUpDateColumnsRef = _a[1];
     var _b = useAsyncSetValue(false), isUpDateColumnsRef = _b[0], setIsUpDateColumnsRef = _b[1];
@@ -524,6 +536,7 @@ function useColumns(props) {
             setUpDateColumnsRef: setUpDateColumnsRef,
             isUpDateColumnsRef: isUpDateColumnsRef,
             setIsUpDateColumnsRef: setIsUpDateColumnsRef,
+            precisions: precisions,
         }, {
             onEditableSave: onEditableSave,
             onTableChange: onTableChange,
@@ -578,6 +591,7 @@ function useColumns(props) {
         isSort,
         menuShow,
         getMenuInfoByCell,
+        precisions,
     ]);
     var _c = useState(false), refreshColumns = _c[0], setRefreshColumns = _c[1];
     var _d = useState([]), myCatchColumns = _d[0], setMyCatchColumns = _d[1];

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

@@ -20,16 +20,34 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-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, showDiff = _a.showDiff, restProps = __rest(_a, ["children", "className", "title", "showDiff"]);
     var classes = classNames('zt-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(Col, __assign({ className: classes }, restProps),
         React.createElement("span", { className: "zt-item--title" },
             title,
             "\uFF1A"),
-        React.createElement("span", { className: showDiff ? 'zt-item--text zt-item--text-diff' : 'zt-item--text' }, children)));
+        React.createElement("span", { className: showDiff ? 'zt-item--text zt-item--text-diff' : 'zt-item--text' }, getChildren())));
 };
 export default Item;

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

@@ -10,6 +10,10 @@ export interface IZtxkConfig {
     serviceNames?: {
         mdmServiceName?: string;
     };
+    precisions: {
+        price: number;
+        amount: number;
+    };
 }
 declare const ZtxkContext: React.Context<IZtxkConfig>;
 export default ZtxkContext;

package/dist/components/utils/ZtxkContext.js

@@ -9,6 +9,10 @@ var ztxkConfig = {
     serviceNames: {
         mdmServiceName: '/zmdms-mdm-data',
     },
+    precisions: {
+        price: 2,
+        amount: 2,
+    },
 };
 var ZtxkContext = React.createContext(ztxkConfig);
 export default ZtxkContext;

package/package.json

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