ronds-metadata 1.0.58 → 1.0.61

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";
@@ -87,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的实例

package/es/comps/MetadataEditV2/index.js

@@ -82,9 +82,8 @@ var MetadataEditV2 = function MetadataEditV2(props) {
   }, [form, initialValues]);
 
   var onMyFinish = function onMyFinish(values) {
-    debugger; // console.log('values:', values, JSON.stringify(values));
+    // console.log('values:', values, JSON.stringify(values));
     // console.log('values:', values);
-
     var _metaSchema = metaSchemaRef.current;
     _metaSchema.id = values.id;
     _metaSchema.type = values.type;
@@ -164,7 +163,6 @@ var MetadataEditV2 = function MetadataEditV2(props) {
   };
 
   var onAddFields = function onAddFields(index) {
-    // debugger;
     if (index === -1) {
       var _id = form.getFieldValue('id');
 
@@ -208,8 +206,6 @@ var MetadataEditV2 = function MetadataEditV2(props) {
   };
 
   var onFieldsChange = function onFieldsChange(values) {
-    // debugger;
-    // console.log('onFieldsChange', values, curFields);
     var _fields = fields;
     _fields[curFields.id] = values;
     setFields(_objectSpread({}, _fields));
@@ -221,7 +217,6 @@ var MetadataEditV2 = function MetadataEditV2(props) {
   };
 
   var processFileds = function processFileds(schema) {
-    debugger;
     var _properties = schema.properties;
     var _fields = fields;
 

package/es/comps/MetadataForm/DataCell/Array.js

@@ -4,6 +4,12 @@ import "antd/es/button/style";
 import _Button from "antd/es/button";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+
+/*
+ * @Author: wangxian
+ * @Date: 2021-09-18 14:15:04
+ * @LastEditTime: 2022-04-11 09:52:46
+ */
 import React from 'react';
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
 import { MetadataFormContext } from '../interface';
@@ -11,7 +17,7 @@ import { useGetExtraInfo } from '../hooks';
 import { getDataCell } from '../utils';
 
 function Index(props) {
-  var _fields$0$value;
+  var _fields$, _fields$$value;
 
   var id = props.id,
       items = props.items,
@@ -33,7 +39,6 @@ function Index(props) {
       setHelp(arr[arr.length - 1]);
     }
   }, [items]);
-  debugger;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     style: {
       position: 'relative',
@@ -43,7 +48,7 @@ function Index(props) {
     className: "ant-form-item-label mt-1"
   }, /*#__PURE__*/React.createElement("label", {
     className: "".concat((extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require) && 'ant-form-item-required')
-  }, extraInfo.label || ((_fields$0$value = fields[0].value) === null || _fields$0$value === void 0 ? void 0 : _fields$0$value.label) || id)), formContext.isShowTypeInfo && /*#__PURE__*/React.createElement("div", {
+  }, extraInfo.label || ((_fields$ = fields[0]) === null || _fields$ === void 0 ? void 0 : (_fields$$value = _fields$.value) === null || _fields$$value === void 0 ? void 0 : _fields$$value.label) || id)), formContext.isShowTypeInfo && /*#__PURE__*/React.createElement("div", {
     style: {
       padding: '0 6px',
       position: 'absolute',

package/es/framework/metadata/index.js

@@ -320,7 +320,6 @@ export var JsonMetadataProvider = /*#__PURE__*/function (_MetadataProvider) {
   }, {
     key: "__visit_field",
     value: function __visit_field(id, value) {
-      debugger;
       return this.__visit_type(id, value);
     }
   }, {

package/package.json

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