ydb-components-material 0.1.155 → 0.1.157

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

@@ -276,7 +276,7 @@ var FileList = function FileList(_ref) {
         key: child.fileList.length
       }, /*#__PURE__*/React.createElement("p", {
         className: "name_level_two"
-      }, subIndex + 1, "\u3001", child.materialName), /*#__PURE__*/React.createElement("span", {
+      }, subIndex + 1, "\u3001", child.declareMaterialName || child.materialName), /*#__PURE__*/React.createElement("span", {
         className: "required"
       }, "*"), /*#__PURE__*/React.createElement(_Balloon, {
         v2: true,

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 ?? []).includes(OTHER) || (signAgentRole ?? []).includes(OTHER)));
-    // } else {
-    //   console.log('signatureSelfRole---', signatureSelfRole)
-    //   // 本人场景
-    //   setShowSignBtn(!((signatureSelfRole ?? []).includes(OTHER) || (signSelfRole ?? []).includes(OTHER)));
-    // }
+    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)));
+    }
   }, [signatureEnable, signEnable, userInfo, signerInfo, signatureAgentRole, signAgentRole, signatureSelfRole, signSelfRole]);
   var _useState = useState(false),
     isShowMaterialLib = _useState[0],
@@ -497,7 +497,7 @@ var FileItem = function FileItem(_ref) {
             });
           case 2:
             sealList = _context4.sent;
-            if (!(userInfo.corpType === 'C04')) {
+            if (!(userInfo.certificateSno && userInfo.certificateSno.substring(0, 2) === '92')) {
               _context4.next = 3;
               break;
             }
@@ -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() {

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

@@ -183,7 +183,22 @@ function SealPage(props) {
     timerRef.current = null;
   };
   useEffect(function () {
-    if (orderId) {
+    // PC端签批 获取签章结果 (文件地址)
+    window.addEventListener('message', function (e) {
+      console.log('e-------', e);
+      if (e.data.type === 'signal' && e.data.data && e.data.data.length) {
+        setHideClose(true);
+        console.log('pc端签章结果', e.data.data[0]); // 文件路径
+        signFileDown(e.data.data[0]);
+      }
+    });
+    return function () {
+      window.removeEventListener('message', function (e) {});
+    };
+  }, []);
+  useEffect(function () {
+    // 移动端轮询签章结果
+    if (orderId && !isPC) {
       handleClearInterval();
       timerRef.current = setInterval(function () {
         getSignFileFun();
@@ -192,7 +207,7 @@ function SealPage(props) {
     return function () {
       handleClearInterval();
     };
-  }, [orderId]);
+  }, [orderId, isPC]);
   var handleTouchMove = function handleTouchMove(e) {
     e.preventDefault(); // 只有在 passive: false 时才能调用
     console.log('Touch move');

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

@@ -282,7 +282,7 @@ var FileList = function FileList(_ref) {
         key: child.fileList.length
       }, /*#__PURE__*/_react["default"].createElement("p", {
         className: "name_level_two"
-      }, subIndex + 1, "\u3001", child.materialName), /*#__PURE__*/_react["default"].createElement("span", {
+      }, subIndex + 1, "\u3001", child.declareMaterialName || child.materialName), /*#__PURE__*/_react["default"].createElement("span", {
         className: "required"
       }, "*"), /*#__PURE__*/_react["default"].createElement(_balloon["default"], {
         v2: true,

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 ?? []).includes(OTHER) || (signAgentRole ?? []).includes(OTHER)));
-    // } else {
-    //   console.log('signatureSelfRole---', signatureSelfRole)
-    //   // 本人场景
-    //   setShowSignBtn(!((signatureSelfRole ?? []).includes(OTHER) || (signSelfRole ?? []).includes(OTHER)));
-    // }
+    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)));
+    }
   }, [signatureEnable, signEnable, userInfo, signerInfo, signatureAgentRole, signAgentRole, signatureSelfRole, signSelfRole]);
   var _useState = (0, _react.useState)(false),
     isShowMaterialLib = _useState[0],
@@ -503,7 +503,7 @@ var FileItem = function FileItem(_ref) {
             });
           case 2:
             sealList = _context4.sent;
-            if (!(userInfo.corpType === 'C04')) {
+            if (!(userInfo.certificateSno && userInfo.certificateSno.substring(0, 2) === '92')) {
               _context4.next = 3;
               break;
             }
@@ -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() {

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

@@ -189,7 +189,22 @@ function SealPage(props) {
     timerRef.current = null;
   };
   (0, _react.useEffect)(function () {
-    if (orderId) {
+    // PC端签批 获取签章结果 (文件地址)
+    window.addEventListener('message', function (e) {
+      console.log('e-------', e);
+      if (e.data.type === 'signal' && e.data.data && e.data.data.length) {
+        setHideClose(true);
+        console.log('pc端签章结果', e.data.data[0]); // 文件路径
+        signFileDown(e.data.data[0]);
+      }
+    });
+    return function () {
+      window.removeEventListener('message', function (e) {});
+    };
+  }, []);
+  (0, _react.useEffect)(function () {
+    // 移动端轮询签章结果
+    if (orderId && !isPC) {
       handleClearInterval();
       timerRef.current = setInterval(function () {
         getSignFileFun();
@@ -198,7 +213,7 @@ function SealPage(props) {
     return function () {
       handleClearInterval();
     };
-  }, [orderId]);
+  }, [orderId, isPC]);
   var handleTouchMove = function handleTouchMove(e) {
     e.preventDefault(); // 只有在 passive: false 时才能调用
     console.log('Touch move');

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

package/package.json

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