ronds-metadata 1.1.64 → 1.1.66

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

@@ -0,0 +1,2 @@
+declare const FileView: () => JSX.Element;
+export default FileView;

package/es/comps/FileView/index.js

@@ -0,0 +1,19 @@
+import React from "react";
+
+/*
+ * @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() {
+  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' //文件地址（后台给返的二进制流也可以）
+
+  }));
+};
+
+export default FileView;

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/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-22 16:10:55
+ * @LastEditTime: 2022-11-28 16:28:25
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -116,10 +116,18 @@ function Index(props) {
               totalRef.current = res === null || res === void 0 ? void 0 : res.total;
 
               if (!(_res && _res.length > 0)) {
-                _context.next = 13;
+                _context.next = 15;
                 break;
               }
 
+              if (!((http === null || http === void 0 ? void 0 : http.isCascader) && http.url.indexOf('{pid}') === -1)) {
+                _context.next = 12;
+                break;
+              }
+
+              return _context.abrupt("return", _res);
+
+            case 12:
               return _context.abrupt("return", _res.map(function (it) {
                 if (http === null || http === void 0 ? void 0 : http.isCascader) {
                   return {
@@ -135,11 +143,11 @@ function Index(props) {
                 }
               }));
 
-            case 13:
+            case 15:
               console.warn("".concat(_url, " is not return success result"));
               return _context.abrupt("return", []);
 
-            case 15:
+            case 17:
             case "end":
               return _context.stop();
           }
@@ -219,6 +227,8 @@ function Index(props) {
 
   var loadData = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(selectedOptions) {
+      var _targetOption$childre;
+
       var targetOption, _children;
 
       return _regeneratorRuntime.wrap(function _callee3$(_context3) {
@@ -227,10 +237,16 @@ function Index(props) {
             case 0:
               targetOption = selectedOptions[selectedOptions.length - 1];
               targetOption.loading = true;
-              _context3.next = 4;
+
+              if (!(!targetOption.isLeaf && (!(targetOption === null || targetOption === void 0 ? void 0 : targetOption.children) || ((_targetOption$childre = targetOption.children) === null || _targetOption$childre === void 0 ? void 0 : _targetOption$childre.length) === 0))) {
+                _context3.next = 7;
+                break;
+              }
+
+              _context3.next = 5;
               return getEnumDataByUrl(extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.http, targetOption.value);
 
-            case 4:
+            case 5:
               _children = _context3.sent;
               setTimeout(function () {
                 targetOption.loading = false;
@@ -238,7 +254,7 @@ function Index(props) {
                 setCascaderOption(_toConsumableArray(cascaderOption));
               }, 500);
 
-            case 6:
+            case 7:
             case "end":
               return _context3.stop();
           }

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/es/index.d.ts

@@ -7,6 +7,7 @@ export { default as JsonView } from './comps/JsonView';
 export { default as JsonEdit } from './comps/JsonEdit';
 export { default as MdEditor } from './comps/MdEdit';
 export { default as MdView } from './comps/MdView';
+export { default as FileView } from './comps/FileView';
 export { default as Editable } from './comps/Editable';
 export { default as DynamicPorts } from './comps/DynamicPorts';
 export { default as DragNode } from './comps/DynamicPorts/comps/DragNode';

package/es/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-09-02 16:19:21
+ * @LastEditTime: 2022-11-25 14:17:34
  */
 import './theme.less';
 export { default as MetadataEdit } from './comps/MetadataEdit';
@@ -12,6 +12,7 @@ export { default as JsonView } from './comps/JsonView';
 export { default as JsonEdit } from './comps/JsonEdit';
 export { default as MdEditor } from './comps/MdEdit';
 export { default as MdView } from './comps/MdView';
+export { default as FileView } from './comps/FileView';
 export { default as Editable } from './comps/Editable';
 export { default as DynamicPorts } from './comps/DynamicPorts';
 export { default as DragNode } from './comps/DynamicPorts/comps/DragNode';

package/package.json

@@ -1,7 +1,7 @@
 {
   "public": true,
   "name": "ronds-metadata",
-  "version": "1.1.64",
+  "version": "1.1.66",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -52,6 +52,7 @@
     "react": "^17.0.2",
     "react-dnd": "^11.1.3",
     "react-dnd-html5-backend": "^11.1.3",
+    "react-file-viewer": "^1.2.1",
     "react-markdown": "^8.0.3",
     "react-markdown-editor-lite": "^1.3.2",
     "react-popper": "^2.2.3",