ydb-components-material 0.1.142 → 0.1.144

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

@@ -197,7 +197,9 @@ var FileItem = function FileItem(_ref) {
   var _useState17 = useState(true),
     showSignPageClose = _useState17[0],
     setShowSignPageClose = _useState17[1];
-  var timerRef = useRef(null);
+  var _useState18 = useState(0),
+    signKey = _useState18[0],
+    setSignKey = _useState18[1];
   var originalUrlRef = useRef('');
   var getSignedFile = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(documentIdVal, contractIdVal, nameVal) {
@@ -216,20 +218,24 @@ var FileItem = function FileItem(_ref) {
             });
           case 1:
             newFile = _context.sent;
-            if (newFile) {
-              closeLoading();
-              sessionStorage.removeItem(tokenTY);
-              clearInterval(timerRef.current);
-              timerRef.current = null;
-              getRes(_extends({}, file, {
-                fileId: newFile.fileId,
-                fileName: nameVal,
-                fileUrl: newFile.fileUrlList[2],
-                originalUrl: originalUrlRef.current,
-                isSigned: true
-              }));
+            sessionStorage.removeItem(tokenTY);
+            localStorage.removeItem(tokenTY);
+            if (!newFile) {
+              _context.next = 2;
+              break;
             }
+            closeLoading();
+            getRes(_extends({}, file, {
+              fileId: newFile.fileId,
+              fileName: nameVal,
+              fileUrl: newFile.fileUrlList[2],
+              originalUrl: originalUrlRef.current,
+              isSigned: true
+            }));
+            return _context.abrupt("return", true);
           case 2:
+            return _context.abrupt("return", false);
+          case 3:
           case "end":
             return _context.stop();
         }
@@ -239,10 +245,6 @@ var FileItem = function FileItem(_ref) {
       return _ref2.apply(this, arguments);
     };
   }();
-  var handleClearInterval = function handleClearInterval() {
-    clearInterval(timerRef.current);
-    timerRef.current = null;
-  };
   var upload = function upload() {
     if (disabled) return;
     var inputEl = document.createElement('input');
@@ -429,6 +431,9 @@ var FileItem = function FileItem(_ref) {
     }
     ;
     openLoading();
+    setSignKey(function (k) {
+      return k + 1;
+    });
     setIsShowSignPage(true);
   };
 
@@ -908,19 +913,17 @@ var FileItem = function FileItem(_ref) {
         console.log('docId', docId, contrId, nameVal);
         if (storedFileId !== fileId) return;
         originalUrlRef.current = originalUrl || '';
-        if (docId && contrId && nameVal && !timerRef.current) {
-          handleClearInterval();
+        if (docId && contrId && nameVal) {
           openLoading();
-          timerRef.current = setInterval(function () {
-            console.log('docId---', docId, contrId, nameVal);
-            getSignedFile(docId, contrId, nameVal);
-          }, 3000);
+          getSignedFile(docId, contrId, nameVal).then(function (success) {
+            if (!success) {
+              closeLoading();
+              _Message.error('签署失败，请重新签署');
+            }
+          });
         }
       }
     } catch (e) {}
-    return function () {
-      handleClearInterval();
-    };
   }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: "file_item",
@@ -1111,6 +1114,7 @@ var FileItem = function FileItem(_ref) {
     className: "btn ok",
     onClick: selectMaterialOk
   }, "\u786E\u5B9A")))), isShowSignPage && /*#__PURE__*/React.createElement(SignPage, {
+    key: signKey,
     isShowSignPage: isShowSignPage,
     userInfo: userInfo,
     file: sealedFile || file,

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

@@ -203,7 +203,9 @@ var FileItem = function FileItem(_ref) {
   var _useState17 = (0, _react.useState)(true),
     showSignPageClose = _useState17[0],
     setShowSignPageClose = _useState17[1];
-  var timerRef = (0, _react.useRef)(null);
+  var _useState18 = (0, _react.useState)(0),
+    signKey = _useState18[0],
+    setSignKey = _useState18[1];
   var originalUrlRef = (0, _react.useRef)('');
   var getSignedFile = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(documentIdVal, contractIdVal, nameVal) {
@@ -222,20 +224,24 @@ var FileItem = function FileItem(_ref) {
             });
           case 1:
             newFile = _context.sent;
-            if (newFile) {
-              closeLoading();
-              sessionStorage.removeItem(tokenTY);
-              clearInterval(timerRef.current);
-              timerRef.current = null;
-              getRes((0, _extends3["default"])({}, file, {
-                fileId: newFile.fileId,
-                fileName: nameVal,
-                fileUrl: newFile.fileUrlList[2],
-                originalUrl: originalUrlRef.current,
-                isSigned: true
-              }));
+            sessionStorage.removeItem(tokenTY);
+            localStorage.removeItem(tokenTY);
+            if (!newFile) {
+              _context.next = 2;
+              break;
             }
+            closeLoading();
+            getRes((0, _extends3["default"])({}, file, {
+              fileId: newFile.fileId,
+              fileName: nameVal,
+              fileUrl: newFile.fileUrlList[2],
+              originalUrl: originalUrlRef.current,
+              isSigned: true
+            }));
+            return _context.abrupt("return", true);
           case 2:
+            return _context.abrupt("return", false);
+          case 3:
           case "end":
             return _context.stop();
         }
@@ -245,10 +251,6 @@ var FileItem = function FileItem(_ref) {
       return _ref2.apply(this, arguments);
     };
   }();
-  var handleClearInterval = function handleClearInterval() {
-    clearInterval(timerRef.current);
-    timerRef.current = null;
-  };
   var upload = function upload() {
     if (disabled) return;
     var inputEl = document.createElement('input');
@@ -435,6 +437,9 @@ var FileItem = function FileItem(_ref) {
     }
     ;
     openLoading();
+    setSignKey(function (k) {
+      return k + 1;
+    });
     setIsShowSignPage(true);
   };
 
@@ -914,19 +919,17 @@ var FileItem = function FileItem(_ref) {
         console.log('docId', docId, contrId, nameVal);
         if (storedFileId !== fileId) return;
         originalUrlRef.current = originalUrl || '';
-        if (docId && contrId && nameVal && !timerRef.current) {
-          handleClearInterval();
+        if (docId && contrId && nameVal) {
           openLoading();
-          timerRef.current = setInterval(function () {
-            console.log('docId---', docId, contrId, nameVal);
-            getSignedFile(docId, contrId, nameVal);
-          }, 3000);
+          getSignedFile(docId, contrId, nameVal).then(function (success) {
+            if (!success) {
+              closeLoading();
+              _message["default"].error('签署失败，请重新签署');
+            }
+          });
         }
       }
     } catch (e) {}
-    return function () {
-      handleClearInterval();
-    };
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "file_item",
@@ -1117,6 +1120,7 @@ var FileItem = function FileItem(_ref) {
     className: "btn ok",
     onClick: selectMaterialOk
   }, "\u786E\u5B9A")))), isShowSignPage && /*#__PURE__*/_react["default"].createElement(_sign["default"], {
+    key: signKey,
     isShowSignPage: isShowSignPage,
     userInfo: userInfo,
     file: sealedFile || file,

package/lowcode_es/meta.js

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

package/lowcode_lib/meta.js

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

package/package.json

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