ztxkui 3.2.12 → 3.2.13

package/dist/DemoCom/BasicDemo.js

@@ -73,13 +73,15 @@ function BasicDemo() {
         React.createElement(InputNumber, { value: value, onChange: function (value) {
                 console.log(value, 1);
                 setValue(value);
-            }, precision: 4, formatterType: "currency", style: { width: '300px' } }),
+            }, precision: 0, 
+            // formatterType="currency"
+            style: { width: '300px' } }),
         React.createElement(AntInputNumber, { value: value, onChange: function (value) {
                 console.log(value, 1);
                 setValue(value);
             }, formatter: function (value) {
                 return ("$ " + value).replace(/\B(?=(\d{3})+(?!\d))/g, ',');
-            }, parser: function (value) { return value.replace(/\$\s?|(,*)/g, ''); }, style: { width: '300px' } }),
+            }, precision: 0, parser: function (value) { return value.replace(/\$\s?|(,*)/g, ''); }, style: { width: '300px' } }),
         React.createElement("div", null,
             React.createElement(Tag, null, "\u4F60\u597D"),
             React.createElement(Tag, { type: "normal" }, "\u4F60\u597D"),

package/dist/DemoCom/PrintContainerDemo.js

@@ -1,3 +1,14 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 /**
  * @author 陈亚雄
  * @description
@@ -11,6 +22,18 @@ import Table from 'components/Table';
 // store
 // 自定义组件
 // 其他文件
+import axios from 'axios';
+function request(options) {
+    return axios({
+        baseURL: 'http://192.168.0.83:8000',
+        url: options.url,
+        headers: __assign({ 'Zmdms-Auth': 'bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOm51bGwsImVtcF9udW1iZXIiOm51bGwsImltdF9pZCI6bnVsbCwicmVhbF9uYW1lIjoi6ZmI5Lqa6ZuEIiwiY2xpZW50X3R5cGUiOiJ3ZWIiLCJkYXRhX3JvbGVfaWQiOiIxMzQzNDkwNjg2MjYwMjI4MDk3LDEzNDU5Nzg1MDUzMDIwNTY5NjIsMTQ2ODAzNTM1MTYyNTI4NTYzNCwxNTQyMDc2MzA4NTc4MDI1NDc0IiwiY2xpZW50X2lkIjoic3dvcmQiLCJ1c2VyX3R5cGUiOiJ3ZWIiLCJyb2xlX2lkIjoiMTEyMzU5ODgxNjczODY3NTIwMSwxNDY3MDE1OTc1NDg0NzYwMDY2LDE0NjgwMzQ0MzcxNTc5NjE3MjksMTQ4MDgyOTMzNzkzOTEzMjQxNyIsInBvc3RfbmFtZSI6bnVsbCwic2NvcGUiOlsiYWxsIl0sImludGVydmlld19pZCI6bnVsbCwiZXhwIjoxNjU5MDU2NTgxLCJvcmdfbmFtZSI6bnVsbCwianRpIjoiYzI5NDlhYmQtNTRlYS00ODhkLTg2MzQtMzEyYTZkMzdhZjE0IiwibWVtYmVyX2lkIjoxLCJjb21wYW55X2lkIjpudWxsLCJzeXN0ZW1faWQiOm51bGwsImRlcHRfbmFtZSI6bnVsbCwiYXZhdGFyIjoiIiwiZGF0YV9yb2xlX25hbWUiOiJudWxsLGFkbWluLGFkbWluLGFkbWluIiwiYXV0aG9yaXRpZXMiOlsiYWRtaW4iLCJ1c2VyIiwiYWRtaW5pc3RyYXRvciJdLCJyb2xlX25hbWUiOiJhZG1pbmlzdHJhdG9yLHVzZXIsYWRtaW4sYWRtaW4iLCJyZXN1bWVfdGVtcGxhdGUiOm51bGwsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IHptZG1zIiwicG9zdF9pZCI6IiIsInVzZXJfaWQiOiIxNDEyOTUzODA0MzMzNTU1NzE0Iiwib3JnX2lkIjpudWxsLCJuaWNrX25hbWUiOiLpmYjkuprpm4QiLCJjb21wYW55X25hbWUiOm51bGwsImRlcHRfaWQiOiIiLCJoYW5kbGVfaHJfbmFtZSI6bnVsbCwiYWNjb3VudCI6ImNoZW55eCIsInJlc3VtZV9pZCI6bnVsbH0.oekbQq3Q_7PWmPgR_A1G48oN9pE2pzDMSSvmkdqg6KM' }, options.headers),
+        method: options.method,
+        data: options.data,
+    });
+}
+var sealIdList = ['2980019783467188885', '2982231505305256230'];
+var keywordList = ['测试', '测试'];
 var dataSource1 = new Array(10).fill('1').map(function (item, index) { return ({
     test1: "\u6D4B\u8BD5\u4E00" + index,
     test2: "\u6D4B\u8BD5\u4E8C" + index,
@@ -53,7 +76,7 @@ var PrintContainerDemo = function () {
             setDataSource(dataSource1);
         }, 3000);
     }, []);
-    return (React.createElement(PrintContainer, { isAddExportPage: true, loading: loading },
+    return (React.createElement(PrintContainer, { isAddExportPage: true, loading: loading, request: request, sealIdList: sealIdList, keywordList: keywordList, showHandSeal: true, showAutoSeal: true },
         React.createElement("div", { className: "html2canvas-container-page" },
             "1",
             React.createElement(Table, { columns: columns, dataSource: dataSource, rowKey: "id", scroll: {

package/dist/DemoCom/TableDemo.js

@@ -659,7 +659,7 @@ var TableDemo = function () {
                 lowMinTip: function (record, index) {
                     return "\u7B2C" + (index + 1) + "\u884C\uFF0C\u4F4E\u4E8E\u6700\u5C0F\u503C\uFF0C\u5DF2\u4FEE\u6539\u6210\u6700\u5C0F\u503C";
                 },
-                precision: 3,
+                precision: 0,
                 formatterType: 'currency',
                 onBlur: function () {
                     setBtnLoading(false);

package/dist/components/InputNumber/input-number.js

@@ -57,6 +57,6 @@ function InputNumber(props) {
         onOverRangeHandle();
         onPressEnter && onPressEnter(e);
     };
-    return (React.createElement(AntInputNumber, __assign({ formatter: formatter || _formatter, parser: parser || _parser, precision: precision || _precision, onChange: onChangeHandle, onBlur: onBlurHandle, onPressEnter: onPressEnterHandle }, restProps)));
+    return (React.createElement(AntInputNumber, __assign({ formatter: formatter || _formatter, parser: parser || _parser, precision: precision !== null && precision !== void 0 ? precision : _precision, onChange: onChangeHandle, onBlur: onBlurHandle, onPressEnter: onPressEnterHandle }, restProps)));
 }
 export default InputNumber;

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

@@ -16,6 +16,18 @@ interface IProps {
     loading?: boolean;
     /** 导出pdf文件名 */
     pdfName?: string;
+    /**请求方法 */
+    request?: any;
+    /** 印章id */
+    sealIdList?: string[];
+    /** 关键字 */
+    keywordList?: string[];
+    /** 手动盖章 */
+    showHandSeal?: boolean;
+    /** 自动盖章 */
+    showAutoSeal?: boolean;
+    /** 盖章是否需要水印 */
+    needWatermark?: number;
 }
 declare const PrintContainer: React.FC<IProps>;
 export default PrintContainer;

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

@@ -10,19 +10,31 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
 import React, { useEffect, useRef, useState } from 'react';
 // redux
 // ztxkui公共组件
-import { Button, Spin } from '../../index';
+import { Button, Spin, message } from '../../index';
 // 路由配置
 // store
 // 自定义组件
 // 其他文件
-import { addWaterHandle, removeWaterHandle, printCurrentDom, htmlToPdf, } from 'ztxkutils/dist/print';
+import { addWaterHandle, removeWaterHandle, printCurrentDom, htmlToPdf, htmlToPdfForExport, } from 'ztxkutils/dist/print';
+// 将base64转换为文件
+function dataURLtoFile(dataurl, filename) {
+    var arr = dataurl.split(','), mime = arr[0].match(/:(.*?);/)[1], bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
+    while (n--) {
+        u8arr[n] = bstr.charCodeAt(n);
+    }
+    return new File([u8arr], filename, { type: mime });
+}
 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;
-    var _e = useState(false), showWater = _e[0], setShowWater = _e[1];
-    var _f = useState(false), pdfShowWater = _f[0], setPdfShowWater = _f[1];
+    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, keywordList = _a.keywordList, showHandSeal = _a.showHandSeal, showAutoSeal = _a.showAutoSeal, _e = _a.needWatermark, needWatermark = _e === void 0 ? 0 : _e;
+    var _f = useState(false), showWater = _f[0], setShowWater = _f[1];
+    var _g = useState(false), pdfShowWater = _g[0], setPdfShowWater = _g[1];
     var containerRef = useRef();
     var allDomRef = useRef();
-    var _g = useState(false), spinning = _g[0], setSpinning = _g[1];
+    var _h = useState(false), spinning = _h[0], setSpinning = _h[1];
+    // 确认盖章后，会得到一个合同id 这个之后盖章要用
+    var _j = useState(), currentContractId = _j[0], setCurrentContractId = _j[1];
+    // 盖章后会得到一个预览地址，这个地址耀保存,同一个合同id，不能重复盖章接口
+    var _k = useState(), currentViewUrl = _k[0], setCurrentViewUrl = _k[1];
     useEffect(function () {
         setSpinning(loading);
     }, [loading]);
@@ -110,13 +122,10 @@ var PrintContainer = function (_a) {
                 pdfName: pdfName,
                 isShowPage: isAddExportPage,
             })
-                .then(function (pdf) {
-                // const pdfBase64 = pdf.output('dataurlstring');
-                // const pdfFile = dataURLtoFile(pdfBase64, pdfName);
-                // console.log(pdfFile);
+                .then(function () {
                 setSpinning(false);
             })
-                .catch(function (pdf) {
+                .catch(function () {
                 setSpinning(false);
             });
         });
@@ -125,6 +134,171 @@ var PrintContainer = function (_a) {
     var onCloseHandle = function () {
         window.close();
     };
+    // 确认盖章位置
+    var onSurePositionHandle = function () {
+        setSpinning(true);
+        setTimeout(function () {
+            htmlToPdfForExport({
+                dom: containerRef.current,
+                isShowPage: isAddExportPage,
+            })
+                .then(function (option) {
+                var pdfBase64 = option.pdfBase64;
+                var files = Array.isArray(pdfBase64)
+                    ? pdfBase64.map(function (base64) { return dataURLtoFile(base64, pdfName + ".pdf"); })
+                    : [];
+                var formData = new FormData();
+                files.forEach(function (file, i) {
+                    formData.append("fileList[" + i + "]", file);
+                });
+                if (Array.isArray(sealIdList)) {
+                    sealIdList.forEach(function (sealId, i) {
+                        formData.append("sealIdList[" + i + "]", sealId);
+                    });
+                }
+                request({
+                    url: '/api/zmdms-resource/seal/confirm-seal-position',
+                    method: 'POST',
+                    data: formData,
+                    headers: {
+                        'Content-Type': 'multipart/form-data',
+                    },
+                })
+                    .then(function (res) {
+                    var _a;
+                    setSpinning(false);
+                    console.log(res);
+                    if (res.status === 200 && res.data.code === 200) {
+                        var data = (res.data || {}).data;
+                        setCurrentContractId(data === null || data === void 0 ? void 0 : data.contractId);
+                        // 重新确认盖章位置后，要清空当前保存的盖章url
+                        setCurrentViewUrl('');
+                        if (data === null || data === void 0 ? void 0 : data.preSignUrl) {
+                            window.open(data === null || data === void 0 ? void 0 : data.preSignUrl);
+                        }
+                        else {
+                            message.info("\u672A\u80FD\u8FD4\u56DE\u76D6\u7AE0\u94FE\u63A5\uFF01");
+                        }
+                    }
+                    else {
+                        message.info(((_a = res === null || res === void 0 ? void 0 : res.data) === null || _a === void 0 ? void 0 : _a.msg) || '接口请求失败!');
+                    }
+                })
+                    .catch(function (err) {
+                    var _a, _b;
+                    setSpinning(false);
+                    message.error(((_b = (_a = err === null || err === void 0 ? void 0 : err.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.msg) || '接口调用失败！');
+                });
+            })
+                .catch(function () {
+                setSpinning(false);
+            });
+        });
+    };
+    // 盖章
+    var onSealHandle = function () {
+        if (currentViewUrl) {
+            window.open(currentViewUrl);
+            return;
+        }
+        setSpinning(true);
+        request({
+            url: '/api/zmdms-resource/seal/final-seal',
+            method: 'POST',
+            data: {
+                contractId: currentContractId,
+                sealIdList: sealIdList,
+                needWatermark: needWatermark,
+            },
+            heaers: {
+                'Content-Type': 'application/json',
+            },
+        })
+            .then(function (res) {
+            var _a;
+            console.log(res);
+            setSpinning(false);
+            if (res.status === 200 && res.data.code === 200) {
+                var data = (res.data || {}).data;
+                if (data === null || data === void 0 ? void 0 : data.viewUrl) {
+                    setCurrentViewUrl(data === null || data === void 0 ? void 0 : data.viewUrl);
+                    window.open(data === null || data === void 0 ? void 0 : data.viewUrl);
+                }
+                else {
+                    message.info("\u672A\u80FD\u8FD4\u56DE\u76D6\u7AE0\u94FE\u63A5\uFF01");
+                }
+            }
+            else {
+                message.info(((_a = res === null || res === void 0 ? void 0 : res.data) === null || _a === void 0 ? void 0 : _a.msg) || '接口请求失败!');
+            }
+        })
+            .catch(function (err) {
+            var _a, _b;
+            setSpinning(false);
+            message.error(((_b = (_a = err === null || err === void 0 ? void 0 : err.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.msg) || '接口调用失败！');
+        });
+    };
+    // 自动盖章
+    var onAutoSealHandle = function () {
+        setSpinning(true);
+        setTimeout(function () {
+            htmlToPdfForExport({
+                dom: containerRef.current,
+                isShowPage: isAddExportPage,
+            })
+                .then(function (option) {
+                var pdfBase64 = option.pdfBase64;
+                var files = Array.isArray(pdfBase64)
+                    ? pdfBase64.map(function (base64) { return dataURLtoFile(base64, pdfName + ".pdf"); })
+                    : [];
+                var formData = new FormData();
+                files.forEach(function (file, i) {
+                    formData.append("fileList[" + i + "]", file);
+                });
+                if (Array.isArray(sealIdList) && Array.isArray(keywordList)) {
+                    sealIdList.forEach(function (sealId, i) {
+                        var keyword = keywordList[i];
+                        formData.append("sealPositionInfoList[" + i + "].sealId", sealId);
+                        formData.append("sealPositionInfoList[" + i + "].keyword", keyword);
+                    });
+                }
+                request({
+                    url: '/api/zmdms-resource/seal/auto-seal',
+                    method: 'POST',
+                    data: formData,
+                    headers: {
+                        'Content-Type': 'multipart/form-data',
+                    },
+                })
+                    .then(function (res) {
+                    var _a;
+                    setSpinning(false);
+                    console.log(res);
+                    if (res.status === 200 && res.data.code === 200) {
+                        var data = (res.data || {}).data;
+                        setCurrentContractId(data === null || data === void 0 ? void 0 : data.contractId);
+                        if (data === null || data === void 0 ? void 0 : data.preSignUrl) {
+                            window.open(data === null || data === void 0 ? void 0 : data.preSignUrl);
+                        }
+                        else {
+                            message.info("\u672A\u80FD\u8FD4\u56DE\u76D6\u7AE0\u94FE\u63A5\uFF01");
+                        }
+                    }
+                    else {
+                        message.info(((_a = res === null || res === void 0 ? void 0 : res.data) === null || _a === void 0 ? void 0 : _a.msg) || '接口请求失败!');
+                    }
+                })
+                    .catch(function (err) {
+                    var _a, _b;
+                    setSpinning(false);
+                    message.error(((_b = (_a = err === null || err === void 0 ? void 0 : err.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.msg) || '接口调用失败！');
+                });
+            })
+                .catch(function () {
+                setSpinning(false);
+            });
+        });
+    };
     return (React.createElement(Spin, { spinning: spinning },
         React.createElement("div", { className: "print-container--header" },
             React.createElement("div", { className: "print-container--header__content" },
@@ -134,6 +308,10 @@ var PrintContainer = function (_a) {
                 React.createElement(Button, { type: "primary", onClick: onPrintHandle }, "\u6253\u5370"),
                 React.createElement(Button, { type: "primary", onClick: onPdfWaterHandle }, !pdfShowWater ? '添加导出PDF水印' : '移除导出PDF水印'),
                 React.createElement(Button, { type: "primary", onClick: onPdfHandle }, "\u5BFC\u51FAPDF"),
+                showHandSeal && (React.createElement(React.Fragment, null,
+                    React.createElement(Button, { type: "primary", onClick: onSurePositionHandle }, "\u786E\u8BA4\u76D6\u7AE0\u4F4D\u7F6E"),
+                    currentContractId && (React.createElement(Button, { type: "primary", onClick: onSealHandle }, "\u76D6\u7AE0")))),
+                showAutoSeal && (React.createElement(Button, { type: "primary", onClick: onAutoSealHandle }, "\u81EA\u52A8\u76D6\u7AE0")),
                 React.createElement(Button, { type: "primary", onClick: onCloseHandle }, "\u5173\u95ED"))),
         React.createElement("div", { className: "print-container--content", ref: containerRef }, children)));
 };

package/dist/index.css

@@ -1811,7 +1811,7 @@ template {
   align-items: center;
 }
 .print-container--header .print-container--header__content > button {
-  margin-right: 10px;
+  margin-right: 5px;
 }
 
 .print-container--content {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "3.2.12",
+  "version": "3.2.13",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",
@@ -23,7 +23,7 @@
     "react-infinite-scroll-component": "^6.1.0",
     "react-resizable": "^3.0.4",
     "react-to-print": "^2.14.7",
-    "ztxkutils": "^2.6.2"
+    "ztxkutils": "^2.7.17"
   },
   "scripts": {
     "analyze": "source-map-explorer 'dist/static/js/*.js'",