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;
+}