From 2e031cc1346fb6ea739f0d45a89213b6577dc7ee Mon Sep 17 00:00:00 2001
From: roymondchen <roymondchen@tencent.com>
Date: Thu, 23 Jul 2026 19:26:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(design):=20=E4=BC=98=E5=8C=96=20FormItem?=
 =?UTF-8?q?=20=E5=92=8C=20colorPicker=20=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/design/src/FormItem.vue           | 4 ++--
 packages/design/src/theme/colorPicker.scss | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/design/src/FormItem.vue b/packages/design/src/FormItem.vue
index 04620ecd..071d9306 100644
--- a/packages/design/src/FormItem.vue
+++ b/packages/design/src/FormItem.vue
@@ -47,8 +47,8 @@ const uiComponent = ui?.component || 'el-form-item';
 
 const adapterType = getDesignConfig('adapterType');
 
-const formInline = inject<boolean>('formInline');
-const formInRow = inject<boolean>('isInRow');
+const formInline = inject<boolean>('formInline', false);
+const formInRow = inject<boolean>('isInRow', false);
 const uiProps = computed<FormItemProps>(() => {
   const { extra, extraTips, ...rest } = ui?.props(props) || props;
   if (isGlobalFlat.value && rest.labelPosition === undefined) {
diff --git a/packages/design/src/theme/colorPicker.scss b/packages/design/src/theme/colorPicker.scss
index b20c57ff..435119ef 100644
--- a/packages/design/src/theme/colorPicker.scss
+++ b/packages/design/src/theme/colorPicker.scss
@@ -2,3 +2,7 @@
   margin-left: 8px;
   width: calc(var(--el-input-width, 100%) - 40px);
 }
+
+.tmagic-design-color-picker {
+  flex: 0 0 auto;
+}