ydb-components-material 0.1.141 → 0.1.143

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

@@ -197,7 +197,6 @@ var FileItem = function FileItem(_ref) {
   var _useState17 = useState(true),
     showSignPageClose = _useState17[0],
     setShowSignPageClose = _useState17[1];
-  var timerRef = useRef(null);
   var originalUrlRef = useRef('');
   var getSignedFile = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(documentIdVal, contractIdVal, nameVal) {
@@ -216,20 +215,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 +242,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');
@@ -908,19 +907,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",

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
-declare function SignPage(props: any): JSX.Element;
+declare function SignPage(props: any): any;
 export default SignPage;

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

@@ -1,12 +1,10 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import { initSignPageMethod } from "./signUtil";
-import closeIcon from "./icon/close.svg";
 function SignPage(props) {
   var userInfo = props.userInfo,
     file = props.file,
-    handleClose = props.handleClose,
     fileList = props.fileList,
     parentPageUrl = props.parentPageUrl,
     toSign = props.toSign,
@@ -15,9 +13,7 @@ function SignPage(props) {
     baseUrl = props.baseUrl,
     env = props.env,
     isPC = props.isPC,
-    closeLoading = props.closeLoading,
-    _props$showClose = props.showClose,
-    showClose = _props$showClose === void 0 ? true : _props$showClose;
+    closeLoading = props.closeLoading;
   var init = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var fileObj, res, pageUrl;
@@ -62,13 +58,6 @@ function SignPage(props) {
   useEffect(function () {
     init();
   }, []);
-  return /*#__PURE__*/React.createElement("div", {
-    className: "sign_page"
-  }, showClose && /*#__PURE__*/React.createElement("img", {
-    className: "sign_close",
-    src: closeIcon,
-    alt: "",
-    onClick: handleClose
-  }));
+  return null;
 }
 export default SignPage;

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

@@ -203,7 +203,6 @@ var FileItem = function FileItem(_ref) {
   var _useState17 = (0, _react.useState)(true),
     showSignPageClose = _useState17[0],
     setShowSignPageClose = _useState17[1];
-  var timerRef = (0, _react.useRef)(null);
   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 +221,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 +248,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');
@@ -914,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["default"].error('签署失败，请重新签署');
+            }
+          });
         }
       }
     } catch (e) {}
-    return function () {
-      handleClearInterval();
-    };
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "file_item",

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
-declare function SignPage(props: any): JSX.Element;
+declare function SignPage(props: any): any;
 export default SignPage;

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

@@ -5,14 +5,11 @@ exports.__esModule = true;
 exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _react = _interopRequireWildcard(require("react"));
+var _react = require("react");
 var _signUtil = require("./signUtil");
-var _close = _interopRequireDefault(require("./icon/close.svg"));
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function SignPage(props) {
   var userInfo = props.userInfo,
     file = props.file,
-    handleClose = props.handleClose,
     fileList = props.fileList,
     parentPageUrl = props.parentPageUrl,
     toSign = props.toSign,
@@ -21,9 +18,7 @@ function SignPage(props) {
     baseUrl = props.baseUrl,
     env = props.env,
     isPC = props.isPC,
-    closeLoading = props.closeLoading,
-    _props$showClose = props.showClose,
-    showClose = _props$showClose === void 0 ? true : _props$showClose;
+    closeLoading = props.closeLoading;
   var init = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var fileObj, res, pageUrl;
@@ -68,13 +63,6 @@ function SignPage(props) {
   (0, _react.useEffect)(function () {
     init();
   }, []);
-  return /*#__PURE__*/_react["default"].createElement("div", {
-    className: "sign_page"
-  }, showClose && /*#__PURE__*/_react["default"].createElement("img", {
-    className: "sign_close",
-    src: _close["default"],
-    alt: "",
-    onClick: handleClose
-  }));
+  return null;
 }
 var _default = exports["default"] = SignPage;

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

package/package.json

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