From bc03616e439329be05563709dab822a8ffbd6ed2 Mon Sep 17 00:00:00 2001
From: wolfcode <37436228+wolf-leo@users.noreply.github.com>
Date: Thu, 27 Mar 2025 14:58:32 +0800
Subject: [PATCH] refactor(admin): refactor model generation and improve array
 string handling

- Update CommonTool to fix array string formatting issue- Refactor model generation template to use getOptions method
---
 app/admin/service/curd/templates/model/model.code | 13 ++++++++-----
 app/admin/service/tool/CommonTool.php             |  3 +++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/admin/service/curd/templates/model/model.code b/app/admin/service/curd/templates/model/model.code
index 3f573ee..1e05b0d 100644
--- a/app/admin/service/curd/templates/model/model.code
+++ b/app/admin/service/curd/templates/model/model.code
@@ -7,11 +7,14 @@ use app\common\model\TimeModel;
 class {{modelName}} extends TimeModel
 {
 
-    protected $name = "{{table}}";
-
-    protected $table = "{{prefix_table}}";
-
-    protected $deleteTime = {{deleteTime}};
+    protected function getOptions(): array
+    {
+        return [
+            'name'       => "{{table}}",
+            'table'      => "{{prefix_table}}",
+            'deleteTime' => {{deleteTime}},
+        ];
+    }
 
     public array $notes = {{selectArrays}};
 
diff --git a/app/admin/service/tool/CommonTool.php b/app/admin/service/tool/CommonTool.php
index 119b830..61d4aa5 100644
--- a/app/admin/service/tool/CommonTool.php
+++ b/app/admin/service/tool/CommonTool.php
@@ -100,6 +100,9 @@ class CommonTool
     {
         $arrayString = str_replace('array (', '[', $arrayString);
         $arrayString = str_replace(')', ']', $arrayString);
+        $arrayString = str_replace('=> 
+  [', '=> [', $arrayString);
         return $arrayString;
     }
+    
 }
\ No newline at end of file