feat:限制模块名称规则

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;
-    }
 }

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',
+        },
       ]"
     >
       <el-input v-model="formData.title" />

modules/Develop/views/schema/index.vue

@@ -64,7 +64,7 @@ const schemaVisible = ref<boolean>(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)

modules/Permissions/Http/Controllers/RolesController.php

@@ -41,11 +41,9 @@ class RolesController extends Controller
     public function store(RoleRequest $request)
     {
         $data = $request->all();
-
+        $data['data_range'] = (int) $data['data_range'];
-        if ($request->get('data_range') && ! DataRange::Personal_Choose->assert($data['data_range'])) {
+        if (!$data['data_range'] || !DataRange::Personal_Choose->assert($data['data_range'])) {
             $data['departments'] = [];
-        } else {
-            $data['data_range'] = 0;
         }
 
         return $this->model->storeBy($data);
@@ -80,11 +78,9 @@ class RolesController extends Controller
     public function update($id, RoleRequest $request)
     {
         $data = $request->all();
-
+        $data['data_range'] = (int) $data['data_range'];
-        if ($request->get('data_range') && ! DataRange::Personal_Choose->assert($data['data_range'])) {
+        if (!$data['data_range'] || !DataRange::Personal_Choose->assert($data['data_range'])) {
             $data['departments'] = [];
-        } else {
-            $data['data_range'] = 0;
         }
 
         return $this->model->updateBy($id, $data);