ronds-metadata 1.0.57 → 1.0.60

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";
@@ -38,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() {
@@ -80,13 +89,22 @@ var EditableAction = function EditableAction(props) {
     title: '确定'
   }), /*#__PURE__*/React.createElement(_Divider, {
     type: "vertical"
-  }))), /*#__PURE__*/React.createElement(_Button, {
+  }))), /*#__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/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/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

@@ -129,6 +129,10 @@ var Editable = function Editable(props) {
         processAddColumnsData(data.payload);
         break;
 
+      case 'onDeleteColumn':
+        processDeleteColumnsData(data.payload);
+        break;
+
       case 'onSingleSave':
         if (lastValueRef.current && lastValueRef.current.rowIdx === data.payload._rowKey_) {
           onRowConfirm && onRowConfirm({
@@ -178,6 +182,12 @@ var Editable = function Editable(props) {
 
             setEditRowkey(_editRowKey);
             editRowKeyRef.current = _editRowKey;
+            editableStream.next({
+              type: 'editRowKey',
+              payload: {
+                _rowkey_: undefined
+              }
+            });
             return;
           }
 
@@ -214,6 +224,16 @@ var Editable = function Editable(props) {
 
     _columns.splice(idx + 1, 0, _objectSpread(_objectSpread({}, _columns[0]), obj));
 
+    setAddColumns(_toConsumableArray(_columns));
+    addColumnsRef.current = _columns; // editableStream.next({ type: 'editHeardCellKey', payload: undefined });
+  };
+
+  var processDeleteColumnsData = function processDeleteColumnsData(data) {
+    var _columns = addColumnsRef.current.length > 0 ? addColumnsRef.current : columns;
+
+    _columns = _columns.filter(function (v) {
+      return v.dataIndex != data.dataIndex;
+    });
     setAddColumns(_toConsumableArray(_columns));
     addColumnsRef.current = _columns; // editableStream.next({ type: 'editHeardCellKey', payload: undefined });
   }; // 返回stream的实例
@@ -311,6 +331,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.57",
+  "version": "1.0.60",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",