From 265077229d01f4cb8f82d74ae22847de0493235b Mon Sep 17 00:00:00 2001 From: JaguarJack <82664165@qq.com> Date: Thu, 14 Mar 2024 13:07:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=A8=A1=E5=9E=8B=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/Develop/Support/Generate/Create/Model.php | 3 +-- modules/Develop/Support/Generate/stubs/vue/form.stub | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/Develop/Support/Generate/Create/Model.php b/modules/Develop/Support/Generate/Create/Model.php index 9a5cd6a..2164782 100644 --- a/modules/Develop/Support/Generate/Create/Model.php +++ b/modules/Develop/Support/Generate/Create/Model.php @@ -130,7 +130,6 @@ use Catch\Traits\DB\BaseOperate; use Catch\Traits\DB\ScopeTrait; use Catch\Traits\DB\Trans; use Illuminate\Database\Eloquent\Model; -use Catch\Traits\DB\WithAttributes; Text; } else { return <<softDelete ? '' : 'use WithAttributes, BaseOperate, Trans, ScopeTrait;'; + return $this->softDelete ? '' : 'use BaseOperate, Trans, ScopeTrait;'; } /** diff --git a/modules/Develop/Support/Generate/stubs/vue/form.stub b/modules/Develop/Support/Generate/stubs/vue/form.stub index 8eb9c5b..4231a52 100644 --- a/modules/Develop/Support/Generate/stubs/vue/form.stub +++ b/modules/Develop/Support/Generate/stubs/vue/form.stub @@ -13,7 +13,7 @@ import { useShow } from '/admin/composables/curd/useShow' import { onMounted } from 'vue' const props = defineProps({ - primary: String | Number, + primary: [String, Number], api: String, })