ydb-components-material 0.1.92 → 0.1.94

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

@@ -7,7 +7,6 @@ var _balloon = _interopRequireDefault(require("@alifd/next/lib/balloon"));
 var _react = _interopRequireDefault(require("react"));
 var _item = _interopRequireDefault(require("./item"));
 require("./index.scss");
-var Tooltip = _balloon["default"].Tooltip;
 var MATERIAL_TYPE = {
   1: '原件',
   2: '复印件',
@@ -35,18 +34,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 = {
@@ -109,58 +103,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["default"].createElement("div", {
       className: "tag",
@@ -212,42 +154,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["default"].createElement(_item["default"], {
-          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["default"].createElement(_react["default"].Fragment, null, item.fileList.length > 0 && item.fileList[0].fileId && item.fileList.map(function (file, i) {
-      return /*#__PURE__*/_react["default"].createElement(_item["default"], {
-        file: file,
-        fileConfig: item,
-        maxFileSize: item.materialSize,
-        token: token,
+      }, child.isSmart ? '本材料为智能生成材料，系统将根据您填写的信息自动生成申报材料。' : child.isShareFile ? '本材料为共享材料，数据由大数据共享获取，无需用户自行准备。' : '需要用户自行准备申报材料')), /*#__PURE__*/_react["default"].createElement("p", {
+        className: "tip"
+      }, getTipTextForSubMaterial(item, index, subIndex)), child.fileObj && /*#__PURE__*/_react["default"].createElement(_item["default"], {
+        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["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("p", {
+      className: "tip"
+    }, getTipText(item)), item.fileObj && /*#__PURE__*/_react["default"].createElement(_item["default"], {
+      file: item.fileObj,
+      fileConfig: item,
+      tokenTY: tokenTY,
+      accessToken: accessToken,
+      baseUrl: baseUrl,
+      env: env,
+      isPC: isPC,
+      download: download,
+      style: {
+        marginBottom: '12px'
+      }
     })));
   }));
 };

package/lib/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;
 }

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

@@ -20,20 +20,18 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 var FileItem = function FileItem(_ref) {
   var file = _ref.file,
     fileConfig = _ref.fileConfig,
-    maxFileSize = _ref.maxFileSize,
-    token = _ref.token,
     tokenTY = _ref.tokenTY,
     accessToken = _ref.accessToken,
     baseUrl = _ref.baseUrl,
     env = _ref.env,
     isPC = _ref.isPC,
-    disabled = _ref.disabled,
     style = _ref.style,
     download = _ref.download;
-  console.log('fileItem', file, maxFileSize);
+  console.log('fileItem', file);
   var fileName = file.fileName,
-    fileUrl = file.fileUrl,
-    fileId = file.fileId;
+    downloadFileId = file.downloadFileId,
+    previewFileId = file.previewFileId,
+    fileUrl = file.fileUrl;
   var signGuidFileId = fileConfig.signGuidFileId,
     keyPoint = fileConfig.keyPoint;
   var _useState = (0, _react.useState)(false),
@@ -72,7 +70,6 @@ var FileItem = function FileItem(_ref) {
               id: signGuidFileId,
               effectiveTime: 3600000
             }, {
-              token: token,
               tokenTY: tokenTY,
               baseUrl: baseUrl,
               env: env,
@@ -95,71 +92,79 @@ var FileItem = function FileItem(_ref) {
       return _ref2.apply(this, arguments);
     };
   }();
-  var onDownload = function onDownload() {
-    var fileName = file.fileName,
-      fileId = file.fileId;
-    if (disabled) return;
-    var format = (0, _file2.getFileExtension)(fileName);
-    download({
-      fileId: fileId,
-      format: format
-    });
-  };
-  var extractImageUrls = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(previewUrl) {
-      var response, htmlText, parser, doc, imgElements, srcList;
+  var onDownload = /*#__PURE__*/function () {
+    var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+      var format;
       return _regenerator["default"].wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context2.next = 1;
+            format = (0, _file2.getFileExtension)(fileName);
+            download({
+              fileId: downloadFileId,
+              format: format
+            });
+          case 1:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function onDownload() {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+  var extractImageUrls = /*#__PURE__*/function () {
+    var _ref4 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(previewUrl) {
+      var response, htmlText, parser, doc, imgElements, srcList;
+      return _regenerator["default"].wrap(function (_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 1;
             return fetch(previewUrl);
           case 1:
-            response = _context2.sent;
-            _context2.next = 2;
+            response = _context3.sent;
+            _context3.next = 2;
             return response.text();
           case 2:
-            htmlText = _context2.sent;
+            htmlText = _context3.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 _context2.abrupt("return", srcList);
+            return _context3.abrupt("return", srcList);
           case 3:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2);
+      }, _callee3);
     }));
     return function extractImageUrls(_x) {
-      return _ref3.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
 
   // 预览材料
   var preview = /*#__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 urlRes, res;
-      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 (fileUrl) {
-              _context3.next = 1;
+            if (previewFileId) {
+              _context4.next = 1;
               break;
             }
-            return _context3.abrupt("return");
+            return _context4.abrupt("return");
           case 1:
-            console.log('fileUrl', fileUrl, fileId);
-            setPreviewIframeUrl(fileUrl);
-            setIsShowPreview(true);
-            // if (!fileId) return;
-            _context3.next = 2;
+            console.log('fileUrl', previewFileId);
+            // if (!previewFileId) return;
+            _context4.next = 2;
             return (0, _api.getUrlById)({
-              id: fileId,
+              id: previewFileId,
               effectiveTime: 3600000
             }, {
-              token: token,
               tokenTY: tokenTY,
               baseUrl: baseUrl,
               env: env,
@@ -167,16 +172,15 @@ var FileItem = function FileItem(_ref) {
               accessToken: accessToken
             });
           case 2:
-            urlRes = _context3.sent;
+            urlRes = _context4.sent;
             if (!(urlRes.presignedUrlList && urlRes.presignedUrlList.length > 0)) {
-              _context3.next = 4;
+              _context4.next = 4;
               break;
             }
-            _context3.next = 3;
+            _context4.next = 3;
             return (0, _api.onlinePreview)({
               url: urlRes.presignedUrlList[2]
             }, {
-              token: token,
               tokenTY: tokenTY,
               baseUrl: baseUrl,
               env: env,
@@ -184,44 +188,43 @@ var FileItem = function FileItem(_ref) {
               accessToken: accessToken
             });
           case 3:
-            res = _context3.sent;
+            res = _context4.sent;
             setPreviewIframeUrl(res.url);
             setIsShowPreview(true);
           case 4:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3);
+      }, _callee4);
     }));
     return function preview() {
-      return _ref4.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
   var getViewUrl = /*#__PURE__*/function () {
-    var _ref5 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(id) {
+    var _ref6 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(id) {
       var type, urlRes, res, list;
-      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:
             type = (0, _file2.getFileExtension)(fileName);
             if (!['png', 'jpg', 'jpeg'].includes(type)) {
-              _context4.next = 1;
+              _context5.next = 1;
               break;
             }
-            return _context4.abrupt("return", fileUrl);
+            return _context5.abrupt("return", fileUrl);
           case 1:
             if (!(type !== 'pdf')) {
-              _context4.next = 2;
+              _context5.next = 2;
               break;
             }
-            return _context4.abrupt("return", '');
+            return _context5.abrupt("return", '');
           case 2:
-            _context4.next = 3;
+            _context5.next = 3;
             return (0, _api.getUrlById)({
               id: id,
               effectiveTime: 3600000
             }, {
-              token: token,
               tokenTY: tokenTY,
               baseUrl: baseUrl,
               env: env,
@@ -229,17 +232,16 @@ var FileItem = function FileItem(_ref) {
               accessToken: accessToken
             });
           case 3:
-            urlRes = _context4.sent;
+            urlRes = _context5.sent;
             if (!(urlRes.presignedUrlList && urlRes.presignedUrlList.length > 0)) {
-              _context4.next = 6;
+              _context5.next = 6;
               break;
             }
             console.log('urlRes', urlRes);
-            _context4.next = 4;
+            _context5.next = 4;
             return (0, _api.onlinePreview)({
               url: urlRes.presignedUrlList[2]
             }, {
-              token: token,
               tokenTY: tokenTY,
               baseUrl: baseUrl,
               env: env,
@@ -247,36 +249,34 @@ var FileItem = function FileItem(_ref) {
               accessToken: accessToken
             });
           case 4:
-            res = _context4.sent;
-            _context4.next = 5;
+            res = _context5.sent;
+            _context5.next = 5;
             return extractImageUrls(res.url);
           case 5:
-            list = _context4.sent;
+            list = _context5.sent;
             console.log('list---', list);
-            return _context4.abrupt("return", list[0]);
+            return _context5.abrupt("return", list[0]);
           case 6:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4);
+      }, _callee5);
     }));
     return function getViewUrl(_x2) {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
   (0, _react.useEffect)(function () {
-    if (fileId) {
-      getViewUrl(fileId).then(function (url) {
+    if (previewFileId) {
+      getViewUrl(previewFileId).then(function (url) {
         setThumbnail(url);
       });
     }
-  }, [fileId]);
+  }, [previewFileId]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "file_item",
     style: style
-  }, /*#__PURE__*/_react["default"].createElement("p", {
-    className: "file_name"
-  }, fileName), /*#__PURE__*/_react["default"].createElement("div", {
+  }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "file"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "file_img"
@@ -292,21 +292,21 @@ var FileItem = function FileItem(_ref) {
     alt: ""
   }))), isPC && /*#__PURE__*/_react["default"].createElement("div", {
     className: "blocks"
-  }, fileUrl && /*#__PURE__*/_react["default"].createElement("div", {
+  }, downloadFileId && previewFileId && /*#__PURE__*/_react["default"].createElement("div", {
     className: "btns"
-  }, /*#__PURE__*/_react["default"].createElement("div", {
+  }, previewFileId && /*#__PURE__*/_react["default"].createElement("div", {
     className: "btn",
     onClick: preview
   }, /*#__PURE__*/_react["default"].createElement("img", {
     src: _preview_pc["default"],
     alt: ""
-  }), "\u9884\u89C8"), !disabled && /*#__PURE__*/_react["default"].createElement("div", {
+  }), "\u9884\u89C8"), downloadFileId && /*#__PURE__*/_react["default"].createElement("div", {
     className: "btn",
     onClick: onDownload
   }, /*#__PURE__*/_react["default"].createElement("img", {
     src: _download_pc["default"],
     alt: ""
-  }), "\u4E0B\u8F7D"))), !disabled && /*#__PURE__*/_react["default"].createElement("div", {
+  }), "\u4E0B\u8F7D"))), /*#__PURE__*/_react["default"].createElement("div", {
     className: isPC ? 'operation_pc' : 'operation'
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "btn"
@@ -321,17 +321,17 @@ var FileItem = function FileItem(_ref) {
   }, "\u5BA1\u67E5\u8981\u70B9")))), !isPC && /*#__PURE__*/_react["default"].createElement("div", {
     className: "file_item_bottom",
     style: {
-      justifyContent: disabled ? 'center' : 'space-evenly'
+      justifyContent: previewFileId && downloadFileId ? 'space-evenly' : 'center'
     }
-  }, /*#__PURE__*/_react["default"].createElement("div", {
+  }, previewFileId && /*#__PURE__*/_react["default"].createElement("div", {
     className: "icon_text",
     onClick: preview
   }, /*#__PURE__*/_react["default"].createElement("img", {
     src: _preview["default"],
     alt: ""
-  }), "\u9884\u89C8"), !disabled && /*#__PURE__*/_react["default"].createElement("div", {
+  }), "\u9884\u89C8"), previewFileId && downloadFileId && /*#__PURE__*/_react["default"].createElement("div", {
     className: "line"
-  }), !disabled && /*#__PURE__*/_react["default"].createElement("div", {
+  }), downloadFileId && /*#__PURE__*/_react["default"].createElement("div", {
     className: "icon_text",
     onClick: onDownload
   }, /*#__PURE__*/_react["default"].createElement("img", {

package/lib/components/submit-type/index.scss

@@ -15,7 +15,7 @@
 
     span {
       position: absolute;
-      top: 12%;
+      top: 14%;
       right: 11%;
       font-size: 16px;
       font-weight: 500;

package/lowcode/file-list-preview/meta.ts

@@ -9,7 +9,7 @@ const FileListPreviewMeta: IPublicTypeComponentMetadata = {
   "devMode": "proCode",
   "npm": {
     "package": "ydb-components-material",
-    "version": "0.1.89",
+    "version": "0.1.93",
     "exportName": "FileListPreview",
     "main": "src/index.tsx",
     "destructuring": true,
@@ -95,30 +95,6 @@ const FileListPreviewMeta: IPublicTypeComponentMetadata = {
           "initialValue": ""
         }
       },
-      {
-        "title": {
-          "label": {
-            "type": "i18n",
-            "en-US": "userInfo",
-            "zh-CN": "userInfo"
-          }
-        },
-        "name": "userInfo",
-        "setter": {
-          "componentName": "ObjectSetter",
-          "props": {
-            "config": {
-              "extraSetter": {
-                "componentName": "MixedSetter",
-                "isRequired": false,
-                "props": {}
-              }
-            }
-          },
-          "isRequired": true,
-          "initialValue": {}
-        }
-      },
       {
         "title": {
           "label": {
@@ -164,21 +140,6 @@ const FileListPreviewMeta: IPublicTypeComponentMetadata = {
           "initialValue": false
         }
       },
-      {
-        "title": {
-          "label": {
-            "type": "i18n",
-            "en-US": "disabled",
-            "zh-CN": "disabled"
-          }
-        },
-        "name": "disabled",
-        "setter": {
-          "componentName": "BoolSetter",
-          "isRequired": false,
-          "initialValue": false
-        }
-      },
       {
         "title": {
           "label": {
@@ -193,20 +154,6 @@ const FileListPreviewMeta: IPublicTypeComponentMetadata = {
           "isRequired": true
         }
       },
-      {
-        "title": {
-          "label": {
-            "type": "i18n",
-            "en-US": "valChange",
-            "zh-CN": "valChange"
-          }
-        },
-        "name": "valChange",
-        "setter": {
-          "componentName": "FunctionSetter",
-          "isRequired": true
-        }
-      }
     ],
     "supports": {
       "style": true

package/lowcode_es/file-list-preview/meta.js

@@ -7,7 +7,7 @@ var FileListPreviewMeta = {
   "devMode": "proCode",
   "npm": {
     "package": "ydb-components-material",
-    "version": "0.1.89",
+    "version": "0.1.93",
     "exportName": "FileListPreview",
     "main": "src/index.tsx",
     "destructuring": true,
@@ -88,29 +88,6 @@ var FileListPreviewMeta = {
         "isRequired": true,
         "initialValue": ""
       }
-    }, {
-      "title": {
-        "label": {
-          "type": "i18n",
-          "en-US": "userInfo",
-          "zh-CN": "userInfo"
-        }
-      },
-      "name": "userInfo",
-      "setter": {
-        "componentName": "ObjectSetter",
-        "props": {
-          "config": {
-            "extraSetter": {
-              "componentName": "MixedSetter",
-              "isRequired": false,
-              "props": {}
-            }
-          }
-        },
-        "isRequired": true,
-        "initialValue": {}
-      }
     }, {
       "title": {
         "label": {
@@ -153,20 +130,6 @@ var FileListPreviewMeta = {
         "isRequired": false,
         "initialValue": false
       }
-    }, {
-      "title": {
-        "label": {
-          "type": "i18n",
-          "en-US": "disabled",
-          "zh-CN": "disabled"
-        }
-      },
-      "name": "disabled",
-      "setter": {
-        "componentName": "BoolSetter",
-        "isRequired": false,
-        "initialValue": false
-      }
     }, {
       "title": {
         "label": {
@@ -180,19 +143,6 @@ var FileListPreviewMeta = {
         "componentName": "FunctionSetter",
         "isRequired": true
       }
-    }, {
-      "title": {
-        "label": {
-          "type": "i18n",
-          "en-US": "valChange",
-          "zh-CN": "valChange"
-        }
-      },
-      "name": "valChange",
-      "setter": {
-        "componentName": "FunctionSetter",
-        "isRequired": true
-      }
     }],
     "supports": {
       "style": true