ydb-components-material 0.1.97 → 0.1.98

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

@@ -1,4 +1,5 @@
 import _Balloon from "@alifd/next/es/balloon";
+import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import { useState } from 'react';
 import { getFileExtension } from "./file.js";
@@ -216,7 +217,9 @@ var FileList = function FileList(_ref) {
   };
   return /*#__PURE__*/React.createElement("div", {
     className: "file_list",
-    style: style
+    style: _extends({}, style, {
+      width: '100%'
+    })
   }, fileList.map(function (item, index) {
     return /*#__PURE__*/React.createElement("div", {
       className: "file_level_one"

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

@@ -4,7 +4,7 @@
     color: #1678FF;
     font-size: 13px;
     border-radius: 4px;
-    padding: 0px 3px;
+    padding: 2px 3px;
     margin-left: 5px;
   }
   .file_level_one {

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

@@ -105,7 +105,9 @@ var FileItem = function FileItem(_ref) {
   var _useState14 = useState(''),
     thumbnail = _useState14[0],
     setThumbnail = _useState14[1]; // 缩略图
-
+  var _useState15 = useState(),
+    sealedFile = _useState15[0],
+    setSealedFile = _useState15[1];
   var upload = function upload() {
     if (disabled) return;
     var inputEl = document.createElement('input');
@@ -312,10 +314,12 @@ var FileItem = function FileItem(_ref) {
   // 获取签章结果
   var getSealRes = function getSealRes(val) {
     console.log('sealval---', val);
-    valChange(val, fileIndex, index, subIndex);
     // 如果还允许签批 就连住一起做了
     if (signatureEnable) {
+      setSealedFile(val);
       sign();
+    } else {
+      valChange(val, fileIndex, index, subIndex);
     }
   };
   var queryFileLibs = function queryFileLibs() {
@@ -666,9 +670,11 @@ var FileItem = function FileItem(_ref) {
     className: "blocks"
   }, /*#__PURE__*/React.createElement("div", {
     className: "status"
-  }, isSigned && /*#__PURE__*/React.createElement("div", {
+  }, isSigned && isSealed && /*#__PURE__*/React.createElement("div", {
     className: "status_item"
-  }, "\u5DF2\u7B7E\u6279"), isSealed && /*#__PURE__*/React.createElement("div", {
+  }, "\u5DF2\u7B7E\u7F72"), isSigned && !isSealed && /*#__PURE__*/React.createElement("div", {
+    className: "status_item"
+  }, "\u5DF2\u7B7E\u6279"), isSealed && !isSigned && /*#__PURE__*/React.createElement("div", {
     className: "status_item"
   }, "\u5DF2\u7B7E\u7AE0")), fileUrl && /*#__PURE__*/React.createElement("div", {
     className: "btns"
@@ -707,10 +713,10 @@ var FileItem = function FileItem(_ref) {
   }, isSigned && isSealed ? '重新签署' : '签署文件'), !(userInfo.acctType === '20' && signEnable) && signatureEnable && /*#__PURE__*/React.createElement("div", {
     className: "operation_btn",
     onClick: sign
-  }, isSigned ? '重新签批' : '手写签批'), !signatureEnable && userInfo.acctType === '20' && signEnable && /*#__PURE__*/React.createElement("div", {
+  }, isSigned ? '重新签批' : '签署文件'), !signatureEnable && userInfo.acctType === '20' && signEnable && /*#__PURE__*/React.createElement("div", {
     className: "operation_btn",
     onClick: seal
-  }, isSealed ? '重新签章' : '电子签章')) :
+  }, isSealed ? '重新签章' : '签署文件')) :
   // 展示材料库
   !isShareFile && !isSmart && !disabled && !!materialLib.length && /*#__PURE__*/React.createElement("div", {
     className: "operation_btn",
@@ -785,7 +791,7 @@ var FileItem = function FileItem(_ref) {
   }, "\u786E\u5B9A")))), isShowSignPage && /*#__PURE__*/React.createElement(SignPage, {
     isShowSignPage: isShowSignPage,
     userInfo: userInfo,
-    file: file,
+    file: sealedFile || file,
     token: token,
     tokenTY: tokenTY,
     baseUrl: baseUrl,

package/es/components/file-list/merge.scss

@@ -5,7 +5,7 @@
   width: 100%;
   height: 100%;
   background: #F7F7F7;
-  z-index: 9999;
+  z-index: 9;
   .tip {
     background: #FFF6E8;
     padding: 12px;

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

@@ -56,7 +56,7 @@ function _initSealPageMethod() {
           return _context.abrupt("return", false);
         case 6:
           _context.next = 7;
-          return getMobilePageFun(orderId, config);
+          return getMobilePageFun(orderId, config, fileObj, fileUrl);
         case 7:
           pageUrl = _context.sent;
           // 将 电子签章地址/文件名称 返回
@@ -211,7 +211,7 @@ function getSignOrderId(sealList, fileObj, esusFileUrl, userInfo, config) {
 }
 
 // [第 4 步 - 移动端] 获取电子印章页面
-function getMobilePageFun(orderId, config) {
+function getMobilePageFun(orderId, config, fileObj, fileUrl) {
   // uni.showLoading({ title: '获取移动端签章页面中' })
   var params = {
     accessToken: config.accessToken,
@@ -220,7 +220,13 @@ function getMobilePageFun(orderId, config) {
   };
   return new Promise(function (resolve) {
     if (config.isPC) {
-      getPcSealUrlApi(params, config).then(function (res) {
+      var paramsForPc = {
+        accessToken: config.accessToken,
+        acctType: '20',
+        docURL: fileUrl,
+        name: fileObj.fileName
+      };
+      getPcSealUrlApi(paramsForPc, config).then(function (res) {
         console.log('签章页面 pc----', res);
         if (res.code === 200) {
           resolve(res.data);

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

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 var _balloon = _interopRequireDefault(require("@alifd/next/lib/balloon"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
 var _file = require("./file.js");
 var _merge = _interopRequireDefault(require("./merge"));
@@ -221,7 +222,9 @@ var FileList = function FileList(_ref) {
   };
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "file_list",
-    style: style
+    style: (0, _extends2["default"])({}, style, {
+      width: '100%'
+    })
   }, fileList.map(function (item, index) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "file_level_one"

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

@@ -4,7 +4,7 @@
     color: #1678FF;
     font-size: 13px;
     border-radius: 4px;
-    padding: 0px 3px;
+    padding: 2px 3px;
     margin-left: 5px;
   }
   .file_level_one {

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

@@ -111,7 +111,9 @@ var FileItem = function FileItem(_ref) {
   var _useState14 = (0, _react.useState)(''),
     thumbnail = _useState14[0],
     setThumbnail = _useState14[1]; // 缩略图
-
+  var _useState15 = (0, _react.useState)(),
+    sealedFile = _useState15[0],
+    setSealedFile = _useState15[1];
   var upload = function upload() {
     if (disabled) return;
     var inputEl = document.createElement('input');
@@ -318,10 +320,12 @@ var FileItem = function FileItem(_ref) {
   // 获取签章结果
   var getSealRes = function getSealRes(val) {
     console.log('sealval---', val);
-    valChange(val, fileIndex, index, subIndex);
     // 如果还允许签批 就连住一起做了
     if (signatureEnable) {
+      setSealedFile(val);
       sign();
+    } else {
+      valChange(val, fileIndex, index, subIndex);
     }
   };
   var queryFileLibs = function queryFileLibs() {
@@ -672,9 +676,11 @@ var FileItem = function FileItem(_ref) {
     className: "blocks"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "status"
-  }, isSigned && /*#__PURE__*/_react["default"].createElement("div", {
+  }, isSigned && isSealed && /*#__PURE__*/_react["default"].createElement("div", {
     className: "status_item"
-  }, "\u5DF2\u7B7E\u6279"), isSealed && /*#__PURE__*/_react["default"].createElement("div", {
+  }, "\u5DF2\u7B7E\u7F72"), isSigned && !isSealed && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "status_item"
+  }, "\u5DF2\u7B7E\u6279"), isSealed && !isSigned && /*#__PURE__*/_react["default"].createElement("div", {
     className: "status_item"
   }, "\u5DF2\u7B7E\u7AE0")), fileUrl && /*#__PURE__*/_react["default"].createElement("div", {
     className: "btns"
@@ -713,10 +719,10 @@ var FileItem = function FileItem(_ref) {
   }, isSigned && isSealed ? '重新签署' : '签署文件'), !(userInfo.acctType === '20' && signEnable) && signatureEnable && /*#__PURE__*/_react["default"].createElement("div", {
     className: "operation_btn",
     onClick: sign
-  }, isSigned ? '重新签批' : '手写签批'), !signatureEnable && userInfo.acctType === '20' && signEnable && /*#__PURE__*/_react["default"].createElement("div", {
+  }, isSigned ? '重新签批' : '签署文件'), !signatureEnable && userInfo.acctType === '20' && signEnable && /*#__PURE__*/_react["default"].createElement("div", {
     className: "operation_btn",
     onClick: seal
-  }, isSealed ? '重新签章' : '电子签章')) :
+  }, isSealed ? '重新签章' : '签署文件')) :
   // 展示材料库
   !isShareFile && !isSmart && !disabled && !!materialLib.length && /*#__PURE__*/_react["default"].createElement("div", {
     className: "operation_btn",
@@ -791,7 +797,7 @@ var FileItem = function FileItem(_ref) {
   }, "\u786E\u5B9A")))), isShowSignPage && /*#__PURE__*/_react["default"].createElement(_sign["default"], {
     isShowSignPage: isShowSignPage,
     userInfo: userInfo,
-    file: file,
+    file: sealedFile || file,
     token: token,
     tokenTY: tokenTY,
     baseUrl: baseUrl,

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

@@ -5,7 +5,7 @@
   width: 100%;
   height: 100%;
   background: #F7F7F7;
-  z-index: 9999;
+  z-index: 9;
   .tip {
     background: #FFF6E8;
     padding: 12px;

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

@@ -58,7 +58,7 @@ function _initSealPageMethod() {
           return _context.abrupt("return", false);
         case 6:
           _context.next = 7;
-          return getMobilePageFun(orderId, config);
+          return getMobilePageFun(orderId, config, fileObj, fileUrl);
         case 7:
           pageUrl = _context.sent;
           // 将 电子签章地址/文件名称 返回
@@ -213,7 +213,7 @@ function getSignOrderId(sealList, fileObj, esusFileUrl, userInfo, config) {
 }
 
 // [第 4 步 - 移动端] 获取电子印章页面
-function getMobilePageFun(orderId, config) {
+function getMobilePageFun(orderId, config, fileObj, fileUrl) {
   // uni.showLoading({ title: '获取移动端签章页面中' })
   var params = {
     accessToken: config.accessToken,
@@ -222,7 +222,13 @@ function getMobilePageFun(orderId, config) {
   };
   return new Promise(function (resolve) {
     if (config.isPC) {
-      (0, _api.getPcSealUrlApi)(params, config).then(function (res) {
+      var paramsForPc = {
+        accessToken: config.accessToken,
+        acctType: '20',
+        docURL: fileUrl,
+        name: fileObj.fileName
+      };
+      (0, _api.getPcSealUrlApi)(paramsForPc, config).then(function (res) {
         console.log('签章页面 pc----', res);
         if (res.code === 200) {
           resolve(res.data);

package/lowcode_es/meta.js

@@ -94,7 +94,7 @@ function fillRealVersion(meta, packageName, version, basicLibraryVersion) {
     packageName = 'ydb-components-material';
   }
   if (version === void 0) {
-    version = '0.1.97';
+    version = '0.1.98';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/lowcode_lib/meta.js

@@ -99,7 +99,7 @@ function fillRealVersion(meta, packageName, version, basicLibraryVersion) {
     packageName = 'ydb-components-material';
   }
   if (version === void 0) {
-    version = '0.1.97';
+    version = '0.1.98';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ydb-components-material",
-  "version": "0.1.97",
+  "version": "0.1.98",
   "description": "ydb-components-material",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -100,10 +100,10 @@
   },
   "componentConfig": {
     "isComponentLibrary": true,
-    "materialSchema": "https://unpkg.com/ydb-components-material@0.1.97/build/lowcode/assets-prod.json"
+    "materialSchema": "https://unpkg.com/ydb-components-material@0.1.98/build/lowcode/assets-prod.json"
   },
   "lcMeta": {
     "type": "component"
   },
-  "homepage": "https://unpkg.com/ydb-components-material@0.1.97/build/index.html"
+  "homepage": "https://unpkg.com/ydb-components-material@0.1.98/build/index.html"
 }