ronds-metadata 1.0.90 → 1.0.91

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

@@ -8,21 +8,15 @@ import "antd/es/button/style";
 import _Button from "antd/es/button";
 import "antd/es/date-picker/style";
 import _DatePicker from "antd/es/date-picker";
-import "antd/es/popover/style";
-import _Popover from "antd/es/popover";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
 
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-11 16:39:26
+ * @LastEditTime: 2022-05-16 09:24:21
  */
 import React from 'react';
-import { BgColorsOutlined } from '@ant-design/icons';
-import { SketchPicker } from 'react-color';
 import { UploadOutlined } from '@ant-design/icons';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
 import { useGetExtraInfo } from '../hooks';
@@ -39,27 +33,6 @@ function Index(props) {
   var formRefContext = React.useContext(MetadataRefContext);
   var extraInfo = useGetExtraInfo(formRefContext ? formRefContext.fields : formContext.fields, id, formContext.form, props.type);
 
-  var _React$useState = React.useState(''),
-      _React$useState2 = _slicedToArray(_React$useState, 2),
-      color = _React$useState2[0],
-      setColor = _React$useState2[1];
-
-  React.useEffect(function () {
-    if ((extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.type) === 'colorPicker') {
-      setColor(formContext.form.getFieldValue(id));
-    }
-  }, [extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.type, formContext.form]);
-
-  var onColorChange = function onColorChange(e) {
-    formContext.form.setFieldsValue(_defineProperty({}, id, e.hex));
-    setColor(e.hex);
-  };
-
-  var colorPicker = /*#__PURE__*/React.createElement(SketchPicker, {
-    color: color,
-    onChange: onColorChange
-  });
-
   var processInputType = function processInputType(_type) {
     var _extraInfo$disabled, _extraInfo$disabled2, _extraInfo$disabled3, _extraInfo$disabled4, _extraInfo$disabled5;
 
@@ -78,22 +51,11 @@ function Index(props) {
         });
 
       case 'colorPicker':
-        return /*#__PURE__*/React.createElement("div", {
-          className: "flex relative"
-        }, /*#__PURE__*/React.createElement(_Input, {
-          value: color,
+        return /*#__PURE__*/React.createElement(_Input, {
+          type: "color",
           disabled: (_extraInfo$disabled3 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled3 !== void 0 ? _extraInfo$disabled3 : disabled,
           placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder
-        }), /*#__PURE__*/React.createElement("div", {
-          style: {
-            position: 'absolute',
-            right: '5px',
-            top: '5px',
-            zIndex: 888
-          }
-        }, /*#__PURE__*/React.createElement(_Popover, {
-          content: colorPicker
-        }, /*#__PURE__*/React.createElement(BgColorsOutlined, null))));
+        });
 
       case 'datePicker':
         return /*#__PURE__*/React.createElement(_DatePicker, {

package/es/comps/MetadataForm/DataCell/layout/TableArray.js

@@ -89,12 +89,14 @@ var TableArray = function TableArray(props) {
         dataIndex: it.id,
         width: 100,
         editable: true,
-        type: it.type
-      }; // 留一列不设宽度以适应弹性布局
-
-      if (i === 0) {
-        delete obj.width;
-      }
+        type: it.type,
+        enum: it.type === 'enum' ? it.enum.map(function (v) {
+          return {
+            label: v.value,
+            value: v.value
+          };
+        }) : undefined
+      };
 
       _columns.push(obj);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "public": true,
   "name": "ronds-metadata",
-  "version": "1.0.90",
+  "version": "1.0.91",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -45,7 +45,6 @@
     "markdown-it-emoji": "^2.0.0",
     "qs": "^6.10.1",
     "react": "^17.0.2",
-    "react-color": "^2.19.3",
     "react-markdown-editor-lite": "^1.3.2",
     "react-popper": "^2.2.3",
     "rxjs": "^7.5.4"