ydb-components-material 0.1.206 → 0.1.207

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

@@ -1,5 +1,9 @@
 import React from 'react';
 import './index.scss';
+/**
+ * 检查列表中是否还存在 loading 为 true 的文件（包含二级材料），有则返回 true
+ */
+export declare const hasLoadingFileInList: (list: any[]) => boolean;
 export interface FileListProps {
     /**
      * 列表数据

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

@@ -34,6 +34,21 @@ var MATERIAL_FORMAT = {
 };
 var OTHER = 1; // 角色数组中"他人"对应的值
 
+/**
+ * 检查列表中是否还存在 loading 为 true 的文件（包含二级材料），有则返回 true
+ */
+export var hasLoadingFileInList = function hasLoadingFileInList(list) {
+  return (list || []).some(function (item) {
+    if ((item.fileList || []).some(function (file) {
+      return file && file.loading;
+    })) return true;
+    return (item.subMaterials || []).some(function (sub) {
+      return (sub.fileList || []).some(function (file) {
+        return file && file.loading;
+      });
+    });
+  });
+};
 var FileList = function FileList(_ref) {
   var fileList = _ref.fileList,
     token = _ref.token,
@@ -212,6 +227,11 @@ var FileList = function FileList(_ref) {
     });
     return list;
   };
+
+  // 传给 FileItem：签署前检查列表中是否还有 loading 中的文件
+  var hasLoadingFile = function hasLoadingFile() {
+    return hasLoadingFileInList(fileArray);
+  };
   var handleChange = function handleChange(value, fileIndex, index, subIndex) {
     // console.log('handleChange', value, fileIndex, index, subIndex);
     // 先找到一级目录
@@ -388,6 +408,7 @@ var FileList = function FileList(_ref) {
           download: download,
           applySeal: applySeal,
           valChange: handleChange,
+          hasLoadingFile: hasLoadingFile,
           openLoading: openLoading,
           closeLoading: closeLoading,
           parentPageUrl: parentPageUrl,
@@ -427,6 +448,7 @@ var FileList = function FileList(_ref) {
         download: download,
         applySeal: applySeal,
         valChange: handleChange,
+        hasLoadingFile: hasLoadingFile,
         openLoading: openLoading,
         closeLoading: closeLoading,
         parentPageUrl: parentPageUrl,

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

@@ -29,6 +29,7 @@ export interface FileItemProps {
     download: (value: any) => void;
     saveSignerInfo: (value: any) => Promise<boolean>;
     signInfoMap?: object;
+    hasLoadingFile?: () => boolean;
     autoShowSignerInfo?: boolean;
     onNeedSignerInfo?: (pos: {
         index: number;

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

@@ -29,6 +29,7 @@ var RadioGroup = _Radio.Group;
 var SELF = 0;
 var OTHER = 1;
 var FileItem = function FileItem(_ref) {
+  var _this = this;
   var index = _ref.index,
     subIndex = _ref.subIndex,
     fileIndex = _ref.fileIndex,
@@ -53,6 +54,7 @@ var FileItem = function FileItem(_ref) {
     closeLoading = _ref.closeLoading,
     saveSignerInfo = _ref.saveSignerInfo,
     signInfoMap = _ref.signInfoMap,
+    hasLoadingFile = _ref.hasLoadingFile,
     applySeal = _ref.applySeal,
     parentPageUrl = _ref.parentPageUrl,
     toSign = _ref.toSign,
@@ -213,6 +215,14 @@ var FileItem = function FileItem(_ref) {
   var _useState19 = useState(0),
     signKey = _useState19[0],
     setSignKey = _useState19[1];
+  // 签批结果轮询中：在当前材料图片上展示局部 loading
+  var _useState20 = useState(false),
+    signPolling = _useState20[0],
+    setSignPolling = _useState20[1];
+  // 材料图片区域的 loading：文件自身 loading 或签批结果轮询中
+  var isLoading = loading || signPolling;
+  // 预览/下载在 loading 期间的提示语，区分「文件加载」与「签批结果轮询」
+  var loadingTip = signPolling ? '签批结果获取中，请稍后' : '数据获取中，请稍后';
   var timerRef = useRef(null);
   var originalUrlRef = useRef('');
   var rootRef = useRef(null);
@@ -245,7 +255,8 @@ var FileItem = function FileItem(_ref) {
               fileName: nameVal,
               fileUrl: newFile.fileUrlList[2],
               originalUrl: originalUrlRef.current,
-              isSigned: true
+              isSigned: true,
+              loading: false
             }));
             return _context.abrupt("return", true);
           case 2:
@@ -352,11 +363,11 @@ var FileItem = function FileItem(_ref) {
       return _regeneratorRuntime.wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            if (!loading) {
+            if (!isLoading) {
               _context2.next = 1;
               break;
             }
-            _Message.warning('数据请求中，请稍后');
+            _Message.warning(loadingTip);
             return _context2.abrupt("return");
           case 1:
             if (fileUrl) {
@@ -477,6 +488,20 @@ var FileItem = function FileItem(_ref) {
     };
   }();
 
+  // 签字要跳转三方页面 跳之前存一下当前页面数据
+  var saveStorage = function saveStorage() {
+    var loginAccountId = userInfo.loginAccountId;
+    var previousData = window.localStorage.getItem(_this.state.applicationId + loginAccountId);
+    var previousDataVal = JSON.parse(previousData || '{}');
+    // 消费过了。删除一下
+    delete previousDataVal.isFormEdited;
+    window.localStorage.setItem(_this.state.applicationId + loginAccountId, JSON.stringify(_extends({}, previousDataVal, {
+      material: {
+        fileList: fileList
+      }
+    })));
+  };
+
   // 手写签批
   var sign = function sign() {
     if (!signatureEnable) {
@@ -489,6 +514,7 @@ var FileItem = function FileItem(_ref) {
       return k + 1;
     });
     setIsShowSignPage(true);
+    saveStorage();
   };
 
   // 签章
@@ -603,6 +629,12 @@ var FileItem = function FileItem(_ref) {
     setShowSignerInfo(true);
   };
   var signAndSeal = function signAndSeal() {
+    // 有材料还在 loading（如签批结果轮询中）时拦截签署，避免还有未完成的请求就跳转签署页面
+    if (hasLoadingFile && hasLoadingFile()) {
+      _Message.warning('部分材料正在处理中，请稍后再签署');
+      return;
+    }
+
     // 当前是个人 不需要签批。需要签他人签署 就直接打开维护签署人信息，这种情况属于签章开启 但是个人待办法人事项的时候
     if (userInfo.acctType !== '20' && !signatureEnable && needOtherSign) {
       openSignerInfo();
@@ -907,8 +939,8 @@ var FileItem = function FileItem(_ref) {
     };
   }();
   var onDownload = function onDownload() {
-    if (loading) {
-      _Message.warning('数据请求中，请稍后');
+    if (isLoading) {
+      _Message.warning(loadingTip);
       return;
     }
     if (disabled) return;
@@ -1074,7 +1106,12 @@ var FileItem = function FileItem(_ref) {
         localStorage.removeItem(fileId);
         originalUrlRef.current = originalUrl || '';
         if (docId && contrId && nameVal) {
-          openLoading();
+          // openLoading()
+          setSignPolling(true);
+          // 轮询期间把 loading 标记到 file 对象上，沿用统一的 loading 展示逻辑
+          valChange(_extends({}, file, {
+            loading: true
+          }), fileIndex, index, subIndex);
           // 兜底：连续 10 次轮询仍未成功则结束轮询，避免无限请求
           var pollCount = 0;
           timerRef.current = setInterval(function () {
@@ -1082,11 +1119,18 @@ var FileItem = function FileItem(_ref) {
               // 成功时 getSignedFile 内部会清除轮询并关闭 loading
               if (!success) {
                 pollCount += 1;
-                if (pollCount >= 20) {
+                if (pollCount >= 10) {
                   clearInterval(timerRef.current);
                   timerRef.current = null;
                   closeLoading();
+                  setSignPolling(false);
+                  valChange(_extends({}, file, {
+                    loading: false
+                  }), fileIndex, index, subIndex);
+                  _Message.error('签批结果获取失败，请重试');
                 }
+              } else {
+                setSignPolling(false);
               }
             });
           }, 3000);
@@ -1129,7 +1173,7 @@ var FileItem = function FileItem(_ref) {
     className: "error_msg",
     src: errorMsgIcon,
     alt: ""
-  })) : !loading && /*#__PURE__*/React.createElement("div", {
+  })) : !isLoading && /*#__PURE__*/React.createElement("div", {
     className: "add",
     onClick: function onClick() {
       return upload();
@@ -1163,7 +1207,7 @@ var FileItem = function FileItem(_ref) {
   }, /*#__PURE__*/React.createElement("img", {
     src: CheckedIcon,
     alt: ""
-  }), "\u5DF2\u7B7E\u7AE0"))), loading && /*#__PURE__*/React.createElement("div", {
+  }), "\u5DF2\u7B7E\u7AE0"))), isLoading && /*#__PURE__*/React.createElement("div", {
     className: "loading_mask"
   }, /*#__PURE__*/React.createElement("span", {
     className: "loading_spinner"

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

@@ -1,5 +1,9 @@
 import React from 'react';
 import './index.scss';
+/**
+ * 检查列表中是否还存在 loading 为 true 的文件（包含二级材料），有则返回 true
+ */
+export declare const hasLoadingFileInList: (list: any[]) => boolean;
 export interface FileListProps {
     /**
      * 列表数据

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

@@ -2,7 +2,7 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
-exports["default"] = void 0;
+exports.hasLoadingFileInList = exports["default"] = void 0;
 var _balloon = _interopRequireDefault(require("@alifd/next/lib/balloon"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
@@ -40,6 +40,21 @@ var MATERIAL_FORMAT = {
 };
 var OTHER = 1; // 角色数组中"他人"对应的值
 
+/**
+ * 检查列表中是否还存在 loading 为 true 的文件（包含二级材料），有则返回 true
+ */
+var hasLoadingFileInList = exports.hasLoadingFileInList = function hasLoadingFileInList(list) {
+  return (list || []).some(function (item) {
+    if ((item.fileList || []).some(function (file) {
+      return file && file.loading;
+    })) return true;
+    return (item.subMaterials || []).some(function (sub) {
+      return (sub.fileList || []).some(function (file) {
+        return file && file.loading;
+      });
+    });
+  });
+};
 var FileList = function FileList(_ref) {
   var fileList = _ref.fileList,
     token = _ref.token,
@@ -218,6 +233,11 @@ var FileList = function FileList(_ref) {
     });
     return list;
   };
+
+  // 传给 FileItem：签署前检查列表中是否还有 loading 中的文件
+  var hasLoadingFile = function hasLoadingFile() {
+    return hasLoadingFileInList(fileArray);
+  };
   var handleChange = function handleChange(value, fileIndex, index, subIndex) {
     // console.log('handleChange', value, fileIndex, index, subIndex);
     // 先找到一级目录
@@ -394,6 +414,7 @@ var FileList = function FileList(_ref) {
           download: download,
           applySeal: applySeal,
           valChange: handleChange,
+          hasLoadingFile: hasLoadingFile,
           openLoading: openLoading,
           closeLoading: closeLoading,
           parentPageUrl: parentPageUrl,
@@ -433,6 +454,7 @@ var FileList = function FileList(_ref) {
         download: download,
         applySeal: applySeal,
         valChange: handleChange,
+        hasLoadingFile: hasLoadingFile,
         openLoading: openLoading,
         closeLoading: closeLoading,
         parentPageUrl: parentPageUrl,

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

@@ -29,6 +29,7 @@ export interface FileItemProps {
     download: (value: any) => void;
     saveSignerInfo: (value: any) => Promise<boolean>;
     signInfoMap?: object;
+    hasLoadingFile?: () => boolean;
     autoShowSignerInfo?: boolean;
     onNeedSignerInfo?: (pos: {
         index: number;

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

@@ -35,6 +35,7 @@ var RadioGroup = _radio["default"].Group;
 var SELF = 0;
 var OTHER = 1;
 var FileItem = function FileItem(_ref) {
+  var _this = this;
   var index = _ref.index,
     subIndex = _ref.subIndex,
     fileIndex = _ref.fileIndex,
@@ -59,6 +60,7 @@ var FileItem = function FileItem(_ref) {
     closeLoading = _ref.closeLoading,
     saveSignerInfo = _ref.saveSignerInfo,
     signInfoMap = _ref.signInfoMap,
+    hasLoadingFile = _ref.hasLoadingFile,
     applySeal = _ref.applySeal,
     parentPageUrl = _ref.parentPageUrl,
     toSign = _ref.toSign,
@@ -219,6 +221,14 @@ var FileItem = function FileItem(_ref) {
   var _useState19 = (0, _react.useState)(0),
     signKey = _useState19[0],
     setSignKey = _useState19[1];
+  // 签批结果轮询中：在当前材料图片上展示局部 loading
+  var _useState20 = (0, _react.useState)(false),
+    signPolling = _useState20[0],
+    setSignPolling = _useState20[1];
+  // 材料图片区域的 loading：文件自身 loading 或签批结果轮询中
+  var isLoading = loading || signPolling;
+  // 预览/下载在 loading 期间的提示语，区分「文件加载」与「签批结果轮询」
+  var loadingTip = signPolling ? '签批结果获取中，请稍后' : '数据获取中，请稍后';
   var timerRef = (0, _react.useRef)(null);
   var originalUrlRef = (0, _react.useRef)('');
   var rootRef = (0, _react.useRef)(null);
@@ -251,7 +261,8 @@ var FileItem = function FileItem(_ref) {
               fileName: nameVal,
               fileUrl: newFile.fileUrlList[2],
               originalUrl: originalUrlRef.current,
-              isSigned: true
+              isSigned: true,
+              loading: false
             }));
             return _context.abrupt("return", true);
           case 2:
@@ -358,11 +369,11 @@ var FileItem = function FileItem(_ref) {
       return _regenerator["default"].wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            if (!loading) {
+            if (!isLoading) {
               _context2.next = 1;
               break;
             }
-            _message["default"].warning('数据请求中，请稍后');
+            _message["default"].warning(loadingTip);
             return _context2.abrupt("return");
           case 1:
             if (fileUrl) {
@@ -483,6 +494,20 @@ var FileItem = function FileItem(_ref) {
     };
   }();
 
+  // 签字要跳转三方页面 跳之前存一下当前页面数据
+  var saveStorage = function saveStorage() {
+    var loginAccountId = userInfo.loginAccountId;
+    var previousData = window.localStorage.getItem(_this.state.applicationId + loginAccountId);
+    var previousDataVal = JSON.parse(previousData || '{}');
+    // 消费过了。删除一下
+    delete previousDataVal.isFormEdited;
+    window.localStorage.setItem(_this.state.applicationId + loginAccountId, JSON.stringify((0, _extends3["default"])({}, previousDataVal, {
+      material: {
+        fileList: fileList
+      }
+    })));
+  };
+
   // 手写签批
   var sign = function sign() {
     if (!signatureEnable) {
@@ -495,6 +520,7 @@ var FileItem = function FileItem(_ref) {
       return k + 1;
     });
     setIsShowSignPage(true);
+    saveStorage();
   };
 
   // 签章
@@ -609,6 +635,12 @@ var FileItem = function FileItem(_ref) {
     setShowSignerInfo(true);
   };
   var signAndSeal = function signAndSeal() {
+    // 有材料还在 loading（如签批结果轮询中）时拦截签署，避免还有未完成的请求就跳转签署页面
+    if (hasLoadingFile && hasLoadingFile()) {
+      _message["default"].warning('部分材料正在处理中，请稍后再签署');
+      return;
+    }
+
     // 当前是个人 不需要签批。需要签他人签署 就直接打开维护签署人信息，这种情况属于签章开启 但是个人待办法人事项的时候
     if (userInfo.acctType !== '20' && !signatureEnable && needOtherSign) {
       openSignerInfo();
@@ -913,8 +945,8 @@ var FileItem = function FileItem(_ref) {
     };
   }();
   var onDownload = function onDownload() {
-    if (loading) {
-      _message["default"].warning('数据请求中，请稍后');
+    if (isLoading) {
+      _message["default"].warning(loadingTip);
       return;
     }
     if (disabled) return;
@@ -1080,7 +1112,12 @@ var FileItem = function FileItem(_ref) {
         localStorage.removeItem(fileId);
         originalUrlRef.current = originalUrl || '';
         if (docId && contrId && nameVal) {
-          openLoading();
+          // openLoading()
+          setSignPolling(true);
+          // 轮询期间把 loading 标记到 file 对象上，沿用统一的 loading 展示逻辑
+          valChange((0, _extends3["default"])({}, file, {
+            loading: true
+          }), fileIndex, index, subIndex);
           // 兜底：连续 10 次轮询仍未成功则结束轮询，避免无限请求
           var pollCount = 0;
           timerRef.current = setInterval(function () {
@@ -1088,11 +1125,18 @@ var FileItem = function FileItem(_ref) {
               // 成功时 getSignedFile 内部会清除轮询并关闭 loading
               if (!success) {
                 pollCount += 1;
-                if (pollCount >= 20) {
+                if (pollCount >= 10) {
                   clearInterval(timerRef.current);
                   timerRef.current = null;
                   closeLoading();
+                  setSignPolling(false);
+                  valChange((0, _extends3["default"])({}, file, {
+                    loading: false
+                  }), fileIndex, index, subIndex);
+                  _message["default"].error('签批结果获取失败，请重试');
                 }
+              } else {
+                setSignPolling(false);
               }
             });
           }, 3000);
@@ -1135,7 +1179,7 @@ var FileItem = function FileItem(_ref) {
     className: "error_msg",
     src: _icon_errorMsg["default"],
     alt: ""
-  })) : !loading && /*#__PURE__*/_react["default"].createElement("div", {
+  })) : !isLoading && /*#__PURE__*/_react["default"].createElement("div", {
     className: "add",
     onClick: function onClick() {
       return upload();
@@ -1169,7 +1213,7 @@ var FileItem = function FileItem(_ref) {
   }, /*#__PURE__*/_react["default"].createElement("img", {
     src: _checked["default"],
     alt: ""
-  }), "\u5DF2\u7B7E\u7AE0"))), loading && /*#__PURE__*/_react["default"].createElement("div", {
+  }), "\u5DF2\u7B7E\u7AE0"))), isLoading && /*#__PURE__*/_react["default"].createElement("div", {
     className: "loading_mask"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "loading_spinner"

package/lowcode_es/meta.js

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

package/lowcode_lib/meta.js

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

package/package.json

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