ydb-components-material 0.1.137 → 0.1.138

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

@@ -506,8 +506,11 @@ var FileItem = function FileItem(_ref) {
   // 获取签pi结果
   var getRes = function getRes(val) {
     console.log('val---', val);
+    if (val.signId) {
+      delete val.signId;
+    }
     valChange(val, fileIndex, index, subIndex);
-    invalidHandle();
+    // invalidHandle()
     needOtherSign && setShowSignerInfo(true);
   };
 
@@ -520,8 +523,11 @@ var FileItem = function FileItem(_ref) {
       setShowSignPageClose(false); // 签章完之后就不展示签批页面的关闭按钮了。防止用户误点击退出去
       sign();
     } else {
+      if (val.signId) {
+        delete val.signId;
+      }
       valChange(val, fileIndex, index, subIndex);
-      invalidHandle();
+      // invalidHandle()
       needOtherSign && setShowSignerInfo(true);
     }
   };
@@ -702,7 +708,7 @@ var FileItem = function FileItem(_ref) {
             }
             return _context6.abrupt("return");
           case 1:
-            invalidHandle();
+            // invalidHandle()
             valChange(undefined, fileIndex, index, subIndex);
           case 2:
           case "end":

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

@@ -130,6 +130,7 @@ function SignerInfo(props) {
               file: fileObj,
               materialName: materialName,
               date: getCurrentTime(),
+              time: new Date(),
               initId: file.initId
             });
           case 6:

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

@@ -69,6 +69,9 @@ var SignFile = function SignFile(_ref) {
   var _useState0 = useState(false),
     hasSigned = _useState0[0],
     setHasSigned = _useState0[1];
+  var _useState1 = useState(fileId),
+    currentFileId = _useState1[0],
+    setCurrentFileId = _useState1[1];
   var fileCopy = useRef(_extends({}, file));
 
   // 预览材料
@@ -78,7 +81,7 @@ var SignFile = function SignFile(_ref) {
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (fileId) {
+            if (currentFileId) {
               _context.next = 1;
               break;
             }
@@ -86,7 +89,7 @@ var SignFile = function SignFile(_ref) {
           case 1:
             _context.next = 2;
             return getUrlById({
-              id: fileId,
+              id: currentFileId,
               effectiveTime: 3600000
             }, {
               token: token,
@@ -411,6 +414,7 @@ var SignFile = function SignFile(_ref) {
   // 获取签批结果
   var getRes = function getRes(val) {
     console.log('signVal---', val);
+    setCurrentFileId(val.fileId);
     valChange(val);
     setHasSigned(true);
   };
@@ -423,17 +427,18 @@ var SignFile = function SignFile(_ref) {
       setSealedFile(val);
       sign(true);
     } else {
+      setCurrentFileId(val.fileId);
       valChange(val);
       setHasSigned(true);
     }
   };
   useEffect(function () {
-    if (fileId) {
-      getViewUrl(fileId).then(function (url) {
+    if (currentFileId) {
+      getViewUrl(currentFileId).then(function (url) {
         setThumbnail(url);
       });
     }
-  }, [fileId]);
+  }, [currentFileId]);
   return /*#__PURE__*/React.createElement(_Loading, {
     tip: '加载中...',
     fullScreen: true,

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

@@ -512,8 +512,11 @@ var FileItem = function FileItem(_ref) {
   // 获取签pi结果
   var getRes = function getRes(val) {
     console.log('val---', val);
+    if (val.signId) {
+      delete val.signId;
+    }
     valChange(val, fileIndex, index, subIndex);
-    invalidHandle();
+    // invalidHandle()
     needOtherSign && setShowSignerInfo(true);
   };
 
@@ -526,8 +529,11 @@ var FileItem = function FileItem(_ref) {
       setShowSignPageClose(false); // 签章完之后就不展示签批页面的关闭按钮了。防止用户误点击退出去
       sign();
     } else {
+      if (val.signId) {
+        delete val.signId;
+      }
       valChange(val, fileIndex, index, subIndex);
-      invalidHandle();
+      // invalidHandle()
       needOtherSign && setShowSignerInfo(true);
     }
   };
@@ -708,7 +714,7 @@ var FileItem = function FileItem(_ref) {
             }
             return _context6.abrupt("return");
           case 1:
-            invalidHandle();
+            // invalidHandle()
             valChange(undefined, fileIndex, index, subIndex);
           case 2:
           case "end":

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

@@ -136,6 +136,7 @@ function SignerInfo(props) {
               file: fileObj,
               materialName: materialName,
               date: getCurrentTime(),
+              time: new Date(),
               initId: file.initId
             });
           case 6:

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

@@ -75,6 +75,9 @@ var SignFile = function SignFile(_ref) {
   var _useState0 = (0, _react.useState)(false),
     hasSigned = _useState0[0],
     setHasSigned = _useState0[1];
+  var _useState1 = (0, _react.useState)(fileId),
+    currentFileId = _useState1[0],
+    setCurrentFileId = _useState1[1];
   var fileCopy = (0, _react.useRef)((0, _extends2["default"])({}, file));
 
   // 预览材料
@@ -84,7 +87,7 @@ var SignFile = function SignFile(_ref) {
       return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (fileId) {
+            if (currentFileId) {
               _context.next = 1;
               break;
             }
@@ -92,7 +95,7 @@ var SignFile = function SignFile(_ref) {
           case 1:
             _context.next = 2;
             return (0, _api.getUrlById)({
-              id: fileId,
+              id: currentFileId,
               effectiveTime: 3600000
             }, {
               token: token,
@@ -417,6 +420,7 @@ var SignFile = function SignFile(_ref) {
   // 获取签批结果
   var getRes = function getRes(val) {
     console.log('signVal---', val);
+    setCurrentFileId(val.fileId);
     valChange(val);
     setHasSigned(true);
   };
@@ -429,17 +433,18 @@ var SignFile = function SignFile(_ref) {
       setSealedFile(val);
       sign(true);
     } else {
+      setCurrentFileId(val.fileId);
       valChange(val);
       setHasSigned(true);
     }
   };
   (0, _react.useEffect)(function () {
-    if (fileId) {
-      getViewUrl(fileId).then(function (url) {
+    if (currentFileId) {
+      getViewUrl(currentFileId).then(function (url) {
         setThumbnail(url);
       });
     }
-  }, [fileId]);
+  }, [currentFileId]);
   return /*#__PURE__*/_react["default"].createElement(_loading["default"], {
     tip: '加载中...',
     fullScreen: true,

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

package/package.json

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