ydb-components-material 0.1.93 → 0.1.95

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

@@ -15,6 +15,8 @@ export interface FileListProps {
     disabled?: boolean;
     style?: object;
     download: (value: any) => void;
+    openLoading: () => void;
+    closeLoading: () => void;
     valChange: (value: any) => void;
 }
 declare const FileList: React.FC<FileListProps>;

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

@@ -38,9 +38,10 @@ var FileList = function FileList(_ref) {
     env = _ref.env,
     isPC = _ref.isPC,
     disabled = _ref.disabled,
-    isShowLib = _ref.isShowLib,
     style = _ref.style,
     download = _ref.download,
+    openLoading = _ref.openLoading,
+    closeLoading = _ref.closeLoading,
     valChange = _ref.valChange;
   var convertNumbersToChinese = function convertNumbersToChinese(str) {
     // 定义基础映射关系
@@ -224,6 +225,8 @@ var FileList = function FileList(_ref) {
           disabled: disabled,
           download: download,
           valChange: handleChange,
+          openLoading: openLoading,
+          closeLoading: closeLoading,
           style: {
             marginBottom: '12px'
           }
@@ -239,7 +242,6 @@ var FileList = function FileList(_ref) {
         fileConfig: item,
         maxFileSize: item.materialSize,
         spec: item.materialSpec,
-        isShowLib: isShowLib,
         userInfo: userInfo,
         token: token,
         tokenTY: tokenTY,
@@ -250,6 +252,8 @@ var FileList = function FileList(_ref) {
         disabled: disabled,
         download: download,
         valChange: handleChange,
+        openLoading: openLoading,
+        closeLoading: closeLoading,
         style: {
           marginBottom: '12px'
         }

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

@@ -16,10 +16,10 @@ export interface FileItemProps {
     maxFileSize: number;
     spec: string;
     isInValid: boolean;
-    isShowLib: boolean;
     userInfo: object;
     style?: object;
-    del: () => void;
+    openLoading: () => void;
+    closeLoading: () => void;
     valChange: (value: any, fileIndex: any, index: any, subIndex: any) => void;
     download: (value: any) => void;
 }

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

@@ -30,7 +30,6 @@ var FileItem = function FileItem(_ref) {
     fileConfig = _ref.fileConfig,
     maxFileSize = _ref.maxFileSize,
     spec = _ref.spec,
-    isShowLib = _ref.isShowLib,
     userInfo = _ref.userInfo,
     token = _ref.token,
     tokenTY = _ref.tokenTY,
@@ -41,7 +40,9 @@ var FileItem = function FileItem(_ref) {
     disabled = _ref.disabled,
     style = _ref.style,
     valChange = _ref.valChange,
-    download = _ref.download;
+    download = _ref.download,
+    openLoading = _ref.openLoading,
+    closeLoading = _ref.closeLoading;
   console.log('fileItem', file, maxFileSize);
   var fileName = file.fileName,
     fileUrl = file.fileUrl,
@@ -53,7 +54,9 @@ var FileItem = function FileItem(_ref) {
     signEnable = fileConfig.signEnable,
     isInValid = fileConfig.isInValid,
     signGuidFileId = fileConfig.signGuidFileId,
-    keyPoint = fileConfig.keyPoint;
+    keyPoint = fileConfig.keyPoint,
+    isSmart = fileConfig.isSmart,
+    isShareFile = fileConfig.isShareFile;
   var _useState = useState(false),
     isShowMaterialLib = _useState[0],
     setIsShowMaterialLib = _useState[1];
@@ -128,6 +131,7 @@ var FileItem = function FileItem(_ref) {
       var formData = new FormData();
       formData.append('file', fileData);
       formData.append('open', true);
+      openLoading();
       fetch(baseUrl + "/declaration/material/file/files/api", {
         method: 'POST',
         body: formData,
@@ -144,6 +148,7 @@ var FileItem = function FileItem(_ref) {
             fileName: fileData.name,
             fileType: fileData.type
           }), fileIndex, index, subIndex);
+          closeLoading();
           _Message.notice('上传成功');
         } else {
           _Message.error('上传失败，请重试');
@@ -157,11 +162,10 @@ var FileItem = function FileItem(_ref) {
   // 预览材料
   var preview = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var fileUrl, fileId, urlRes, res;
+      var urlRes, res;
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            fileUrl = file.fileUrl, fileId = file.fileId;
             if (fileUrl) {
               _context.next = 1;
               break;
@@ -286,15 +290,13 @@ var FileItem = function FileItem(_ref) {
 
   // 签章
   var seal = function seal() {
-    var fileName = file.fileName,
-      fileType = file.fileType;
     console.log('fileType', fileType);
     var type = getFileExtension(fileName);
     if (type !== 'pdf') {
       _Message.notice('只有pdf文件才能使用电子签章');
       return;
     }
-    // handleSeal()
+    openLoading();
     setIsShowSealPage(true);
   };
   var signAndSeal = function signAndSeal() {
@@ -305,6 +307,7 @@ var FileItem = function FileItem(_ref) {
   var getRes = function getRes(val) {
     console.log('val---', val);
     valChange(val, fileIndex, index, subIndex);
+    closeLoading();
   };
 
   // 获取签章结果
@@ -314,6 +317,8 @@ var FileItem = function FileItem(_ref) {
     // 如果还允许签批 就连住一起做了
     if (signatureEnable) {
       sign();
+    } else {
+      closeLoading();
     }
   };
   var queryFileLibs = function queryFileLibs() {
@@ -466,8 +471,6 @@ var FileItem = function FileItem(_ref) {
     };
   }();
   var onDownload = function onDownload() {
-    var fileName = file.fileName,
-      fileId = file.fileId;
     if (disabled) return;
     var format = getFileExtension(fileName);
     download({
@@ -480,13 +483,13 @@ var FileItem = function FileItem(_ref) {
     valChange(undefined, fileIndex, index, subIndex);
   };
   useEffect(function () {
-    if (userInfo && isShowLib && tokenTY) {
+    if (userInfo && tokenTY) {
       console.log('userInfo', tokenTY, userInfo);
       setTimeout(function () {
         queryFileLibs();
       }, 0);
     }
-  }, [userInfo, isShowLib, tokenTY]);
+  }, [userInfo, tokenTY]);
   var extractImageUrls = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5(previewUrl) {
       var response, htmlText, parser, doc, imgElements, srcList;
@@ -704,7 +707,7 @@ var FileItem = function FileItem(_ref) {
     onClick: seal
   }, isSealed ? '重新签章' : '电子签章')) :
   // 展示材料库
-  isShowLib && !disabled && !!materialLib.length && /*#__PURE__*/React.createElement("div", {
+  !isShareFile && !isSmart && !disabled && !!materialLib.length && /*#__PURE__*/React.createElement("div", {
     className: "operation_btn",
     onClick: function onClick() {
       return setIsShowMaterialLib(true);

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

@@ -398,6 +398,18 @@
     height: 100%;
     z-index: 99;
     background: rgba(0, 0, 0, 0.5);
+
+    .seal_close {
+      position: absolute;
+      top: 3px;
+      right: 3px;
+      width: 30px;
+      height: 30px;
+      background: #3333337d;
+      border-radius: 50%;
+      padding: 5px;
+      z-index: 999;
+    }
   }
   .sign_page {
     position: fixed;
@@ -407,6 +419,17 @@
     height: 100%;
     z-index: 99;
     background: rgba(0, 0, 0, 0.5);
+    .sign_close {
+      position: absolute;
+      top: 3px;
+      right: 3px;
+      width: 30px;
+      height: 30px;
+      background: #3333337d;
+      border-radius: 50%;
+      padding: 5px;
+      z-index: 999;
+    }
   }
 
 }

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

@@ -4,6 +4,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useEffect, useState, useRef } from 'react';
 import { initSealPageMethod } from "./sealUtil";
 import { signFileDownApi, getSignFileApi, fileUploadApi } from "../../api";
+import closeIcon from "./icon/close.svg";
 // import { uploadFilePromise, dataURLtoBlob } from './file.js'
 
 function SealPage(props) {
@@ -211,7 +212,16 @@ function SealPage(props) {
   return /*#__PURE__*/React.createElement("div", {
     className: "sealPage",
     ref: elementRef
-  }, /*#__PURE__*/React.createElement("iframe", {
+  }, /*#__PURE__*/React.createElement("img", {
+    className: "seal_close",
+    src: closeIcon,
+    alt: "",
+    onClick: function onClick(e) {
+      console.log('close');
+      e.stopPropagation();
+      handleClose();
+    }
+  }), /*#__PURE__*/React.createElement("iframe", {
     src: srcUrl,
     id: "iframe",
     frameborder: "0",

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

@@ -3,6 +3,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useEffect, useState, useRef } from 'react';
 import { initSignPageMethod, getSignRes } from "./signUtil";
+import closeIcon from "./icon/close.svg";
 function SignPage(props) {
   var userInfo = props.userInfo,
     file = props.file,
@@ -127,7 +128,12 @@ function SignPage(props) {
   }, [srcUrl, documentId, contractId, name]);
   return /*#__PURE__*/React.createElement("div", {
     className: "sign_page"
-  }, /*#__PURE__*/React.createElement("iframe", {
+  }, /*#__PURE__*/React.createElement("img", {
+    className: "sign_close",
+    src: closeIcon,
+    alt: "",
+    onClick: handleClose
+  }), /*#__PURE__*/React.createElement("iframe", {
     src: srcUrl,
     id: "iframe",
     frameborder: "0",

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

@@ -5,17 +5,13 @@ export interface FileListPreviewProps {
      * 列表数据
      */
     fileList: Array<object>;
-    token: string;
     tokenTY: string;
     accessToken: string;
-    userInfo: object;
     baseUrl: string;
     env: string;
     isPC?: boolean;
-    disabled?: boolean;
     style?: object;
     download: (value: any) => void;
-    valChange: (value: any) => void;
 }
 declare const FileListPreview: React.FC<FileListPreviewProps>;
 export default FileListPreview;

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

@@ -1,6 +1,5 @@
 import _Balloon from "@alifd/next/es/balloon";
 import React from 'react';
-var Tooltip = _Balloon.Tooltip;
 import FileItem from "./item";
 import "./index.scss";
 var MATERIAL_TYPE = {
@@ -30,18 +29,13 @@ var MATERIAL_FORMAT = {
 };
 var FileListPreview = function FileListPreview(_ref) {
   var fileList = _ref.fileList,
-    token = _ref.token,
     tokenTY = _ref.tokenTY,
     accessToken = _ref.accessToken,
-    userInfo = _ref.userInfo,
     baseUrl = _ref.baseUrl,
     env = _ref.env,
     isPC = _ref.isPC,
-    disabled = _ref.disabled,
-    isShowLib = _ref.isShowLib,
     style = _ref.style,
-    download = _ref.download,
-    valChange = _ref.valChange;
+    download = _ref.download;
   var convertNumbersToChinese = function convertNumbersToChinese(str) {
     // 定义基础映射关系
     var digitMap = {
@@ -104,58 +98,6 @@ var FileListPreview = function FileListPreview(_ref) {
     console.log('text', sizeText);
     return text + "\u9700\u4E0A\u4F20\u3010" + MATERIAL_TYPE[materialType] + "\u3011\uFF0C\u652F\u6301\u3010" + formatText + "\u3011\u683C\u5F0F\u3002" + sizeText;
   };
-  var handleChange = function handleChange(value, fileIndex, index, subIndex) {
-    console.log('handleChange', value, fileIndex, index, subIndex);
-    // 先找到一级目录
-    var oneLevelItem = fileList[index];
-    // 如果subIndex有值。再去找一下二级目录
-    if (subIndex !== undefined) {
-      // value为空，说明删除了
-      if (!value) {
-        oneLevelItem.subMaterials[subIndex].isSmart = false;
-        oneLevelItem.subMaterials[subIndex].isShareFile = false;
-        // 如果当前文件list中只有一个文件，还得补个空的
-        if (oneLevelItem.subMaterials[subIndex].fileList.length === 1) {
-          oneLevelItem.subMaterials[subIndex].fileList = [{
-            fileId: ''
-          }];
-        } else {
-          oneLevelItem.subMaterials[subIndex].fileList.splice(fileIndex, 1);
-        }
-      } else {
-        // 如果当前这个位置的fileId是空的。说明这次修改是新增
-        var isAdd = !oneLevelItem.subMaterials[subIndex].fileList[fileIndex].fileId;
-        oneLevelItem.subMaterials[subIndex].fileList[fileIndex] = value;
-        if (isAdd && oneLevelItem.subMaterials[subIndex].fileList.length < 10) {
-          oneLevelItem.subMaterials[subIndex].fileList.push({
-            fileId: ''
-          });
-        }
-      }
-    } else {
-      if (!value) {
-        oneLevelItem.isSmart = false;
-        oneLevelItem.isShareFile = false;
-        oneLevelItem.fileList.splice(fileIndex, 1);
-        if (oneLevelItem.fileList.length === 0) {
-          oneLevelItem.fileList.push({
-            fileId: ''
-          });
-        }
-      } else {
-        // 如果当前这个位置的fileId是空的。说明这次修改是新增
-        var _isAdd = !oneLevelItem.fileList[fileIndex].fileId;
-        oneLevelItem.fileList[fileIndex] = value;
-        if (_isAdd && oneLevelItem.fileList.length < 10) {
-          oneLevelItem.fileList.push({
-            fileId: ''
-          });
-        }
-      }
-    }
-    console.log('fileList--------res', fileList);
-    valChange(fileList);
-  };
   var trigger = function trigger(child) {
     return /*#__PURE__*/React.createElement("div", {
       className: "tag",
@@ -207,42 +149,36 @@ var FileListPreview = function FileListPreview(_ref) {
         align: "t",
         title: "",
         delay: 20
-      }, child.isSmart ? '本材料为智能生成材料，系统将根据您填写的信息自动生成申报材料。' : child.isShareFile ? '本材料为共享材料，数据由大数据共享获取，无需用户自行准备。' : '需要用户自行准备申报材料')), child.fileList.length > 0 && child.fileList[0].fileId && child.fileList.map(function (file, i) {
-        return /*#__PURE__*/React.createElement(FileItem, {
-          file: file,
-          fileConfig: child,
-          maxFileSize: item.materialSize,
-          token: token,
-          tokenTY: tokenTY,
-          accessToken: accessToken,
-          baseUrl: baseUrl,
-          env: env,
-          isPC: isPC,
-          disabled: disabled,
-          download: download,
-          style: {
-            marginBottom: '12px',
-            marginTop: '12px'
-          }
-        });
-      }));
-    })) : /*#__PURE__*/React.createElement(React.Fragment, null, item.fileList.length > 0 && item.fileList[0].fileId && item.fileList.map(function (file, i) {
-      return /*#__PURE__*/React.createElement(FileItem, {
-        file: file,
-        fileConfig: item,
-        maxFileSize: item.materialSize,
-        token: token,
+      }, child.isSmart ? '本材料为智能生成材料，系统将根据您填写的信息自动生成申报材料。' : child.isShareFile ? '本材料为共享材料，数据由大数据共享获取，无需用户自行准备。' : '需要用户自行准备申报材料')), /*#__PURE__*/React.createElement("p", {
+        className: "tip"
+      }, getTipTextForSubMaterial(item, index, subIndex)), child.fileObj && /*#__PURE__*/React.createElement(FileItem, {
+        file: child.fileObj,
+        fileConfig: child,
         tokenTY: tokenTY,
         accessToken: accessToken,
         baseUrl: baseUrl,
         env: env,
         isPC: isPC,
-        disabled: disabled,
         download: download,
         style: {
-          marginBottom: '12px'
+          marginBottom: '12px',
+          marginTop: '12px'
         }
-      });
+      }));
+    })) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("p", {
+      className: "tip"
+    }, getTipText(item)), item.fileObj && /*#__PURE__*/React.createElement(FileItem, {
+      file: item.fileObj,
+      fileConfig: item,
+      tokenTY: tokenTY,
+      accessToken: accessToken,
+      baseUrl: baseUrl,
+      env: env,
+      isPC: isPC,
+      download: download,
+      style: {
+        marginBottom: '12px'
+      }
     })));
   }));
 };

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

@@ -3,14 +3,11 @@ import './item.scss';
 export interface FileItemProps {
     file: object;
     fileConfig: object;
-    token: string;
     tokenTY: string;
     accessToken: string;
     baseUrl: string;
     env: string;
     isPC?: boolean;
-    disabled?: boolean;
-    maxFileSize: number;
     style?: object;
     download: (value: any) => void;
 }