ydb-components-material 0.1.201 → 0.1.203

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

@@ -91,7 +91,7 @@ var FileList = function FileList(_ref) {
   };
   useEffect(function () {
     var stored = localStorage.getItem(tokenTY);
-    console.log('fileList-stored', stored);
+    // console.log('fileList-stored', stored);
     if (stored) {
       try {
         setFileArray(JSON.parse(stored));
@@ -141,7 +141,7 @@ var FileList = function FileList(_ref) {
 
   // 拼接材料的提示文案 - 一级材料
   var getTipText = function getTipText(item) {
-    console.log('getTipText', item);
+    // console.log('getTipText', item);
     var materialSize = item.materialSize,
       materialSpec = item.materialSpec,
       materialType = item.materialType;
@@ -156,8 +156,8 @@ var FileList = function FileList(_ref) {
   // 拼接材料的提示文案 - 二级材料
   var getTipTextForSubMaterial = function getTipTextForSubMaterial(item, index, subIndex) {
     var subMaterials = fileArray[index].subMaterials;
-    console.log('getTipTextForSubMaterial', item, index, subIndex);
-    console.log('subMaterials', subMaterials);
+    // console.log('getTipTextForSubMaterial', item, index, subIndex);
+    // console.log('subMaterials', subMaterials);
     var materialSize = item.materialSize,
       materialSpec = item.materialSpec,
       materialType = item.materialType;
@@ -177,7 +177,7 @@ var FileList = function FileList(_ref) {
       text = "\u3010" + materialNames.join('和') + "\u3011\u81F3\u5C11\u4E0A\u4F20\u4E00\u4EFD\uFF0C";
     }
     var sizeText = materialSize ? "\u5355\u4E2A\u4E0D\u8D85\u8FC7\u3010" + materialSize + "MB\u3011" : '';
-    console.log('text', sizeText);
+    // console.log('text', sizeText);
     return text + "\u9700\u4E0A\u4F20\u3010" + MATERIAL_TYPE[materialType] + "\u3011\uFF0C\u652F\u6301\u3010" + formatText + "\u3011\u683C\u5F0F\u3002" + sizeText;
   };
   var mergeFiles = function mergeFiles(name, files, index, subIndex) {
@@ -193,7 +193,7 @@ var FileList = function FileList(_ref) {
     setShowMerge(true);
   };
   var mergeChange = function mergeChange(value) {
-    console.log('mergeChange', value);
+    // console.log('mergeChange', value);
     for (var i = 0; i < curMerge.fileList.length - 1; i++) {
       handleChange(undefined, 0, curMerge.index, curMerge.subIndex);
     }
@@ -213,7 +213,7 @@ var FileList = function FileList(_ref) {
     return list;
   };
   var handleChange = function handleChange(value, fileIndex, index, subIndex) {
-    console.log('handleChange', value, fileIndex, index, subIndex);
+    // console.log('handleChange', value, fileIndex, index, subIndex);
     // 先找到一级目录
     var oneLevelItem = fileArray[index];
     // 如果subIndex有值。再去找一下二级目录
@@ -253,7 +253,7 @@ var FileList = function FileList(_ref) {
         }
       }
     }
-    console.log('fileList--------res', fileArray);
+    // console.log('fileList--------res', fileArray);
     valChange(fileArray);
     setFileArray([].concat(fileArray));
   };
@@ -268,16 +268,16 @@ var FileList = function FileList(_ref) {
 
   // 如果 文件列表中都是图片，且数量大于1 判断需要合并
   var judgeNeedMerge = function judgeNeedMerge(files) {
-    console.log('files--------judgeNeedMerge', files);
+    // console.log('files--------judgeNeedMerge', files)
     var filterList = files.filter(function (file) {
       return !!file.fileId;
     });
     return filterList.every(function (file) {
       var fileName = file.fileName;
       if (!fileName) return false;
-      console.log('fileName----', fileName);
+      // console.log('fileName----', fileName)
       var type = getFileExtension(fileName);
-      console.log('type----', type);
+      // console.log('type----', type)
       return ['png', 'jpg', 'jpeg'].includes(type);
     }) && filterList.length > 1;
   };
@@ -449,7 +449,8 @@ var FileList = function FileList(_ref) {
     tokenTY: tokenTY,
     materialName: curMerge.materialName,
     openLoading: openLoading,
-    closeLoading: closeLoading
+    closeLoading: closeLoading,
+    isPC: isPC
   }));
 };
 export default FileList;

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

@@ -59,7 +59,7 @@ var FileItem = function FileItem(_ref) {
     autoShowSignerInfo = _ref.autoShowSignerInfo,
     onNeedSignerInfo = _ref.onNeedSignerInfo,
     onCloseSignerInfo = _ref.onCloseSignerInfo;
-  console.log('fileItem', file, maxFileSize);
+  // console.log('fileItem', file, maxFileSize);
   var fileName = file.fileName,
     fileUrl = file.fileUrl,
     fileId = file.fileId,
@@ -133,7 +133,7 @@ var FileItem = function FileItem(_ref) {
     setShowSignBtn = _React$useState6[1];
   React.useEffect(function () {
     var prerequisite = signatureEnable || signEnable;
-    console.log('prerequisite', prerequisite);
+    // console.log('prerequisite', prerequisite)
     if (!prerequisite) {
       setShowSignBtn(false);
       // return;
@@ -221,7 +221,6 @@ var FileItem = function FileItem(_ref) {
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            console.log('params---', documentIdVal, contractIdVal, nameVal, file);
             _context.next = 1;
             return getSignRes(documentIdVal, contractIdVal, nameVal, true, {
               token: token,
@@ -358,7 +357,7 @@ var FileItem = function FileItem(_ref) {
             }
             return _context2.abrupt("return");
           case 1:
-            console.log('fileUrl', fileUrl, fileId);
+            // console.log('fileUrl', fileUrl, fileId);
             captureComponentTop();
             setPreviewIframeUrl(fileUrl);
             setIsShowPreview(true);
@@ -635,7 +634,7 @@ var FileItem = function FileItem(_ref) {
     // invalidHandle()
     // 轮询回调是旧闭包，这里读 ref 拿最新值，避免读到挂载时的初始 false
     var needOther = needOtherSignRef.current;
-    console.log('needOtherSign-----', needOther);
+    // console.log('needOtherSign-----', needOther);
     if (needOther) {
       // 弹窗状态放到父级 FileList 控制，避免 FileItem 因 fileId 变化重挂载导致弹窗状态丢失
       onNeedSignerInfo && onNeedSignerInfo({
@@ -648,7 +647,7 @@ var FileItem = function FileItem(_ref) {
 
   // 获取签章结果
   var getSealRes = function getSealRes(val) {
-    console.log('sealval---', val);
+    // console.log('sealval---', val);
     // 如果还允许签批 就连住一起做了
     if (signatureEnable) {
       setSealedFile(val);
@@ -688,7 +687,7 @@ var FileItem = function FileItem(_ref) {
             }
             return _context5.abrupt("return", null);
           case 1:
-            console.log('queryFileLibs', userInfo);
+            // console.log('queryFileLibs', userInfo);
             certNo = userInfo.certNo, certificateSno = userInfo.certificateSno, acctType = userInfo.acctType;
             currentPage = reset ? 1 : pageNum;
             params = {
@@ -1004,7 +1003,6 @@ var FileItem = function FileItem(_ref) {
               _context1.next = 6;
               break;
             }
-            console.log('urlRes', urlRes);
             _context1.next = 4;
             return onlinePreview({
               url: urlRes.presignedUrlList[2]
@@ -1022,7 +1020,6 @@ var FileItem = function FileItem(_ref) {
             return extractImageUrls(res.url);
           case 5:
             list = _context1.sent;
-            console.log('list---111111', list);
             return _context1.abrupt("return", list[0]);
           case 6:
           case "end":
@@ -1036,7 +1033,7 @@ var FileItem = function FileItem(_ref) {
   }();
   useEffect(function () {
     if (fileId) {
-      console.log('fileId---', fileId);
+      // console.log('fileId---', fileId)
       getViewUrl(fileId).then(function (url) {
         setThumbnail(url);
       });
@@ -1199,7 +1196,7 @@ var FileItem = function FileItem(_ref) {
     className: "operation_btn",
     onClick: signAndSeal
   }, function () {
-    console.log('isSigned---', isSigned, signatureEnable);
+    // console.log('isSigned---', isSigned, signatureEnable)
     var canSign = signatureEnable;
     var canSeal = userInfo.acctType === '20' && signEnable;
     // 两者都开启：两个都签署过才算重新签署

package/es/components/file-list/merge.d.ts

@@ -13,6 +13,7 @@ export interface MergeProps {
     materialName: string;
     openLoading: () => void;
     closeLoading: () => void;
+    isPC?: boolean;
 }
 declare const Merge: React.FC<MergeProps>;
 export default Merge;

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

@@ -1,3 +1,4 @@
+import _Message from "@alifd/next/es/message";
 import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
@@ -18,19 +19,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 = useState(''),
     viewUrl = _useState[0],
     setViewUrl = _useState[1];
-  var _useState2 = useState(''),
-    viewPdfUrl = _useState2[0],
-    setViewPdfUrl = _useState2[1];
-  var _useState3 = useState(null),
-    blob = _useState3[0],
-    setBlob = _useState3[1];
-  var _useState4 = useState(fileList),
-    materialList = _useState4[0],
-    setMaterialList = _useState4[1];
+  var _useState2 = useState(false),
+    isShowPreview = _useState2[0],
+    setIsShowPreview = _useState2[1];
+  var _useState3 = useState(''),
+    viewPdfUrl = _useState3[0],
+    setViewPdfUrl = _useState3[1];
+  var _useState4 = useState(null),
+    blob = _useState4[0],
+    setBlob = _useState4[1];
+  var _useState5 = useState(fileList),
+    materialList = _useState5[0],
+    setMaterialList = _useState5[1];
 
   // 置顶
   var top = function top(index) {
@@ -185,9 +190,9 @@ var Merge = function Merge(_ref) {
   };
 
   // 核心：多张图片合并PDF
-  var imgsToPdf = /*#__PURE__*/function () {
+  var buildPdfBlob = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.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 _regeneratorRuntime.wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -238,56 +243,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 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-      var formData;
+      var pdfBlob;
       return _regeneratorRuntime.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 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+      var pdfBlob, formData, response, res, _t2, _t3;
+      return _regeneratorRuntime.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(_extends({}, 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(_extends({}, res, {
+              fileName: materialName + '.pdf'
+            }));
+            _context4.next = 7;
+            break;
+          case 6:
+            _context4.prev = 6;
+            _t3 = _context4["catch"](1);
+            console.error(_t3);
+            _Message.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", {
@@ -355,7 +416,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(CloseOutlined, {
@@ -367,15 +428,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',
@@ -384,7 +456,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/es/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/es/components/sign-file/mobile.js

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

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

@@ -97,7 +97,7 @@ var FileList = function FileList(_ref) {
   };
   (0, _react.useEffect)(function () {
     var stored = localStorage.getItem(tokenTY);
-    console.log('fileList-stored', stored);
+    // console.log('fileList-stored', stored);
     if (stored) {
       try {
         setFileArray(JSON.parse(stored));
@@ -147,7 +147,7 @@ var FileList = function FileList(_ref) {
 
   // 拼接材料的提示文案 - 一级材料
   var getTipText = function getTipText(item) {
-    console.log('getTipText', item);
+    // console.log('getTipText', item);
     var materialSize = item.materialSize,
       materialSpec = item.materialSpec,
       materialType = item.materialType;
@@ -162,8 +162,8 @@ var FileList = function FileList(_ref) {
   // 拼接材料的提示文案 - 二级材料
   var getTipTextForSubMaterial = function getTipTextForSubMaterial(item, index, subIndex) {
     var subMaterials = fileArray[index].subMaterials;
-    console.log('getTipTextForSubMaterial', item, index, subIndex);
-    console.log('subMaterials', subMaterials);
+    // console.log('getTipTextForSubMaterial', item, index, subIndex);
+    // console.log('subMaterials', subMaterials);
     var materialSize = item.materialSize,
       materialSpec = item.materialSpec,
       materialType = item.materialType;
@@ -183,7 +183,7 @@ var FileList = function FileList(_ref) {
       text = "\u3010" + materialNames.join('和') + "\u3011\u81F3\u5C11\u4E0A\u4F20\u4E00\u4EFD\uFF0C";
     }
     var sizeText = materialSize ? "\u5355\u4E2A\u4E0D\u8D85\u8FC7\u3010" + materialSize + "MB\u3011" : '';
-    console.log('text', sizeText);
+    // console.log('text', sizeText);
     return text + "\u9700\u4E0A\u4F20\u3010" + MATERIAL_TYPE[materialType] + "\u3011\uFF0C\u652F\u6301\u3010" + formatText + "\u3011\u683C\u5F0F\u3002" + sizeText;
   };
   var mergeFiles = function mergeFiles(name, files, index, subIndex) {
@@ -199,7 +199,7 @@ var FileList = function FileList(_ref) {
     setShowMerge(true);
   };
   var mergeChange = function mergeChange(value) {
-    console.log('mergeChange', value);
+    // console.log('mergeChange', value);
     for (var i = 0; i < curMerge.fileList.length - 1; i++) {
       handleChange(undefined, 0, curMerge.index, curMerge.subIndex);
     }
@@ -219,7 +219,7 @@ var FileList = function FileList(_ref) {
     return list;
   };
   var handleChange = function handleChange(value, fileIndex, index, subIndex) {
-    console.log('handleChange', value, fileIndex, index, subIndex);
+    // console.log('handleChange', value, fileIndex, index, subIndex);
     // 先找到一级目录
     var oneLevelItem = fileArray[index];
     // 如果subIndex有值。再去找一下二级目录
@@ -259,7 +259,7 @@ var FileList = function FileList(_ref) {
         }
       }
     }
-    console.log('fileList--------res', fileArray);
+    // console.log('fileList--------res', fileArray);
     valChange(fileArray);
     setFileArray([].concat(fileArray));
   };
@@ -274,16 +274,16 @@ var FileList = function FileList(_ref) {
 
   // 如果 文件列表中都是图片，且数量大于1 判断需要合并
   var judgeNeedMerge = function judgeNeedMerge(files) {
-    console.log('files--------judgeNeedMerge', files);
+    // console.log('files--------judgeNeedMerge', files)
     var filterList = files.filter(function (file) {
       return !!file.fileId;
     });
     return filterList.every(function (file) {
       var fileName = file.fileName;
       if (!fileName) return false;
-      console.log('fileName----', fileName);
+      // console.log('fileName----', fileName)
       var type = (0, _file.getFileExtension)(fileName);
-      console.log('type----', type);
+      // console.log('type----', type)
       return ['png', 'jpg', 'jpeg'].includes(type);
     }) && filterList.length > 1;
   };
@@ -455,7 +455,8 @@ var FileList = function FileList(_ref) {
     tokenTY: tokenTY,
     materialName: curMerge.materialName,
     openLoading: openLoading,
-    closeLoading: closeLoading
+    closeLoading: closeLoading,
+    isPC: isPC
   }));
 };
 var _default = exports["default"] = FileList;

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

@@ -65,7 +65,7 @@ var FileItem = function FileItem(_ref) {
     autoShowSignerInfo = _ref.autoShowSignerInfo,
     onNeedSignerInfo = _ref.onNeedSignerInfo,
     onCloseSignerInfo = _ref.onCloseSignerInfo;
-  console.log('fileItem', file, maxFileSize);
+  // console.log('fileItem', file, maxFileSize);
   var fileName = file.fileName,
     fileUrl = file.fileUrl,
     fileId = file.fileId,
@@ -139,7 +139,7 @@ var FileItem = function FileItem(_ref) {
     setShowSignBtn = _React$useState6[1];
   _react["default"].useEffect(function () {
     var prerequisite = signatureEnable || signEnable;
-    console.log('prerequisite', prerequisite);
+    // console.log('prerequisite', prerequisite)
     if (!prerequisite) {
       setShowSignBtn(false);
       // return;
@@ -227,7 +227,6 @@ var FileItem = function FileItem(_ref) {
       return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            console.log('params---', documentIdVal, contractIdVal, nameVal, file);
             _context.next = 1;
             return (0, _signUtil.getSignRes)(documentIdVal, contractIdVal, nameVal, true, {
               token: token,
@@ -364,7 +363,7 @@ var FileItem = function FileItem(_ref) {
             }
             return _context2.abrupt("return");
           case 1:
-            console.log('fileUrl', fileUrl, fileId);
+            // console.log('fileUrl', fileUrl, fileId);
             captureComponentTop();
             setPreviewIframeUrl(fileUrl);
             setIsShowPreview(true);
@@ -641,7 +640,7 @@ var FileItem = function FileItem(_ref) {
     // invalidHandle()
     // 轮询回调是旧闭包，这里读 ref 拿最新值，避免读到挂载时的初始 false
     var needOther = needOtherSignRef.current;
-    console.log('needOtherSign-----', needOther);
+    // console.log('needOtherSign-----', needOther);
     if (needOther) {
       // 弹窗状态放到父级 FileList 控制，避免 FileItem 因 fileId 变化重挂载导致弹窗状态丢失
       onNeedSignerInfo && onNeedSignerInfo({
@@ -654,7 +653,7 @@ var FileItem = function FileItem(_ref) {
 
   // 获取签章结果
   var getSealRes = function getSealRes(val) {
-    console.log('sealval---', val);
+    // console.log('sealval---', val);
     // 如果还允许签批 就连住一起做了
     if (signatureEnable) {
       setSealedFile(val);
@@ -694,7 +693,7 @@ var FileItem = function FileItem(_ref) {
             }
             return _context5.abrupt("return", null);
           case 1:
-            console.log('queryFileLibs', userInfo);
+            // console.log('queryFileLibs', userInfo);
             certNo = userInfo.certNo, certificateSno = userInfo.certificateSno, acctType = userInfo.acctType;
             currentPage = reset ? 1 : pageNum;
             params = {
@@ -1010,7 +1009,6 @@ var FileItem = function FileItem(_ref) {
               _context1.next = 6;
               break;
             }
-            console.log('urlRes', urlRes);
             _context1.next = 4;
             return (0, _api.onlinePreview)({
               url: urlRes.presignedUrlList[2]
@@ -1028,7 +1026,6 @@ var FileItem = function FileItem(_ref) {
             return extractImageUrls(res.url);
           case 5:
             list = _context1.sent;
-            console.log('list---111111', list);
             return _context1.abrupt("return", list[0]);
           case 6:
           case "end":
@@ -1042,7 +1039,7 @@ var FileItem = function FileItem(_ref) {
   }();
   (0, _react.useEffect)(function () {
     if (fileId) {
-      console.log('fileId---', fileId);
+      // console.log('fileId---', fileId)
       getViewUrl(fileId).then(function (url) {
         setThumbnail(url);
       });
@@ -1205,7 +1202,7 @@ var FileItem = function FileItem(_ref) {
     className: "operation_btn",
     onClick: signAndSeal
   }, function () {
-    console.log('isSigned---', isSigned, signatureEnable);
+    // console.log('isSigned---', isSigned, signatureEnable)
     var canSign = signatureEnable;
     var canSeal = userInfo.acctType === '20' && signEnable;
     // 两者都开启：两个都签署过才算重新签署

package/lib/components/file-list/merge.d.ts

@@ -13,6 +13,7 @@ export interface MergeProps {
     materialName: string;
     openLoading: () => void;
     closeLoading: () => void;
+    isPC?: boolean;
 }
 declare const Merge: React.FC<MergeProps>;
 export default Merge;