From a69c1e427f9f1c3f181278940057b9345e20dd57 Mon Sep 17 00:00:00 2001
From: "zude.hzd" <zude.hzd@alibaba-inc.com>
Date: Thu, 31 Dec 2020 14:12:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=82=E9=85=8Dvs-style,vs-select?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor-skeleton/src/transducers/addon-combine.ts | 3 +++
 packages/editor-skeleton/src/transducers/parse-props.ts   | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/editor-skeleton/src/transducers/addon-combine.ts b/packages/editor-skeleton/src/transducers/addon-combine.ts
index f20a488bb..2cf987523 100644
--- a/packages/editor-skeleton/src/transducers/addon-combine.ts
+++ b/packages/editor-skeleton/src/transducers/addon-combine.ts
@@ -178,6 +178,9 @@ export default function (metadata: TransformedComponentMetadata): TransformedCom
       name: 'style',
       title: { type: 'i18n', 'zh-CN': '行内样式', 'en-US': 'Style' },
       setter: 'StyleSetter',
+      extraProps: {
+        display: 'block',
+      },
     });
   }
   if (stylesGroup.length > 0) {
diff --git a/packages/editor-skeleton/src/transducers/parse-props.ts b/packages/editor-skeleton/src/transducers/parse-props.ts
index 53e899123..5e70937c3 100644
--- a/packages/editor-skeleton/src/transducers/parse-props.ts
+++ b/packages/editor-skeleton/src/transducers/parse-props.ts
@@ -69,7 +69,7 @@ function propTypeToSetter(propType: PropType): SetterType {
       const componentName = dataSource.length >= 4 ? 'SelectSetter' : 'RadioGroupSetter';
       return {
         componentName,
-        props: { dataSource },
+        props: { dataSource, options: dataSource },
         isRequired,
         initialValue: dataSource[0] ? dataSource[0].value : null,
       };
@@ -139,6 +139,11 @@ function propTypeToSetter(propType: PropType): SetterType {
         componentName: 'FunctionSetter',
         isRequired,
       };
+    case 'color':
+      return {
+        componentName: 'ColorSetter',
+        isRequired,
+      };
     case 'oneOfType':
       return {
         componentName: 'MixedSetter',