ydb-components-material 0.1.139 → 0.1.140

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

@@ -4,7 +4,6 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _react = _interopRequireWildcard(require("react"));
 var _signUtil = require("./signUtil");
@@ -13,8 +12,8 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 function SignPage(props) {
   var userInfo = props.userInfo,
     file = props.file,
-    getRes = props.getRes,
     handleClose = props.handleClose,
+    fileList = props.fileList,
     token = props.token,
     tokenTY = props.tokenTY,
     baseUrl = props.baseUrl,
@@ -23,22 +22,9 @@ function SignPage(props) {
     closeLoading = props.closeLoading,
     _props$showClose = props.showClose,
     showClose = _props$showClose === void 0 ? true : _props$showClose;
-  var _useState = (0, _react.useState)(''),
-    srcUrl = _useState[0],
-    setSrcUrl = _useState[1];
-  var _useState2 = (0, _react.useState)(''),
-    documentId = _useState2[0],
-    setDocumentId = _useState2[1];
-  var _useState3 = (0, _react.useState)(''),
-    contractId = _useState3[0],
-    setContractId = _useState3[1];
-  var _useState4 = (0, _react.useState)(''),
-    name = _useState4[0],
-    setName = _useState4[1];
-  var timerRef = (0, _react.useRef)(null);
   var init = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var fileObj, res, documentIdVal, contractIdVal, pageUrl, nameVal;
+      var fileObj, res, pageUrl;
       return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -55,16 +41,14 @@ function SignPage(props) {
               tokenTY: tokenTY,
               baseUrl: baseUrl,
               env: env,
-              isPC: isPC
+              isPC: isPC,
+              fileList: fileList
             });
           case 1:
             res = _context.sent;
-            documentIdVal = res.documentId, contractIdVal = res.contractId, pageUrl = res.pageUrl, nameVal = res.fileName;
+            pageUrl = res.pageUrl;
             closeLoading();
-            setSrcUrl(pageUrl);
-            setDocumentId(documentIdVal);
-            setContractId(contractIdVal);
-            setName(nameVal);
+            window.location.href = pageUrl;
             console.log(res);
           case 2:
           case "end":
@@ -76,66 +60,9 @@ function SignPage(props) {
       return _ref.apply(this, arguments);
     };
   }();
-  var getSignedFile = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(documentIdVal, contractIdVal, nameVal) {
-      var newFile, finalFile;
-      return _regenerator["default"].wrap(function (_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            _context2.next = 1;
-            return (0, _signUtil.getSignRes)(documentIdVal, contractIdVal, nameVal, true, {
-              token: token,
-              tokenTY: tokenTY,
-              baseUrl: baseUrl,
-              env: env,
-              isPC: isPC
-            });
-          case 1:
-            newFile = _context2.sent;
-            console.log(newFile, '签署完毕后的');
-            if (newFile) {
-              // 关闭轮询定时
-              handleClearInterval();
-              // 关闭弹框
-              handleClose();
-              // 将手写签批后的新文件 传给
-              finalFile = (0, _extends2["default"])({}, file, {
-                fileId: newFile.fileId,
-                fileName: nameVal,
-                fileUrl: newFile.fileUrlList[2],
-                isSigned: true
-              });
-              console.log('finalFile---', finalFile);
-              getRes(finalFile);
-            }
-          case 2:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2);
-    }));
-    return function getSignedFile(_x, _x2, _x3) {
-      return _ref2.apply(this, arguments);
-    };
-  }();
-  var handleClearInterval = function handleClearInterval() {
-    clearInterval(timerRef.current);
-    timerRef.current = null;
-  };
   (0, _react.useEffect)(function () {
     init();
   }, []);
-  (0, _react.useEffect)(function () {
-    if (srcUrl && documentId && contractId && name && !timerRef.current) {
-      handleClearInterval();
-      timerRef.current = setInterval(function () {
-        getSignedFile(documentId, contractId, name);
-      }, 3000);
-    }
-    return function () {
-      handleClearInterval();
-    };
-  }, [srcUrl, documentId, contractId, name]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "sign_page"
   }, showClose && /*#__PURE__*/_react["default"].createElement("img", {
@@ -143,12 +70,6 @@ function SignPage(props) {
     src: _close["default"],
     alt: "",
     onClick: handleClose
-  }), /*#__PURE__*/_react["default"].createElement("iframe", {
-    src: srcUrl,
-    id: "iframe",
-    frameborder: "0",
-    height: "100%",
-    width: "100%"
   }));
 }
 var _default = exports["default"] = SignPage;

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

@@ -22,12 +22,12 @@ function initSignPageMethod(_x, _x2, _x3) {
 } // 【第 1 步】上传要手写签批的文件
 function _initSignPageMethod() {
   _initSignPageMethod = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(fileObj, userInfo, config) {
-    var fileName, docId, contrId, flag, pageUrl, params;
+    var fileName, fileId, originalUrl, fileUrl, docId, contrId, flag, pageUrl, params;
     return _regenerator["default"].wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           console.log('fileObj', fileObj, userInfo);
-          fileName = fileObj.fileName; // 【第 1 步】上传要手写签批的文件
+          fileName = fileObj.fileName, fileId = fileObj.fileId, originalUrl = fileObj.originalUrl, fileUrl = fileObj.fileUrl; // 【第 1 步】上传要手写签批的文件
           _context.next = 1;
           return uploadSignFile(fileObj, config);
         case 1:
@@ -67,7 +67,7 @@ function _initSignPageMethod() {
           return _context.abrupt("return", false);
         case 6:
           _context.next = 7;
-          return getSignUrl(userInfo, config);
+          return getSignUrl(userInfo, config, fileName, fileId, originalUrl || fileUrl);
         case 7:
           pageUrl = _context.sent;
           if (pageUrl) {
@@ -216,8 +216,20 @@ function getContractSignUrl(contractIdVal, userInfo, config) {
   });
 }
 
+// 拼接回调页面的参数
+function getCallbackPageUrl(fileName, tokenTY, fileId, fileUrl) {
+  sessionStorage.setItem(tokenTY, JSON.stringify({
+    contractId: contractId,
+    documentId: documentId,
+    fileName: fileName,
+    fileId: fileId,
+    fileUrl: fileUrl
+  }));
+  return window.location.href;
+}
+
 // 【第 4 步】获取签 pi 页面
-function getSignUrl(userInfo, config) {
+function getSignUrl(userInfo, config, fileName, fileId, fileUrl) {
   // uni.showLoading({ title: '加载中' })
   var params = {
     contractId: contractId,
@@ -242,12 +254,16 @@ function getSignUrl(userInfo, config) {
     autoClosePage: true,
     // 操作完成自动关闭页面
     language: 'ZH_CN',
+    callbackPage: getCallbackPageUrl(fileName, config.tokenTY, fileId, fileUrl),
     deviceType: config.isPC || 'H5' // 取值范围：PC（返回 PC 页面），H5（返回 H5 页面）；不传值默认为：根据请求的 UserAgent 自动判断返回的页面类型。
   };
   return new Promise(function (resolve) {
     (0, _api.signurl)(params, config).then(function (res) {
       console.log(res, '页面结果');
       if (res.data.code == 0) {
+        if (config.fileList) {
+          localStorage.setItem(config.tokenTY, JSON.stringify(config.fileList));
+        }
         resolve(res.data.signUrl);
       } else {
         resolve(false);

package/lowcode_es/meta.js

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

package/lowcode_lib/meta.js

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

package/package.json

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