ydb-components-material 0.1.201 → 0.1.203

package/lib/components/file-list/merge.js

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _react = _interopRequireWildcard(require("react"));
@@ -13,7 +14,7 @@ var _reactBeautifulDnd = require("react-beautiful-dnd");
 var _icons = require("@ant-design/icons");
 var _jspdf = _interopRequireDefault(require("jspdf"));
 require("./merge.scss");
-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 _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
+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 _t4 in e) "default" !== _t4 && {}.hasOwnProperty.call(e, _t4) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t4)) && (i.get || i.set) ? o(f, _t4, i) : f[_t4] = e[_t4]); return f; })(e, t); }
 // 1. 引入 useState
 
 var Merge = function Merge(_ref) {
@@ -26,19 +27,23 @@ var Merge = function Merge(_ref) {
     tokenTY = _ref.tokenTY,
     openLoading = _ref.openLoading,
     closeLoading = _ref.closeLoading,
-    close = _ref.close;
+    close = _ref.close,
+    isPC = _ref.isPC;
   var _useState = (0, _react.useState)(''),
     viewUrl = _useState[0],
     setViewUrl = _useState[1];
-  var _useState2 = (0, _react.useState)(''),
-    viewPdfUrl = _useState2[0],
-    setViewPdfUrl = _useState2[1];
-  var _useState3 = (0, _react.useState)(null),
-    blob = _useState3[0],
-    setBlob = _useState3[1];
-  var _useState4 = (0, _react.useState)(fileList),
-    materialList = _useState4[0],
-    setMaterialList = _useState4[1];
+  var _useState2 = (0, _react.useState)(false),
+    isShowPreview = _useState2[0],
+    setIsShowPreview = _useState2[1];
+  var _useState3 = (0, _react.useState)(''),
+    viewPdfUrl = _useState3[0],
+    setViewPdfUrl = _useState3[1];
+  var _useState4 = (0, _react.useState)(null),
+    blob = _useState4[0],
+    setBlob = _useState4[1];
+  var _useState5 = (0, _react.useState)(fileList),
+    materialList = _useState5[0],
+    setMaterialList = _useState5[1];
 
   // 置顶
   var top = function top(index) {
@@ -193,9 +198,9 @@ var Merge = function Merge(_ref) {
   };
 
   // 核心：多张图片合并PDF
-  var imgsToPdf = /*#__PURE__*/function () {
+  var buildPdfBlob = /*#__PURE__*/function () {
     var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-      var pdf, i, fileUrl, _blob, file, img, targetWidth, scale, targetHeight, pdfBlob, blobUrl;
+      var pdf, i, fileUrl, _blob, file, img, targetWidth, scale, targetHeight;
       return _regenerator["default"].wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -246,56 +251,112 @@ var Merge = function Merge(_ref) {
             _context2.next = 1;
             break;
           case 5:
-            // 1. 获取 Blob
-            pdfBlob = pdf.output('blob');
-            setBlob(pdfBlob);
-
-            // 2. 创建 Blob URL
-            blobUrl = URL.createObjectURL(pdfBlob);
-            setViewPdfUrl(blobUrl);
+            return _context2.abrupt("return", pdf.output('blob'));
           case 6:
           case "end":
             return _context2.stop();
         }
       }, _callee2);
     }));
-    return function imgsToPdf() {
+    return function buildPdfBlob() {
       return _ref3.apply(this, arguments);
     };
   }();
-  var uploadPdf = /*#__PURE__*/function () {
+
+  // PC：先拼出 PDF，再用 iframe 交给浏览器内置的 PDF 查看器预览
+  var imgsToPdf = /*#__PURE__*/function () {
     var _ref4 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
-      var formData;
+      var pdfBlob;
       return _regenerator["default"].wrap(function (_context3) {
         while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 1;
+            return buildPdfBlob();
+          case 1:
+            pdfBlob = _context3.sent;
+            setBlob(pdfBlob);
+            setViewPdfUrl(URL.createObjectURL(pdfBlob));
+            setIsShowPreview(true);
+          case 2:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+    return function imgsToPdf() {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+
+  // 移动端：WebView 没有内置 PDF 查看器（iframe 里的 blob PDF 渲染不出来），
+  // 直接按顺序滚动预览图片，内容与 PDF 一致；PDF 留到点「确认无误」时再生成
+  var openImgPreview = function openImgPreview() {
+    return setIsShowPreview(true);
+  };
+  var previewMaterial = function previewMaterial() {
+    return isPC ? imgsToPdf() : openImgPreview();
+  };
+  var uploadPdf = /*#__PURE__*/function () {
+    var _ref5 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+      var pdfBlob, formData, response, res, _t2, _t3;
+      return _regenerator["default"].wrap(function (_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             openLoading();
+            _context4.prev = 1;
+            _t2 = blob;
+            if (_t2) {
+              _context4.next = 3;
+              break;
+            }
+            _context4.next = 2;
+            return buildPdfBlob();
+          case 2:
+            _t2 = _context4.sent;
+          case 3:
+            pdfBlob = _t2;
+            if (!blob) setBlob(pdfBlob);
             formData = new FormData();
-            formData.append('file', blob, materialName + '.pdf');
+            formData.append('file', pdfBlob, materialName + '.pdf');
             formData.append('open', true);
-            fetch(baseUrl + "/declaration/material/file/files/api", {
+            _context4.next = 4;
+            return fetch(baseUrl + "/declaration/material/file/files/api", {
               method: 'POST',
               body: formData,
               headers: {
                 'Authorization': tokenTY || ''
               }
-            }).then(function (response) {
-              return response.json();
-            }).then(function (res) {
-              console.log(res);
-              valChange((0, _extends2["default"])({}, res, {
-                fileName: materialName + '.pdf'
-              }));
-              closeLoading();
             });
-          case 1:
+          case 4:
+            response = _context4.sent;
+            _context4.next = 5;
+            return response.json();
+          case 5:
+            res = _context4.sent;
+            console.log(res);
+            valChange((0, _extends2["default"])({}, res, {
+              fileName: materialName + '.pdf'
+            }));
+            _context4.next = 7;
+            break;
+          case 6:
+            _context4.prev = 6;
+            _t3 = _context4["catch"](1);
+            console.error(_t3);
+            _message["default"].error('生成或上传失败，请重试');
+          case 7:
+            _context4.prev = 7;
+            // 原来只在成功分支里关，失败时全屏 loading 会一直挂着
+            closeLoading();
+            return _context4.finish(7);
+          case 8:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3);
+      }, _callee4, null, [[1, 6, 7, 8]]);
     }));
     return function uploadPdf() {
-      return _ref4.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
   return /*#__PURE__*/React.createElement("div", {
@@ -363,7 +424,7 @@ var Merge = function Merge(_ref) {
     onClick: close
   }, "\u4E0A\u4E00\u6B65"), /*#__PURE__*/React.createElement("div", {
     className: "preview btn",
-    onClick: imgsToPdf
+    onClick: previewMaterial
   }, "\u9884\u89C8\u6750\u6599")), viewUrl && /*#__PURE__*/React.createElement("div", {
     className: "viewImg"
   }, /*#__PURE__*/React.createElement(_icons.CloseOutlined, {
@@ -375,15 +436,26 @@ var Merge = function Merge(_ref) {
     className: "view",
     src: viewUrl,
     alt: ""
-  })), viewPdfUrl && /*#__PURE__*/React.createElement("div", {
+  })), isShowPreview && /*#__PURE__*/React.createElement("div", {
     className: "view_pdf"
-  }, /*#__PURE__*/React.createElement("iframe", {
+  }, isPC ? /*#__PURE__*/React.createElement("iframe", {
     src: viewPdfUrl + '#toolbar=0&navpanes=0&scrollbar=0&messages=0&statusbar=0',
     id: "iframe",
     frameBorder: "0",
     height: "95%",
     width: "100%"
-  }), /*#__PURE__*/React.createElement("div", {
+  }) :
+  /*#__PURE__*/
+  // 移动端 WebView 没有内置 PDF 查看器，iframe 里的 blob PDF 渲染不出来，改为直接滚动预览图片
+  React.createElement("div", {
+    className: "view_imgs"
+  }, materialList.map(function (item) {
+    return /*#__PURE__*/React.createElement("img", {
+      key: item.fileId,
+      src: item.fileUrl,
+      alt: ""
+    });
+  })), /*#__PURE__*/React.createElement("div", {
     className: "bottom_btn",
     style: {
       background: '#fff',
@@ -392,7 +464,7 @@ var Merge = function Merge(_ref) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "previous btn",
     onClick: function onClick() {
-      return setViewPdfUrl('');
+      return setIsShowPreview(false);
     }
   }, "\u8FD4\u56DE\u4FEE\u6539"), /*#__PURE__*/React.createElement("div", {
     className: "preview btn",

package/lib/components/file-list/merge.scss

@@ -112,6 +112,24 @@
     height: 100%;
     z-index: 999;
   }
+  // 移动端：按顺序滚动预览待合并的图片（代替渲染不出来的 PDF iframe）
+  .view_imgs {
+    height: 100%;
+    box-sizing: border-box;
+    overflow-y: auto;
+    -webkit-overflow-scrolling: touch;
+    background: #ffffff;
+    // 底部留出固定按钮的位置，别让最后一张图被压住
+    padding: 12px 12px 100px;
+
+    img {
+      display: block;
+      width: 100%;
+      margin-bottom: 12px;
+      border-radius: 4px;
+      background: #ffffff;
+    }
+  }
   .viewImg {
     background-color: #3333336a;
     position: fixed;

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

@@ -27,7 +27,6 @@ var SignFileMobile = function SignFileMobile(props) {
   var _useSignFile = (0, _useSignFile2.useSignFile)(props, {
       withThumbnail: true
     }),
-    fileName = _useSignFile.fileName,
     originalFileId = _useSignFile.originalFileId,
     guideImg = _useSignFile.guideImg,
     thumbnail = _useSignFile.thumbnail,

package/lowcode_es/meta.js

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

package/lowcode_lib/meta.js

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

package/package.json

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