ronds-metadata 1.1.69 → 1.1.71

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

@@ -1,5 +1,7 @@
 interface IFileViewProps {
-    path: string;
+    path?: string;
+    limit?: number;
+    data?: any[];
 }
 declare const FileView: (props: IFileViewProps) => JSX.Element;
 export default FileView;

package/es/comps/FileView/index.js

@@ -1,5 +1,5 @@
-import "antd/es/empty/style";
-import _Empty from "antd/es/empty";
+import "antd/es/spin/style";
+import _Spin from "antd/es/spin";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
@@ -9,7 +9,10 @@ import { ReactJexcel } from 'react-jexcel';
 import * as XLSX from 'xlsx';
 
 var FileView = function FileView(props) {
-  var path = props.path;
+  var path = props.path,
+      data = props.data,
+      _props$limit = props.limit,
+      limit = _props$limit === void 0 ? 1000 : _props$limit;
   var ref = React.useRef(null);
   var firstLoadRef = React.useRef(true);
 
@@ -31,7 +34,7 @@ var FileView = function FileView(props) {
     _title = f.map(function (it) {
       return {
         title: it,
-        width: 150,
+        width: 100,
         align: 'left'
       };
     });
@@ -43,10 +46,14 @@ var FileView = function FileView(props) {
       });
 
       _value.push(arr);
+
+      if (i === limit - 1) return "break";
     };
 
     for (var i = 0; i < data.length; i++) {
-      _loop(i);
+      var _ret = _loop(i);
+
+      if (_ret === "break") break;
     }
 
     setValue([].concat(_value));
@@ -74,25 +81,41 @@ var FileView = function FileView(props) {
           case 6:
             blob = _context.sent;
             fileReader = new FileReader();
-            fileReader.readAsBinaryString(blob); //二进制
+            // 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 result = event.target.result; // 以二进制流方式读取得到整份excel表格对象
+                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(result, {
-                  type: 'binary'
-                }); // 遍历每张工作表进行读取（这里默认只读取第一张表）
+                // 遍历每张工作表进行读取（这里默认只读取第一张表）
+                var workbook = XLSX.read(binary, {
+                  type: 'binary',
+                  codepage: 936
+                });
 
                 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; // 如果只取第一张表，就取消注释这行
+                    _data = _data.concat(XLSX.utils.sheet_to_json(workbook.Sheets[sheet])); // 如果只取第一张表，就取消注释这行
+
+                    break;
                   }
                 }
 
-                processDataToExcel(data);
+                processDataToExcel(_data);
               } catch (e) {
                 return;
               }
@@ -110,9 +133,14 @@ var FileView = function FileView(props) {
       getFileData();
     }
   }, [getFileData, path]);
+  React.useEffect(function () {
+    if (data && firstLoadRef.current) {
+      processDataToExcel(data);
+    }
+  }, [getFileData, data]);
 
   if (!value) {
-    return /*#__PURE__*/React.createElement(_Empty, null);
+    return /*#__PURE__*/React.createElement(_Spin, 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.69",
+  "version": "1.1.71",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -44,6 +44,7 @@
     "babel-plugin-transform-remove-console": "^6.9.4",
     "bl": "^5.0.0",
     "codemirror": "^5.63.0",
+    "codepage": "^1.15.0",
     "github-markdown-css": "^5.1.0",
     "immer": "^9.0.14",
     "lodash": "^4.17.21",