ronds-metadata 1.1.70 → 1.1.72

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

@@ -1,6 +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/spin/style";
-import _Spin from "antd/es/spin";
+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";
@@ -10,6 +10,7 @@ import * as XLSX from 'xlsx';
 
 var FileView = function FileView(props) {
   var path = props.path,
+      data = props.data,
       _props$limit = props.limit,
       limit = _props$limit === void 0 ? 1000 : _props$limit;
   var ref = React.useRef(null);
@@ -28,35 +29,38 @@ var FileView = function FileView(props) {
   var processDataToExcel = React.useCallback(function (data) {
     var _title = [];
     var _value = [];
-    var p = data[0];
-    var f = Object.keys(p);
-    _title = f.map(function (it) {
-      return {
-        title: it,
-        width: 100,
-        align: 'left'
-      };
-    });
-    setTitle(_toConsumableArray(_title));
 
-    var _loop = function _loop(i) {
-      var arr = f.map(function (it) {
-        return data[i][it];
+    if (data && data.length > 0) {
+      var p = data[0];
+      var f = Object.keys(p);
+      _title = f.map(function (it) {
+        return {
+          title: it,
+          width: 100,
+          align: 'left'
+        };
       });
+      setTitle(_toConsumableArray(_title));
 
-      _value.push(arr);
+      var _loop = function _loop(i) {
+        var arr = f.map(function (it) {
+          return data[i][it];
+        });
 
-      if (i === limit - 1) return "break";
-    };
+        _value.push(arr);
 
-    for (var i = 0; i < data.length; i++) {
-      var _ret = _loop(i);
+        if (i === limit - 1) return "break";
+      };
 
-      if (_ret === "break") break;
-    }
+      for (var i = 0; i < data.length; i++) {
+        var _ret = _loop(i);
+
+        if (_ret === "break") break;
+      }
 
-    setValue([].concat(_value));
-    firstLoadRef.current = false;
+      setValue([].concat(_value));
+      firstLoadRef.current = false;
+    }
   }, []);
   var getFileData = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
     var res, blob, fileReader;
@@ -79,14 +83,17 @@ var FileView = function FileView(props) {
 
           case 6:
             blob = _context.sent;
-            fileReader = new FileReader(); //二进制
+            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 _data = [];
                 var binary = ''; // 以二进制流方式读取得到整份excel表格对象
 
                 var result = event.target.result;
@@ -105,13 +112,13 @@ var FileView = function FileView(props) {
                 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])); // 如果只取第一张表，就取消注释这行
+                    _data = _data.concat(XLSX.utils.sheet_to_json(workbook.Sheets[sheet])); // 如果只取第一张表，就取消注释这行
 
                     break;
                   }
                 }
 
-                processDataToExcel(data);
+                processDataToExcel(_data);
               } catch (e) {
                 return;
               }
@@ -129,9 +136,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(_Spin, null);
+    return /*#__PURE__*/React.createElement(_Empty, 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.70",
+  "version": "1.1.72",
   "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",