npm - ztxkui - Versions diffs - 3.2.16 → 3.2.17 - Mend

ztxkui 3.2.16 → 3.2.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/dist/DemoCom/PrintContainerDemo.js +1 -1
package/dist/components/PrintContainer/print-container.d.ts +2 -0
package/dist/components/PrintContainer/print-container.js +39 -15
package/package.json +1 -1

package/dist/DemoCom/PrintContainerDemo.js CHANGED Viewed

@@ -27,7 +27,7 @@ function request(options) {
     return axios({
         baseURL: options.baseURL ? options.baseURL : 'http://192.168.0.83:8000',
         url: options.url,
-        headers: __assign({ 'Zmdms-Auth': 'bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOm51bGwsImVtcF9udW1iZXIiOm51bGwsImltdF9pZCI6bnVsbCwicmVhbF9uYW1lIjoi6ZmI5Lqa6ZuEIiwiY2xpZW50X3R5cGUiOiJ3ZWIiLCJkYXRhX3JvbGVfaWQiOiIxMzQzNDkwNjg2MjYwMjI4MDk3LDEzNDU5Nzg1MDUzMDIwNTY5NjIsMTQ2ODAzNTM1MTYyNTI4NTYzNCwxNTQyMDc2MzA4NTc4MDI1NDc0IiwiY2xpZW50X2lkIjoic3dvcmQiLCJ1c2VyX3R5cGUiOiJ3ZWIiLCJyb2xlX2lkIjoiMTEyMzU5ODgxNjczODY3NTIwMSwxNDY3MDE1OTc1NDg0NzYwMDY2LDE0NjgwMzQ0MzcxNTc5NjE3MjksMTQ4MDgyOTMzNzkzOTEzMjQxNyIsInBvc3RfbmFtZSI6bnVsbCwic2NvcGUiOlsiYWxsIl0sImludGVydmlld19pZCI6bnVsbCwiZXhwIjoxNjU5NDE0MjU0LCJvcmdfbmFtZSI6bnVsbCwianRpIjoiZmJiYzJlYjYtZmJmNi00MTkyLThhODEtN2U5OTkxN2M5MDUxIiwibWVtYmVyX2lkIjoxLCJjb21wYW55X2lkIjpudWxsLCJzeXN0ZW1faWQiOm51bGwsImRlcHRfbmFtZSI6bnVsbCwiYXZhdGFyIjoiIiwiZGF0YV9yb2xlX25hbWUiOiJudWxsLGFkbWluLGFkbWluLGFkbWluIiwiYXV0aG9yaXRpZXMiOlsiYWRtaW4iLCJ1c2VyIiwiYWRtaW5pc3RyYXRvciJdLCJyb2xlX25hbWUiOiJhZG1pbmlzdHJhdG9yLHVzZXIsYWRtaW4sYWRtaW4iLCJyZXN1bWVfdGVtcGxhdGUiOm51bGwsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IHptZG1zIiwicG9zdF9pZCI6IiIsInVzZXJfaWQiOiIxNDEyOTUzODA0MzMzNTU1NzE0Iiwib3JnX2lkIjpudWxsLCJuaWNrX25hbWUiOiLpmYjkuprpm4QiLCJjb21wYW55X25hbWUiOm51bGwsImRlcHRfaWQiOiIiLCJoYW5kbGVfaHJfbmFtZSI6bnVsbCwiYWNjb3VudCI6ImNoZW55eCIsInJlc3VtZV9pZCI6bnVsbH0.L7cdhTBDi8A01glKumGYSVFpBBGEQz5aroOH1-Nlb3Q' }, options.headers),
+        headers: __assign({ 'Zmdms-Auth': 'bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOm51bGwsImVtcF9udW1iZXIiOm51bGwsImltdF9pZCI6bnVsbCwicmVhbF9uYW1lIjoi6ZmI5Lqa6ZuEIiwiY2xpZW50X3R5cGUiOiJ3ZWIiLCJkYXRhX3JvbGVfaWQiOiIxMzQzNDkwNjg2MjYwMjI4MDk3LDEzNDU5Nzg1MDUzMDIwNTY5NjIsMTQ2ODAzNTM1MTYyNTI4NTYzNCwxNTQyMDc2MzA4NTc4MDI1NDc0IiwiY2xpZW50X2lkIjoic3dvcmQiLCJ1c2VyX3R5cGUiOiJ3ZWIiLCJyb2xlX2lkIjoiMTEyMzU5ODgxNjczODY3NTIwMSwxNDY3MDE1OTc1NDg0NzYwMDY2LDE0NjgwMzQ0MzcxNTc5NjE3MjksMTQ4MDgyOTMzNzkzOTEzMjQxNyIsInBvc3RfbmFtZSI6bnVsbCwic2NvcGUiOlsiYWxsIl0sImludGVydmlld19pZCI6bnVsbCwiZXhwIjoxNjU5NDkxNzgwLCJvcmdfbmFtZSI6bnVsbCwianRpIjoiNDlmN2UzZmQtZmIzMi00ZTZjLWIwMmUtOTBkMjdlMzY3NjVjIiwibWVtYmVyX2lkIjoxLCJjb21wYW55X2lkIjpudWxsLCJzeXN0ZW1faWQiOm51bGwsImRlcHRfbmFtZSI6bnVsbCwiYXZhdGFyIjoiIiwiZGF0YV9yb2xlX25hbWUiOiJudWxsLGFkbWluLGFkbWluLGFkbWluIiwiYXV0aG9yaXRpZXMiOlsiYWRtaW4iLCJ1c2VyIiwiYWRtaW5pc3RyYXRvciJdLCJyb2xlX25hbWUiOiJhZG1pbmlzdHJhdG9yLHVzZXIsYWRtaW4sYWRtaW4iLCJyZXN1bWVfdGVtcGxhdGUiOm51bGwsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IHptZG1zIiwicG9zdF9pZCI6IiIsInVzZXJfaWQiOiIxNDEyOTUzODA0MzMzNTU1NzE0Iiwib3JnX2lkIjpudWxsLCJuaWNrX25hbWUiOiLpmYjkuprpm4QiLCJjb21wYW55X25hbWUiOm51bGwsImRlcHRfaWQiOiIiLCJoYW5kbGVfaHJfbmFtZSI6bnVsbCwiYWNjb3VudCI6ImNoZW55eCIsInJlc3VtZV9pZCI6bnVsbH0.dvTb_yy1956xAniua6u2gVdWVa6id4uSDrxT71AgO8g' }, options.headers),
         method: options.method,
         data: options.data,
         params: options.params,

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

@@ -25,6 +25,8 @@ interface IProps {
     sealIdList?: string[];
     /** 关键字 */
     keywordList?: string[];
+    /** 自定盖章印章id */
+    autoSealIdList?: string[];
     /** 手动盖章 */
     showHandSeal?: boolean;
     /** 自动盖章 */

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

@@ -25,7 +25,7 @@ function dataURLtoFile(dataurl, filename) {
     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, request = _a.request, sealIdList = _a.sealIdList, 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;
+    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;
     var _h = useState(false), showWater = _h[0], setShowWater = _h[1];
     var _j = useState(false), pdfShowWater = _j[0], setPdfShowWater = _j[1];
     var containerRef = useRef();
@@ -37,14 +37,21 @@ var PrintContainer = function (_a) {
     var _m = useState(), currentViewUrl = _m[0], setCurrentViewUrl = _m[1];
     // 印章列表
     var _o = useState(), _sealIdList = _o[0], setSealIdList = _o[1];
+    // 自动盖章印章列表
+    var _p = useState(), _autoSealIdList = _p[0], setAutoSealIdList = _p[1];
     // 关键字列表
-    var _p = useState(), _keywordList = _p[0], setKeywordList = _p[1];
+    var _q = useState(), _keywordList = _q[0], setKeywordList = _q[1];
     // 根据传入参数设置印章 关键字
     useEffect(function () {
         if (sealIdList) {
             setSealIdList(sealIdList);
         }
     }, [sealIdList]);
+    useEffect(function () {
+        if (autoSealIdList) {
+            setAutoSealIdList(autoSealIdList);
+        }
+    }, [autoSealIdList]);
     useEffect(function () {
         if (keywordList) {
             setKeywordList(keywordList);
@@ -62,29 +69,42 @@ var PrintContainer = function (_a) {
                     flowId: flowId,
                     deptId: deptId,
                 },
-            }).then(function (res) {
-                var _a;
+            })
+                .then(function (res) {
+                var _a, _b, _c;
                 var data = res.data, status = res.status;
                 if (status === 200 && data.code === 200) {
                     var records = (data || {}).data.records;
                     if (Array.isArray(records)) {
-                        var sealPositionInfoList = ((_a = records[0]) === null || _a === void 0 ? void 0 : _a.sealPositionInfoList) || [];
+                        var sealInfoList = ((_a = records[0]) === null || _a === void 0 ? void 0 : _a.sealInfoList) || [];
                         var __sealIdList_1 = [];
+                        var __autoSealIdList_1 = [];
                         var __keywordList_1 = [];
-                        sealPositionInfoList.forEach(function (item, index) {
+                        sealInfoList.forEach(function (item, index) {
+                            // 只要传入的印章 都可以手动盖章
                             if (item.sealId != null) {
                                 __sealIdList_1.push(item.sealId);
                             }
+                            // 有关键字才可以自动盖章
                             if (item.keyword != null) {
+                                __autoSealIdList_1.push(item.sealId);
                                 __keywordList_1.push(item.keyword);
                             }
                         });
                         setSealIdList(__sealIdList_1);
-                        setKeywordList(function (pre) { return __spreadArray(__spreadArray([], (pre || [])), __keywordList_1); });
+                        setAutoSealIdList(__autoSealIdList_1);
+                        setKeywordList(__keywordList_1);
                         return;
                     }
                     message.info('当前部门、流程下未找到对应的印章！');
                 }
+                else {
+                    message.error(((_c = (_b = res === null || res === void 0 ? void 0 : res.data) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.msg) || '获取印章失败！');
+                }
+            })
+                .catch(function (err) {
+                var _a, _b;
+                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) || '获取印章失败！');
             });
         }
     }, [deptId, flowId, request]);
@@ -189,6 +209,10 @@ var PrintContainer = function (_a) {
     };
     // 确认盖章位置
     var onSurePositionHandle = function () {
+        if (!Array.isArray(_sealIdList) || _sealIdList.length === 0) {
+            message.info("\u5F53\u524D\u90E8\u95E8\u3001\u6D41\u7A0B\u4E0B\u672A\u914D\u7F6E\u5370\u7AE0\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u914D\u7F6E!");
+            return;
+        }
         setSpinning(true);
         setTimeout(function () {
             htmlToPdfForExport({
@@ -293,6 +317,10 @@ var PrintContainer = function (_a) {
     };
     // 自动盖章
     var onAutoSealHandle = function () {
+        if (!Array.isArray(_autoSealIdList) || _autoSealIdList.length === 0) {
+            message.info("\u5F53\u524D\u90E8\u95E8\u3001\u6D41\u7A0B\u4E0B\u672A\u914D\u7F6E\u81EA\u52A8\u76D6\u7AE0\u5173\u952E\u5B57\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u914D\u7F6E!");
+            return;
+        }
         setSpinning(true);
         setTimeout(function () {
             htmlToPdfForAutoSeal({
@@ -310,8 +338,8 @@ var PrintContainer = function (_a) {
                 files.forEach(function (file, i) {
                     formData.append("fileList[" + i + "]", file);
                 });
-                if (Array.isArray(_sealIdList) && Array.isArray(_keywordList)) {
-                    _sealIdList.forEach(function (sealId, i) {
+                if (Array.isArray(_autoSealIdList) && Array.isArray(_keywordList)) {
+                    _autoSealIdList.forEach(function (sealId, i) {
                         var keyword = _keywordList[i];
                         formData.append("sealPositionInfoList[" + i + "].sealId", sealId);
                         formData.append("sealPositionInfoList[" + i + "].keyword", keyword);
@@ -361,14 +389,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 &&
-                    Array.isArray(_sealIdList) &&
-                    (_sealIdList === null || _sealIdList === void 0 ? void 0 : _sealIdList.length) > 0 && (React.createElement(React.Fragment, null,
+                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 &&
-                    Array.isArray(_keywordList) &&
-                    (_keywordList === null || _keywordList === void 0 ? void 0 : _keywordList.length) > 0 && (React.createElement(Button, { type: "primary", onClick: onAutoSealHandle }, "\u81EA\u52A8\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/package.json CHANGED Viewed

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