From 0522e2f9c38124c326f29d9cfa531ca78003fb94 Mon Sep 17 00:00:00 2001
From: augushong <augushong@163.com>
Date: Fri, 9 Jan 2026 21:28:54 +0800
Subject: [PATCH] =?UTF-8?q?refactor(DbToSchemeService):=20=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E5=AD=97=E6=AE=B5=E6=B3=A8=E8=A7=A3=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BB=A5=E6=8F=90=E9=AB=98=E5=8F=AF=E8=AF=BB?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/scheme/DbToSchemeService.php      | 65 ++++++++++++++++---
 1 file changed, 56 insertions(+), 9 deletions(-)

diff --git a/extend/base/common/service/scheme/DbToSchemeService.php b/extend/base/common/service/scheme/DbToSchemeService.php
index 2ebfac2..5b45be9 100644
--- a/extend/base/common/service/scheme/DbToSchemeService.php
+++ b/extend/base/common/service/scheme/DbToSchemeService.php
@@ -150,22 +150,69 @@ class DbToSchemeService
                 $componentAttr = "\n    #[Component(type: '$compType', options: $optionsCode)]";
             }
 
-            // 构建 Field 注解
-            $defaultStr = is_null($default) ? 'null' : (is_string($default) ? "'$default'" : $default);
-            $nullable = $notNull ? 'false' : 'true';
-            $unsigned = str_contains($type, 'unsigned') ? 'true' : 'false';
-            $primaryStr = $primary ? 'true' : 'false';
-            $autoincStr = $autoinc ? 'true' : 'false';
-            
             // 如果是整型且未指定长度，默认11 (兼容旧习俗)
             if (str_contains($dbType, 'int') && !$length) {
                 $length = 11;
             }
 
-            $lengthStr = is_null($length) ? 'null' : $length;
+            // 构建 Field 注解参数
+            $fieldParams = [];
+
+            // type (default: varchar)
+            if ($dbType !== 'varchar') {
+                $fieldParams[] = "type: '$dbType'";
+            }
+
+            // length (default: null)
+            if ($length !== null) {
+                $fieldParams[] = "length: $length";
+            }
+
+            // precision (default: 0)
+            if ($precision !== 0) {
+                $fieldParams[] = "precision: $precision";
+            }
+
+            // scale (default: 0)
+            if ($scale !== 0) {
+                $fieldParams[] = "scale: $scale";
+            }
+
+            // nullable (default: true)
+            if ($notNull) {
+                $fieldParams[] = "nullable: false";
+            }
+
+            // default (default: null)
+            if (!is_null($default)) {
+                $defaultVal = is_string($default) ? "'$default'" : $default;
+                $fieldParams[] = "default: $defaultVal";
+            }
+
+            // comment (default: '')
+            if ($cleanComment !== '') {
+                $fieldParams[] = "comment: '$cleanComment'";
+            }
+
+            // unsigned (default: false)
+            if (str_contains($type, 'unsigned')) {
+                $fieldParams[] = "unsigned: true";
+            }
+
+            // autoIncrement (default: false)
+            if ($autoinc) {
+                $fieldParams[] = "autoIncrement: true";
+            }
+
+            // primary (default: false)
+            if ($primary) {
+                $fieldParams[] = "primary: true";
+            }
+
+            $fieldAttrStr = implode(', ', $fieldParams);
 
             $fieldsCode[] = <<<PHP
-    #[Field(type: '$dbType', length: $lengthStr, precision: $precision, scale: $scale, nullable: $nullable, default: $defaultStr, comment: '$cleanComment', unsigned: $unsigned, autoIncrement: $autoincStr, primary: $primaryStr)]$componentAttr
+    #[Field($fieldAttrStr)]$componentAttr
     public \$$fieldName;
 PHP;
         }