ydb-components-material 0.1.169 → 0.1.171

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

@@ -973,8 +973,20 @@ var FileItem = function FileItem(_ref) {
         originalUrlRef.current = originalUrl || '';
         if (docId && contrId && nameVal) {
           openLoading();
+          // 兜底：连续 10 次轮询仍未成功则结束轮询，避免无限请求
+          var pollCount = 0;
           timerRef.current = setInterval(function () {
-            getSignedFile(docId, contrId, nameVal);
+            getSignedFile(docId, contrId, nameVal).then(function (success) {
+              // 成功时 getSignedFile 内部会清除轮询并关闭 loading
+              if (!success) {
+                pollCount += 1;
+                if (pollCount >= 10) {
+                  clearInterval(timerRef.current);
+                  timerRef.current = null;
+                  closeLoading();
+                }
+              }
+            });
           }, 3000);
         }
       }
@@ -1282,7 +1294,8 @@ var FileItem = function FileItem(_ref) {
     fileIndex: fileIndex,
     index: index,
     subIndex: subIndex,
-    valChange: valChange
+    valChange: valChange,
+    env: env
   }));
 };
 FileItem.displayName = 'FileItem';

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

@@ -262,8 +262,8 @@ function getSignUrl(userInfo, config, fileName, fileId, fileUrl) {
     signurl(params, config).then(function (res) {
       console.log(res, '页面结果');
       if (res.data.code == 0) {
+        setSignInfo(fileName, fileId, fileUrl);
         if (config.fileList) {
-          setSignInfo(fileName, fileId, fileUrl);
           localStorage.setItem(config.tokenTY, JSON.stringify(config.fileList));
         }
         resolve(res.data.signUrl);

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

@@ -26,7 +26,8 @@ function SignerInfo(props) {
     valChange = props.valChange,
     fileIndex = props.fileIndex,
     fileItemIndex = props.index,
-    subIndex = props.subIndex;
+    subIndex = props.subIndex,
+    env = props.env;
   var _React$useState = React.useState([]),
     signerInfoList = _React$useState[0],
     setSignerInfoList = _React$useState[1];
@@ -37,6 +38,9 @@ function SignerInfo(props) {
   var _useState2 = useState(''),
     url = _useState2[0],
     setUrl = _useState2[1];
+  var _useState3 = useState(''),
+    urlStr = _useState3[0],
+    setUrlStr = _useState3[1];
   var handleFieldChange = function handleFieldChange(field, val, index) {
     var _extends2;
     var newList = [].concat(signerInfoList);
@@ -142,6 +146,7 @@ function SignerInfo(props) {
               fileObj.signId = id;
               valChange === null || valChange === void 0 ? void 0 : valChange(fileObj, fileIndex, fileItemIndex, subIndex);
               setUrl("https://zwfw.xzspglj.taiyuan.gov.cn/threeSign?id=" + id + "&draftNo=" + workNo + "&taskHandleItem=" + taskHandleItem);
+              setUrlStr((env && env.indexOf('release') > -1 ? 'http://221.204.12.137:11000/mh/pages/sign/threeSign' : 'https://zwfw.xzspglj.taiyuan.gov.cn/threeSign') + "?id=" + id + "&draftNo=" + workNo + "&taskHandleItem=" + taskHandleItem);
               setShowQRcode(true);
             } else {
               _Message.warning('信息保存失败，请重试');
@@ -173,10 +178,10 @@ function SignerInfo(props) {
   var onCopy = function onCopy() {
     var _navigator$clipboard;
     if ((_navigator$clipboard = navigator.clipboard) !== null && _navigator$clipboard !== void 0 && _navigator$clipboard.writeText) {
-      navigator.clipboard.writeText(url);
+      navigator.clipboard.writeText(urlStr);
     } else {
       var textarea = document.createElement('textarea');
-      textarea.value = url;
+      textarea.value = urlStr;
       textarea.style.position = 'fixed';
       textarea.style.opacity = '0';
       document.body.appendChild(textarea);
@@ -368,10 +373,10 @@ function SignerInfo(props) {
     }, signatureEnable && isNeedOtherSign && /*#__PURE__*/React.createElement(_Checkbox, {
       id: "1",
       value: "1"
-    }, "\u4EC5\u7B7E\u540D"), signEnable && isNeedOtherSeal && item.signType === 1 && /*#__PURE__*/React.createElement(_Checkbox, {
+    }, "\u7B7E\u540D"), signEnable && isNeedOtherSeal && item.signType === 1 && /*#__PURE__*/React.createElement(_Checkbox, {
       id: "2",
       value: "2"
-    }, "\u4EC5\u7B7E\u7AE0")))));
+    }, "\u7B7E\u7AE0")))));
   })), /*#__PURE__*/React.createElement("div", {
     className: "footer"
   }, /*#__PURE__*/React.createElement("div", {

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

@@ -16,6 +16,7 @@ export interface SignFileProps {
     applySeal: () => void;
     download: (value: any) => void;
     valChange: (value: any) => void;
+    toSign?: (url: string) => void;
 }
 declare const SignFile: React.FC<SignFileProps>;
 export default SignFile;

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

@@ -10,6 +10,7 @@ import downloadIcon from "./icon/download.svg";
 import fileIcon from "./icon/file.svg";
 import closeIcon from "./icon/close.svg";
 import SignPage from "../file-list/sign";
+import { getSignRes } from "../file-list/signUtil";
 import SealPage from "../file-list/seal";
 import { querySeal } from "../file-list/sealUtil";
 import { getGuideImg, getUrlById, onlinePreview } from "../../api";
@@ -30,7 +31,8 @@ var SignFile = function SignFile(_ref) {
     style = _ref.style,
     download = _ref.download,
     valChange = _ref.valChange,
-    applySeal = _ref.applySeal;
+    applySeal = _ref.applySeal,
+    toSign = _ref.toSign;
   var fileName = file.fileName,
     fileUrl = file.fileUrl,
     fileId = file.fileId,
@@ -73,6 +75,8 @@ var SignFile = function SignFile(_ref) {
     currentFileId = _useState1[0],
     setCurrentFileId = _useState1[1];
   var fileCopy = useRef(_extends({}, file));
+  var timerRef = useRef(null);
+  var originalUrlRef = useRef('');
 
   // 预览材料
   var preview = /*#__PURE__*/function () {
@@ -340,7 +344,7 @@ var SignFile = function SignFile(_ref) {
             });
           case 3:
             sealList = _context5.sent;
-            if (!(userInfo.corpType === 'C04')) {
+            if (!(userInfo.certificateSno && userInfo.certificateSno.substring(0, 2) === '92')) {
               _context5.next = 4;
               break;
             }
@@ -432,6 +436,51 @@ var SignFile = function SignFile(_ref) {
       setHasSigned(true);
     }
   };
+  var getSignedFile = /*#__PURE__*/function () {
+    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6(documentIdVal, contractIdVal, nameVal) {
+      var newFile;
+      return _regeneratorRuntime.wrap(function (_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
+          case 0:
+            console.log('params---', documentIdVal, contractIdVal, nameVal, file);
+            _context6.next = 1;
+            return getSignRes(documentIdVal, contractIdVal, nameVal, true, {
+              token: token,
+              tokenTY: tokenTY,
+              baseUrl: baseUrl,
+              env: env,
+              isPC: isPC
+            });
+          case 1:
+            newFile = _context6.sent;
+            if (!newFile) {
+              _context6.next = 2;
+              break;
+            }
+            clearInterval(timerRef.current);
+            timerRef.current = null;
+            localStorage.removeItem(fileId);
+            // closeLoading()
+            getRes(_extends({}, file, {
+              fileId: newFile.fileId,
+              fileName: nameVal,
+              fileUrl: newFile.fileUrlList[2],
+              originalUrl: originalUrlRef.current,
+              isSigned: true
+            }));
+            return _context6.abrupt("return", true);
+          case 2:
+            return _context6.abrupt("return", false);
+          case 3:
+          case "end":
+            return _context6.stop();
+        }
+      }, _callee6);
+    }));
+    return function getSignedFile(_x3, _x4, _x5) {
+      return _ref7.apply(this, arguments);
+    };
+  }();
   useEffect(function () {
     if (currentFileId) {
       getViewUrl(currentFileId).then(function (url) {
@@ -439,6 +488,46 @@ var SignFile = function SignFile(_ref) {
       });
     }
   }, [currentFileId]);
+  useEffect(function () {
+    try {
+      var stored = localStorage.getItem(fileId);
+      if (stored) {
+        console.log('stored---', stored);
+        var _JSON$parse = JSON.parse(stored),
+          contrId = _JSON$parse.contractId,
+          docId = _JSON$parse.documentId,
+          nameVal = _JSON$parse.fileName,
+          originalUrl = _JSON$parse.fileUrl;
+        console.log('docId', docId, contrId, nameVal);
+        localStorage.removeItem(fileId);
+        originalUrlRef.current = originalUrl || '';
+        if (docId && contrId && nameVal) {
+          // openLoading()
+          // 兜底：连续 10 次轮询仍未成功则结束轮询，避免无限请求
+          var pollCount = 0;
+          timerRef.current = setInterval(function () {
+            getSignedFile(docId, contrId, nameVal).then(function (success) {
+              // 成功时 getSignedFile 内部会清除轮询并关闭 loading
+              if (!success) {
+                pollCount += 1;
+                if (pollCount >= 10) {
+                  clearInterval(timerRef.current);
+                  timerRef.current = null;
+                  // closeLoading()
+                }
+              }
+            });
+          }, 3000);
+        }
+      }
+    } catch (e) {}
+    return function () {
+      if (timerRef.current) {
+        clearInterval(timerRef.current);
+        timerRef.current = null;
+      }
+    };
+  }, [fileId]);
   return /*#__PURE__*/React.createElement(_Loading, {
     tip: '加载中...',
     fullScreen: true,
@@ -489,6 +578,7 @@ var SignFile = function SignFile(_ref) {
     src: downloadIcon,
     alt: ""
   }), "\u4E0B\u8F7D")), isShowSignPage && /*#__PURE__*/React.createElement(SignPage, {
+    toSign: toSign,
     isShowSignPage: isShowSignPage,
     userInfo: userInfo,
     file: sealedFile || fileCopy.current,
@@ -497,7 +587,6 @@ var SignFile = function SignFile(_ref) {
     baseUrl: baseUrl,
     env: env,
     isPC: isPC,
-    getRes: getRes,
     handleClose: function handleClose() {
       return setIsShowSignPage(false);
     },

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

@@ -979,8 +979,20 @@ var FileItem = function FileItem(_ref) {
         originalUrlRef.current = originalUrl || '';
         if (docId && contrId && nameVal) {
           openLoading();
+          // 兜底：连续 10 次轮询仍未成功则结束轮询，避免无限请求
+          var pollCount = 0;
           timerRef.current = setInterval(function () {
-            getSignedFile(docId, contrId, nameVal);
+            getSignedFile(docId, contrId, nameVal).then(function (success) {
+              // 成功时 getSignedFile 内部会清除轮询并关闭 loading
+              if (!success) {
+                pollCount += 1;
+                if (pollCount >= 10) {
+                  clearInterval(timerRef.current);
+                  timerRef.current = null;
+                  closeLoading();
+                }
+              }
+            });
           }, 3000);
         }
       }
@@ -1288,7 +1300,8 @@ var FileItem = function FileItem(_ref) {
     fileIndex: fileIndex,
     index: index,
     subIndex: subIndex,
-    valChange: valChange
+    valChange: valChange,
+    env: env
   }));
 };
 FileItem.displayName = 'FileItem';

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

@@ -266,8 +266,8 @@ function getSignUrl(userInfo, config, fileName, fileId, fileUrl) {
     (0, _api.signurl)(params, config).then(function (res) {
       console.log(res, '页面结果');
       if (res.data.code == 0) {
+        setSignInfo(fileName, fileId, fileUrl);
         if (config.fileList) {
-          setSignInfo(fileName, fileId, fileUrl);
           localStorage.setItem(config.tokenTY, JSON.stringify(config.fileList));
         }
         resolve(res.data.signUrl);

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

@@ -32,7 +32,8 @@ function SignerInfo(props) {
     valChange = props.valChange,
     fileIndex = props.fileIndex,
     fileItemIndex = props.index,
-    subIndex = props.subIndex;
+    subIndex = props.subIndex,
+    env = props.env;
   var _React$useState = _react["default"].useState([]),
     signerInfoList = _React$useState[0],
     setSignerInfoList = _React$useState[1];
@@ -43,6 +44,9 @@ function SignerInfo(props) {
   var _useState2 = (0, _react.useState)(''),
     url = _useState2[0],
     setUrl = _useState2[1];
+  var _useState3 = (0, _react.useState)(''),
+    urlStr = _useState3[0],
+    setUrlStr = _useState3[1];
   var handleFieldChange = function handleFieldChange(field, val, index) {
     var _extends2;
     var newList = [].concat(signerInfoList);
@@ -148,6 +152,7 @@ function SignerInfo(props) {
               fileObj.signId = id;
               valChange === null || valChange === void 0 ? void 0 : valChange(fileObj, fileIndex, fileItemIndex, subIndex);
               setUrl("https://zwfw.xzspglj.taiyuan.gov.cn/threeSign?id=" + id + "&draftNo=" + workNo + "&taskHandleItem=" + taskHandleItem);
+              setUrlStr((env && env.indexOf('release') > -1 ? 'http://221.204.12.137:11000/mh/pages/sign/threeSign' : 'https://zwfw.xzspglj.taiyuan.gov.cn/threeSign') + "?id=" + id + "&draftNo=" + workNo + "&taskHandleItem=" + taskHandleItem);
               setShowQRcode(true);
             } else {
               _message["default"].warning('信息保存失败，请重试');
@@ -179,10 +184,10 @@ function SignerInfo(props) {
   var onCopy = function onCopy() {
     var _navigator$clipboard;
     if ((_navigator$clipboard = navigator.clipboard) !== null && _navigator$clipboard !== void 0 && _navigator$clipboard.writeText) {
-      navigator.clipboard.writeText(url);
+      navigator.clipboard.writeText(urlStr);
     } else {
       var textarea = document.createElement('textarea');
-      textarea.value = url;
+      textarea.value = urlStr;
       textarea.style.position = 'fixed';
       textarea.style.opacity = '0';
       document.body.appendChild(textarea);
@@ -374,10 +379,10 @@ function SignerInfo(props) {
     }, signatureEnable && isNeedOtherSign && /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
       id: "1",
       value: "1"
-    }, "\u4EC5\u7B7E\u540D"), signEnable && isNeedOtherSeal && item.signType === 1 && /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
+    }, "\u7B7E\u540D"), signEnable && isNeedOtherSeal && item.signType === 1 && /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
       id: "2",
       value: "2"
-    }, "\u4EC5\u7B7E\u7AE0")))));
+    }, "\u7B7E\u7AE0")))));
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "footer"
   }, /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -16,6 +16,7 @@ export interface SignFileProps {
     applySeal: () => void;
     download: (value: any) => void;
     valChange: (value: any) => void;
+    toSign?: (url: string) => void;
 }
 declare const SignFile: React.FC<SignFileProps>;
 export default SignFile;

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

@@ -15,6 +15,7 @@ var _download = _interopRequireDefault(require("./icon/download.svg"));
 var _file = _interopRequireDefault(require("./icon/file.svg"));
 var _close = _interopRequireDefault(require("./icon/close.svg"));
 var _sign = _interopRequireDefault(require("../file-list/sign"));
+var _signUtil = require("../file-list/signUtil");
 var _seal = _interopRequireDefault(require("../file-list/seal"));
 var _sealUtil = require("../file-list/sealUtil");
 var _api = require("../../api");
@@ -36,7 +37,8 @@ var SignFile = function SignFile(_ref) {
     style = _ref.style,
     download = _ref.download,
     valChange = _ref.valChange,
-    applySeal = _ref.applySeal;
+    applySeal = _ref.applySeal,
+    toSign = _ref.toSign;
   var fileName = file.fileName,
     fileUrl = file.fileUrl,
     fileId = file.fileId,
@@ -79,6 +81,8 @@ var SignFile = function SignFile(_ref) {
     currentFileId = _useState1[0],
     setCurrentFileId = _useState1[1];
   var fileCopy = (0, _react.useRef)((0, _extends2["default"])({}, file));
+  var timerRef = (0, _react.useRef)(null);
+  var originalUrlRef = (0, _react.useRef)('');
 
   // 预览材料
   var preview = /*#__PURE__*/function () {
@@ -346,7 +350,7 @@ var SignFile = function SignFile(_ref) {
             });
           case 3:
             sealList = _context5.sent;
-            if (!(userInfo.corpType === 'C04')) {
+            if (!(userInfo.certificateSno && userInfo.certificateSno.substring(0, 2) === '92')) {
               _context5.next = 4;
               break;
             }
@@ -438,6 +442,51 @@ var SignFile = function SignFile(_ref) {
       setHasSigned(true);
     }
   };
+  var getSignedFile = /*#__PURE__*/function () {
+    var _ref7 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6(documentIdVal, contractIdVal, nameVal) {
+      var newFile;
+      return _regenerator["default"].wrap(function (_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
+          case 0:
+            console.log('params---', documentIdVal, contractIdVal, nameVal, file);
+            _context6.next = 1;
+            return (0, _signUtil.getSignRes)(documentIdVal, contractIdVal, nameVal, true, {
+              token: token,
+              tokenTY: tokenTY,
+              baseUrl: baseUrl,
+              env: env,
+              isPC: isPC
+            });
+          case 1:
+            newFile = _context6.sent;
+            if (!newFile) {
+              _context6.next = 2;
+              break;
+            }
+            clearInterval(timerRef.current);
+            timerRef.current = null;
+            localStorage.removeItem(fileId);
+            // closeLoading()
+            getRes((0, _extends2["default"])({}, file, {
+              fileId: newFile.fileId,
+              fileName: nameVal,
+              fileUrl: newFile.fileUrlList[2],
+              originalUrl: originalUrlRef.current,
+              isSigned: true
+            }));
+            return _context6.abrupt("return", true);
+          case 2:
+            return _context6.abrupt("return", false);
+          case 3:
+          case "end":
+            return _context6.stop();
+        }
+      }, _callee6);
+    }));
+    return function getSignedFile(_x3, _x4, _x5) {
+      return _ref7.apply(this, arguments);
+    };
+  }();
   (0, _react.useEffect)(function () {
     if (currentFileId) {
       getViewUrl(currentFileId).then(function (url) {
@@ -445,6 +494,46 @@ var SignFile = function SignFile(_ref) {
       });
     }
   }, [currentFileId]);
+  (0, _react.useEffect)(function () {
+    try {
+      var stored = localStorage.getItem(fileId);
+      if (stored) {
+        console.log('stored---', stored);
+        var _JSON$parse = JSON.parse(stored),
+          contrId = _JSON$parse.contractId,
+          docId = _JSON$parse.documentId,
+          nameVal = _JSON$parse.fileName,
+          originalUrl = _JSON$parse.fileUrl;
+        console.log('docId', docId, contrId, nameVal);
+        localStorage.removeItem(fileId);
+        originalUrlRef.current = originalUrl || '';
+        if (docId && contrId && nameVal) {
+          // openLoading()
+          // 兜底：连续 10 次轮询仍未成功则结束轮询，避免无限请求
+          var pollCount = 0;
+          timerRef.current = setInterval(function () {
+            getSignedFile(docId, contrId, nameVal).then(function (success) {
+              // 成功时 getSignedFile 内部会清除轮询并关闭 loading
+              if (!success) {
+                pollCount += 1;
+                if (pollCount >= 10) {
+                  clearInterval(timerRef.current);
+                  timerRef.current = null;
+                  // closeLoading()
+                }
+              }
+            });
+          }, 3000);
+        }
+      }
+    } catch (e) {}
+    return function () {
+      if (timerRef.current) {
+        clearInterval(timerRef.current);
+        timerRef.current = null;
+      }
+    };
+  }, [fileId]);
   return /*#__PURE__*/_react["default"].createElement(_loading["default"], {
     tip: '加载中...',
     fullScreen: true,
@@ -495,6 +584,7 @@ var SignFile = function SignFile(_ref) {
     src: _download["default"],
     alt: ""
   }), "\u4E0B\u8F7D")), isShowSignPage && /*#__PURE__*/_react["default"].createElement(_sign["default"], {
+    toSign: toSign,
     isShowSignPage: isShowSignPage,
     userInfo: userInfo,
     file: sealedFile || fileCopy.current,
@@ -503,7 +593,6 @@ var SignFile = function SignFile(_ref) {
     baseUrl: baseUrl,
     env: env,
     isPC: isPC,
-    getRes: getRes,
     handleClose: function handleClose() {
       return setIsShowSignPage(false);
     },

package/lowcode/sign-file/meta.ts

@@ -184,7 +184,21 @@ const SignFileMeta: IPublicTypeComponentMetadata = {
           "componentName": "FunctionSetter",
           "isRequired": true
         }
-      }
+      },
+      {
+        "title": {
+          "label": {
+            "type": "i18n",
+            "en-US": "toSign",
+            "zh-CN": "toSign"
+          }
+        },
+        "name": "toSign",
+        "setter": {
+          "componentName": "FunctionSetter",
+          "isRequired": true
+        }
+      },
     ],
     "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.169';
+    version = '0.1.171';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/lowcode_es/sign-file/meta.js

@@ -172,6 +172,19 @@ var SignFileMeta = {
         "componentName": "FunctionSetter",
         "isRequired": true
       }
+    }, {
+      "title": {
+        "label": {
+          "type": "i18n",
+          "en-US": "toSign",
+          "zh-CN": "toSign"
+        }
+      },
+      "name": "toSign",
+      "setter": {
+        "componentName": "FunctionSetter",
+        "isRequired": true
+      }
     }],
     "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.169';
+    version = '0.1.171';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/lowcode_lib/sign-file/meta.js

@@ -177,6 +177,19 @@ var SignFileMeta = {
         "componentName": "FunctionSetter",
         "isRequired": true
       }
+    }, {
+      "title": {
+        "label": {
+          "type": "i18n",
+          "en-US": "toSign",
+          "zh-CN": "toSign"
+        }
+      },
+      "name": "toSign",
+      "setter": {
+        "componentName": "FunctionSetter",
+        "isRequired": true
+      }
     }],
     "supports": {
       "style": true

package/package.json

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