ronds-metadata 1.1.65 → 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/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/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.66",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",