ydb-components-material 0.1.209 → 0.1.210

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

@@ -224,6 +224,8 @@ var FileItem = function FileItem(_ref) {
   // 预览/下载在 loading 期间的提示语，区分「文件加载」与「签批结果轮询」
   var loadingTip = signPolling ? '签批结果获取中，请稍后' : '数据获取中，请稍后';
   var timerRef = useRef(null);
+  // 签批结果轮询是否已启动（幂等标记，避免 loading 变化导致重复起轮询）
+  var pollingRef = useRef(false);
   var originalUrlRef = useRef('');
   var rootRef = useRef(null);
   var getSignedFile = /*#__PURE__*/function () {
@@ -1092,60 +1094,68 @@ var FileItem = function FileItem(_ref) {
       onCloseSignerInfo && onCloseSignerInfo();
     }
   }, [autoShowSignerInfo, onCloseSignerInfo]);
+
+  // 轮询签批结果：
+  // - 外层组件会修改 file.loading，需要在 loading 变为 false 时启动轮询
+  // - 轮询自身会把 loading 置为 true，所以必须幂等，且不能在依赖变化时清理定时器
   useEffect(function () {
+    if (loading || pollingRef.current) return;
     try {
       var stored = localStorage.getItem(fileId);
-      // 当前文件已处于 loading 中时，不再重复发起签批结果轮询
-      // 注意：loading 不进依赖数组，否则轮询把 loading 置为 true 后 effect 重跑会清掉定时器
-      if (stored && !loading) {
-        console.log('stored---', stored);
-        var _JSON$parse = JSON.parse(stored),
-          contrId = _JSON$parse.contractId,
-          docId = _JSON$parse.documentId,
-          nameVal = _JSON$parse.fileName,
-          originalUrl = _JSON$parse.fileUrl;
-        console.log('docId', docId, contrId, nameVal);
-        localStorage.removeItem(fileId);
-        originalUrlRef.current = originalUrl || '';
-        if (docId && contrId && nameVal) {
-          // openLoading()
-          setSignPolling(true);
-          // 轮询期间把 loading 标记到 file 对象上，沿用统一的 loading 展示逻辑
-          valChange(_extends({}, file, {
-            loading: true
-          }), fileIndex, index, subIndex);
-          // 兜底：连续 10 次轮询仍未成功则结束轮询，避免无限请求
-          var pollCount = 0;
-          timerRef.current = setInterval(function () {
-            getSignedFile(docId, contrId, nameVal).then(function (success) {
-              // 成功时 getSignedFile 内部会清除轮询并关闭 loading
-              if (!success) {
-                pollCount += 1;
-                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);
-        }
-      }
+      if (!stored) return;
+      console.log('stored---', stored);
+      var _JSON$parse = JSON.parse(stored),
+        contrId = _JSON$parse.contractId,
+        docId = _JSON$parse.documentId,
+        nameVal = _JSON$parse.fileName,
+        originalUrl = _JSON$parse.fileUrl;
+      console.log('docId', docId, contrId, nameVal);
+      localStorage.removeItem(fileId);
+      originalUrlRef.current = originalUrl || '';
+      if (!(docId && contrId && nameVal)) return;
+      pollingRef.current = true;
+      // openLoading()
+      setSignPolling(true);
+      // 轮询期间把 loading 标记到 file 对象上，沿用统一的 loading 展示逻辑
+      valChange(_extends({}, file, {
+        loading: true
+      }), fileIndex, index, subIndex);
+      // 兜底：连续 10 次轮询仍未成功则结束轮询，避免无限请求
+      var pollCount = 0;
+      timerRef.current = setInterval(function () {
+        getSignedFile(docId, contrId, nameVal).then(function (success) {
+          // 成功时 getSignedFile 内部会清除轮询并关闭 loading
+          if (!success) {
+            pollCount += 1;
+            if (pollCount >= 10) {
+              clearInterval(timerRef.current);
+              timerRef.current = null;
+              pollingRef.current = false;
+              closeLoading();
+              setSignPolling(false);
+              valChange(_extends({}, file, {
+                loading: false
+              }), fileIndex, index, subIndex);
+              _Message.error('签批结果获取失败，请重试');
+            }
+          } else {
+            pollingRef.current = false;
+            setSignPolling(false);
+          }
+        });
+      }, 3000);
     } catch (e) {}
+  }, [fileId, loading]);
+
+  // 仅在卸载时清理定时器；不能放进上面的 effect，否则 loading 变化会清掉正在进行的轮询
+  useEffect(function () {
     return function () {
       if (timerRef.current) {
         clearInterval(timerRef.current);
         timerRef.current = null;
       }
     };
-  }, [fileId]);
+  }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: "file_item",
     style: style,

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

@@ -230,6 +230,8 @@ var FileItem = function FileItem(_ref) {
   // 预览/下载在 loading 期间的提示语，区分「文件加载」与「签批结果轮询」
   var loadingTip = signPolling ? '签批结果获取中，请稍后' : '数据获取中，请稍后';
   var timerRef = (0, _react.useRef)(null);
+  // 签批结果轮询是否已启动（幂等标记，避免 loading 变化导致重复起轮询）
+  var pollingRef = (0, _react.useRef)(false);
   var originalUrlRef = (0, _react.useRef)('');
   var rootRef = (0, _react.useRef)(null);
   var getSignedFile = /*#__PURE__*/function () {
@@ -1098,60 +1100,68 @@ var FileItem = function FileItem(_ref) {
       onCloseSignerInfo && onCloseSignerInfo();
     }
   }, [autoShowSignerInfo, onCloseSignerInfo]);
+
+  // 轮询签批结果：
+  // - 外层组件会修改 file.loading，需要在 loading 变为 false 时启动轮询
+  // - 轮询自身会把 loading 置为 true，所以必须幂等，且不能在依赖变化时清理定时器
   (0, _react.useEffect)(function () {
+    if (loading || pollingRef.current) return;
     try {
       var stored = localStorage.getItem(fileId);
-      // 当前文件已处于 loading 中时，不再重复发起签批结果轮询
-      // 注意：loading 不进依赖数组，否则轮询把 loading 置为 true 后 effect 重跑会清掉定时器
-      if (stored && !loading) {
-        console.log('stored---', stored);
-        var _JSON$parse = JSON.parse(stored),
-          contrId = _JSON$parse.contractId,
-          docId = _JSON$parse.documentId,
-          nameVal = _JSON$parse.fileName,
-          originalUrl = _JSON$parse.fileUrl;
-        console.log('docId', docId, contrId, nameVal);
-        localStorage.removeItem(fileId);
-        originalUrlRef.current = originalUrl || '';
-        if (docId && contrId && nameVal) {
-          // openLoading()
-          setSignPolling(true);
-          // 轮询期间把 loading 标记到 file 对象上，沿用统一的 loading 展示逻辑
-          valChange((0, _extends3["default"])({}, file, {
-            loading: true
-          }), fileIndex, index, subIndex);
-          // 兜底：连续 10 次轮询仍未成功则结束轮询，避免无限请求
-          var pollCount = 0;
-          timerRef.current = setInterval(function () {
-            getSignedFile(docId, contrId, nameVal).then(function (success) {
-              // 成功时 getSignedFile 内部会清除轮询并关闭 loading
-              if (!success) {
-                pollCount += 1;
-                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);
-        }
-      }
+      if (!stored) return;
+      console.log('stored---', stored);
+      var _JSON$parse = JSON.parse(stored),
+        contrId = _JSON$parse.contractId,
+        docId = _JSON$parse.documentId,
+        nameVal = _JSON$parse.fileName,
+        originalUrl = _JSON$parse.fileUrl;
+      console.log('docId', docId, contrId, nameVal);
+      localStorage.removeItem(fileId);
+      originalUrlRef.current = originalUrl || '';
+      if (!(docId && contrId && nameVal)) return;
+      pollingRef.current = true;
+      // openLoading()
+      setSignPolling(true);
+      // 轮询期间把 loading 标记到 file 对象上，沿用统一的 loading 展示逻辑
+      valChange((0, _extends3["default"])({}, file, {
+        loading: true
+      }), fileIndex, index, subIndex);
+      // 兜底：连续 10 次轮询仍未成功则结束轮询，避免无限请求
+      var pollCount = 0;
+      timerRef.current = setInterval(function () {
+        getSignedFile(docId, contrId, nameVal).then(function (success) {
+          // 成功时 getSignedFile 内部会清除轮询并关闭 loading
+          if (!success) {
+            pollCount += 1;
+            if (pollCount >= 10) {
+              clearInterval(timerRef.current);
+              timerRef.current = null;
+              pollingRef.current = false;
+              closeLoading();
+              setSignPolling(false);
+              valChange((0, _extends3["default"])({}, file, {
+                loading: false
+              }), fileIndex, index, subIndex);
+              _message["default"].error('签批结果获取失败，请重试');
+            }
+          } else {
+            pollingRef.current = false;
+            setSignPolling(false);
+          }
+        });
+      }, 3000);
     } catch (e) {}
+  }, [fileId, loading]);
+
+  // 仅在卸载时清理定时器；不能放进上面的 effect，否则 loading 变化会清掉正在进行的轮询
+  (0, _react.useEffect)(function () {
     return function () {
       if (timerRef.current) {
         clearInterval(timerRef.current);
         timerRef.current = null;
       }
     };
-  }, [fileId]);
+  }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "file_item",
     style: style,

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.209';
+    version = '0.1.210';
   }
   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.209';
+    version = '0.1.210';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/package.json

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