From 35445f37e193f45dae6dcdb0be690e79771d635f Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Tue, 1 Dec 2020 17:55:36 +0800
Subject: [PATCH] =?UTF-8?q?fixed:=E6=A8=A1=E5=9E=8Bname=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E5=A4=9A=E5=8A=A0=E4=BA=86=E8=A1=A8=E5=89=8D=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/catcher/Utils.php                  | 12 ++++++++++++
 extend/catcher/generate/factory/Model.php |  5 ++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/extend/catcher/Utils.php b/extend/catcher/Utils.php
index 88dc22a..1aa8cf2 100644
--- a/extend/catcher/Utils.php
+++ b/extend/catcher/Utils.php
@@ -151,6 +151,18 @@ class Utils
         return \config('database.connections.mysql.prefix');
     }
 
+    /**
+     * 删除前缀
+     *
+     * @time 2020年12月01日
+     * @param string $table
+     * @return string|string[]
+     */
+    public static function tableWithoutPrefix(string $table)
+    {
+        return str_replace(self::tablePrefix(), '', $table);
+    }
+
     /**
      * 是否是超级管理员
      *
diff --git a/extend/catcher/generate/factory/Model.php b/extend/catcher/generate/factory/Model.php
index 4f614aa..c375b4d 100644
--- a/extend/catcher/generate/factory/Model.php
+++ b/extend/catcher/generate/factory/Model.php
@@ -11,6 +11,7 @@ use catcher\generate\build\classes\Uses;
 use catcher\generate\build\types\Arr;
 use catcher\traits\db\BaseOptionsTrait;
 use catcher\traits\db\ScopeTrait;
+use catcher\Utils;
 use think\facade\Db;
 use think\helper\Str;
 
@@ -80,7 +81,9 @@ class Model extends Factory
                             }
 
                             $class->addProperty(
-                                (new Property('name'))->default($table)->docComment('// 表名')
+                                (new Property('name'))->default(
+                                    Utils::tableWithoutPrefix($table)
+                                )->docComment('// 表名')
                             );
 
                             $class->when($this->hasTableExists($table), function ($class) use ($table){