ronds-metadata 1.1.73 → 1.1.75

package/es/comps/FileView/index.d.ts

@@ -1,7 +1,20 @@
 interface IFileViewProps {
+    /**
+     * 文件远程链接
+     */
     path?: string;
-    limit?: number;
+    /**
+     * json数据
+     */
     data?: any[];
+    /**
+     * 文件
+     */
+    file?: any;
+    /**
+     * 最多展示多少行数据
+     */
+    limit?: number;
 }
 declare const FileView: (props: IFileViewProps) => JSX.Element;
 export default FileView;

package/es/comps/FileView/index.js

@@ -1,5 +1,3 @@
-import "antd/es/empty/style";
-import _Empty from "antd/es/empty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
@@ -11,6 +9,7 @@ import * as XLSX from 'xlsx';
 var FileView = function FileView(props) {
   var path = props.path,
       data = props.data,
+      file = props.file,
       _props$limit = props.limit,
       limit = _props$limit === void 0 ? 1000 : _props$limit;
   var ref = React.useRef(null);
@@ -61,76 +60,98 @@ var FileView = function FileView(props) {
       setValue([].concat(_value));
       firstLoadRef.current = false;
     }
-  }, []);
-  var getFileData = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var res, blob, fileReader;
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            if (!(path && firstLoadRef.current)) {
-              _context.next = 10;
+  }, []); // 文件流转 base64
+
+  var fixdata = function fixdata(data) {
+    var o = '',
+        l = 0,
+        w = 10240;
+
+    for (; l < data.byteLength / w; ++l) {
+      o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w, l * w + w)));
+    }
+
+    o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w)));
+    return o;
+  };
+
+  var getFileData = React.useCallback( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_file) {
+      var blob, res, fileReader;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!firstLoadRef.current) {
+                _context.next = 14;
+                break;
+              }
+
+              if (!path) {
+                _context.next = 10;
+                break;
+              }
+
+              _context.next = 4;
+              return fetch(path);
+
+            case 4:
+              res = _context.sent;
+              _context.next = 7;
+              return res.blob();
+
+            case 7:
+              blob = _context.sent;
+              _context.next = 11;
               break;
-            }
-
-            _context.next = 3;
-            return fetch(path);
-
-          case 3:
-            res = _context.sent;
-            _context.next = 6;
-            return res.blob();
-
-          case 6:
-            blob = _context.sent;
-            fileReader = new FileReader();
-            // blob.type = 'text/csv;charset=utf-8;';
-            // const bl = new Blob([blob], { type: 'text/csv;charset=utf-8;' });
-            // console.log('blob2', bl);
-            //二进制
-            // fileReader.readAsBinaryString(blob);
-            fileReader.readAsArrayBuffer(blob);
-
-            fileReader.onload = function (event) {
-              try {
-                var _data = [];
-                var binary = ''; // 以二进制流方式读取得到整份excel表格对象
-
-                var result = event.target.result;
-                var bytes = new Uint8Array(result);
-
-                for (var i = 0; i < bytes.byteLength; i++) {
-                  binary += String.fromCharCode(bytes[i]);
-                }
 
-                // 遍历每张工作表进行读取（这里默认只读取第一张表）
-                var workbook = XLSX.read(binary, {
-                  type: 'binary',
-                  codepage: 936
-                });
+            case 10:
+              blob = _file;
+
+            case 11:
+              fileReader = new FileReader(); //二进制
+              // fileReader.readAsBinaryString(blob);
+
+              fileReader.onload = function (event) {
+                try {
+                  var _data = []; // 以二进制流方式读取得到整份excel表格对象
 
-                for (var sheet in workbook.Sheets) {
-                  if (workbook.Sheets.hasOwnProperty(sheet)) {
-                    // 利用 sheet_to_json 方法将 excel 转成 json 数据
-                    _data = _data.concat(XLSX.utils.sheet_to_json(workbook.Sheets[sheet])); // 如果只取第一张表，就取消注释这行
+                  var result = event.target.result; // 遍历每张工作表进行读取（这里默认只读取第一张表）
 
-                    break;
+                  var workbook = XLSX.read(fixdata(result), {
+                    type: 'binary',
+                    codepage: 65001
+                  });
+
+                  for (var sheet in workbook.Sheets) {
+                    if (workbook.Sheets.hasOwnProperty(sheet)) {
+                      // 利用 sheet_to_json 方法将 excel 转成 json 数据
+                      _data = _data.concat(XLSX.utils.sheet_to_json(workbook.Sheets[sheet])); // 如果只取第一张表，就取消注释这行
+
+                      break;
+                    }
                   }
+
+                  processDataToExcel(_data);
+                } catch (e) {
+                  return;
                 }
+              };
 
-                processDataToExcel(_data);
-              } catch (e) {
-                return;
-              }
-            };
+              fileReader.readAsArrayBuffer(blob);
 
-          case 10:
-          case "end":
-            return _context.stop();
+            case 14:
+            case "end":
+              return _context.stop();
+          }
         }
-      }
-    }, _callee);
-  })), []);
+      }, _callee);
+    }));
+
+    return function (_x) {
+      return _ref.apply(this, arguments);
+    };
+  }(), []);
   React.useEffect(function () {
     if (path && firstLoadRef.current) {
       getFileData();
@@ -141,6 +162,16 @@ var FileView = function FileView(props) {
 
     return function () {};
   }, [getFileData, path]);
+  React.useEffect(function () {
+    if (file && firstLoadRef.current) {
+      getFileData(file);
+      return function () {
+        ref.current = null;
+      };
+    }
+
+    return function () {};
+  }, [getFileData, file]);
   React.useEffect(function () {
     if (data && firstLoadRef.current) {
       processDataToExcel(data);
@@ -153,7 +184,7 @@ var FileView = function FileView(props) {
   }, [getFileData, data]);
 
   if (!value) {
-    return /*#__PURE__*/React.createElement(_Empty, null);
+    return /*#__PURE__*/React.createElement(React.Fragment, null);
   }
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ReactJexcel, {

package/package.json

@@ -1,7 +1,7 @@
 {
   "public": true,
   "name": "ronds-metadata",
-  "version": "1.1.73",
+  "version": "1.1.75",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",