ronds-metadata 1.1.65 → 1.1.67

package/es/api/index.js

@@ -6,12 +6,12 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-08-29 19:24:38
+ * @LastEditTime: 2022-12-07 15:45:18
  */
 import { guid, md5 } from '../utils';
 import { addInterceptor, HttpHelper } from '../framework/http';
 var http = new HttpHelper();
-var token = 'Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IkNBMzFBMEJDMkQ5M0I3RkVFOTBDMDkwMDI4MUVBMTlEIiwidHlwIjoiYXQrand0In0.eyJuYmYiOjE2Mzg1MTM1NzMsImV4cCI6MTY3MDA0OTU3MywiaXNzIjoiaHR0cDovLzE5Mi4xNjguMS4xNzk6MzEwMDIiLCJhdWQiOiJlcG0iLCJjbGllbnRfaWQiOiJlcG0iLCJzdWIiOiIzYTAwMjYxOS1kNGRjLTY5NGMtYjUzNi0xNzM3YzVjZjRlM2UiLCJhdXRoX3RpbWUiOjE2Mzg1MTM1NzMsImlkcCI6ImxvY2FsIiwicGhvbmVfbnVtYmVyIjoiMTgxNjQ0NjI0MDAiLCJwaG9uZV9udW1iZXJfdmVyaWZpZWQiOiJGYWxzZSIsImVtYWlsIjoieGlhbi53YW5nQHJvbmRzLmNvbS5jbiIsImVtYWlsX3ZlcmlmaWVkIjoiRmFsc2UiLCJuYW1lIjoid2FuZ3hpYW4iLCJpYXQiOjE2Mzg1MTM1NzMsInNjb3BlIjpbImFkZHJlc3MiLCJlbWFpbCIsImVwbSIsIm9wZW5pZCIsInBob25lIiwicHJvZmlsZSIsInJvbGUiLCJvZmZsaW5lX2FjY2VzcyJdLCJhbXIiOlsicHdkIl19.FI4lIbjLwCn0sF9iZ1aaJ9vXLEi8TxQiLROab_8XYdDrR4HVFIcWYHbxUWqhdQtaCKwyyhL8tJLVgi-O_EaOTj_ui5AZLH_LVSR1_lAzYIER3yfoz2vEOaR0T0HlPAVuO60nI_In4q9XyuW12_8morm1f4NukrYxVqDiRh8_biUevWXAH0WgeXmLyzKBduDrE-5dZzAx4O6dFBSqDpedIJt36ILQR5vXEBtje7IlVgVN2jRCQ-jdHfiGYoTsggoybQ1YfI5aUDv9RHMEETTgdHWtRSvlyv5QuW1yF7LiHvT1a2KKN3YhHnKtcmPkoD-WT8taVxsAn3oxGwyZ0Ru5sw';
+var token = 'Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IkNBMzFBMEJDMkQ5M0I3RkVFOTBDMDkwMDI4MUVBMTlEIiwidHlwIjoiYXQrand0In0.eyJuYmYiOjE2NzAyODgzMTksImV4cCI6MTcwMTgyNDMxOSwiaXNzIjoiaHR0cDovLzE5Mi4xNjguMS4xNzk6MzEwMDIiLCJhdWQiOiJlcG0iLCJjbGllbnRfaWQiOiJlcG0iLCJzdWIiOiIzYTAyZTY3Zi1mYzNjLWU2YjQtYTFjNC1jOTEzOWE1NjM3OTUiLCJhdXRoX3RpbWUiOjE2NzAyODgzMTksImlkcCI6ImxvY2FsIiwicm9sZSI6InBobV9hZG1pbiIsInBob25lX251bWJlciI6IjEyMzQ1NiIsInBob25lX251bWJlcl92ZXJpZmllZCI6IkZhbHNlIiwiZW1haWwiOiJwaG1AYWJwLmlvIiwiZW1haWxfdmVyaWZpZWQiOiJGYWxzZSIsIm5hbWUiOiJwaG0iLCJpYXQiOjE2NzAyODgzMTksInNjb3BlIjpbImFkZHJlc3MiLCJlbWFpbCIsImVwbSIsIm9wZW5pZCIsInBob25lIiwicHJvZmlsZSIsInJvbGUiLCJvZmZsaW5lX2FjY2VzcyJdLCJhbXIiOlsicHdkIl19.J1FKumhVm8zRAAqk61-4_LxjIz7gSehrAWhTKj0BPExZytQhLe8vLjGpXtLL-n_j3JE2eDz8____0afXdC5LaD_b6z-Wxyowe0BdCgGCRxAZDVjHUF-J5PnGPTYpjBTnbQ0g2lpTLTNPCb3AmEKj172okXm_3jRKj3FYYB7delG4ZDNPFKu4VtSoH8B4PubAliSAuBifcDtMYYPv83_mb6zipFbb_S1CgI-IZLNV5c5dMIz6jPpooYyKkOu1B0bcCE31R40V4NcARlomO41nfJiJ3PdwwVfmrOe1OHeFkwLwyG_rersTYVLF1nACT2cOMT9VRWzofkWjhRbW1iz_3w';
 addInterceptor(function (httpClient) {
   httpClient.interceptors.request.use(function (_config) {
     if (!_config.headers) {

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

@@ -33,6 +33,14 @@ interface IEditableProps<R = any> {
      * 是否可以添加列
      */
     isAddColumn?: boolean;
+    /**
+     * 是否显示操作栏
+     */
+    isAction?: boolean;
+    /**
+     * 是否有添加列
+     */
+    isAddRow?: boolean;
     /**
      * antd自身的属性
      */

package/es/comps/Editable/index.js

@@ -32,6 +32,10 @@ var Editable = function Editable(props) {
       addPosition = _props$addPosition === void 0 ? 'bottom' : _props$addPosition,
       _props$isAddColumn = props.isAddColumn,
       isAddColumn = _props$isAddColumn === void 0 ? false : _props$isAddColumn,
+      _props$isAddRow = props.isAddRow,
+      isAddRow = _props$isAddRow === void 0 ? true : _props$isAddRow,
+      _props$isAction = props.isAction,
+      isAction = _props$isAction === void 0 ? true : _props$isAction,
       tableProps = props.tableProps,
       onRowClick = props.onRowClick,
       onButtonCellClick = props.onButtonCellClick,
@@ -243,7 +247,7 @@ var Editable = function Editable(props) {
 
     var res = __columns__.map(getEditColumn);
 
-    if (!readonly) {
+    if (!readonly && isAction) {
       var _aciton_ = {
         dataKey: '_aciton_',
         title: tr('操作'),
@@ -357,7 +361,7 @@ var Editable = function Editable(props) {
         index: index
       };
     }
-  })), (type === 'multiple' || type === 'freedom') && !readonly && defaultValue && /*#__PURE__*/React.createElement(_Button, {
+  })), (type === 'multiple' || type === 'freedom') && !readonly && isAddRow && defaultValue && /*#__PURE__*/React.createElement(_Button, {
     block: true,
     type: "dashed",
     style: {

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

@@ -1,2 +1,5 @@
-declare const FileView: () => JSX.Element;
+interface IFileViewProps {
+    path: string;
+}
+declare const FileView: (props: IFileViewProps) => JSX.Element;
 export default FileView;

package/es/comps/FileView/index.js

@@ -1,18 +1,125 @@
-import React from "react";
+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";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React from 'react';
+import { ReactJexcel } from 'react-jexcel';
+import * as XLSX from 'xlsx';
 
-/*
- * @Author: wangxian
- * @Date: 2022-11-25 14:14:50
- * @LastEditTime: 2022-11-25 14:30:35
- */
-import FileViewer from 'react-file-viewer';
+var FileView = function FileView(props) {
+  var path = props.path;
+  var ref = React.useRef(null);
+  var firstLoadRef = React.useRef(true);
 
-var FileView = function FileView() {
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FileViewer, {
-    fileType: "xslx" //文件类型
-    ,
-    filePath: 'http://192.168.1.186:9006/experiment//1fc9b9e3-51a3-79c0-de28-5ddff261d8fd/%E8%A1%A8%E6%A0%BC/%E6%B5%8B%E8%AF%95/test.xlsx?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minio%2F20221125%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20221125T061952Z&X-Amz-Expires=604800&X-Amz-SignedHeaders=host&X-Amz-Signature=97b63c66f7d2e9181d3b1486e360bdd7000e3104fc486a1d8fafd8db3d0623b4' //文件地址（后台给返的二进制流也可以）
+  var _React$useState = React.useState(),
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      title = _React$useState2[0],
+      setTitle = _React$useState2[1];
 
+  var _React$useState3 = React.useState(),
+      _React$useState4 = _slicedToArray(_React$useState3, 2),
+      value = _React$useState4[0],
+      setValue = _React$useState4[1];
+
+  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: 150,
+        align: 'left'
+      };
+    });
+    setTitle(_toConsumableArray(_title));
+
+    var _loop = function _loop(i) {
+      var arr = f.map(function (it) {
+        return data[i][it];
+      });
+
+      _value.push(arr);
+    };
+
+    for (var i = 0; i < data.length; i++) {
+      _loop(i);
+    }
+
+    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;
+              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();
+            fileReader.readAsBinaryString(blob); //二进制
+
+            fileReader.onload = function (event) {
+              try {
+                var data = [];
+                var result = event.target.result; // 以二进制流方式读取得到整份excel表格对象
+
+                var workbook = XLSX.read(result, {
+                  type: 'binary'
+                }); // 遍历每张工作表进行读取（这里默认只读取第一张表）
+
+                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;
+              }
+            };
+
+          case 10:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  })), []);
+  React.useEffect(function () {
+    if (path && firstLoadRef.current) {
+      getFileData();
+    }
+  }, [getFileData, path]);
+
+  if (!value) {
+    return /*#__PURE__*/React.createElement(_Empty, null);
+  }
+
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ReactJexcel, {
+    ref: ref,
+    data: value,
+    columns: title,
+    rowResize: true
   }));
 };
 

package/es/comps/MetadataForm/DataCell/Array.js

@@ -8,7 +8,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-11-03 11:14:58
+ * @LastEditTime: 2022-12-05 09:45:03
  */
 import React from 'react';
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
@@ -75,6 +75,8 @@ function Index(props) {
   }, help || (items === null || items === void 0 ? void 0 : items.type))), extraInfo.layout === 'table' && items.type === 'ref' ? /*#__PURE__*/React.createElement(TableArray, {
     initValue: formContext.initialValues,
     readonly: (_extraInfo$disabled = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled !== void 0 ? _extraInfo$disabled : disabled,
+    addButtonHidden: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.addButtonHidden,
+    rowNumber: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.rowNumber) || 10,
     refId: items.refId,
     form: formContext.form,
     name: id

package/es/comps/MetadataForm/DataCell/Number.js

@@ -4,11 +4,12 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import "antd/es/input-number/style";
 import _InputNumber from "antd/es/input-number";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-10-10 11:27:22
+ * @LastEditTime: 2022-12-08 13:45:40
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -27,6 +28,26 @@ function Index(props) {
   var formRefContext = React.useContext(MetadataRefContext);
   var extraInfo = useGetExtraInfo(formRefContext ? formRefContext.fields : formContext.fields, id, formContext.form, props.type);
 
+  var _React$useState = React.useState([]),
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      rules = _React$useState2[0],
+      setRules = _React$useState2[1];
+
+  React.useEffect(function () {
+    var _rules = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.rules;
+
+    if (_rules) {
+      var _ = _rules.map(function (it) {
+        return {
+          pattern: new RegExp(eval(it === null || it === void 0 ? void 0 : it.regExp), 'g'),
+          message: it.message
+        };
+      });
+
+      setRules(_toConsumableArray(_));
+    }
+  }, [extraInfo]);
+
   if (isObj && isRefForm && field) {
     var _extraInfo$disabled;
 
@@ -40,7 +61,7 @@ function Index(props) {
       fieldKey: [field === null || field === void 0 ? void 0 : field.fieldKey],
       rules: [{
         required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
-      }],
+      }].concat(_toConsumableArray(rules)),
       help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
       tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
     }), /*#__PURE__*/React.createElement(_InputNumber, {
@@ -59,7 +80,7 @@ function Index(props) {
     name: name,
     rules: [{
       required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
-    }],
+    }].concat(_toConsumableArray(rules)),
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
   }, /*#__PURE__*/React.createElement(_InputNumber, {
@@ -74,7 +95,7 @@ function Index(props) {
     fieldKey: [field === null || field === void 0 ? void 0 : field.fieldKey],
     rules: [{
       required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
-    }],
+    }].concat(_toConsumableArray(rules)),
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
   }), /*#__PURE__*/React.createElement(_InputNumber, {

package/es/comps/MetadataForm/DataCell/Select.js

@@ -26,7 +26,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-11-28 16:28:25
+ * @LastEditTime: 2022-12-08 14:37:13
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -82,7 +82,7 @@ function Index(props) {
     var _watch = extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$http = extraInfo.http) === null || _extraInfo$http === void 0 ? void 0 : _extraInfo$http.watch;
 
     if (_watch) {
-      var _value = p.payload[_watch];
+      var _value = p === null || p === void 0 ? void 0 : p.payload[_watch];
 
       if (_value) {
         setWatchValue(_value);

package/es/comps/MetadataForm/DataCell/layout/TableArray.d.ts

@@ -4,6 +4,8 @@ interface ITableArrayProps {
     form: FormInstance;
     refId: string;
     readonly?: boolean;
+    rowNumber: number;
+    addButtonHidden?: boolean;
     initValue: any;
 }
 declare const TableArray: (props: ITableArrayProps) => JSX.Element;

package/es/comps/MetadataForm/DataCell/layout/TableArray.js

@@ -18,6 +18,8 @@ import { deepClone } from '../../../../utils';
 var TableArray = function TableArray(props) {
   var initValue = props.initValue,
       readonly = props.readonly,
+      rowNumber = props.rowNumber,
+      addButtonHidden = props.addButtonHidden,
       name = props.name,
       form = props.form,
       refId = props.refId;
@@ -52,7 +54,7 @@ var TableArray = function TableArray(props) {
       setList = _React$useState10[1];
 
   useObservable(function (p) {
-    if ((p === null || p === void 0 ? void 0 : p.type) === 'setFieldsValue') {
+    if ((p === null || p === void 0 ? void 0 : p.type) === 'setFieldsValue' && p.payload[name]) {
       setList(_toConsumableArray(p.payload[name]));
     }
   }, [formContext.stream$]);
@@ -183,7 +185,7 @@ var TableArray = function TableArray(props) {
     var _columns = [];
 
     for (var i = 0; i < _properties.length; i++) {
-      var _extraInfo$disabled;
+      var _extraInfo$common;
 
       var it = _properties[i];
       var extraInfo = refFieldsRef.current.get(it.id);
@@ -192,7 +194,7 @@ var TableArray = function TableArray(props) {
         key: it.id,
         dataIndex: it.id,
         width: processColumnType(it, extraInfo) === 'buttonCell' ? 60 : 100,
-        editable: (_extraInfo$disabled = !extraInfo.disabled) !== null && _extraInfo$disabled !== void 0 ? _extraInfo$disabled : true,
+        editable: !((_extraInfo$common = extraInfo.common) === null || _extraInfo$common === void 0 ? void 0 : _extraInfo$common.disabled),
         type: processColumnType(it, extraInfo),
         enum: it.type === 'enum' ? processEnumData(it, extraInfo) : undefined
       };
@@ -230,7 +232,7 @@ var TableArray = function TableArray(props) {
   return /*#__PURE__*/React.createElement("div", {
     style: {
       width: '100%',
-      height: '340px'
+      height: "".concat(rowNumber * 40 + 40, "px")
     }
   }, /*#__PURE__*/React.createElement(_Form.Item, {
     name: name,
@@ -242,6 +244,8 @@ var TableArray = function TableArray(props) {
     readonly: readonly,
     defaultValue: defaultValue,
     addPosition: "bottom",
+    isAddRow: !addButtonHidden,
+    isAction: !addButtonHidden,
     columns: columns,
     dataSource: list,
     onMulChange: onTableChange,
@@ -252,7 +256,7 @@ var TableArray = function TableArray(props) {
     tableProps: {
       scroll: {
         x: '100%',
-        y: '300px'
+        y: "".concat(rowNumber * 40, "px")
       }
     }
   })));

package/package.json

@@ -1,7 +1,7 @@
 {
   "public": true,
   "name": "ronds-metadata",
-  "version": "1.1.65",
+  "version": "1.1.67",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -52,14 +52,15 @@
     "react": "^17.0.2",
     "react-dnd": "^11.1.3",
     "react-dnd-html5-backend": "^11.1.3",
-    "react-file-viewer": "^1.2.1",
+    "react-jexcel": "^1.0.2",
     "react-markdown": "^8.0.3",
     "react-markdown-editor-lite": "^1.3.2",
     "react-popper": "^2.2.3",
     "react-syntax-highlighter": "^15.5.0",
     "rehype-raw": "^6.1.1",
     "remark-gfm": "^3.0.1",
-    "rxjs": "^7.5.4"
+    "rxjs": "^7.5.4",
+    "xlsx": "^0.18.5"
   },
   "peerDependencies": {
     "antd": ">=4.1.5",