ydb-components-material 0.1.126 → 0.1.128

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

@@ -502,6 +502,7 @@ var FileItem = function FileItem(_ref) {
   var getRes = function getRes(val) {
     console.log('val---', val);
     valChange(val, fileIndex, index, subIndex);
+    invalidHandle();
     // needOtherSign && setShowSignerInfo(true)
   };
 
@@ -515,6 +516,7 @@ var FileItem = function FileItem(_ref) {
       sign();
     } else {
       valChange(val, fileIndex, index, subIndex);
+      invalidHandle();
       // needOtherSign && setShowSignerInfo(true)
     }
   };
@@ -675,10 +677,38 @@ var FileItem = function FileItem(_ref) {
       format: format
     });
   };
-  var handleDel = function handleDel() {
-    if (disabled) return;
-    valChange(undefined, fileIndex, index, subIndex);
+  var invalidHandle = function invalidHandle() {
+    // 分享出去的需要别人签署的文件数据。标识为无效
+    if (file.signId) {
+      saveSignerInfo({
+        uuid: file.signId,
+        invalid: true
+      });
+    }
   };
+  var handleDel = /*#__PURE__*/function () {
+    var _ref7 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6() {
+      return _regenerator["default"].wrap(function (_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
+          case 0:
+            if (!disabled) {
+              _context6.next = 1;
+              break;
+            }
+            return _context6.abrupt("return");
+          case 1:
+            invalidHandle();
+            valChange(undefined, fileIndex, index, subIndex);
+          case 2:
+          case "end":
+            return _context6.stop();
+        }
+      }, _callee6);
+    }));
+    return function handleDel() {
+      return _ref7.apply(this, arguments);
+    };
+  }();
   (0, _react.useEffect)(function () {
     var timer;
     if (userInfo && tokenTY) {
@@ -694,58 +724,58 @@ var FileItem = function FileItem(_ref) {
 
   // 获取缩略图
   var extractImageUrls = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6(previewUrl) {
+    var _ref8 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7(previewUrl) {
       var response, htmlText, parser, doc, imgElements, srcList;
-      return _regenerator["default"].wrap(function (_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regenerator["default"].wrap(function (_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            _context6.next = 1;
+            _context7.next = 1;
             return fetch(previewUrl);
           case 1:
-            response = _context6.sent;
-            _context6.next = 2;
+            response = _context7.sent;
+            _context7.next = 2;
             return response.text();
           case 2:
-            htmlText = _context6.sent;
+            htmlText = _context7.sent;
             parser = new DOMParser();
             doc = parser.parseFromString(htmlText, 'text/html');
             imgElements = doc.querySelectorAll('img');
             srcList = Array.from(imgElements).map(function (img) {
               return img.getAttribute('data-src');
             });
-            return _context6.abrupt("return", srcList);
+            return _context7.abrupt("return", srcList);
           case 3:
           case "end":
-            return _context6.stop();
+            return _context7.stop();
         }
-      }, _callee6);
+      }, _callee7);
     }));
     return function extractImageUrls(_x3) {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
 
   // 获取预览图片
   var getViewUrl = /*#__PURE__*/function () {
-    var _ref8 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7(id) {
+    var _ref9 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee8(id) {
       var type, urlRes, res, list;
-      return _regenerator["default"].wrap(function (_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
+      return _regenerator["default"].wrap(function (_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
           case 0:
             type = (0, _file2.getFileExtension)(fileName);
             if (!['png', 'jpg', 'jpeg'].includes(type)) {
-              _context7.next = 1;
+              _context8.next = 1;
               break;
             }
-            return _context7.abrupt("return", fileUrl);
+            return _context8.abrupt("return", fileUrl);
           case 1:
             if (!(type !== 'pdf')) {
-              _context7.next = 2;
+              _context8.next = 2;
               break;
             }
-            return _context7.abrupt("return", '');
+            return _context8.abrupt("return", '');
           case 2:
-            _context7.next = 3;
+            _context8.next = 3;
             return (0, _api.getUrlById)({
               id: id,
               effectiveTime: 3600000
@@ -758,13 +788,13 @@ var FileItem = function FileItem(_ref) {
               accessToken: accessToken
             });
           case 3:
-            urlRes = _context7.sent;
+            urlRes = _context8.sent;
             if (!(urlRes.presignedUrlList && urlRes.presignedUrlList.length > 0)) {
-              _context7.next = 6;
+              _context8.next = 6;
               break;
             }
             console.log('urlRes', urlRes);
-            _context7.next = 4;
+            _context8.next = 4;
             return (0, _api.onlinePreview)({
               url: urlRes.presignedUrlList[2]
             }, {
@@ -776,21 +806,21 @@ var FileItem = function FileItem(_ref) {
               accessToken: accessToken
             });
           case 4:
-            res = _context7.sent;
-            _context7.next = 5;
+            res = _context8.sent;
+            _context8.next = 5;
             return extractImageUrls(res.url);
           case 5:
-            list = _context7.sent;
+            list = _context8.sent;
             console.log('list---111111', list);
-            return _context7.abrupt("return", list[0]);
+            return _context8.abrupt("return", list[0]);
           case 6:
           case "end":
-            return _context7.stop();
+            return _context8.stop();
         }
-      }, _callee7);
+      }, _callee8);
     }));
     return function getViewUrl(_x4) {
-      return _ref8.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }();
   (0, _react.useEffect)(function () {
@@ -1087,7 +1117,11 @@ var FileItem = function FileItem(_ref) {
       signGuidFileId: signGuidFileId
     }),
     materialName: materialName,
-    signInfoMap: signInfoMap
+    signInfoMap: signInfoMap,
+    fileIndex: fileIndex,
+    index: index,
+    subIndex: subIndex,
+    valChange: valChange
   }));
 };
 FileItem.displayName = 'FileItem';

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

@@ -13,6 +13,7 @@ var _radio = _interopRequireDefault(require("@alifd/next/lib/radio"));
 var _react = _interopRequireWildcard(require("react"));
 var _close_black = _interopRequireDefault(require("./icon/close_black.svg"));
 var _add = _interopRequireDefault(require("./icon/add.svg"));
+var _delete = _interopRequireDefault(require("./icon/delete.svg"));
 var _qrcode = _interopRequireDefault(require("qrcode"));
 require("./signerInfo.scss");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
@@ -27,7 +28,11 @@ function SignerInfo(props) {
     isNeedOtherSeal = props.isNeedOtherSeal,
     file = props.file,
     materialName = props.materialName,
-    signInfoMap = props.signInfoMap;
+    signInfoMap = props.signInfoMap,
+    valChange = props.valChange,
+    fileIndex = props.fileIndex,
+    fileItemIndex = props.index,
+    subIndex = props.subIndex;
   var _React$useState = _react["default"].useState([]),
     signerInfoList = _React$useState[0],
     setSignerInfoList = _React$useState[1];
@@ -56,7 +61,7 @@ function SignerInfo(props) {
   };
   var next = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var i, item, fields, _i, _fields, field, val, saveRes;
+      var i, item, fields, _i, _fields, field, val, fileObj, saveRes;
       return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -119,16 +124,25 @@ function SignerInfo(props) {
             _context.next = 1;
             break;
           case 5:
+            fileObj = (0, _extends3["default"])({}, file);
+            if (!fileObj.initId) {
+              fileObj.initId = file.fileId;
+            }
+
+            // 保存签署人信息到草稿中
             _context.next = 6;
             return saveSignerInfo({
               list: signerInfoList,
-              file: file,
+              file: fileObj,
               materialName: materialName,
-              date: getCurrentTime()
+              date: getCurrentTime(),
+              initId: file.initId
             });
           case 6:
             saveRes = _context.sent;
             if (saveRes) {
+              fileObj.signId = saveRes;
+              valChange === null || valChange === void 0 ? void 0 : valChange(fileObj, fileIndex, fileItemIndex, subIndex);
               setUrl("https://zwfw.xzspglj.taiyuan.gov.cn/threeSign?draftNo=" + saveRes);
               setShowQRcode(true);
             } else {
@@ -152,15 +166,21 @@ function SignerInfo(props) {
       signContent: ''
     }]));
   };
+  var handleDelete = function handleDelete(index) {
+    var newList = signerInfoList.filter(function (_, i) {
+      return i !== index;
+    });
+    setSignerInfoList(newList);
+  };
   var onCopy = function onCopy() {
     navigator.clipboard.writeText(url);
     _message["default"].success('复制成功');
   };
   (0, _react.useEffect)(function () {
     if (signInfoMap && file) {
-      var fileId = file.fileId;
-      if (signInfoMap[fileId]) {
-        setSignerInfoList(signInfoMap[fileId]);
+      var initId = file.initId;
+      if (initId && signInfoMap[initId]) {
+        setSignerInfoList(signInfoMap[initId]);
       }
     }
   }, [signInfoMap, file]);
@@ -224,7 +244,15 @@ function SignerInfo(props) {
       }
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "signer-info-item-title"
-    }, /*#__PURE__*/_react["default"].createElement("span", null), "\u7B7E\u7F72\u65B9", index + 1), /*#__PURE__*/_react["default"].createElement("div", {
+    }, /*#__PURE__*/_react["default"].createElement("span", null), "\u7B7E\u7F72\u65B9", index + 1, index > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "signer-info-item-delete",
+      onClick: function onClick() {
+        return handleDelete(index);
+      }
+    }, /*#__PURE__*/_react["default"].createElement("img", {
+      src: _delete["default"],
+      alt: "delete"
+    }), "\u5220\u9664")), /*#__PURE__*/_react["default"].createElement("div", {
       className: "signer-info-item-content"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "signer-info-item-box",

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

@@ -79,6 +79,8 @@
     top: 0;
     z-index: 9;
 
+
+
     .close {
       margin-left: auto;
       position: absolute;
@@ -108,6 +110,14 @@
 
           background: linear-gradient(180deg, #7bb2ff 0%, #1678ff 100%);
         }
+
+        .signer-info-item-delete {
+          display: flex;
+          align-items: center;
+          margin-left: auto;
+          color: #F7625D;
+          font-size: 15px;
+        }
       }
 
       .signer-info-item-content {

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

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

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

@@ -5,8 +5,10 @@ exports.__esModule = true;
 exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _loading = _interopRequireDefault(require("@alifd/next/lib/loading"));
+var _dialog = _interopRequireDefault(require("@alifd/next/lib/dialog"));
 var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
 var _preview = _interopRequireDefault(require("./icon/preview.svg"));
 var _download = _interopRequireDefault(require("./icon/download.svg"));
@@ -14,13 +16,11 @@ var _file = _interopRequireDefault(require("./icon/file.svg"));
 var _close = _interopRequireDefault(require("./icon/close.svg"));
 var _sign = _interopRequireDefault(require("../file-list/sign"));
 var _seal = _interopRequireDefault(require("../file-list/seal"));
+var _sealUtil = require("../file-list/sealUtil");
 var _api = require("../../api");
 var _file2 = require("./file.js");
 require("./index.scss");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
-// import SignPage from './sign';
-// import SealPage from './seal';
-
 var SIGN = 1; // 签名
 var SEAL = 2; // 签章
 
@@ -35,7 +35,8 @@ var SignFile = function SignFile(_ref) {
     isPC = _ref.isPC,
     style = _ref.style,
     download = _ref.download,
-    valChange = _ref.valChange;
+    valChange = _ref.valChange,
+    applySeal = _ref.applySeal;
   var fileName = file.fileName,
     fileUrl = file.fileUrl,
     fileId = file.fileId,
@@ -71,6 +72,10 @@ var SignFile = function SignFile(_ref) {
   var _useState9 = (0, _react.useState)(),
     sealedFile = _useState9[0],
     setSealedFile = _useState9[1];
+  var _useState0 = (0, _react.useState)(false),
+    hasSigned = _useState0[0],
+    setHasSigned = _useState0[1];
+  var fileCopy = (0, _react.useRef)((0, _extends2["default"])({}, file));
 
   // 预览材料
   var preview = /*#__PURE__*/function () {
@@ -293,32 +298,127 @@ var SignFile = function SignFile(_ref) {
   }();
 
   // 手写签批
-  var sign = function sign() {
+  var sign = function sign(fromSeal) {
+    if (fromSeal === void 0) {
+      fromSeal = false;
+    }
+    if (!fromSeal) setSealedFile(undefined);
     setLoading(true);
     setIsShowSignPage(true);
   };
 
   // 签章
-  var seal = function seal() {
-    // 如果不需要签章 就直接去签字
-    if (!signContent.includes(SEAL)) {
-      sign();
-      return;
-    }
-    console.log('fileType', fileType);
-    var type = (0, _file2.getFileExtension)(fileName);
-    if (type !== 'pdf') {
-      _message["default"].notice('只有pdf文件才能使用电子签章');
-      return;
-    }
-    setLoading(true);
-    setIsShowSealPage(true);
-  };
+  var seal = /*#__PURE__*/function () {
+    var _ref6 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5() {
+      var type, sealList;
+      return _regenerator["default"].wrap(function (_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            setSealedFile(undefined);
+            // 如果不需要签章 就直接去签字
+            if (signContent.includes(SEAL)) {
+              _context5.next = 1;
+              break;
+            }
+            sign();
+            return _context5.abrupt("return");
+          case 1:
+            console.log('fileType', fileType);
+            type = (0, _file2.getFileExtension)(fileName);
+            if (!(type !== 'pdf')) {
+              _context5.next = 2;
+              break;
+            }
+            _message["default"].notice('只有pdf文件才能使用电子签章');
+            return _context5.abrupt("return");
+          case 2:
+            _context5.next = 3;
+            return (0, _sealUtil.querySeal)(userInfo, {
+              token: token,
+              tokenTY: tokenTY,
+              baseUrl: baseUrl,
+              env: env,
+              isPC: isPC,
+              accessToken: accessToken
+            });
+          case 3:
+            sealList = _context5.sent;
+            if (!(userInfo.corpType === 'C04')) {
+              _context5.next = 4;
+              break;
+            }
+            if (sealList.length) {
+              // 有印章 → 对话框提示，可跳过走签批
+              _dialog["default"].confirm({
+                title: '提示',
+                footerAlign: 'center',
+                content: '本份材料可豁免签章流程，完成电子签名即可，是否确认跳过签章？',
+                okProps: {
+                  children: '继续签章'
+                },
+                cancelProps: {
+                  children: '跳过签章'
+                },
+                onOk: function onOk() {
+                  setIsShowSealPage(true);
+                },
+                onCancel: function onCancel() {
+                  sign();
+                },
+                onClose: function onClose() {
+                  setLoading(false);
+                }
+              });
+            } else {
+              // 无印章 → 对话框提示，可申请印章或跳过走签批
+              _dialog["default"].confirm({
+                title: '提示',
+                content: '经检测，本账户暂未申请企业印章，办理时可选择跳过签章流程完成签名；也可办好印章后再来办理此项业务',
+                footerAlign: 'center',
+                okProps: {
+                  children: '申请印章'
+                },
+                cancelProps: {
+                  children: '跳过签章'
+                },
+                onOk: function onOk() {
+                  applySeal();
+                },
+                onCancel: function onCancel() {
+                  sign();
+                },
+                onClose: function onClose() {
+                  setLoading(false);
+                }
+              });
+            }
+            return _context5.abrupt("return");
+          case 4:
+            if (sealList.length) {
+              _context5.next = 5;
+              break;
+            }
+            _message["default"].error('该单位下暂无印章，请前往"山西政务服务网"或"三晋通"小程序申领印章');
+            return _context5.abrupt("return");
+          case 5:
+            setLoading(true);
+            setIsShowSealPage(true);
+          case 6:
+          case "end":
+            return _context5.stop();
+        }
+      }, _callee5);
+    }));
+    return function seal() {
+      return _ref6.apply(this, arguments);
+    };
+  }();
 
-  // 获取签pi结果
+  // 获取签批结果
   var getRes = function getRes(val) {
     console.log('signVal---', val);
     valChange(val);
+    setHasSigned(true);
   };
 
   // 获取签章结果
@@ -327,9 +427,10 @@ var SignFile = function SignFile(_ref) {
     // 如果还允许签批 就连住一起做了
     if (signatureEnable) {
       setSealedFile(val);
-      sign();
+      sign(true);
     } else {
       valChange(val);
+      setHasSigned(true);
     }
   };
   (0, _react.useEffect)(function () {
@@ -391,7 +492,7 @@ var SignFile = function SignFile(_ref) {
   }), "\u4E0B\u8F7D")), isShowSignPage && /*#__PURE__*/_react["default"].createElement(_sign["default"], {
     isShowSignPage: isShowSignPage,
     userInfo: userInfo,
-    file: sealedFile || file,
+    file: sealedFile || fileCopy.current,
     token: token,
     tokenTY: tokenTY,
     baseUrl: baseUrl,
@@ -409,7 +510,7 @@ var SignFile = function SignFile(_ref) {
     showClose: false,
     isShowSealPage: isShowSealPage,
     userInfo: userInfo,
-    file: file,
+    file: fileCopy.current,
     token: token,
     tokenTY: tokenTY,
     baseUrl: baseUrl,
@@ -454,7 +555,7 @@ var SignFile = function SignFile(_ref) {
   }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "sign_btn",
     onClick: seal
-  }, "\u7B7E\u7F72\u6587\u4EF6")));
+  }, hasSigned ? '重新签署' : '签署文件')));
 };
 SignFile.displayName = 'SignFile';
 var _default = exports["default"] = SignFile;

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ydb-components-material",
-  "version": "0.1.126",
+  "version": "0.1.128",
   "description": "ydb-components-material",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -83,6 +83,7 @@
     "@alifd/next": "^1.25.27",
     "@babel/runtime": "^7.0.0",
     "antd": "^4.24.12",
+    "axios": "^1.18.0",
     "jspdf": "^2.5.1",
     "mobile-select": "^1.4.0",
     "moment": "latest",
@@ -101,10 +102,10 @@
   },
   "componentConfig": {
     "isComponentLibrary": true,
-    "materialSchema": "https://unpkg.com/ydb-components-material@0.1.126/build/lowcode/assets-prod.json"
+    "materialSchema": "https://unpkg.com/ydb-components-material@0.1.128/build/lowcode/assets-prod.json"
   },
   "lcMeta": {
     "type": "component"
   },
-  "homepage": "https://unpkg.com/ydb-components-material@0.1.126/build/index.html"
+  "homepage": "https://unpkg.com/ydb-components-material@0.1.128/build/index.html"
 }