ydb-components-material 0.1.66 → 0.1.68

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

@@ -2,27 +2,26 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { getBlob, getFileExtension, upload, dataURLtoBlob, uploadFilePromise } from "./file";
 import { createbycategory, contractSignUrl, signurl, checkSignState, contractFinish, documentDownload } from "../../api";
-var baseURL = 'http://172.16.132.12:5005';
 var categoryId = '3354397552669692408';
 var documentId = ''; // 手写签批生成的文件id
 var contractId = ''; // 合同id
 
 // 对外的方法 初始化手写签批的页面
-export function initSignPageMethod(_x, _x2, _x3, _x4, _x5) {
+export function initSignPageMethod(_x, _x2) {
   return _initSignPageMethod.apply(this, arguments);
 }
 
 // 【第1步】上传要手写签批的文件
 function _initSignPageMethod() {
-  _initSignPageMethod = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(fileObj, userInfo, token, device, tokenTY) {
+  _initSignPageMethod = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(fileObj, userInfo) {
     var name, docId, contrId, flag, pageUrl, params;
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          console.log('fileObj', fileObj, userInfo, token, tokenTY);
+          console.log('fileObj', fileObj, userInfo);
           name = fileObj.name; // 【第1步】上传要手写签批的文件
           _context.next = 1;
-          return uploadSignFile(fileObj, token);
+          return uploadSignFile(fileObj);
         case 1:
           docId = _context.sent;
           console.log('docId---', docId);
@@ -36,7 +35,7 @@ function _initSignPageMethod() {
 
           // 【第2步】创建或者发起电子签批
           _context.next = 3;
-          return createbycategoryFun(name, docId, token);
+          return createbycategoryFun(name, docId);
         case 3:
           contrId = _context.sent;
           console.log('contrId---', contrId);
@@ -56,7 +55,7 @@ function _initSignPageMethod() {
 
           // 【第3步】创建手写签批页面
           _context.next = 5;
-          return getContractSignUrl(contrId, userInfo, token);
+          return getContractSignUrl(contrId, userInfo);
         case 5:
           flag = _context.sent;
           if (flag) {
@@ -66,7 +65,7 @@ function _initSignPageMethod() {
           return _context.abrupt("return", false);
         case 6:
           _context.next = 7;
-          return getSignUrl(userInfo, token, device);
+          return getSignUrl(userInfo);
         case 7:
           pageUrl = _context.sent;
           if (pageUrl) {
@@ -91,11 +90,11 @@ function _initSignPageMethod() {
   }));
   return _initSignPageMethod.apply(this, arguments);
 }
-function uploadSignFile(_x6, _x7) {
+function uploadSignFile(_x3) {
   return _uploadSignFile.apply(this, arguments);
 } // 【第2步】创建或者发起电子签批
 function _uploadSignFile() {
-  _uploadSignFile = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(event, token) {
+  _uploadSignFile = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(event) {
     var blob, file, signApprovalFileType;
     return _regeneratorRuntime.wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -119,9 +118,9 @@ function _uploadSignFile() {
               filename: event.name,
               // 文件名称
               headers: {
-                Authorization: token
+                Authorization: window.token
               },
-              action: "\nhttps://zwfwpt.sxzwfw.gov.cn/DeclarationAPI/declaration/center/signapproval/api/createbyfile",
+              action: "\nhttps://zwfwpt.sxzwfw.gov.cn" + (window.env === 'release' ? ':10010' : '') + "/DeclarationAPI/declaration/center/signapproval/api/createbyfile",
               // 上传文件的地址
               onError: function onError(e) {
                 // uni.$u.toast(e.msg || '手写签批上传文件异常');
@@ -143,7 +142,7 @@ function _uploadSignFile() {
   }));
   return _uploadSignFile.apply(this, arguments);
 }
-function createbycategoryFun(fileName, documentIdVal, token) {
+function createbycategoryFun(fileName, documentIdVal) {
   // uni.showLoading({ title: '加载中' })
   var params = {
     subject: fileName,
@@ -153,9 +152,7 @@ function createbycategoryFun(fileName, documentIdVal, token) {
     tenantName: '山西省行政审批服务管理局'
   };
   return new Promise(function (resolve) {
-    createbycategory(params, {
-      token: token
-    }).then(function (res) {
+    createbycategory(params).then(function (res) {
       console.log('创建订单成功', res);
       if (res.code === 200) {
         resolve(res.data.contractId);
@@ -170,7 +167,7 @@ function createbycategoryFun(fileName, documentIdVal, token) {
 }
 
 // 【第3步】创建手写签批页面
-function getContractSignUrl(contractIdVal, userInfo, token) {
+function getContractSignUrl(contractIdVal, userInfo) {
   console.log('contractIdVal', contractIdVal, userInfo);
   // uni.showLoading({ title: '加载中' })
   var params = {
@@ -187,9 +184,7 @@ function getContractSignUrl(contractIdVal, userInfo, token) {
     }]
   };
   return new Promise(function (resolve) {
-    contractSignUrl(params, {
-      token: token
-    }).then(function (res) {
+    contractSignUrl(params).then(function (res) {
       if (res.data.code == 0) {
         resolve(true);
       } else {
@@ -210,7 +205,7 @@ function getContractSignUrl(contractIdVal, userInfo, token) {
 }
 
 // 【第4步】获取签pi页面
-function getSignUrl(userInfo, token, device) {
+function getSignUrl(userInfo) {
   // uni.showLoading({ title: '加载中' })
   var params = {
     contractId: contractId,
@@ -235,12 +230,10 @@ function getSignUrl(userInfo, token, device) {
     autoClosePage: true,
     // 操作完成自动关闭页面
     language: 'ZH_CN',
-    deviceType: device || 'H5' // 取值范围：PC（返回PC页面），H5（返回H5页面）；不传值默认为：根据请求的UserAgent自动判断返回的页面类型。
+    deviceType: window.isPC || 'H5' // 取值范围：PC（返回PC页面），H5（返回H5页面）；不传值默认为：根据请求的UserAgent自动判断返回的页面类型。
   };
   return new Promise(function (resolve) {
-    signurl(params, {
-      token: token
-    }).then(function (res) {
+    signurl(params).then(function (res) {
       console.log(res, '页面结果');
       if (res.data.code == 0) {
         resolve(res.data.signUrl);
@@ -258,19 +251,19 @@ function getSignUrl(userInfo, token, device) {
 // 下方是打开手写签批页面后 的后续操作
 
 // 对外的方法 获取签批后的文件
-export function getSignRes(_x8, _x9, _x0, _x1, _x10, _x11) {
+export function getSignRes(_x4, _x5, _x6, _x7) {
   return _getSignRes.apply(this, arguments);
 }
 
 // 轮询 签批状态
 function _getSignRes() {
-  _getSignRes = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(documentIdVal, contractIdVal, name, autoUpload, token, baseUrl) {
+  _getSignRes = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(documentIdVal, contractIdVal, name, autoUpload) {
     var isSignSucc, newFile, uploadedFileObj;
     return _regeneratorRuntime.wrap(function (_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
           _context3.next = 1;
-          return getCheckSignState(contractIdVal, token);
+          return getCheckSignState(contractIdVal);
         case 1:
           isSignSucc = _context3.sent;
           if (!isSignSucc) {
@@ -278,9 +271,9 @@ function _getSignRes() {
             break;
           }
           // 封存
-          getContractFinish(contractIdVal, token);
+          getContractFinish(contractIdVal);
           _context3.next = 2;
-          return handleSignApprovalDown(documentIdVal, name, token);
+          return handleSignApprovalDown(documentIdVal, name);
         case 2:
           newFile = _context3.sent;
           console.log('newFile', newFile);
@@ -290,7 +283,7 @@ function _getSignRes() {
             break;
           }
           _context3.next = 3;
-          return uploadFilePromise(newFile, baseUrl, token);
+          return uploadFilePromise(newFile);
         case 3:
           uploadedFileObj = _context3.sent;
           console.log('签批完成后的文件地址', uploadedFileObj);
@@ -310,12 +303,10 @@ function _getSignRes() {
   }));
   return _getSignRes.apply(this, arguments);
 }
-function getCheckSignState(contractIdVal, token) {
+function getCheckSignState(contractIdVal) {
   return new Promise(function (resolve) {
     checkSignState({
       contractId: contractIdVal
-    }, {
-      token: token
     }).then(function (res) {
       console.log('轮询结果---', res);
       // console.log('轮询结果', JSON.parse(res.data));
@@ -335,24 +326,20 @@ function getCheckSignState(contractIdVal, token) {
 }
 
 // 封存电子签批
-function getContractFinish(contractIdVal, token) {
+function getContractFinish(contractIdVal) {
   contractFinish({
     contractId: contractIdVal
-  }, {
-    token: token
   });
 }
 
 // 下载签署完的文档
-function handleSignApprovalDown(documentIdVal, name, token) {
+function handleSignApprovalDown(documentIdVal, name) {
   var params = {
     documentId: documentIdVal,
     type: 'pdf'
   };
   return new Promise(function (resolve) {
-    documentDownload(params, {
-      token: token
-    }).then(function (res) {
+    documentDownload(params).then(function (res) {
       console.log('下载文件：', res);
       // 返回来是base64格式的
       var blob = dataURLtoBlob(res.data); // 转成blob格式进行上传

package/lib/api.js

@@ -2,7 +2,7 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
-exports.signurl = exports.signFileDownApi = exports.qrySealApi = exports.previewApi = exports.post = exports.getSignOrderIdApi = exports.getSignFileApi = exports.getSealUrlApi = exports.getPcSealUrlApi = exports.getMaterialLib = exports.getIcons = exports.get = exports.fileUploadApi = exports.documentDownload = exports.createbycategory = exports.contractSignUrl = exports.contractFinish = exports.checkSignState = void 0;
+exports.signurl = exports.signFileDownApi = exports.qrySealApi = exports.previewApi = exports.post = exports.getSignOrderIdApi = exports.getSignFileApi = exports.getSealUrlApi = exports.getPcSealUrlApi = exports.getMaterialPreview = exports.getMaterialLib = exports.getIcons = exports.getGuideImg = exports.get = exports.fileUploadApi = exports.documentDownload = exports.createbycategory = exports.contractSignUrl = exports.contractFinish = exports.checkSignState = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var post = exports.post = /*#__PURE__*/function () {
@@ -14,7 +14,8 @@ var post = exports.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;
@@ -23,7 +24,7 @@ var post = exports.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) {
@@ -57,7 +58,8 @@ var get = exports.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();
@@ -108,30 +110,30 @@ var documentDownload = exports.documentDownload = function documentDownload(para
   return post("https://zwfwpt.sxzwfw.gov.cn/DeclarationAPI/declaration/center/signapproval/api/documentDownload", params, config);
 };
 var qrySealApi = exports.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);
 };
 
 // 获取电子签章页面
 var getSignOrderIdApi = exports.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);
 };
 // 获取电子签章页面
 var getSealUrlApi = exports.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
 var getPcSealUrlApi = exports.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);
 };
 
 // 电子签章-下载文件
 var signFileDownApi = exports.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);
 };
 
 // 电子签章 上传文件
 var fileUploadApi = exports.fileUploadApi = function fileUploadApi(params, config) {
-  return post(config.baseUrl + "/declaration/material/base64UploadMaterial", params, config);
+  return post(window.baseUrl + "/declaration/material/base64UploadMaterial", params, config);
 };
 
 // 预览
@@ -142,9 +144,15 @@ var previewApi = exports.previewApi = function previewApi(params, config) {
 var getMaterialLib = exports.getMaterialLib = function getMaterialLib(params, config) {
   return post("https://zwfwpt.sxzwfw.gov.cn/DeclarationAPI/declaration/material/queryFileByCardNo", params, config);
 };
+var getMaterialPreview = exports.getMaterialPreview = function getMaterialPreview(params, config) {
+  return get(window.baseUrl + "/declaration/material/onlinePreview", params, config);
+};
 var getSignFileApi = exports.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);
 };
 var getIcons = exports.getIcons = function getIcons(params, config) {
-  return post(config.baseUrl + "component/icon/page", params, config);
+  return post(window.baseUrl + "component/icon/page", params, config);
+};
+var getGuideImg = exports.getGuideImg = function getGuideImg(params, config) {
+  return get(window.baseUrl + "/declaration/material/file/files/api/presigned-url", params, config);
 };

package/lib/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/lib/components/file-item/index.js

@@ -3,7 +3,9 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports["default"] = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _extends3 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
 var _radio = _interopRequireDefault(require("@alifd/next/lib/radio"));
@@ -46,6 +48,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,
@@ -270,9 +273,7 @@ var FileItem = function FileItem(_ref) {
       pageNum: 1,
       pageSize: 10
     };
-    (0, _api.getMaterialLib)(params, {
-      token: token
-    }).then(function (res) {
+    (0, _api.getMaterialLib)(params).then(function (res) {
       if (res.code === 200) {
         var records = res.data.records;
         setMaterialLib(records);
@@ -286,26 +287,39 @@ 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 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      var guideImgRes;
+      return _regenerator["default"].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 (0, _api.getGuideImg)({
+              id: guideImg,
+              effectiveTime: 3600000
+            });
+          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);
@@ -344,11 +358,19 @@ var FileItem = function FileItem(_ref) {
     });
   };
   (0, _react.useEffect)(function () {
-    if (userInfo && isShowLib) {
+    if (userInfo && isShowLib && tokenTY) {
       console.log('userInfo', userInfo);
       queryFileLibs();
     }
-  }, [userInfo, isShowLib]);
+  }, [userInfo, isShowLib, tokenTY]);
+  (0, _react.useEffect)(function () {
+    window.env = env;
+    window.baseUrl = baseUrl;
+    window.token = token;
+    window.tokenTY = tokenTY;
+    window.isPC = isPC;
+    window.accessToken = accessToken;
+  }, [env, baseUrl, token, tokenTY, isPC, accessToken]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "file_item"
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -551,6 +573,7 @@ var FileItem = function FileItem(_ref) {
     token: token,
     tokenTY: tokenTY,
     baseUrl: baseUrl,
+    env: env,
     getSealRes: getSealRes,
     accessToken: accessToken,
     handleClose: function handleClose() {

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

@@ -15,14 +15,8 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 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 = (0, _react.useState)(''),
     srcUrl = _useState[0],
     setSrcUrl = _useState[1];
@@ -43,7 +37,7 @@ function SealPage(props) {
               fileObj.url = file.oldUrl;
             }
             _context.next = 1;
-            return (0, _sealUtil.initSealPageMethod)(file, userInfo, token, accessToken, baseUrl, tokenTY, isPC);
+            return (0, _sealUtil.initSealPageMethod)(file, userInfo);
           case 1:
             res = _context.sent;
             if (res) {
@@ -83,10 +77,7 @@ function SealPage(props) {
             };
             console.log('params', params);
             _context2.next = 1;
-            return (0, _api.fileUploadApi)(params, {
-              baseUrl: baseUrl,
-              tokenTY: tokenTY
-            });
+            return (0, _api.fileUploadApi)(params);
           case 1:
             uploadRes = _context2.sent;
             console.log('重新上传的文件', uploadRes);
@@ -115,9 +106,6 @@ function SealPage(props) {
   var signFileDown = function signFileDown(filePath) {
     (0, _api.signFileDownApi)({
       fileUrl: filePath
-    }, {
-      baseUrl: baseUrl,
-      tokenTY: tokenTY
     }).then(function (res) {
       if (res.code === 200) {
         uploadNewFile(res.data);
@@ -132,10 +120,7 @@ function SealPage(props) {
     var params = {
       orderId: orderId
     };
-    (0, _api.getSignFileApi)(params, {
-      baseUrl: baseUrl,
-      tokenTY: tokenTY
-    }).then(function (res) {
+    (0, _api.getSignFileApi)(params).then(function (res) {
       if (!res) {
         return;
       }
@@ -196,7 +181,7 @@ function SealPage(props) {
   }, []);
   (0, _react.useEffect)(function () {
     handleRes();
-  }, [userInfo, file, token, accessToken, baseUrl]);
+  }, [userInfo, file]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "sealPage",
     ref: elementRef