ztxkui 3.4.13 → 3.4.16

package/dist/components/PrintContainer/print-container.d.ts

@@ -38,6 +38,10 @@ export interface IProps {
     flowId?: string;
     /** 水印图片 */
     imgWaterBg?: string;
+    /** 点击打印的回调函数 */
+    onPrintCallback?: () => void;
+    /** 是否添加点击打印提示 */
+    showPrintMessage?: boolean;
 }
 declare const PrintContainer: React.FC<IProps>;
 export default PrintContainer;

package/dist/components/PrintContainer/print-container.js

@@ -46,7 +46,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
 import React, { useEffect, useRef, useState } from 'react';
 // redux
 // ztxkui公共组件
-import { Button, Spin, message } from '../../index';
+import { Button, Spin, message, Modal } from '../../index';
 // 路由配置
 // store
 // 自定义组件
@@ -75,7 +75,7 @@ function downloadFontTTF(_a) {
     });
 }
 var PrintContainer = function (_a) {
-    var children = _a.children, waterText = _a.waterText, onFonsizeChange = _a.onFonsizeChange, hiddenClassName = _a.hiddenClassName, _b = _a.isAddExportPage, isAddExportPage = _b === void 0 ? false : _b, _c = _a.loading, loading = _c === void 0 ? false : _c, _d = _a.pdfName, pdfName = _d === void 0 ? 'pdf文件' : _d, request = _a.request, sealIdList = _a.sealIdList, autoSealIdList = _a.autoSealIdList, keywordList = _a.keywordList, _e = _a.showHandSeal, showHandSeal = _e === void 0 ? true : _e, _f = _a.showAutoSeal, showAutoSeal = _f === void 0 ? true : _f, _g = _a.needWatermark, needWatermark = _g === void 0 ? 0 : _g, fileId = _a.fileId, deptId = _a.deptId, flowId = _a.flowId, imgWaterBg = _a.imgWaterBg;
+    var children = _a.children, waterText = _a.waterText, onFonsizeChange = _a.onFonsizeChange, hiddenClassName = _a.hiddenClassName, _b = _a.isAddExportPage, isAddExportPage = _b === void 0 ? false : _b, _c = _a.loading, loading = _c === void 0 ? false : _c, _d = _a.pdfName, pdfName = _d === void 0 ? 'pdf文件' : _d, request = _a.request, sealIdList = _a.sealIdList, autoSealIdList = _a.autoSealIdList, keywordList = _a.keywordList, _e = _a.showHandSeal, showHandSeal = _e === void 0 ? true : _e, _f = _a.showAutoSeal, showAutoSeal = _f === void 0 ? true : _f, _g = _a.needWatermark, needWatermark = _g === void 0 ? 0 : _g, fileId = _a.fileId, deptId = _a.deptId, flowId = _a.flowId, imgWaterBg = _a.imgWaterBg, onPrintCallback = _a.onPrintCallback, showPrintMessage = _a.showPrintMessage;
     var _h = useState(false), showWater = _h[0], setShowWater = _h[1];
     var containerRef = useRef();
     var allDomRef = useRef();
@@ -231,11 +231,37 @@ var PrintContainer = function (_a) {
     };
     // 打印
     var onPrintHandle = function () {
-        printCurrentDom({
-            hiddenClassNames: __spreadArray([
-                '.print-container--header'
-            ], (hiddenClassName || [])),
-        });
+        if (showPrintMessage) {
+            var isOkSure_1 = false;
+            Modal.confirm({
+                title: '打印提示',
+                content: '点击确认按钮后，将作为一次成功的打印，并记录到系统！你确认要打印吗？',
+                okText: '确认',
+                onOk: function () {
+                    isOkSure_1 = true;
+                    onPrintCallback && onPrintCallback();
+                },
+                afterClose: function () {
+                    if (isOkSure_1) {
+                        setTimeout(function () {
+                            printCurrentDom({
+                                hiddenClassNames: __spreadArray([
+                                    '.print-container--header'
+                                ], (hiddenClassName || [])),
+                            });
+                        });
+                    }
+                },
+            });
+        }
+        else {
+            onPrintCallback && onPrintCallback();
+            printCurrentDom({
+                hiddenClassNames: __spreadArray([
+                    '.print-container--header'
+                ], (hiddenClassName || [])),
+            });
+        }
     };
     // 生成pdf
     var onPdfHandle = function () { return __awaiter(void 0, void 0, void 0, function () {

package/dist/components/business/Signatures/components/DetailTable.js

@@ -92,7 +92,7 @@ var DetailTable = function (_a) {
                                 viewSealPageFn && viewSealPageFn();
                             } }, "\u9884\u89C8\u76D6\u7AE0\u6548\u679C"),
                         (electronicList || [])
-                            .filter(function (item) { return electronicSeal.includes(item.sealId); })
+                            .filter(function (item) { return electronicSeal === null || electronicSeal === void 0 ? void 0 : electronicSeal.includes(item.sealId); })
                             .map(function (n) { return (React.createElement("div", { style: { padding: '3px 0' }, key: n.sealId }, n.sealName || '')); }))),
                     props: {},
                 };

package/dist/components/business/Signatures/hooks.js

@@ -8,6 +8,9 @@ export function useRecords(fileList) {
         if (Array.isArray(fileList)) {
             setRecords(fileList);
         }
+        else {
+            setRecords([]);
+        }
     }, [fileList]);
     return {
         records: records,
@@ -20,6 +23,9 @@ export function useQunjData(data) {
         if (typeof data === 'object') {
             setQunjSeal(data);
         }
+        else {
+            setQunjSeal({});
+        }
     }, [data]);
     return {
         qunjSeal: qunjSeal,
@@ -32,6 +38,9 @@ export function useElectronicData(data) {
         if (Array.isArray(data)) {
             setElectronicSeal(data);
         }
+        else {
+            setElectronicSeal([]);
+        }
     }, [data]);
     return {
         electronicSeal: electronicSeal,

package/dist/components/business/Signatures/index.js

@@ -254,11 +254,12 @@ var Sinatures = function (_a) {
             data: params,
         })
             .then(function (res) {
+            var _a;
             if (res.status === 200 &&
                 res.data.code === 200 &&
                 res.data.data.preSignUrl) {
                 for (var i = sealedIds.length; i--; i >= 0) {
-                    if (res.data.data.deleteAttachIdList.includes(sealedIds[i])) {
+                    if ((_a = res.data.data.deleteAttachIdList) === null || _a === void 0 ? void 0 : _a.includes(sealedIds[i])) {
                         sealedIds.splice(i, 1);
                     }
                 }
@@ -603,7 +604,7 @@ var Sinatures = function (_a) {
             var hasElectronicSeal = records === null || records === void 0 ? void 0 : records.some(function (item) { return !!item.isElectronicSeal; });
             // 勾选加盖电子印章时未勾选电子印章
             if ((innerElectronicSeal === null || innerElectronicSeal === void 0 ? void 0 : innerElectronicSeal.length) === 0 && hasElectronicSeal) {
-                message.warning('请勾选加盖电子印章所需要的印章列表[表格右侧]！');
+                message.warning('请勾选加盖电子印章所需要的印章列表！');
                 return false;
             }
             // 超过4倍禁止提交审批

package/dist/hooks/useFormatter.js

@@ -64,12 +64,44 @@ function useFormatter(formatterType, currencySymbol) {
         precision: precision,
     };
 }
+function formatCurrency(n) {
+    if (n != null) {
+        var _n = n.toString();
+        var pointIndex = _n.indexOf('.');
+        var pointAfterNum = '';
+        if (pointIndex !== -1) {
+            n = _n.slice(0, pointIndex);
+            pointAfterNum = _n.slice(pointIndex);
+        }
+        var res = '';
+        var s = n.toString();
+        var length_1 = s.length;
+        for (var i = length_1 - 1; i >= 0; i--) {
+            var j = length_1 - i;
+            if (j % 3 === 0) {
+                if (i === 0) {
+                    res = s[i] + res;
+                }
+                else {
+                    res = ',' + s[i] + res;
+                }
+            }
+            else {
+                res = s[i] + res;
+            }
+        }
+        return res + pointAfterNum;
+    }
+    else {
+        return n;
+    }
+}
 export function getFormatter(formatterType, currencySymbol) {
     if (currencySymbol === void 0) { currencySymbol = '$'; }
     if (formatterType === 'currency') {
-        var formatterFn = function (value) {
-            return ("" + value).replace(/\B(?=(\d{3})+(?!\d))/g, ',');
-        };
+        // let formatterFn: IFormatterFuc = (value) =>
+        //   `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+        var formatterFn = function (value) { return formatCurrency(value); };
         var parserFn = function (value) { return value.replace(/(,*)/g, ''); };
         return {
             formatter: formatterFn,

package/package.json

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