ydb-components-material 0.1.115 → 0.1.117

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

@@ -50,18 +50,77 @@ function SignerInfo(props) {
   };
   var next = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var saveRes;
+      var i, item, fields, _i, _fields, field, val, saveRes;
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            i = 0;
+          case 1:
+            if (!(i < signerInfoList.length)) {
+              _context.next = 5;
+              break;
+            }
+            item = signerInfoList[i];
+            fields = [{
+              label: '签署内容',
+              value: item.signContent
+            }];
+            if (item.signType === 0) {
+              // 个人：姓名、身份证号、手机号、签署内容
+              fields.push({
+                label: '姓名',
+                value: item.signerName
+              }, {
+                label: '身份证号',
+                value: item.signerCerNo
+              }, {
+                label: '手机号',
+                value: item.signerPhoneNum
+              });
+            } else {
+              // 企业：手机号、企业名称、统一社会信用代码、签署内容
+              fields.push({
+                label: '手机号',
+                value: item.signerPhoneNum
+              }, {
+                label: '企业名称',
+                value: item.signerCompany
+              }, {
+                label: '统一社会信用代码',
+                value: item.signerCertificateSno
+              });
+            }
+            _i = 0, _fields = fields;
+          case 2:
+            if (!(_i < _fields.length)) {
+              _context.next = 4;
+              break;
+            }
+            field = _fields[_i];
+            val = field.value;
+            if (!(val === undefined || val === null || val === '' || Array.isArray(val) && val.length === 0)) {
+              _context.next = 3;
+              break;
+            }
+            _Message.warning("\u7B7E\u7F72\u65B9" + (i + 1) + "\u7684\"" + field.label + "\"\u4E0D\u80FD\u4E3A\u7A7A");
+            return _context.abrupt("return");
+          case 3:
+            _i++;
+            _context.next = 2;
+            break;
+          case 4:
+            i++;
             _context.next = 1;
+            break;
+          case 5:
+            _context.next = 6;
             return saveSignerInfo({
               list: signerInfoList,
               file: file,
               materialName: materialName,
               date: getCurrentTime()
             });
-          case 1:
+          case 6:
             saveRes = _context.sent;
             if (saveRes) {
               setUrl("https://zwfw.xzspglj.taiyuan.gov.cn/threeSign?draftNo=" + saveRes);
@@ -69,7 +128,7 @@ function SignerInfo(props) {
             } else {
               _Message.warning('信息保存失败，请重试');
             }
-          case 2:
+          case 7:
           case "end":
             return _context.stop();
         }
@@ -121,7 +180,7 @@ function SignerInfo(props) {
     }
   }, [signerInfo]);
   useEffect(function () {
-    if (canvasRef.current) {
+    if (canvasRef.current && url) {
       var options = {
         width: 110,
         // 二维码的宽度
@@ -136,7 +195,7 @@ function SignerInfo(props) {
       };
       QRCode.toCanvas(canvasRef.current, url, options, function () {});
     }
-  }, [url]);
+  }, [url, showQRcode]);
   return /*#__PURE__*/React.createElement("div", {
     className: "signer-info-mask"
   }, !showQRcode && /*#__PURE__*/React.createElement("div", {

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

@@ -14,6 +14,9 @@ import SealPage from "../file-list/seal";
 import { getGuideImg, getUrlById, onlinePreview } from "../../api";
 import { getFileExtension } from "./file.js";
 import "./index.scss";
+var SIGN = 1; // 签名
+var SEAL = 2; // 签章
+
 var SignFile = function SignFile(_ref) {
   var file = _ref.file,
     userInfo = _ref.userInfo,
@@ -32,7 +35,8 @@ var SignFile = function SignFile(_ref) {
     fileType = file.fileType,
     signatureEnable = file.signatureEnable,
     signEnable = file.signEnable,
-    guideImg = file.signGuidFileId;
+    guideImg = file.signGuidFileId,
+    signContent = file.signContent;
   var _useState = useState(false),
     isShowSignPage = _useState[0],
     setIsShowSignPage = _useState[1];
@@ -289,6 +293,11 @@ var SignFile = function SignFile(_ref) {
 
   // 签章
   var seal = function seal() {
+    // 如果不需要签章 就直接去签字
+    if (!signContent.includes(SEAL)) {
+      sign();
+      return;
+    }
     console.log('fileType', fileType);
     var type = getFileExtension(fileName);
     if (type !== 'pdf') {

package/es/style.js

@@ -4,8 +4,8 @@ import '@alifd/next/es/radio/style';
 import '@alifd/next/es/checkbox/style';
 import '@alifd/next/es/balloon/style';
 import 'antd/es/cascader/style';
-import '@alifd/next/es/input/style';
 import '@alifd/next/es/dialog/style';
+import '@alifd/next/es/input/style';
 import '@alifd/next/es/loading/style';
 import '@alifd/next/es/button/style';
 import './index.scss';

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

@@ -18,6 +18,7 @@ export interface FileListProps {
     download: (value: any) => void;
     openLoading: () => void;
     closeLoading: () => void;
+    applySeal: () => void;
     valChange: (value: any) => void;
     saveSignerInfo: (value: any) => boolean;
     signInfoMap?: object;

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

@@ -53,6 +53,7 @@ var FileList = function FileList(_ref) {
     closeLoading = _ref.closeLoading,
     valChange = _ref.valChange,
     saveSignerInfo = _ref.saveSignerInfo,
+    applySeal = _ref.applySeal,
     signInfoMap = _ref.signInfoMap;
   var _useState = (0, _react.useState)(false),
     showMerge = _useState[0],
@@ -300,6 +301,7 @@ var FileList = function FileList(_ref) {
           signInfoMap: signInfoMap,
           disabled: disabled,
           download: download,
+          applySeal: applySeal,
           valChange: handleChange,
           openLoading: openLoading,
           closeLoading: closeLoading,
@@ -330,6 +332,7 @@ var FileList = function FileList(_ref) {
         isPC: isPC,
         disabled: disabled,
         download: download,
+        applySeal: applySeal,
         valChange: handleChange,
         openLoading: openLoading,
         closeLoading: closeLoading,

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

@@ -20,6 +20,7 @@ export interface FileItemProps {
     style?: object;
     signerInfo?: object;
     openLoading: () => void;
+    applySeal: () => void;
     closeLoading: () => void;
     valChange: (value: any, fileIndex: any, index: any, subIndex: any) => void;
     download: (value: any) => void;

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

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _dialog = _interopRequireDefault(require("@alifd/next/lib/dialog"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _extends3 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
@@ -24,6 +25,7 @@ var _sign = _interopRequireDefault(require("./sign"));
 var _seal = _interopRequireDefault(require("./seal"));
 var _api = require("../../api");
 var _file2 = require("./file.js");
+var _sealUtil = require("./sealUtil");
 var _checkPoint = _interopRequireDefault(require("./checkPoint"));
 var _signerInfo = _interopRequireDefault(require("./signerInfo"));
 require("./item.scss");
@@ -54,7 +56,8 @@ var FileItem = function FileItem(_ref) {
     openLoading = _ref.openLoading,
     closeLoading = _ref.closeLoading,
     saveSignerInfo = _ref.saveSignerInfo,
-    signInfoMap = _ref.signInfoMap;
+    signInfoMap = _ref.signInfoMap,
+    applySeal = _ref.applySeal;
   console.log('fileItem', file, maxFileSize);
   var fileName = file.fileName,
     fileUrl = file.fileUrl,
@@ -77,7 +80,10 @@ var FileItem = function FileItem(_ref) {
     _fileConfig$signSelfR = fileConfig.signSelfRole,
     signSelfRole = _fileConfig$signSelfR === void 0 ? [] : _fileConfig$signSelfR,
     _fileConfig$signAgent = fileConfig.signAgentRole,
-    signAgentRole = _fileConfig$signAgent === void 0 ? [] : _fileConfig$signAgent;
+    signAgentRole = _fileConfig$signAgent === void 0 ? [] : _fileConfig$signAgent,
+    sealKeywords = fileConfig.sealKeywords,
+    sealPosition = fileConfig.sealPosition,
+    sealContent = fileConfig.sealContent;
 
   // 解构默认值只对 undefined 生效，对 null 无效，手动兜底
   var safeSignatureSelfRole = signatureSelfRole !== null && signatureSelfRole !== void 0 ? signatureSelfRole : [];
@@ -147,6 +153,9 @@ var FileItem = function FileItem(_ref) {
   var _useState16 = (0, _react.useState)(false),
     showSignerInfo = _useState16[0],
     setShowSignerInfo = _useState16[1];
+  var _useState17 = (0, _react.useState)(true),
+    showSignPageClose = _useState17[0],
+    setShowSignPageClose = _useState17[1];
   var upload = function upload() {
     if (disabled) return;
     var inputEl = document.createElement('input');
@@ -327,20 +336,112 @@ var FileItem = function FileItem(_ref) {
 
   // 手写签批
   var sign = function sign() {
+    if (!signatureEnable) {
+      closeLoading();
+      return;
+    }
+    ;
     openLoading();
     setIsShowSignPage(true);
   };
 
   // 签章
-  var seal = function seal() {
-    var type = (0, _file2.getFileExtension)(fileName);
-    if (type !== 'pdf') {
-      _message["default"].notice('只有pdf文件才能使用电子签章');
-      return;
-    }
-    openLoading();
-    setIsShowSealPage(true);
-  };
+  var seal = /*#__PURE__*/function () {
+    var _ref4 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+      var type, sealList;
+      return _regenerator["default"].wrap(function (_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            type = (0, _file2.getFileExtension)(fileName);
+            if (!(type !== 'pdf')) {
+              _context3.next = 1;
+              break;
+            }
+            _message["default"].notice('只有pdf文件才能使用电子签章');
+            return _context3.abrupt("return");
+          case 1:
+            openLoading();
+            // 查询当前用户是否有电子签章
+            _context3.next = 2;
+            return (0, _sealUtil.querySeal)(userInfo, {
+              token: token,
+              tokenTY: tokenTY,
+              baseUrl: baseUrl,
+              env: env,
+              isPC: isPC,
+              accessToken: accessToken
+            });
+          case 2:
+            sealList = _context3.sent;
+            if (!(userInfo.corpType === 'C04')) {
+              _context3.next = 3;
+              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() {
+                  closeLoading();
+                }
+              });
+            } else {
+              // 无印章 → 对话框提示，可申请印章或跳过走签批
+              _dialog["default"].confirm({
+                title: '提示',
+                content: '经检测，本账户暂未申请企业印章，办理时可选择跳过签章流程完成签名；也可办好印章后再来办理此项业务',
+                footerAlign: 'center',
+                okProps: {
+                  children: '申请印章'
+                },
+                cancelProps: {
+                  children: '跳过签章'
+                },
+                onOk: function onOk() {
+                  applySeal();
+                },
+                onCancel: function onCancel() {
+                  sign();
+                },
+                onClose: function onClose() {
+                  closeLoading();
+                }
+              });
+            }
+            return _context3.abrupt("return");
+          case 3:
+            if (sealList.length) {
+              _context3.next = 4;
+              break;
+            }
+            _message["default"].error('该单位下暂无印章，请前往"山西政务服务网"或"三晋通"小程序申领印章');
+            return _context3.abrupt("return");
+          case 4:
+            setIsShowSealPage(true);
+          case 5:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+    return function seal() {
+      return _ref4.apply(this, arguments);
+    };
+  }();
   var signAndSeal = function signAndSeal() {
     // const notNeedSelfSign = !signatureSelfRole.includes(SELF) && !signatureAgentRole.includes(SELF) && !signSelfRole.includes(SELF) && !signAgentRole.includes(SELF)
     // // 如果不需要自己签署 只需要别人签署 就直接打开维护签署人信息
@@ -369,6 +470,7 @@ var FileItem = function FileItem(_ref) {
     // 如果还允许签批 就连住一起做了
     if (signatureEnable) {
       setSealedFile(val);
+      setShowSignPageClose(false); // 签章完之后就不展示签批页面的关闭按钮了。防止用户误点击退出去
       sign();
     } else {
       valChange(val, fileIndex, index, subIndex);
@@ -412,18 +514,18 @@ var FileItem = function FileItem(_ref) {
     queryFileLibs();
   };
   var showGuide = /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+    var _ref5 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
       var guideImgRes;
-      return _regenerator["default"].wrap(function (_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      return _regenerator["default"].wrap(function (_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             if (signGuidFileId) {
-              _context3.next = 1;
+              _context4.next = 1;
               break;
             }
-            return _context3.abrupt("return");
+            return _context4.abrupt("return");
           case 1:
-            _context3.next = 2;
+            _context4.next = 2;
             return (0, _api.getGuideImg)({
               id: signGuidFileId,
               effectiveTime: 3600000
@@ -436,26 +538,26 @@ var FileItem = function FileItem(_ref) {
               accessToken: accessToken
             });
           case 2:
-            guideImgRes = _context3.sent;
+            guideImgRes = _context4.sent;
             if (guideImgRes.presignedUrl) {
               setGuideurl(guideImgRes.presignedUrl);
               setIsShowGuide(true);
             }
           case 3:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3);
+      }, _callee4);
     }));
     return function showGuide() {
-      return _ref4.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
   var selectMaterialOk = /*#__PURE__*/function () {
-    var _ref5 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+    var _ref6 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5() {
       var selectedMaterial, arr, fileFormat, formatFinal, urlRes, m;
-      return _regenerator["default"].wrap(function (_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      return _regenerator["default"].wrap(function (_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
             console.log('val', materialId);
             console.log('materialLib==', materialLib);
@@ -464,7 +566,7 @@ var FileItem = function FileItem(_ref) {
             });
             console.log('selectedMaterial', selectedMaterial);
             if (!spec) {
-              _context4.next = 1;
+              _context5.next = 1;
               break;
             }
             arr = selectedMaterial.fileName.split('.'); //
@@ -473,24 +575,24 @@ var FileItem = function FileItem(_ref) {
             formatFinal = (0, _file2.initFormat)(spec); // 限制的文件类型
             console.log(formatFinal, '限制的格式最后');
             if (formatFinal.includes(fileFormat)) {
-              _context4.next = 1;
+              _context5.next = 1;
               break;
             }
             _message["default"].notice("\u8BE5\u6750\u6599\u4E0D\u652F\u6301\u4E0A\u4F20\u3010" + fileFormat + "\u3011\u683C\u5F0F\u7684\u6587\u4EF6");
-            return _context4.abrupt("return");
+            return _context5.abrupt("return");
           case 1:
             if (!(selectedMaterial.type === 1)) {
-              _context4.next = 2;
+              _context5.next = 2;
               break;
             }
             _message["default"].notice('该文件为旧文件, 请先下载后手动上传');
-            return _context4.abrupt("return");
+            return _context5.abrupt("return");
           case 2:
             if (selectedMaterial.innerFileUrl) {
-              _context4.next = 4;
+              _context5.next = 4;
               break;
             }
-            _context4.next = 3;
+            _context5.next = 3;
             return (0, _api.getUrlById)({
               id: selectedMaterial.fileId,
               effectiveTime: 3600000
@@ -503,7 +605,7 @@ var FileItem = function FileItem(_ref) {
               accessToken: accessToken
             });
           case 3:
-            urlRes = _context4.sent;
+            urlRes = _context5.sent;
             if (urlRes.presignedUrlList && urlRes.presignedUrlList.length > 0) {
               selectedMaterial.innerFileUrl = urlRes.presignedUrlList[2];
             }
@@ -516,12 +618,12 @@ var FileItem = function FileItem(_ref) {
             setIsShowMaterialLib(false);
           case 5:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4);
+      }, _callee5);
     }));
     return function selectMaterialOk() {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
   var onDownload = function onDownload() {
@@ -551,58 +653,58 @@ var FileItem = function FileItem(_ref) {
 
   // 获取缩略图
   var extractImageUrls = /*#__PURE__*/function () {
-    var _ref6 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(previewUrl) {
+    var _ref7 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6(previewUrl) {
       var response, htmlText, parser, doc, imgElements, srcList;
-      return _regenerator["default"].wrap(function (_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+      return _regenerator["default"].wrap(function (_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
-            _context5.next = 1;
+            _context6.next = 1;
             return fetch(previewUrl);
           case 1:
-            response = _context5.sent;
-            _context5.next = 2;
+            response = _context6.sent;
+            _context6.next = 2;
             return response.text();
           case 2:
-            htmlText = _context5.sent;
+            htmlText = _context6.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 _context5.abrupt("return", srcList);
+            return _context6.abrupt("return", srcList);
           case 3:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
-      }, _callee5);
+      }, _callee6);
     }));
     return function extractImageUrls(_x3) {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
 
   // 获取预览图片
   var getViewUrl = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6(id) {
+    var _ref8 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7(id) {
       var type, urlRes, res, list;
-      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:
             type = (0, _file2.getFileExtension)(fileName);
             if (!['png', 'jpg', 'jpeg'].includes(type)) {
-              _context6.next = 1;
+              _context7.next = 1;
               break;
             }
-            return _context6.abrupt("return", fileUrl);
+            return _context7.abrupt("return", fileUrl);
           case 1:
             if (!(type !== 'pdf')) {
-              _context6.next = 2;
+              _context7.next = 2;
               break;
             }
-            return _context6.abrupt("return", '');
+            return _context7.abrupt("return", '');
           case 2:
-            _context6.next = 3;
+            _context7.next = 3;
             return (0, _api.getUrlById)({
               id: id,
               effectiveTime: 3600000
@@ -615,13 +717,13 @@ var FileItem = function FileItem(_ref) {
               accessToken: accessToken
             });
           case 3:
-            urlRes = _context6.sent;
+            urlRes = _context7.sent;
             if (!(urlRes.presignedUrlList && urlRes.presignedUrlList.length > 0)) {
-              _context6.next = 6;
+              _context7.next = 6;
               break;
             }
             console.log('urlRes', urlRes);
-            _context6.next = 4;
+            _context7.next = 4;
             return (0, _api.onlinePreview)({
               url: urlRes.presignedUrlList[2]
             }, {
@@ -633,21 +735,21 @@ var FileItem = function FileItem(_ref) {
               accessToken: accessToken
             });
           case 4:
-            res = _context6.sent;
-            _context6.next = 5;
+            res = _context7.sent;
+            _context7.next = 5;
             return extractImageUrls(res.url);
           case 5:
-            list = _context6.sent;
+            list = _context7.sent;
             console.log('list---', list);
-            return _context6.abrupt("return", list[0]);
+            return _context7.abrupt("return", list[0]);
           case 6:
           case "end":
-            return _context6.stop();
+            return _context7.stop();
         }
-      }, _callee6);
+      }, _callee7);
     }));
     return function getViewUrl(_x4) {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
   (0, _react.useEffect)(function () {
@@ -848,7 +950,8 @@ var FileItem = function FileItem(_ref) {
     handleClose: function handleClose() {
       return setIsShowSignPage(false);
     },
-    closeLoading: closeLoading
+    closeLoading: closeLoading,
+    showClose: showSignPageClose
   }), isShowSealPage && /*#__PURE__*/_react["default"].createElement(_seal["default"], {
     isShowSealPage: isShowSealPage,
     userInfo: userInfo,
@@ -863,7 +966,12 @@ var FileItem = function FileItem(_ref) {
     handleClose: function handleClose() {
       return setIsShowSealPage(false);
     },
-    closeLoading: closeLoading
+    closeLoading: closeLoading,
+    sealConfig: {
+      sealKeywords: sealKeywords,
+      sealPosition: sealPosition,
+      sealContent: sealContent
+    }
   }), isShowPreview && /*#__PURE__*/_react["default"].createElement("div", {
     className: "preview"
   }, /*#__PURE__*/_react["default"].createElement("img", {

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

@@ -24,6 +24,8 @@ function SealPage(props) {
     isPC = props.isPC,
     accessToken = props.accessToken,
     closeLoading = props.closeLoading,
+    _props$sealConfig = props.sealConfig,
+    sealConfig = _props$sealConfig === void 0 ? {} : _props$sealConfig,
     _props$showClose = props.showClose,
     showClose = _props$showClose === void 0 ? true : _props$showClose;
   var _useState = (0, _react.useState)(''),
@@ -49,7 +51,7 @@ function SealPage(props) {
             }
             // 传递配置参数给工具函数
             _context.next = 1;
-            return (0, _sealUtil.initSealPageMethod)(fileObj, userInfo, {
+            return (0, _sealUtil.initSealPageMethod)(fileObj, userInfo, sealConfig, {
               tokenTY: tokenTY,
               baseUrl: baseUrl,
               env: env,