ydb-components-material 0.1.115 → 0.1.116

package/lib/components/file-list/item.js

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _dialog = _interopRequireDefault(require("@alifd/next/lib/dialog"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _extends3 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
@@ -24,6 +25,7 @@ var _sign = _interopRequireDefault(require("./sign"));
 var _seal = _interopRequireDefault(require("./seal"));
 var _api = require("../../api");
 var _file2 = require("./file.js");
+var _sealUtil = require("./sealUtil");
 var _checkPoint = _interopRequireDefault(require("./checkPoint"));
 var _signerInfo = _interopRequireDefault(require("./signerInfo"));
 require("./item.scss");
@@ -54,7 +56,8 @@ var FileItem = function FileItem(_ref) {
     openLoading = _ref.openLoading,
     closeLoading = _ref.closeLoading,
     saveSignerInfo = _ref.saveSignerInfo,
-    signInfoMap = _ref.signInfoMap;
+    signInfoMap = _ref.signInfoMap,
+    applySeal = _ref.applySeal;
   console.log('fileItem', file, maxFileSize);
   var fileName = file.fileName,
     fileUrl = file.fileUrl,
@@ -327,20 +330,112 @@ var FileItem = function FileItem(_ref) {
 
   // 手写签批
   var sign = function sign() {
+    if (!signatureEnable) {
+      closeLoading();
+      return;
+    }
+    ;
     openLoading();
     setIsShowSignPage(true);
   };
 
   // 签章
-  var seal = function seal() {
-    var type = (0, _file2.getFileExtension)(fileName);
-    if (type !== 'pdf') {
-      _message["default"].notice('只有pdf文件才能使用电子签章');
-      return;
-    }
-    openLoading();
-    setIsShowSealPage(true);
-  };
+  var seal = /*#__PURE__*/function () {
+    var _ref4 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+      var type, sealList;
+      return _regenerator["default"].wrap(function (_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            type = (0, _file2.getFileExtension)(fileName);
+            if (!(type !== 'pdf')) {
+              _context3.next = 1;
+              break;
+            }
+            _message["default"].notice('只有pdf文件才能使用电子签章');
+            return _context3.abrupt("return");
+          case 1:
+            openLoading();
+            // 查询当前用户是否有电子签章
+            _context3.next = 2;
+            return (0, _sealUtil.querySeal)(userInfo, {
+              token: token,
+              tokenTY: tokenTY,
+              baseUrl: baseUrl,
+              env: env,
+              isPC: isPC,
+              accessToken: accessToken
+            });
+          case 2:
+            sealList = _context3.sent;
+            if (!(userInfo.corpType === 'C04')) {
+              _context3.next = 3;
+              break;
+            }
+            if (sealList.length) {
+              // 有印章 → 对话框提示，可跳过走签批
+              _dialog["default"].confirm({
+                title: '提示',
+                footerAlign: 'center',
+                content: '检测到您已有电子印章，是否使用电子印章签署？',
+                okProps: {
+                  children: '签署'
+                },
+                cancelProps: {
+                  children: '跳过'
+                },
+                onOk: function onOk() {
+                  setIsShowSealPage(true);
+                },
+                onCancel: function onCancel() {
+                  sign();
+                },
+                onClose: function onClose() {
+                  closeLoading();
+                }
+              });
+            } else {
+              // 无印章 → 对话框提示，可申请印章或跳过走签批
+              _dialog["default"].confirm({
+                title: '提示',
+                content: '经检测，本账户暂未申请企业印章，办理时可选择跳过签章流程完成签名；也可办好印章后再来办理此项业务',
+                footerAlign: 'center',
+                okProps: {
+                  children: '申请印章'
+                },
+                cancelProps: {
+                  children: '跳过签章'
+                },
+                onOk: function onOk() {
+                  applySeal();
+                },
+                onCancel: function onCancel() {
+                  sign();
+                },
+                onClose: function onClose() {
+                  closeLoading();
+                }
+              });
+            }
+            return _context3.abrupt("return");
+          case 3:
+            if (sealList.length) {
+              _context3.next = 4;
+              break;
+            }
+            _message["default"].error('该单位下暂无印章，请前往"山西政务服务网"或"三晋通"小程序申领印章');
+            return _context3.abrupt("return");
+          case 4:
+            setIsShowSealPage(true);
+          case 5:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+    return function seal() {
+      return _ref4.apply(this, arguments);
+    };
+  }();
   var signAndSeal = function signAndSeal() {
     // const notNeedSelfSign = !signatureSelfRole.includes(SELF) && !signatureAgentRole.includes(SELF) && !signSelfRole.includes(SELF) && !signAgentRole.includes(SELF)
     // // 如果不需要自己签署 只需要别人签署 就直接打开维护签署人信息
@@ -412,18 +507,18 @@ var FileItem = function FileItem(_ref) {
     queryFileLibs();
   };
   var showGuide = /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+    var _ref5 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
       var guideImgRes;
-      return _regenerator["default"].wrap(function (_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      return _regenerator["default"].wrap(function (_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             if (signGuidFileId) {
-              _context3.next = 1;
+              _context4.next = 1;
               break;
             }
-            return _context3.abrupt("return");
+            return _context4.abrupt("return");
           case 1:
-            _context3.next = 2;
+            _context4.next = 2;
             return (0, _api.getGuideImg)({
               id: signGuidFileId,
               effectiveTime: 3600000
@@ -436,26 +531,26 @@ var FileItem = function FileItem(_ref) {
               accessToken: accessToken
             });
           case 2:
-            guideImgRes = _context3.sent;
+            guideImgRes = _context4.sent;
             if (guideImgRes.presignedUrl) {
               setGuideurl(guideImgRes.presignedUrl);
               setIsShowGuide(true);
             }
           case 3:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3);
+      }, _callee4);
     }));
     return function showGuide() {
-      return _ref4.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
   var selectMaterialOk = /*#__PURE__*/function () {
-    var _ref5 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+    var _ref6 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5() {
       var selectedMaterial, arr, fileFormat, formatFinal, urlRes, m;
-      return _regenerator["default"].wrap(function (_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      return _regenerator["default"].wrap(function (_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
             console.log('val', materialId);
             console.log('materialLib==', materialLib);
@@ -464,7 +559,7 @@ var FileItem = function FileItem(_ref) {
             });
             console.log('selectedMaterial', selectedMaterial);
             if (!spec) {
-              _context4.next = 1;
+              _context5.next = 1;
               break;
             }
             arr = selectedMaterial.fileName.split('.'); //
@@ -473,24 +568,24 @@ var FileItem = function FileItem(_ref) {
             formatFinal = (0, _file2.initFormat)(spec); // 限制的文件类型
             console.log(formatFinal, '限制的格式最后');
             if (formatFinal.includes(fileFormat)) {
-              _context4.next = 1;
+              _context5.next = 1;
               break;
             }
             _message["default"].notice("\u8BE5\u6750\u6599\u4E0D\u652F\u6301\u4E0A\u4F20\u3010" + fileFormat + "\u3011\u683C\u5F0F\u7684\u6587\u4EF6");
-            return _context4.abrupt("return");
+            return _context5.abrupt("return");
           case 1:
             if (!(selectedMaterial.type === 1)) {
-              _context4.next = 2;
+              _context5.next = 2;
               break;
             }
             _message["default"].notice('该文件为旧文件, 请先下载后手动上传');
-            return _context4.abrupt("return");
+            return _context5.abrupt("return");
           case 2:
             if (selectedMaterial.innerFileUrl) {
-              _context4.next = 4;
+              _context5.next = 4;
               break;
             }
-            _context4.next = 3;
+            _context5.next = 3;
             return (0, _api.getUrlById)({
               id: selectedMaterial.fileId,
               effectiveTime: 3600000
@@ -503,7 +598,7 @@ var FileItem = function FileItem(_ref) {
               accessToken: accessToken
             });
           case 3:
-            urlRes = _context4.sent;
+            urlRes = _context5.sent;
             if (urlRes.presignedUrlList && urlRes.presignedUrlList.length > 0) {
               selectedMaterial.innerFileUrl = urlRes.presignedUrlList[2];
             }
@@ -516,12 +611,12 @@ var FileItem = function FileItem(_ref) {
             setIsShowMaterialLib(false);
           case 5:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4);
+      }, _callee5);
     }));
     return function selectMaterialOk() {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
   var onDownload = function onDownload() {
@@ -551,58 +646,58 @@ var FileItem = function FileItem(_ref) {
 
   // 获取缩略图
   var extractImageUrls = /*#__PURE__*/function () {
-    var _ref6 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(previewUrl) {
+    var _ref7 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6(previewUrl) {
       var response, htmlText, parser, doc, imgElements, srcList;
-      return _regenerator["default"].wrap(function (_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+      return _regenerator["default"].wrap(function (_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
-            _context5.next = 1;
+            _context6.next = 1;
             return fetch(previewUrl);
           case 1:
-            response = _context5.sent;
-            _context5.next = 2;
+            response = _context6.sent;
+            _context6.next = 2;
             return response.text();
           case 2:
-            htmlText = _context5.sent;
+            htmlText = _context6.sent;
             parser = new DOMParser();
             doc = parser.parseFromString(htmlText, 'text/html');
             imgElements = doc.querySelectorAll('img');
             srcList = Array.from(imgElements).map(function (img) {
               return img.getAttribute('data-src');
             });
-            return _context5.abrupt("return", srcList);
+            return _context6.abrupt("return", srcList);
           case 3:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
-      }, _callee5);
+      }, _callee6);
     }));
     return function extractImageUrls(_x3) {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
 
   // 获取预览图片
   var getViewUrl = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6(id) {
+    var _ref8 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7(id) {
       var type, urlRes, res, list;
-      return _regenerator["default"].wrap(function (_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regenerator["default"].wrap(function (_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
             type = (0, _file2.getFileExtension)(fileName);
             if (!['png', 'jpg', 'jpeg'].includes(type)) {
-              _context6.next = 1;
+              _context7.next = 1;
               break;
             }
-            return _context6.abrupt("return", fileUrl);
+            return _context7.abrupt("return", fileUrl);
           case 1:
             if (!(type !== 'pdf')) {
-              _context6.next = 2;
+              _context7.next = 2;
               break;
             }
-            return _context6.abrupt("return", '');
+            return _context7.abrupt("return", '');
           case 2:
-            _context6.next = 3;
+            _context7.next = 3;
             return (0, _api.getUrlById)({
               id: id,
               effectiveTime: 3600000
@@ -615,13 +710,13 @@ var FileItem = function FileItem(_ref) {
               accessToken: accessToken
             });
           case 3:
-            urlRes = _context6.sent;
+            urlRes = _context7.sent;
             if (!(urlRes.presignedUrlList && urlRes.presignedUrlList.length > 0)) {
-              _context6.next = 6;
+              _context7.next = 6;
               break;
             }
             console.log('urlRes', urlRes);
-            _context6.next = 4;
+            _context7.next = 4;
             return (0, _api.onlinePreview)({
               url: urlRes.presignedUrlList[2]
             }, {
@@ -633,21 +728,21 @@ var FileItem = function FileItem(_ref) {
               accessToken: accessToken
             });
           case 4:
-            res = _context6.sent;
-            _context6.next = 5;
+            res = _context7.sent;
+            _context7.next = 5;
             return extractImageUrls(res.url);
           case 5:
-            list = _context6.sent;
+            list = _context7.sent;
             console.log('list---', list);
-            return _context6.abrupt("return", list[0]);
+            return _context7.abrupt("return", list[0]);
           case 6:
           case "end":
-            return _context6.stop();
+            return _context7.stop();
         }
-      }, _callee6);
+      }, _callee7);
     }));
     return function getViewUrl(_x4) {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
   (0, _react.useEffect)(function () {

package/lib/components/file-list/sealUtil.js

@@ -3,6 +3,7 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports.initSealPageMethod = initSealPageMethod;
+exports.querySeal = querySeal;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -22,44 +23,37 @@ function _initSealPageMethod() {
         case 0:
           fileName = fileObj.fileName;
           console.log('fileObj', fileObj, userInfo);
-          // 【第 1 步】判断当前用户是否有印章
+
+          // 查询印章列表（getSignOrderId 需要）
           _context.next = 1;
           return querySeal(userInfo, config);
         case 1:
           sealList = _context.sent;
-          console.log('sealList---', sealList);
-          if (sealList.length) {
-            _context.next = 2;
-            break;
-          }
-          _message["default"].error('该单位下暂无印章，请前往“山西政务服务网”或“三晋通”小程序申领印章');
-          return _context.abrupt("return", false);
-        case 2:
-          _context.next = 3;
+          _context.next = 2;
           return uploadSealFile(fileObj, config);
-        case 3:
+        case 2:
           fileUrl = _context.sent;
           console.log('fileUrl---', fileUrl);
           if (fileUrl) {
-            _context.next = 4;
+            _context.next = 3;
             break;
           }
           return _context.abrupt("return", false);
-        case 4:
-          _context.next = 5;
+        case 3:
+          _context.next = 4;
           return getSignOrderId(sealList, fileObj, fileUrl, userInfo, config);
-        case 5:
+        case 4:
           orderId = _context.sent;
           console.log('orderId---', orderId);
           if (orderId) {
-            _context.next = 6;
+            _context.next = 5;
             break;
           }
           return _context.abrupt("return", false);
-        case 6:
-          _context.next = 7;
+        case 5:
+          _context.next = 6;
           return getMobilePageFun(orderId, config, fileObj, fileUrl);
-        case 7:
+        case 6:
           pageUrl = _context.sent;
           // 将 电子签章地址/文件名称 返回
           params = {
@@ -68,7 +62,7 @@ function _initSealPageMethod() {
             orderId: orderId
           };
           return _context.abrupt("return", params);
-        case 8:
+        case 7:
         case "end":
           return _context.stop();
       }

package/lib/components/file-list/signerInfo.js

@@ -127,7 +127,7 @@ function SignerInfo(props) {
     }
   }, [signerInfo]);
   (0, _react.useEffect)(function () {
-    if (canvasRef.current) {
+    if (canvasRef.current && url) {
       var options = {
         width: 110,
         // 二维码的宽度
@@ -142,7 +142,7 @@ function SignerInfo(props) {
       };
       _qrcode["default"].toCanvas(canvasRef.current, url, options, function () {});
     }
-  }, [url]);
+  }, [url, showQRcode]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "signer-info-mask"
   }, !showQRcode && /*#__PURE__*/_react["default"].createElement("div", {

package/lib/style.js

@@ -4,8 +4,8 @@ require('@alifd/next/lib/radio/style');
 require('@alifd/next/lib/checkbox/style');
 require('@alifd/next/lib/balloon/style');
 require('antd/lib/cascader/style');
-require('@alifd/next/lib/input/style');
 require('@alifd/next/lib/dialog/style');
+require('@alifd/next/lib/input/style');
 require('@alifd/next/lib/loading/style');
 require('@alifd/next/lib/button/style');
 require('./index.scss');

package/lowcode_es/meta.js

@@ -97,7 +97,7 @@ function fillRealVersion(meta, packageName, version, basicLibraryVersion) {
     packageName = 'ydb-components-material';
   }
   if (version === void 0) {
-    version = '0.1.115';
+    version = '0.1.116';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/lowcode_lib/meta.js

@@ -102,7 +102,7 @@ function fillRealVersion(meta, packageName, version, basicLibraryVersion) {
     packageName = 'ydb-components-material';
   }
   if (version === void 0) {
-    version = '0.1.115';
+    version = '0.1.116';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ydb-components-material",
-  "version": "0.1.115",
+  "version": "0.1.116",
   "description": "ydb-components-material",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -101,10 +101,10 @@
   },
   "componentConfig": {
     "isComponentLibrary": true,
-    "materialSchema": "https://unpkg.com/ydb-components-material@0.1.115/build/lowcode/assets-prod.json"
+    "materialSchema": "https://unpkg.com/ydb-components-material@0.1.116/build/lowcode/assets-prod.json"
   },
   "lcMeta": {
     "type": "component"
   },
-  "homepage": "https://unpkg.com/ydb-components-material@0.1.115/build/index.html"
+  "homepage": "https://unpkg.com/ydb-components-material@0.1.116/build/index.html"
 }