ydb-components-material 0.1.171 → 0.1.173

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

@@ -1205,7 +1205,8 @@ var FileItem = function FileItem(_ref) {
     },
     closeLoading: closeLoading,
     showClose: showSignPageClose,
-    originalFileId: file.fileId
+    originalFileId: file.fileId,
+    isReSign: !!isSigned
   }), isShowSealPage && /*#__PURE__*/React.createElement(SealPage, {
     isShowSealPage: isShowSealPage,
     userInfo: userInfo,

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

@@ -14,17 +14,20 @@ function SignPage(props) {
     env = props.env,
     isPC = props.isPC,
     closeLoading = props.closeLoading,
-    originalFileId = props.originalFileId;
+    originalFileId = props.originalFileId,
+    isReSign = props.isReSign;
   var init = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var fileObj, res, pageUrl;
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            fileObj = file; // 有旧的 URL 说明是重新签章 旧的是原始的空白的 重新签需要签在原始的空白文件
-            if (file.isSigned && !file.isSealed) {
+            fileObj = file; // 重新签署：回退到该签署方上次签署的基线文件（originalUrl）
+            if (isReSign && !file.isSealed && file.originalUrl) {
               fileObj.fileUrl = file.originalUrl;
-            } else if (!file.originalUrl) {
+            } else if (!isReSign && !file.originalUrl) {
+              // 首次签署：把当前文件记为签署基线
+              // 保留 !originalUrl 守卫，防止"先签章再签批"时覆盖签章步骤已记录的基线
               fileObj.originalUrl = file.fileUrl;
             }
             // 传递配置参数给工具函数

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

@@ -13,6 +13,7 @@ export interface SignFileProps {
     env: string;
     isPC?: boolean;
     style?: object;
+    parentPageUrl: string;
     applySeal: () => void;
     download: (value: any) => void;
     valChange: (value: any) => void;

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

@@ -32,7 +32,8 @@ var SignFile = function SignFile(_ref) {
     download = _ref.download,
     valChange = _ref.valChange,
     applySeal = _ref.applySeal,
-    toSign = _ref.toSign;
+    toSign = _ref.toSign,
+    parentPageUrl = _ref.parentPageUrl;
   var fileName = file.fileName,
     fileUrl = file.fileUrl,
     fileId = file.fileId,
@@ -419,6 +420,8 @@ var SignFile = function SignFile(_ref) {
   var getRes = function getRes(val) {
     console.log('signVal---', val);
     setCurrentFileId(val.fileId);
+    // 同步最新的签署结果到 fileCopy，确保第三方"重新签署"时 SignPage 拿到的是本人/上次签完的文件
+    fileCopy.current = _extends({}, val);
     valChange(val);
     setHasSigned(true);
   };
@@ -432,6 +435,8 @@ var SignFile = function SignFile(_ref) {
       sign(true);
     } else {
       setCurrentFileId(val.fileId);
+      // 签章后无连签时，同样同步 fileCopy，保证后续"重新签署"基于签章后的文件
+      fileCopy.current = _extends({}, val);
       valChange(val);
       setHasSigned(true);
     }
@@ -593,7 +598,9 @@ var SignFile = function SignFile(_ref) {
     closeLoading: function closeLoading() {
       return setLoading(false);
     },
-    showClose: false
+    showClose: false,
+    parentPageUrl: parentPageUrl,
+    isReSign: hasSigned
   }), isShowSealPage && /*#__PURE__*/React.createElement(SealPage, {
     showClose: false,
     isShowSealPage: isShowSealPage,

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

@@ -1211,7 +1211,8 @@ var FileItem = function FileItem(_ref) {
     },
     closeLoading: closeLoading,
     showClose: showSignPageClose,
-    originalFileId: file.fileId
+    originalFileId: file.fileId,
+    isReSign: !!isSigned
   }), isShowSealPage && /*#__PURE__*/_react["default"].createElement(_seal["default"], {
     isShowSealPage: isShowSealPage,
     userInfo: userInfo,

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

@@ -19,17 +19,20 @@ function SignPage(props) {
     env = props.env,
     isPC = props.isPC,
     closeLoading = props.closeLoading,
-    originalFileId = props.originalFileId;
+    originalFileId = props.originalFileId,
+    isReSign = props.isReSign;
   var init = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var fileObj, res, pageUrl;
       return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            fileObj = file; // 有旧的 URL 说明是重新签章 旧的是原始的空白的 重新签需要签在原始的空白文件
-            if (file.isSigned && !file.isSealed) {
+            fileObj = file; // 重新签署：回退到该签署方上次签署的基线文件（originalUrl）
+            if (isReSign && !file.isSealed && file.originalUrl) {
               fileObj.fileUrl = file.originalUrl;
-            } else if (!file.originalUrl) {
+            } else if (!isReSign && !file.originalUrl) {
+              // 首次签署：把当前文件记为签署基线
+              // 保留 !originalUrl 守卫，防止"先签章再签批"时覆盖签章步骤已记录的基线
               fileObj.originalUrl = file.fileUrl;
             }
             // 传递配置参数给工具函数

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

@@ -13,6 +13,7 @@ export interface SignFileProps {
     env: string;
     isPC?: boolean;
     style?: object;
+    parentPageUrl: string;
     applySeal: () => void;
     download: (value: any) => void;
     valChange: (value: any) => void;

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

@@ -38,7 +38,8 @@ var SignFile = function SignFile(_ref) {
     download = _ref.download,
     valChange = _ref.valChange,
     applySeal = _ref.applySeal,
-    toSign = _ref.toSign;
+    toSign = _ref.toSign,
+    parentPageUrl = _ref.parentPageUrl;
   var fileName = file.fileName,
     fileUrl = file.fileUrl,
     fileId = file.fileId,
@@ -425,6 +426,8 @@ var SignFile = function SignFile(_ref) {
   var getRes = function getRes(val) {
     console.log('signVal---', val);
     setCurrentFileId(val.fileId);
+    // 同步最新的签署结果到 fileCopy，确保第三方"重新签署"时 SignPage 拿到的是本人/上次签完的文件
+    fileCopy.current = (0, _extends2["default"])({}, val);
     valChange(val);
     setHasSigned(true);
   };
@@ -438,6 +441,8 @@ var SignFile = function SignFile(_ref) {
       sign(true);
     } else {
       setCurrentFileId(val.fileId);
+      // 签章后无连签时，同样同步 fileCopy，保证后续"重新签署"基于签章后的文件
+      fileCopy.current = (0, _extends2["default"])({}, val);
       valChange(val);
       setHasSigned(true);
     }
@@ -599,7 +604,9 @@ var SignFile = function SignFile(_ref) {
     closeLoading: function closeLoading() {
       return setLoading(false);
     },
-    showClose: false
+    showClose: false,
+    parentPageUrl: parentPageUrl,
+    isReSign: hasSigned
   }), isShowSealPage && /*#__PURE__*/_react["default"].createElement(_seal["default"], {
     showClose: false,
     isShowSealPage: isShowSealPage,

package/lowcode/sign-file/meta.ts

@@ -199,6 +199,21 @@ const SignFileMeta: IPublicTypeComponentMetadata = {
           "isRequired": true
         }
       },
+      {
+        "title": {
+          "label": {
+            "type": "i18n",
+            "en-US": "parentPageUrl",
+            "zh-CN": "parentPageUrl"
+          }
+        },
+        "name": "parentPageUrl",
+        "setter": {
+          "componentName": "StringSetter",
+          "isRequired": true,
+          "initialValue": ""
+        }
+      },
     ],
     "supports": {
       "style": 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.171';
+    version = '0.1.173';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/lowcode_es/sign-file/meta.js

@@ -185,6 +185,20 @@ var SignFileMeta = {
         "componentName": "FunctionSetter",
         "isRequired": true
       }
+    }, {
+      "title": {
+        "label": {
+          "type": "i18n",
+          "en-US": "parentPageUrl",
+          "zh-CN": "parentPageUrl"
+        }
+      },
+      "name": "parentPageUrl",
+      "setter": {
+        "componentName": "StringSetter",
+        "isRequired": true,
+        "initialValue": ""
+      }
     }],
     "supports": {
       "style": true

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

package/lowcode_lib/sign-file/meta.js

@@ -190,6 +190,20 @@ var SignFileMeta = {
         "componentName": "FunctionSetter",
         "isRequired": true
       }
+    }, {
+      "title": {
+        "label": {
+          "type": "i18n",
+          "en-US": "parentPageUrl",
+          "zh-CN": "parentPageUrl"
+        }
+      },
+      "name": "parentPageUrl",
+      "setter": {
+        "componentName": "StringSetter",
+        "isRequired": true,
+        "initialValue": ""
+      }
     }],
     "supports": {
       "style": true

package/package.json

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