ydb-components-material 0.1.136 → 0.1.138

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

@@ -506,8 +506,11 @@ var FileItem = function FileItem(_ref) {
   // 获取签pi结果
   var getRes = function getRes(val) {
     console.log('val---', val);
+    if (val.signId) {
+      delete val.signId;
+    }
     valChange(val, fileIndex, index, subIndex);
-    invalidHandle();
+    // invalidHandle()
     needOtherSign && setShowSignerInfo(true);
   };
 
@@ -520,8 +523,11 @@ var FileItem = function FileItem(_ref) {
       setShowSignPageClose(false); // 签章完之后就不展示签批页面的关闭按钮了。防止用户误点击退出去
       sign();
     } else {
+      if (val.signId) {
+        delete val.signId;
+      }
       valChange(val, fileIndex, index, subIndex);
-      invalidHandle();
+      // invalidHandle()
       needOtherSign && setShowSignerInfo(true);
     }
   };
@@ -702,7 +708,7 @@ var FileItem = function FileItem(_ref) {
             }
             return _context6.abrupt("return");
           case 1:
-            invalidHandle();
+            // invalidHandle()
             valChange(undefined, fileIndex, index, subIndex);
           case 2:
           case "end":

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

@@ -55,7 +55,7 @@ function SignerInfo(props) {
   };
   var next = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var i, item, fields, _i, _fields, field, val, fileObj, saveRes, id, workNo;
+      var i, item, fields, _i, _fields, field, val, fileObj, saveRes, id, workNo, taskHandleItem;
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -130,15 +130,16 @@ function SignerInfo(props) {
               file: fileObj,
               materialName: materialName,
               date: getCurrentTime(),
+              time: new Date(),
               initId: file.initId
             });
           case 6:
             saveRes = _context.sent;
             if (saveRes) {
-              id = saveRes.id, workNo = saveRes.workNo;
+              id = saveRes.id, workNo = saveRes.workNo, taskHandleItem = saveRes.taskHandleItem;
               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);
+              setUrl("https://zwfw.xzspglj.taiyuan.gov.cn/threeSign?id=" + id + "&draftNo=" + workNo + "&taskHandleItem=" + taskHandleItem);
               setShowQRcode(true);
             } else {
               _Message.warning('信息保存失败，请重试');
@@ -168,7 +169,19 @@ function SignerInfo(props) {
     setSignerInfoList(newList);
   };
   var onCopy = function onCopy() {
-    navigator.clipboard.writeText(url);
+    var _navigator$clipboard;
+    if ((_navigator$clipboard = navigator.clipboard) !== null && _navigator$clipboard !== void 0 && _navigator$clipboard.writeText) {
+      navigator.clipboard.writeText(url);
+    } else {
+      var textarea = document.createElement('textarea');
+      textarea.value = url;
+      textarea.style.position = 'fixed';
+      textarea.style.opacity = '0';
+      document.body.appendChild(textarea);
+      textarea.select();
+      document.execCommand('copy');
+      document.body.removeChild(textarea);
+    }
     _Message.success('复制成功');
   };
   useEffect(function () {

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

@@ -15,8 +15,8 @@ import { querySeal } from "../file-list/sealUtil";
 import { getGuideImg, getUrlById, onlinePreview } from "../../api";
 import { getFileExtension } from "./file.js";
 import "./index.scss";
-var SIGN = 1; // 签名
-var SEAL = 2; // 签章
+var SIGN = '1'; // 签名
+var SEAL = '2'; // 签章
 
 var SignFile = function SignFile(_ref) {
   var file = _ref.file,
@@ -69,6 +69,9 @@ var SignFile = function SignFile(_ref) {
   var _useState0 = useState(false),
     hasSigned = _useState0[0],
     setHasSigned = _useState0[1];
+  var _useState1 = useState(fileId),
+    currentFileId = _useState1[0],
+    setCurrentFileId = _useState1[1];
   var fileCopy = useRef(_extends({}, file));
 
   // 预览材料
@@ -78,7 +81,7 @@ var SignFile = function SignFile(_ref) {
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (fileId) {
+            if (currentFileId) {
               _context.next = 1;
               break;
             }
@@ -86,7 +89,7 @@ var SignFile = function SignFile(_ref) {
           case 1:
             _context.next = 2;
             return getUrlById({
-              id: fileId,
+              id: currentFileId,
               effectiveTime: 3600000
             }, {
               token: token,
@@ -411,6 +414,7 @@ var SignFile = function SignFile(_ref) {
   // 获取签批结果
   var getRes = function getRes(val) {
     console.log('signVal---', val);
+    setCurrentFileId(val.fileId);
     valChange(val);
     setHasSigned(true);
   };
@@ -423,17 +427,18 @@ var SignFile = function SignFile(_ref) {
       setSealedFile(val);
       sign(true);
     } else {
+      setCurrentFileId(val.fileId);
       valChange(val);
       setHasSigned(true);
     }
   };
   useEffect(function () {
-    if (fileId) {
-      getViewUrl(fileId).then(function (url) {
+    if (currentFileId) {
+      getViewUrl(currentFileId).then(function (url) {
         setThumbnail(url);
       });
     }
-  }, [fileId]);
+  }, [currentFileId]);
   return /*#__PURE__*/React.createElement(_Loading, {
     tip: '加载中...',
     fullScreen: true,

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

@@ -512,8 +512,11 @@ var FileItem = function FileItem(_ref) {
   // 获取签pi结果
   var getRes = function getRes(val) {
     console.log('val---', val);
+    if (val.signId) {
+      delete val.signId;
+    }
     valChange(val, fileIndex, index, subIndex);
-    invalidHandle();
+    // invalidHandle()
     needOtherSign && setShowSignerInfo(true);
   };
 
@@ -526,8 +529,11 @@ var FileItem = function FileItem(_ref) {
       setShowSignPageClose(false); // 签章完之后就不展示签批页面的关闭按钮了。防止用户误点击退出去
       sign();
     } else {
+      if (val.signId) {
+        delete val.signId;
+      }
       valChange(val, fileIndex, index, subIndex);
-      invalidHandle();
+      // invalidHandle()
       needOtherSign && setShowSignerInfo(true);
     }
   };
@@ -708,7 +714,7 @@ var FileItem = function FileItem(_ref) {
             }
             return _context6.abrupt("return");
           case 1:
-            invalidHandle();
+            // invalidHandle()
             valChange(undefined, fileIndex, index, subIndex);
           case 2:
           case "end":

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

@@ -61,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, fileObj, saveRes, id, workNo;
+      var i, item, fields, _i, _fields, field, val, fileObj, saveRes, id, workNo, taskHandleItem;
       return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -136,15 +136,16 @@ function SignerInfo(props) {
               file: fileObj,
               materialName: materialName,
               date: getCurrentTime(),
+              time: new Date(),
               initId: file.initId
             });
           case 6:
             saveRes = _context.sent;
             if (saveRes) {
-              id = saveRes.id, workNo = saveRes.workNo;
+              id = saveRes.id, workNo = saveRes.workNo, taskHandleItem = saveRes.taskHandleItem;
               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);
+              setUrl("https://zwfw.xzspglj.taiyuan.gov.cn/threeSign?id=" + id + "&draftNo=" + workNo + "&taskHandleItem=" + taskHandleItem);
               setShowQRcode(true);
             } else {
               _message["default"].warning('信息保存失败，请重试');
@@ -174,7 +175,19 @@ function SignerInfo(props) {
     setSignerInfoList(newList);
   };
   var onCopy = function onCopy() {
-    navigator.clipboard.writeText(url);
+    var _navigator$clipboard;
+    if ((_navigator$clipboard = navigator.clipboard) !== null && _navigator$clipboard !== void 0 && _navigator$clipboard.writeText) {
+      navigator.clipboard.writeText(url);
+    } else {
+      var textarea = document.createElement('textarea');
+      textarea.value = url;
+      textarea.style.position = 'fixed';
+      textarea.style.opacity = '0';
+      document.body.appendChild(textarea);
+      textarea.select();
+      document.execCommand('copy');
+      document.body.removeChild(textarea);
+    }
     _message["default"].success('复制成功');
   };
   (0, _react.useEffect)(function () {

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

@@ -21,8 +21,8 @@ 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); }
-var SIGN = 1; // 签名
-var SEAL = 2; // 签章
+var SIGN = '1'; // 签名
+var SEAL = '2'; // 签章
 
 var SignFile = function SignFile(_ref) {
   var file = _ref.file,
@@ -75,6 +75,9 @@ var SignFile = function SignFile(_ref) {
   var _useState0 = (0, _react.useState)(false),
     hasSigned = _useState0[0],
     setHasSigned = _useState0[1];
+  var _useState1 = (0, _react.useState)(fileId),
+    currentFileId = _useState1[0],
+    setCurrentFileId = _useState1[1];
   var fileCopy = (0, _react.useRef)((0, _extends2["default"])({}, file));
 
   // 预览材料
@@ -84,7 +87,7 @@ var SignFile = function SignFile(_ref) {
       return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (fileId) {
+            if (currentFileId) {
               _context.next = 1;
               break;
             }
@@ -92,7 +95,7 @@ var SignFile = function SignFile(_ref) {
           case 1:
             _context.next = 2;
             return (0, _api.getUrlById)({
-              id: fileId,
+              id: currentFileId,
               effectiveTime: 3600000
             }, {
               token: token,
@@ -417,6 +420,7 @@ var SignFile = function SignFile(_ref) {
   // 获取签批结果
   var getRes = function getRes(val) {
     console.log('signVal---', val);
+    setCurrentFileId(val.fileId);
     valChange(val);
     setHasSigned(true);
   };
@@ -429,17 +433,18 @@ var SignFile = function SignFile(_ref) {
       setSealedFile(val);
       sign(true);
     } else {
+      setCurrentFileId(val.fileId);
       valChange(val);
       setHasSigned(true);
     }
   };
   (0, _react.useEffect)(function () {
-    if (fileId) {
-      getViewUrl(fileId).then(function (url) {
+    if (currentFileId) {
+      getViewUrl(currentFileId).then(function (url) {
         setThumbnail(url);
       });
     }
-  }, [fileId]);
+  }, [currentFileId]);
   return /*#__PURE__*/_react["default"].createElement(_loading["default"], {
     tip: '加载中...',
     fullScreen: 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.136';
+    version = '0.1.138';
   }
   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.136';
+    version = '0.1.138';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/package.json

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