ronds-metadata 1.0.42 → 1.0.45

package/es/comps/Editable/DataCell/Input.js

@@ -6,24 +6,46 @@ import _Input from "antd/es/input";
 /*
  * @Author: wangxian
  * @Date: 2022-03-04 14:53:50
- * @LastEditTime: 2022-03-08 14:16:12
+ * @LastEditTime: 2022-03-10 14:38:32
  */
 import React from 'react';
 import { EditableContext } from '../interface';
 
 function Index(props) {
   var dataIndex = props.dataIndex,
+      rowIndex = props.rowIndex,
       disabled = props.disabled;
 
   var _ref = React.useContext(EditableContext) || undefined,
       editConfig = _ref.editConfig;
 
+  var inputRef = React.useRef();
+  var firstLoadRef = React.useRef(true);
+  React.useEffect(function () {
+    var _editConfig$editCellK, _editConfig$editCellK2;
+
+    if (!inputRef.current) return;
+
+    if (((_editConfig$editCellK = editConfig.editCellKey) === null || _editConfig$editCellK === void 0 ? void 0 : _editConfig$editCellK.dataIndex) === dataIndex && ((_editConfig$editCellK2 = editConfig.editCellKey) === null || _editConfig$editCellK2 === void 0 ? void 0 : _editConfig$editCellK2.rowIndex) === rowIndex) {
+      if (firstLoadRef.current) {
+        var _inputRef$current$sta, _inputRef$current$sta2;
+
+        // 选中内容
+        inputRef.current.input.setSelectionRange(0, ((_inputRef$current$sta = inputRef.current.state) === null || _inputRef$current$sta === void 0 ? void 0 : (_inputRef$current$sta2 = _inputRef$current$sta.value) === null || _inputRef$current$sta2 === void 0 ? void 0 : _inputRef$current$sta2.length) || 0);
+        firstLoadRef.current = false;
+      } // 设置焦点
+
+
+      inputRef.current.focus();
+    }
+  }, [editConfig]);
   return /*#__PURE__*/React.createElement(_Form.Item, {
     name: dataIndex,
     style: {
       margin: 0
     }
   }, /*#__PURE__*/React.createElement(_Input, {
+    ref: inputRef,
     disabled: editConfig.type === 'edit' ? disabled : false
   }));
 }

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

@@ -6,24 +6,36 @@ import _InputNumber from "antd/es/input-number";
 /*
  * @Author: wangxian
  * @Date: 2022-03-04 14:53:50
- * @LastEditTime: 2022-03-08 14:16:01
+ * @LastEditTime: 2022-03-08 17:26:48
  */
 import React from 'react';
 import { EditableContext } from '../interface';
 
 function Index(props) {
   var dataIndex = props.dataIndex,
+      rowIndex = props.rowIndex,
       disabled = props.disabled;
 
   var _ref = React.useContext(EditableContext) || undefined,
       editConfig = _ref.editConfig;
 
+  var inputRef = React.useRef();
+  React.useEffect(function () {
+    var _editConfig$editCellK, _editConfig$editCellK2;
+
+    if (!inputRef.current) return;
+
+    if (((_editConfig$editCellK = editConfig.editCellKey) === null || _editConfig$editCellK === void 0 ? void 0 : _editConfig$editCellK.dataIndex) === dataIndex && ((_editConfig$editCellK2 = editConfig.editCellKey) === null || _editConfig$editCellK2 === void 0 ? void 0 : _editConfig$editCellK2.rowIndex) === rowIndex) {
+      inputRef.current.focus(); // 设置焦点
+    }
+  }, [editConfig]);
   return /*#__PURE__*/React.createElement(_Form.Item, {
     name: dataIndex,
     style: {
       margin: 0
     }
   }, /*#__PURE__*/React.createElement(_InputNumber, {
+    ref: inputRef,
     disabled: editConfig.type === 'edit' ? disabled : false
   }));
 }

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

@@ -1,5 +1,5 @@
 interface IEditableActionProps {
-    type: 'single' | 'multiple';
+    type: 'single' | 'multiple' | 'freedom';
     record: any;
 }
 declare const EditableAction: (props: IEditableActionProps) => JSX.Element;

package/es/comps/Editable/comps/EditableAction.js

@@ -61,7 +61,7 @@ var EditableAction = function EditableAction(props) {
     title: '确定'
   }), /*#__PURE__*/React.createElement(_Divider, {
     type: "vertical"
-  }), /*#__PURE__*/React.createElement(_Button, {
+  }), editConfig.type === 'edit' && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
     type: "link",
     size: "small",
     icon: /*#__PURE__*/React.createElement(CloseOutlined, null),
@@ -69,7 +69,7 @@ var EditableAction = function EditableAction(props) {
     title: '取消'
   }), /*#__PURE__*/React.createElement(_Divider, {
     type: "vertical"
-  }))), /*#__PURE__*/React.createElement(_Button, {
+  })))), /*#__PURE__*/React.createElement(_Button, {
     type: "link",
     size: "small",
     icon: /*#__PURE__*/React.createElement(DeleteOutlined, null),

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

@@ -1,4 +1,5 @@
 import React from 'react';
 import { EditableCellProps } from '../interface';
+import './index.less';
 declare const EditableCell: React.FC<EditableCellProps>;
 export default EditableCell;

package/es/comps/Editable/comps/EditableCell.js

@@ -1,17 +1,17 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import "antd/es/message/style";
+import _message from "antd/es/message";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["editable", "editableType", "dataIndex", "rowIndex", "children"];
-
-/*
- * @Author: wangxian
- * @Date: 2022-03-04 10:01:10
- * @LastEditTime: 2022-03-08 14:06:58
- */
+var _excluded = ["isAddColumn", "editable", "record", "editableType", "dataIndex", "rowIndex", "children"];
 import React from 'react';
 import { EditableContext } from '../interface';
-import { getDataCell } from '../utils';
+import { getDataCell, isFreeEditCell, isFreeEditRow } from '../utils';
+import "./index.css";
 
 var EditableCell = function EditableCell(props) {
-  var editable = props.editable,
+  var isAddColumn = props.isAddColumn,
+      editable = props.editable,
+      record = props.record,
       editableType = props.editableType,
       dataIndex = props.dataIndex,
       rowIndex = props.rowIndex,
@@ -19,13 +19,65 @@ var EditableCell = function EditableCell(props) {
       restProps = _objectWithoutProperties(props, _excluded);
 
   var _ref = React.useContext(EditableContext) || undefined,
-      editConfig = _ref.editConfig;
+      editableStream = _ref.editableStream,
+      editConfig = _ref.editConfig; // console.log('EditableCell', props, editConfig);
+
+
+  var onCellDoubleClick = function onCellDoubleClick() {
+    if ((editConfig === null || editConfig === void 0 ? void 0 : editConfig.curRow) && (editConfig === null || editConfig === void 0 ? void 0 : editConfig.curRow) !== 'undefined') {
+      if (isFreeEditRow(editConfig.curRow, rowIndex)) return;
+
+      _message.warning('请先保存正在编辑的行');
+
+      return;
+    }
+
+    editableStream.next({
+      type: 'editCellKey',
+      payload: {
+        dataIndex: dataIndex,
+        rowIndex: rowIndex
+      }
+    });
+  };
+
+  var onCellClick = function onCellClick() {
+    if (!isFreeEditCell(editConfig.editCellKey, dataIndex, rowIndex)) {
+      editableStream.next({
+        type: 'editCellKey',
+        payload: {
+          dataIndex: undefined,
+          rowIndex: undefined
+        }
+      });
+    }
+
+    if (isAddColumn) {
+      editableStream.next({
+        type: 'editHeardCellKey',
+        payload: undefined
+      });
+    }
+  };
 
   if (editableType === 'single') {
-    return /*#__PURE__*/React.createElement("td", restProps, editable && editConfig.curRow === rowIndex ? getDataCell(props) : children);
+    return /*#__PURE__*/React.createElement("td", _extends({}, restProps, {
+      className: "ant-table-cell ".concat(isAddColumn && editConfig.editHeardCellKey === dataIndex ? 'border-right' : '', " ")
+    }), editable && editConfig.curRow === rowIndex ? getDataCell(props) : children);
+  }
+
+  if (editableType === 'freedom') {
+    return /*#__PURE__*/React.createElement("td", _extends({
+      onDoubleClick: onCellDoubleClick,
+      onClick: onCellClick
+    }, restProps, {
+      className: "ant-table-cell ".concat(isAddColumn && editConfig.editHeardCellKey === dataIndex ? 'border-right' : '', " ")
+    }), editable && (isFreeEditRow(editConfig.curRow, rowIndex) || isFreeEditCell(editConfig.editCellKey, dataIndex, rowIndex)) ? getDataCell(props) : children);
   }
 
-  return /*#__PURE__*/React.createElement("td", restProps, editable ? getDataCell(props) : children);
+  return /*#__PURE__*/React.createElement("td", _extends({}, restProps, {
+    className: "ant-table-cell ".concat(isAddColumn && editConfig.editHeardCellKey === dataIndex ? 'border-right' : '', " ")
+  }), editable ? getDataCell(props) : children);
 };
 
 export default EditableCell;

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

@@ -0,0 +1,5 @@
+import React from 'react';
+import { EditableHeardCellProps } from '../interface';
+import './index.less';
+declare const EditableHeardCell: React.FC<EditableHeardCellProps>;
+export default EditableHeardCell;

package/es/comps/Editable/comps/EditableHeardCell.js

@@ -0,0 +1,141 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import "antd/es/popover/style";
+import _Popover from "antd/es/popover";
+import "antd/es/button/style";
+import _Button from "antd/es/button";
+import "antd/es/input/style";
+import _Input from "antd/es/input";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["title", "dataIndex", "isAddColumn", "children"];
+import { PlusSquareOutlined, DeleteOutlined } from '@ant-design/icons';
+import React from 'react';
+import { EditableContext } from '../interface';
+import "./index.css";
+
+var EditableHeardCell = function EditableHeardCell(props) {
+  var title = props.title,
+      dataIndex = props.dataIndex,
+      isAddColumn = props.isAddColumn,
+      children = props.children,
+      restProps = _objectWithoutProperties(props, _excluded);
+
+  var _ref = React.useContext(EditableContext) || undefined,
+      editableStream = _ref.editableStream,
+      editConfig = _ref.editConfig;
+
+  var addColumnRef = React.useRef({
+    key: '',
+    title: ''
+  });
+
+  var _React$useState = React.useState({
+    key: '',
+    title: ''
+  }),
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      addColumn = _React$useState2[0],
+      setAddColumn = _React$useState2[1];
+
+  var _React$useState3 = React.useState(false),
+      _React$useState4 = _slicedToArray(_React$useState3, 2),
+      visible = _React$useState4[0],
+      setVisible = _React$useState4[1];
+
+  var onMouseOver = function onMouseOver() {
+    editableStream.next({
+      type: 'editHeardCellKey',
+      payload: dataIndex
+    });
+  };
+
+  var onMouseLeave = function onMouseLeave() {};
+
+  var onAddColumn = function onAddColumn() {
+    setVisible(false);
+    editableStream.next({
+      type: 'onAddColumn',
+      payload: _objectSpread({
+        dataIndex: dataIndex
+      }, addColumnRef.current)
+    });
+    setAddColumn({
+      key: '',
+      title: ''
+    });
+    addColumnRef.current = {
+      key: '',
+      title: ''
+    };
+  };
+
+  var content = /*#__PURE__*/React.createElement("div", {
+    style: {
+      width: '100px'
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginBottom: '10px'
+    }
+  }, /*#__PURE__*/React.createElement(_Input, {
+    value: addColumn.key,
+    style: {
+      width: '100%',
+      marginBottom: '5px'
+    },
+    onChange: function onChange(e) {
+      var _ = addColumnRef.current;
+      _.key = e.target.value;
+      setAddColumn(_objectSpread({}, _));
+      addColumnRef.current = _;
+    },
+    placeholder: "\u8BF7\u8F93\u5165key"
+  }), /*#__PURE__*/React.createElement(_Input, {
+    value: addColumn.title,
+    style: {
+      width: '100%'
+    },
+    onChange: function onChange(e) {
+      var _ = addColumnRef.current;
+      _.title = e.target.value;
+      setAddColumn(_objectSpread({}, _));
+      addColumnRef.current = _;
+    },
+    placeholder: "\u8BF7\u8F93\u5165title",
+    onPressEnter: onAddColumn
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Button, {
+    type: "primary",
+    block: true,
+    onClick: onAddColumn
+  }, "\u786E\u5B9A")));
+
+  var onVisibleChange = function onVisibleChange(b) {
+    setVisible(b);
+  };
+
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("th", _extends({}, restProps, {
+    className: "ant-table-cell ".concat(isAddColumn && editConfig.editHeardCellKey === dataIndex ? 'border-right ' : '', " ")
+  }), isAddColumn && /*#__PURE__*/React.createElement(_Popover, {
+    placement: "rightTop",
+    content: content,
+    trigger: "click",
+    visible: visible,
+    onVisibleChange: onVisibleChange
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(editConfig.editHeardCellKey === dataIndex ? 'editable-th-hover-add' : 'display-none')
+  }, /*#__PURE__*/React.createElement(_Button, {
+    type: "link",
+    icon: /*#__PURE__*/React.createElement(PlusSquareOutlined, null)
+  }))), isAddColumn && /*#__PURE__*/React.createElement("div", {
+    className: "".concat(editConfig.editHeardCellKey === dataIndex ? 'editable-th-hover-delete' : 'display-none')
+  }, /*#__PURE__*/React.createElement(_Button, {
+    type: "link",
+    icon: /*#__PURE__*/React.createElement(DeleteOutlined, null)
+  })), /*#__PURE__*/React.createElement("div", {
+    onMouseOver: onMouseOver,
+    onMouseLeave: onMouseLeave
+  }, children)));
+};
+
+export default EditableHeardCell;

package/es/comps/Editable/comps/index.css

@@ -0,0 +1,19 @@
+.editable-th-hover-add {
+  position: absolute;
+  right: -16px;
+  top: -30px;
+}
+.editable-th-hover-delete {
+  position: absolute;
+  left: 49%;
+  top: -30px;
+}
+.display-none {
+  display: none;
+}
+.border-right {
+  border-right: 1px solid var(--antd-wave-shadow-color) !important;
+}
+.border-top {
+  border-top: 1px solid var(--antd-wave-shadow-color) !important;
+}

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

@@ -1,21 +1,25 @@
 import { TableProps } from 'antd';
 import { BehaviorSubject } from 'rxjs';
-import { EditColumnsType, IEditableStream, IMultipleProps } from './interface';
+import { EditColumnsType, IEditableStream } from './interface';
 interface IEditableProps<R = any> {
     /**
      * 单行编辑或多行编辑。
      * 备注：
      * type为multiple时，一定要设置defaultValue
      */
-    type?: 'single' | 'multiple';
+    type?: 'single' | 'multiple' | 'freedom';
     /**
      * 表格列的配置描述
      */
-    columns: EditColumnsType;
+    columns: EditColumnsType[];
     /**
-     * 当type为multiple的配置
+     * 新增一列 默认的值
      */
-    multipleProps?: IMultipleProps;
+    defaultValue?: any;
+    /**
+     * 添加行的位置
+     */
+    addPosition?: 'top' | 'bottom';
     /**
      * 数据数组
      */
@@ -24,6 +28,10 @@ interface IEditableProps<R = any> {
      * 只读
      */
     readonly?: boolean;
+    /**
+     * 是否可以添加列
+     */
+    isAddColumn?: boolean;
     /**
      * antd自身的属性
      */

package/es/comps/Editable/index.js

@@ -4,9 +4,9 @@ import "antd/es/table/style";
 import _Table from "antd/es/table";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/message/style";
 import _message from "antd/es/message";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React from 'react';
 import { BehaviorSubject } from 'rxjs';
@@ -15,6 +15,8 @@ import EditableCell from './comps/EditableCell';
 import EditableRow from './comps/EditableRow';
 import { EditableContext } from './interface';
 import EditableAction from './comps/EditableAction';
+import { isFreeEditRow, removeCurKeyFromEditRow } from './utils';
+import EditableHeardCell from './comps/EditableHeardCell';
 
 var Editable = function Editable(props) {
   var _props$type = props.type,
@@ -22,18 +24,16 @@ var Editable = function Editable(props) {
       readonly = props.readonly,
       columns = props.columns,
       dataSource = props.dataSource,
-      _props$multipleProps = props.multipleProps,
-      multipleProps = _props$multipleProps === void 0 ? {
-    defaultValue: '',
-    addPosition: 'bottom'
-  } : _props$multipleProps,
+      defaultValue = props.defaultValue,
+      _props$addPosition = props.addPosition,
+      addPosition = _props$addPosition === void 0 ? 'bottom' : _props$addPosition,
+      _props$isAddColumn = props.isAddColumn,
+      isAddColumn = _props$isAddColumn === void 0 ? false : _props$isAddColumn,
       tableProps = props.tableProps,
       onRowConfirm = props.onRowConfirm,
       onRowDelete = props.onRowDelete,
       onMulChange = props.onMulChange,
       getStreamInstance = props.getStreamInstance;
-  var defaultValue = multipleProps.defaultValue,
-      addPosition = multipleProps.addPosition;
 
   var _React$useState = React.useState([]),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -52,7 +52,26 @@ var Editable = function Editable(props) {
       editType = _React$useState6[0],
       setEditType = _React$useState6[1];
 
-  var editRowKeyRef = React.useRef(); // 记录上一次发生改变的行值
+  var editRowKeyRef = React.useRef(); // 当type为freedom的时候可以编辑指定cell
+
+  var _React$useState7 = React.useState(),
+      _React$useState8 = _slicedToArray(_React$useState7, 2),
+      editCellKey = _React$useState8[0],
+      setEditCellkey = _React$useState8[1]; // 添加一列表头
+
+
+  var _React$useState9 = React.useState(),
+      _React$useState10 = _slicedToArray(_React$useState9, 2),
+      editHeardCellKey = _React$useState10[0],
+      setEditHeardCellkey = _React$useState10[1]; // 记录临时加的列头
+
+
+  var _React$useState11 = React.useState([]),
+      _React$useState12 = _slicedToArray(_React$useState11, 2),
+      addColumns = _React$useState12[0],
+      setAddColumns = _React$useState12[1];
+
+  var addColumnsRef = React.useRef([]); // 记录上一次发生改变的行值
 
   var lastValueRef = React.useRef(); // 记录上一次的datasource
 
@@ -62,6 +81,35 @@ var Editable = function Editable(props) {
   var editableStream = React.useMemo(function () {
     return new BehaviorSubject(undefined);
   }, []);
+
+  var processAddColumnsData = function processAddColumnsData(data) {
+    var _columns = addColumnsRef.current.length > 0 ? addColumnsRef.current : columns; // 判断key是否重复
+
+
+    if (_columns.findIndex(function (v) {
+      return v.key === data.key;
+    }) > -1) {
+      _message.warning('表格的key不可以重复');
+
+      return;
+    }
+
+    var idx = _columns.findIndex(function (v) {
+      return v.dataIndex === data.dataIndex;
+    });
+
+    var obj = {
+      title: data.title,
+      key: data.key,
+      dataIndex: data.key
+    };
+
+    _columns.splice(idx + 1, 0, _objectSpread(_objectSpread({}, _columns[0]), obj));
+
+    setAddColumns(_toConsumableArray(_columns));
+    addColumnsRef.current = _columns; // editableStream.next({ type: 'editHeardCellKey', payload: undefined });
+  };
+
   var processStreamFactory = React.useCallback(function (data) {
     switch (data === null || data === void 0 ? void 0 : data.type) {
       case 'onValuesChange':
@@ -69,8 +117,18 @@ var Editable = function Editable(props) {
 
         if (type === 'multiple') {
           var _records = recordsRef.current;
-          _records[data.payload.rowIdx] = data.payload.allValues;
+          _records[data.payload.rowIdx] = _objectSpread(_objectSpread({}, _records[data.payload.rowIdx]), data.payload.allValues);
           onMulChange && onMulChange(_records);
+        } // type为freedom时候处理records
+
+
+        if (type === 'freedom') {
+          var _records2 = recordsRef.current;
+          _records2[data.payload.rowIdx] = _objectSpread(_objectSpread({}, _records2[data.payload.rowIdx]), data.payload.allValues);
+          setRecords(_toConsumableArray(_records2));
+          onMulChange && onMulChange(_objectSpread(_objectSpread({}, data.payload), {}, {
+            records: _records2
+          }));
         }
 
         break;
@@ -86,6 +144,21 @@ var Editable = function Editable(props) {
         editRowKeyRef.current = data.payload._rowKey_;
         break;
 
+      case 'editCellKey':
+        setEditCellkey({
+          dataIndex: data.payload.dataIndex,
+          rowIndex: data.payload.rowIndex
+        });
+        break;
+
+      case 'editHeardCellKey':
+        setEditHeardCellkey(data.payload);
+        break;
+
+      case 'onAddColumn':
+        processAddColumnsData(data.payload);
+        break;
+
       case 'onSingleSave':
         if (lastValueRef.current && lastValueRef.current.rowIdx === data.payload._rowKey_) {
           onRowConfirm && onRowConfirm({
@@ -113,12 +186,32 @@ var Editable = function Editable(props) {
         }
 
         if (type === 'multiple') {
-          var _records2 = recordsRef.current;
+          var _records3 = recordsRef.current;
 
-          _records2.splice(data.payload._rowKey_, 1);
+          _records3.splice(data.payload._rowKey_, 1);
 
-          setRecords(_toConsumableArray(_records2));
-          recordsRef.current = _records2;
+          setRecords(_toConsumableArray(_records3));
+          recordsRef.current = _records3;
+        }
+
+        if (type === 'freedom') {
+          // 正在全行编辑的直接删除，不需要回调
+          if (isFreeEditRow(editRowKeyRef.current, data.payload._rowKey_)) {
+            var _records4 = recordsRef.current;
+
+            _records4.splice(data.payload._rowKey_, 1);
+
+            setRecords(_toConsumableArray(_records4));
+            recordsRef.current = _records4; // 移除当前的行的编辑状态
+
+            var _editRowKey = removeCurKeyFromEditRow(editRowKeyRef.current, data.payload._rowKey_);
+
+            setEditRowkey(_editRowKey);
+            editRowKeyRef.current = _editRowKey;
+            return;
+          }
+
+          onRowDelete && onRowDelete(data.payload);
         }
 
         break;
@@ -156,18 +249,30 @@ var Editable = function Editable(props) {
       _column.onCell = function (record, rowIndex) {
         return _objectSpread(_objectSpread({
           record: record,
-          editableType: type
+          editableType: type,
+          isAddColumn: isAddColumn
         }, pick(column, ['editable', 'title', 'dataIndex', 'type', 'enum', 'disabled'])), {}, {
           rowIndex: rowIndex
         });
       };
     }
 
+    if (isAddColumn) {
+      _column.onHeaderCell = function (col) {
+        return _objectSpread({
+          width: col.width,
+          isAddColumn: isAddColumn
+        }, pick(column, ['title', 'dataIndex']));
+      };
+    }
+
     return _column;
   }, [readonly, type]); // 处理一下编辑表格的数据
 
   var _columns = React.useMemo(function () {
-    var res = columns.map(getEditColumn);
+    var __columns__ = addColumns && addColumns.length > 0 ? addColumns : columns;
+
+    var res = __columns__.map(getEditColumn);
 
     if (!readonly) {
       var _aciton_ = {
@@ -189,7 +294,7 @@ var Editable = function Editable(props) {
     }
 
     return res;
-  }, [columns, readonly, type]); // 主要是自己加一层rowkey
+  }, [columns, readonly, type, addColumns]); // 主要是自己加一层rowkey
 
 
   var _dataSource = React.useMemo(function () {
@@ -217,6 +322,19 @@ var Editable = function Editable(props) {
         _records.push(defaultValue);
       }
 
+      if (type === 'freedom') {
+        var _editRowKeyRef$curren;
+
+        var _editRowKeyArr = ((_editRowKeyRef$curren = editRowKeyRef.current) === null || _editRowKeyRef$curren === void 0 ? void 0 : _editRowKeyRef$curren.toString().split(',')) || ['undefined'];
+
+        var _curKey = addPosition === 'top' ? _editRowKeyArr.length - 1 : _records.length - 1;
+
+        var _editRowKey = "".concat(editRowKeyRef.current, ",").concat(_curKey);
+
+        setEditRowkey(_editRowKey);
+        editRowKeyRef.current = _editRowKey;
+      }
+
       setRecords(_toConsumableArray(_records));
       recordsRef.current = _records;
     }
@@ -227,7 +345,9 @@ var Editable = function Editable(props) {
       editableStream: editableStream,
       editConfig: {
         curRow: editRowKey,
-        type: editType
+        type: editType,
+        editCellKey: editCellKey,
+        editHeardCellKey: editHeardCellKey
       }
     }
   }, /*#__PURE__*/React.createElement(_Table, _extends({
@@ -239,6 +359,9 @@ var Editable = function Editable(props) {
     columns: _columns,
     dataSource: _dataSource,
     components: {
+      header: {
+        cell: EditableHeardCell
+      },
       body: {
         row: EditableRow,
         cell: EditableCell
@@ -250,7 +373,7 @@ var Editable = function Editable(props) {
         index: index
       };
     }
-  })), type === 'multiple' && /*#__PURE__*/React.createElement(_Button, {
+  })), (type === 'multiple' || type === 'freedom') && /*#__PURE__*/React.createElement(_Button, {
     block: true,
     type: "dashed",
     style: {

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

@@ -5,17 +5,25 @@ export interface EditableCellProps extends React.HTMLAttributes<HTMLElement> {
     title: any;
     editable: boolean;
     disabled?: boolean;
-    dataIndex: number;
+    dataIndex: string;
+    isAddColumn: boolean;
     rowIndex: number;
     record: any;
     type: InputType;
-    editableType: 'single' | 'multiple';
+    editableType: 'single' | 'multiple' | 'freedom';
     enum?: {
         label: string;
         value: string;
     }[];
     children: React.ReactNode;
 }
+export interface EditableHeardCellProps extends React.HTMLAttributes<HTMLElement> {
+    title: any;
+    width: number;
+    isAddColumn: boolean;
+    dataIndex: string;
+    children: React.ReactNode;
+}
 export interface EditableRowProps extends React.HTMLAttributes<HTMLElement> {
     rowIndex: number;
     record?: any;
@@ -38,21 +46,22 @@ export interface IEditableContextProps {
         /**
          * 当前编辑的行
          */
-        curRow: number;
+        curRow: number | string;
         /**
          * 当前行是编辑还是新增
          */
         type: 'edit' | 'add';
+        editCellKey: {
+            dataIndex: string;
+            rowIndex: number;
+        };
+        editHeardCellKey: string;
     };
 }
 export declare const EditableContext: React.Context<IEditableContextProps>;
-export interface IMultipleProps {
-    /**
-     * 新增一列 默认的值
-     */
-    defaultValue: any;
-    /**
-     * 添加行的位置
-     */
-    addPosition?: 'top' | 'bottom';
+export interface ICommonProps {
+}
+export interface IMultipleProps extends ICommonProps {
+}
+export interface IFreedomProps extends ICommonProps {
 }

package/es/comps/Editable/interface.js

@@ -1,7 +1,7 @@
 /*
  * @Author: wangxian
  * @Date: 2022-03-04 15:07:57
- * @LastEditTime: 2022-03-08 13:59:06
+ * @LastEditTime: 2022-03-10 13:49:40
  */
 import React from 'react';
 export var EditableContext = /*#__PURE__*/React.createContext(null);

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

@@ -1,2 +1,5 @@
 import { EditableCellProps } from './interface';
 export declare function getDataCell(item: EditableCellProps): JSX.Element;
+export declare function isFreeEditRow(curRow: any, rowIndex: number): boolean;
+export declare function isFreeEditCell(editCellKey: any, dataIndex: string, rowIndex: number): boolean;
+export declare function removeCurKeyFromEditRow(editRowKey: any, curKey: number): string;

package/es/comps/Editable/utils.js

@@ -1,7 +1,7 @@
 /*
  * @Author: wangxian
  * @Date: 2022-03-04 14:59:04
- * @LastEditTime: 2022-03-04 15:28:47
+ * @LastEditTime: 2022-03-09 10:42:38
  */
 import React from 'react';
 import Input from './DataCell/Input';
@@ -21,4 +21,22 @@ export function getDataCell(item) {
   }
 
   return null;
+}
+export function isFreeEditRow(curRow, rowIndex) {
+  return (curRow === null || curRow === void 0 ? void 0 : curRow.toString().split(',').indexOf("".concat(rowIndex))) > -1;
+}
+export function isFreeEditCell(editCellKey, dataIndex, rowIndex) {
+  return (editCellKey === null || editCellKey === void 0 ? void 0 : editCellKey.dataIndex) === dataIndex && (editCellKey === null || editCellKey === void 0 ? void 0 : editCellKey.rowIndex) === rowIndex;
+}
+export function removeCurKeyFromEditRow(editRowKey, curKey) {
+  var keys = editRowKey.toString().split(',');
+  var res = [];
+  keys.forEach(function (v) {
+    if (parseInt(v) > curKey) {
+      res.push(parseInt(v) - 1);
+    } else if (v !== "".concat(curKey)) {
+      res.push(v);
+    }
+  });
+  return res.toString();
 }

package/es/comps/MetadataEdit/components/MetaPropsEdit.d.ts

@@ -5,6 +5,7 @@ interface IMetaPropsEditProps {
     metadataTag?: string;
     name: string;
     isEdit?: boolean;
+    isAddFields?: boolean;
     onAddFields?: (idx: number) => void;
     onNewRefClick?: () => void;
 }

package/es/comps/MetadataEdit/components/MetaPropsEdit.js

@@ -23,6 +23,8 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
       id = props.id,
       metadataTag = props.metadataTag,
       name = props.name,
+      _props$isAddFields = props.isAddFields,
+      isAddFields = _props$isAddFields === void 0 ? true : _props$isAddFields,
       onAddFields = props.onAddFields,
       onNewRefClick = props.onNewRefClick;
 
@@ -320,7 +322,7 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
       },
       block: true,
       icon: /*#__PURE__*/React.createElement(PlusOutlined, null)
-    }, "\u6DFB\u52A0".concat(name, "\u540D\u79F0"))), /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(_Button, {
+    }, "\u6DFB\u52A0".concat(name, "\u540D\u79F0"))), isAddFields && /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(_Button, {
       type: "dashed",
       onClick: function onClick() {
         onAddFields(-1);

package/es/index.d.ts

@@ -1,4 +1,5 @@
 export { default as MetadataEdit } from './comps/MetadataEdit';
+export { default as MetaPropsEdit } from './comps/MetadataEdit/components/MetaPropsEdit';
 export { default as MetadataEditV2 } from './comps/MetadataEditV2';
 export { default as MetadataForm } from './comps/MetadataForm';
 export { default as JsonView } from './comps/JsonView';

package/es/index.js

@@ -1,9 +1,10 @@
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-03-04 16:53:30
+ * @LastEditTime: 2022-03-09 08:43:55
  */
 export { default as MetadataEdit } from './comps/MetadataEdit';
+export { default as MetaPropsEdit } from './comps/MetadataEdit/components/MetaPropsEdit';
 export { default as MetadataEditV2 } from './comps/MetadataEditV2';
 export { default as MetadataForm } from './comps/MetadataForm';
 export { default as JsonView } from './comps/JsonView';

package/package.json

@@ -1,7 +1,7 @@
 {
  "public": true,
   "name": "ronds-metadata",
-  "version": "1.0.42",
+  "version": "1.0.45",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",