ydb-components-material 0.1.158 → 0.1.160

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

@@ -128,17 +128,17 @@ var FileItem = function FileItem(_ref) {
     console.log('prerequisite', prerequisite);
     if (!prerequisite) {
       setShowSignBtn(false);
-      return;
+      // return;
     }
     // 会签暂时不上线
-    if (Object.keys(signerInfo).length) {
-      // 代办场景
-      setShowSignBtn(!((signatureAgentRole !== null && signatureAgentRole !== void 0 ? signatureAgentRole : []).includes(OTHER) || (signAgentRole !== null && signAgentRole !== void 0 ? signAgentRole : []).includes(OTHER)));
-    } else {
-      console.log('signatureSelfRole---', signatureSelfRole);
-      // 本人场景
-      setShowSignBtn(!((signatureSelfRole !== null && signatureSelfRole !== void 0 ? signatureSelfRole : []).includes(OTHER) || (signSelfRole !== null && signSelfRole !== void 0 ? signSelfRole : []).includes(OTHER)));
-    }
+    // if (Object.keys(signerInfo).length) {
+    //   // 代办场景
+    //   setShowSignBtn(!((signatureAgentRole ?? []).includes(OTHER) || (signAgentRole ?? []).includes(OTHER)));
+    // } else {
+    //   console.log('signatureSelfRole---', signatureSelfRole)
+    //   // 本人场景
+    //   setShowSignBtn(!((signatureSelfRole ?? []).includes(OTHER) || (signSelfRole ?? []).includes(OTHER)));
+    // }
   }, [signatureEnable, signEnable, userInfo, signerInfo, signatureAgentRole, signAgentRole, signatureSelfRole, signSelfRole]);
   var _useState = useState(false),
     isShowMaterialLib = _useState[0],
@@ -600,7 +600,7 @@ var FileItem = function FileItem(_ref) {
     }
     valChange(val, fileIndex, index, subIndex);
     // invalidHandle()
-    // needOtherSign && setShowSignerInfo(true)
+    needOtherSign && setShowSignerInfo(true);
   };
 
   // 获取签章结果
@@ -617,7 +617,7 @@ var FileItem = function FileItem(_ref) {
       }
       valChange(val, fileIndex, index, subIndex);
       // invalidHandle()
-      // needOtherSign && setShowSignerInfo(true)
+      needOtherSign && setShowSignerInfo(true);
     }
   };
   var queryFileLibs = function queryFileLibs() {
@@ -1156,7 +1156,8 @@ var FileItem = function FileItem(_ref) {
       return setIsShowSignPage(false);
     },
     closeLoading: closeLoading,
-    showClose: showSignPageClose
+    showClose: showSignPageClose,
+    originalFileId: file.fileId
   }), isShowSealPage && /*#__PURE__*/React.createElement(SealPage, {
     isShowSealPage: isShowSealPage,
     userInfo: userInfo,

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

@@ -13,7 +13,8 @@ function SignPage(props) {
     baseUrl = props.baseUrl,
     env = props.env,
     isPC = props.isPC,
-    closeLoading = props.closeLoading;
+    closeLoading = props.closeLoading,
+    originalFileId = props.originalFileId;
   var init = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var fileObj, res, pageUrl;
@@ -27,6 +28,7 @@ function SignPage(props) {
               fileObj.originalUrl = file.fileUrl;
             }
             // 传递配置参数给工具函数
+            // originalFileId 用于确保 localStorage 的 key 是原始 fileId，外层 useEffect 能正确找到
             _context.next = 1;
             return initSignPageMethod(fileObj, userInfo, {
               token: token,
@@ -36,7 +38,7 @@ function SignPage(props) {
               isPC: isPC,
               fileList: fileList,
               parentPageUrl: parentPageUrl
-            });
+            }, originalFileId);
           case 1:
             res = _context.sent;
             pageUrl = res.pageUrl;

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

@@ -11,14 +11,17 @@ var documentId = ''; // 手写签批生成的文件id
 var contractId = ''; // 合同id
 
 // 对外的方法 初始化手写签批的页面
-export function initSignPageMethod(_x, _x2, _x3) {
+// originalFileId：用于 localStorage 存储的 fileId，在"先签章再签批"场景下，
+// fileObj.fileId 可能是签章后新上传文件的新 ID，但外层 useEffect 用原始 file.fileId 查 localStorage，
+// 所以需要传入原始 fileId 以确保数据能被正确找到。
+export function initSignPageMethod(_x, _x2, _x3, _x4) {
   return _initSignPageMethod.apply(this, arguments);
 }
 
 // 【第 1 步】上传要手写签批的文件
 function _initSignPageMethod() {
-  _initSignPageMethod = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(fileObj, userInfo, config) {
-    var fileName, fileId, originalUrl, fileUrl, docId, contrId, flag, pageUrl, params;
+  _initSignPageMethod = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(fileObj, userInfo, config, originalFileId) {
+    var fileName, fileId, originalUrl, fileUrl, docId, contrId, flag, localStorageFileId, pageUrl, params;
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -62,8 +65,11 @@ function _initSignPageMethod() {
           }
           return _context.abrupt("return", false);
         case 6:
+          // 【第 4 步】获取签章页面
+          // 用 originalFileId（如果传入）作为 localStorage key，确保外层 useEffect 能找到数据
+          localStorageFileId = originalFileId || fileId;
           _context.next = 7;
-          return getSignUrl(userInfo, config, fileName, fileId, originalUrl || fileUrl);
+          return getSignUrl(userInfo, config, fileName, localStorageFileId, originalUrl || fileUrl);
         case 7:
           pageUrl = _context.sent;
           if (pageUrl) {
@@ -88,7 +94,7 @@ function _initSignPageMethod() {
   }));
   return _initSignPageMethod.apply(this, arguments);
 }
-function uploadSignFile(_x4, _x5) {
+function uploadSignFile(_x5, _x6) {
   return _uploadSignFile.apply(this, arguments);
 } // 【第 2 步】创建或者发起电子签批
 function _uploadSignFile() {
@@ -275,7 +281,7 @@ function getSignUrl(userInfo, config, fileName, fileId, fileUrl) {
 // 下方是打开手写签批页面后 的后续操作
 
 // 对外的方法 获取签批后的文件
-export function getSignRes(_x6, _x7, _x8, _x9, _x0) {
+export function getSignRes(_x7, _x8, _x9, _x0, _x1) {
   return _getSignRes.apply(this, arguments);
 }
 

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

@@ -134,17 +134,17 @@ var FileItem = function FileItem(_ref) {
     console.log('prerequisite', prerequisite);
     if (!prerequisite) {
       setShowSignBtn(false);
-      return;
+      // return;
     }
     // 会签暂时不上线
-    if (Object.keys(signerInfo).length) {
-      // 代办场景
-      setShowSignBtn(!((signatureAgentRole !== null && signatureAgentRole !== void 0 ? signatureAgentRole : []).includes(OTHER) || (signAgentRole !== null && signAgentRole !== void 0 ? signAgentRole : []).includes(OTHER)));
-    } else {
-      console.log('signatureSelfRole---', signatureSelfRole);
-      // 本人场景
-      setShowSignBtn(!((signatureSelfRole !== null && signatureSelfRole !== void 0 ? signatureSelfRole : []).includes(OTHER) || (signSelfRole !== null && signSelfRole !== void 0 ? signSelfRole : []).includes(OTHER)));
-    }
+    // if (Object.keys(signerInfo).length) {
+    //   // 代办场景
+    //   setShowSignBtn(!((signatureAgentRole ?? []).includes(OTHER) || (signAgentRole ?? []).includes(OTHER)));
+    // } else {
+    //   console.log('signatureSelfRole---', signatureSelfRole)
+    //   // 本人场景
+    //   setShowSignBtn(!((signatureSelfRole ?? []).includes(OTHER) || (signSelfRole ?? []).includes(OTHER)));
+    // }
   }, [signatureEnable, signEnable, userInfo, signerInfo, signatureAgentRole, signAgentRole, signatureSelfRole, signSelfRole]);
   var _useState = (0, _react.useState)(false),
     isShowMaterialLib = _useState[0],
@@ -606,7 +606,7 @@ var FileItem = function FileItem(_ref) {
     }
     valChange(val, fileIndex, index, subIndex);
     // invalidHandle()
-    // needOtherSign && setShowSignerInfo(true)
+    needOtherSign && setShowSignerInfo(true);
   };
 
   // 获取签章结果
@@ -623,7 +623,7 @@ var FileItem = function FileItem(_ref) {
       }
       valChange(val, fileIndex, index, subIndex);
       // invalidHandle()
-      // needOtherSign && setShowSignerInfo(true)
+      needOtherSign && setShowSignerInfo(true);
     }
   };
   var queryFileLibs = function queryFileLibs() {
@@ -1162,7 +1162,8 @@ var FileItem = function FileItem(_ref) {
       return setIsShowSignPage(false);
     },
     closeLoading: closeLoading,
-    showClose: showSignPageClose
+    showClose: showSignPageClose,
+    originalFileId: file.fileId
   }), isShowSealPage && /*#__PURE__*/_react["default"].createElement(_seal["default"], {
     isShowSealPage: isShowSealPage,
     userInfo: userInfo,

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

@@ -18,7 +18,8 @@ function SignPage(props) {
     baseUrl = props.baseUrl,
     env = props.env,
     isPC = props.isPC,
-    closeLoading = props.closeLoading;
+    closeLoading = props.closeLoading,
+    originalFileId = props.originalFileId;
   var init = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var fileObj, res, pageUrl;
@@ -32,6 +33,7 @@ function SignPage(props) {
               fileObj.originalUrl = file.fileUrl;
             }
             // 传递配置参数给工具函数
+            // originalFileId 用于确保 localStorage 的 key 是原始 fileId，外层 useEffect 能正确找到
             _context.next = 1;
             return (0, _signUtil.initSignPageMethod)(fileObj, userInfo, {
               token: token,
@@ -41,7 +43,7 @@ function SignPage(props) {
               isPC: isPC,
               fileList: fileList,
               parentPageUrl: parentPageUrl
-            });
+            }, originalFileId);
           case 1:
             res = _context.sent;
             pageUrl = res.pageUrl;

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

@@ -17,12 +17,15 @@ var documentId = ''; // 手写签批生成的文件id
 var contractId = ''; // 合同id
 
 // 对外的方法 初始化手写签批的页面
-function initSignPageMethod(_x, _x2, _x3) {
+// originalFileId：用于 localStorage 存储的 fileId，在"先签章再签批"场景下，
+// fileObj.fileId 可能是签章后新上传文件的新 ID，但外层 useEffect 用原始 file.fileId 查 localStorage，
+// 所以需要传入原始 fileId 以确保数据能被正确找到。
+function initSignPageMethod(_x, _x2, _x3, _x4) {
   return _initSignPageMethod.apply(this, arguments);
 } // 【第 1 步】上传要手写签批的文件
 function _initSignPageMethod() {
-  _initSignPageMethod = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(fileObj, userInfo, config) {
-    var fileName, fileId, originalUrl, fileUrl, docId, contrId, flag, pageUrl, params;
+  _initSignPageMethod = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(fileObj, userInfo, config, originalFileId) {
+    var fileName, fileId, originalUrl, fileUrl, docId, contrId, flag, localStorageFileId, pageUrl, params;
     return _regenerator["default"].wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -66,8 +69,11 @@ function _initSignPageMethod() {
           }
           return _context.abrupt("return", false);
         case 6:
+          // 【第 4 步】获取签章页面
+          // 用 originalFileId（如果传入）作为 localStorage key，确保外层 useEffect 能找到数据
+          localStorageFileId = originalFileId || fileId;
           _context.next = 7;
-          return getSignUrl(userInfo, config, fileName, fileId, originalUrl || fileUrl);
+          return getSignUrl(userInfo, config, fileName, localStorageFileId, originalUrl || fileUrl);
         case 7:
           pageUrl = _context.sent;
           if (pageUrl) {
@@ -92,7 +98,7 @@ function _initSignPageMethod() {
   }));
   return _initSignPageMethod.apply(this, arguments);
 }
-function uploadSignFile(_x4, _x5) {
+function uploadSignFile(_x5, _x6) {
   return _uploadSignFile.apply(this, arguments);
 } // 【第 2 步】创建或者发起电子签批
 function _uploadSignFile() {
@@ -279,7 +285,7 @@ function getSignUrl(userInfo, config, fileName, fileId, fileUrl) {
 // 下方是打开手写签批页面后 的后续操作
 
 // 对外的方法 获取签批后的文件
-function getSignRes(_x6, _x7, _x8, _x9, _x0) {
+function getSignRes(_x7, _x8, _x9, _x0, _x1) {
   return _getSignRes.apply(this, arguments);
 } // 轮询 签批状态
 function _getSignRes() {

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

package/package.json

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