ydb-components-material 0.1.167 → 0.1.169

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

@@ -101,14 +101,20 @@ var FileList = function FileList(_ref) {
   var _useState3 = useState(false),
     showMerge = _useState3[0],
     setShowMerge = _useState3[1];
-  var _useState4 = useState({
+  // 签署完成后自动打开维护签署人信息
+  // 状态放在 FileList（FileItem 的父级），因为 FileItem 在签章/签批完成后会因 fileId 变化被重新挂载，
+  // 局部 state 会丢失。这里记录需要自动弹窗的材料位置，等重挂载后的 FileItem 挂载完成再触发弹窗
+  var _useState4 = useState(null),
+    needSignerInfo = _useState4[0],
+    setNeedSignerInfo = _useState4[1];
+  var _useState5 = useState({
       materialName: '',
       fileList: [],
       index: 0,
       subIndex: 0
     }),
-    curMerge = _useState4[0],
-    setCurMerge = _useState4[1];
+    curMerge = _useState5[0],
+    setCurMerge = _useState5[1];
   var convertNumbersToChinese = function convertNumbersToChinese(str) {
     // 定义基础映射关系
     var digitMap = {
@@ -245,6 +251,14 @@ var FileList = function FileList(_ref) {
     setFileArray([].concat(fileArray));
   };
 
+  // 签署完成后需要自动打开维护签署人信息：记录目标材料位置，等对应 FileItem 挂载后触发弹窗
+  var handleNeedSignerInfo = function handleNeedSignerInfo(pos) {
+    setNeedSignerInfo(pos);
+  };
+  var handleCloseSignerInfo = function handleCloseSignerInfo() {
+    setNeedSignerInfo(null);
+  };
+
   // 如果 文件列表中都是图片，且数量大于1 判断需要合并
   var judgeNeedMerge = function judgeNeedMerge(files) {
     console.log('files--------judgeNeedMerge', files);
@@ -354,6 +368,9 @@ var FileList = function FileList(_ref) {
           parentPageUrl: parentPageUrl,
           toSign: toSign,
           saveSignerInfo: saveSignerInfo,
+          autoShowSignerInfo: !!(needSignerInfo && needSignerInfo.index === index && needSignerInfo.subIndex === subIndex && needSignerInfo.fileIndex === i),
+          onNeedSignerInfo: handleNeedSignerInfo,
+          onCloseSignerInfo: handleCloseSignerInfo,
           style: {
             marginBottom: '12px'
           }
@@ -389,6 +406,9 @@ var FileList = function FileList(_ref) {
         closeLoading: closeLoading,
         parentPageUrl: parentPageUrl,
         saveSignerInfo: saveSignerInfo,
+        autoShowSignerInfo: !!(needSignerInfo && needSignerInfo.index === index && needSignerInfo.fileIndex === i),
+        onNeedSignerInfo: handleNeedSignerInfo,
+        onCloseSignerInfo: handleCloseSignerInfo,
         style: {
           marginBottom: '12px'
         }

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

@@ -29,6 +29,13 @@ export interface FileItemProps {
     download: (value: any) => void;
     saveSignerInfo: (value: any) => Promise<boolean>;
     signInfoMap?: object;
+    autoShowSignerInfo?: boolean;
+    onNeedSignerInfo?: (pos: {
+        index: number;
+        subIndex?: number;
+        fileIndex: number;
+    }) => void;
+    onCloseSignerInfo?: () => void;
 }
 declare const FileItem: React.FC<FileItemProps>;
 export default FileItem;

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

@@ -55,7 +55,10 @@ var FileItem = function FileItem(_ref) {
     signInfoMap = _ref.signInfoMap,
     applySeal = _ref.applySeal,
     parentPageUrl = _ref.parentPageUrl,
-    toSign = _ref.toSign;
+    toSign = _ref.toSign,
+    autoShowSignerInfo = _ref.autoShowSignerInfo,
+    onNeedSignerInfo = _ref.onNeedSignerInfo,
+    onCloseSignerInfo = _ref.onCloseSignerInfo;
   console.log('fileItem', file, maxFileSize);
   var fileName = file.fileName,
     fileUrl = file.fileUrl,
@@ -116,7 +119,7 @@ var FileItem = function FileItem(_ref) {
     // 本人 → signatureSelfRole/signSelfRole 含 OTHER
     var signBtnOtherSign = Object.keys(signerInfo).length ? safeSignatureAgentRole.includes(OTHER) || safeSignAgentRole.includes(OTHER) : safeSignatureSelfRole.includes(OTHER) || safeSignSelfRole.includes(OTHER);
     setSignBtnText(signBtnOtherSign ? '联合签署' : '签署文件');
-    setReSignBtnText(signBtnOtherSign ? '重新联合签署' : '重新签署');
+    setReSignBtnText(signBtnOtherSign ? '重新签署' : '重新签署');
   }, [signatureSelfRole, signatureAgentRole, signSelfRole, signAgentRole, signerInfo]);
 
   // 是否展示签署按钮
@@ -611,7 +614,14 @@ var FileItem = function FileItem(_ref) {
     // 轮询回调是旧闭包，这里读 ref 拿最新值，避免读到挂载时的初始 false
     var needOther = needOtherSignRef.current;
     console.log('needOtherSign-----', needOther);
-    needOther && setShowSignerInfo(true);
+    if (needOther) {
+      // 弹窗状态放到父级 FileList 控制，避免 FileItem 因 fileId 变化重挂载导致弹窗状态丢失
+      onNeedSignerInfo && onNeedSignerInfo({
+        index: index,
+        subIndex: subIndex,
+        fileIndex: fileIndex
+      });
+    }
   };
 
   // 获取签章结果
@@ -628,7 +638,13 @@ var FileItem = function FileItem(_ref) {
       }
       valChange(val, fileIndex, index, subIndex);
       // invalidHandle()
-      needOtherSignRef.current && setShowSignerInfo(true);
+      if (needOtherSignRef.current) {
+        onNeedSignerInfo && onNeedSignerInfo({
+          index: index,
+          subIndex: subIndex,
+          fileIndex: fileIndex
+        });
+      }
     }
   };
   var queryFileLibs = function queryFileLibs() {
@@ -933,6 +949,15 @@ var FileItem = function FileItem(_ref) {
       });
     }
   }, [fileId]);
+
+  // 父级 FileList 通知：本组件（重挂载后）需要自动打开维护签署人信息
+  // 打开后立即回调清除标记，避免下次切换材料位置时误弹
+  useEffect(function () {
+    if (autoShowSignerInfo) {
+      setShowSignerInfo(true);
+      onCloseSignerInfo && onCloseSignerInfo();
+    }
+  }, [autoShowSignerInfo, onCloseSignerInfo]);
   useEffect(function () {
     try {
       var stored = localStorage.getItem(fileId);
@@ -1241,7 +1266,8 @@ var FileItem = function FileItem(_ref) {
   }), showSignerInfo && /*#__PURE__*/React.createElement(SignerInfo, {
     signerInfo: signerInfo,
     handleClose: function handleClose() {
-      return setShowSignerInfo(false);
+      setShowSignerInfo(false);
+      onCloseSignerInfo && onCloseSignerInfo();
     },
     saveSignerInfo: saveSignerInfo,
     signatureEnable: signatureEnable,

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

@@ -107,14 +107,20 @@ var FileList = function FileList(_ref) {
   var _useState3 = (0, _react.useState)(false),
     showMerge = _useState3[0],
     setShowMerge = _useState3[1];
-  var _useState4 = (0, _react.useState)({
+  // 签署完成后自动打开维护签署人信息
+  // 状态放在 FileList（FileItem 的父级），因为 FileItem 在签章/签批完成后会因 fileId 变化被重新挂载，
+  // 局部 state 会丢失。这里记录需要自动弹窗的材料位置，等重挂载后的 FileItem 挂载完成再触发弹窗
+  var _useState4 = (0, _react.useState)(null),
+    needSignerInfo = _useState4[0],
+    setNeedSignerInfo = _useState4[1];
+  var _useState5 = (0, _react.useState)({
       materialName: '',
       fileList: [],
       index: 0,
       subIndex: 0
     }),
-    curMerge = _useState4[0],
-    setCurMerge = _useState4[1];
+    curMerge = _useState5[0],
+    setCurMerge = _useState5[1];
   var convertNumbersToChinese = function convertNumbersToChinese(str) {
     // 定义基础映射关系
     var digitMap = {
@@ -251,6 +257,14 @@ var FileList = function FileList(_ref) {
     setFileArray([].concat(fileArray));
   };
 
+  // 签署完成后需要自动打开维护签署人信息：记录目标材料位置，等对应 FileItem 挂载后触发弹窗
+  var handleNeedSignerInfo = function handleNeedSignerInfo(pos) {
+    setNeedSignerInfo(pos);
+  };
+  var handleCloseSignerInfo = function handleCloseSignerInfo() {
+    setNeedSignerInfo(null);
+  };
+
   // 如果 文件列表中都是图片，且数量大于1 判断需要合并
   var judgeNeedMerge = function judgeNeedMerge(files) {
     console.log('files--------judgeNeedMerge', files);
@@ -360,6 +374,9 @@ var FileList = function FileList(_ref) {
           parentPageUrl: parentPageUrl,
           toSign: toSign,
           saveSignerInfo: saveSignerInfo,
+          autoShowSignerInfo: !!(needSignerInfo && needSignerInfo.index === index && needSignerInfo.subIndex === subIndex && needSignerInfo.fileIndex === i),
+          onNeedSignerInfo: handleNeedSignerInfo,
+          onCloseSignerInfo: handleCloseSignerInfo,
           style: {
             marginBottom: '12px'
           }
@@ -395,6 +412,9 @@ var FileList = function FileList(_ref) {
         closeLoading: closeLoading,
         parentPageUrl: parentPageUrl,
         saveSignerInfo: saveSignerInfo,
+        autoShowSignerInfo: !!(needSignerInfo && needSignerInfo.index === index && needSignerInfo.fileIndex === i),
+        onNeedSignerInfo: handleNeedSignerInfo,
+        onCloseSignerInfo: handleCloseSignerInfo,
         style: {
           marginBottom: '12px'
         }

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

@@ -29,6 +29,13 @@ export interface FileItemProps {
     download: (value: any) => void;
     saveSignerInfo: (value: any) => Promise<boolean>;
     signInfoMap?: object;
+    autoShowSignerInfo?: boolean;
+    onNeedSignerInfo?: (pos: {
+        index: number;
+        subIndex?: number;
+        fileIndex: number;
+    }) => void;
+    onCloseSignerInfo?: () => void;
 }
 declare const FileItem: React.FC<FileItemProps>;
 export default FileItem;

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

@@ -61,7 +61,10 @@ var FileItem = function FileItem(_ref) {
     signInfoMap = _ref.signInfoMap,
     applySeal = _ref.applySeal,
     parentPageUrl = _ref.parentPageUrl,
-    toSign = _ref.toSign;
+    toSign = _ref.toSign,
+    autoShowSignerInfo = _ref.autoShowSignerInfo,
+    onNeedSignerInfo = _ref.onNeedSignerInfo,
+    onCloseSignerInfo = _ref.onCloseSignerInfo;
   console.log('fileItem', file, maxFileSize);
   var fileName = file.fileName,
     fileUrl = file.fileUrl,
@@ -122,7 +125,7 @@ var FileItem = function FileItem(_ref) {
     // 本人 → signatureSelfRole/signSelfRole 含 OTHER
     var signBtnOtherSign = Object.keys(signerInfo).length ? safeSignatureAgentRole.includes(OTHER) || safeSignAgentRole.includes(OTHER) : safeSignatureSelfRole.includes(OTHER) || safeSignSelfRole.includes(OTHER);
     setSignBtnText(signBtnOtherSign ? '联合签署' : '签署文件');
-    setReSignBtnText(signBtnOtherSign ? '重新联合签署' : '重新签署');
+    setReSignBtnText(signBtnOtherSign ? '重新签署' : '重新签署');
   }, [signatureSelfRole, signatureAgentRole, signSelfRole, signAgentRole, signerInfo]);
 
   // 是否展示签署按钮
@@ -617,7 +620,14 @@ var FileItem = function FileItem(_ref) {
     // 轮询回调是旧闭包，这里读 ref 拿最新值，避免读到挂载时的初始 false
     var needOther = needOtherSignRef.current;
     console.log('needOtherSign-----', needOther);
-    needOther && setShowSignerInfo(true);
+    if (needOther) {
+      // 弹窗状态放到父级 FileList 控制，避免 FileItem 因 fileId 变化重挂载导致弹窗状态丢失
+      onNeedSignerInfo && onNeedSignerInfo({
+        index: index,
+        subIndex: subIndex,
+        fileIndex: fileIndex
+      });
+    }
   };
 
   // 获取签章结果
@@ -634,7 +644,13 @@ var FileItem = function FileItem(_ref) {
       }
       valChange(val, fileIndex, index, subIndex);
       // invalidHandle()
-      needOtherSignRef.current && setShowSignerInfo(true);
+      if (needOtherSignRef.current) {
+        onNeedSignerInfo && onNeedSignerInfo({
+          index: index,
+          subIndex: subIndex,
+          fileIndex: fileIndex
+        });
+      }
     }
   };
   var queryFileLibs = function queryFileLibs() {
@@ -939,6 +955,15 @@ var FileItem = function FileItem(_ref) {
       });
     }
   }, [fileId]);
+
+  // 父级 FileList 通知：本组件（重挂载后）需要自动打开维护签署人信息
+  // 打开后立即回调清除标记，避免下次切换材料位置时误弹
+  (0, _react.useEffect)(function () {
+    if (autoShowSignerInfo) {
+      setShowSignerInfo(true);
+      onCloseSignerInfo && onCloseSignerInfo();
+    }
+  }, [autoShowSignerInfo, onCloseSignerInfo]);
   (0, _react.useEffect)(function () {
     try {
       var stored = localStorage.getItem(fileId);
@@ -1247,7 +1272,8 @@ var FileItem = function FileItem(_ref) {
   }), showSignerInfo && /*#__PURE__*/_react["default"].createElement(_signerInfo["default"], {
     signerInfo: signerInfo,
     handleClose: function handleClose() {
-      return setShowSignerInfo(false);
+      setShowSignerInfo(false);
+      onCloseSignerInfo && onCloseSignerInfo();
     },
     saveSignerInfo: saveSignerInfo,
     signatureEnable: signatureEnable,

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

package/package.json

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