refactor:优化

composer.json

@@ -18,7 +18,7 @@
         "guzzlehttp/guzzle": "^7.2",
         "laravel/framework": "^10.0",
         "laravel/tinker": "^2.8",
-        "catchadmin/core": "^0.1.12"
+        "catchadmin/core": "^0.1.14"
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",

modules/Develop/Support/Generate/stubs/vue/formItems/textarea.stub

@@ -0,0 +1,3 @@
+<el-form-item label="{label}" prop="{prop}">
+  <el-input v-model="{model-value}" name="{prop}" type="textarea" clearable />
+</el-form-item>

modules/Develop/Support/Generate/stubs/vue/formItems/upload.stub

@@ -0,0 +1,3 @@
+<el-form-item label="{label}" prop="{prop}">
+    <Upload v-model="{model-value}" />
+</el-form-item>

modules/Develop/views/generate/components/structure.vue

@@ -95,5 +95,5 @@ const validates: string[] = [
   'prohibited',
 ]
 
-const formComponents: string[] = ['cascader', 'date', 'datetime', 'input', 'input-number', 'radio', 'rate', 'select', 'tree', 'tree-select']
+const formComponents: string[] = ['cascader', 'date', 'datetime', 'input', 'input-number', 'radio', 'rate', 'select', 'tree', 'tree-select', 'textarea', 'upload']
 </script>

modules/Permissions/Models/Traits/DataRange.php

@@ -9,6 +9,9 @@ use Modules\Permissions\Models\Departments;
 use Modules\Permissions\Models\Roles;
 use Modules\Permissions\Enums\DataRange as DataRangeEnum;
 
+/**
+ * @method aliasField(string $field)
+ */
 trait DataRange
 {
 
@@ -28,7 +31,7 @@ trait DataRange
 
         $userIds = $this->getDepartmentUserIdsBy($roles, $currenUser);
 
-        if (empty($userIds)) {
+        if ($userIds->isEmpty()) {
             return $query;
         }
 

modules/Permissions/views/roles/form/create.vue

@@ -220,4 +220,10 @@ const getParent = (parentId: any) => {
 :deep(.el-tree .el-tree__empty-block .el-tree__empty-text) {
   @apply left-10 top-4;
 }
+:deep(.el-tree-node .is-expanded .el-tree-node__children) {
+  @apply flex flex-wrap pl-9;
+}
+:deep(.el-tree-node .is-expanded .el-tree-node__children .el-tree-node__content) {
+  padding-left: 0 !important;
+}
 </style>

modules/System/Http/Controllers/DictionaryController.php

@@ -0,0 +1,72 @@
+<?php
+declare(strict_types=1);
+
+namespace Modules\System\Http\Controllers;
+
+use Catch\Base\CatchController as Controller;
+use Modules\System\Models\Dictionary;
+use Illuminate\Http\Request;
+
+
+class DictionaryController extends Controller
+{
+    public function __construct(
+        protected readonly Dictionary $model
+    ){}
+
+    /**
+     * @return mixed
+     */
+    public function index(): mixed
+    {
+        return $this->model->getList();
+    }
+
+    /**
+     * @param Request $request
+     * @return mixed
+     */
+    public function store(Request $request)
+    {
+        return $this->model->storeBy($request->all());
+    }
+
+    /**
+     * @param $id
+     * @return mixed
+     */
+    public function show($id)
+    {
+        return $this->model->firstBy($id);
+    }
+
+    /**
+     * @param Request $request
+     * @param $id
+     * @return mixed
+     */
+    public function update($id, Request $request)
+    {
+        return $this->model->updateBy($id, $request->all());
+    }
+
+    /**
+     * @param $id
+     * @return mixed
+     */
+    public function destroy($id)
+    {
+        $dictionary = $this->model->find($id);
+
+        if ($this->model->deleteBy($id)) {
+            return $dictionary->values()->delete();
+        }
+
+        return false;
+    }
+
+    public function enable($id)
+    {
+        return $this->model->toggleBy($id);
+    }
+}

modules/System/Http/Controllers/DictionaryValuesController.php

@@ -0,0 +1,66 @@
+<?php
+declare(strict_types=1);
+
+namespace Modules\System\Http\Controllers;
+
+use Catch\Base\CatchController as Controller;
+use Modules\System\Models\DictionaryValues;
+use Illuminate\Http\Request;
+
+
+class DictionaryValuesController extends Controller
+{
+    public function __construct(
+        protected readonly DictionaryValues $model
+    ){}
+
+    /**
+     * @return mixed
+     */
+    public function index(): mixed
+    {
+        return $this->model->getList();
+    }
+
+    /**
+     * @param Request $request
+     * @return mixed
+     */
+    public function store(Request $request)
+    {
+        return $this->model->storeBy($request->all());
+    }
+
+    /**
+     * @param $id
+     * @return mixed
+     */
+    public function show($id)
+    {
+        return $this->model->firstBy($id);
+    }
+
+    /**
+     * @param Request $request
+     * @param $id
+     * @return mixed
+     */
+    public function update($id, Request $request)
+    {
+        return $this->model->updateBy($id, $request->all());
+    }
+
+    /**
+     * @param $id
+     * @return mixed
+     */
+    public function destroy($id)
+    {
+        return $this->model->deleteBy($id);
+    }
+
+    public function enable($id)
+    {
+        return $this->model->toggleBy($id);
+    }
+}

modules/System/Models/Dictionary.php

@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Modules\System\Models;
+
+use Catch\Base\CatchModel as Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+/**
+ * @property $id
+ * @property $name
+ * @property $key
+ * @property $status
+ * @property $description
+ * @property $creator_id
+ * @property $created_at
+ * @property $updated_at
+ * @property $deleted_at
+*/
+class Dictionary extends Model
+{
+    protected $table = 'system_dictionary';
+
+    protected $fillable = [ 'id', 'name', 'key', 'status', 'description', 'creator_id', 'created_at', 'updated_at', 'deleted_at' ];
+
+    /**
+     * @var array
+     */
+    protected array $fields = ['id','name','key','status','description','created_at','updated_at'];
+
+    /**
+     * @var array
+     */
+    protected array $form = ['name','key','status','description'];
+
+    /**
+     * @var array
+     */
+    public array $searchable = [
+        'name' => 'like',
+        'key' => 'like',
+        'status' => '=',
+    ];
+
+
+    /**
+     * 字典值集合
+     *
+     * @return HasMany
+     */
+    public function values(): HasMany
+    {
+        return $this->hasMany(DictionaryValues::class, 'dic_id', 'id');
+    }
+}

modules/System/Models/DictionaryValues.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Modules\System\Models;
+
+use Catch\Base\CatchModel as Model;
+
+/**
+ * @property $id
+ * @property $dic_id
+ * @property $label
+ * @property $value
+ * @property $sort
+ * @property $status
+ * @property $description
+ * @property $creator_id
+ * @property $created_at
+ * @property $updated_at
+ * @property $deleted_at
+*/
+class DictionaryValues extends Model
+{
+    protected $table = 'system_dictionary_values';
+
+    protected $fillable = [ 'id', 'dic_id', 'label', 'value', 'sort', 'status', 'description', 'creator_id', 'created_at', 'updated_at', 'deleted_at' ];
+
+    /**
+     * @var array
+     */
+    protected array $fields = ['id','label','value','sort','status','description','created_at','updated_at'];
+
+    /**
+     * @var array
+     */
+    protected array $form = ['dic_id', 'label','value','sort','description'];
+
+    /**
+     * @var array
+     */
+    public array $searchable = [
+        'dic_ids' => '=',
+        'label' => 'like',
+        'status' => '=',
+    ];
+}

modules/System/Providers/SystemServiceProvider.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Modules\System\Providers;
+
+use Catch\CatchAdmin;
+use Catch\Providers\CatchModuleServiceProvider;
+
+class SystemServiceProvider extends CatchModuleServiceProvider
+{
+    /**
+     * route path
+     *
+     * @return string
+     */
+    public function moduleName(): string
+    {
+        // TODO: Implement path() method.
+        return 'system';
+    }
+}

modules/System/database/migrations/2023_05_08_043214_create_system_dictionary.php

@@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('system_dictionary', function (Blueprint $table) {
+            $table->id();
+            $table->string('name', 100)->comment('字典名称');
+            $table->string('key')->comment('字典 key');
+            $table->tinyInteger('status')->default(1)->comment('状态 1 启用 2 禁用');
+            $table->string('description', 1000)->comment('备注')->default('');
+            $table->creatorId();
+            $table->createdAt();
+            $table->updatedAt();
+            $table->deletedAt();
+
+            $table->engine='InnoDB';
+            $table->comment('字段管理');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('system_dictionary');
+    }
+};

modules/System/database/migrations/2023_05_08_043740_create_system_dictionary_values.php

@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('system_dictionary_values', function (Blueprint $table) {
+            $table->id();
+            $table->integer('dic_id')->comment('字典ID');
+            $table->string('label')->comment('值名称');
+            $table->tinyInteger('value')->comment('对应值');
+            $table->integer('sort')->default(0)->comment('排序');
+            $table->tinyInteger('status')->default(1)->comment('状态 1 正常 2 禁用');
+            $table->string('description', 1000)->comment('描述')->default('');
+            $table->creatorId();
+            $table->createdAt();
+            $table->updatedAt();
+            $table->deletedAt();
+
+            $table->engine='InnoDB';
+            $table->comment('字典对应值');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('system_dictionary_values');
+    }
+};

modules/System/database/seeder/SystemMenusSeeder.php

@@ -0,0 +1,193 @@
+<?php
+
+use Illuminate\Database\Console\Seeds\WithoutModelEvents;
+use Illuminate\Database\Seeder;
+
+return new class extends Seeder
+{
+    /**
+     * Run the seeder.
+     *
+     * @return void
+     */
+    public function run(): void
+    {
+        $menus = $this->menus();
+
+        importTreeData($menus, 'permissions');
+    }
+
+    public function menus(): array
+    {
+        return array (
+  0 => 
+  array (
+    'id' => 96,
+    'parent_id' => 0,
+    'permission_name' => '系统管理',
+    'route' => '/system',
+    'icon' => 'server-stack',
+    'module' => 'system',
+    'permission_mark' => '',
+    'component' => '',
+    'redirect' => NULL,
+    'keepalive' => 1,
+    'type' => 1,
+    'hidden' => 1,
+    'sort' => 1,
+    'active_menu' => '',
+    'creator_id' => 1,
+    'created_at' => 1683535826,
+    'updated_at' => 1683535826,
+    'deleted_at' => 0,
+  ),
+  1 => 
+  array (
+    'id' => 97,
+    'parent_id' => 96,
+    'permission_name' => '字典管理',
+    'route' => 'dictionary',
+    'icon' => '',
+    'module' => 'system',
+    'permission_mark' => 'dictionary',
+    'component' => '/System/views/dictionary/index.vue',
+    'redirect' => '',
+    'keepalive' => 1,
+    'type' => 2,
+    'hidden' => 1,
+    'sort' => 1,
+    'active_menu' => '',
+    'creator_id' => 1,
+    'created_at' => 1683535863,
+    'updated_at' => 1683535874,
+    'deleted_at' => 0,
+  ),
+  2 => 
+  array (
+    'id' => 103,
+    'parent_id' => 97,
+    'permission_name' => '删除',
+    'route' => '',
+    'icon' => '',
+    'module' => 'system',
+    'permission_mark' => 'dictionary@destroy',
+    'component' => '',
+    'redirect' => '',
+    'keepalive' => 1,
+    'type' => 3,
+    'hidden' => 1,
+    'sort' => 5,
+    'active_menu' => '',
+    'creator_id' => 1,
+    'created_at' => 1683535980,
+    'updated_at' => 1683535980,
+    'deleted_at' => 0,
+  ),
+  3 => 
+  array (
+    'id' => 99,
+    'parent_id' => 97,
+    'permission_name' => '列表',
+    'route' => '',
+    'icon' => '',
+    'module' => 'system',
+    'permission_mark' => 'dictionary@index',
+    'component' => '',
+    'redirect' => '',
+    'keepalive' => 1,
+    'type' => 3,
+    'hidden' => 1,
+    'sort' => 1,
+    'active_menu' => '',
+    'creator_id' => 1,
+    'created_at' => 1683535980,
+    'updated_at' => 1683535980,
+    'deleted_at' => 0,
+  ),
+  4 => 
+  array (
+    'id' => 101,
+    'parent_id' => 97,
+    'permission_name' => '读取',
+    'route' => '',
+    'icon' => '',
+    'module' => 'system',
+    'permission_mark' => 'dictionary@show',
+    'component' => '',
+    'redirect' => '',
+    'keepalive' => 1,
+    'type' => 3,
+    'hidden' => 1,
+    'sort' => 3,
+    'active_menu' => '',
+    'creator_id' => 1,
+    'created_at' => 1683535980,
+    'updated_at' => 1683535980,
+    'deleted_at' => 0,
+  ),
+  5 => 
+  array (
+    'id' => 100,
+    'parent_id' => 97,
+    'permission_name' => '新增',
+    'route' => '',
+    'icon' => '',
+    'module' => 'system',
+    'permission_mark' => 'dictionary@store',
+    'component' => '',
+    'redirect' => '',
+    'keepalive' => 1,
+    'type' => 3,
+    'hidden' => 1,
+    'sort' => 2,
+    'active_menu' => '',
+    'creator_id' => 1,
+    'created_at' => 1683535980,
+    'updated_at' => 1683535980,
+    'deleted_at' => 0,
+  ),
+  6 => 
+  array (
+    'id' => 102,
+    'parent_id' => 97,
+    'permission_name' => '更新',
+    'route' => '',
+    'icon' => '',
+    'module' => 'system',
+    'permission_mark' => 'dictionary@update',
+    'component' => '',
+    'redirect' => '',
+    'keepalive' => 1,
+    'type' => 3,
+    'hidden' => 1,
+    'sort' => 4,
+    'active_menu' => '',
+    'creator_id' => 1,
+    'created_at' => 1683535980,
+    'updated_at' => 1683535980,
+    'deleted_at' => 0,
+  ),
+  7 => 
+  array (
+    'id' => 98,
+    'parent_id' => 96,
+    'permission_name' => '字典值管理',
+    'route' => 'dictionary/values/:id',
+    'icon' => '',
+    'module' => 'system',
+    'permission_mark' => 'dictionaryValues',
+    'component' => '/System/views/dictionaryValues/index.vue',
+    'redirect' => '',
+    'keepalive' => 2,
+    'type' => 2,
+    'hidden' => 2,
+    'sort' => 1,
+    'active_menu' => '/system/dictionary',
+    'creator_id' => 1,
+    'created_at' => 1683535961,
+    'updated_at' => 1683593856,
+    'deleted_at' => 0,
+  ),
+);
+    }
+};

modules/System/routes/route.php

@@ -0,0 +1,17 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+use Modules\System\Http\Controllers\DictionaryController;
+use Modules\System\Http\Controllers\DictionaryValuesController;
+
+Route::prefix('system')->group(function(){
+
+	Route::apiResource('dictionary', DictionaryController::class);
+    Route::put('dictionary/enable/{id}', [DictionaryController::class, 'enable']);
+
+	Route::apiResource('dic/values', DictionaryValuesController::class);
+    Route::put('dic/values/enable/{id}', [DictionaryValuesController::class, 'enable']);
+
+    //next
+});
+

modules/System/views/dictionary/create.vue

@@ -0,0 +1,56 @@
+<template>
+  <el-form :model="formData" label-width="120px" ref="form" v-loading="loading" class="pr-4">
+    <el-form-item
+      label="字典名称"
+      prop="name"
+      :rules="[
+        {
+          required: true,
+          message: '字典名称必须填写',
+        },
+      ]"
+    >
+      <el-input v-model="formData.name" name="name" clearable />
+    </el-form-item>
+    <el-form-item
+      label="字典键名"
+      prop="key"
+      :rules="[
+        {
+          required: true,
+          message: '字典键名必须填写',
+        },
+      ]"
+    >
+      <el-input v-model="formData.key" name="key" clearable />
+    </el-form-item>
+    <el-form-item label="字典描述" prop="description">
+      <el-input v-model="formData.description" name="description" clearable type="textarea" />
+    </el-form-item>
+    <div class="flex justify-end">
+      <el-button type="primary" @click="submitForm(form)">{{ $t('system.confirm') }}</el-button>
+    </div>
+  </el-form>
+</template>
+
+<script lang="ts" setup>
+import { useCreate } from '/admin/composables/curd/useCreate'
+import { useShow } from '/admin/composables/curd/useShow'
+import { onMounted } from 'vue'
+
+const props = defineProps({
+  primary: String | Number,
+  api: String,
+})
+
+const { formData, form, loading, submitForm, close } = useCreate(props.api, props.primary)
+
+if (props.primary) {
+  useShow(props.api, props.primary, formData)
+}
+
+const emit = defineEmits(['close'])
+onMounted(() => {
+  close(() => emit('close'))
+})
+</script>

modules/System/views/dictionary/index.vue

@@ -0,0 +1,73 @@
+<template>
+  <div>
+    <Search :search="search" :reset="reset">
+      <template v-slot:body>
+        <el-form-item label="字典名称" prop="name">
+          <el-input v-model="query.name" name="name" clearable />
+        </el-form-item>
+        <el-form-item label="字典键名" prop="key">
+          <el-input v-model="query.key" name="key" clearable />
+        </el-form-item>
+        <el-form-item label="字典状态" prop="status">
+          <el-input v-model="query.status" name="status" clearable />
+        </el-form-item>
+      </template>
+    </Search>
+
+    <div class="table-default">
+      <Operate :show="open" />
+      <el-table :data="tableData" class="mt-3" v-loading="loading">
+        <el-table-column prop="id" label="ID" width="100" />
+        <el-table-column prop="name" label="字典名称" />
+        <el-table-column prop="key" label="字典键名">
+          <template #default="scope">
+            <router-link :to="{ path: '/system/dictionary/values/' + scope.row.id }">
+              <el-text type="primary">{{ scope.row.key }}</el-text>
+            </router-link>
+          </template>
+        </el-table-column>
+        <el-table-column prop="status" label="字典状态">
+          <template #default="scope">
+            <Status v-model="scope.row.status" :id="scope.row.id" :api="api" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="description" label="字典描述" />
+        <el-table-column label="操作" width="300">
+          <template #default="scope">
+            <Update @click="open(scope.row.id)" />
+            <Destroy @click="destroy(api, scope.row.id)" />
+            <router-link :to="{ path: '/system/dictionary/values/' + scope.row.id }">
+              <Show text="列表" class="ml-3" />
+            </router-link>
+          </template>
+        </el-table-column>
+      </el-table>
+      <Paginate />
+    </div>
+
+    <Dialog v-model="visible" :title="title" destroy-on-close>
+      <Create @close="close(reset)" :primary="id" :api="api" />
+    </Dialog>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { computed, onMounted } from 'vue'
+import Create from './create.vue'
+import { useGetList } from '/admin/composables/curd/useGetList'
+import { useDestroy } from '/admin/composables/curd/useDestroy'
+import { useOpen } from '/admin/composables/curd/useOpen'
+
+const api = 'system/dictionary'
+
+const { data, query, search, reset, loading } = useGetList(api)
+const { destroy, deleted } = useDestroy()
+const { open, close, title, visible, id } = useOpen()
+
+const tableData = computed(() => data.value?.data)
+
+onMounted(() => {
+  search()
+  deleted(reset)
+})
+</script>

modules/System/views/dictionaryValues/create.vue

@@ -0,0 +1,65 @@
+<template>
+  <el-form :model="formData" label-width="120px" ref="form" v-loading="loading" class="pr-4">
+    <el-form-item
+      label="字典值名"
+      prop="label"
+      :rules="[
+        {
+          required: true,
+          message: '字典值名必须填写',
+        },
+      ]"
+    >
+      <el-input v-model="formData.label" name="label" clearable />
+    </el-form-item>
+    <el-form-item
+      label="字典键值"
+      prop="value"
+      :rules="[
+        {
+          required: true,
+          message: '字典键值必须填写',
+        },
+      ]"
+    >
+      <el-input-number v-model="formData.value" name="value" clearable :min="1" />
+    </el-form-item>
+    <el-form-item label="排序" prop="sort">
+      <el-input-number v-model="formData.sort" name="sort" :min="1" />
+    </el-form-item>
+    <el-form-item label="描述" prop="description">
+      <el-input v-model="formData.description" name="description" clearable type="textarea" />
+    </el-form-item>
+    <div class="flex justify-end">
+      <el-button type="primary" @click="submitForm(form)">{{ $t('system.confirm') }}</el-button>
+    </div>
+  </el-form>
+</template>
+
+<script lang="ts" setup>
+import { useCreate } from '/admin/composables/curd/useCreate'
+import { useShow } from '/admin/composables/curd/useShow'
+import { onMounted } from 'vue'
+import router from '/admin/router'
+
+const props = defineProps({
+  primary: String | Number,
+  api: String,
+})
+
+const { formData, form, loading, submitForm, close } = useCreate(props.api, props.primary)
+
+// 默认值
+formData.value.value = 1
+formData.value.sort = 1
+formData.value.dic_id = router.currentRoute.value.params.id
+
+if (props.primary) {
+  useShow(props.api, props.primary, formData)
+}
+
+const emit = defineEmits(['close'])
+onMounted(() => {
+  close(() => emit('close'))
+})
+</script>

modules/System/views/dictionaryValues/index.vue

@@ -0,0 +1,64 @@
+<template>
+  <div>
+    <Search :search="search" :reset="reset">
+      <template v-slot:body>
+        <el-form-item label="字典值名" prop="label">
+          <el-input v-model="query.label" name="label" clearable />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-input v-model="query.status" name="status" clearable />
+        </el-form-item>
+      </template>
+    </Search>
+    <div class="table-default">
+      <Operate :show="open" />
+      <el-table :data="tableData" class="mt-3" v-loading="loading">
+        <el-table-column prop="id" label="ID" />
+        <el-table-column prop="label" label="字典值名称" />
+        <el-table-column prop="value" label="字典键值" />
+        <el-table-column prop="sort" label="排序" />
+        <el-table-column prop="status" label="状态">
+          <template #default="scope">
+            <Status v-model="scope.row.status" :id="scope.row.id" :api="api" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="description" label="描述" />
+        <el-table-column label="操作" width="200">
+          <template #default="scope">
+            <Update @click="open(scope.row.id)" />
+            <Destroy @click="destroy(api, scope.row.id)" />
+          </template>
+        </el-table-column>
+      </el-table>
+      <Paginate />
+    </div>
+
+    <Dialog v-model="visible" :title="title" destroy-on-close>
+      <Create @close="close(reset)" :primary="id" :api="api" />
+    </Dialog>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { computed, onMounted } from 'vue'
+import Create from './create.vue'
+import { useGetList } from '/admin/composables/curd/useGetList'
+import { useDestroy } from '/admin/composables/curd/useDestroy'
+import { useOpen } from '/admin/composables/curd/useOpen'
+import router from '/admin/router'
+
+const api = 'system/dic/values'
+
+const { data, query, search, reset, loading } = useGetList(api)
+query.value.dic_id = router.currentRoute.value.params.id
+
+const { destroy, deleted } = useDestroy()
+const { open, close, title, visible, id } = useOpen()
+
+const tableData = computed(() => data.value?.data)
+
+onMounted(() => {
+  search()
+  deleted(reset)
+})
+</script>

modules/User/Http/Controllers/UserController.php

@@ -6,13 +6,14 @@ use Catch\Base\CatchController as Controller;
 use Catch\Support\Module\ModuleRepository;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
-use Illuminate\Http\Request;
 use Modules\Permissions\Models\Departments;
 use Modules\User\Models\LogLogin;
 use Modules\User\Models\LogOperate;
 use Modules\User\Models\User;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
+use Modules\User\Http\Requests\UserRequest;
+use Illuminate\Http\Request;
 
 class UserController extends Controller
 {
@@ -47,10 +48,10 @@ class UserController extends Controller
     /**
      * store
      *
-     * @param Request $request
+     * @param UserRequest $request
      * @return false|mixed
      */
-    public function store(Request $request)
+    public function store(UserRequest $request)
     {
         return $this->user->storeBy($request->all());
     }
@@ -80,10 +81,10 @@ class UserController extends Controller
      * update
      *
      * @param $id
-     * @param Request $request
+     * @param UserRequest $request
      * @return mixed
      */
-    public function update($id, Request $request)
+    public function update($id, UserRequest $request)
     {
         return $this->user->updateBy($id, $request->all());
     }

modules/User/Http/Requests/UserRequest.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Modules\User\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+use Modules\Permissions\Models\Roles;
+
+class UserRequest extends FormRequest
+{
+    /**
+     * rules
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'email' => [
+              'required',
+               Rule::unique('users')->where(function ($query) {
+                   return $query->when($this->get('id'), function ($query){
+                       $query->where('id', '<>', $this->get('id'));
+                   })->where('deleted_at', 0);
+               })
+            ],
+        ];
+    }
+
+
+    /**
+     * messages
+     *
+     * @return string[]
+     */
+    public function messages(): array
+    {
+        return [
+            'email.required' => '邮箱必须填写',
+
+            'email.unique' => '邮箱已存在',
+        ];
+    }
+}

modules/User/Models/User.php

@@ -37,7 +37,7 @@ class User extends Model implements AuthenticatableContract
     public array $searchable = [
         'username' => 'like',
         'email' => 'like',
-        'status' => '='
+        'status' => '=',
     ];
 
     /**

modules/User/views/user/components/profile.vue

@@ -1,9 +1,6 @@
 <template>
   <el-form :model="profile" ref="form" v-loading="loading" label-position="top">
-    <Upload class="w-28 h-28 rounded-full mx-auto" action="upload/image" :show-file-list="false" name="image" :on-success="uploadAvatar">
-      <img :src="profile.avatar" class="h-28 rounded-full" v-if="profile.avatar" />
-      <Icon name="plus" v-else />
-    </Upload>
+    <Upload imageClass="w-28 h-28 rounded-full mx-auto" v-model="profile.avatar" />
     <el-form-item
       label="昵称"
       prop="username"
@@ -66,14 +63,12 @@ interface profile {
   password: string
 }
 
-const profile = ref<profile>(
-  Object.assign({
-    avatar: '',
-    username: '',
-    email: '',
-    password: '',
-  }),
-)
+const profile = ref<profile>({
+  avatar: '',
+  username: '',
+  email: '',
+  password: '',
+})
 const { form, loading, submitForm, afterCreate } = useCreate('user/online', null, profile)
 
 const getUserInfo = () => {
@@ -91,15 +86,6 @@ onMounted(() => {
 })
 
 const userStore = useUserStore()
-const uploadAvatar = (response, uploadFile) => {
-  if (response.code === Code.SUCCESS) {
-    form.value.avatar = response.data.path
-    profile.value.avatar = response.data.path
-  } else {
-    Message.error(response.message)
-  }
-}
-
 afterCreate.value = () => {
   userStore.getUserInfo()
 }

modules/User/views/user/index.vue

@@ -21,7 +21,8 @@
           <el-table-column prop="username" label="用户名" width="150" />
           <el-table-column prop="avatar" label="头像">
             <template #default="scope">
-              <el-avatar :src="scope.row.avatar" />
+              <el-avatar :icon="UserFilled" v-if="!scope.row.avatar" />
+              <el-avatar :src="scope.row.avatar" v-else />
             </template>
           </el-table-column>
           <el-table-column prop="email" label="邮箱" />
@@ -50,6 +51,7 @@
 </template>
 
 <script lang="ts" setup>
+// @ts-nocheck
 import { computed, onMounted, ref } from 'vue'
 import Create from './create.vue'
 import { useGetList } from '/admin/composables/curd/useGetList'
@@ -58,11 +60,11 @@ import { useOpen } from '/admin/composables/curd/useOpen'
 import Department from './components/department.vue'
 import { useUserStore } from '/admin/stores/modules/user'
 import { isUndefined } from '/admin/support/helper'
+import { UserFilled } from '@element-plus/icons-vue'
 
 const userStore = useUserStore()
 
 const api = 'users'
-
 const { data, query, search, reset, loading } = useGetList(api)
 const { destroy, deleted } = useDestroy()
 const { open, close, title, visible, id } = useOpen()
@@ -74,9 +76,7 @@ const hasRoles = ref<boolean>(false)
 
 onMounted(() => {
   search()
-
   deleted(reset)
-
   hasRoles.value = !isUndefined(userStore.getRoles)
 })
 </script>

package.json

@@ -1,53 +1,55 @@
 {
-  "name": "catchadmin",
-  "private": false,
-  "version": "0.0.1",
-  "scripts": {
-    "dev": "vite",
-    "build": "vue-tsc --noEmit && vite build",
-    "preview": "vite preview"
-  },
-  "dependencies": {
-    "@heroicons/vue": "^2.0.18",
-    "@tinymce/tinymce-vue": "^5.1.0",
-    "@vueuse/core": "^10.1.2",
-    "autoprefixer": "^10.4.13",
-    "element-plus": "^2.3.4",
-    "nprogress": "^0.2.0",
-    "pinia": "^2.0.36",
-    "postcss": "^8.4.23",
-    "tailwindcss": "^3.3.2",
-    "terser": "^5.17.3",
-    "vue": "^3.2.47",
-    "vue-i18n": "9",
-    "vue-router": "4.1.6",
-    "vuedraggable": "^4.1.0"
-  },
-  "devDependencies": {
-    "@iconify-json/logos": "^1.1.28",
-    "@rollup/plugin-alias": "^5.0.0",
-    "@types/mockjs": "^1.0.7",
-    "@types/node": "^20.1.1",
-    "@types/nprogress": "^0.2.0",
-    "@typescript-eslint/eslint-plugin": "^5.59.5",
-    "@typescript-eslint/parser": "^5.59.5",
-    "@vitejs/plugin-vue": "^4.2.1",
-    "@vitejs/plugin-vue-jsx": "^3.0.0",
-    "axios": "^1.4.0",
-    "eslint": "^8.40.0",
-    "eslint-config-standard": "^17.0.0",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-n": "^15.6.0",
-    "eslint-plugin-promise": "^6.1.1",
-    "eslint-plugin-vue": "^9.11.1",
-    "prettier": "2.8.4",
-    "sass": "^1.62.1",
-    "typescript": "^5.0.4",
-    "unplugin-auto-import": "^0.14.4",
-    "unplugin-icons": "^0.16.1",
-    "unplugin-vue-components": "^0.24.0",
-    "vite": "^4.3.5",
-    "vite-plugin-html": "^3.2.0",
-    "vue-tsc": "^1.6.4"
-  }
+    "name": "catchadmin",
+    "private": false,
+    "version": "0.0.1",
+    "scripts": {
+        "dev": "vite",
+        "build": "vue-tsc --noEmit && vite build",
+        "preview": "vite preview"
+    },
+    "dependencies": {
+        "@heroicons/vue": "^2.0.18",
+        "@tinymce/tinymce-vue": "^5.1.0",
+        "@vueuse/core": "^10.1.2",
+        "element-plus": "^2.3.5",
+        "nprogress": "^0.2.0",
+        "pinia": "^2.1.3",
+        "terser": "^5.16.6",
+        "vue": "^3.3.4",
+        "vue-i18n": "9",
+        "vue-router": "4.2.1",
+        "vuedraggable": "^2.24.3"
+    },
+    "devDependencies": {
+        "@iconify-json/logos": "^1.1.31",
+        "@rollup/plugin-alias": "^5.0.0",
+        "@types/mockjs": "^1.0.7",
+        "@types/node": "^20.2.3",
+        "@types/nprogress": "^0.2.0",
+        "@typescript-eslint/eslint-plugin": "^5.59.7",
+        "@typescript-eslint/parser": "^5.59.7",
+        "@vitejs/plugin-vue": "^4.2.3",
+        "@vitejs/plugin-vue-jsx": "^3.0.1",
+        "autoprefixer": "^10.4.14",
+        "axios": "^1.4.0",
+        "eslint": "^8.41.0",
+        "eslint-config-standard": "^17.0.0",
+        "eslint-plugin-import": "^2.27.5",
+        "eslint-plugin-n": "^16.0.0",
+        "eslint-plugin-promise": "^6.1.1",
+        "eslint-plugin-vue": "^9.14.0",
+        "mockjs": "^1.1.0",
+        "postcss": "^8.4.23",
+        "prettier": "2.8.8",
+        "sass": "^1.62.1",
+        "tailwindcss": "^3.3.2",
+        "typescript": "^5.0.4",
+        "unplugin-auto-import": "^0.16.2",
+        "unplugin-icons": "^0.16.1",
+        "unplugin-vue-components": "^0.24.0",
+        "vite": "^4.3.8",
+        "vite-plugin-html": "^3.2.0",
+        "vite-plugin-mock": "^3.0.0",
+        "vue-tsc": "^1.6.5"
+    }
 }

resources/admin/components/admin/icons/index.vue

@@ -36,9 +36,9 @@ const props = defineProps({
 
 const emits = defineEmits(['update:modelValue', 'close'])
 
-const limit = ref(16)
-const icons = ref([])
-const total = ref(0)
+const limit = ref<number>(16)
+const icons = ref<Array<string>>([])
+const total = ref<number>(0)
 function getIcons(page = 1) {
   const start = (page - 1) * limit.value
   const end = start + limit.value
@@ -49,11 +49,11 @@ onMounted(() => {
   getIcons()
   total.value = constIcons.length
 })
-const handleNext = value => {
+const handleNext = (value: number) => {
   getIcons(value)
 }
 
-const handlePrev = value => {
+const handlePrev = (value: number) => {
   getIcons(value)
 }
 const selectIcon = (icon: string) => {

resources/admin/components/admin/upload/index.vue

@@ -1,8 +1,21 @@
 <template>
-  <el-upload ref="upload" :action="actionApi" :auto-upload="auto" :headers="{ authorization: token, 'Request-from': 'Dashboard' }" v-bind="$attrs">
+  <el-upload
+    ref="upload"
+    :action="actionApi"
+    :show-file-list="false"
+    name="image"
+    :auto-upload="auto"
+    :headers="{ authorization: token, 'Request-from': 'Dashboard' }"
+    v-bind="$attrs"
+    :on-success="handleSuccess"
+  >
     <template v-for="(index, name) in $slots" v-slot:[name]>
       <slot :name="name"></slot>
     </template>
+    <img :src="modelValue" v-if="modelValue" :class="imageClass" />
+    <div v-else class="w-24 h-24 border-blue-100 border-dashed border rounded flex justify-center pt-8">
+      <Icon name="plus" />
+    </div>
   </el-upload>
 </template>
 
@@ -10,18 +23,30 @@
 import { ref } from 'vue'
 import { env } from '/admin/support/helper'
 import { getAuthToken } from '/admin/support/helper'
+import { Code } from '/admin/enum/app'
+import Message from '/admin/support/message'
 
 const props = defineProps({
   action: {
     type: String,
-    default: 'upload',
+    default: 'upload/image',
   },
   auto: {
     type: Boolean,
     default: true,
   },
+  modelValue: {
+    type: String,
+    default: '',
+    require: true,
+  },
+  imageClass: {
+    type: String,
+    default: '',
+  },
 })
 
+const emits = defineEmits(['update:modelValue'])
 const baseURL = env('VITE_BASE_URL')
 
 const actionApi = ref<string>('')
@@ -30,4 +55,12 @@ actionApi.value = baseURL + props.action
 
 const token = ref<string>()
 token.value = 'Bearer ' + getAuthToken()
+
+const handleSuccess = (response: any) => {
+  if (response.code === Code.SUCCESS) {
+    emits('update:modelValue', response.data.path)
+  } else {
+    Message.error(response.message)
+  }
+}
 </script>

resources/admin/directives/permission/action.ts

@@ -18,7 +18,7 @@ function checkAction(el: any, action: any) {
       el.parentNode && el.parentNode.removeChild(el)
     }
   } else {
-    throw new Error(`need action! Like v-action="module.controller.action" || v-action="module@controller@action" `)
+    throw new Error(`need action! Like v-action="module.controller.action"`)
   }
 }
 

resources/admin/layout/components/header/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="flex flex-row h-16 w-full drop-shadow border-l dark:border-l-0 border-gray-200" style="background-color: var(--header-bg-color)">
-    <div class="flex flex-row justify-between w-full">
+    <div class="flex flex-row justify-between w-full h-16">
       <div class="flex flex-row min-w-[17rem]">
         <div class="h-full flex items-center w-8 ml-2 hover:cursor-pointer" @click="store.changeExpaned">
           <Icon name="list-bullet" class="w-6 h-8" />

resources/admin/router/guard/index.ts

@@ -37,9 +37,8 @@ const guard = (router: Router) => {
               // 挂载路由（实际是从后端获取用户的权限）
               const permissionStore = usePermissionsStore()
               // 动态路由挂载
-              const asyncRoutes = permissionStore.getAsyncMenusFrom(toRaw(userStore.getPermissions))
-              console.log(asyncRoutes)
-                asyncRoutes.forEach((route: Menu) => {
+              const asyncRoutes = permissionStore.getAsyncMenusFrom(toRaw(userStore.getPermissions), true)
+              asyncRoutes.forEach((route: Menu) => {
                 router.addRoute(route as unknown as RouteRecordRaw)
               })
               // 在动态路由之后挂载匹配 404 路由

resources/admin/stores/modules/user/index.ts

@@ -1,10 +1,10 @@
 import { defineStore } from 'pinia'
-import { User } from '/admin/types/user'
 import http from '/admin/support/http'
 import { rememberAuthToken, removeAuthToken } from '/admin/support/helper'
 import Message from '/admin/support/message'
 import router from '/admin/router'
-import { Permission } from '/admin/types/permission'
+import { User } from '/admin/types/User'
+import { Permission } from '/admin/types/Permission'
 
 export const useUserStore = defineStore('UserStore', {
   state: (): User => {

resources/admin/stores/modules/user/permissions.ts

@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia'
-import { Permission } from '/admin/types/permission'
+import { Permission } from '/admin/types/Permission'
 import { MenuType } from '/admin/enum/app'
 import { Menu } from '/admin/types/Menu'
 import { constantRoutes } from '/admin/router'

resources/admin/types/User.ts

@@ -1,6 +1,5 @@
 // login user type
-
-import { Permission } from './permission'
+import { Permission } from './Permission'
 
 export interface User {
   id: number