ydb-components-material 0.1.21 → 0.1.22

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

@@ -11,12 +11,12 @@ var _api = require("../../api.js");
 // import apiConfig from '@/config/api.cofig'
 // const userInfo = uni.getStorageSync('userInfo')
 // 对外的方法 获取电子签章的页面地址
-function initSealPageMethod(_x, _x2, _x3, _x4) {
+function initSealPageMethod(_x, _x2, _x3, _x4, _x5) {
   return _initSealPageMethod.apply(this, arguments);
 } // [第1步] 查询当前用户是否有电子签章
 function _initSealPageMethod() {
-  _initSealPageMethod = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(fileObj, userInfo, token, accessToken) {
-    var name, hasSeal, fileUrl, pageUrl, params;
+  _initSealPageMethod = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(fileObj, userInfo, token, accessToken, baseUrl) {
+    var name, sealList, fileUrl, orderId, pageUrl, params;
     return _regenerator["default"].wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -24,26 +24,21 @@ function _initSealPageMethod() {
           console.log('fileObj', fileObj, userInfo);
           // 【第1步】判断当前用户是否有印章
           _context.next = 1;
-          return querySeal(userInfo, token);
+          return querySeal(userInfo, token, baseUrl);
         case 1:
-          hasSeal = _context.sent;
-          if (hasSeal) {
+          sealList = _context.sent;
+          if (sealList.length) {
             _context.next = 2;
             break;
           }
           _message["default"].error('该单位下暂无印章，请前往“山西政务服务网”或“三晋通”小程序申领印章');
-          // return uni.showModal({
-          //   title: '提示',
-          //   content: '该单位下暂无印章，请前往“山西政务服务网”或“三晋通”小程序申领印章',
-          //   confirmText: '知道了',
-          //   showCancel: false,
-          // })
           return _context.abrupt("return", false);
         case 2:
           _context.next = 3;
-          return uploadSealFile(fileObj, token);
+          return uploadSealFile(fileObj, token, baseUrl);
         case 3:
           fileUrl = _context.sent;
+          console.log('fileUrl---', fileUrl);
           if (fileUrl) {
             _context.next = 4;
             break;
@@ -51,22 +46,27 @@ function _initSealPageMethod() {
           return _context.abrupt("return", false);
         case 4:
           _context.next = 5;
-          return getSealUrl(fileUrl, name, token, accessToken);
+          return getSignOrderId(sealList, fileObj, fileUrl, token, baseUrl, userInfo);
         case 5:
-          pageUrl = _context.sent;
-          if (pageUrl) {
+          orderId = _context.sent;
+          console.log('orderId---', orderId);
+          if (orderId) {
             _context.next = 6;
             break;
           }
           return _context.abrupt("return", false);
         case 6:
+          _context.next = 7;
+          return getMobilePageFun(orderId, accessToken, token, baseUrl);
+        case 7:
+          pageUrl = _context.sent;
           // 将 电子签章地址/文件名称 返回
           params = {
             pageUrl: pageUrl,
             name: name
           };
           return _context.abrupt("return", params);
-        case 7:
+        case 8:
         case "end":
           return _context.stop();
       }
@@ -74,7 +74,7 @@ function _initSealPageMethod() {
   }));
   return _initSealPageMethod.apply(this, arguments);
 }
-function querySeal(userInfo, token) {
+function querySeal(userInfo, token, baseUrl) {
   console.log('querySeal', userInfo);
   // uni.showLoading({ title: '查询印章中' })
   var params = {
@@ -84,27 +84,28 @@ function querySeal(userInfo, token) {
   };
   return new Promise(function (resolve) {
     (0, _api.qrySealApi)(params, {
-      token: token
+      token: token,
+      baseUrl: baseUrl
     }).then(function (res) {
       if (res.data && res.data.length > 0) {
-        resolve(true);
+        resolve(res.data);
       } else {
-        resolve(false);
+        resolve([]);
       }
       // uni.hideLoading()
     })["catch"](function (error) {
-      resolve(false);
+      resolve([]);
       // uni.hideLoading()
     });
   });
 }
 
 // [第2步] 上传文件
-function uploadSealFile(_x5, _x6) {
+function uploadSealFile(_x6, _x7, _x8) {
   return _uploadSealFile.apply(this, arguments);
 } // [第3步] 获取电子印章页面
 function _uploadSealFile() {
-  _uploadSealFile = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(fileObj, token) {
+  _uploadSealFile = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(fileObj, token, baseUrl) {
     var blob, file;
     return _regenerator["default"].wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -116,7 +117,6 @@ function _uploadSealFile() {
           file = new File([blob], fileObj.name, {
             type: fileObj.type
           }); // 上传接口
-          // const { baseURL } = apiConfig;
           return _context2.abrupt("return", new Promise(function (resolve) {
             (0, _file.upload)({
               file: file,
@@ -125,7 +125,7 @@ function _uploadSealFile() {
               headers: {
                 Authorization: token
               },
-              action: "https://zwfwpt.sxzwfw.gov.cn/DeclarationAPI/declaration/center/signapproval/api/createbyfile",
+              action: baseUrl + "/declaration/center/sign/api/fileUploadApi",
               // 上传文件的地址
               onError: function onError(e) {
                 // uni.$u.toast(e.msg || '上传文件异常');
@@ -147,20 +147,116 @@ function _uploadSealFile() {
   }));
   return _uploadSealFile.apply(this, arguments);
 }
-function getSealUrl(fileUrl, fileName, token, accessToken) {
+function getSignOrderId(sealList, fileObj, esusFileUrl, token, baseUrl, userInfo) {
   // uni.showLoading({ title: '获取签章页面中' })
-  // const accessToken = uni.getStorageSync('access_token');
+  console.log('sealList', sealList, fileObj, esusFileUrl, token, baseUrl, userInfo);
+  var fileId = fileObj.fileId,
+    name = fileObj.name;
+  // 循环签章列表 - 开始
+  var apiSignDtosArr = [];
+  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,
+    // 单位统一社会信用代码
+    outUserId: userInfo.legalCertno,
+    // 用户身份证号
+    userIdType: '2',
+    // 2：身份证
+    signFileReqs: [{
+      file: esusFileUrl,
+      // 签章文件(签章文件base64编码文件数据或者文件地址)
+      fileType: '0',
+      // 文件格式类型(0文件路径；1文件数据)
+      docType: '0',
+      // 文件内容类型 (0 PDF；1 OFD)
+      fileId: fileId,
+      // 业务系统文件id (用于回传文件，不可重复)
+      fileName: name,
+      // 签章文件名称(文件名称包含文件格式，如a.pdf,b.ofd)
+      apiSignDtos: apiSignDtosArr
+      // apiSignDtos: [ // 签章信息列表(一次可以多个签章参数。每个参数选一个签章参数)
+      //   {
+      //     deviceType: 3, // 签章类型(默认3)
+      //     sealCode: '14110000000423', // 印章编码
+      //     signType: 0, // 签章方式(0 - 自由签章 or 定位签章2 - 关键字签章3 - 骑缝签章，一次只能有个一个类型，多个请写多组)
+      //     signatories: [ // 定位签章参数
+      //       {
+      //         pageIndex: 0, // 签章所在页码
+      //         x: 0.00, // 位置横坐标 支持百分比坐标<1,百分比。>1,pdf磅，ofd 毫米
+      //         y: 0.00, // 位置纵坐标
+      //       }
+      //     ]
+      //   },
+      //   {
+      //     deviceType: 3, // 签章类型(默认3)
+      //     sealCode: '14110000000392', // 印章编码
+      //     signType: 0, // 签章方式(0 - 自由签章 or 定位签章2 - 关键字签章3 - 骑缝签章，一次只能有个一个类型，多个请写多组)
+      //     signatories: [ // 定位签章参数
+      //       {
+      //         pageIndex: 0, // 签章所在页码
+      //         x: 0.00, // 位置横坐标 支持百分比坐标<1,百分比。>1,pdf磅，ofd 毫米
+      //         y: 0.00, // 位置纵坐标
+      //       }
+      //     ]
+      //   }
+      // ]
+    }]
+  };
+  console.log('params---', params);
+  return new Promise(function (resolve) {
+    console.log('获取签章订单id');
+    (0, _api.getSignOrderIdApi)(params, {
+      token: token,
+      baseUrl: baseUrl
+    }).then(function (res) {
+      if (res) {
+        var bigNumber = BigInt(res);
+        resolve(bigNumber + '');
+        // uni.hideLoading()
+      } else {
+        resolve(false);
+        // uni.hideLoading()
+      }
+    })["catch"](function () {
+      resolve(false);
+      // uni.hideLoading()
+    });
+  });
+}
+
+// [第4步-移动端] 获取电子印章页面
+function getMobilePageFun(orderId, accessToken, token, baseUrl) {
+  // uni.showLoading({ title: '获取移动端签章页面中' })
   var params = {
     accessToken: accessToken,
     acctType: '20',
-    docURL: fileUrl,
-    name: fileName
+    orderId: orderId
   };
   return new Promise(function (resolve) {
     (0, _api.getSealUrlApi)(params, {
+      baseUrl: baseUrl,
       token: token
     }).then(function (res) {
       if (res) {
+        console.log(res, '移动端签章页面');
         resolve(res);
         // uni.hideLoading()
       } else {

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

@@ -14,7 +14,9 @@ function SignPage(props) {
     userInfo = props.userInfo,
     file = props.file,
     token = props.token,
-    getRes = props.getRes;
+    getRes = props.getRes,
+    handleClose = props.handleClose,
+    baseUrl = props.baseUrl;
   var _useState = (0, _react.useState)(''),
     srcUrl = _useState[0],
     setSrcUrl = _useState[1];
@@ -28,7 +30,7 @@ function SignPage(props) {
     name = _useState4[0],
     setName = _useState4[1];
   var timerRef = (0, _react.useRef)(null);
-  var handleRes = /*#__PURE__*/function () {
+  var init = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var res, documentIdVal, contractIdVal, pageUrl, nameVal;
       return _regenerator["default"].wrap(function (_context) {
@@ -50,12 +52,12 @@ function SignPage(props) {
         }
       }, _callee);
     }));
-    return function handleRes() {
+    return function init() {
       return _ref.apply(this, arguments);
     };
   }();
   var getSignedFile = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(documentIdVal, contractIdVal, nameVal, tokenVal) {
+    var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(documentIdVal, contractIdVal, nameVal, tokenVal, baseUrl) {
       var newFile, finalFile;
       return _regenerator["default"].wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -63,7 +65,7 @@ function SignPage(props) {
             console.log('tokenVal----', tokenVal);
             // const { autoUpload } = this
             _context2.next = 1;
-            return (0, _signUtil.getSignRes)(documentIdVal, contractIdVal, nameVal, true, tokenVal);
+            return (0, _signUtil.getSignRes)(documentIdVal, contractIdVal, nameVal, true, tokenVal, baseUrl);
           case 1:
             newFile = _context2.sent;
             console.log(newFile, '签署完毕后的');
@@ -71,11 +73,12 @@ function SignPage(props) {
               // 关闭轮询定时
               handleClearInterval();
               // 关闭弹框
-              // this.handleClose()
+              handleClose();
               // 将手写签批后的新文件 传给
               finalFile = (0, _extends2["default"])({
                 name: nameVal,
-                url: newFile.fileUrlList[0]
+                url: newFile.fileUrlList[0],
+                isSigned: true
               }, newFile);
               console.log('finalFile---', finalFile);
               getRes(finalFile);
@@ -86,7 +89,7 @@ function SignPage(props) {
         }
       }, _callee2);
     }));
-    return function getSignedFile(_x, _x2, _x3, _x4) {
+    return function getSignedFile(_x, _x2, _x3, _x4, _x5) {
       return _ref2.apply(this, arguments);
     };
   }();
@@ -95,25 +98,26 @@ function SignPage(props) {
     timerRef.current = null;
   };
   (0, _react.useEffect)(function () {
-    if (isShowSignPage) {
-      handleRes();
-    }
-  }, [isShowSignPage]);
+    init();
+  }, []);
   (0, _react.useEffect)(function () {
-    if (srcUrl && documentId && contractId && name && token && !timerRef.current) {
+    if (srcUrl && documentId && contractId && name && token && baseUrl && !timerRef.current) {
       handleClearInterval();
       timerRef.current = setInterval(function () {
-        getSignedFile(documentId, contractId, name, token);
+        getSignedFile(documentId, contractId, name, token, baseUrl);
       }, 3000);
     }
-  }, [srcUrl, documentId, contractId, name, token]);
+    return function () {
+      handleClearInterval();
+    };
+  }, [srcUrl, documentId, contractId, name, token, baseUrl]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "sign_page"
   }, /*#__PURE__*/_react["default"].createElement("iframe", {
     src: srcUrl,
     id: "iframe",
     frameborder: "0",
-    height: "500px",
+    height: "100%",
     width: "100%"
   }));
 }

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

@@ -261,11 +261,11 @@ function getSignUrl(userInfo, token) {
 // 下方是打开手写签批页面后 的后续操作
 
 // 对外的方法 获取签批后的文件
-function getSignRes(_x6, _x7, _x8, _x9, _x0) {
+function getSignRes(_x6, _x7, _x8, _x9, _x0, _x1) {
   return _getSignRes.apply(this, arguments);
 } // 轮询 签批状态
 function _getSignRes() {
-  _getSignRes = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(documentIdVal, contractIdVal, name, autoUpload, token) {
+  _getSignRes = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(documentIdVal, contractIdVal, name, autoUpload, token, baseUrl) {
     var isSignSucc, newFile, uploadedFileObj;
     return _regenerator["default"].wrap(function (_context3) {
       while (1) switch (_context3.prev = _context3.next) {
@@ -291,7 +291,7 @@ function _getSignRes() {
             break;
           }
           _context3.next = 3;
-          return (0, _file.uploadFilePromise)(newFile, token);
+          return (0, _file.uploadFilePromise)(newFile, baseUrl, token);
         case 3:
           uploadedFileObj = _context3.sent;
           console.log('签批完成后的文件地址', uploadedFileObj);

package/lib/components/scene-tree/index.js

@@ -179,6 +179,7 @@ var SceneTree = function SceneTree(_ref) {
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(FormItem, {
       name: "baseUser",
       label: node.title,
+      labelTextAlign: "left",
       required: true,
       style: {
         borderBottom: node.children && node.children.length ? '1px solid #EEEEEE' : '',

package/lowcode/file-item/meta.ts

@@ -21,12 +21,12 @@ const FileItemMeta: IPublicTypeComponentMetadata = {
         "title": {
           "label": {
             "type": "i18n",
-            "en-US": "file",
+            "en-US": "fileUrl",
             "zh-CN": "文件地址"
           },
-          "tip": "file | 文件地址"
+          "tip": "fileUrl | 文件地址"
         },
-        "name": "file",
+        "name": "fileUrl",
         "description": "文件地址",
         "setter": {
           "componentName": "StringSetter",
@@ -34,6 +34,23 @@ const FileItemMeta: IPublicTypeComponentMetadata = {
           "initialValue": ""
         }
       },
+      {
+        "title": {
+          "label": {
+            "type": "i18n",
+            "en-US": "fileId",
+            "zh-CN": "文件ID"
+          },
+          "tip": "fileId | 文件ID"
+        },
+        "name": "fileId",
+        "description": "文件ID",
+        "setter": {
+          "componentName": "StringSetter",
+          "isRequired": true,
+          "initialValue": ""
+        }
+      },
       {
         "title": {
           "label": {
@@ -85,6 +102,23 @@ const FileItemMeta: IPublicTypeComponentMetadata = {
           "initialValue": ""
         }
       },
+      {
+        "title": {
+          "label": {
+            "type": "i18n",
+            "en-US": "baseUrl",
+            "zh-CN": "baseUrl"
+          },
+          "tip": "baseUrl | baseUrl"
+        },
+        "name": "baseUrl",
+        "description": "baseUrl",
+        "setter": {
+          "componentName": "StringSetter",
+          "isRequired": true,
+          "initialValue": ""
+        }
+      },
       {
         "title": {
           "label": {
@@ -137,13 +171,13 @@ const FileItemMeta: IPublicTypeComponentMetadata = {
         "title": {
           "label": {
             "type": "i18n",
-            "en-US": "approvalUrl",
-            "zh-CN": "签批接口地址"
+            "en-US": "signatureEnable",
+            "zh-CN": "签批开启"
           }
         },
-        "name": "approvalUrl",
+        "name": "signatureEnable",
         "setter": {
-          "componentName": "StringSetter",
+          "componentName": "BoolSetter",
           "isRequired": true,
           "initialValue": ""
         }
@@ -152,13 +186,13 @@ const FileItemMeta: IPublicTypeComponentMetadata = {
         "title": {
           "label": {
             "type": "i18n",
-            "en-US": "signatureUrl",
-            "zh-CN": "电子签章接口地址"
+            "en-US": "signEnable",
+            "zh-CN": "电子签章开启"
           }
         },
-        "name": "signatureUrl",
+        "name": "signEnable",
         "setter": {
-          "componentName": "StringSetter",
+          "componentName": "BoolSetter",
           "isRequired": true,
           "initialValue": ""
         }
@@ -167,11 +201,11 @@ const FileItemMeta: IPublicTypeComponentMetadata = {
         "title": {
           "label": {
             "type": "i18n",
-            "en-US": "isApproval",
+            "en-US": "isSigned",
             "zh-CN": "是否签批"
           }
         },
-        "name": "isApproval",
+        "name": "isSigned",
         "setter": {
           "componentName": "BoolSetter",
           "isRequired": true,
@@ -182,11 +216,11 @@ const FileItemMeta: IPublicTypeComponentMetadata = {
         "title": {
           "label": {
             "type": "i18n",
-            "en-US": "isSignature",
+            "en-US": "isSealed",
             "zh-CN": "是否签章"
           }
         },
-        "name": "isSignature",
+        "name": "isSealed",
         "setter": {
           "componentName": "BoolSetter",
           "isRequired": true,
@@ -265,6 +299,20 @@ const FileItemMeta: IPublicTypeComponentMetadata = {
           "componentName": "FunctionSetter",
           "isRequired": true
         }
+      },
+      {
+        "title": {
+          "label": {
+            "type": "i18n",
+            "en-US": "download",
+            "zh-CN": "download"
+          }
+        },
+        "name": "download",
+        "setter": {
+          "componentName": "FunctionSetter",
+          "isRequired": true
+        }
       }
     ],
     "supports": {

package/lowcode_es/file-item/meta.js

@@ -18,18 +18,34 @@ var FileItemMeta = {
       "title": {
         "label": {
           "type": "i18n",
-          "en-US": "file",
+          "en-US": "fileUrl",
           "zh-CN": "文件地址"
         },
-        "tip": "file | 文件地址"
+        "tip": "fileUrl | 文件地址"
       },
-      "name": "file",
+      "name": "fileUrl",
       "description": "文件地址",
       "setter": {
         "componentName": "StringSetter",
         "isRequired": true,
         "initialValue": ""
       }
+    }, {
+      "title": {
+        "label": {
+          "type": "i18n",
+          "en-US": "fileId",
+          "zh-CN": "文件ID"
+        },
+        "tip": "fileId | 文件ID"
+      },
+      "name": "fileId",
+      "description": "文件ID",
+      "setter": {
+        "componentName": "StringSetter",
+        "isRequired": true,
+        "initialValue": ""
+      }
     }, {
       "title": {
         "label": {
@@ -78,6 +94,22 @@ var FileItemMeta = {
         "isRequired": true,
         "initialValue": ""
       }
+    }, {
+      "title": {
+        "label": {
+          "type": "i18n",
+          "en-US": "baseUrl",
+          "zh-CN": "baseUrl"
+        },
+        "tip": "baseUrl | baseUrl"
+      },
+      "name": "baseUrl",
+      "description": "baseUrl",
+      "setter": {
+        "componentName": "StringSetter",
+        "isRequired": true,
+        "initialValue": ""
+      }
     }, {
       "title": {
         "label": {
@@ -126,13 +158,13 @@ var FileItemMeta = {
       "title": {
         "label": {
           "type": "i18n",
-          "en-US": "approvalUrl",
-          "zh-CN": "签批接口地址"
+          "en-US": "signatureEnable",
+          "zh-CN": "签批开启"
         }
       },
-      "name": "approvalUrl",
+      "name": "signatureEnable",
       "setter": {
-        "componentName": "StringSetter",
+        "componentName": "BoolSetter",
         "isRequired": true,
         "initialValue": ""
       }
@@ -140,13 +172,13 @@ var FileItemMeta = {
       "title": {
         "label": {
           "type": "i18n",
-          "en-US": "signatureUrl",
-          "zh-CN": "电子签章接口地址"
+          "en-US": "signEnable",
+          "zh-CN": "电子签章开启"
         }
       },
-      "name": "signatureUrl",
+      "name": "signEnable",
       "setter": {
-        "componentName": "StringSetter",
+        "componentName": "BoolSetter",
         "isRequired": true,
         "initialValue": ""
       }
@@ -154,11 +186,11 @@ var FileItemMeta = {
       "title": {
         "label": {
           "type": "i18n",
-          "en-US": "isApproval",
+          "en-US": "isSigned",
           "zh-CN": "是否签批"
         }
       },
-      "name": "isApproval",
+      "name": "isSigned",
       "setter": {
         "componentName": "BoolSetter",
         "isRequired": true,
@@ -168,11 +200,11 @@ var FileItemMeta = {
       "title": {
         "label": {
           "type": "i18n",
-          "en-US": "isSignature",
+          "en-US": "isSealed",
           "zh-CN": "是否签章"
         }
       },
-      "name": "isSignature",
+      "name": "isSealed",
       "setter": {
         "componentName": "BoolSetter",
         "isRequired": true,
@@ -246,6 +278,19 @@ var FileItemMeta = {
         "componentName": "FunctionSetter",
         "isRequired": true
       }
+    }, {
+      "title": {
+        "label": {
+          "type": "i18n",
+          "en-US": "download",
+          "zh-CN": "download"
+        }
+      },
+      "name": "download",
+      "setter": {
+        "componentName": "FunctionSetter",
+        "isRequired": true
+      }
     }],
     "supports": {
       "style": true