diff --git a/apps/storybook/src/ui/var-tree.stories.tsx b/apps/storybook/src/ui/var-tree.stories.tsx
index 54e9cbba..457ff95d 100644
--- a/apps/storybook/src/ui/var-tree.stories.tsx
+++ b/apps/storybook/src/ui/var-tree.stories.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { VariableTree } from '@music163/tango-designer';
+import { VariableTree } from '@music163/tango-designer/lib/cjs/components';
 import { Box } from 'coral-system';
 
 export default {
diff --git a/packages/setting-form/src/form-ui.tsx b/packages/setting-form/src/form-ui.tsx
index eaded26e..aaa0d722 100644
--- a/packages/setting-form/src/form-ui.tsx
+++ b/packages/setting-form/src/form-ui.tsx
@@ -103,9 +103,11 @@ export function FormControlGroup({
           {extra}
         </Box>
       }
-      borderTop="solid"
-      borderBottom="solid"
+      border="solid"
       borderColor="line.normal"
+      headerProps={{
+        bg: 'fill1',
+      }}
     >
       <Box
         p="m"
diff --git a/packages/setting-form/src/form.tsx b/packages/setting-form/src/form.tsx
index 6fe2778a..4bf2acf0 100644
--- a/packages/setting-form/src/form.tsx
+++ b/packages/setting-form/src/form.tsx
@@ -47,7 +47,8 @@ const formStyle = css`
     margin-top: var(--tango-space-m);
   }
 
-  > .SettingFormMain > .FormControl {
+  > .SettingFormMain > .FormControl,
+  .FormObject {
     margin-left: var(--tango-space-m);
     margin-right: var(--tango-space-m);
   }
diff --git a/packages/ui/src/collapse-panel.tsx b/packages/ui/src/collapse-panel.tsx
index dad6b4fe..6d81e80b 100644
--- a/packages/ui/src/collapse-panel.tsx
+++ b/packages/ui/src/collapse-panel.tsx
@@ -32,6 +32,8 @@ export interface CollapsePanelProps extends Omit<HTMLCoralProps<'div'>, 'title'>
    * 是否显示底部边框线
    */
   showBottomBorder?: boolean;
+  headerProps?: HTMLCoralProps<'div'>;
+  bodyProps?: HTMLCoralProps<'div'>;
 }
 
 const headerStyle = css`
@@ -54,6 +56,8 @@ export function CollapsePanel(props: CollapsePanelProps) {
     onCollapse,
     stickyHeader,
     showBottomBorder = true,
+    headerProps,
+    bodyProps,
     ...rest
   } = props;
   const [collapsed, setCollapsed] = useControllableState({
@@ -92,6 +96,7 @@ export function CollapsePanel(props: CollapsePanelProps) {
         onClick={() => setCollapsed(!collapsed)}
         p="m"
         {...stickHeaderProps}
+        {...headerProps}
         css={headerStyle}
       >
         <Box display="flex" alignItems="center" fontSize="14px" fontWeight="500">
@@ -100,7 +105,7 @@ export function CollapsePanel(props: CollapsePanelProps) {
         </Box>
         <Box>{extra}</Box>
       </Box>
-      <Box className="CollapsePanelBody" display={collapsed ? 'none' : 'block'}>
+      <Box className="CollapsePanelBody" display={collapsed ? 'none' : 'block'} {...bodyProps}>
         {children}
       </Box>
     </Box>