ydb-components-material 0.1.66 → 0.1.67

package/es/api.js

@@ -9,7 +9,8 @@ export var post = /*#__PURE__*/function () {
           if (noJson === void 0) {
             noJson = false;
           }
-          if (window.env === 'release') {
+          console.log('window.env', window.env);
+          if (window.env === 'release' && url.indexOf('zwfwpt.sxzwfw.gov.cn') > -1) {
             url = url.replace('zwfwpt.sxzwfw.gov.cn', 'zwfwpt.sxzwfw.gov.cn:10010');
           }
           _context.next = 1;
@@ -18,7 +19,7 @@ export var post = /*#__PURE__*/function () {
             headers: {
               'Content-Type': config && config['Content-Type'] ? config['Content-Type'] : 'application/json',
               // 声明发送的数据格式
-              'Authorization': config.token || undefined
+              'Authorization': url.indexOf('zwfwpt.sxzwfw.gov.cn') > -1 ? window.token : window.tokenTY
             },
             body: JSON.stringify(data)
           }).then(function (response) {
@@ -52,7 +53,8 @@ export var get = /*#__PURE__*/function () {
           return fetch(url + "?" + new URLSearchParams(data), {
             method: 'GET',
             headers: {
-              'Content-Type': config && config['Content-Type'] ? config['Content-Type'] : 'application/json'
+              'Content-Type': config && config['Content-Type'] ? config['Content-Type'] : 'application/json',
+              'Authorization': url.indexOf('zwfwpt.sxzwfw.gov.cn') > -1 ? window.token : window.tokenTY
             }
           }).then(function (response) {
             return response.json();
@@ -103,30 +105,30 @@ export var documentDownload = function documentDownload(params, config) {
   return post("https://zwfwpt.sxzwfw.gov.cn/DeclarationAPI/declaration/center/signapproval/api/documentDownload", params, config);
 };
 export var qrySealApi = function qrySealApi(params, config) {
-  return post(config.baseUrl + "/declaration/center/sign/api/qrySeal", params, config);
+  return post(window.baseUrl + "/declaration/center/sign/api/qrySeal", params, config);
 };
 
 // 获取电子签章页面
 export var getSignOrderIdApi = function getSignOrderIdApi(params, config) {
-  return post(config.baseUrl + "/declaration/center/sign/api/outSignCreateSiggOrder", params, config);
+  return post(window.baseUrl + "/declaration/center/sign/api/outSignCreateSiggOrder", params, config);
 };
 // 获取电子签章页面
 export var getSealUrlApi = function getSealUrlApi(params, config) {
-  return post(config.baseUrl + "/declaration/center/sign/api/signWebByDirectMobile", params, config, true);
+  return post(window.baseUrl + "/declaration/center/sign/api/signWebByDirectMobile", params, config, true);
 };
 // 获取电子签章页面pc
 export var getPcSealUrlApi = function getPcSealUrlApi(params, config) {
-  return post(config.baseUrl + "/declaration/center/sign/api/signWebByDirect", params, config);
+  return post(window.baseUrl + "/declaration/center/sign/api/signWebByDirect", params, config);
 };
 
 // 电子签章-下载文件
 export var signFileDownApi = function signFileDownApi(params, config) {
-  return post(config.baseUrl + "/declaration/center/sign/api/fileDownloadBySign", params, config);
+  return post(window.baseUrl + "/declaration/center/sign/api/fileDownloadBySign", params, config);
 };
 
 // 电子签章 上传文件
 export var fileUploadApi = function fileUploadApi(params, config) {
-  return post(config.baseUrl + "/declaration/material/base64UploadMaterial", params, config);
+  return post(window.baseUrl + "/declaration/material/base64UploadMaterial", params, config);
 };
 
 // 预览
@@ -138,8 +140,11 @@ export var getMaterialLib = function getMaterialLib(params, config) {
   return post("https://zwfwpt.sxzwfw.gov.cn/DeclarationAPI/declaration/material/queryFileByCardNo", params, config);
 };
 export var getSignFileApi = function getSignFileApi(params, config) {
-  return post(config.baseUrl + "/declaration/center/sign/api/getSignFileList", params, config);
+  return post(window.baseUrl + "/declaration/center/sign/api/getSignFileList", params, config);
 };
 export var getIcons = function getIcons(params, config) {
-  return post(config.baseUrl + "component/icon/page", params, config);
+  return post(window.baseUrl + "component/icon/page", params, config);
+};
+export var getGuideImg = function getGuideImg(params, config) {
+  return get(window.baseUrl + "/declaration/material/file/files/api/presigned-url", params, config);
 };

package/es/components/file-item/index.d.ts

@@ -22,6 +22,7 @@ export interface FileItemProps {
     isShowLib: boolean;
     userInfo: object;
     baseUrl: string;
+    env: string;
     isPC?: boolean;
     disabled?: boolean;
     checkPoint?: object;

package/es/components/file-item/index.js

@@ -1,7 +1,9 @@
 import _Icon from "@alifd/next/es/icon";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _Message from "@alifd/next/es/message";
 import _Radio from "@alifd/next/es/radio";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useEffect, useState } from 'react';
 import CheckedIcon from "./icon/checked.svg";
 import delIcon from "./icon/del.svg";
@@ -16,7 +18,7 @@ import uploadIcon from "./icon/upload.svg";
 import closeIcon from "./icon/close.svg";
 import SignPage from "./sign";
 import SealPage from "./seal";
-import { getMaterialLib } from "../../api";
+import { getMaterialLib, getGuideImg } from "../../api";
 import { initFormat, getFileExtension } from "./file.js";
 import CheckPoint from "./checkPoint";
 import "./index.scss";
@@ -40,6 +42,7 @@ var FileItem = function FileItem(_ref) {
     tokenTY = _ref.tokenTY,
     accessToken = _ref.accessToken,
     baseUrl = _ref.baseUrl,
+    env = _ref.env,
     isPC = _ref.isPC,
     disabled = _ref.disabled,
     checkPoint = _ref.checkPoint,
@@ -280,26 +283,41 @@ var FileItem = function FileItem(_ref) {
       // this.loadStatus = 'nomore'
     });
   };
-  var showGuide = function showGuide() {
-    if (!guideImg) return;
-    if (guideurl) {
-      setIsShowGuide(true);
-      return;
-    }
-    fetch(baseUrl + "/declaration/material/file/files/api/presigned-url?id=" + guideImg + "&effectiveTime=3600000", {
-      method: 'GET',
-      headers: {
-        'Authorization': tokenTY
-      }
-    }).then(function (response) {
-      return response.json();
-    }).then(function (res) {
-      if (res.presignedUrl) {
-        setGuideurl(res.presignedUrl);
-        setIsShowGuide(true);
-      }
-    });
-  };
+  var showGuide = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var guideImgRes;
+      return _regeneratorRuntime.wrap(function (_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (guideImg) {
+              _context.next = 1;
+              break;
+            }
+            return _context.abrupt("return");
+          case 1:
+            _context.next = 2;
+            return getGuideImg({
+              id: guideImg,
+              effectiveTime: 3600000
+            }, {
+              tokenTY: tokenTY
+            });
+          case 2:
+            guideImgRes = _context.sent;
+            if (guideImgRes.presignedUrl) {
+              setGuideurl(guideImgRes.presignedUrl);
+              setIsShowGuide(true);
+            }
+          case 3:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function showGuide() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
   var selectMaterialOk = function selectMaterialOk() {
     console.log('val', materialId);
     console.log('materialLib==', materialLib);
@@ -343,6 +361,14 @@ var FileItem = function FileItem(_ref) {
       queryFileLibs();
     }
   }, [userInfo, isShowLib]);
+  useEffect(function () {
+    window.env = env;
+    window.baseUrl = baseUrl;
+    window.token = token;
+    window.tokenTY = tokenTY;
+    window.isPC = isPC;
+    window.accessToken = accessToken;
+  }, [env, baseUrl]);
   return /*#__PURE__*/React.createElement("div", {
     className: "file_item"
   }, /*#__PURE__*/React.createElement("div", {
@@ -545,6 +571,7 @@ var FileItem = function FileItem(_ref) {
     token: token,
     tokenTY: tokenTY,
     baseUrl: baseUrl,
+    env: env,
     getSealRes: getSealRes,
     accessToken: accessToken,
     handleClose: function handleClose() {

package/es/components/file-item/seal.js

@@ -9,14 +9,8 @@ import { signFileDownApi, getSignFileApi, fileUploadApi } from "../../api";
 function SealPage(props) {
   var userInfo = props.userInfo,
     file = props.file,
-    token = props.token,
-    tokenTY = props.tokenTY,
-    accessToken = props.accessToken,
     getSealRes = props.getSealRes,
-    baseUrl = props.baseUrl,
-    handleClose = props.handleClose,
-    _props$isPC = props.isPC,
-    isPC = _props$isPC === void 0 ? false : _props$isPC;
+    handleClose = props.handleClose;
   var _useState = useState(''),
     srcUrl = _useState[0],
     setSrcUrl = _useState[1];
@@ -37,7 +31,7 @@ function SealPage(props) {
               fileObj.url = file.oldUrl;
             }
             _context.next = 1;
-            return initSealPageMethod(file, userInfo, token, accessToken, baseUrl, tokenTY, isPC);
+            return initSealPageMethod(file, userInfo);
           case 1:
             res = _context.sent;
             if (res) {
@@ -77,10 +71,7 @@ function SealPage(props) {
             };
             console.log('params', params);
             _context2.next = 1;
-            return fileUploadApi(params, {
-              baseUrl: baseUrl,
-              tokenTY: tokenTY
-            });
+            return fileUploadApi(params);
           case 1:
             uploadRes = _context2.sent;
             console.log('重新上传的文件', uploadRes);
@@ -109,9 +100,6 @@ function SealPage(props) {
   var signFileDown = function signFileDown(filePath) {
     signFileDownApi({
       fileUrl: filePath
-    }, {
-      baseUrl: baseUrl,
-      tokenTY: tokenTY
     }).then(function (res) {
       if (res.code === 200) {
         uploadNewFile(res.data);
@@ -126,10 +114,7 @@ function SealPage(props) {
     var params = {
       orderId: orderId
     };
-    getSignFileApi(params, {
-      baseUrl: baseUrl,
-      tokenTY: tokenTY
-    }).then(function (res) {
+    getSignFileApi(params).then(function (res) {
       if (!res) {
         return;
       }
@@ -190,7 +175,7 @@ function SealPage(props) {
   }, []);
   useEffect(function () {
     handleRes();
-  }, [userInfo, file, token, accessToken, baseUrl]);
+  }, [userInfo, file]);
   return /*#__PURE__*/React.createElement("div", {
     className: "sealPage",
     ref: elementRef

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

@@ -7,25 +7,22 @@ import { qrySealApi, getSealUrlApi, getSignOrderIdApi, getPcSealUrlApi } from ".
 // const userInfo = uni.getStorageSync('userInfo')
 
 // 对外的方法 获取电子签章的页面地址
-export function initSealPageMethod(_x, _x2, _x3, _x4, _x5, _x6, _x7) {
+export function initSealPageMethod(_x, _x2) {
   return _initSealPageMethod.apply(this, arguments);
 }
 
 // [第1步] 查询当前用户是否有电子签章
 function _initSealPageMethod() {
-  _initSealPageMethod = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(fileObj, userInfo, token, accessToken, baseUrl, tokenTY, isPC) {
+  _initSealPageMethod = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(fileObj, userInfo) {
     var name, sealList, fileUrl, orderId, pageUrl, params;
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (isPC === void 0) {
-            isPC = false;
-          }
           name = fileObj.name;
           console.log('fileObj', fileObj, userInfo);
           // 【第1步】判断当前用户是否有印章
           _context.next = 1;
-          return querySeal(userInfo, tokenTY, baseUrl);
+          return querySeal(userInfo);
         case 1:
           sealList = _context.sent;
           console.log('sealList---', sealList);
@@ -37,7 +34,7 @@ function _initSealPageMethod() {
           return _context.abrupt("return", false);
         case 2:
           _context.next = 3;
-          return uploadSealFile(fileObj, tokenTY, baseUrl);
+          return uploadSealFile(fileObj);
         case 3:
           fileUrl = _context.sent;
           console.log('fileUrl---', fileUrl);
@@ -48,7 +45,7 @@ function _initSealPageMethod() {
           return _context.abrupt("return", false);
         case 4:
           _context.next = 5;
-          return getSignOrderId(sealList, fileObj, fileUrl, tokenTY, baseUrl, userInfo);
+          return getSignOrderId(sealList, fileObj, fileUrl, userInfo);
         case 5:
           orderId = _context.sent;
           console.log('orderId---', orderId);
@@ -59,7 +56,7 @@ function _initSealPageMethod() {
           return _context.abrupt("return", false);
         case 6:
           _context.next = 7;
-          return getMobilePageFun(orderId, accessToken, tokenTY, baseUrl, isPC);
+          return getMobilePageFun(orderId);
         case 7:
           pageUrl = _context.sent;
           // 将 电子签章地址/文件名称 返回
@@ -77,7 +74,7 @@ function _initSealPageMethod() {
   }));
   return _initSealPageMethod.apply(this, arguments);
 }
-function querySeal(userInfo, token, baseUrl) {
+function querySeal(userInfo) {
   console.log('querySeal', userInfo);
   // uni.showLoading({ title: '查询印章中' })
   var params = {
@@ -86,10 +83,7 @@ function querySeal(userInfo, token, baseUrl) {
     userIdType: '2'
   };
   return new Promise(function (resolve) {
-    qrySealApi(params, {
-      token: token,
-      baseUrl: baseUrl
-    }).then(function (res) {
+    qrySealApi(params).then(function (res) {
       if (res.data && res.data.length > 0) {
         resolve(res.data);
       } else {
@@ -104,11 +98,11 @@ function querySeal(userInfo, token, baseUrl) {
 }
 
 // [第2步] 上传文件
-function uploadSealFile(_x8, _x9, _x0) {
+function uploadSealFile(_x3) {
   return _uploadSealFile.apply(this, arguments);
 } // [第3步] 获取电子印章页面
 function _uploadSealFile() {
-  _uploadSealFile = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(fileObj, token, baseUrl) {
+  _uploadSealFile = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(fileObj) {
     var blob, file;
     return _regeneratorRuntime.wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -126,9 +120,9 @@ function _uploadSealFile() {
               filename: fileObj.name,
               // 文件名称
               headers: {
-                Authorization: token
+                Authorization: window.tokenTY
               },
-              action: baseUrl + "/declaration/center/sign/api/fileUploadApi",
+              action: window.baseUrl + "/declaration/center/sign/api/fileUploadApi",
               // 上传文件的地址
               onError: function onError(e) {
                 // uni.$u.toast(e.msg || '上传文件异常');
@@ -150,9 +144,9 @@ function _uploadSealFile() {
   }));
   return _uploadSealFile.apply(this, arguments);
 }
-function getSignOrderId(sealList, fileObj, esusFileUrl, token, baseUrl, userInfo) {
+function getSignOrderId(sealList, fileObj, esusFileUrl, userInfo) {
   // uni.showLoading({ title: '获取签章页面中' })
-  console.log('sealList', sealList, fileObj, esusFileUrl, token, baseUrl, userInfo);
+  console.log('sealList', sealList, fileObj, esusFileUrl, userInfo);
   var fileId = fileObj.fileId,
     name = fileObj.name;
   // 循环签章列表 - 开始
@@ -226,10 +220,7 @@ function getSignOrderId(sealList, fileObj, esusFileUrl, token, baseUrl, userInfo
   console.log('params---', params);
   return new Promise(function (resolve) {
     console.log('获取签章订单id');
-    getSignOrderIdApi(params, {
-      token: token,
-      baseUrl: baseUrl
-    }).then(function (res) {
+    getSignOrderIdApi(params).then(function (res) {
       if (res) {
         var bigNumber = BigInt(res);
         resolve(bigNumber + '');
@@ -246,22 +237,16 @@ function getSignOrderId(sealList, fileObj, esusFileUrl, token, baseUrl, userInfo
 }
 
 // [第4步-移动端] 获取电子印章页面
-function getMobilePageFun(orderId, accessToken, token, baseUrl, isPC) {
-  if (isPC === void 0) {
-    isPC = false;
-  }
+function getMobilePageFun(orderId) {
   // uni.showLoading({ title: '获取移动端签章页面中' })
   var params = {
-    accessToken: accessToken,
+    accessToken: window.accessToken,
     acctType: '20',
     orderId: orderId
   };
   return new Promise(function (resolve) {
-    if (isPC) {
-      getPcSealUrlApi(params, {
-        baseUrl: baseUrl,
-        token: token
-      }).then(function (res) {
+    if (window.isPC) {
+      getPcSealUrlApi(params).then(function (res) {
         console.log('签章页面pc----', res);
         if (res.code === 200) {
           resolve(res.data);
@@ -275,10 +260,7 @@ function getMobilePageFun(orderId, accessToken, token, baseUrl, isPC) {
         // uni.hideLoading()
       });
     } else {
-      getSealUrlApi(params, {
-        baseUrl: baseUrl,
-        token: token
-      }).then(function (res) {
+      getSealUrlApi(params).then(function (res) {
         if (res) {
           console.log(res, '移动端签章页面');
           resolve(res);

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

@@ -4,15 +4,10 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useEffect, useState, useRef } from 'react';
 import { initSignPageMethod, getSignRes } from "./signUtil";
 function SignPage(props) {
-  var isShowSignPage = props.isShowSignPage,
-    userInfo = props.userInfo,
+  var userInfo = props.userInfo,
     file = props.file,
-    token = props.token,
-    tokenTY = props.tokenTY,
     getRes = props.getRes,
-    handleClose = props.handleClose,
-    baseUrl = props.baseUrl,
-    device = props.device;
+    handleClose = props.handleClose;
   var _useState = useState(''),
     srcUrl = _useState[0],
     setSrcUrl = _useState[1];
@@ -37,7 +32,7 @@ function SignPage(props) {
               fileObj.url = file.oldUrl;
             }
             _context.next = 1;
-            return initSignPageMethod(file, userInfo, token, device);
+            return initSignPageMethod(file, userInfo);
           case 1:
             res = _context.sent;
             documentIdVal = res.documentId, contractIdVal = res.contractId, pageUrl = res.pageUrl, nameVal = res.name;
@@ -57,15 +52,13 @@ function SignPage(props) {
     };
   }();
   var getSignedFile = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(documentIdVal, contractIdVal, nameVal, tokenVal, baseUrl) {
+    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:
-            console.log('tokenVal----', tokenVal);
-            // const { autoUpload } = this
             _context2.next = 1;
-            return getSignRes(documentIdVal, contractIdVal, nameVal, true, tokenVal, baseUrl);
+            return getSignRes(documentIdVal, contractIdVal, nameVal, true);
           case 1:
             newFile = _context2.sent;
             console.log(newFile, '签署完毕后的');
@@ -90,7 +83,7 @@ function SignPage(props) {
         }
       }, _callee2);
     }));
-    return function getSignedFile(_x, _x2, _x3, _x4, _x5) {
+    return function getSignedFile(_x, _x2, _x3) {
       return _ref2.apply(this, arguments);
     };
   }();
@@ -102,16 +95,16 @@ function SignPage(props) {
     init();
   }, []);
   useEffect(function () {
-    if (srcUrl && documentId && contractId && name && tokenTY && baseUrl && !timerRef.current) {
+    if (srcUrl && documentId && contractId && name && !timerRef.current) {
       handleClearInterval();
       timerRef.current = setInterval(function () {
-        getSignedFile(documentId, contractId, name, tokenTY, baseUrl);
+        getSignedFile(documentId, contractId, name);
       }, 3000);
     }
     return function () {
       handleClearInterval();
     };
-  }, [srcUrl, documentId, contractId, name, tokenTY, baseUrl]);
+  }, [srcUrl, documentId, contractId, name]);
   return /*#__PURE__*/React.createElement("div", {
     className: "sign_page"
   }, /*#__PURE__*/React.createElement("iframe", {