ydb-components-material 0.1.85 → 0.1.86

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

@@ -1,7 +1,7 @@
 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";
+import { createbycategory, contractSignUrl, signurl, checkSignState, contractFinish, documentDownload, fileUploadApi } from "../../api";
 var categoryId = '3354397552669692408';
 // 预发
 var categoryIdRelease = '3291682531601133765'; // 手写签批id
@@ -256,7 +256,7 @@ export function getSignRes(_x6, _x7, _x8, _x9, _x0) {
 // 轮询 签批状态
 function _getSignRes() {
   _getSignRes = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(documentIdVal, contractIdVal, name, autoUpload, config) {
-    var isSignSucc, newFile, uploadedFileObj;
+    var isSignSucc, newFile, params, uploadRes;
     return _regeneratorRuntime.wrap(function (_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -265,7 +265,7 @@ function _getSignRes() {
         case 1:
           isSignSucc = _context3.sent;
           if (!isSignSucc) {
-            _context3.next = 6;
+            _context3.next = 8;
             break;
           }
           // 封存
@@ -277,23 +277,38 @@ function _getSignRes() {
           console.log('newFile', newFile);
           // 如果需要自动上传
           if (!autoUpload) {
-            _context3.next = 4;
+            _context3.next = 6;
             break;
           }
+          params = {
+            materiaBase: newFile,
+            open: true
+          };
+          console.log('params', params);
           _context3.next = 3;
-          return uploadFilePromise(newFile, config);
+          return fileUploadApi(params, config);
         case 3:
-          uploadedFileObj = _context3.sent;
-          console.log('签批完成后的文件地址', uploadedFileObj);
-          return _context3.abrupt("return", uploadedFileObj);
+          uploadRes = _context3.sent;
+          // const uploadedFileObj = await uploadFilePromise(newFile, config)
+          console.log('签批完成后的文件地址', uploadRes);
+          if (!(uploadRes.code === 200)) {
+            _context3.next = 4;
+            break;
+          }
+          return _context3.abrupt("return", uploadRes.data);
         case 4:
-          return _context3.abrupt("return", newFile);
+          return _context3.abrupt("return", false);
         case 5:
           _context3.next = 7;
           break;
         case 6:
-          return _context3.abrupt("return", false);
+          return _context3.abrupt("return", newFile);
         case 7:
+          _context3.next = 9;
+          break;
+        case 8:
+          return _context3.abrupt("return", false);
+        case 9:
         case "end":
           return _context3.stop();
       }
@@ -340,9 +355,13 @@ function handleSignApprovalDown(documentIdVal, name, config) {
     documentDownload(params, config).then(function (res) {
       console.log('下载文件：', res);
       // 返回来是base64格式的
-      var blob = dataURLtoBlob(res.data); // 转成blob格式进行上传
-      console.log(blob, '新文件的blob格式');
-      resolve(blob);
+      // const blob = dataURLtoBlob(res.data); // 转成blob格式进行上传
+      // console.log(blob, '新文件的blob格式');
+      if (res.code === 200) {
+        resolve(res.data);
+      } else {
+        resolve(false);
+      }
     });
   });
 }

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

@@ -258,7 +258,7 @@ function getSignRes(_x6, _x7, _x8, _x9, _x0) {
 } // 轮询 签批状态
 function _getSignRes() {
   _getSignRes = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(documentIdVal, contractIdVal, name, autoUpload, config) {
-    var isSignSucc, newFile, uploadedFileObj;
+    var isSignSucc, newFile, params, uploadRes;
     return _regenerator["default"].wrap(function (_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -267,7 +267,7 @@ function _getSignRes() {
         case 1:
           isSignSucc = _context3.sent;
           if (!isSignSucc) {
-            _context3.next = 6;
+            _context3.next = 8;
             break;
           }
           // 封存
@@ -279,23 +279,38 @@ function _getSignRes() {
           console.log('newFile', newFile);
           // 如果需要自动上传
           if (!autoUpload) {
-            _context3.next = 4;
+            _context3.next = 6;
             break;
           }
+          params = {
+            materiaBase: newFile,
+            open: true
+          };
+          console.log('params', params);
           _context3.next = 3;
-          return (0, _file.uploadFilePromise)(newFile, config);
+          return (0, _api.fileUploadApi)(params, config);
         case 3:
-          uploadedFileObj = _context3.sent;
-          console.log('签批完成后的文件地址', uploadedFileObj);
-          return _context3.abrupt("return", uploadedFileObj);
+          uploadRes = _context3.sent;
+          // const uploadedFileObj = await uploadFilePromise(newFile, config)
+          console.log('签批完成后的文件地址', uploadRes);
+          if (!(uploadRes.code === 200)) {
+            _context3.next = 4;
+            break;
+          }
+          return _context3.abrupt("return", uploadRes.data);
         case 4:
-          return _context3.abrupt("return", newFile);
+          return _context3.abrupt("return", false);
         case 5:
           _context3.next = 7;
           break;
         case 6:
-          return _context3.abrupt("return", false);
+          return _context3.abrupt("return", newFile);
         case 7:
+          _context3.next = 9;
+          break;
+        case 8:
+          return _context3.abrupt("return", false);
+        case 9:
         case "end":
           return _context3.stop();
       }
@@ -342,9 +357,13 @@ function handleSignApprovalDown(documentIdVal, name, config) {
     (0, _api.documentDownload)(params, config).then(function (res) {
       console.log('下载文件：', res);
       // 返回来是base64格式的
-      var blob = (0, _file.dataURLtoBlob)(res.data); // 转成blob格式进行上传
-      console.log(blob, '新文件的blob格式');
-      resolve(blob);
+      // const blob = dataURLtoBlob(res.data); // 转成blob格式进行上传
+      // console.log(blob, '新文件的blob格式');
+      if (res.code === 200) {
+        resolve(res.data);
+      } else {
+        resolve(false);
+      }
     });
   });
 }

package/lowcode_es/meta.js

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

package/lowcode_lib/meta.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ydb-components-material",
-  "version": "0.1.85",
+  "version": "0.1.86",
   "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.85/build/lowcode/assets-prod.json"
+    "materialSchema": "https://unpkg.com/ydb-components-material@0.1.86/build/lowcode/assets-prod.json"
   },
   "lcMeta": {
     "type": "component"
   },
-  "homepage": "https://unpkg.com/ydb-components-material@0.1.85/build/index.html"
+  "homepage": "https://unpkg.com/ydb-components-material@0.1.86/build/index.html"
 }