ronds-metadata 1.0.56 → 1.0.59

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

@@ -1,3 +1,5 @@
+import "antd/es/popconfirm/style";
+import _Popconfirm from "antd/es/popconfirm";
 import "antd/es/divider/style";
 import _Divider from "antd/es/divider";
 import "antd/es/button/style";
@@ -5,8 +7,11 @@ import _Button from "antd/es/button";
 import { EditOutlined, CloseOutlined, CheckOutlined, DeleteOutlined } from '@ant-design/icons';
 import React from 'react';
 import { EditableContext } from '../interface';
+import { isFreeEditRow } from '../utils';
 
 var EditableAction = function EditableAction(props) {
+  var _editConfig$editCellK;
+
   var type = props.type,
       record = props.record;
 
@@ -35,6 +40,13 @@ var EditableAction = function EditableAction(props) {
       type: 'onSingleSave',
       payload: record
     });
+    editableStream.next({
+      type: 'editCellKey',
+      payload: {
+        dataIndex: undefined,
+        rowIndex: undefined
+      }
+    });
   };
 
   var onDelete = function onDelete() {
@@ -69,13 +81,30 @@ var EditableAction = function EditableAction(props) {
     title: '取消'
   }), /*#__PURE__*/React.createElement(_Divider, {
     type: "vertical"
-  })))), /*#__PURE__*/React.createElement(_Button, {
+  })))), type === 'freedom' && /*#__PURE__*/React.createElement(React.Fragment, null, (record._rowKey_ === (editConfig === null || editConfig === void 0 ? void 0 : (_editConfig$editCellK = editConfig.editCellKey) === null || _editConfig$editCellK === void 0 ? void 0 : _editConfig$editCellK.rowIndex) || isFreeEditRow(editConfig.curRow, record._rowKey_)) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
+    type: "link",
+    size: "small",
+    icon: /*#__PURE__*/React.createElement(CheckOutlined, null),
+    onClick: onSave,
+    title: '确定'
+  }), /*#__PURE__*/React.createElement(_Divider, {
+    type: "vertical"
+  }))), /*#__PURE__*/React.createElement(_Popconfirm, {
+    placement: 'left',
+    title: "\u786E\u8BA4\u5220\u9664\u8BE5\u6761\u6570\u636E\uFF1F",
+    onConfirm: onDelete,
+    onCancel: function onCancel(e) {
+      e.stopPropagation();
+    },
+    okText: "\u786E\u5B9A",
+    cancelText: "\u53D6\u6D88"
+  }, /*#__PURE__*/React.createElement(_Button, {
     type: "link",
     size: "small",
     icon: /*#__PURE__*/React.createElement(DeleteOutlined, null),
     onClick: onDelete,
     title: '删除'
-  }));
+  })));
 };
 
 export default EditableAction;

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

@@ -24,6 +24,8 @@ var EditableCell = function EditableCell(props) {
 
 
   var onCellDoubleClick = function onCellDoubleClick() {
+    var _editConfig$editCellK, _editConfig$editCellK2;
+
     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;
 
@@ -32,6 +34,12 @@ var EditableCell = function EditableCell(props) {
       return;
     }
 
+    if (((editConfig === null || editConfig === void 0 ? void 0 : (_editConfig$editCellK = editConfig.editCellKey) === null || _editConfig$editCellK === void 0 ? void 0 : _editConfig$editCellK.rowIndex) || (editConfig === null || editConfig === void 0 ? void 0 : (_editConfig$editCellK2 = editConfig.editCellKey) === null || _editConfig$editCellK2 === void 0 ? void 0 : _editConfig$editCellK2.rowIndex) === 0) && rowIndex !== editConfig.editCellKey.rowIndex) {
+      _message.warning('请先保存正在编辑的行');
+
+      return;
+    }
+
     editableStream.next({
       type: 'editCellKey',
       payload: {
@@ -42,16 +50,9 @@ 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 (!isFreeEditCell(editConfig.editCellKey, dataIndex, rowIndex)) {
+    //   editableStream.next({ type: 'editCellKey', payload: { dataIndex: undefined, rowIndex: undefined } });
+    // }
     if (isAddColumn) {
       editableStream.next({
         type: 'editHeardCellKey',

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

@@ -1,4 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
+import "antd/es/popconfirm/style";
+import _Popconfirm from "antd/es/popconfirm";
 import "antd/es/popover/style";
 import _Popover from "antd/es/popover";
 import "antd/es/button/style";
@@ -70,6 +72,16 @@ var EditableHeardCell = function EditableHeardCell(props) {
     };
   };
 
+  var onDeleteColumn = function onDeleteColumn() {
+    setVisible(false);
+    editableStream.next({
+      type: 'onDeleteColumn',
+      payload: {
+        dataIndex: dataIndex
+      }
+    });
+  };
+
   var content = /*#__PURE__*/React.createElement("div", {
     style: {
       width: '100px'
@@ -129,10 +141,19 @@ var EditableHeardCell = function EditableHeardCell(props) {
     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(_Popconfirm, {
+    placement: 'left',
+    title: "\u786E\u8BA4\u5220\u9664\u8BE5\u6761\u5217\uFF1F",
+    onConfirm: onDeleteColumn,
+    onCancel: function onCancel(e) {
+      e.stopPropagation();
+    },
+    okText: "\u786E\u5B9A",
+    cancelText: "\u53D6\u6D88"
   }, /*#__PURE__*/React.createElement(_Button, {
     type: "link",
     icon: /*#__PURE__*/React.createElement(DeleteOutlined, null)
-  })), /*#__PURE__*/React.createElement("div", {
+  }))), /*#__PURE__*/React.createElement("div", {
     onMouseOver: onMouseOver,
     onMouseLeave: onMouseLeave
   }, children)));

package/es/comps/Editable/comps/EditableRow.js

@@ -17,13 +17,7 @@ var EditableRow = function EditableRow(props) {
   React.useEffect(function () {
     if (!form) return;
     form.setFieldsValue(record);
-  }, [record]); // 编辑的时候初始化值
-  // React.useEffect(() => {
-  //   const subscription = editableStream.pipe(filter((p: any) => p?.type === 'editRowKey')).subscribe((p: IEditableStream) => {
-  //     form.setFieldsValue(p.payload);
-  //   });
-  //   return () => subscription.unsubscribe();
-  // }, [editableStream]);
+  }, [record]);
 
   var onValuesChange = function onValuesChange(values, allValues) {
     if (editableStream) {

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

@@ -5,7 +5,7 @@
 }
 .editable-th-hover-delete {
   position: absolute;
-  left: 49%;
+  right: 16px;
   top: -30px;
 }
 .display-none {

package/es/comps/Editable/index.js

@@ -270,10 +270,10 @@ var Editable = function Editable(props) {
       var _aciton_ = {
         dataKey: '_aciton_',
         title: '操作',
-        width: 60,
-        maxWidth: 60,
+        width: 50,
+        maxWidth: 50,
         export: false,
-        minWidth: 60,
+        minWidth: 50,
         frozen: 'right',
         render: function render(val, record) {
           return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(EditableAction, {
@@ -311,6 +311,12 @@ var Editable = function Editable(props) {
 
   var onAddRow = function onAddRow() {
     if (defaultValue) {
+      if (type === 'freedom' && editRowKey) {
+        _message.warn('请先保存正在编辑的行');
+
+        return;
+      }
+
       var _records = recordsRef.current;
 
       if (addPosition === 'top') {

package/package.json

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