From a36fa86d8dc53b6703c7e619a991e9f08e50bb5b Mon Sep 17 00:00:00 2001 From: JaguarJack Date: Wed, 7 Jun 2023 09:28:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E9=99=90=E5=88=B6=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/Develop/Models/Schemas.php | 19 ------------------- modules/Develop/views/module/install.vue | 10 ++++++++++ modules/Develop/views/schema/index.vue | 2 +- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/modules/Develop/Models/Schemas.php b/modules/Develop/Models/Schemas.php index 0ff2d46..a7b7fbc 100644 --- a/modules/Develop/Models/Schemas.php +++ b/modules/Develop/Models/Schemas.php @@ -8,7 +8,6 @@ use Exception; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\DB; use Modules\Develop\Support\Generate\Create\Schema; -use Illuminate\Support\Facades\Schema as SchemaFacade; class Schemas extends CatchModel { @@ -108,22 +107,4 @@ class Schemas extends CatchModel return $schema; } - - /** - * delete - * - * @param $id - * @param bool $force - * @return bool|null - */ - public function deleteBy($id, bool $force = false): ?bool - { - $schema = parent::firstBy($id); - - if ($schema->delete()) { - SchemaFacade::dropIfExists($schema->name); - } - - return true; - } } diff --git a/modules/Develop/views/module/install.vue b/modules/Develop/views/module/install.vue index 494a8d5..1a3a859 100644 --- a/modules/Develop/views/module/install.vue +++ b/modules/Develop/views/module/install.vue @@ -22,6 +22,16 @@ required: true, message: '模块名称必须填写', }, + { + validator: (rule: any, value: any, callback: any) => { + if (! /^[A-Za-z]+$/.test(value)) { + callback('模块名称只允许大小字母组合') + } else { + callback() + } + }, + trigger: 'blur', + }, ]" > diff --git a/modules/Develop/views/schema/index.vue b/modules/Develop/views/schema/index.vue index f0a90a9..07e3793 100644 --- a/modules/Develop/views/schema/index.vue +++ b/modules/Develop/views/schema/index.vue @@ -64,7 +64,7 @@ const schemaVisible = ref(false) const api = 'schema' const { data, query, search, reset, loading } = useGetList(api) -const { destroy, deleted } = useDestroy('确认删除吗? 将会删除数据库的 Schema,请提前做好备份,一旦删除,将无法恢复!') +const { destroy, deleted } = useDestroy('确认删除吗? 删除后数据表将会保留,如需删除相关表,请手动进行删除!') const { open, close, title, visible, id } = useOpen() const tableData = computed(() => data.value?.data)