ztxkui 10.0.73 → 10.0.75

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;
@@ -472,7 +472,14 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
                 var value = text;
                 if (text == null || text === '')
                     return '— —';
-                else if (_column.dateFormat)
+                if (_column.title.includes('单价')) {
+                    return priceOrAmountFormat(text, _column.precision || precisions.price);
+                }
+                else if (_column.title.includes('金额') ||
+                    _column.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/dist/index.d.ts

@@ -1,3 +1,62 @@
+export { default as Button } from './components/Button';
+export { default as Calendar } from './components/Calendar';
+export { default as Checkbox } from './components/Checkbox';
+export { default as DatePicker } from './components/DatePicker';
+export { default as RangePicker } from './components/RangePicker';
+export { default as Input } from './components/Input';
+export { InputNumberRange, default as InputNumber, } from './components/InputNumber';
+export { default as Radio } from './components/Radio';
+export { default as Select } from './components/Select';
+export { default as FetchSelect } from './components/FetchSelect';
+export { default as TimePicker } from './components/TimePicker';
+export { default as Form } from './components/Form';
+export { default as ProForm } from './components/ProForm';
+export { default as Menu } from './components/Menu';
+export { default as Layout } from './components/Layout';
+export { default as Tabs } from './components/Tabs';
+export { default as Modal } from './components/Modal';
+export { default as ProModal } from './components/ProModal';
+export { default as Pagination } from './components/Pagination';
+export { default as Table } from './components/Table';
+export { default as ProTable } from './components/ProTable';
+export { default as Sortable } from './components/Sortable';
+export { default as SortableCancel } from './components/SortableCancel';
+export { default as Container } from './components/business/Container';
+export { default as SearchContainer } from './components/business/SearchContainer';
+export { default as Footer } from './components/business/Footer';
+export { default as FormList } from './components/business/NewList';
+export { default as ProFormList } from './components/ProFormList';
+export { default as Upload } from './components/Upload';
+export { default as ZtIcon } from './components/ZtIcon';
+export { default as DetailHeader } from './components/business/DetailHeader';
+export { default as DetailCard } from './components/business/DetailCard';
+export { default as DetailList } from './components/business/DetailList';
+export { default as ExportButton } from './components/business/ExportButton';
+export { default as OperationBtnGroup } from './components/business/OperationBtnGroup';
+export { default as EnhanceSelect } from './components/EnhanceSelect';
+export { default as EnhanceTree } from './components/EnhanceTree';
+export { default as EnhanceTreeSelect } from './components/EnhanceTreeSelect';
+export { default as Collapse } from './components/Collapse';
+export { default as GridList } from './components/business/GridList';
+export { default as Timeline } from './components/Timeline';
+export { default as Tag } from './components/Tag';
+export { UserInfo, UserPassword } from './components/business/Common';
+export { default as Analyse } from './components/business/Analyse';
+export { default as SortList } from './components/business/SortList';
+export { default as Empty } from './components/Empty';
+export { default as Print } from './components/Print';
+export { default as PrintContainer } from './components/PrintContainer';
+export { default as Sinatures } from './components/business/Signatures';
+export { default as UploadSingle } from './components/UploadSingle';
+export { default as CodeQuery } from './components/business/CodeQuery';
+export { default as DgColumns } from './components/business/DgColumns';
+export { default as message } from './components/basic/message';
+export { default as NumberCase } from './components/NumberCase';
+export { default as OCR } from './components/OCR_COM';
+export { default as DrawerOcr } from './components/OCR_COM/DrawerOcr';
+export { default as ChatRoom } from './components/ChatRoom';
+export { default as Asr } from './components/Asr';
+export { default as ZtxkContext } from './components/utils/ZtxkContext';
 export { ConfigProvider, Drawer, Space, Grid, Divider, Dropdown, Badge, List, Result, Spin, Popconfirm, TreeSelect, Tree, Progress, Cascader, Tooltip, Descriptions, Image, Popover, Breadcrumb, Transfer, Row, Col, notification, Slider, Rate, Affix, } from 'antd';
 export { default as zhCN } from 'antd/lib/locale/zh_CN';
 export { default as Icon, createFromIconfontCN } from '@ant-design/icons';

package/dist/index.js

@@ -123,68 +123,65 @@
 //   // </React.StrictMode>,
 //   document.getElementById('root')
 // );
-// export { default as Button } from './components/Button';
-// export { default as Calendar } from './components/Calendar';
-// export { default as Checkbox } from './components/Checkbox';
-// export { default as DatePicker } from './components/DatePicker';
-// export { default as RangePicker } from './components/RangePicker';
-// export { default as Input } from './components/Input';
-// export {
-//   InputNumberRange,
-//   default as InputNumber,
-// } from './components/InputNumber';
-// export { default as Radio } from './components/Radio';
-// export { default as Select } from './components/Select';
-// export { default as FetchSelect } from './components/FetchSelect';
-// export { default as TimePicker } from './components/TimePicker';
-// export { default as Form } from './components/Form';
-// export { default as ProForm } from './components/ProForm';
-// export { default as Menu } from './components/Menu';
-// export { default as Layout } from './components/Layout';
-// export { default as Tabs } from './components/Tabs';
-// export { default as Modal } from './components/Modal';
-// export { default as ProModal } from './components/ProModal';
-// export { default as Pagination } from './components/Pagination';
-// export { default as Table } from './components/Table';
-// export { default as ProTable } from './components/ProTable';
-// export { default as Sortable } from './components/Sortable';
-// export { default as SortableCancel } from './components/SortableCancel';
-// export { default as Container } from './components/business/Container';
-// export { default as SearchContainer } from './components/business/SearchContainer';
-// export { default as Footer } from './components/business/Footer';
-// export { default as FormList } from './components/business/NewList';
-// export { default as ProFormList } from './components/ProFormList';
-// export { default as Upload } from './components/Upload';
-// export { default as ZtIcon } from './components/ZtIcon';
-// export { default as DetailHeader } from './components/business/DetailHeader';
-// export { default as DetailCard } from './components/business/DetailCard';
-// export { default as DetailList } from './components/business/DetailList';
-// export { default as ExportButton } from './components/business/ExportButton';
-// export { default as OperationBtnGroup } from './components/business/OperationBtnGroup';
-// export { default as EnhanceSelect } from './components/EnhanceSelect';
-// export { default as EnhanceTree } from './components/EnhanceTree';
-// export { default as EnhanceTreeSelect } from './components/EnhanceTreeSelect';
-// export { default as Collapse } from './components/Collapse';
-// export { default as GridList } from './components/business/GridList';
-// export { default as Timeline } from './components/Timeline';
-// export { default as Tag } from './components/Tag';
-// export { UserInfo, UserPassword } from './components/business/Common';
-// export { default as Analyse } from './components/business/Analyse';
-// export { default as SortList } from './components/business/SortList';
-// export { default as Empty } from './components/Empty';
-// export { default as Print } from './components/Print';
-// export { default as PrintContainer } from './components/PrintContainer';
-// export { default as Sinatures } from './components/business/Signatures';
-// export { default as UploadSingle } from './components/UploadSingle';
-// export { default as CodeQuery } from './components/business/CodeQuery';
-// export { default as DgColumns } from './components/business/DgColumns';
-// export { default as message } from './components/basic/message';
-// export { default as NumberCase } from './components/NumberCase';
-// export { default as OCR } from './components/OCR_COM';
-// export { default as DrawerOcr } from './components/OCR_COM/DrawerOcr';
-// export { default as ChatRoom } from './components/ChatRoom';
-// export { default as Asr } from './components/Asr';
-// export { default as ZtxkContext } from './components/utils/ZtxkContext';
+export { default as Button } from './components/Button';
+export { default as Calendar } from './components/Calendar';
+export { default as Checkbox } from './components/Checkbox';
+export { default as DatePicker } from './components/DatePicker';
+export { default as RangePicker } from './components/RangePicker';
+export { default as Input } from './components/Input';
+export { InputNumberRange, default as InputNumber, } from './components/InputNumber';
+export { default as Radio } from './components/Radio';
+export { default as Select } from './components/Select';
+export { default as FetchSelect } from './components/FetchSelect';
+export { default as TimePicker } from './components/TimePicker';
+export { default as Form } from './components/Form';
+export { default as ProForm } from './components/ProForm';
+export { default as Menu } from './components/Menu';
+export { default as Layout } from './components/Layout';
+export { default as Tabs } from './components/Tabs';
+export { default as Modal } from './components/Modal';
+export { default as ProModal } from './components/ProModal';
+export { default as Pagination } from './components/Pagination';
+export { default as Table } from './components/Table';
+export { default as ProTable } from './components/ProTable';
+export { default as Sortable } from './components/Sortable';
+export { default as SortableCancel } from './components/SortableCancel';
+export { default as Container } from './components/business/Container';
+export { default as SearchContainer } from './components/business/SearchContainer';
+export { default as Footer } from './components/business/Footer';
+export { default as FormList } from './components/business/NewList';
+export { default as ProFormList } from './components/ProFormList';
+export { default as Upload } from './components/Upload';
+export { default as ZtIcon } from './components/ZtIcon';
+export { default as DetailHeader } from './components/business/DetailHeader';
+export { default as DetailCard } from './components/business/DetailCard';
+export { default as DetailList } from './components/business/DetailList';
+export { default as ExportButton } from './components/business/ExportButton';
+export { default as OperationBtnGroup } from './components/business/OperationBtnGroup';
+export { default as EnhanceSelect } from './components/EnhanceSelect';
+export { default as EnhanceTree } from './components/EnhanceTree';
+export { default as EnhanceTreeSelect } from './components/EnhanceTreeSelect';
+export { default as Collapse } from './components/Collapse';
+export { default as GridList } from './components/business/GridList';
+export { default as Timeline } from './components/Timeline';
+export { default as Tag } from './components/Tag';
+export { UserInfo, UserPassword } from './components/business/Common';
+export { default as Analyse } from './components/business/Analyse';
+export { default as SortList } from './components/business/SortList';
+export { default as Empty } from './components/Empty';
+export { default as Print } from './components/Print';
+export { default as PrintContainer } from './components/PrintContainer';
+export { default as Sinatures } from './components/business/Signatures';
+export { default as UploadSingle } from './components/UploadSingle';
+export { default as CodeQuery } from './components/business/CodeQuery';
+export { default as DgColumns } from './components/business/DgColumns';
+export { default as message } from './components/basic/message';
+export { default as NumberCase } from './components/NumberCase';
+export { default as OCR } from './components/OCR_COM';
+export { default as DrawerOcr } from './components/OCR_COM/DrawerOcr';
+export { default as ChatRoom } from './components/ChatRoom';
+export { default as Asr } from './components/Asr';
+export { default as ZtxkContext } from './components/utils/ZtxkContext';
 export { ConfigProvider, Drawer, Space, Grid, Divider, Dropdown, Badge, List, Result, Spin, Popconfirm, TreeSelect, Tree, Progress, Cascader, Tooltip, Descriptions, Image, Popover, Breadcrumb, Transfer, Row, Col, notification, Slider, Rate, Affix, } from 'antd';
 export { default as zhCN } from 'antd/lib/locale/zh_CN';
 export { default as Icon, createFromIconfontCN } from '@ant-design/icons';

package/package.json

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