ydb-components-material 0.1.66 → 0.1.67

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

@@ -10,15 +10,10 @@ var _react = _interopRequireWildcard(require("react"));
 var _signUtil = require("./signUtil");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 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 = (0, _react.useState)(''),
     srcUrl = _useState[0],
     setSrcUrl = _useState[1];
@@ -43,7 +38,7 @@ function SignPage(props) {
               fileObj.url = file.oldUrl;
             }
             _context.next = 1;
-            return (0, _signUtil.initSignPageMethod)(file, userInfo, token, device);
+            return (0, _signUtil.initSignPageMethod)(file, userInfo);
           case 1:
             res = _context.sent;
             documentIdVal = res.documentId, contractIdVal = res.contractId, pageUrl = res.pageUrl, nameVal = res.name;
@@ -63,15 +58,13 @@ function SignPage(props) {
     };
   }();
   var getSignedFile = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(documentIdVal, contractIdVal, nameVal, tokenVal, baseUrl) {
+    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:
-            console.log('tokenVal----', tokenVal);
-            // const { autoUpload } = this
             _context2.next = 1;
-            return (0, _signUtil.getSignRes)(documentIdVal, contractIdVal, nameVal, true, tokenVal, baseUrl);
+            return (0, _signUtil.getSignRes)(documentIdVal, contractIdVal, nameVal, true);
           case 1:
             newFile = _context2.sent;
             console.log(newFile, '签署完毕后的');
@@ -96,7 +89,7 @@ function SignPage(props) {
         }
       }, _callee2);
     }));
-    return function getSignedFile(_x, _x2, _x3, _x4, _x5) {
+    return function getSignedFile(_x, _x2, _x3) {
       return _ref2.apply(this, arguments);
     };
   }();
@@ -108,16 +101,16 @@ function SignPage(props) {
     init();
   }, []);
   (0, _react.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["default"].createElement("div", {
     className: "sign_page"
   }, /*#__PURE__*/_react["default"].createElement("iframe", {

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

@@ -8,25 +8,24 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _file = require("./file");
 var _api = require("../../api");
-var baseURL = 'http://172.16.132.12:5005';
 var categoryId = '3354397552669692408';
 var documentId = ''; // 手写签批生成的文件id
 var contractId = ''; // 合同id
 
 // 对外的方法 初始化手写签批的页面
-function initSignPageMethod(_x, _x2, _x3, _x4, _x5) {
+function initSignPageMethod(_x, _x2) {
   return _initSignPageMethod.apply(this, arguments);
 } // 【第1步】上传要手写签批的文件
 function _initSignPageMethod() {
-  _initSignPageMethod = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(fileObj, userInfo, token, device, tokenTY) {
+  _initSignPageMethod = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(fileObj, userInfo) {
     var name, 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, 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);
@@ -40,7 +39,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);
@@ -60,7 +59,7 @@ function _initSignPageMethod() {
 
           // 【第3步】创建手写签批页面
           _context.next = 5;
-          return getContractSignUrl(contrId, userInfo, token);
+          return getContractSignUrl(contrId, userInfo);
         case 5:
           flag = _context.sent;
           if (flag) {
@@ -70,7 +69,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) {
@@ -95,11 +94,11 @@ function _initSignPageMethod() {
   }));
   return _initSignPageMethod.apply(this, arguments);
 }
-function uploadSignFile(_x6, _x7) {
+function uploadSignFile(_x3) {
   return _uploadSignFile.apply(this, arguments);
 } // 【第2步】创建或者发起电子签批
 function _uploadSignFile() {
-  _uploadSignFile = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(event, token) {
+  _uploadSignFile = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(event) {
     var blob, file, signApprovalFileType;
     return _regenerator["default"].wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -123,9 +122,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 || '手写签批上传文件异常');
@@ -147,7 +146,7 @@ function _uploadSignFile() {
   }));
   return _uploadSignFile.apply(this, arguments);
 }
-function createbycategoryFun(fileName, documentIdVal, token) {
+function createbycategoryFun(fileName, documentIdVal) {
   // uni.showLoading({ title: '加载中' })
   var params = {
     subject: fileName,
@@ -157,9 +156,7 @@ function createbycategoryFun(fileName, documentIdVal, token) {
     tenantName: '山西省行政审批服务管理局'
   };
   return new Promise(function (resolve) {
-    (0, _api.createbycategory)(params, {
-      token: token
-    }).then(function (res) {
+    (0, _api.createbycategory)(params).then(function (res) {
       console.log('创建订单成功', res);
       if (res.code === 200) {
         resolve(res.data.contractId);
@@ -174,7 +171,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 = {
@@ -191,9 +188,7 @@ function getContractSignUrl(contractIdVal, userInfo, token) {
     }]
   };
   return new Promise(function (resolve) {
-    (0, _api.contractSignUrl)(params, {
-      token: token
-    }).then(function (res) {
+    (0, _api.contractSignUrl)(params).then(function (res) {
       if (res.data.code == 0) {
         resolve(true);
       } else {
@@ -214,7 +209,7 @@ function getContractSignUrl(contractIdVal, userInfo, token) {
 }
 
 // 【第4步】获取签pi页面
-function getSignUrl(userInfo, token, device) {
+function getSignUrl(userInfo) {
   // uni.showLoading({ title: '加载中' })
   var params = {
     contractId: contractId,
@@ -239,12 +234,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) {
-    (0, _api.signurl)(params, {
-      token: token
-    }).then(function (res) {
+    (0, _api.signurl)(params).then(function (res) {
       console.log(res, '页面结果');
       if (res.data.code == 0) {
         resolve(res.data.signUrl);
@@ -262,17 +255,17 @@ function getSignUrl(userInfo, token, device) {
 // 下方是打开手写签批页面后 的后续操作
 
 // 对外的方法 获取签批后的文件
-function getSignRes(_x8, _x9, _x0, _x1, _x10, _x11) {
+function getSignRes(_x4, _x5, _x6, _x7) {
   return _getSignRes.apply(this, arguments);
 } // 轮询 签批状态
 function _getSignRes() {
-  _getSignRes = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(documentIdVal, contractIdVal, name, autoUpload, token, baseUrl) {
+  _getSignRes = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(documentIdVal, contractIdVal, name, autoUpload) {
     var isSignSucc, newFile, uploadedFileObj;
     return _regenerator["default"].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) {
@@ -280,9 +273,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);
@@ -292,7 +285,7 @@ function _getSignRes() {
             break;
           }
           _context3.next = 3;
-          return (0, _file.uploadFilePromise)(newFile, baseUrl, token);
+          return (0, _file.uploadFilePromise)(newFile);
         case 3:
           uploadedFileObj = _context3.sent;
           console.log('签批完成后的文件地址', uploadedFileObj);
@@ -312,12 +305,10 @@ function _getSignRes() {
   }));
   return _getSignRes.apply(this, arguments);
 }
-function getCheckSignState(contractIdVal, token) {
+function getCheckSignState(contractIdVal) {
   return new Promise(function (resolve) {
     (0, _api.checkSignState)({
       contractId: contractIdVal
-    }, {
-      token: token
     }).then(function (res) {
       console.log('轮询结果---', res);
       // console.log('轮询结果', JSON.parse(res.data));
@@ -337,24 +328,20 @@ function getCheckSignState(contractIdVal, token) {
 }
 
 // 封存电子签批
-function getContractFinish(contractIdVal, token) {
+function getContractFinish(contractIdVal) {
   (0, _api.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) {
-    (0, _api.documentDownload)(params, {
-      token: token
-    }).then(function (res) {
+    (0, _api.documentDownload)(params).then(function (res) {
       console.log('下载文件：', res);
       // 返回来是base64格式的
       var blob = (0, _file.dataURLtoBlob)(res.data); // 转成blob格式进行上传

package/lowcode/file-item/meta.ts

@@ -333,6 +333,21 @@ const FileItemMeta: IPublicTypeComponentMetadata = {
           "initialValue": ""
         }
       },
+      {
+        "title": {
+          "label": {
+            "type": "i18n",
+            "en-US": "env",
+            "zh-CN": "env"
+          }
+        },
+        "name": "env",
+        "setter": {
+          "componentName": "StringSetter",
+          "isRequired": true,
+          "initialValue": ""
+        }
+      },
       {
         "title": {
           "label": {

package/lowcode_es/file-item/meta.js

@@ -309,6 +309,20 @@ var FileItemMeta = {
         "isRequired": true,
         "initialValue": ""
       }
+    }, {
+      "title": {
+        "label": {
+          "type": "i18n",
+          "en-US": "env",
+          "zh-CN": "env"
+        }
+      },
+      "name": "env",
+      "setter": {
+        "componentName": "StringSetter",
+        "isRequired": true,
+        "initialValue": ""
+      }
     }, {
       "title": {
         "label": {

package/lowcode_es/meta.js

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

package/lowcode_lib/file-item/meta.js

@@ -314,6 +314,20 @@ var FileItemMeta = {
         "isRequired": true,
         "initialValue": ""
       }
+    }, {
+      "title": {
+        "label": {
+          "type": "i18n",
+          "en-US": "env",
+          "zh-CN": "env"
+        }
+      },
+      "name": "env",
+      "setter": {
+        "componentName": "StringSetter",
+        "isRequired": true,
+        "initialValue": ""
+      }
     }, {
       "title": {
         "label": {

package/lowcode_lib/meta.js

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

package/package.json

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