ydb-components-material 0.1.199 → 0.1.201

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

@@ -200,6 +200,18 @@ var FileList = function FileList(_ref) {
     handleChange(value, 0, curMerge.index, curMerge.subIndex);
     setShowMerge(false);
   };
+
+  // 删除之后调用：只要没到 10 个上限，就保证末尾是一个空槽（渲染成「上传材料」按钮）。
+  // 末尾已经是空槽或列表为空（空列表也要补一个）时按需处理，已达上限则不动。
+  var ensureEmptySlot = function ensureEmptySlot(list) {
+    if (list.length >= 10) return list;
+    var last = list[list.length - 1];
+    if (last && !last.fileId) return list;
+    list.push({
+      fileId: ''
+    });
+    return list;
+  };
   var handleChange = function handleChange(value, fileIndex, index, subIndex) {
     console.log('handleChange', value, fileIndex, index, subIndex);
     // 先找到一级目录
@@ -210,14 +222,9 @@ var FileList = function FileList(_ref) {
       if (!value) {
         oneLevelItem.subMaterials[subIndex].isSmart = false;
         oneLevelItem.subMaterials[subIndex].isShareFile = false;
-        // 如果当前文件list中只有一个文件，还得补个空的
-        if (oneLevelItem.subMaterials[subIndex].fileList.length === 1) {
-          oneLevelItem.subMaterials[subIndex].fileList = [{
-            fileId: ''
-          }];
-        } else {
-          oneLevelItem.subMaterials[subIndex].fileList.splice(fileIndex, 1);
-        }
+        oneLevelItem.subMaterials[subIndex].fileList.splice(fileIndex, 1);
+        // 删完保证末尾还有「上传材料」按钮
+        ensureEmptySlot(oneLevelItem.subMaterials[subIndex].fileList);
       } else {
         // 如果当前这个位置的fileId是空的。说明这次修改是新增
         var isAdd = !oneLevelItem.subMaterials[subIndex].fileList[fileIndex].fileId;
@@ -233,11 +240,8 @@ var FileList = function FileList(_ref) {
         oneLevelItem.isSmart = false;
         oneLevelItem.isShareFile = false;
         oneLevelItem.fileList.splice(fileIndex, 1);
-        if (oneLevelItem.fileList.length === 0) {
-          oneLevelItem.fileList.push({
-            fileId: ''
-          });
-        }
+        // 删完保证末尾还有「上传材料」按钮
+        ensureEmptySlot(oneLevelItem.fileList);
       } else {
         // 如果当前这个位置的fileId是空的。说明这次修改是新增
         var _isAdd = !oneLevelItem.fileList[fileIndex].fileId;

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

@@ -669,55 +669,128 @@ var FileItem = function FileItem(_ref) {
       }
     }
   };
-  var queryFileLibs = function queryFileLibs() {
-    console.log('queryFileLibs', userInfo);
-    var certNo = userInfo.certNo,
-      certificateSno = userInfo.certificateSno,
-      acctType = userInfo.acctType;
-    var params = {
-      cardno: acctType === '10' ? certNo : certificateSno,
-      // 个人传身份证号、法人传社会统一信用代码
-      // cardno: '140110199504131013', // 个人传身份证号、法人传社会统一信用代码
-      type: acctType === '10' ? '11' : '21',
-      pageNum: pageNum,
-      pageSize: 10
+
+  // 请求材料库数据。reset 为 true 时从第一页重新拉取（每次点击「材料库」都拿最新的），
+  // 否则按当前页码追加（加载更多）。返回本次拿到的记录，请求失败返回 null——
+  // 调用方要靠这个区分「真的没有数据」和「没请求成功」，后者不该提示暂无数据。
+  var queryFileLibs = /*#__PURE__*/function () {
+    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5(reset) {
+      var certNo, certificateSno, acctType, currentPage, params, res, records, _t;
+      return _regeneratorRuntime.wrap(function (_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            if (reset === void 0) {
+              reset = false;
+            }
+            if (userInfo) {
+              _context5.next = 1;
+              break;
+            }
+            return _context5.abrupt("return", null);
+          case 1:
+            console.log('queryFileLibs', userInfo);
+            certNo = userInfo.certNo, certificateSno = userInfo.certificateSno, acctType = userInfo.acctType;
+            currentPage = reset ? 1 : pageNum;
+            params = {
+              cardno: acctType === '10' ? certNo : certificateSno,
+              // 个人传身份证号、法人传社会统一信用代码
+              // cardno: '140110199504131013', // 个人传身份证号、法人传社会统一信用代码
+              type: acctType === '10' ? '11' : '21',
+              pageNum: currentPage,
+              pageSize: 10
+            };
+            _context5.prev = 2;
+            _context5.next = 3;
+            return getMaterialLib(params, {
+              token: token,
+              tokenTY: tokenTY,
+              baseUrl: baseUrl,
+              env: env,
+              isPC: isPC,
+              accessToken: accessToken
+            });
+          case 3:
+            res = _context5.sent;
+            if (!(res.code !== 200)) {
+              _context5.next = 4;
+              break;
+            }
+            return _context5.abrupt("return", null);
+          case 4:
+            records = res.data.records || [];
+            setMaterialLib(function (list) {
+              return reset ? records : list.concat(records);
+            });
+            setMaterialLibTotal(+res.data.total);
+            setPageNum(currentPage + 1);
+            return _context5.abrupt("return", records);
+          case 5:
+            _context5.prev = 5;
+            _t = _context5["catch"](2);
+            console.error(_t);
+            return _context5.abrupt("return", null);
+          case 6:
+          case "end":
+            return _context5.stop();
+        }
+      }, _callee5, null, [[2, 5]]);
+    }));
+    return function queryFileLibs(_x6) {
+      return _ref6.apply(this, arguments);
     };
-    getMaterialLib(params, {
-      token: token,
-      tokenTY: tokenTY,
-      baseUrl: baseUrl,
-      env: env,
-      isPC: isPC,
-      accessToken: accessToken
-    }).then(function (res) {
-      if (res.code === 200) {
-        var records = res.data.records;
-        setMaterialLib(function (list) {
-          return list.concat(records);
-        });
-        setMaterialLibTotal(+res.data.total);
-        setPageNum(pageNum + 1);
-      }
-    })["catch"](function (err) {
-      console.error(err);
-    });
-  };
+  }();
+
+  // 点击「材料库」：先拉数据，空则提示，不打开弹窗
+  var openMaterialLib = /*#__PURE__*/function () {
+    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
+      var records;
+      return _regeneratorRuntime.wrap(function (_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
+          case 0:
+            _context6.next = 1;
+            return queryFileLibs(true);
+          case 1:
+            records = _context6.sent;
+            if (records) {
+              _context6.next = 2;
+              break;
+            }
+            return _context6.abrupt("return");
+          case 2:
+            if (records.length) {
+              _context6.next = 3;
+              break;
+            }
+            _Message.notice('暂无数据');
+            return _context6.abrupt("return");
+          case 3:
+            setIsShowMaterialLib(true);
+          case 4:
+          case "end":
+            return _context6.stop();
+        }
+      }, _callee6);
+    }));
+    return function openMaterialLib() {
+      return _ref7.apply(this, arguments);
+    };
+  }();
   var loadMore = function loadMore() {
     queryFileLibs();
   };
   var showGuide = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+    var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
       var guideImgRes;
-      return _regeneratorRuntime.wrap(function (_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+      return _regeneratorRuntime.wrap(function (_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
             if (signGuidFileId) {
-              _context5.next = 1;
+              _context7.next = 1;
               break;
             }
-            return _context5.abrupt("return");
+            return _context7.abrupt("return");
           case 1:
-            _context5.next = 2;
+            _context7.next = 2;
             return getGuideImg({
               id: signGuidFileId,
               effectiveTime: 3600000
@@ -730,7 +803,7 @@ var FileItem = function FileItem(_ref) {
               accessToken: accessToken
             });
           case 2:
-            guideImgRes = _context5.sent;
+            guideImgRes = _context7.sent;
             if (guideImgRes.presignedUrlList.length && guideImgRes.presignedUrlList[2]) {
               captureComponentTop();
               setGuideurl(guideImgRes.presignedUrlList[2]);
@@ -738,19 +811,19 @@ var FileItem = function FileItem(_ref) {
             }
           case 3:
           case "end":
-            return _context5.stop();
+            return _context7.stop();
         }
-      }, _callee5);
+      }, _callee7);
     }));
     return function showGuide() {
-      return _ref6.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
   var selectMaterialOk = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
+    var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
       var selectedMaterial, arr, fileFormat, formatFinal, urlRes, m;
-      return _regeneratorRuntime.wrap(function (_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regeneratorRuntime.wrap(function (_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
           case 0:
             console.log('val', materialId);
             console.log('materialLib==', materialLib);
@@ -758,8 +831,15 @@ var FileItem = function FileItem(_ref) {
               return item.fileId === materialId;
             });
             console.log('selectedMaterial', selectedMaterial);
+            if (selectedMaterial) {
+              _context8.next = 1;
+              break;
+            }
+            _Message.notice('请选择材料');
+            return _context8.abrupt("return");
+          case 1:
             if (!spec) {
-              _context6.next = 1;
+              _context8.next = 2;
               break;
             }
             arr = selectedMaterial.fileName.split('.'); //
@@ -768,24 +848,24 @@ var FileItem = function FileItem(_ref) {
             formatFinal = initFormat(spec); // 限制的文件类型
             console.log(formatFinal, '限制的格式最后');
             if (formatFinal.includes(fileFormat)) {
-              _context6.next = 1;
+              _context8.next = 2;
               break;
             }
             _Message.notice("\u8BE5\u6750\u6599\u4E0D\u652F\u6301\u4E0A\u4F20\u3010" + fileFormat + "\u3011\u683C\u5F0F\u7684\u6587\u4EF6");
-            return _context6.abrupt("return");
-          case 1:
+            return _context8.abrupt("return");
+          case 2:
             if (!(selectedMaterial.type === 1)) {
-              _context6.next = 2;
+              _context8.next = 3;
               break;
             }
             _Message.notice('该文件为旧文件, 请先下载后手动上传');
-            return _context6.abrupt("return");
-          case 2:
+            return _context8.abrupt("return");
+          case 3:
             if (selectedMaterial.innerFileUrl) {
-              _context6.next = 4;
+              _context8.next = 5;
               break;
             }
-            _context6.next = 3;
+            _context8.next = 4;
             return getUrlById({
               id: selectedMaterial.fileId,
               effectiveTime: 3600000
@@ -797,26 +877,26 @@ var FileItem = function FileItem(_ref) {
               isPC: isPC,
               accessToken: accessToken
             });
-          case 3:
-            urlRes = _context6.sent;
+          case 4:
+            urlRes = _context8.sent;
             if (urlRes.presignedUrlList && urlRes.presignedUrlList.length > 0) {
               selectedMaterial.innerFileUrl = urlRes.presignedUrlList[2];
             }
-          case 4:
+          case 5:
             m = _extends({}, selectedMaterial, {
               fileUrl: selectedMaterial.innerFileUrl
             });
             console.log('m', m);
             valChange(m, fileIndex, index, subIndex);
             setIsShowMaterialLib(false);
-          case 5:
+          case 6:
           case "end":
-            return _context6.stop();
+            return _context8.stop();
         }
-      }, _callee6);
+      }, _callee8);
     }));
     return function selectMaterialOk() {
-      return _ref7.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }();
   var onDownload = function onDownload() {
@@ -828,95 +908,85 @@ var FileItem = function FileItem(_ref) {
     });
   };
   var handleDel = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
-      return _regeneratorRuntime.wrap(function (_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
+    var _ref0 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
+      return _regeneratorRuntime.wrap(function (_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
           case 0:
             if (!disabled) {
-              _context7.next = 1;
+              _context9.next = 1;
               break;
             }
-            return _context7.abrupt("return");
+            return _context9.abrupt("return");
           case 1:
             // invalidHandle()
             valChange(undefined, fileIndex, index, subIndex);
           case 2:
           case "end":
-            return _context7.stop();
+            return _context9.stop();
         }
-      }, _callee7);
+      }, _callee9);
     }));
     return function handleDel() {
-      return _ref8.apply(this, arguments);
+      return _ref0.apply(this, arguments);
     };
   }();
-  useEffect(function () {
-    var timer;
-    if (userInfo && tokenTY) {
-      console.log('userInfo', tokenTY, userInfo);
-      timer = setTimeout(function () {
-        queryFileLibs();
-      }, 0);
-    }
-    return function () {
-      timer && clearTimeout(timer);
-    };
-  }, [userInfo, tokenTY]);
+
+  // 材料库数据改为点击「材料库」时按需拉取（见 openMaterialLib），不再挂载即预取
 
   // 获取缩略图
   var extractImageUrls = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee8(previewUrl) {
+    var _ref1 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee0(previewUrl) {
       var response, htmlText, parser, doc, imgElements, srcList;
-      return _regeneratorRuntime.wrap(function (_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+      return _regeneratorRuntime.wrap(function (_context0) {
+        while (1) switch (_context0.prev = _context0.next) {
           case 0:
-            _context8.next = 1;
+            _context0.next = 1;
             return fetch(previewUrl);
           case 1:
-            response = _context8.sent;
-            _context8.next = 2;
+            response = _context0.sent;
+            _context0.next = 2;
             return response.text();
           case 2:
-            htmlText = _context8.sent;
+            htmlText = _context0.sent;
             parser = new DOMParser();
             doc = parser.parseFromString(htmlText, 'text/html');
             imgElements = doc.querySelectorAll('img');
             srcList = Array.from(imgElements).map(function (img) {
               return img.getAttribute('data-src');
             });
-            return _context8.abrupt("return", srcList);
+            return _context0.abrupt("return", srcList);
           case 3:
           case "end":
-            return _context8.stop();
+            return _context0.stop();
         }
-      }, _callee8);
+      }, _callee0);
     }));
-    return function extractImageUrls(_x6) {
-      return _ref9.apply(this, arguments);
+    return function extractImageUrls(_x7) {
+      return _ref1.apply(this, arguments);
     };
   }();
 
   // 获取预览图片
   var getViewUrl = /*#__PURE__*/function () {
-    var _ref0 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee9(id) {
+    var _ref10 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee1(id) {
       var type, urlRes, res, list;
-      return _regeneratorRuntime.wrap(function (_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
+      return _regeneratorRuntime.wrap(function (_context1) {
+        while (1) switch (_context1.prev = _context1.next) {
           case 0:
             type = getFileExtension(fileName);
             if (!['png', 'jpg', 'jpeg'].includes(type)) {
-              _context9.next = 1;
+              _context1.next = 1;
               break;
             }
-            return _context9.abrupt("return", fileUrl);
+            return _context1.abrupt("return", fileUrl);
           case 1:
             if (!(type !== 'pdf')) {
-              _context9.next = 2;
+              _context1.next = 2;
               break;
             }
-            return _context9.abrupt("return", '');
+            return _context1.abrupt("return", '');
           case 2:
-            _context9.next = 3;
+            _context1.next = 3;
             return getUrlById({
               id: id,
               effectiveTime: 3600000
@@ -929,13 +999,13 @@ var FileItem = function FileItem(_ref) {
               accessToken: accessToken
             });
           case 3:
-            urlRes = _context9.sent;
+            urlRes = _context1.sent;
             if (!(urlRes.presignedUrlList && urlRes.presignedUrlList.length > 0)) {
-              _context9.next = 6;
+              _context1.next = 6;
               break;
             }
             console.log('urlRes', urlRes);
-            _context9.next = 4;
+            _context1.next = 4;
             return onlinePreview({
               url: urlRes.presignedUrlList[2]
             }, {
@@ -947,21 +1017,21 @@ var FileItem = function FileItem(_ref) {
               accessToken: accessToken
             });
           case 4:
-            res = _context9.sent;
-            _context9.next = 5;
+            res = _context1.sent;
+            _context1.next = 5;
             return extractImageUrls(res.url);
           case 5:
-            list = _context9.sent;
+            list = _context1.sent;
             console.log('list---111111', list);
-            return _context9.abrupt("return", list[0]);
+            return _context1.abrupt("return", list[0]);
           case 6:
           case "end":
-            return _context9.stop();
+            return _context1.stop();
         }
-      }, _callee9);
+      }, _callee1);
     }));
-    return function getViewUrl(_x7) {
-      return _ref0.apply(this, arguments);
+    return function getViewUrl(_x8) {
+      return _ref10.apply(this, arguments);
     };
   }();
   useEffect(function () {
@@ -1140,11 +1210,9 @@ var FileItem = function FileItem(_ref) {
     return isSealed ? reSignBtnText : signBtnText;
   }())) :
   // 展示材料库
-  !isShareFile && !isSmart && !disabled && !!materialLib.length && /*#__PURE__*/React.createElement("div", {
+  !isShareFile && !isSmart && !disabled && /*#__PURE__*/React.createElement("div", {
     className: "operation_btn",
-    onClick: function onClick() {
-      return setIsShowMaterialLib(true);
-    }
+    onClick: openMaterialLib
   }, "\u6750\u6599\u5E93"))), !isPC && /*#__PURE__*/React.createElement("div", {
     className: "file_item_bottom",
     style: {

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

@@ -110,7 +110,7 @@
     left: 0;
     width: 100%;
     height: 100%;
-    z-index: 9;
+    z-index: 999;
   }
   .viewImg {
     background-color: #3333336a;

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

@@ -206,6 +206,18 @@ var FileList = function FileList(_ref) {
     handleChange(value, 0, curMerge.index, curMerge.subIndex);
     setShowMerge(false);
   };
+
+  // 删除之后调用：只要没到 10 个上限，就保证末尾是一个空槽（渲染成「上传材料」按钮）。
+  // 末尾已经是空槽或列表为空（空列表也要补一个）时按需处理，已达上限则不动。
+  var ensureEmptySlot = function ensureEmptySlot(list) {
+    if (list.length >= 10) return list;
+    var last = list[list.length - 1];
+    if (last && !last.fileId) return list;
+    list.push({
+      fileId: ''
+    });
+    return list;
+  };
   var handleChange = function handleChange(value, fileIndex, index, subIndex) {
     console.log('handleChange', value, fileIndex, index, subIndex);
     // 先找到一级目录
@@ -216,14 +228,9 @@ var FileList = function FileList(_ref) {
       if (!value) {
         oneLevelItem.subMaterials[subIndex].isSmart = false;
         oneLevelItem.subMaterials[subIndex].isShareFile = false;
-        // 如果当前文件list中只有一个文件，还得补个空的
-        if (oneLevelItem.subMaterials[subIndex].fileList.length === 1) {
-          oneLevelItem.subMaterials[subIndex].fileList = [{
-            fileId: ''
-          }];
-        } else {
-          oneLevelItem.subMaterials[subIndex].fileList.splice(fileIndex, 1);
-        }
+        oneLevelItem.subMaterials[subIndex].fileList.splice(fileIndex, 1);
+        // 删完保证末尾还有「上传材料」按钮
+        ensureEmptySlot(oneLevelItem.subMaterials[subIndex].fileList);
       } else {
         // 如果当前这个位置的fileId是空的。说明这次修改是新增
         var isAdd = !oneLevelItem.subMaterials[subIndex].fileList[fileIndex].fileId;
@@ -239,11 +246,8 @@ var FileList = function FileList(_ref) {
         oneLevelItem.isSmart = false;
         oneLevelItem.isShareFile = false;
         oneLevelItem.fileList.splice(fileIndex, 1);
-        if (oneLevelItem.fileList.length === 0) {
-          oneLevelItem.fileList.push({
-            fileId: ''
-          });
-        }
+        // 删完保证末尾还有「上传材料」按钮
+        ensureEmptySlot(oneLevelItem.fileList);
       } else {
         // 如果当前这个位置的fileId是空的。说明这次修改是新增
         var _isAdd = !oneLevelItem.fileList[fileIndex].fileId;