ydb-components-material 0.1.138 → 0.1.140

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

@@ -1,14 +1,13 @@
-import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import React, { useEffect, useState, useRef } from 'react';
-import { initSignPageMethod, getSignRes } from "./signUtil";
+import React, { useEffect } from 'react';
+import { initSignPageMethod } from "./signUtil";
 import closeIcon from "./icon/close.svg";
 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,
@@ -17,22 +16,9 @@ function SignPage(props) {
     closeLoading = props.closeLoading,
     _props$showClose = props.showClose,
     showClose = _props$showClose === void 0 ? true : _props$showClose;
-  var _useState = useState(''),
-    srcUrl = _useState[0],
-    setSrcUrl = _useState[1];
-  var _useState2 = useState(''),
-    documentId = _useState2[0],
-    setDocumentId = _useState2[1];
-  var _useState3 = useState(''),
-    contractId = _useState3[0],
-    setContractId = _useState3[1];
-  var _useState4 = useState(''),
-    name = _useState4[0],
-    setName = _useState4[1];
-  var timerRef = useRef(null);
   var init = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var fileObj, res, documentIdVal, contractIdVal, pageUrl, nameVal;
+      var fileObj, res, pageUrl;
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -49,16 +35,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":
@@ -70,66 +54,9 @@ function SignPage(props) {
       return _ref.apply(this, arguments);
     };
   }();
-  var getSignedFile = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(documentIdVal, contractIdVal, nameVal) {
-      var newFile, finalFile;
-      return _regeneratorRuntime.wrap(function (_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            _context2.next = 1;
-            return 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 = _extends({}, 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;
-  };
   useEffect(function () {
     init();
   }, []);
-  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.createElement("div", {
     className: "sign_page"
   }, showClose && /*#__PURE__*/React.createElement("img", {
@@ -137,12 +64,6 @@ function SignPage(props) {
     src: closeIcon,
     alt: "",
     onClick: handleClose
-  }), /*#__PURE__*/React.createElement("iframe", {
-    src: srcUrl,
-    id: "iframe",
-    frameborder: "0",
-    height: "100%",
-    width: "100%"
   }));
 }
 export default SignPage;

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

@@ -18,12 +18,12 @@ export function initSignPageMethod(_x, _x2, _x3) {
 // 【第 1 步】上传要手写签批的文件
 function _initSignPageMethod() {
   _initSignPageMethod = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(fileObj, userInfo, config) {
-    var fileName, docId, contrId, flag, pageUrl, params;
+    var fileName, fileId, originalUrl, fileUrl, docId, contrId, flag, pageUrl, params;
     return _regeneratorRuntime.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:
@@ -63,7 +63,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) {
@@ -212,8 +212,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,
@@ -238,12 +250,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) {
     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/lib/components/file-list/index.js

@@ -55,17 +55,31 @@ var FileList = function FileList(_ref) {
     saveSignerInfo = _ref.saveSignerInfo,
     applySeal = _ref.applySeal,
     signInfoMap = _ref.signInfoMap;
-  var _useState = (0, _react.useState)(false),
-    showMerge = _useState[0],
-    setShowMerge = _useState[1];
-  var _useState2 = (0, _react.useState)({
+  var _useState = (0, _react.useState)(fileList),
+    fileArray = _useState[0],
+    setFileArray = _useState[1];
+  (0, _react.useEffect)(function () {
+    var stored = localStorage.getItem(tokenTY);
+    console.log('fileList-stored', stored);
+    if (stored) {
+      try {
+        setFileArray(JSON.parse(stored));
+      } catch (e) {}
+    } else {
+      setFileArray(fileList);
+    }
+  }, [fileList]);
+  var _useState2 = (0, _react.useState)(false),
+    showMerge = _useState2[0],
+    setShowMerge = _useState2[1];
+  var _useState3 = (0, _react.useState)({
       materialName: '',
       fileList: [],
       index: 0,
       subIndex: 0
     }),
-    curMerge = _useState2[0],
-    setCurMerge = _useState2[1];
+    curMerge = _useState3[0],
+    setCurMerge = _useState3[1];
   var convertNumbersToChinese = function convertNumbersToChinese(str) {
     // 定义基础映射关系
     var digitMap = {
@@ -103,13 +117,13 @@ var FileList = function FileList(_ref) {
 
   // 拼接材料的提示文案 - 二级材料
   var getTipTextForSubMaterial = function getTipTextForSubMaterial(item, index, subIndex) {
-    var subMaterials = fileList[index].subMaterials;
+    var subMaterials = fileArray[index].subMaterials;
     console.log('getTipTextForSubMaterial', item, index, subIndex);
     console.log('subMaterials', subMaterials);
     var materialSize = item.materialSize,
       materialSpec = item.materialSpec,
       materialType = item.materialType;
-    var groupId = fileList[index].subMaterials[subIndex].groupId;
+    var groupId = fileArray[index].subMaterials[subIndex].groupId;
     if (!materialSpec) return '';
     var formatText = materialSpec.split(',').map(function (i) {
       return MATERIAL_FORMAT[i];
@@ -151,7 +165,7 @@ var FileList = function FileList(_ref) {
   var handleChange = function handleChange(value, fileIndex, index, subIndex) {
     console.log('handleChange', value, fileIndex, index, subIndex);
     // 先找到一级目录
-    var oneLevelItem = fileList[index];
+    var oneLevelItem = fileArray[index];
     // 如果subIndex有值。再去找一下二级目录
     if (subIndex !== undefined) {
       // value为空，说明删除了
@@ -197,8 +211,9 @@ var FileList = function FileList(_ref) {
         }
       }
     }
-    console.log('fileList--------res', fileList);
-    valChange(fileList);
+    console.log('fileList--------res', fileArray);
+    valChange(fileArray);
+    setFileArray([].concat(fileArray));
   };
 
   // 如果 文件列表中都是图片，且数量大于1 判断需要合并
@@ -229,7 +244,7 @@ var FileList = function FileList(_ref) {
     style: (0, _extends2["default"])({}, style, {
       width: '100%'
     })
-  }, fileList.map(function (item, index) {
+  }, fileArray.map(function (item, index) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "file_level_one"
     }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -283,11 +298,13 @@ var FileList = function FileList(_ref) {
         className: "tip"
       }, getTipTextForSubMaterial(item, index, subIndex)), child.fileList.map(function (file, i) {
         return /*#__PURE__*/_react["default"].createElement(_item["default"], {
+          key: file.fileId || i,
           index: index,
           subIndex: subIndex,
           fileIndex: i,
           file: file,
           fileConfig: child,
+          fileList: fileArray,
           maxFileSize: item.materialSize,
           spec: item.materialSpec,
           userInfo: userInfo,
@@ -315,12 +332,14 @@ var FileList = function FileList(_ref) {
       className: "tip"
     }, getTipText(item)), item.fileList.map(function (file, i) {
       return /*#__PURE__*/_react["default"].createElement(_item["default"], {
+        key: file.fileId || i,
         index: index,
         fileIndex: i,
         signerInfo: signerInfo || {},
         signInfoMap: signInfoMap,
         file: file,
         fileConfig: item,
+        fileList: fileArray,
         maxFileSize: item.materialSize,
         spec: item.materialSpec,
         userInfo: userInfo,

package/lib/components/file-list/item.d.ts

@@ -19,6 +19,7 @@ export interface FileItemProps {
     userInfo: object;
     style?: object;
     signerInfo?: object;
+    fileList: Array<object>;
     openLoading: () => void;
     applySeal: () => void;
     closeLoading: () => void;