ydb-components-material 0.1.140 → 0.1.141

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

@@ -15,6 +15,8 @@ export interface FileListProps {
     isPC?: boolean;
     disabled?: boolean;
     style?: object;
+    parentPageUrl?: string;
+    toSign?: (url: string) => void;
     download: (value: any) => void;
     openLoading: () => void;
     closeLoading: () => void;

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

@@ -48,7 +48,9 @@ var FileList = function FileList(_ref) {
     valChange = _ref.valChange,
     saveSignerInfo = _ref.saveSignerInfo,
     applySeal = _ref.applySeal,
-    signInfoMap = _ref.signInfoMap;
+    signInfoMap = _ref.signInfoMap,
+    parentPageUrl = _ref.parentPageUrl,
+    toSign = _ref.toSign;
   var _useState = useState(fileList),
     fileArray = _useState[0],
     setFileArray = _useState[1];
@@ -316,6 +318,8 @@ var FileList = function FileList(_ref) {
           valChange: handleChange,
           openLoading: openLoading,
           closeLoading: closeLoading,
+          parentPageUrl: parentPageUrl,
+          toSign: toSign,
           saveSignerInfo: saveSignerInfo,
           style: {
             marginBottom: '12px'
@@ -343,12 +347,14 @@ var FileList = function FileList(_ref) {
         baseUrl: baseUrl,
         env: env,
         isPC: isPC,
+        toSign: toSign,
         disabled: disabled,
         download: download,
         applySeal: applySeal,
         valChange: handleChange,
         openLoading: openLoading,
         closeLoading: closeLoading,
+        parentPageUrl: parentPageUrl,
         saveSignerInfo: saveSignerInfo,
         style: {
           marginBottom: '12px'

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

@@ -20,6 +20,8 @@ export interface FileItemProps {
     style?: object;
     signerInfo?: object;
     fileList: Array<object>;
+    parentPageUrl?: string;
+    toSign?: (url: string) => void;
     openLoading: () => void;
     applySeal: () => void;
     closeLoading: () => void;

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

@@ -53,7 +53,9 @@ var FileItem = function FileItem(_ref) {
     closeLoading = _ref.closeLoading,
     saveSignerInfo = _ref.saveSignerInfo,
     signInfoMap = _ref.signInfoMap,
-    applySeal = _ref.applySeal;
+    applySeal = _ref.applySeal,
+    parentPageUrl = _ref.parentPageUrl,
+    toSign = _ref.toSign;
   console.log('fileItem', file, maxFileSize);
   var fileName = file.fileName,
     fileUrl = file.fileUrl,
@@ -1113,6 +1115,8 @@ var FileItem = function FileItem(_ref) {
     userInfo: userInfo,
     file: sealedFile || file,
     fileList: fileList,
+    parentPageUrl: parentPageUrl,
+    toSign: toSign,
     token: token,
     tokenTY: tokenTY,
     baseUrl: baseUrl,

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

@@ -8,6 +8,8 @@ function SignPage(props) {
     file = props.file,
     handleClose = props.handleClose,
     fileList = props.fileList,
+    parentPageUrl = props.parentPageUrl,
+    toSign = props.toSign,
     token = props.token,
     tokenTY = props.tokenTY,
     baseUrl = props.baseUrl,
@@ -36,13 +38,16 @@ function SignPage(props) {
               baseUrl: baseUrl,
               env: env,
               isPC: isPC,
-              fileList: fileList
+              fileList: fileList,
+              parentPageUrl: parentPageUrl
             });
           case 1:
             res = _context.sent;
             pageUrl = res.pageUrl;
             closeLoading();
-            window.location.href = pageUrl;
+            if (toSign) {
+              toSign(pageUrl);
+            }
             console.log(res);
           case 2:
           case "end":

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

@@ -212,8 +212,8 @@ function getContractSignUrl(contractIdVal, userInfo, config) {
   });
 }
 
-// 拼接回调页面的参数
-function getCallbackPageUrl(fileName, tokenTY, fileId, fileUrl) {
+// 保存签批信息
+function setSignInfo(fileName, tokenTY, fileId, fileUrl) {
   sessionStorage.setItem(tokenTY, JSON.stringify({
     contractId: contractId,
     documentId: documentId,
@@ -221,7 +221,6 @@ function getCallbackPageUrl(fileName, tokenTY, fileId, fileUrl) {
     fileId: fileId,
     fileUrl: fileUrl
   }));
-  return window.location.href;
 }
 
 // 【第 4 步】获取签 pi 页面
@@ -250,7 +249,7 @@ function getSignUrl(userInfo, config, fileName, fileId, fileUrl) {
     autoClosePage: true,
     // 操作完成自动关闭页面
     language: 'ZH_CN',
-    callbackPage: getCallbackPageUrl(fileName, config.tokenTY, fileId, fileUrl),
+    callbackPage: config.parentPageUrl,
     deviceType: config.isPC || 'H5' // 取值范围：PC（返回 PC 页面），H5（返回 H5 页面）；不传值默认为：根据请求的 UserAgent 自动判断返回的页面类型。
   };
   return new Promise(function (resolve) {
@@ -258,6 +257,7 @@ function getSignUrl(userInfo, config, fileName, fileId, fileUrl) {
       console.log(res, '页面结果');
       if (res.data.code == 0) {
         if (config.fileList) {
+          setSignInfo(fileName, config.tokenTY, fileId, fileUrl);
           localStorage.setItem(config.tokenTY, JSON.stringify(config.fileList));
         }
         resolve(res.data.signUrl);

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

@@ -15,6 +15,8 @@ export interface FileListProps {
     isPC?: boolean;
     disabled?: boolean;
     style?: object;
+    parentPageUrl?: string;
+    toSign?: (url: string) => void;
     download: (value: any) => void;
     openLoading: () => void;
     closeLoading: () => void;

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

@@ -54,7 +54,9 @@ var FileList = function FileList(_ref) {
     valChange = _ref.valChange,
     saveSignerInfo = _ref.saveSignerInfo,
     applySeal = _ref.applySeal,
-    signInfoMap = _ref.signInfoMap;
+    signInfoMap = _ref.signInfoMap,
+    parentPageUrl = _ref.parentPageUrl,
+    toSign = _ref.toSign;
   var _useState = (0, _react.useState)(fileList),
     fileArray = _useState[0],
     setFileArray = _useState[1];
@@ -322,6 +324,8 @@ var FileList = function FileList(_ref) {
           valChange: handleChange,
           openLoading: openLoading,
           closeLoading: closeLoading,
+          parentPageUrl: parentPageUrl,
+          toSign: toSign,
           saveSignerInfo: saveSignerInfo,
           style: {
             marginBottom: '12px'
@@ -349,12 +353,14 @@ var FileList = function FileList(_ref) {
         baseUrl: baseUrl,
         env: env,
         isPC: isPC,
+        toSign: toSign,
         disabled: disabled,
         download: download,
         applySeal: applySeal,
         valChange: handleChange,
         openLoading: openLoading,
         closeLoading: closeLoading,
+        parentPageUrl: parentPageUrl,
         saveSignerInfo: saveSignerInfo,
         style: {
           marginBottom: '12px'

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

@@ -20,6 +20,8 @@ export interface FileItemProps {
     style?: object;
     signerInfo?: object;
     fileList: Array<object>;
+    parentPageUrl?: string;
+    toSign?: (url: string) => void;
     openLoading: () => void;
     applySeal: () => void;
     closeLoading: () => void;

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

@@ -59,7 +59,9 @@ var FileItem = function FileItem(_ref) {
     closeLoading = _ref.closeLoading,
     saveSignerInfo = _ref.saveSignerInfo,
     signInfoMap = _ref.signInfoMap,
-    applySeal = _ref.applySeal;
+    applySeal = _ref.applySeal,
+    parentPageUrl = _ref.parentPageUrl,
+    toSign = _ref.toSign;
   console.log('fileItem', file, maxFileSize);
   var fileName = file.fileName,
     fileUrl = file.fileUrl,
@@ -1119,6 +1121,8 @@ var FileItem = function FileItem(_ref) {
     userInfo: userInfo,
     file: sealedFile || file,
     fileList: fileList,
+    parentPageUrl: parentPageUrl,
+    toSign: toSign,
     token: token,
     tokenTY: tokenTY,
     baseUrl: baseUrl,

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

@@ -14,6 +14,8 @@ function SignPage(props) {
     file = props.file,
     handleClose = props.handleClose,
     fileList = props.fileList,
+    parentPageUrl = props.parentPageUrl,
+    toSign = props.toSign,
     token = props.token,
     tokenTY = props.tokenTY,
     baseUrl = props.baseUrl,
@@ -42,13 +44,16 @@ function SignPage(props) {
               baseUrl: baseUrl,
               env: env,
               isPC: isPC,
-              fileList: fileList
+              fileList: fileList,
+              parentPageUrl: parentPageUrl
             });
           case 1:
             res = _context.sent;
             pageUrl = res.pageUrl;
             closeLoading();
-            window.location.href = pageUrl;
+            if (toSign) {
+              toSign(pageUrl);
+            }
             console.log(res);
           case 2:
           case "end":

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

@@ -216,8 +216,8 @@ function getContractSignUrl(contractIdVal, userInfo, config) {
   });
 }
 
-// 拼接回调页面的参数
-function getCallbackPageUrl(fileName, tokenTY, fileId, fileUrl) {
+// 保存签批信息
+function setSignInfo(fileName, tokenTY, fileId, fileUrl) {
   sessionStorage.setItem(tokenTY, JSON.stringify({
     contractId: contractId,
     documentId: documentId,
@@ -225,7 +225,6 @@ function getCallbackPageUrl(fileName, tokenTY, fileId, fileUrl) {
     fileId: fileId,
     fileUrl: fileUrl
   }));
-  return window.location.href;
 }
 
 // 【第 4 步】获取签 pi 页面
@@ -254,7 +253,7 @@ function getSignUrl(userInfo, config, fileName, fileId, fileUrl) {
     autoClosePage: true,
     // 操作完成自动关闭页面
     language: 'ZH_CN',
-    callbackPage: getCallbackPageUrl(fileName, config.tokenTY, fileId, fileUrl),
+    callbackPage: config.parentPageUrl,
     deviceType: config.isPC || 'H5' // 取值范围：PC（返回 PC 页面），H5（返回 H5 页面）；不传值默认为：根据请求的 UserAgent 自动判断返回的页面类型。
   };
   return new Promise(function (resolve) {
@@ -262,6 +261,7 @@ function getSignUrl(userInfo, config, fileName, fileId, fileUrl) {
       console.log(res, '页面结果');
       if (res.data.code == 0) {
         if (config.fileList) {
+          setSignInfo(fileName, config.tokenTY, fileId, fileUrl);
           localStorage.setItem(config.tokenTY, JSON.stringify(config.fileList));
         }
         resolve(res.data.signUrl);

package/lowcode/file-list/meta.ts

@@ -117,6 +117,21 @@ const FileListMeta: IPublicTypeComponentMetadata = {
           "initialValue": ""
         }
       },
+      {
+        "title": {
+          "label": {
+            "type": "i18n",
+            "en-US": "parentPageUrl",
+            "zh-CN": "parentPageUrl"
+          }
+        },
+        "name": "parentPageUrl",
+        "setter": {
+          "componentName": "StringSetter",
+          "isRequired": true,
+          "initialValue": ""
+        }
+      },
       {
         "title": {
           "label": {
@@ -245,6 +260,20 @@ const FileListMeta: IPublicTypeComponentMetadata = {
           "isRequired": true
         }
       },
+      {
+        "title": {
+          "label": {
+            "type": "i18n",
+            "en-US": "toSign",
+            "zh-CN": "toSign"
+          }
+        },
+        "name": "toSign",
+        "setter": {
+          "componentName": "FunctionSetter",
+          "isRequired": true
+        }
+      },
       {
         "title": {
           "label": {

package/lowcode_es/file-list/meta.js

@@ -110,6 +110,20 @@ var FileListMeta = {
         "isRequired": true,
         "initialValue": ""
       }
+    }, {
+      "title": {
+        "label": {
+          "type": "i18n",
+          "en-US": "parentPageUrl",
+          "zh-CN": "parentPageUrl"
+        }
+      },
+      "name": "parentPageUrl",
+      "setter": {
+        "componentName": "StringSetter",
+        "isRequired": true,
+        "initialValue": ""
+      }
     }, {
       "title": {
         "label": {
@@ -230,6 +244,19 @@ var FileListMeta = {
         "componentName": "FunctionSetter",
         "isRequired": true
       }
+    }, {
+      "title": {
+        "label": {
+          "type": "i18n",
+          "en-US": "toSign",
+          "zh-CN": "toSign"
+        }
+      },
+      "name": "toSign",
+      "setter": {
+        "componentName": "FunctionSetter",
+        "isRequired": true
+      }
     }, {
       "title": {
         "label": {

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

package/lowcode_lib/file-list/meta.js

@@ -115,6 +115,20 @@ var FileListMeta = {
         "isRequired": true,
         "initialValue": ""
       }
+    }, {
+      "title": {
+        "label": {
+          "type": "i18n",
+          "en-US": "parentPageUrl",
+          "zh-CN": "parentPageUrl"
+        }
+      },
+      "name": "parentPageUrl",
+      "setter": {
+        "componentName": "StringSetter",
+        "isRequired": true,
+        "initialValue": ""
+      }
     }, {
       "title": {
         "label": {
@@ -235,6 +249,19 @@ var FileListMeta = {
         "componentName": "FunctionSetter",
         "isRequired": true
       }
+    }, {
+      "title": {
+        "label": {
+          "type": "i18n",
+          "en-US": "toSign",
+          "zh-CN": "toSign"
+        }
+      },
+      "name": "toSign",
+      "setter": {
+        "componentName": "FunctionSetter",
+        "isRequired": true
+      }
     }, {
       "title": {
         "label": {

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

package/package.json

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