ronds-metadata 1.0.42 → 1.0.43

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

@@ -6,24 +6,38 @@ 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-08 17:22:26
  */
 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.input.setSelectionRange(0, inputRef.current.state.value.length); // 选中内容
+
+      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.js

@@ -1,17 +1,15 @@
+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 = ["editable", "record", "editableType", "dataIndex", "rowIndex", "children"];
 import React from 'react';
 import { EditableContext } from '../interface';
 import { getDataCell } from '../utils';
 
 var EditableCell = function EditableCell(props) {
   var editable = props.editable,
+      record = props.record,
       editableType = props.editableType,
       dataIndex = props.dataIndex,
       rowIndex = props.rowIndex,
@@ -19,12 +17,43 @@ var EditableCell = function EditableCell(props) {
       restProps = _objectWithoutProperties(props, _excluded);
 
   var _ref = React.useContext(EditableContext) || undefined,
+      editableStream = _ref.editableStream,
       editConfig = _ref.editConfig;
 
+  var onCellClick = function onCellClick() {
+    if (editConfig === null || editConfig === void 0 ? void 0 : editConfig.curRow) {
+      var _editConfig$curRow;
+
+      if (((_editConfig$curRow = editConfig.curRow) === null || _editConfig$curRow === void 0 ? void 0 : _editConfig$curRow.toString().split(',').indexOf("".concat(rowIndex))) > -1) return;
+
+      _message.warning('请先保存正在编辑的行');
+
+      return;
+    }
+
+    editableStream.next({
+      type: 'editCellKey',
+      payload: {
+        dataIndex: dataIndex,
+        rowIndex: rowIndex
+      }
+    });
+  };
+
   if (editableType === 'single') {
     return /*#__PURE__*/React.createElement("td", restProps, editable && editConfig.curRow === rowIndex ? getDataCell(props) : children);
   }
 
+  if (editableType === 'freedom') {
+    var _editConfig$curRow2, _editConfig$editCellK, _editConfig$editCellK2;
+
+    var isAddRow = editable && ((_editConfig$curRow2 = editConfig.curRow) === null || _editConfig$curRow2 === void 0 ? void 0 : _editConfig$curRow2.toString().split(',').indexOf("".concat(rowIndex))) > -1;
+    var isCell = editable && ((_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;
+    return /*#__PURE__*/React.createElement("td", _extends({
+      onDoubleClick: onCellClick
+    }, restProps), isAddRow || isCell ? getDataCell(props) : children);
+  }
+
   return /*#__PURE__*/React.createElement("td", restProps, editable ? getDataCell(props) : children);
 };
 

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;
     /**
-     * 当type为multiple的配置
+     * 新增一列 默认的值
      */
-    multipleProps?: IMultipleProps;
+    defaultValue?: any;
+    /**
+     * 添加行的位置
+     */
+    addPosition?: 'top' | 'bottom';
     /**
      * 数据数组
      */

package/es/comps/Editable/index.js

@@ -3,9 +3,9 @@ import _Button from "antd/es/button";
 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 "antd/es/message/style";
 import _message from "antd/es/message";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React from 'react';
@@ -22,18 +22,14 @@ 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,
       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 +48,13 @@ 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 lastValueRef = React.useRef(); // 记录上一次的datasource
 
@@ -69,8 +71,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 +98,14 @@ var Editable = function Editable(props) {
         editRowKeyRef.current = data.payload._rowKey_;
         break;
 
+      case 'editCellKey':
+        setEditCellkey({
+          dataIndex: data.payload.dataIndex,
+          rowIndex: data.payload.rowIndex
+        });
+        editRowKeyRef.current = data.payload._rowKey_;
+        break;
+
       case 'onSingleSave':
         if (lastValueRef.current && lastValueRef.current.rowIdx === data.payload._rowKey_) {
           onRowConfirm && onRowConfirm({
@@ -113,12 +133,17 @@ 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') {
+          // 正在全行编辑的直接删除，不需要回调
+          onRowDelete && onRowDelete(data.payload);
         }
 
         break;
@@ -217,6 +242,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 +265,8 @@ var Editable = function Editable(props) {
       editableStream: editableStream,
       editConfig: {
         curRow: editRowKey,
-        type: editType
+        type: editType,
+        editCellKey: editCellKey
       }
     }
   }, /*#__PURE__*/React.createElement(_Table, _extends({
@@ -250,7 +289,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,11 +5,11 @@ export interface EditableCellProps extends React.HTMLAttributes<HTMLElement> {
     title: any;
     editable: boolean;
     disabled?: boolean;
-    dataIndex: number;
+    dataIndex: string;
     rowIndex: number;
     record: any;
     type: InputType;
-    editableType: 'single' | 'multiple';
+    editableType: 'single' | 'multiple' | 'freedom';
     enum?: {
         label: string;
         value: string;
@@ -38,21 +38,21 @@ export interface IEditableContextProps {
         /**
          * 当前编辑的行
          */
-        curRow: number;
+        curRow: number | string;
         /**
          * 当前行是编辑还是新增
          */
         type: 'edit' | 'add';
+        editCellKey: {
+            dataIndex: string;
+            rowIndex: number;
+        };
     };
 }
 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-08 17:06:55
  */
 import React from 'react';
 export var EditableContext = /*#__PURE__*/React.createContext(null);

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

@@ -1,2 +1,4 @@
 import { EditableCellProps } from './interface';
 export declare function getDataCell(item: EditableCellProps): JSX.Element;
+export declare function isFreeEditRow(): void;
+export declare function isFreeEditCell(): void;

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 09:27:01
  */
 import React from 'react';
 import Input from './DataCell/Input';
@@ -21,4 +21,6 @@ export function getDataCell(item) {
   }
 
   return null;
-}
+}
+export function isFreeEditRow() {}
+export function isFreeEditCell() {}

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.43",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",