ronds-metadata 1.0.43 → 1.0.44

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

@@ -6,7 +6,7 @@ import _Input from "antd/es/input";
 /*
  * @Author: wangxian
  * @Date: 2022-03-04 14:53:50
- * @LastEditTime: 2022-03-08 17:22:26
+ * @LastEditTime: 2022-03-09 11:13:21
  */
 import React from 'react';
 import { EditableContext } from '../interface';
@@ -20,15 +20,21 @@ function Index(props) {
       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) {
-      inputRef.current.input.setSelectionRange(0, inputRef.current.state.value.length); // 选中内容
+      if (firstLoadRef.current) {
+        // 选中内容
+        inputRef.current.input.setSelectionRange(0, inputRef.current.state.value.length);
+        firstLoadRef.current = false;
+      } // 设置焦点
 
-      inputRef.current.focus(); // 设置焦点
+
+      inputRef.current.focus();
     }
   }, [editConfig]);
   return /*#__PURE__*/React.createElement(_Form.Item, {

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

@@ -5,7 +5,8 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["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,
@@ -20,7 +21,7 @@ var EditableCell = function EditableCell(props) {
       editableStream = _ref.editableStream,
       editConfig = _ref.editConfig;
 
-  var onCellClick = function onCellClick() {
+  var onCellDoubleClick = function onCellDoubleClick() {
     if (editConfig === null || editConfig === void 0 ? void 0 : editConfig.curRow) {
       var _editConfig$curRow;
 
@@ -40,18 +41,27 @@ var EditableCell = function EditableCell(props) {
     });
   };
 
+  var onCellClick = function onCellClick() {
+    if (!isFreeEditCell(editConfig.editCellKey, dataIndex, rowIndex)) {
+      editableStream.next({
+        type: 'editCellKey',
+        payload: {
+          dataIndex: undefined,
+          rowIndex: undefined
+        }
+      });
+    }
+  };
+
   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);
+      onDoubleClick: onCellDoubleClick,
+      onClick: onCellClick
+    }, restProps), editable && (isFreeEditRow(editConfig.curRow, rowIndex) || isFreeEditCell(editConfig.editCellKey, dataIndex, rowIndex)) ? getDataCell(props) : children);
   }
 
   return /*#__PURE__*/React.createElement("td", restProps, editable ? getDataCell(props) : children);

package/es/comps/Editable/index.js

@@ -15,6 +15,7 @@ import EditableCell from './comps/EditableCell';
 import EditableRow from './comps/EditableRow';
 import { EditableContext } from './interface';
 import EditableAction from './comps/EditableAction';
+import { isFreeEditRow, removeCurKeyFromEditRow } from './utils';
 
 var Editable = function Editable(props) {
   var _props$type = props.type,
@@ -143,6 +144,21 @@ var Editable = function Editable(props) {
 
         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);
         }
 

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

@@ -1,4 +1,5 @@
 import { EditableCellProps } from './interface';
 export declare function getDataCell(item: EditableCellProps): JSX.Element;
-export declare function isFreeEditRow(): void;
-export declare function isFreeEditCell(): void;
+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-09 09:27:01
+ * @LastEditTime: 2022-03-09 10:42:38
  */
 import React from 'react';
 import Input from './DataCell/Input';
@@ -22,5 +22,21 @@ export function getDataCell(item) {
 
   return null;
 }
-export function isFreeEditRow() {}
-export function isFreeEditCell() {}
+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/package.json

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