From b2f33809d0bbb4f0695e26ef3596935b3ecd3539 Mon Sep 17 00:00:00 2001
From: wangxiao <wanngxiao@gmail.com>
Date: Mon, 20 Sep 2021 01:24:26 +0800
Subject: [PATCH 1/2] fix(element): fix select label error

---
 .../docs/demos/guide/select/template-async.vue    |  5 +++--
 packages/element/src/select/index.ts              | 15 +++++----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/packages/element/docs/demos/guide/select/template-async.vue b/packages/element/docs/demos/guide/select/template-async.vue
index f3e57188e6f..102afb523ca 100644
--- a/packages/element/docs/demos/guide/select/template-async.vue
+++ b/packages/element/docs/demos/guide/select/template-async.vue
@@ -12,13 +12,13 @@
           },
         },
       ]"
-      :enum="[
+      :dataSource="[
         { label: '发请求1', value: 1 },
         { label: '发请求2', value: 2 },
       ]"
     />
     <Field
-      name="[Select]"
+      name="select"
       title="异步选择框"
       :decorator="[FormItem]"
       :component="[
@@ -57,6 +57,7 @@ const form = createForm({
     useAsyncDataSource('select', async (field) => {
       const linkage = field.query('linkage').get('value')
       if (!linkage) return []
+
       return new Promise((resolve) => {
         setTimeout(() => {
           if (linkage === 1) {
diff --git a/packages/element/src/select/index.ts b/packages/element/src/select/index.ts
index b2d4f778bd3..d7d0a1e44a5 100644
--- a/packages/element/src/select/index.ts
+++ b/packages/element/src/select/index.ts
@@ -7,14 +7,10 @@ import type {
   Option as ElOptionProps,
 } from 'element-ui'
 import { Select as ElSelect, Option as ElOption } from 'element-ui'
-import { resolveComponent, SlotTypes } from '../__builtins__'
+import { resolveComponent } from '../__builtins__'
 
 export type SelectProps = ElSelectProps & {
-  options?: Array<
-    Omit<ElOptionProps, 'label'> & {
-      label: SlotTypes
-    }
-  >
+  options?: Array<ElOptionProps>
 }
 
 const SelectOption = defineComponent<SelectProps>({
@@ -31,10 +27,10 @@ const SelectOption = defineComponent<SelectProps>({
                   if (typeof option === 'string') {
                     return h(
                       ElOption,
-                      { props: { value: option } },
+                      { props: { value: option, label: option } },
                       {
                         default: () => [
-                          resolveComponent(slots?.option ?? option, { option }),
+                          resolveComponent(slots?.option, { option }),
                         ],
                       }
                     )
@@ -44,12 +40,11 @@ const SelectOption = defineComponent<SelectProps>({
                       {
                         props: {
                           ...option,
-                          label: '',
                         },
                       },
                       {
                         default: () => [
-                          resolveComponent(slots?.option ?? option.label, {
+                          resolveComponent(slots?.option, {
                             option,
                           }),
                         ],

From 273fce7d4ffffcdc7a157d1c1751bc8e2e61b9ee Mon Sep 17 00:00:00 2001
From: wangxiao <wanngxiao@gmail.com>
Date: Mon, 20 Sep 2021 01:54:49 +0800
Subject: [PATCH 2/2] feat(element): add form layout inline support

---
 packages/element/src/form-layout/style.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/element/src/form-layout/style.scss b/packages/element/src/form-layout/style.scss
index e69de29bb2d..c77f85a5797 100644
--- a/packages/element/src/form-layout/style.scss
+++ b/packages/element/src/form-layout/style.scss
@@ -0,0 +1,6 @@
+@import '../__builtins__/styles/common.scss';
+
+.#{$formily-prefix}-form-inline {
+  display: flex;
+  flex-wrap: wrap;
+}