diff --git a/public/_locales/zh_CN/messages.json b/public/_locales/zh_CN/messages.json
index bd83827..7d6f8ca 100644
--- a/public/_locales/zh_CN/messages.json
+++ b/public/_locales/zh_CN/messages.json
@@ -1011,10 +1011,6 @@
     "message": "数据格式",
     "description": "Translation key: testDataGenerator_format"
   },
-  "testDataGenerator_defaultNullRate": {
-    "message": "默认空值率",
-    "description": "Translation key: testDataGenerator_defaultNullRate"
-  },
   "testDataGenerator_generate": {
     "message": "生成数据",
     "description": "Translation key: testDataGenerator_generate"
@@ -1163,6 +1159,10 @@
     "message": "确认",
     "description": "Translation key: testDataGenerator_confirm"
   },
+  "testDataGenerator_done": {
+    "message": "完成",
+    "description": "Translation key: testDataGenerator_done"
+  },
   "testDataGenerator_noSearchResults": {
     "message": "未找到匹配的规则",
     "description": "Translation key: testDataGenerator_noSearchResults"
diff --git a/src/components/ui/dialog.tsx b/src/components/ui/dialog.tsx
index c226b38..68fa678 100644
--- a/src/components/ui/dialog.tsx
+++ b/src/components/ui/dialog.tsx
@@ -26,10 +26,16 @@ const DialogOverlay = React.forwardRef<
 ));
 DialogOverlay.displayName = DialogPrimitive.Overlay.displayName;
 
+interface DialogContentProps extends React.ComponentPropsWithoutRef<
+  typeof DialogPrimitive.Content
+> {
+  showCloseButton?: boolean;
+}
+
 const DialogContent = React.forwardRef<
   React.ElementRef<typeof DialogPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content>
->(({ className, children, ...props }, ref) => (
+  DialogContentProps
+>(({ className, children, showCloseButton = true, ...props }, ref) => (
   <DialogPortal>
     <DialogOverlay />
     <DialogPrimitive.Content
@@ -41,10 +47,12 @@ const DialogContent = React.forwardRef<
       {...props}
     >
       {children}
-      <DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
-        <X className="h-4 w-4" />
-        <span className="sr-only">Close</span>
-      </DialogPrimitive.Close>
+      {showCloseButton && (
+        <DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
+          <X className="h-4 w-4" />
+          <span className="sr-only">Close</span>
+        </DialogPrimitive.Close>
+      )}
     </DialogPrimitive.Content>
   </DialogPortal>
 ));
diff --git a/src/pages/TestDataGenerator/index.tsx b/src/pages/TestDataGenerator/index.tsx
index a3c2163..5e9365c 100644
--- a/src/pages/TestDataGenerator/index.tsx
+++ b/src/pages/TestDataGenerator/index.tsx
@@ -9,6 +9,7 @@ import { cn } from '@/lib/utils';
 import { useGenerator } from './hooks/useGenerator';
 import type { FieldConfig, GenerateResult } from '@/types/testDataGenerator';
 import { Dialog, DialogContent } from '@/components/ui/dialog';
+import { Button } from '@/components/ui/button';
 import { toast } from 'sonner';
 
 // 生成唯一 ID 的辅助函数
@@ -39,7 +40,6 @@ export default function TestDataGeneratorPage() {
   // 生成选项
   const [count, setCount] = useState(100);
   const [format, setFormat] = useState<'json' | 'csv'>('json');
-  const [defaultNullRate, setDefaultNullRate] = useState(10);
 
   // 当前标签页
   const [activeTab, setActiveTab] = useState<TabType>('fields');
@@ -206,8 +206,6 @@ export default function TestDataGeneratorPage() {
                 onCountChange={setCount}
                 format={format}
                 onFormatChange={setFormat}
-                defaultNullRate={defaultNullRate}
-                onDefaultNullRateChange={setDefaultNullRate}
               />
             </div>
 
@@ -264,8 +262,11 @@ export default function TestDataGeneratorPage() {
 
       {/* 字段编辑弹窗 */}
       <Dialog open={isEditorOpen} onOpenChange={setIsEditorOpen}>
-        <DialogContent className="w-[calc(100vw-4rem)] max-w-[420px] max-h-[calc(100vh-4rem)] overflow-hidden p-0 pt-8">
-          <div className="overflow-y-auto max-h-[calc(100vh-6rem)] px-6 pb-6">
+        <DialogContent
+          showCloseButton={false}
+          className="w-[calc(100vw-4rem)] max-w-[420px] max-h-[calc(100vh-4rem)] p-0 pt-6 flex flex-col"
+        >
+          <div className="flex-1 overflow-y-auto px-6 pb-4">
             {selectedField && selectedIndex !== null && (
               <FieldEditor
                 field={selectedField}
@@ -273,6 +274,14 @@ export default function TestDataGeneratorPage() {
               />
             )}
           </div>
+          <div className="flex justify-end gap-2 px-6 py-2 border-t shrink-0">
+            <Button variant="ghost" size="sm" onClick={() => setIsEditorOpen(false)}>
+              {t('testDataGenerator_cancel')}
+            </Button>
+            <Button size="sm" onClick={() => setIsEditorOpen(false)}>
+              {t('testDataGenerator_done')}
+            </Button>
+          </div>
         </DialogContent>
       </Dialog>
     </div>