ydb-components-material 0.1.115 → 0.1.117

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

@@ -3,63 +3,61 @@
 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"));
 var _file = require("./file.js");
 var _api = require("../../api.js");
 // import apiConfig from '@/config/api.cofig'
+
 // const userInfo = uni.getStorageSync('userInfo')
+var SEAL_TYPE = '法人名章';
+var SEAL_POSITION = '关键字印章';
+
 // 对外的方法 获取电子签章的页面地址
-function initSealPageMethod(_x, _x2, _x3) {
+function initSealPageMethod(_x, _x2, _x3, _x4) {
   return _initSealPageMethod.apply(this, arguments);
 } // [第 1 步] 查询当前用户是否有电子签章
 function _initSealPageMethod() {
-  _initSealPageMethod = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(fileObj, userInfo, config) {
+  _initSealPageMethod = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(fileObj, userInfo, sealConfig, config) {
     var fileName, sealList, fileUrl, orderId, pageUrl, params;
     return _regenerator["default"].wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         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 3:
+          _context.next = 4;
+          return getSignOrderId(sealList, fileObj, fileUrl, userInfo, sealConfig, config);
         case 4:
-          _context.next = 5;
-          return getSignOrderId(sealList, fileObj, fileUrl, userInfo, config);
-        case 5:
           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 +66,7 @@ function _initSealPageMethod() {
             orderId: orderId
           };
           return _context.abrupt("return", params);
-        case 8:
+        case 7:
         case "end":
           return _context.stop();
       }
@@ -100,7 +98,7 @@ function querySeal(userInfo, config) {
 }
 
 // [第 2 步] 上传文件
-function uploadSealFile(_x4, _x5) {
+function uploadSealFile(_x5, _x6) {
   return _uploadSealFile.apply(this, arguments);
 } // [第 3 步] 获取电子印章页面
 function _uploadSealFile() {
@@ -146,32 +144,51 @@ function _uploadSealFile() {
   }));
   return _uploadSealFile.apply(this, arguments);
 }
-function getSignOrderId(sealList, fileObj, esusFileUrl, userInfo, config) {
+function getSignOrderId(sealList, fileObj, esusFileUrl, userInfo, sealConfig, config) {
   // uni.showLoading({ title: '获取签章页面中' })
   console.log('sealList', sealList, fileObj, esusFileUrl, userInfo);
   var fileId = fileObj.fileId,
     fileName = fileObj.fileName;
   // 循环签章列表 - 开始
   var apiSignDtosArr = [];
-  sealList.forEach(function (sealItem, sealIndex) {
+  // 当前用户有法人名章
+  var legalSeal = sealList.find(function (item) {
+    return item.sealTypeName === SEAL_TYPE;
+  });
+  // 如果设置的有关键字签章
+  if (sealConfig.sealKeywords && sealConfig.sealPosition === SEAL_POSITION && sealConfig.sealContent === SEAL_TYPE && legalSeal) {
     apiSignDtosArr.push({
       deviceType: 3,
       // 签章类型 (默认 3)
-      signType: 0,
+      signType: 3,
       // 签章方式 (0 - 自由签章 or 定位签章 2 - 关键字签章 3 - 骑缝签章，一次只能有个一个类型，多个请写多组)
-      sealCode: sealItem.sealCode,
+      sealCode: legalSeal.sealCode,
       // 印章编码
-      signatories: [
-      // 定位签章参数
-      {
-        pageIndex: sealIndex,
-        // 签章所在页码
-        x: 0.00,
-        // 位置横坐标 支持百分比坐标<1，百分比。>1,pdf 磅，ofd 毫米
-        y: 0.00 // 位置纵坐标
+      keyWordParam: [{
+        keyWord: sealConfig.sealKeywords
       }]
     });
-  });
+  } else {
+    sealList.forEach(function (sealItem, sealIndex) {
+      apiSignDtosArr.push({
+        deviceType: 3,
+        // 签章类型 (默认 3)
+        signType: 0,
+        // 签章方式 (0 - 自由签章 or 定位签章 2 - 关键字签章 3 - 骑缝签章，一次只能有个一个类型，多个请写多组)
+        sealCode: sealItem.sealCode,
+        // 印章编码
+        signatories: [
+        // 定位签章参数
+        {
+          pageIndex: sealIndex,
+          // 签章所在页码
+          x: 0.00,
+          // 位置横坐标 支持百分比坐标<1，百分比。>1,pdf 磅，ofd 毫米
+          y: 0.00 // 位置纵坐标
+        }]
+      });
+    });
+  }
   var params = {
     deptCode: userInfo.certificateSno,
     // 单位统一社会信用代码

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

@@ -56,18 +56,77 @@ function SignerInfo(props) {
   };
   var next = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var saveRes;
+      var i, item, fields, _i, _fields, field, val, saveRes;
       return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            i = 0;
+          case 1:
+            if (!(i < signerInfoList.length)) {
+              _context.next = 5;
+              break;
+            }
+            item = signerInfoList[i];
+            fields = [{
+              label: '签署内容',
+              value: item.signContent
+            }];
+            if (item.signType === 0) {
+              // 个人：姓名、身份证号、手机号、签署内容
+              fields.push({
+                label: '姓名',
+                value: item.signerName
+              }, {
+                label: '身份证号',
+                value: item.signerCerNo
+              }, {
+                label: '手机号',
+                value: item.signerPhoneNum
+              });
+            } else {
+              // 企业：手机号、企业名称、统一社会信用代码、签署内容
+              fields.push({
+                label: '手机号',
+                value: item.signerPhoneNum
+              }, {
+                label: '企业名称',
+                value: item.signerCompany
+              }, {
+                label: '统一社会信用代码',
+                value: item.signerCertificateSno
+              });
+            }
+            _i = 0, _fields = fields;
+          case 2:
+            if (!(_i < _fields.length)) {
+              _context.next = 4;
+              break;
+            }
+            field = _fields[_i];
+            val = field.value;
+            if (!(val === undefined || val === null || val === '' || Array.isArray(val) && val.length === 0)) {
+              _context.next = 3;
+              break;
+            }
+            _message["default"].warning("\u7B7E\u7F72\u65B9" + (i + 1) + "\u7684\"" + field.label + "\"\u4E0D\u80FD\u4E3A\u7A7A");
+            return _context.abrupt("return");
+          case 3:
+            _i++;
+            _context.next = 2;
+            break;
+          case 4:
+            i++;
             _context.next = 1;
+            break;
+          case 5:
+            _context.next = 6;
             return saveSignerInfo({
               list: signerInfoList,
               file: file,
               materialName: materialName,
               date: getCurrentTime()
             });
-          case 1:
+          case 6:
             saveRes = _context.sent;
             if (saveRes) {
               setUrl("https://zwfw.xzspglj.taiyuan.gov.cn/threeSign?draftNo=" + saveRes);
@@ -75,7 +134,7 @@ function SignerInfo(props) {
             } else {
               _message["default"].warning('信息保存失败，请重试');
             }
-          case 2:
+          case 7:
           case "end":
             return _context.stop();
         }
@@ -127,7 +186,7 @@ function SignerInfo(props) {
     }
   }, [signerInfo]);
   (0, _react.useEffect)(function () {
-    if (canvasRef.current) {
+    if (canvasRef.current && url) {
       var options = {
         width: 110,
         // 二维码的宽度
@@ -142,7 +201,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/components/sign-file/index.js

@@ -21,6 +21,9 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 // import SignPage from './sign';
 // import SealPage from './seal';
 
+var SIGN = 1; // 签名
+var SEAL = 2; // 签章
+
 var SignFile = function SignFile(_ref) {
   var file = _ref.file,
     userInfo = _ref.userInfo,
@@ -39,7 +42,8 @@ var SignFile = function SignFile(_ref) {
     fileType = file.fileType,
     signatureEnable = file.signatureEnable,
     signEnable = file.signEnable,
-    guideImg = file.signGuidFileId;
+    guideImg = file.signGuidFileId,
+    signContent = file.signContent;
   var _useState = (0, _react.useState)(false),
     isShowSignPage = _useState[0],
     setIsShowSignPage = _useState[1];
@@ -296,6 +300,11 @@ var SignFile = function SignFile(_ref) {
 
   // 签章
   var seal = function seal() {
+    // 如果不需要签章 就直接去签字
+    if (!signContent.includes(SEAL)) {
+      sign();
+      return;
+    }
     console.log('fileType', fileType);
     var type = (0, _file2.getFileExtension)(fileName);
     if (type !== 'pdf') {

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/file-list/meta.ts

@@ -245,6 +245,20 @@ const FileListMeta: IPublicTypeComponentMetadata = {
           "isRequired": true
         }
       },
+      {
+        "title": {
+          "label": {
+            "type": "i18n",
+            "en-US": "applySeal",
+            "zh-CN": "applySeal"
+          }
+        },
+        "name": "applySeal",
+        "setter": {
+          "componentName": "FunctionSetter",
+          "isRequired": false
+        }
+      },
       {
         "title": {
           "label": {

package/lowcode_es/file-list/meta.js

@@ -230,6 +230,19 @@ var FileListMeta = {
         "componentName": "FunctionSetter",
         "isRequired": true
       }
+    }, {
+      "title": {
+        "label": {
+          "type": "i18n",
+          "en-US": "applySeal",
+          "zh-CN": "applySeal"
+        }
+      },
+      "name": "applySeal",
+      "setter": {
+        "componentName": "FunctionSetter",
+        "isRequired": false
+      }
     }, {
       "title": {
         "label": {

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.117';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/lowcode_lib/file-list/meta.js

@@ -235,6 +235,19 @@ var FileListMeta = {
         "componentName": "FunctionSetter",
         "isRequired": true
       }
+    }, {
+      "title": {
+        "label": {
+          "type": "i18n",
+          "en-US": "applySeal",
+          "zh-CN": "applySeal"
+        }
+      },
+      "name": "applySeal",
+      "setter": {
+        "componentName": "FunctionSetter",
+        "isRequired": false
+      }
     }, {
       "title": {
         "label": {

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.117';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ydb-components-material",
-  "version": "0.1.115",
+  "version": "0.1.117",
   "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.117/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.117/build/index.html"
 }