fix: 修复代码删除表名前缀 #77

make password hidden

.gitignore

@@ -1,5 +1,3 @@
-/node_modules
-/public/build
 /public/hot
 /public/storage
 /storage/*.key
@@ -14,13 +12,8 @@ nohup.out
 .php-cs-fixer.cache
 Homestead.json
 Homestead.yaml
-auth.json
-npm-debug.log
-yarn-error.log
-yarn.lock
 composer.lock
 /.fleet
 /.idea
 /.vscode
-components.d.ts
+/web
-auto-imports.d.ts

.prettierrc

@@ -1,10 +0,0 @@
-{
-  "semi": false,
-  "printWidth": 200,
-  "tabWidth": 2,
-  "useTabs": false,
-  "singleQuote": true,
-  "arrowParens": "avoid",
-  "trailingComma": "all",
-  "bracketSpacing": true
-}

.workflow/branch-pipeline.yml

@@ -0,0 +1,51 @@
+version: '1.0'
+name: branch-pipeline
+displayName: BranchPipeline
+stages:
+  - stage: 
+    name: compile
+    displayName: 编译
+    steps:
+      - step: build@php
+        name: build_php
+        displayName: PHP 构建
+        # 支持5.0、7.0、7.1、7.2、7.3、7.4、8.0、8.1八个版本
+        phpVersion: 8.0
+        # 构建命令
+        commands:
+          - php --version
+        # 非必填字段，开启后表示将构建产物暂存，但不会上传到制品库中，7天后自动清除
+        artifacts:
+            # 构建产物名字，作为产物的唯一标识可向下传递，支持自定义，默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
+          - name: BUILD_ARTIFACT
+            # 构建产物获取路径，是指代码编译完毕之后构建物的所在路径
+            path:
+              - ./
+      - step: publish@general_artifacts
+        name: publish_general_artifacts
+        displayName: 上传制品
+        # 上游构建任务定义的产物名，默认BUILD_ARTIFACT
+        dependArtifact: BUILD_ARTIFACT
+        # 上传到制品库时的制品命名，默认output
+        artifactName: output  
+        dependsOn: build_php
+  - stage: 
+    name: release
+    displayName: 发布
+    steps:
+      - step: publish@release_artifacts
+        name: publish_release_artifacts
+        displayName: '发布'
+        # 上游上传制品任务的产出
+        dependArtifact: output
+        # 发布制品版本号
+        version: '1.0.0.0'
+        # 是否开启版本号自增，默认开启
+        autoIncrement: true
+triggers:
+  push:
+    branches:
+      exclude:
+        - master
+      include:
+        - .*

.workflow/master-pipeline.yml

@@ -0,0 +1,49 @@
+version: '1.0'
+name: master-pipeline
+displayName: MasterPipeline
+stages:
+  - stage: 
+    name: compile
+    displayName: 编译
+    steps:
+      - step: build@php
+        name: build_php
+        displayName: PHP 构建
+        # 支持5.0、7.0、7.1、7.2、7.3、7.4、8.0、8.1八个版本
+        phpVersion: 8.0
+        # 构建命令
+        commands:
+          - php --version
+        # 非必填字段，开启后表示将构建产物暂存，但不会上传到制品库中，7天后自动清除
+        artifacts:
+            # 构建产物名字，作为产物的唯一标识可向下传递，支持自定义，默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
+          - name: BUILD_ARTIFACT
+            # 构建产物获取路径，是指代码编译完毕之后构建物的所在路径
+            path:
+              - ./
+      - step: publish@general_artifacts
+        name: publish_general_artifacts
+        displayName: 上传制品
+        # 上游构建任务定义的产物名，默认BUILD_ARTIFACT
+        dependArtifact: BUILD_ARTIFACT
+        # 上传到制品库时的制品命名，默认output
+        artifactName: output
+        dependsOn: build_php
+  - stage: 
+    name: release
+    displayName: 发布
+    steps:
+      - step: publish@release_artifacts
+        name: publish_release_artifacts
+        displayName: '发布'
+        # 上游上传制品任务的产出
+        dependArtifact: output
+        # 发布制品版本号
+        version: '1.0.0.0'
+        # 是否开启版本号自增，默认开启
+        autoIncrement: true
+triggers:
+  push:
+    branches:
+      include:
+        - master

.workflow/pr-pipeline.yml

@@ -0,0 +1,36 @@
+version: '1.0'
+name: pr-pipeline
+displayName: PRPipeline
+stages:
+  - stage: 
+    name: compile
+    displayName: 编译
+    steps:
+      - step: build@php
+        name: build_php
+        displayName: PHP 构建
+        # 支持5.0、7.0、7.1、7.2、7.3、7.4、8.0、8.1八个版本
+        phpVersion: 8.0
+        # 构建命令
+        commands:
+          - php --version
+        # 非必填字段，开启后表示将构建产物暂存，但不会上传到制品库中，7天后自动清除
+        artifacts:
+            # 构建产物名字，作为产物的唯一标识可向下传递，支持自定义，默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
+          - name: BUILD_ARTIFACT
+            # 构建产物获取路径，是指代码编译完毕之后构建物的所在路径
+            path:
+              - ./
+      - step: publish@general_artifacts
+        name: publish_general_artifacts
+        displayName: 上传制品
+        # 上游构建任务定义的产物名，默认BUILD_ARTIFACT
+        dependArtifact: BUILD_ARTIFACT
+        # 上传到制品库时的制品命名，默认output
+        artifactName: output
+        dependsOn: build_php
+triggers:
+  pr:
+    branches:
+      include:
+        - master

README.md

@@ -1,13 +1,30 @@
 ## 介绍
+### 这是 catchadmin 完全分离的版本
 `CatchAdmin`是一款基于[Laravel](https://laravel.com)和[Element Plus](https://element-plus.org)二次开发而成后台管理系统。`Laravel` 社区也有许多非常优秀的后台管理系统，例如 `Nova`, 官方出品，当然是收费的，免费的有基于 `Livewire` 的 `Filament`，还有不得不说的 `Laravel Admin`。`CatchAdmin` 还是采用传统的前后端分离策略，`Laravel` 框架仅仅作为 `Api` 输出。将管理系统模块之间的耦合降到了最低限度。每个模块之间都有独立的控制器，路由，模型，数据表。在开发上尽可能将模块之间的影响降到最低，降低了开发上的难度。基于 `CatchAdmin `可以开发 `CMS`，`CRM`，`OA` 等 等系统。也封装了很多实用的工具，提升开发体验。
 
+## 前端项目
+[catchadmin-vue](https://gitee.com/catchadmin/catch-admin-vue)
+
+## Laravel 入门教程
+[Laravel 免费入门教程](https://laravel-study.catchadmin.com)
+
 [中文](./README.md)|[英文](./README-en.md)
+## 其他版本
+- [tp8 新版本](https://gitee.com/catchamin/catchadmin-tp)
+- [webman 高性能版本](https://gitee.com/catchamin/catchadmin-webman)
 
-## ⚠️Thinkphp 用户注意
+## 新功能
-由于新版本使用 `Laravel` 开发，所以请使用 `thinkphp` 分支或者 tag2.6.2，thinkphp 版本已经非常稳定了。
+- [动态表单](https://catchadmin.com/docs/3.0/front/catch-form)
+- [动态表格](https://catchadmin.com/docs/3.0/front/catch-table)
 
-## 为什么是 Laravel
+## 专业版
-`V2` 版本使用`Thinkphp`，但从其社区来看，从我个人角度来看开发组的心思已经不在维护框架上，因为据观察，每一次小版本发布都会引发一些小问题，虽然不大，但给人一种不够稳定的感觉，所以思索再三，使用 `Laravel`。`Laravel` 社区非常繁荣，他们每周都会发布新版本，以及围绕`Laravel`构建的生态也非常完善，有 `Horizon` 队列管理工具, `Telescope` 调试工具，`Octane`（基于 `Swoole` 和 `RoadRunner` 提高性能）等等一系列的工具，而且都是免费的。
+[专业版本官方地址](https://license.catchadmin.com)
+
+首先感谢一直以来对 `CatchAdmin` 开源项目的支持和使用。作为一名开源工作者，我一直致力于开发出功能强大且易于使用的后台管理系统，以帮助您简化业务流程和提升工作效率。然而，由于某些原因，我不得不做出一些调整。为了能够继续开发和维护这个项目，我将推出一款付费的后台管理系统，以确保我能够持续为您提供高质量的服务和支持。
+
+专业版本不会在开源版本做一些破坏性变更，所以当您从开源版本切换到专业版本，不会有任何开发心智负担。但是使用专业版本会有新的组件来配合您的工作。
+
+我深信，付费后台管理系统将为您带来更多的价值和便利，帮助您提升工作效率
 
 ## 功能
 - [x] 用户管理 后台用户管理
@@ -21,8 +38,13 @@
 - [x] Schema 管理 生成表结构 
 - [x] 模块管理 系统模块管理
 
-## 额外模块
+
-- [CMS 模块](https://github.com/catch-admin/cms)
+## 讨论
+- 可以提 `ISSUE`，请按照 `issue` 模板提问
+- 加入 Q 群 `302266230` 暗号 `catchadmin`。
+- 加微信入群，新建🆕
+
+<img src="wechat.png" width="200"/>
 
 ## 项目地址
 - [github catchadmin](https://github.com/jaguarjack/catch-admin)
@@ -40,10 +62,10 @@
 - 账户: `catch@admin.com`
 - 密码: `catchadmin`
 
-## 赞助
+## 视频教程(😂记得一键三连哦)
-如果项目对你有帮助，或者在工作上帮你节省了开发时间。在力所能及的情况下，可以支持下`Catchadmin`项目, 非常感谢🙏
+- [catchadmin 安装](https://www.bilibili.com/video/BV1eY411v71J/)
-
+- [catchadmin 开发之模块创建](https://www.bilibili.com/video/BV1jP41127aW/)
-<img src="https://i.imgtg.com/2023/02/16/dAV0a.jpg" width = "200" alt="support"/>
+- [catchadmin 之快速开发](https://www.bilibili.com/video/BV1Qh4y1J7eB/)
 
 ## 规范
 ### PHP
@@ -63,19 +85,13 @@ composer cs
 composer cs-diff
 ```
 
-## 讨论
-- [论坛讨论](https://bbs.catchadmin.com)
-- 可以提 `ISSUE`，请按照 `issue` 模板提问
-- 加入 Q 群 `302266230` 暗号 `catchadmin`。
-
-
 ## 感谢🙏
 > 排名不分先后
 
 - [Laravel](https://laravel.com)
 - [Vue](https://cn.vuejs.org/)
 - [ElementPlus](https://element-plus.org)
-- [Docusaurus](https://docusaurus.com)
+- [VitePress](https://vitepress.dev/zh/)
 - [JetBrains](https://www.jetbrains.com/)
 
 

composer.json

@@ -11,19 +11,17 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "ext-pdo": "*",
         "ext-zip": "*",
-        "doctrine/dbal": "^3.4",
+        "laravel/framework": "^v12.8.1",
-        "guzzlehttp/guzzle": "^7.2",
+        "laravel/tinker": "^v2.10.1",
-        "laravel/framework": "^10.0",
+        "catchadmin/core": "^0.4.5"
-        "laravel/tinker": "^2.8",
-        "catchadmin/core": "^0.1.10"
     },
     "require-dev": {
-        "fakerphp/faker": "^1.9.1",
+        "fakerphp/faker": "^v1.24.1",
-        "mockery/mockery": "^1.4.4",
+        "mockery/mockery": "^1.6.12",
-        "pestphp/pest": "^1.22"
+        "pestphp/pest": "^v3.7.2"
     },
     "autoload": {
         "psr-4": {
@@ -42,7 +40,8 @@
     "scripts": {
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
-            "@php artisan package:discover --ansi"
+            "@php artisan package:discover --ansi",
+            "@composer dump-autoload --no-scripts"
         ],
         "post-update-cmd": [
             "@php artisan vendor:publish --tag=laravel-assets --ansi --force"
@@ -53,6 +52,10 @@
         "post-create-project-cmd": [
             "@php artisan key:generate --ansi"
         ],
+        "dev": [
+            "Composer\\Config::disableProcessTimeout",
+            "npx concurrently -c \"#93c5fd,#c4b5fd\" \"cd web && yarn dev\" \"php artisan serve\" --names='vite,server'"
+        ],
         "cs-diff": "./fixer/vendor/bin/php-cs-fixer fix --dry-run --diff",
         "cs": "./fixer/vendor/bin/php-cs-fixer fix"
     },

config/app.php

@@ -185,7 +185,6 @@ return [
         /*
          * Package Service Providers...
          */
-        \Catch\Providers\CatchAdminServiceProvider::class,
 
         /*
          * Application Service Providers...

config/filesystems.php

@@ -71,6 +71,9 @@ return [
 
     'links' => [
         public_path('storage') => storage_path('app/public'),
+
+        // 创建 storage 对应的软连接
+        public_path('uploads') => storage_path('uploads')
     ],
 
 ];

jsconfig.json

@@ -1,10 +0,0 @@
-{
-    "_comment": "This file is used to trick IntelliJ/Webstorm/PHPStorm to use the correct alias as defined in vite.config.js",
-    "compilerOptions": {
-        "baseUrl": ".",
-        "paths": {
-            "/admin/*": ["resources/admin/*"],
-            "@/module/*": ["modules/*/views/*"]
-        }
-    }
-}

modules/Common/Repository/Options/Components.php

@@ -2,7 +2,6 @@
 
 namespace Modules\Common\Repository\Options;
 
-use Catch\CatchAdmin;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Str;
 
@@ -14,29 +13,45 @@ class Components implements OptionInterface
     protected array $components = [
         [
             'label' => 'layout',
-            'value' => '/admin/layout/index.vue'
+            'value' => '/layout/index.vue',
-        ]
+        ],
     ];
 
     public function get(): array
     {
+        try {
+            $viewRootPath = config('catch.views_path');
+
             if ($module = request()->get('module')) {
-            $components = File::glob(CatchAdmin::getModuleViewsPath($module).'*'.DIRECTORY_SEPARATOR.'*.vue');
+                if (!File::exists($viewRootPath . $module . DIRECTORY_SEPARATOR)) {
+                    return [];
+                }
+
+                $components = File::allFiles($viewRootPath . $module . DIRECTORY_SEPARATOR);
 
                 foreach ($components as $component) {
-                $_component = Str::of($component)
+                    // 过滤非 vue 文件
-                                ->replace(CatchAdmin::moduleRootPath(), '')
+                    if ($component->getExtension() !== 'vue') {
+                        continue;
+                    }
+
+                    $_component = Str::of($component->getPathname())
+                        ->replace($viewRootPath, '')
                         ->explode(DIRECTORY_SEPARATOR);
-                $_component->shift(2);
+
+                    $_component->shift(1);
 
                     $this->components[] = [
                         'label' => Str::of($_component->implode('/'))->replace('.vue', ''),
 
-                    'value' => Str::of($component)->replace(CatchAdmin::moduleRootPath(), '')->prepend('/')
+                        'value' => Str::of($component)->replace($viewRootPath, '')->prepend('/'),
                     ];
                 }
             }
 
             return $this->components;
+        } catch (\Throwable $exception) {
+            return [];
+        }
     }
 }

modules/Common/Repository/Options/Schemas.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Modules\Common\Repository\Options;
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Str;
+
+class Schemas implements OptionInterface
+{
+    public function get(): array
+    {
+        $options = [];
+
+        $connection = DB::connection();
+        $databaseName = $connection->getDatabaseName();
+        $tablePrefix = $connection->getTablePrefix();
+
+        foreach (Schema::getTables($databaseName) as $table) {
+            $tableName = Str::of($table['name'])->replaceStart($tablePrefix, '');
+
+            $options[] = [
+                'label' => $tableName . "\t\t\t\t" . $table['comment'],
+                'value' => $tableName,
+            ];
+        }
+
+        return $options;
+    }
+}

modules/Common/Support/Upload/Uses/LocalUpload.php

@@ -4,6 +4,7 @@ namespace Modules\Common\Support\Upload\Uses;
 
 
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
 
 class LocalUpload extends Upload
 {
@@ -25,7 +26,9 @@ class LocalUpload extends Upload
      */
     protected function addUrl($path): mixed
     {
-        $path['path'] = config('app.url') . '/'. $path['path'];
+        $path['path'] = config('app.url') . '/'.
+
+                        Str::of($path['path'])->replace('\\', '/')->toString();
 
         return $path;
     }

modules/Develop/Models/Schemas.php

@@ -6,7 +6,6 @@ use Catch\Base\CatchModel;
 use Catch\Enums\Status;
 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;
 
@@ -49,6 +48,18 @@ class Schemas extends CatchModel
      */
     public function storeBy(array $data): bool
     {
+        // 从已有 schema 中选择
+        if (isset($data['schema_name'])) {
+            $columns = SchemaFacade::getColumnListing($data['schema_name']);
+
+            return parent::storeBy([
+                'module' => $data['module'],
+                'name' => $data['schema_name'],
+                'columns' => implode(',', $columns),
+                'is_soft_delete' => isset($columns['deleted_at']) ? Status::Enable : Status::Disable,
+            ]);
+        }
+
         $schema = $data['schema'];
 
         $structures = $data['structures'];
@@ -91,16 +102,13 @@ class Schemas extends CatchModel
     {
         $schema = parent::firstBy($id);
 
-        $columns = [];
+        foreach (SchemaFacade::getColumns($schema->name) as $column) {
-
-        foreach (getTableColumns($schema->name) as $columnString) {
-            $column = DB::connection()->getDoctrineColumn(DB::connection()->getTablePrefix().$schema->name, $columnString);
             $columns[] = [
-                'name' => $column->getName(),
+                'name' => $column['name'],
-                'type' => $column->getType()->getName(),
+                'type' => $column['type_name'],
-                'nullable' => ! $column->getNotnull(),
+                'nullable' => $column['nullable'],
-                'default' => $column->getDefault(),
+                'default' => $column['default'],
-                'comment' => $column->getComment()
+                'comment' => $column['comment'],
             ];
         }
 
@@ -108,22 +116,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/Support/Generate/Create/FrontForm.php

@@ -95,8 +95,10 @@ class FrontForm extends Creator
      */
     public function getFile(): string
     {
+        $path = config('catch.views_path').lcfirst($this->module).DIRECTORY_SEPARATOR;
+
         // TODO: Implement getFile() method.
-        return CatchAdmin::makeDir(CatchAdmin::getModuleViewsPath($this->module).Str::of($this->controller)->replace('Controller', '')->lcfirst()).DIRECTORY_SEPARATOR.'create.vue';
+        return CatchAdmin::makeDir($path.Str::of($this->controller)->replace('Controller', '')->lcfirst()).DIRECTORY_SEPARATOR.'create.vue';
     }
 
     /**

modules/Develop/Support/Generate/Create/FrontTable.php

@@ -114,7 +114,9 @@ class FrontTable extends Creator
     public function getFile(): string
     {
         // TODO: Implement getFile() method.
-        return CatchAdmin::makeDir(CatchAdmin::getModuleViewsPath($this->module).Str::of($this->controller)->replace('Controller', '')->lcfirst()).DIRECTORY_SEPARATOR.'index.vue';
+        $path = config('catch.views_path').lcfirst($this->module).DIRECTORY_SEPARATOR;
+
+        return CatchAdmin::makeDir($path.Str::of($this->controller)->replace('Controller', '')->lcfirst()).DIRECTORY_SEPARATOR.'index.vue';
     }
 
 

modules/Develop/Support/Generate/Module.php

@@ -81,6 +81,13 @@ class Module
      */
     protected function createRoute(): void
     {
-        File::copy(__DIR__.DIRECTORY_SEPARATOR.'stubs'.DIRECTORY_SEPARATOR.'route.stub', CatchAdmin::getModuleRoutePath($this->module));
+        $content = Str::of(
+            File::get(__DIR__.DIRECTORY_SEPARATOR.'stubs'.DIRECTORY_SEPARATOR.'route.stub')
+        )->replace(['{module}'], [lcfirst($this->module)]);
+
+        File::put(
+            CatchAdmin::getModuleRoutePath($this->module),
+            $content
+        );
     }
 }

modules/Develop/Support/Generate/stubs/controller.stub

@@ -13,7 +13,6 @@ class {controller} extends Controller
     ){}
 
     /**
-     * @param Request $request
      * @return mixed
      */
     public function index(): mixed

modules/Develop/Support/Generate/stubs/migration.stub

@@ -13,6 +13,8 @@ return new class extends Migration
      */
     public function up()
     {
+        if (Schema::hasTable('{table}')) { return; }
+
         Schema::{method}('{table}', function (Blueprint $table) {
             {content}
         });

modules/Develop/Support/Generate/stubs/request.stub

@@ -21,7 +21,7 @@ class {request} extends Request
      *
      * @return array
      */
-    public function message(): array
+    public function messages(): array
     {
         return [];
     }

modules/Develop/Support/Generate/stubs/vue/form.stub

@@ -8,12 +8,12 @@
 </template>
 
 <script lang="ts" setup>
-import { useCreate } from '/admin/composables/curd/useCreate'
+import { useCreate } from '@/composables/curd/useCreate'
-import { useShow } from '/admin/composables/curd/useShow'
+import { useShow } from '@/composables/curd/useShow'
 import { onMounted } from 'vue'
 
 const props = defineProps({
-  primary: String | Number,
+  primary: [String, Number],
   api: String,
 })
 

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/Support/Generate/stubs/vue/table.stub

@@ -28,9 +28,9 @@
 <script lang="ts" setup>
 import { computed, onMounted } from 'vue'
 import Create from './create.vue'
-import { useGetList } from '/admin/composables/curd/useGetList'
+import { useGetList } from '@/composables/curd/useGetList'
-import { useDestroy } from '/admin/composables/curd/useDestroy'
+import { useDestroy } from '@/composables/curd/useDestroy'
-import { useOpen } from '/admin/composables/curd/useOpen'
+import { useOpen } from '@/composables/curd/useOpen'
 
 const api = '{api}'
 

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

@@ -1,109 +0,0 @@
-<template>
-  <el-card class="box-card" shadow="never">
-    <template #header>
-      <div>
-        <span>{{ $t('generate.code.title') }}</span>
-      </div>
-    </template>
-    <div class="w-full sm:w-[40%] mx-auto">
-      <el-form :model="gen" ref="form" label-width="100px">
-        <el-form-item
-          :label="$t('generate.code.module.name')"
-          prop="module"
-          :rules="[
-            {
-              required: true,
-              message: $t('generate.code.module.verify'),
-            },
-          ]"
-        >
-          <Select v-model="gen.module" clearable :placeholder="$t('generate.code.module.placeholder')" api="modules" class="w-full" filterable />
-        </el-form-item>
-        <el-form-item
-          :label="$t('generate.code.controller.name')"
-          prop="controller"
-          :rules="[
-            {
-              required: true,
-              message: $t('generate.code.controller.verify'),
-            },
-          ]"
-        >
-          <el-input v-model="gen.controller" clearable :placeholder="$t('generate.code.controller.placeholder')" />
-        </el-form-item>
-        <el-form-item :label="$t('generate.code.model.name')" prop="model">
-          <el-input v-model="gen.model" clearable :placeholder="$t('generate.code.model.placeholder')" />
-        </el-form-item>
-
-        <div class="flex">
-          <el-form-item :label="$t('generate.code.paginate')" prop="paginate">
-            <el-switch v-model="gen.paginate" inline-prompt :active-text="$t('system.yes')" :inactive-text="$t('system.no')" />
-          </el-form-item>
-          <el-form-item label-width="15px">
-            <div class="text-sm text-gray-300">控制列表是否使用分页功能</div>
-          </el-form-item>
-        </div>
-      </el-form>
-    </div>
-    <Structure />
-    <div class="w-full flex justify-center pt-5">
-      <router-link to="/develop/schemas">
-        <el-button>{{ $t('system.back') }}</el-button>
-      </router-link>
-      <el-button type="primary" @click="submitGenerate(form)" class="ml-5">{{ $t('system.finish') }}</el-button>
-    </div>
-  </el-card>
-</template>
-<script lang="ts" setup>
-import { watch, onMounted, reactive, ref } from 'vue'
-import { useGenerateStore } from './store'
-import type { FormInstance } from 'element-plus'
-import http from '/admin/support/http'
-import Structure from './structure.vue'
-import { useRouter } from 'vue-router'
-const generateStore = useGenerateStore()
-const gen = reactive(generateStore.getCodeGen)
-
-const router = useRouter()
-
-const schemaId = router.currentRoute.value.params.schema
-
-onMounted(() => {
-  if (!generateStore.getSchemaId) {
-    generateStore.setSchemaId(schemaId)
-    getSchema()
-  } else {
-    if (schemaId !== generateStore.getSchemaId) {
-      generateStore.setSchemaId(schemaId)
-      generateStore.resetStructures()
-      getSchema()
-    }
-  }
-})
-
-const getSchema = () => {
-  http.get('schema/' + schemaId).then(r => {
-    gen.module = r.data.data.module
-    gen.schema = r.data.data.name
-
-    gen.model = r.data.data.name.replace(/\_(\w)/g, (value, letter) => {
-      return letter.toUpperCase()
-    })
-
-    generateStore.initStructures(r.data.data.columns)
-  })
-}
-const form = ref<FormInstance>()
-const submitGenerate = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.validate(valid => {
-    if (valid) {
-      http.post('generate', generateStore.$state).then(r => {})
-      //emits('next')
-      //generateStore.$reset()
-    } else {
-      return false
-    }
-  })
-}
-</script>

modules/Develop/views/generate/components/store.ts

@@ -1,112 +0,0 @@
-import { defineStore } from 'pinia'
-
-/**
- * 表结构信息
- */
-export interface Structure {
-  field: string
-  label: string
-  form_component: string
-  list: boolean
-  form: boolean
-  search: boolean
-  search_op: string
-  validates: string[]
-}
-
-/**
- * CodeGen
- */
-export interface CodeGen {
-  module: string
-  controller: string
-  model: string
-  paginate: true
-  schema: string
-}
-
-/**
- * generate
- */
-interface generate {
-  schemaId: number
-  structures: Structure[]
-  codeGen: CodeGen
-}
-
-/**
- * useGenerateStore
- */
-export const useGenerateStore = defineStore('generateStore', {
-  state(): generate {
-    return {
-      // schema id
-      schemaId: 0,
-      // structures
-      structures: [] as Structure[],
-      // codeGen
-      codeGen: Object.assign({
-        module: '',
-        controller: '',
-        model: '',
-        paginate: true,
-        schema: '',
-      }),
-    }
-  },
-
-  // store getters
-  getters: {
-    getSchemaId(): any {
-      return this.schemaId
-    },
-
-    getStructures(): Structure[] {
-      return this.structures
-    },
-
-    getCodeGen(): CodeGen {
-      return this.codeGen
-    },
-  },
-
-  // store actions
-  actions: {
-    // set schema
-    setSchemaId(schemaId: any): void {
-      this.schemaId = schemaId
-    },
-    // reset
-    resetStructures(): void {
-      this.structures = []
-    },
-    // filter structures
-    filterStructures(field: string) {
-      this.structures = this.structures.filter((s: Structure) => {
-        return !(s.field === field)
-      })
-    },
-
-    // init structure
-    initStructures(fields: Array<any>): void {
-      const unSupportFields = ['deleted_at', 'creator_id']
-
-      fields.forEach(field => {
-        if (!unSupportFields.includes(field.name)) {
-          this.structures.push(
-            Object.assign({
-              field: field.name,
-              label: '',
-              form_component: 'input',
-              list: true,
-              form: true,
-              search: false,
-              search_op: '',
-              validates: [],
-            }),
-          )
-        }
-      })
-    },
-  },
-})

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

@@ -1,99 +0,0 @@
-<template>
-  <div>
-    <el-table :data="structures">
-      <el-table-column prop="field" :label="$t('generate.schema.structure.field_name.name')" width="100px" />
-      <el-table-column prop="label" :label="$t('generate.schema.structure.form_label')" width="150px">
-        <template #default="scope">
-          <el-input v-model="scope.row.label" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="label" :label="$t('generate.schema.structure.form_component')" width="110px">
-        <template #default="scope">
-          <el-select v-model="scope.row.form_component" class="w-full" filterable>
-            <el-option v-for="component in formComponents" :key="component" :label="component" :value="component" />
-          </el-select>
-        </template>
-      </el-table-column>
-      <el-table-column prop="list" :label="$t('generate.schema.structure.list')">
-        <template #default="scope">
-          <el-switch v-model="scope.row.list" inline-prompt :active-text="$t('system.yes')" :inactive-text="$t('system.no')" width="45px" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="form" :label="$t('generate.schema.structure.form')">
-        <template #default="scope">
-          <el-switch v-model="scope.row.form" inline-prompt :active-text="$t('system.yes')" :inactive-text="$t('system.no')" width="45px" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="search" :label="$t('generate.schema.structure.search')">
-        <template #default="scope">
-          <el-switch v-model="scope.row.search" inline-prompt :active-text="$t('system.yes')" :inactive-text="$t('system.no')" width="45px" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="search_op" :label="$t('generate.schema.structure.search_op.name')" width="150px">
-        <template #default="scope">
-          <el-select v-model="scope.row.search_op" :placeholder="$t('generate.schema.structure.search_op.placeholder')" class="w-full">
-            <el-option v-for="op in operates" :key="op" :label="op" :value="op" />
-          </el-select>
-        </template>
-      </el-table-column>
-      <el-table-column prop="validates" :label="$t('generate.schema.structure.rules.name')" width="250px">
-        <template #default="scope">
-          <el-select v-model="scope.row.validates" :placeholder="$t('generate.schema.structure.rules.placeholder')" multiple filterable allow-create clearable class="w-full">
-            <el-option v-for="validate in validates" :key="validate" :label="validate" :value="validate" />
-          </el-select>
-        </template>
-      </el-table-column>
-      <!--<el-table-column prop="comment" label="注释" />-->
-      <el-table-column prop="id" :label="$t('generate.schema.structure.operate')" width="120px">
-        <template #default="scope">
-          <el-button type="danger" :icon="Delete" @click="deleteField(scope.row.field)" size="small" />
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-</template>
-<script lang="ts" setup>
-import { computed } from 'vue'
-import { useGenerateStore } from './store'
-import { Delete } from '@element-plus/icons-vue'
-
-const generateStore = useGenerateStore()
-
-const structures = computed(() => {
-  return generateStore.getStructures
-})
-
-const deleteField = (field: string) => {
-  generateStore.filterStructures(field)
-}
-
-const operates: string[] = ['=', '!=', '>', '>=', '<', '<=', 'like', 'RLike', 'LLike', 'in']
-
-const validates: string[] = [
-  'required',
-  'integer',
-  'numeric',
-  'string',
-  'timezone',
-  'url',
-  'uuid',
-  'date',
-  'alpha',
-  'alpha_dash',
-  'alpha_num',
-  'boolean',
-  'email',
-  'image',
-  'file',
-  'ip',
-  'ipv4',
-  'ipv6',
-  'mac_address',
-  'json',
-  'nullable',
-  'present',
-  'prohibited',
-]
-
-const formComponents: string[] = ['cascader', 'date', 'datetime', 'input', 'input-number', 'radio', 'rate', 'select', 'tree', 'tree-select']
-</script>

modules/Develop/views/generate/index.vue

@@ -1,10 +0,0 @@
-<template>
-  <div class="bg-white">
-    <CodeGen />
-  </div>
-</template>
-<script lang="ts" setup>
-import { ref } from 'vue'
-
-import CodeGen from './components/codeGen.vue'
-</script>

modules/Develop/views/module/create.vue

@@ -1,84 +0,0 @@
-<template>
-  <el-form :model="formData" label-width="120px" ref="form" v-loading="loading" class="pr-4">
-    <el-form-item
-      :label="$t('module.form.name.title')"
-      prop="title"
-      :rules="[
-        {
-          required: true,
-          message: $t('module.form.name.required'),
-        },
-      ]"
-    >
-      <el-input v-model="formData.title" />
-    </el-form-item>
-    <el-form-item
-      :label="$t('module.form.path.title')"
-      prop="path"
-      :rules="[
-        {
-          required: true,
-          message: $t('module.form.path.required'),
-        },
-      ]"
-    >
-      <el-input v-model="formData.path" :disabled="!!primary" />
-    </el-form-item>
-    <el-form-item :label="$t('module.form.keywords.title')" prop="keywords">
-      <el-input v-model="formData.keywords" />
-    </el-form-item>
-    <el-form-item :label="$t('module.form.desc.title')" prop="desc">
-      <el-input v-model="formData.description" type="textarea" />
-    </el-form-item>
-
-    <el-form-item :label="$t('module.form.dirs.title')" prop="dirs" v-if="!primary">
-      <el-checkbox v-model="formData['dirs']['controllers']" label="Controllers" size="large" />
-      <el-checkbox v-model="formData['dirs']['models']" label="Models" size="large" />
-      <el-checkbox v-model="formData['dirs']['database']" label="Database" size="large" />
-      <el-checkbox v-model="formData['dirs']['requests']" label="Requests" size="large" />
-    </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,
-  Object.assign({
-    title: '',
-    path: '',
-    keywords: '',
-    description: '',
-    dirs: {
-      controllers: true,
-      models: true,
-      database: true,
-      requests: false,
-    },
-  }),
-)
-
-const emit = defineEmits(['close'])
-
-if (props.primary) {
-  useShow(props.api, props.primary, formData)
-}
-
-onMounted(() => {
-  close(() => emit('close'))
-})
-</script>

modules/Develop/views/module/index.vue

@@ -1,71 +0,0 @@
-<template>
-  <div>
-    <Search :search="search" :reset="reset">
-      <template v-slot:body>
-        <el-form-item label="模块名称">
-          <el-input v-model="query.title" name="title" clearable />
-        </el-form-item>
-      </template>
-    </Search>
-    <div class="table-default">
-      <Operate :show="open">
-        <template v-slot:operate>
-          <!-- header 插槽的内容放这里 -->
-          <el-button type="success" class="float-right" @click="installVisible = true"><Icon name="cog-6-tooth" class="mr-1 w-4 h-4" /> 安装</el-button>
-        </template>
-      </Operate>
-      <el-table :data="tableData" class="mt-3" v-loading="loading">
-        <el-table-column prop="title" label="模块名称" width="180" />
-        <el-table-column prop="path" label="模块目录" width="180" />
-        <el-table-column prop="version" label="模块版本">
-          <template #default="scope">
-            <el-tag type="warning">{{ scope.row.version }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="enable" label="模块状态">
-          <template #default="scope">
-            <Status v-model="scope.row.enable" :id="scope.row.name" :api="api" />
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" width="300">
-          <template #default="scope">
-            <Update @click="open(scope.row.name)" />
-            <Destroy @click="destroy(api, scope.row.name)" />
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <Dialog v-model="visible" :title="title" destroy-on-close>
-      <Create @close="close(reset)" :primary="id" :api="api" />
-    </Dialog>
-
-    <!-- 安装 -->
-    <Dialog v-model="installVisible" title="安装模块" destroy-on-close>
-      <Install />
-    </Dialog>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { computed, onMounted, ref } from 'vue'
-import Create from './create.vue'
-import Install from './install.vue'
-import { useGetList } from '/admin/composables/curd/useGetList'
-import { useDestroy } from '/admin/composables/curd/useDestroy'
-import { useOpen } from '/admin/composables/curd/useOpen'
-
-const api = 'module'
-
-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)
-const installVisible = ref<boolean>(false)
-
-onMounted(() => {
-  search()
-
-  deleted(reset)
-})
-</script>

modules/Develop/views/module/install.vue

@@ -1,66 +0,0 @@
-<template>
-  <el-form :model="formData" label-width="120px" ref="form" v-loading="loading" class="pr-4">
-    <el-form-item label="安装方式" prop="type">
-      <el-radio-group v-model="formData.type">
-        <el-radio-button
-          v-for="item in [
-            { label: '普通安装', value: 1 },
-            { label: 'ZIP 安装', value: 2 },
-          ]"
-          :key="item.value"
-          :label="item.value"
-          name="type"
-          >{{ item.label }}
-        </el-radio-button>
-      </el-radio-group>
-    </el-form-item>
-    <el-form-item
-      label="模块名称"
-      prop="title"
-      :rules="[
-        {
-          required: true,
-          message: '模块名称必须填写',
-        },
-      ]"
-    >
-      <el-input v-model="formData.title" />
-    </el-form-item>
-    <el-form-item label="上传 ZIP" prop="file" v-if="formData.type === 2">
-      <Upload action="module/upload" :limit="1" accept=".zip" :on-success="moduleUpload">
-        <template #trigger>
-          <el-button type="primary">选择模块文件</el-button>
-        </template>
-      </Upload>
-    </el-form-item>
-
-    <div class="flex justify-end">
-      <el-button type="primary" @click="submitForm(form)">安装</el-button>
-    </div>
-  </el-form>
-</template>
-
-<script lang="ts" setup>
-import { useCreate } from '/admin/composables/curd/useCreate'
-
-import { onMounted } from 'vue'
-import { Code } from '/admin/enum/app'
-import Message from '/admin/support/message'
-
-const { formData, form, loading, submitForm, close } = useCreate('module/install')
-formData.value.type = 1
-
-const emit = defineEmits(['close'])
-
-onMounted(() => {
-  close(() => emit('close'))
-})
-
-const moduleUpload = (response, uploadFile) => {
-  if (response.code === Code.SUCCESS) {
-    formData.value.file = response.data
-  } else {
-    Message.error(response.message)
-  }
-}
-</script>

modules/Develop/views/router.ts

@@ -1,32 +0,0 @@
-import { RouteRecordRaw } from 'vue-router'
-
-// @ts-ignore
-const router: RouteRecordRaw[] = [
-  {
-    path: '/develop',
-    component: () => import('/admin/layout/index.vue'),
-    meta: { title: '开发工具', icon: 'wrench-screwdriver' },
-    children: [
-      {
-        path: 'modules',
-        name: 'modules',
-        meta: { title: '模块管理', icon: 'queue-list' },
-        component: () => import('./module/index.vue'),
-      },
-      {
-        path: 'schemas',
-        name: 'schemas',
-        meta: { title: 'Schemas', icon: 'list-bullet' },
-        component: () => import('./schema/index.vue'),
-      },
-      {
-        path: 'generate/:schema',
-        name: 'generate',
-        meta: { title: '代码生成', hidden: true, active_menu: '/develop/schemas' },
-        component: () => import('./generate/index.vue'),
-      },
-    ],
-  },
-]
-
-export default router

modules/Develop/views/schema/create.vue

@@ -1,36 +0,0 @@
-<template>
-  <div>
-    <Schema v-if="active === 1" @next="next" @prev="prev" />
-    <Structure v-if="active === 2" @next="next" @prev="prev" />
-  </div>
-</template>
-<script lang="ts" setup>
-import { ref, watch } from 'vue'
-import Schema from './steps/schema.vue'
-import Structure from './steps/structure.vue'
-import { useSchemaStore } from './store'
-
-const schemaStore = useSchemaStore()
-
-const active = ref(1)
-const next = () => {
-  if (active.value++ >= 2) {
-    active.value = 2
-  }
-}
-const prev = () => {
-  if (active.value-- === 1) {
-    active.value = 1
-  }
-}
-
-const emit = defineEmits(['close'])
-watch(
-  () => schemaStore.getFinished,
-  function (value) {
-    if (value) {
-      emit('close')
-    }
-  },
-)
-</script>

modules/Develop/views/schema/index.vue

@@ -1,83 +0,0 @@
-<template>
-  <div>
-    <Search :search="search" :reset="reset">
-      <template v-slot:body>
-        <el-form-item label="模块名称">
-          <el-input v-model="query.module" name="module" clearable />
-        </el-form-item>
-        <el-form-item label="Schema 名称">
-          <el-input v-model="query.name" name="name" 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="module" label="所属模块" />
-        <el-table-column prop="name" label="schema 名称" />
-        <el-table-column prop="columns" label="字段">
-          <template #default="scope">
-            <el-button size="small" type="success" @click="view(scope.row.id)"><Icon name="eye" class="w-3 mr-1" /> 查看</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column prop="is_soft_delete" label="?软删">
-          <template #default="scope">
-            <el-tag v-if="scope.row.is_soft_delete">是</el-tag>
-            <el-tag type="danger" v-else>否</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="created_at" label="创建时间" />
-        <el-table-column label="操作" width="250">
-          <template #default="scope">
-            <router-link :to="'/develop/generate/' + scope.row.id">
-              <el-button type="warning" size="small"><Icon name="wrench-screwdriver" class="w-3 mr-1" /> 生成代码</el-button>
-            </router-link>
-            <Destroy @click="destroy(api, scope.row.id)" class="ml-2" />
-          </template>
-        </el-table-column>
-      </el-table>
-      <Paginate />
-    </div>
-
-    <!-- schema 创建 -->
-    <Dialog v-model="visible" :title="title" width="650px" destroy-on-close>
-      <Create @close="close(reset)" :api="api" />
-    </Dialog>
-
-    <!-- schema 表结构 -->
-    <Dialog v-model="schemaVisible" title="Schema 结构" width="650px" destroy-on-close>
-      <Show :id="id" :api="api" />
-    </Dialog>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { computed, onMounted, ref } from 'vue'
-import Create from './create.vue'
-import Show from './show.vue'
-import { useGetList } from '/admin/composables/curd/useGetList'
-import { useDestroy } from '/admin/composables/curd/useDestroy'
-import { useOpen } from '/admin/composables/curd/useOpen'
-
-const schemaVisible = ref<boolean>(false)
-
-const api = 'schema'
-
-const { data, query, search, reset, loading } = useGetList(api)
-const { destroy, deleted } = useDestroy('确认删除吗? 将会删除数据库的 Schema，请提前做好备份，一旦删除，将无法恢复!')
-const { open, close, title, visible, id } = useOpen()
-
-const tableData = computed(() => data.value?.data)
-
-const view = primaryId => {
-  schemaVisible.value = true
-
-  id.value = primaryId
-}
-
-onMounted(() => {
-  search()
-
-  deleted(reset)
-})
-</script>

modules/Develop/views/schema/show.vue

@@ -1,31 +0,0 @@
-<template>
-  <el-table :data="data?.columns" class="mt-3" v-loading="loading">
-    <el-table-column prop="name" label="字段名称" />
-    <el-table-column prop="type" label="类型" />
-    <el-table-column prop="nullable" label="nullable">
-      <template #default="scope">
-        <el-tag v-if="scope.row.nullable">是</el-tag>
-        <el-tag type="danger" v-else>否</el-tag>
-      </template>
-    </el-table-column>
-    <el-table-column prop="default" label="默认值">
-      <template #default="scope"> </template>
-    </el-table-column>
-    <el-table-column prop="comment" label="注释" />
-  </el-table>
-</template>
-
-<script lang="ts" setup>
-import { useShow } from '/admin/composables/curd/useShow'
-const props = defineProps({
-  id: {
-    type: Number,
-    required: true,
-  },
-})
-
-// const data = ref<Array<object>>()
-const { data, loading } = useShow('schema', props.id)
-</script>
-
-<style scoped></style>

modules/Develop/views/schema/steps/schema.vue

@@ -1,107 +0,0 @@
-<template>
-  <div class="w-full sm:w-[90%] mx-auto">
-    <el-form :model="schema" ref="form" label-width="80px">
-      <el-form-item
-        :label="$t('generate.code.module.name')"
-        prop="module"
-        :rules="[
-          {
-            // required: true,
-            message: $t('generate.code.module.verify'),
-          },
-        ]"
-      >
-        <Select v-model="schema.module" clearable :placeholder="$t('generate.code.module.placeholder')" api="modules" class="w-full" filterable />
-      </el-form-item>
-      <el-form-item
-        :label="$t('generate.schema.name')"
-        prop="name"
-        :rules="[
-          {
-            required: true,
-            message: $t('generate.schema.name_verify'),
-          },
-        ]"
-      >
-        <el-input v-model="schema.name" clearable />
-      </el-form-item>
-      <el-form-item
-        :label="$t('generate.schema.engine.name')"
-        prop="engine"
-        :rules="[
-          {
-            required: true,
-            message: $t('generate.schema.engine.verify'),
-          },
-        ]"
-      >
-        <el-select class="w-full" v-model="schema.engine" :placeholder="$t('generate.schema.engine.placeholder')" clearable>
-          <el-option v-for="engine in engines" :key="engine.value" :label="engine.label" :value="engine.value" />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('generate.schema.default_field.name')">
-        <el-checkbox v-model="schema.created_at" :label="$t('generate.schema.default_field.created_at')" size="large" />
-        <el-checkbox v-model="schema.updated_at" :label="$t('generate.schema.default_field.updated_at')" size="large" />
-        <el-checkbox v-model="schema.creator_id" :label="$t('generate.schema.default_field.creator')" size="large" />
-        <el-checkbox v-model="schema.deleted_at" :label="$t('generate.schema.default_field.delete_at')" size="large" />
-      </el-form-item>
-      <el-form-item
-        :label="$t('generate.schema.comment.name')"
-        prop="comment"
-        :rules="[
-          {
-            required: true,
-            message: $t('generate.schema.comment.verify'),
-          },
-        ]"
-      >
-        <el-input v-model="schema.comment" type="textarea" />
-      </el-form-item>
-    </el-form>
-
-    <div class="w-full sm:w-96 justify-between mx-auto pl-24 mt-4">
-      <el-button class="mt-5" @click="$emit('prev')">{{ $t('system.prev') }}</el-button>
-      <el-button class="mt-5" type="primary" @click="submitCreateTable(form)">{{ $t('system.next') }}</el-button>
-    </div>
-  </div>
-</template>
-<script lang="ts" setup>
-import { reactive, computed, ref, unref } from 'vue'
-import { useSchemaStore } from '../store'
-import type { FormInstance } from 'element-plus'
-
-const schemaStore = useSchemaStore()
-schemaStore.start()
-
-const emits = defineEmits(['prev', 'next'])
-
-const schema = ref(schemaStore.getSchema)
-const form = ref<FormInstance>()
-const submitCreateTable = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.validate(valid => {
-    if (valid) {
-      emits('next')
-      schemaStore.setSchema(unref(schema))
-    } else {
-      return false
-    }
-  })
-}
-const engines = computed(() => {
-  return [
-    {
-      value: 'InnoDB',
-      label: 'InnoDB',
-    },
-    {
-      value: 'MyISAM',
-      label: 'MyISAM',
-    },
-    {
-      value: 'Memory',
-      label: 'Memory',
-    },
-  ]
-})
-</script>

modules/Develop/views/schema/steps/structure.vue

@@ -1,230 +0,0 @@
-<template>
-  <div>
-    <el-table :data="structures" class="draggable">
-      <el-table-column prop="field" :label="$t('generate.schema.structure.field_name.name')" />
-      <el-table-column prop="type" :label="$t('generate.schema.structure.type.name')">
-        <template #default="scope">
-          <el-tag type="success">{{ scope.row.type }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column prop="nullable" :label="$t('generate.schema.structure.nullable')" width="90px">
-        <template #default="scope">
-          <el-tag v-if="scope.row.nullable">{{ $t('system.yes') }}</el-tag>
-          <el-tag v-else type="info">{{ $t('system.no') }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column prop="default" :label="$t('generate.schema.structure.default')" />
-      <!--<el-table-column prop="comment" label="注释" />-->
-      <el-table-column prop="id" :label="$t('generate.schema.structure.operate')" width="120px">
-        <template #default="scope">
-          <el-button type="primary" :icon="Edit" @click="updateField(scope.row.id)" size="small" />
-          <el-button type="danger" :icon="Delete" @click="deleteField(scope.row.id)" size="small" />
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <div class="flex justify-end mt-4">
-      <el-button type="success" :icon="Plus" @click="addField">{{ $t('system.add') }}</el-button>
-    </div>
-
-    <div class="w-full sm:w-96 justify-between mx-auto pl-24 mt-2">
-      <el-button class="mt-5" @click="emits('prev')">{{ $t('system.prev') }}</el-button>
-      <el-button class="mt-5" type="primary" @click="next">{{ $t('system.confirm') }}</el-button>
-    </div>
-
-    <Dialog v-model="visible" :title="$t('system.add')">
-      <el-form :model="structure" status-icon label-width="120px" ref="form">
-        <el-form-item
-          :label="$t('generate.schema.structure.field_name.name')"
-          prop="field"
-          :rules="[
-            {
-              required: true,
-              message: $t('generate.schema.structure.field_name.verify'),
-            },
-          ]"
-        >
-          <el-input v-model="structure.field" />
-        </el-form-item>
-        <div class="flex justify-between">
-          <el-form-item
-            class="w-full"
-            :label="$t('generate.schema.structure.type.name')"
-            prop="type"
-            :rules="[
-              {
-                required: true,
-                message: $t('generate.schema.structure.type.verify'),
-              },
-            ]"
-          >
-            <el-select v-model="structure.type" :placeholder="$t('generate.schema.structure.type.placeholder')" filterable class="w-full">
-              <el-option v-for="item in types" :key="item" :label="item" :value="item" />
-            </el-select>
-          </el-form-item>
-        </div>
-        <el-form-item :label="$t('generate.schema.structure.length')" prop="length">
-          <el-input-number v-model="structure.length" :min="0" />
-        </el-form-item>
-        <div class="flex justify-between">
-          <el-form-item label="nullable" prop="nullable">
-            <el-switch v-model="structure.nullable" inline-prompt :active-text="$t('system.yes')" :inactive-text="$t('system.no')" />
-          </el-form-item>
-          <el-form-item :label="$t('generate.schema.structure.default')" prop="default" v-if="!structure.nullable">
-            <el-input v-model="structure.default" />
-          </el-form-item>
-        </div>
-        <el-form-item :label="$t('generate.schema.structure.unique')" prop="unique">
-          <el-switch v-model="structure.unique" inline-prompt :active-text="$t('system.yes')" :inactive-text="$t('system.no')" />
-        </el-form-item>
-        <el-form-item :label="$t('generate.schema.structure.comment')" prop="comment">
-          <el-input v-model="structure.comment" text />
-        </el-form-item>
-        <div class="flex justify-end">
-          <el-button type="primary" @click="submitStructure(form)">{{ $t('system.confirm') }}</el-button>
-        </div>
-      </el-form>
-    </Dialog>
-  </div>
-</template>
-<script lang="ts" setup>
-import { computed, onMounted, Ref, ref } from 'vue'
-import { useSchemaStore, Structure } from '../store'
-import { Delete, Plus, Edit } from '@element-plus/icons-vue'
-import type { FormInstance } from 'element-plus'
-import Message from '/admin/support/message'
-import http from '/admin/support/http'
-import { Code } from '/admin/enum/app'
-import Sortable from 'sortablejs'
-
-const schemaStore = useSchemaStore()
-const emits = defineEmits(['prev', 'next'])
-const visible = ref(false)
-
-const structures = computed(() => {
-  return schemaStore.getStructures
-})
-
-const structure: Ref<Structure> = ref(schemaStore.initStructure())
-// structure
-const addField = async () => {
-  await form.value?.clearValidate()
-  visible.value = true
-}
-const updateField = (id: number) => {
-  visible.value = true
-  schemaStore.getStructures.forEach(s => {
-    if (s.id === id) {
-      structure.value = s
-    }
-  })
-}
-
-onMounted(() => {
-  const tbody = document.querySelector('.draggable .el-table__body-wrapper tbody')
-  const structures = schemaStore.getStructures
-
-  Sortable.create(tbody, {
-    draggable: 'tr',
-    onEnd({ newIndex, oldIndex }) {
-      const newStructures = []
-      const s = structures.splice(oldIndex, newIndex - oldIndex)
-      s.concat(structures).forEach(item => {
-        newStructures.push(item)
-      })
-      schemaStore.setStructures(newStructures)
-
-      // console.log(structure)
-      // structures[newIndex] = structures[oldIndex]
-      // structures[oldIndex] = temp
-    },
-  })
-})
-
-const form = ref<FormInstance>()
-const submitStructure = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.validate(valid => {
-    if (valid) {
-      visible.value = !visible.value
-      schemaStore.addStructure(structure.value)
-      structure.value = schemaStore.initStructure()
-    } else {
-      return false
-    }
-  })
-}
-
-const deleteField = (id: number) => {
-  schemaStore.filterStructures(id)
-}
-
-const next = () => {
-  if (schemaStore.getStructures.length < 1) {
-    Message.error('请先填写表结构数据')
-  } else {
-    http.post('schema', schemaStore.$state).then(r => {
-      if (r.data.code == Code.SUCCESS) {
-        Message.success('创建成功')
-        schemaStore.finished()
-      }
-    })
-  }
-}
-
-const types: string[] = [
-  'id',
-  'smallIncrements',
-  'mediumIncrements',
-  'increments',
-  'smallInteger',
-  'integer',
-  'bigIncrements',
-  'bigInteger',
-  'mediumInteger',
-  'unsignedInteger',
-  'unsignedMediumInteger',
-  'unsignedSmallInteger',
-  'unsignedTinyInteger',
-  'string',
-  'text',
-  'binary',
-  'boolean',
-  'char',
-  'dateTimeTz',
-  'dateTime',
-  'date',
-  'decimal',
-  'double',
-  'float',
-  'geometryCollection',
-  'geometry',
-  'ipAddress',
-  'json',
-  'jsonb',
-  'lineString',
-  'longText',
-  'macAddress',
-  'mediumText',
-  'multiLineString',
-  'multiPoint',
-  'multiPolygon',
-  'nullableMorphs',
-  'nullableTimestamps',
-  'nullableUuidMorphs',
-  'point',
-  'polygon',
-  'timeTz',
-  'time',
-  'timestampTz',
-  'timestamp',
-  'timestampsTz',
-  'timestamps',
-  'tinyIncrements',
-  'tinyInteger',
-  'tinyText',
-  'unsignedDecimal',
-  'uuid',
-  'year',
-]
-</script>

modules/Develop/views/schema/store/index.ts

@@ -1,146 +0,0 @@
-import { defineStore } from 'pinia'
-
-/**
- * 表信息
- */
-export interface Schema {
-  module: string
-  name: string
-  comment: string
-  engine: string
-  charset: string
-  collaction: string
-  created_at: boolean
-  creator_id: boolean
-  updated_at: boolean
-  deleted_at: boolean
-}
-
-/**
- * 表结构信息
- */
-export interface Structure {
-  id: number
-  field: string
-  length: number
-  type: string
-  nullable: boolean
-  unique: boolean
-  default: number | string
-  comment: string
-}
-
-/**
- * generate
- */
-interface CreateSchema {
-  schema: Schema
-  structures: Structure[]
-  is_finished: boolean
-}
-
-/**
- * useSchemaStore
- */
-export const useSchemaStore = defineStore('schemaStore', {
-  state(): CreateSchema {
-    return {
-      // schema
-      schema: Object.assign({
-        module: '',
-        name: '',
-        comment: '',
-        engine: 'InnoDB',
-        charset: 'utf8mb4',
-        collection: 'utf8mb4_unicode_ci',
-        created_at: true,
-        creator_id: true,
-        updated_at: true,
-        deleted_at: true,
-      }),
-      // structures
-      structures: [] as Structure[],
-
-      // is finished
-      is_finished: false,
-    }
-  },
-
-  // store getters
-  getters: {
-    getSchema(): Schema {
-      return this.schema
-    },
-
-    getStructures(): Structure[] {
-      return this.structures
-    },
-
-    getFinished(): boolean {
-      return this.is_finished
-    },
-  },
-
-  // store actions
-  actions: {
-    // set schema
-    setSchema(schema: Schema): void {
-      this.schema = schema
-    },
-
-    setStructures(structures: Array<Structure>): void {
-      this.structures = structures
-    },
-    // add structure
-    addStructure(structure: Structure): void {
-      if (structure.id) {
-        this.structures = this.structures.filter((s: Structure) => {
-          if (s.id === structure.id) {
-            s = structure
-          }
-          return s
-        })
-      } else {
-        structure.id = this.structures.length + 1
-        this.structures.push(structure)
-      }
-    },
-
-    // filter structures
-    filterStructures(id: number) {
-      this.structures = this.structures.filter((s: Structure) => {
-        return !(s.id === id)
-      })
-    },
-
-    // init structure
-    initStructure(): Structure {
-      return Object.assign({
-        id: 0,
-        field: '',
-        label: '',
-        type: '',
-        length: 0,
-        nullable: false,
-        unique: false,
-        default: '',
-        comment: '',
-      })
-    },
-
-    /**
-     * finished
-     */
-    finished(): void {
-      this.$reset()
-      this.is_finished = true
-    },
-
-    /**
-     * unfinished
-     */
-    start(): void {
-      this.is_finished = false
-    },
-  },
-})

modules/Permissions/Http/Controllers/PermissionsController.php

@@ -28,11 +28,13 @@ class PermissionsController extends Controller
     public function index(Request $request): mixed
     {
         if ($request->get('from') == 'role') {
-            return $this->model->getList();
+            return $this->model->setBeforeGetList(function ($query){
+                return $query->orderByDesc('sort');
+            })->getList();
         }
 
         return $this->model->setBeforeGetList(function ($query) {
-            return $query->with('actions')->whereIn('type', [MenuType::Top->value(), MenuType::Menu->value()]);
+            return $query->with('actions')->whereIn('type', [MenuType::Top->value(), MenuType::Menu->value()])->orderByDesc('sort');
         })->getList();
     }
 

modules/Permissions/Http/Controllers/RolesController.php

@@ -6,6 +6,10 @@ namespace Modules\Permissions\Http\Controllers;
 
 use Catch\Base\CatchController as Controller;
 use Catch\Exceptions\FailedException;
+use Catch\Support\ResponseBuilder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Foundation\Exceptions\ReportableHandler;
+use Illuminate\Http\Request;
 use Modules\Permissions\Enums\DataRange;
 use Modules\Permissions\Models\Roles;
 use Modules\Permissions\Http\Requests\RoleRequest;
@@ -39,25 +43,34 @@ class RolesController extends Controller
      */
     public function store(RoleRequest $request)
     {
-        $dataRange = $request->get('data_range');
+        $data = $request->all();
-
+        if (!isset($data['data_range'])) {
-        if ($dataRange && ! DataRange::Personal_Choose->assert($request->get('data_range'))) {
+            $data['data_range'] = 0;
-            $request['departments'] = [];
+        } else {
+            $data['data_range'] = (int)$data['data_range'];
+            if (!DataRange::Personal_Choose->assert($data['data_range'])) {
+                $data['departments'] = [];
+            }
         }
 
-        return $this->model->storeBy($request->all());
+        return $this->model->storeBy($data);
     }
 
     /**
      *
      * @param $id
-     * @return \Illuminate\Database\Eloquent\Model|null
+     * @param Request $request
+     * @return Model|null
      */
-    public function show($id)
+    public function show($id, Request $request)
     {
         $role = $this->model->firstBy($id);
 
+        if ($request->has('from') && $request->get('from') == 'parent_role') {
+            $role->setAttribute('permissions', $role->permissions()->get()->toTree());
+        } else {
             $role->setAttribute('permissions', $role->permissions()->get()->pluck('id'));
+        }
 
         $role->setAttribute('departments', $role->departments()->pluck('id'));
 
@@ -73,8 +86,8 @@ 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 (!DataRange::Personal_Choose->assert($data['data_range'])) {
             $data['departments'] = [];
         }
 

modules/Permissions/Models/Permissions.php

@@ -7,9 +7,11 @@ namespace Modules\Permissions\Models;
 use Catch\Base\CatchModel as Model;
 use Catch\CatchAdmin;
 use Catch\Enums\Status;
+use Catch\Exceptions\FailedException;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
 use Modules\Permissions\Enums\MenuStatus;
 use Modules\Permissions\Enums\MenuType;
 
@@ -188,6 +190,10 @@ class Permissions extends Model
                 return true;
             }
 
+            if ($data['type'] != MenuType::Top->value() && ! $data['parent_id']) {
+                throw new FailedException('请选择父级菜单');
+            }
+
             $model = $this->fill($data);
 
             if ($model->isAction()) {
@@ -199,6 +205,9 @@ class Permissions extends Model
                 $data['route'] = '/'.trim($data['route'], '/');
             }
 
+            if (isset($data['component'])) {
+                $data['component'] = Str::of($data['component'])->replace('\\', '/')->toString();
+            }
             return parent::storeBy($data);
         });
     }
@@ -236,6 +245,10 @@ class Permissions extends Model
      */
     public function updateBy($id, array $data): mixed
     {
+        if ($data['type'] != MenuType::Top->value() && ! $data['parent_id']) {
+            throw new FailedException('请选择父级菜单');
+        }
+
         $model = $this->fill($data);
 
         if ($model->isAction()) {
@@ -244,6 +257,9 @@ class Permissions extends Model
             $data['permission_mark'] = $parentMenu->permission_mark.'@'.$data['permission_mark'];
         }
 
+        if (isset($data['component'])) {
+            $data['component'] = Str::of($data['component'])->replace('\\', '/')->toString();
+        }
         return parent::updateBy($id, $data);
     }
 }

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/database/seeder/PermissionsMenusSeeder.php

@@ -30,7 +30,7 @@ return new class extends Seeder
     'icon' => 'arrow-down-on-square-stack',
     'module' => 'permissions',
     'permission_mark' => '',
-    'component' => '/admin/layout/index.vue',
+    'component' => '/layout/index.vue',
     'redirect' => NULL,
     'keepalive' => 1,
     'type' => 1,
@@ -51,7 +51,7 @@ return new class extends Seeder
         'icon' => 'arrow-left-circle',
         'module' => 'permissions',
         'permission_mark' => 'Roles',
-        'component' => '/Permissions/views/roles/index.vue',
+        'component' => '/permissions/roles/index.vue',
         'redirect' => NULL,
         'keepalive' => 1,
         'type' => 2,
@@ -174,7 +174,7 @@ return new class extends Seeder
         'icon' => 'finger-print',
         'module' => 'permissions',
         'permission_mark' => 'Permissions',
-        'component' => '/Permissions/views/permissions/index.vue',
+        'component' => '/permissions/permissions/index.vue',
         'redirect' => NULL,
         'keepalive' => 1,
         'type' => 2,
@@ -317,7 +317,7 @@ return new class extends Seeder
         'icon' => 'globe-americas',
         'module' => 'permissions',
         'permission_mark' => 'Jobs',
-        'component' => '/Permissions/views/jobs/index.vue',
+        'component' => '/permissions/jobs/index.vue',
         'redirect' => NULL,
         'keepalive' => 1,
         'type' => 2,
@@ -460,7 +460,7 @@ return new class extends Seeder
         'icon' => 'table-cells',
         'module' => 'permissions',
         'permission_mark' => 'Departments',
-        'component' => '/Permissions/views/departments/index.vue',
+        'component' => '/permissions/departments/index.vue',
         'redirect' => NULL,
         'keepalive' => 1,
         'type' => 2,
@@ -594,6 +594,178 @@ return new class extends Seeder
           ),
         ),
       ),
+
+        4 =>
+            array (
+                'id' => 223,
+                'parent_id' => 1,
+                'permission_name' => '用户管理',
+                'route' => 'user',
+                'icon' => 'users',
+                'module' => 'user',
+                'permission_mark' => 'user',
+                'component' => '/user/index.vue',
+                'redirect' => NULL,
+                'keepalive' => 1,
+                'type' => 2,
+                'hidden' => 1,
+                'sort' => 1,
+                'active_menu' => '',
+                'creator_id' => 1,
+                'created_at' => 1709342019,
+                'updated_at' => 1709342019,
+                'deleted_at' => 0,
+                'children' =>
+                    array (
+                        0 =>
+                            array (
+                                'id' => 224,
+                                'parent_id' => 223,
+                                'permission_name' => '列表',
+                                'route' => '',
+                                'icon' => '',
+                                'module' => 'user',
+                                'permission_mark' => 'user@index',
+                                'component' => '',
+                                'redirect' => '',
+                                'keepalive' => 1,
+                                'type' => 3,
+                                'hidden' => 1,
+                                'sort' => 1,
+                                'active_menu' => '',
+                                'creator_id' => 1,
+                                'created_at' => 1709373354,
+                                'updated_at' => 1709373354,
+                                'deleted_at' => 0,
+                            ),
+                        1 =>
+                            array (
+                                'id' => 225,
+                                'parent_id' => 223,
+                                'permission_name' => '新增',
+                                'route' => '',
+                                'icon' => '',
+                                'module' => 'user',
+                                'permission_mark' => 'user@store',
+                                'component' => '',
+                                'redirect' => '',
+                                'keepalive' => 1,
+                                'type' => 3,
+                                'hidden' => 1,
+                                'sort' => 2,
+                                'active_menu' => '',
+                                'creator_id' => 1,
+                                'created_at' => 1709373354,
+                                'updated_at' => 1709373354,
+                                'deleted_at' => 0,
+                            ),
+                        2 =>
+                            array (
+                                'id' => 226,
+                                'parent_id' => 223,
+                                'permission_name' => '读取',
+                                'route' => '',
+                                'icon' => '',
+                                'module' => 'user',
+                                'permission_mark' => 'user@show',
+                                'component' => '',
+                                'redirect' => '',
+                                'keepalive' => 1,
+                                'type' => 3,
+                                'hidden' => 1,
+                                'sort' => 3,
+                                'active_menu' => '',
+                                'creator_id' => 1,
+                                'created_at' => 1709373354,
+                                'updated_at' => 1709373354,
+                                'deleted_at' => 0,
+                            ),
+                        3 =>
+                            array (
+                                'id' => 227,
+                                'parent_id' => 223,
+                                'permission_name' => '更新',
+                                'route' => '',
+                                'icon' => '',
+                                'module' => 'user',
+                                'permission_mark' => 'user@update',
+                                'component' => '',
+                                'redirect' => '',
+                                'keepalive' => 1,
+                                'type' => 3,
+                                'hidden' => 1,
+                                'sort' => 4,
+                                'active_menu' => '',
+                                'creator_id' => 1,
+                                'created_at' => 1709373354,
+                                'updated_at' => 1709373354,
+                                'deleted_at' => 0,
+                            ),
+                        4 =>
+                            array (
+                                'id' => 228,
+                                'parent_id' => 223,
+                                'permission_name' => '删除',
+                                'route' => '',
+                                'icon' => '',
+                                'module' => 'user',
+                                'permission_mark' => 'user@destroy',
+                                'component' => '',
+                                'redirect' => '',
+                                'keepalive' => 1,
+                                'type' => 3,
+                                'hidden' => 1,
+                                'sort' => 5,
+                                'active_menu' => '',
+                                'creator_id' => 1,
+                                'created_at' => 1709373354,
+                                'updated_at' => 1709373354,
+                                'deleted_at' => 0,
+                            ),
+                        5 =>
+                            array (
+                                'id' => 229,
+                                'parent_id' => 223,
+                                'permission_name' => '禁用/启用',
+                                'route' => '',
+                                'icon' => '',
+                                'module' => 'user',
+                                'permission_mark' => 'user@enable',
+                                'component' => '',
+                                'redirect' => '',
+                                'keepalive' => 1,
+                                'type' => 3,
+                                'hidden' => 1,
+                                'sort' => 6,
+                                'active_menu' => '',
+                                'creator_id' => 1,
+                                'created_at' => 1709373354,
+                                'updated_at' => 1709373354,
+                                'deleted_at' => 0,
+                            ),
+                        6 =>
+                            array (
+                                'id' => 230,
+                                'parent_id' => 223,
+                                'permission_name' => '导出',
+                                'route' => '',
+                                'icon' => '',
+                                'module' => 'user',
+                                'permission_mark' => 'user@export',
+                                'component' => '',
+                                'redirect' => '',
+                                'keepalive' => 1,
+                                'type' => 3,
+                                'hidden' => 1,
+                                'sort' => 10,
+                                'active_menu' => '',
+                                'creator_id' => 1,
+                                'created_at' => 1709373354,
+                                'updated_at' => 1709373354,
+                                'deleted_at' => 0,
+                            ),
+                    ),
+            ),
     ),
   ),
 );

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

@@ -1,79 +0,0 @@
-<template>
-  <el-form :model="formData" label-width="120px" ref="form" v-loading="loading" class="pr-4">
-    <el-form-item label="父级部门" prop="parent_id">
-      <el-cascader :options="departments" name="parent_id" v-model="formData.parent_id" clearable :props="{ value: 'id', label: 'department_name', checkStrictly: true }" class="w-full" />
-    </el-form-item>
-    <el-form-item label="部门名称" prop="department_name" :rules="[{ required: true, message: '部门名称必须填写' }]">
-      <el-input v-model="formData.department_name" name="department_name" clearable />
-    </el-form-item>
-    <el-form-item label="部门联系人" prop="principal">
-      <el-input v-model="formData.principal" name="principal" clearable />
-    </el-form-item>
-    <el-form-item label="手机号" prop="mobile">
-      <el-input v-model="formData.mobile" name="mobile" clearable />
-    </el-form-item>
-    <el-form-item label="邮箱" prop="email">
-      <el-input v-model="formData.email" name="email" clearable />
-    </el-form-item>
-    <el-form-item label="排序" prop="sort">
-      <el-input-number v-model="formData.sort" name="sort" :min="1" />
-    </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 http from '/admin/support/http'
-import { onMounted, ref, unref } from 'vue'
-
-const props = defineProps({
-  primary: String | Number,
-  api: String,
-})
-
-const { formData, form, loading, submitForm, close, beforeCreate, beforeUpdate } = useCreate(props.api, props.primary)
-formData.value.sort = 1
-
-beforeCreate.value = () => {
-  formData.value.parent_id = getParent(formData.value.parent_id)
-}
-
-beforeUpdate.value = () => {
-  formData.value.parent_id = getParent(formData.value.parent_id)
-}
-
-const getParent = (parentId: any) => {
-  return typeof parentId === 'undefined' ? 0 : parentId[parentId.length - 1]
-}
-
-if (props.primary) {
-  const { afterShow } = useShow(props.api, props.primary, formData)
-  afterShow.value = formData => {
-    const data = unref(formData)
-    data.parent_id = data.parent_id ? [data.parent_id] : 0
-
-    if (!data.data_range) {
-      data.data_range = null
-    }
-
-    formData.value = data
-  }
-}
-
-const emit = defineEmits(['close'])
-
-const departments = ref()
-onMounted(() => {
-  http.get(props.api).then(r => {
-    departments.value = r.data.data
-  })
-
-  close(() => {
-    emit('close')
-  })
-})
-</script>

modules/Permissions/views/departments/index.vue

@@ -1,56 +0,0 @@
-<template>
-  <div>
-    <Search :search="search" :reset="reset">
-      <template v-slot:body>
-        <el-form-item label="部门名称" prop="department_name">
-          <el-input v-model="query.department_name" name="department_name" clearable />
-        </el-form-item>
-      </template>
-    </Search>
-    <div class="table-default">
-      <Operate :show="open" />
-      <el-table :data="tableData" class="mt-3" v-loading="loading" row-key="id" default-expand-all :tree-props="{ children: 'children' }">
-        <el-table-column prop="department_name" 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" @refresh="search" />
-          </template>
-        </el-table-column>
-        <el-table-column prop="created_at" 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>
-    </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 './form/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 = 'permissions/departments'
-
-const { data, query, search, reset, loading } = useGetList(api, false)
-const { destroy, deleted } = useDestroy()
-const { open, close, title, visible, id } = useOpen()
-
-const tableData = computed(() => data.value?.data)
-
-onMounted(() => {
-  search()
-
-  deleted(reset)
-})
-</script>

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

@@ -1,55 +0,0 @@
-<template>
-  <el-form :model="formData" label-width="120px" ref="form" v-loading="loading" class="pr-4">
-    <el-form-item label="岗位名称" prop="job_name" :rules="[{ required: true, message: '岗位名称必须填写' }]">
-      <el-input v-model="formData.job_name" name="job_name" clearable />
-    </el-form-item>
-    <el-form-item label="岗位编码" prop="coding">
-      <el-input v-model="formData.coding" name="coding" clearable />
-    </el-form-item>
-    <el-form-item label="状态" prop="status">
-      <el-radio-group v-model="formData.status">
-        <el-radio v-for="item in options" :key="item.value" :label="item.value" name="status">{{ item.label }}</el-radio>
-      </el-radio-group>
-    </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'
-
-const props = defineProps({
-  primary: String | Number,
-  api: String,
-})
-
-const { formData, form, loading, submitForm, close } = useCreate(props.api, props.primary)
-
-formData.value.status = 1
-formData.value.sort = 1
-
-if (props.primary) {
-  useShow(props.api, props.primary, formData)
-}
-const emit = defineEmits(['close'])
-
-onMounted(() => {
-  close(() => emit('close'))
-})
-
-const options = [
-  { label: '正常', value: 1 },
-  { label: '禁用', value: 2 },
-]
-</script>

modules/Permissions/views/jobs/index.vue

@@ -1,58 +0,0 @@
-<template>
-  <div>
-    <Search :search="search" :reset="reset">
-      <template v-slot:body>
-        <el-form-item label="岗位名称" prop="job_name">
-          <el-input v-model="query.job_name" name="job_name" 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="job_name" label="岗位名称" />
-        <el-table-column prop="coding" 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="sort" label="排序" />
-        <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 './form/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 = 'permissions/jobs'
-
-const { data, query, search, reset, loading } = useGetList(api)
-const { destroy, deleted } = useDestroy()
-
-const tableData = computed(() => data.value?.data)
-const { open, close, title, visible, id } = useOpen()
-
-onMounted(() => {
-  search()
-
-  deleted(reset)
-})
-</script>

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

@@ -1,209 +0,0 @@
-<template>
-  <el-form :model="formData" label-width="85px" ref="form" v-loading="loading" class="pr-4">
-    <div class="flex flex-row justify-between">
-      <div>
-        <el-form-item label="菜单类型" prop="type">
-          <el-radio-group v-model="formData.type">
-            <el-radio-button
-              v-for="item in [
-                { label: '目录', value: 1 },
-                { label: '菜单', value: 2 },
-                { label: '按钮', value: 3 },
-              ]"
-              :key="item.value"
-              :label="item.value"
-              name="type"
-              >{{ item.label }}
-            </el-radio-button>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="菜单名称" prop="permission_name" :rules="[{ required: true, message: '菜单名称必须填写' }]">
-          <el-input v-model="formData.permission_name" name="permission_name" clearable />
-        </el-form-item>
-        <el-form-item label="所属模块" prop="module" :rules="[{ required: true, message: '所属模块必须填写' }]" v-if="!isAction">
-          <Select v-model="formData.module" api="modules" allow-create @clear="clearModule" />
-        </el-form-item>
-        <el-form-item label="路由Path" prop="route" :rules="[{ required: true, message: '路由Path必须填写' }]" v-if="!isAction">
-          <el-input v-model="formData.route" name="route" clearable />
-        </el-form-item>
-        <el-form-item label="Redirect" prop="redirect" v-if="!isAction">
-          <el-input v-model="formData.redirect" name="redirect" clearable />
-        </el-form-item>
-        <el-form-item label="排序" prop="sort">
-          <el-input-number v-model="formData.sort" name="sort" :min="1" />
-        </el-form-item>
-      </div>
-      <div>
-        <el-form-item label="父级菜单" prop="parent_id">
-          <el-cascader :options="permissions" name="parent_id" v-model="formData.parent_id" clearable :props="{ value: 'id', label: 'permission_name', checkStrictly: true }" class="w-full" />
-        </el-form-item>
-        <el-form-item label="权限标识" prop="permission_mark" :rules="[{ required: true, message: '权限标识必须填写' }]" v-if="!isTop">
-          <el-input v-model="formData.permission_mark" name="permission_mark" clearable v-if="isAction" />
-          <Select v-model="formData.permission_mark" allow-create placeholder="请选择" api="controllers" :query="{ module: formData.module }" v-else />
-        </el-form-item>
-        <el-form-item label="菜单Icon" prop="icon" v-if="!isAction">
-          <el-input v-model="formData.icon" name="icon" clearable @click="open" />
-        </el-form-item>
-        <el-form-item label="所属组件" prop="component" v-if="!isAction">
-          <Select v-model="formData.component" placeholder="请选择" allow-create api="components" :query="{ module: formData.module }" />
-        </el-form-item>
-
-        <el-form-item label="Hidden" prop="hidden" v-if="!isAction">
-          <el-radio-group v-model="formData.hidden">
-            <el-radio
-              v-for="item in [
-                { label: '显示', value: 1 },
-                { label: '隐藏', value: 2 },
-              ]"
-              :key="item.value"
-              :label="item.value"
-              name="hidden"
-              >{{ item.label }}</el-radio
-            >
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="Keepalive" prop="keepalive" v-if="!isAction">
-          <el-radio-group v-model="formData.keepalive">
-            <el-radio
-              v-for="item in [
-                { label: '启用', value: 1 },
-                { label: '禁用', value: 2 },
-              ]"
-              :key="item.value"
-              :label="item.value"
-              name="keepalive"
-              >{{ item.label }}
-            </el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </div>
-    </div>
-    <div>
-      <el-form-item label="激活菜单" prop="active_menu" v-if="isMenu">
-        <div class="w-full flex flex-row">
-          <el-input v-model="formData.active_menu" name="active_menu" clearable class="w-3/4" />
-          <el-tooltip effect="dark" :content="activeMenuIntro" raw-content placement="top">
-            <div class="text-red-500 cursor-pointer w-1/4 ml-2 justify-center flex">说明</div>
-          </el-tooltip>
-        </div>
-      </el-form-item>
-    </div>
-    <div class="flex justify-end">
-      <el-button type="primary" @click="submitForm(form)">{{ $t('system.confirm') }}</el-button>
-    </div>
-  </el-form>
-
-  <Dialog v-model="visible" title="选择 Icon" width="1000px" destroy-on-close>
-    <Icons v-model="formData.icon" @close="closeSelectIcon" />
-  </Dialog>
-</template>
-
-<script lang="ts" setup>
-import { useCreate } from '/admin/composables/curd/useCreate'
-import { useShow } from '/admin/composables/curd/useShow'
-import { useOpen } from '/admin/composables/curd/useOpen'
-import { onMounted, ref, watch } from 'vue'
-import http from '/admin/support/http'
-import { MenuType } from '/admin/enum/app'
-
-const props = defineProps({
-  primary: String | Number,
-  api: String,
-})
-
-const activeMenuIntro =
-  '<div>如果是访问内页的菜单路由，例如创建文章 create/post, 虽然它隶属于文章列表，但实际上并不会嵌套在文章列表路由里</div><div>而是单独的一个路由，并且是不显示在左侧菜单的。所以在访问它的时候，需要左侧菜单高亮，则需要设置该参数</div>'
-
-const { formData, form, loading, submitForm, close, beforeCreate, beforeUpdate } = useCreate(props.api, props.primary)
-
-// 选择 icon
-const { open, visible } = useOpen()
-// 关闭选择 icon
-const closeSelectIcon = () => {
-  visible.value = false
-}
-
-// 默认值
-const defaultSort = 1
-const defaultKeepalive = 1
-const defaultHidden = 1
-
-// 初始化
-formData.value.sort = defaultSort
-formData.value.keepalive = defaultKeepalive
-formData.value.type = MenuType.TOP_TYPE
-formData.value.hidden = defaultHidden
-
-// 默认目录
-const isTop = ref<boolean>(true)
-const isMenu = ref<boolean>(false)
-const isAction = ref<boolean>(false)
-
-// 回显示表单
-if (props.primary) {
-  const { afterShow } = useShow(props.api, props.primary, formData)
-
-  afterShow.value = formData => {
-    if (formData.value.permission_mark.indexOf('@') !== -1) {
-      formData.value.permission_mark = formData.value.permission_mark.split('@')[1]
-    }
-  }
-}
-
-const emit = defineEmits(['close'])
-const permissions = ref()
-onMounted(() => {
-  http.get(props.api).then(r => {
-    permissions.value = r.data.data
-  })
-
-  close(() => emit('close'))
-
-  // 监听 form data
-  watch(
-    formData,
-    () => {
-      const type: number = formData.value.type
-      if (type === MenuType.TOP_TYPE) {
-        isTop.value = true
-        isMenu.value = isAction.value = false
-      } else if (type === MenuType.PAGE_TYPE) {
-        isMenu.value = true
-        isTop.value = isAction.value = false
-      } else {
-        isAction.value = true
-        isTop.value = isMenu.value = false
-      }
-    },
-    { deep: true },
-  )
-})
-
-// 菜单是菜单类型的时，清除模块，那么权限标识&组件也需要清除
-const clearModule = () => {
-  if (formData.value.type === MenuType.TOP_TYPE || formData.value.type === MenuType.PAGE_TYPE) {
-    formData.value.component = null
-  }
-  if (formData.value.type === MenuType.PAGE_TYPE) {
-    formData.value.permission_mark = null
-  }
-}
-
-// 创建前的钩子
-beforeCreate.value = () => {
-  formData.value.parent_id = getParent(formData.value.parent_id)
-}
-
-// 更新前的钩子
-beforeUpdate.value = () => {
-  formData.value.parent_id = getParent(formData.value.parent_id)
-}
-
-const getParent = (parentId: any) => {
-  if (typeof parentId === 'number') {
-    return parentId
-  }
-
-  return typeof parentId === 'undefined' ? 0 : parentId[parentId.length - 1]
-}
-</script>

modules/Permissions/views/permissions/index.vue

@@ -1,83 +0,0 @@
-<template>
-  <div>
-    <Search :search="search" :reset="reset">
-      <template v-slot:body>
-        <el-form-item label="菜单名称" prop="permission_name">
-          <el-input v-model="query.permission_name" name="permission_name" clearable />
-        </el-form-item>
-      </template>
-    </Search>
-    <div class="table-default">
-      <Operate :show="open" />
-      <el-table :data="tableData" class="mt-3" v-loading="loading" row-key="id" default-expand-all :tree-props="{ children: 'children' }">
-        <el-table-column prop="permission_name" label="菜单名称" />
-        <el-table-column prop="route" label="菜单路由" />
-        <el-table-column prop="permission_mark" label="权限标识" width="330">
-          <template #default="scope">
-            <div v-if="scope.row.actions.length" class="flex grid gap-1 grid-cols-4">
-              <el-tag v-for="action in scope.row.actions" class="cursor-pointer min-w-fit" @click="open(action.id)" closable @close="destroy(api, action.id)">{{ action.permission_name }}</el-tag>
-            </div>
-            <div v-else>
-              <el-popconfirm confirm-button-text="确认" title="添加基础actions" @confirm="actionGenerate(scope.row.id)" placement="top">
-                <template #reference>
-                  <el-tag class="cursor-pointer w-8" v-if="scope.row.type === MenuType.PAGE_TYPE">
-                    <Icon name="cog-6-tooth" class="animate-spin w-5 h-5" v-if="actionLoading" />
-                    <Icon name="plus" className="w-4 h-4" v-else />
-                  </el-tag>
-                </template>
-              </el-popconfirm>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="hidden" label="状态" width="100">
-          <template #default="scope">
-            <Status v-model="scope.row.hidden" :id="scope.row.id" :api="api" @refresh="search" />
-          </template>
-        </el-table-column>
-        <el-table-column prop="created_at" 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>
-    </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, ref } from 'vue'
-import Create from './form/create.vue'
-import { useGetList } from '/admin/composables/curd/useGetList'
-import { useDestroy } from '/admin/composables/curd/useDestroy'
-import { useOpen } from '/admin/composables/curd/useOpen'
-import { MenuType } from '/admin/enum/app'
-import http from '../../../../resources/admin/support/http'
-
-const api = 'permissions/permissions'
-
-const { data, query, search, reset, loading } = useGetList(api, false)
-const { destroy, deleted } = useDestroy()
-const { open, close, title, visible, id } = useOpen()
-
-const tableData = computed(() => data.value?.data)
-
-onMounted(() => {
-  search()
-  deleted(reset)
-})
-
-const actionLoading = ref<boolean>(false)
-const actionGenerate = async (id: number) => {
-  actionLoading.value = true
-  http.post(api, { parent_id: id, actions: true }).then(r => {
-    search()
-    actionLoading.value = false
-  })
-}
-</script>

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

@@ -1,209 +0,0 @@
-<template>
-  <el-form :model="formData" label-width="120px" ref="form" v-loading="loading" class="pr-6">
-    <el-form-item label="上级角色" prop="parent_id" v-if="!primary">
-      <el-cascader
-        :options="roles"
-        name="parent_id"
-        v-model="formData.parent_id"
-        clearable
-        check-strictly
-        class="w-full"
-        @change="getPermissions"
-        :props="{ value: 'id', label: 'role_name', checkStrictly: true }"
-      />
-    </el-form-item>
-    <el-form-item
-      label="角色名称"
-      prop="role_name"
-      :rules="[
-        {
-          required: true,
-          message: '角色名称必须填写',
-        },
-      ]"
-    >
-      <el-input v-model="formData.role_name" name="role_name" clearable />
-    </el-form-item>
-    <el-form-item
-      label="角色标识"
-      prop="identify"
-      :rules="[
-        {
-          required: true,
-          message: '角色标识必须填写',
-        },
-      ]"
-    >
-      <el-input v-model="formData.identify" name="identify" clearable />
-    </el-form-item>
-
-    <el-form-item label="角色描述" prop="description">
-      <el-input v-model="formData.description" name="description" clearable type="textarea" />
-    </el-form-item>
-    <el-form-item label="数据权限" prop="data_range">
-      <Select v-model="formData.data_range" name="data_range" clearable api="dataRange" class="w-full" />
-    </el-form-item>
-    <el-form-item
-      label="自定义权限"
-      prop="departments"
-      v-if="showDepartments"
-      :rules="[
-        {
-          required: true,
-          message: '自定义权限必须选择',
-        },
-      ]"
-    >
-      <el-tree-select
-        v-model="formData.departments"
-        value-key="id"
-        class="w-full"
-        :data="departments"
-        :render-after-expand="false"
-        show-checkbox
-        multiple
-        :props="{ value: 'id', label: 'department_name' }"
-      />
-    </el-form-item>
-    <el-form-item label="角色权限" prop="permissions">
-      <div class="h-40 overflow-auto w-full border border-gray-300 rounded pt-2 pl-2">
-        <el-tree
-          ref="permissionTree"
-          v-model="formData.permissions"
-          :data="permissions"
-          node-key="id"
-          class="w-full"
-          :props="{ label: 'permission_name', value: 'id' }"
-          show-checkbox
-          :default-expand-all="false"
-          @check="selectPermissions"
-          :empty-text="permissionLoadingText"
-        />
-      </div>
-    </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 { nextTick, onMounted, ref, unref, watch } from 'vue'
-import http from '/admin/support/http'
-
-const props = defineProps({
-  primary: String | Number,
-  api: String,
-  hasPermissions: Array<Object>,
-})
-
-const emit = defineEmits(['close'])
-
-const { formData, form, loading, submitForm, close, beforeCreate, beforeUpdate } = useCreate(props.api, props.primary)
-
-if (props.primary) {
-  const { afterShow } = useShow(props.api, props.primary, formData)
-
-  afterShow.value = formData => {
-    const data = unref(formData)
-    data.parent_id = data.parent_id ? [data.parent_id] : 0
-
-    if (!data.data_range) {
-      data.data_range = null
-    }
-
-    formData.value = data
-  }
-}
-
-const roles = ref()
-const permissions = ref()
-// 权限树对象
-const permissionTree = ref()
-//  部门
-const departments = ref()
-const showDepartments = ref<boolean>(false)
-
-const permissionLoadingText = ref<string>('加载中...')
-const getPermissions = async (value: number = 0) => {
-  if (value) {
-    http.get('permissions/roles/' + getParent(value)).then(r => {
-      permissions.value = r.data.data.permissions
-      setCheckedPermissions()
-    })
-  } else {
-    http.get('permissions/permissions', { from: 'role' }).then(r => {
-      permissions.value = r.data.data
-      setCheckedPermissions()
-    })
-  }
-}
-
-const setCheckedPermissions = () => {
-  nextTick(() => {
-    props.hasPermissions.forEach(p => {
-      permissionTree.value.setChecked(p.id, true, false)
-    })
-  })
-
-  if (!permissions.value.length) {
-    permissionLoadingText.value = '暂无数据'
-  }
-}
-const getRoles = () => {
-  http.get(props.api, { id: props.primary ? props.primary : '' }).then(r => {
-    roles.value = r.data.data
-  })
-}
-
-const getDepartments = () => {
-  http.get('permissions/departments').then(r => {
-    departments.value = r.data.data
-  })
-}
-onMounted(() => {
-  getRoles()
-  getPermissions()
-  getDepartments()
-  close(() => emit('close'))
-  watch(
-    formData,
-    function (value) {
-      // 如果数据权限是自定义数据
-      showDepartments.value = value.data_range === 2
-    },
-    { deep: true },
-  )
-})
-
-const selectPermissions = (checkedNodes, checkedKeys) => {
-  formData.value.permissions = checkedKeys.checkedKeys.concat(checkedKeys.halfCheckedKeys).sort()
-}
-
-// 创建前的钩子
-beforeCreate.value = () => {
-  formData.value.parent_id = getParent(formData.value.parent_id)
-}
-
-// 更新前的钩子
-beforeUpdate.value = () => {
-  const permissionIds = []
-  formData.value.permissions.forEach(item => {
-    permissionIds.push(item)
-  })
-
-  formData.value.permissions = permissionIds
-  formData.value.parent_id = getParent(formData.value.parent_id)
-}
-
-const getParent = (parentId: any) => {
-  return typeof parentId === 'undefined' ? 0 : parentId[parentId.length - 1]
-}
-</script>
-<style scoped>
-:deep(.el-tree .el-tree__empty-block .el-tree__empty-text) {
-  @apply left-10 top-4;
-}
-</style>

modules/Permissions/views/roles/index.vue

@@ -1,58 +0,0 @@
-<template>
-  <div>
-    <Search :search="search" :reset="reset">
-      <template v-slot:body>
-        <el-form-item label="角色名称" prop="role_name">
-          <el-input v-model="query.role_name" name="role_name" clearable />
-        </el-form-item>
-      </template>
-    </Search>
-    <div class="table-default">
-      <div class="pt-5 pl-2">
-        <Add @click="openRoleForm(null, [])" />
-      </div>
-      <el-table :data="tableData" class="mt-3" v-loading="loading" row-key="id" default-expand-all :tree-props="{ children: 'children' }">
-        <el-table-column prop="role_name" label="角色名称" />
-        <el-table-column prop="identify" label="角色标识" />
-        <el-table-column prop="description" label="角色描述" />
-        <el-table-column prop="created_at" label="创建时间" />
-        <el-table-column label="操作" width="200">
-          <template #default="scope">
-            <Update @click="openRoleForm(scope.row.id, scope.row.permissions)" />
-            <Destroy @click="destroy(api, scope.row.id)" />
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <Dialog v-model="visible" :title="title" destroy-on-close>
-      <Create @close="close(reset)" :primary="id" :api="api" :has-permissions="rolePermissions" />
-    </Dialog>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { computed, onMounted, ref } from 'vue'
-import Create from './form/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 = 'permissions/roles'
-
-const { data, query, search, reset, loading } = useGetList(api, false)
-const { destroy, deleted } = useDestroy()
-const { open, close, title, visible, id } = useOpen()
-
-const tableData = computed(() => data.value?.data)
-
-const rolePermissions = ref<Array<number>>([])
-const openRoleForm = (id, permissions) => {
-  rolePermissions.value = permissions
-  open(id)
-}
-onMounted(() => {
-  search()
-
-  deleted(reset)
-})
-</script>

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/Installer.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Modules\System;
+
+use Catch\Support\Module\Installer as ModuleInstaller;
+use Modules\System\Providers\SystemServiceProvider;
+
+class Installer extends ModuleInstaller
+{
+    protected function info(): array
+    {
+        // TODO: Implement info() method.
+        return [
+            'title' => '系统管理',
+            'name' => 'system',
+            'path' => 'system',
+            'keywords' => '系统管理, system',
+            'description' => '系统管理模块',
+            'provider' => SystemServiceProvider::class
+        ];
+    }
+
+    protected function requirePackages(): void
+    {
+        // TODO: Implement requirePackages() method.
+    }
+
+    protected function removePackages(): void
+    {
+        // TODO: Implement removePackages() method.
+    }
+}

modules/System/LICENSE.txt

@@ -0,0 +1,199 @@
+ Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

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/README.md

@@ -0,0 +1 @@
+# 系统模块

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/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/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/User/Http/Controllers/AuthController.php

@@ -22,12 +22,18 @@ class AuthController extends Controller
         /* @var User $user */
         $user = User::query()->where('email', $request->get('email'))->first();
 
-        Event::dispatch(new Login($request, $user));
+        Event::dispatch(new Login($request, $user ? ($user->isDisabled() ? null : $user) : null));
 
-        if ($user && Hash::check($request->get('password'), $user->password)) {
+        if ($user) {
+            if ($user->isDisabled()) {
+                throw new FailedException('账号被禁用，请联系管理员');
+            }
+
+            if (Hash::check($request->get('password'), $user->password)) {
                 $token = $user->createToken('token')->plainTextToken;
                 return compact('token');
             }
+        }
 
         throw new FailedException('登录失败！请检查邮箱或者密码');
     }

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());
     }
@@ -158,4 +159,16 @@ class UserController extends Controller
             return $builder;
         })->getList();
     }
+
+    /**
+     * @return void
+     */
+    public function export()
+    {
+        return User::query()
+                    ->select('id', 'username', 'email', 'created_at')
+                    ->without('roles')
+                    ->get()
+                    ->download(['id', '昵称', '邮箱', '创建时间']);
+    }
 }

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/LogOperate.php

@@ -6,17 +6,17 @@ use Catch\CatchAdmin;
 use Catch\Traits\DB\BaseOperate;
 use Catch\Traits\DB\ScopeTrait;
 use Catch\Traits\DB\Trans;
+use Catch\Traits\DB\WithAttributes;
 use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Route;
 use Symfony\Component\HttpFoundation\Response;
 
 class LogOperate extends Model
 {
-    use BaseOperate, Trans, ScopeTrait;
+    use BaseOperate, Trans, ScopeTrait, WithAttributes;
 
     protected $table = 'log_operate';
 

modules/User/Models/Traits/UserRelations.php

@@ -58,23 +58,19 @@ trait UserRelations
 
         /* @var Permissions $permissionsModel */
         $permissionsModel = app($this->getPermissionsModel());
-
         if ($this->isSuperAdmin()) {
-            $permissions = $permissionsModel->get();
+            $permissions = $permissionsModel->orderByDesc('sort')->get();
         } else {
-            $permissions = Collection::make();
+            $permissionIds = Collection::make();
-
+            $this->roles()->with('permissions')->get()
-            app($this->getRolesModel())->with(['permissions'])->get()
+                ->each(function ($role) use (&$permissionIds) {
-
+                    $permissionIds = $permissionIds->concat($role->permissions?->pluck('id'));
-                ->each(function ($role) use (&$permissions) {
-                    $permissions = $permissions->concat($role->permissions);
                 });
 
-            $permissions = $permissions->unique();
+            $permissions = $permissionsModel->whereIn('id', $permissionIds->unique())->orderByDesc('sort')->get();
         }
 
         $this->setAttribute('permissions', $permissions->each(fn ($permission) => $permission->setAttribute('hidden', $permission->isHidden())));
-
         return $this;
     }
 
@@ -103,14 +99,15 @@ trait UserRelations
             if ($permission->isAction()) {
                 [$controller, $action] = explode('@', $permission->permission_mark);
 
-                $actions->add(CatchAdmin::getModuleControllerNamespace($permission->module).$controller.'Controller@'.$action);
+                $actions->add(CatchAdmin::getModuleControllerNamespace($permission->module). ucfirst($controller).'Controller@'.$action);
             }
         });
 
+        // 自定义权限判断
         if ($permission) {
             [$module, $controller, $action] = explode('@', $permission);
 
-            $permission = CatchAdmin::getModuleControllerNamespace($module).$controller.'Controller@'.$action;
+            $permission = CatchAdmin::getModuleControllerNamespace($module). ucfirst($controller) .'Controller@'.$action;
         }
 
         return $actions->contains($permission ?: Route::currentRouteAction());

modules/User/Models/User.php

@@ -3,6 +3,7 @@
 namespace Modules\User\Models;
 
 use Catch\Base\CatchModel as Model;
+use Catch\Enums\Status;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Laravel\Sanctum\HasApiTokens;
@@ -31,13 +32,15 @@ class User extends Model implements AuthenticatableContract
         'id', 'username', 'email', 'avatar', 'password', 'remember_token', 'creator_id', 'status', 'department_id', 'login_ip', 'login_at', 'created_at', 'updated_at', 'deleted_at'
     ];
 
+    protected array $defaultHidden = ['password', 'remember_token'];
+
     /**
      * @var array|string[]
      */
     public array $searchable = [
         'username' => 'like',
         'email' => 'like',
-        'status' => '='
+        'status' => '=',
     ];
 
     /**
@@ -73,7 +76,8 @@ class User extends Model implements AuthenticatableContract
     protected function DepartmentId(): Attribute
     {
         return new Attribute(
-            get: fn($value) => $value ? : null
+            get: fn($value) => $value ? : null,
+            set: fn($value) => $value ? : 0
         );
     }
 
@@ -95,10 +99,16 @@ class User extends Model implements AuthenticatableContract
      */
     public function updateBy($id, array $data): mixed
     {
-        if (isset($data['password']) && ! $data['password']) {
+        if (empty($data['password'])) {
             unset($data['password']);
         }
 
         return parent::updateBy($id, $data);
     }
+
+    public function isDisabled(): bool
+    {
+
+        return $this->status == Status::Disable->value;
+    }
 }

modules/User/routes/route.php

@@ -14,4 +14,8 @@ Route::put('users/enable/{id}', [UserController::class, 'enable']);
 Route::match(['post', 'get'], 'user/online', [UserController::class, 'online']);
 Route::get('user/login/log', [UserController::class, 'loginLog']);
 Route::get('user/operate/log', [UserController::class, 'operateLog']);
+Route::get('user/operate/log', [UserController::class, 'operateLog']);
+Route::get('user/export', [UserController::class, 'export']);
+
+
 

modules/User/views/router.ts

@@ -1,26 +0,0 @@
-import { RouteRecordRaw } from 'vue-router'
-
-// @ts-ignore
-const router: RouteRecordRaw[] = [
-  {
-    path: '/users',
-    component: () => import('/admin/layout/index.vue'),
-    meta: { title: '用户管理', icon: 'user' },
-    children: [
-      {
-        path: 'index',
-        name: 'user-account',
-        meta: { title: '账号管理', icon: 'home' },
-        component: () => import('./user/index.vue'),
-      },
-      {
-        path: 'center',
-        name: 'user-center',
-        meta: { title: '个人中心', icon: 'home' },
-        component: () => import('./user/center.vue'),
-      },
-    ],
-  },
-]
-
-export default router

modules/User/views/user/center.vue

@@ -1,44 +0,0 @@
-<template>
-  <div class="flex flex-col sm:flex-row dark:bg-regal-dark w-full">
-    <el-card shadow="never" class="w-full sm:w-[35rem] h-[32rem]">
-      <template #header>
-        <div class="card-header">
-          <span>个人资料</span>
-        </div>
-      </template>
-      <div class="flex flex-col w-full">
-        <div class="w-full">
-          <Profile />
-        </div>
-      </div>
-    </el-card>
-
-    <el-tabs v-model="activeName" class="pl-3 pr-3 bg-white dark:bg-regal-dark mt-2 sm:mt-0 w-full ml-0 sm:ml-2">
-      <el-tab-pane label="登录日志" name="login_log">
-        <LoginLog />
-      </el-tab-pane>
-      <el-tab-pane label="操作日志" name="operation_log">
-        <OperateLog />
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { ref } from 'vue'
-import Profile from './components/profile.vue'
-import LoginLog from './components/loginLog.vue'
-import OperateLog from './components/operateLog.vue'
-
-const activeName = ref('login_log')
-</script>
-
-<style scoped>
-.el-tabs {
-  --el-tabs-header-height: 62px !important;
-}
-
-.el-tabs .el-tabs__item {
-  font-size: 18px !important;
-}
-</style>

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

@@ -1,43 +0,0 @@
-<template>
-  <div class="w-full sm:w-[28rem] min-h-[30rem] bg-white">
-    <el-tree :data="departments" :props="{ label: 'department_name', value: 'id'}" @node-click="clickDepartment" class="p-5" :expand-on-click-node="false" :highlight-current="true"/>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { onMounted, ref } from 'vue'
-import http from '/admin/support/http'
-
-const props = defineProps({
-   modelValue: {
-     type: Number,
-     default: 0
-   }
-})
-
-const departments = ref()
-
-onMounted(() => {
-  http.get('permissions/departments').then(r => {
-    departments.value = r.data.data
-  })
-})
-
-const emits = defineEmits(['update:modelValue', 'searchDepartmentUsers'])
-
-const clickDepartment = (node) => {
-  emits('update:modelValue', node.id)
-
-  emits('searchDepartmentUsers')
-}
-</script>
-
-<style scoped lang="scss">
-:deep(.el-tree .el-tree-node) {
-  @apply p-0.5
-}
-
-:deep(.el-tree .el-tree-node .el-tree-node__content) {
-  @apply h-8 rounded
-}
-</style>

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

@@ -1,34 +0,0 @@
-<template>
-  <div class="table-default">
-    <el-table :data="tableData" class="mt-3" v-loading="loading">
-      <el-table-column prop="account" label="账户" />
-      <el-table-column prop="browser" label="浏览器" />
-      <el-table-column prop="platform" label="平台" />
-      <el-table-column prop="login_ip" label="IP" />
-      <el-table-column prop="status" label="状态">
-        <template #default="scope">
-          <el-tag type="success" v-if="scope.row.status === 1">成功</el-tag>
-          <el-tag type="danger" v-else>失败</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column prop="login_at" label="登录时间" />
-    </el-table>
-
-    <Paginate />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { computed, onMounted } from 'vue'
-import { useGetList } from '/admin/composables/curd/useGetList'
-
-const api = 'user/login/log'
-
-const { data, query, search, reset, loading } = useGetList(api)
-
-onMounted(() => search())
-
-const tableData = computed(() => data.value?.data)
-</script>
-
-<style scoped></style>

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

@@ -1,48 +0,0 @@
-<template>
-  <div class="table-default">
-    <div class="w-full flex justify-end">
-      <el-radio-group v-model="query.scope" size="small" @change="search">
-        <el-radio-button label="self">只看自己</el-radio-button>
-        <el-radio-button label="all">全部</el-radio-button>
-      </el-radio-group>
-    </div>
-    <el-table :data="tableData" class="mt-3" v-loading="loading">
-      <el-table-column prop="creator" label="创建人" />
-      <el-table-column prop="module" label="模块" />
-      <el-table-column prop="action" label="操作" width="150" />
-      <el-table-column prop="http_method" label="请求方法" width="90" />
-      <el-table-column prop="http_code" label="请求状态" width="90">
-        <template #default="scope">
-          <el-tag type="success" v-if="scope.row.http_code >= 200 && scope.row.http_code < 300"> {{ scope.row.http_code }}</el-tag>
-          <el-tag type="danger" v-else>{{ scope.row.http_code }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column prop="time_taken" label="耗时" />
-      <el-table-column prop="params" label="参数">
-        <template #default="scope">
-          <el-tooltip class="box-item" effect="dark" :content="scope.row.params" placement="top-start">
-            <el-button size="small" type="primary">查看</el-button>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-    </el-table>
-    <Paginate />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { computed, onMounted } from 'vue'
-import { useGetList } from '/admin/composables/curd/useGetList'
-
-const api = 'user/operate/log'
-
-const { data, query, search, reset, loading } = useGetList(api)
-
-query.value.scope = 'self'
-
-onMounted(() => search())
-
-const tableData = computed(() => data.value?.data)
-</script>
-
-<style scoped></style>

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

@@ -1,112 +0,0 @@
-<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>
-    <el-form-item
-      label="昵称"
-      prop="username"
-      class="mt-2"
-      :rules="[
-        {
-          required: true,
-          message: '昵称必须填写',
-        },
-      ]"
-    >
-      <el-input v-model="profile.username" placeholder="请填写昵称" />
-    </el-form-item>
-    <el-form-item
-      label="邮箱"
-      prop="email"
-      :rules="[
-        {
-          required: true,
-          message: '邮箱必须填写',
-        },
-        {
-          type: 'email',
-          message: '邮箱格式不正确',
-        },
-      ]"
-    >
-      <el-input v-model="profile.email" placeholder="请填写邮箱" />
-    </el-form-item>
-    <el-form-item
-      label="密码"
-      prop="password"
-      :rules="[
-        {
-          pattern: /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{6,20}$/,
-          message: '必须包含大小写字母和数字的组合，可以使用特殊字符，长度在6-20之间',
-        },
-      ]"
-    >
-      <el-input v-model="profile.password" type="password" show-password placeholder="请输入密码" />
-    </el-form-item>
-    <div class="flex justify-center">
-      <el-button type="primary" @click="submitForm(form)">{{ $t('system.update') }}</el-button>
-    </div>
-  </el-form>
-</template>
-
-<script lang="ts" setup>
-import { onMounted, ref } from 'vue'
-import { useCreate } from '/admin/composables/curd/useCreate'
-import http from '/admin/support/http'
-import { Code } from '/admin/enum/app'
-import Message from '/admin/support/message'
-import { useUserStore } from '/admin/stores/modules/user'
-
-interface profile {
-  avatar: string
-  username: string
-  email: string
-  password: string
-}
-
-const profile = ref<profile>(
-  Object.assign({
-    avatar: '',
-    username: '',
-    email: '',
-    password: '',
-  }),
-)
-const { form, loading, submitForm, afterCreate } = useCreate('user/online', null, profile)
-
-const getUserInfo = () => {
-  loading.value = true
-  http.get('user/online').then(r => {
-    profile.value.username = r.data.data.username
-    profile.value.avatar = r.data.data.avatar
-    profile.value.email = r.data.data.email
-    loading.value = false
-  })
-}
-
-onMounted(() => {
-  getUserInfo()
-})
-
-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()
-}
-</script>
-
-<style scoped lang="scss">
-:deep(.el-upload) {
-  @apply h-full w-full;
-}
-</style>

modules/User/views/user/create.vue

@@ -1,129 +0,0 @@
-<template>
-  <el-form :model="formData" label-width="80px" ref="form" v-loading="loading" class="pr-4">
-    <div class="flex flex-row justify-between">
-      <div :class="hasRoles ? 'w-1/2' : 'w-full'">
-        <el-form-item
-          label="昵称"
-          prop="username"
-          :rules="[
-            {
-              required: true,
-              message: '昵称必须填写',
-            },
-          ]"
-        >
-          <el-input v-model="formData.username" placeholder="请填写昵称" />
-        </el-form-item>
-        <el-form-item
-          label="邮箱"
-          prop="email"
-          :rules="[
-            {
-              required: true,
-              message: '邮箱必须填写',
-            },
-            {
-              type: 'email',
-              message: '邮箱格式不正确',
-            },
-          ]"
-        >
-          <el-input v-model="formData.email" placeholder="请填写邮箱" />
-        </el-form-item>
-        <el-form-item label="密码" prop="password" :rules="passwordRules">
-          <el-input v-model="formData.password" type="password" show-password placeholder="请输入密码" />
-        </el-form-item>
-
-        <el-form-item label="角色" prop="roles" v-if="hasRoles" :rules="[{ required: true, message: '请选择角色' }]">
-          <el-tree-select
-            v-model="formData.roles"
-            :default-expanded-keys="formData.roles"
-            :data="roles"
-            value-key="id"
-            check-strictly
-            class="w-full"
-            :props="{ label: 'role_name', value: 'id' }"
-            clearable
-            multiple
-            show-checkbox
-          />
-        </el-form-item>
-      </div>
-
-      <div class="w-1/2" v-if="hasRoles">
-        <el-form-item label="部门" prop="department_id">
-          <el-tree-select v-model="formData.department_id" :data="departments" check-strictly :props="{ label: 'department_name', value: 'id' }" />
-        </el-form-item>
-        <el-form-item label="岗位" prop="department_id">
-          <el-select v-model="formData.jobs" multiple>
-            <el-option v-for="item in jobs" :key="item.id" :label="item.job_name" :value="item.id" />
-          </el-select>
-        </el-form-item>
-      </div>
-    </div>
-    <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, ref } from 'vue'
-import http from '/admin/support/http'
-
-const props = defineProps({
-  primary: String | Number,
-  api: String,
-  hasRoles: {
-    type: Boolean,
-    default: true,
-  },
-})
-
-const passwordRules = [
-  {
-    required: true,
-    message: '密码必须填写',
-  },
-  {
-    pattern: /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{6,20}$/,
-    message: '必须包含大小写字母和数字的组合，可以使用特殊字符，长度在6-20之间',
-  },
-]
-
-if (props.primary) {
-  passwordRules.shift()
-}
-
-const { formData, form, loading, submitForm, close } = useCreate(props.api, props.primary)
-
-if (props.primary) {
-  useShow(props.api, props.primary, formData)
-}
-
-const emit = defineEmits(['close'])
-close(() => emit('close'))
-
-const departments = ref()
-const jobs = ref()
-const roles = ref()
-
-onMounted(() => {
-  if (props.hasRoles) {
-    http.get('permissions/departments').then(r => {
-      departments.value = r.data.data
-    })
-
-    http.get('permissions/jobs').then(r => {
-      jobs.value = r.data.data
-    })
-
-    http.get('permissions/roles').then(r => {
-      roles.value = r.data.data
-    })
-  }
-})
-</script>

modules/User/views/user/index.vue

@@ -1,82 +0,0 @@
-<template>
-  <div class="flex flex-col sm:flex-row w-full justify-between">
-    <Department v-model="query.department_id" @searchDepartmentUsers="search" v-if="hasRoles" class="dark:bg-regal-dark" />
-    <div :class="hasRoles ? 'w-full ml-0 sm:ml-2 mt-2 sm:mt-0' : 'w-full'">
-      <Search :search="search" :reset="reset">
-        <template v-slot:body>
-          <el-form-item label="用户名">
-            <el-input v-model="query.username" clearable />
-          </el-form-item>
-          <el-form-item label="邮箱">
-            <el-input v-model="query.email" clearable />
-          </el-form-item>
-          <el-form-item label="状态">
-            <Select v-model="query.status" clearable api="status" />
-          </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="username" label="用户名" width="150" />
-          <el-table-column prop="avatar" label="头像">
-            <template #default="scope">
-              <el-avatar :src="scope.row.avatar" />
-            </template>
-          </el-table-column>
-          <el-table-column prop="email" 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="created_at" 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" :has-roles="hasRoles" />
-      </Dialog>
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { computed, onMounted, ref } 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 Department from './components/department.vue'
-import { useUserStore } from '/admin/stores/modules/user'
-import { isUndefined } from '/admin/support/helper'
-
-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()
-
-const tableData = computed(() => data.value?.data)
-
-const roles = ref<Array<Object>>()
-const hasRoles = ref<boolean>(false)
-
-onMounted(() => {
-  search()
-
-  deleted(reset)
-
-  hasRoles.value = !isUndefined(userStore.getRoles)
-})
-</script>

package.json

@@ -1,53 +0,0 @@
-{
-  "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.14",
-    "@tinymce/tinymce-vue": "^5.0.1",
-    "@vueuse/core": "^9.12.0",
-    "autoprefixer": "^10.4.13",
-    "element-plus": "^2.2.33",
-    "nprogress": "^0.2.0",
-    "pinia": "^2.0.32",
-    "postcss": "^8.4.21",
-    "tailwindcss": "^3.2.2",
-    "terser": "^5.16.5",
-    "vue": "^3.2.47",
-    "vue-i18n": "9",
-    "vue-router": "4.1.6",
-    "vuedraggable": "^4.1.0"
-  },
-  "devDependencies": {
-    "@iconify-json/logos": "^1.1.22",
-    "@rollup/plugin-alias": "^4.0.3",
-    "@types/mockjs": "^1.0.7",
-    "@types/node": "^18.14.6",
-    "@types/nprogress": "^0.2.0",
-    "@typescript-eslint/eslint-plugin": "^5.54.0",
-    "@typescript-eslint/parser": "^5.54.0",
-    "@vitejs/plugin-vue": "^4.0.0",
-    "@vitejs/plugin-vue-jsx": "^3.0.0",
-    "axios": "^1.3.4",
-    "eslint": "^8.35.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.9.0",
-    "prettier": "2.8.4",
-    "sass": "^1.58.0",
-    "typescript": "^4.9.5",
-    "unplugin-auto-import": "^0.14.4",
-    "unplugin-icons": "^0.15.2",
-    "unplugin-vue-components": "^0.24.0",
-    "vite": "^4.1.4",
-    "vite-plugin-html": "^3.2.0",
-    "vue-tsc": "^1.2.0"
-  }
-}

postcss.config.js

@@ -1,6 +0,0 @@
-module.exports = {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {}
-  }
-}

resources/admin/App.vue

@@ -1,3 +0,0 @@
-<template>
-  <router-view />
-</template>

resources/admin/app.ts

@@ -1,7 +0,0 @@
-import '/admin/styles/index.scss'
-
-import CatchAdmin from './support/catchAdmin'
-
-const admin = new CatchAdmin()
-
-admin.bootstrap()

resources/admin/components/404/index.vue

@@ -1,28 +0,0 @@
-<template>
-  <div :style="bgColor" class="flex flex-col w-full">
-    <img :src="notFound" class="w-full sm:w-3/5 m-auto" />
-    <div class="mr-auto w-full bottom-0 m-auto">
-      <div class="w-full text-center text-base text-gray-400">抱歉，您访问的页面不存在</div>
-      <div @click="push('/')" class="text-center w-full mt-2">
-        <el-button type="primary">回到首页</el-button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { useRouter } from 'vue-router'
-import { useAppStore } from '/admin/stores/modules/app'
-import { computed } from 'vue'
-import notFound from '/admin/assets/404.png'
-
-const { push } = useRouter()
-
-const dark: string = '#161d31;'
-const light: string = 'rgb(241,245,249);'
-
-const appStore = useAppStore()
-const bgColor = computed(() => {
-  return 'background-color:' + (appStore.getIsDarkMode ? dark : light)
-})
-</script>

resources/admin/components/admin/buttons/add.vue

@@ -1,16 +0,0 @@
-<template>
-  <el-button type="primary" :size="size"><Icon name="plus" className="w-4 h-4 mr-1" /> {{ text }}</el-button>
-</template>
-
-<script lang="ts" setup>
-defineProps({
-  size: {
-    type: String,
-    default: 'default',
-  },
-  text: {
-    type: String,
-    default: '新增',
-  },
-})
-</script>

resources/admin/components/admin/buttons/destroy.vue

@@ -1,16 +0,0 @@
-<template>
-  <el-button type="danger" :size="size"><Icon name="trash" className="w-4 h-4 mr-1" /> {{ text }}</el-button>
-</template>
-
-<script lang="ts" setup>
-defineProps({
-  size: {
-    type: String,
-    default: 'small',
-  },
-  text: {
-    type: String,
-    default: '删除',
-  },
-})
-</script>

resources/admin/components/admin/buttons/show.vue

@@ -1,16 +0,0 @@
-<template>
-  <el-button type="primary" :size="size"><Icon name="eye" className="w-4 h-4 mr-1" /> {{ text }}</el-button>
-</template>
-
-<script lang="ts" setup>
-defineProps({
-  size: {
-    type: String,
-    default: 'small',
-  },
-  text: {
-    type: String,
-    default: '详情',
-  },
-})
-</script>

resources/admin/components/admin/buttons/update.vue

@@ -1,18 +0,0 @@
-<template>
-  <el-button type="success" :size="size"><Icon name="pencil-square" className="w-4 h-4 mr-1" /> {{ text }}</el-button>
-</template>
-
-<script lang="ts" setup>
-defineProps({
-  size: {
-    type: String,
-    default: 'small',
-  },
-  text: {
-    type: String,
-    default: '更新',
-  },
-})
-</script>
-
-<style scoped></style>

resources/admin/components/admin/dialog/index.vue

@@ -1,100 +0,0 @@
-<template>
-  <div>
-    <el-dialog :model-value="modelValue" :show-close="false" :fullscreen="isFullscreen" v-bind="$attrs" :width="width" :close="close" :before-close="beforeClose" draggable>
-      <template #header="{ titleId, titleClass }">
-        <div class="flex justify-between w-full">
-          <div>
-            <h4 :id="titleId" :class="titleClass">{{ title }}</h4>
-          </div>
-          <div class="flex w-12 justify-end">
-            <!--<Icon :name="fullscreenIcon" @click="fullscreen" className="hover:cursor-pointer w-4 h-4" />-->
-            <Icon name="x-mark" className="hover:cursor-pointer w-5 h-5" @click="close" />
-          </div>
-        </div>
-      </template>
-      <slot />
-      <template #footer v-if="showFooter">
-        <span class="dialog-footer">
-          <el-button @click="close">{{ $t('system.cancel') }}</el-button>
-          <el-button type="primary" @click="close">{{ $t('system.confirm') }}</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { ref, computed, onMounted } from 'vue'
-
-const props = defineProps({
-  modelValue: {
-    type: Boolean,
-    default: false,
-    require: true,
-  },
-  showFooter: {
-    type: Boolean,
-    default: false,
-  },
-
-  width: {
-    type: String,
-    required: false,
-    default: '',
-  },
-  title: {
-    type: String,
-    default: '',
-  },
-})
-
-const emits = defineEmits(['update:modelValue'])
-
-const isFullscreen = ref(false)
-
-const fullscreenIcon = computed(() => {
-  return isFullscreen.value ? 'arrows-pointing-in' : 'arrows-pointing-out'
-})
-const fullscreen = () => {
-  isFullscreen.value = !isFullscreen.value
-}
-
-const close = () => {
-  emits('update:modelValue', false)
-}
-
-// 遮罩关闭调用
-const beforeClose = () => {
-  emits('update:modelValue', false)
-}
-const width = ref<string>('')
-
-onMounted(() => {
-  width.value = props.width ? props.width : getWidth()
-})
-
-// 窗口尺寸
-const getWidth = () => {
-  const clientWidth = window.document.body.clientWidth
-
-  if (clientWidth <= 726) {
-    return '100%'
-  }
-
-  if (clientWidth > 726 && clientWidth < 1440) {
-    return '60%'
-  }
-
-  return '650px'
-}
-</script>
-
-<style scoped lang="scss">
-:deep(.el-dialog) {
-  border-radius: 0.5rem;
-  .el-dialog__header {
-    margin-right: 0 !important;
-    border-bottom: 1px solid #e2e8f0;
-  }
-}
-</style>

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

@@ -1,332 +0,0 @@
-<template>
-  <div :class="`grid ${grid} gap-y-6`">
-    <div v-for="icon in icons" :key="icon" class="flex justify-center hover:cursor-pointer" @click="selectIcon(icon)">
-      <div v-if="modelValue === icon">
-        <div class="flex justify-center w-full text-violet-700"><Icon :name="icon" /></div>
-        <div class="text-sm text-violet-700">{{ icon }}</div>
-      </div>
-
-      <div v-else>
-        <div class="flex justify-center w-full"><Icon :name="icon" /></div>
-        <div class="text-sm">{{ icon }}</div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-const props = defineProps({
-  modelValue: {
-    type: String,
-    require: true,
-  },
-  grid: {
-    type: String,
-    default: 'grid-cols-5',
-  },
-})
-
-const emits = defineEmits(['update:modelValue', 'close'])
-
-const selectIcon = (icon: string) => {
-  emits('update:modelValue', icon)
-  emits('close')
-}
-// icons
-const icons = [
-  'academic-cap',
-  'adjustments-horizontal',
-  'adjustments-vertical',
-  'archive-box-arrow-down',
-  'archive-box-x-mark',
-  'archive-box',
-  'arrow-down-circle',
-  'arrow-down-left',
-  'arrow-down-on-square-stack',
-  'arrow-down-on-square',
-  'arrow-down-right',
-  'arrow-down-tray',
-  'arrow-down',
-  'arrow-left-circle',
-  'arrow-left-on-rectangle',
-  'arrow-left',
-  'arrow-long-down',
-  'arrow-long-left',
-  'arrow-long-right',
-  'arrow-long-up',
-  'arrow-path-rounded-square',
-  'arrow-path',
-  'arrow-right-circle',
-  'arrow-right-on-rectangle',
-  'arrow-right',
-  'arrow-small-down',
-  'arrow-small-left',
-  'arrow-small-right',
-  'arrow-small-up',
-  'arrow-top-right-on-square',
-  'arrow-trending-down',
-  'arrow-trending-up',
-  'arrow-up-circle',
-  'arrow-up-left',
-  'arrow-up-on-square-stack',
-  'arrow-up-on-square',
-  'arrow-up-right',
-  'arrow-up-tray',
-  'arrow-up',
-  'arrow-uturn-down',
-  'arrow-uturn-left',
-  'arrow-uturn-right',
-  'arrow-uturn-up',
-  'arrows-pointing-in',
-  'arrows-pointing-out',
-  'arrows-right-left',
-  'arrows-up-down',
-  'at-symbol',
-  'backspace',
-  'backward',
-  'banknotes',
-  'bars-2',
-  'bars-3-bottom-left',
-  'bars-3-bottom-right',
-  'bars-3-center-left',
-  'bars-3',
-  'bars-4',
-  'bars-arrow-down',
-  'bars-arrow-up',
-  'battery-0',
-  'battery-100',
-  'battery-50',
-  'beaker',
-  'bell-alert',
-  'bell-slash',
-  'bell-snooze',
-  'bell',
-  'bolt-slash',
-  'bolt',
-  'book-open',
-  'bookmark-slash',
-  'bookmark-square',
-  'bookmark',
-  'briefcase',
-  'bug-ant',
-  'building-library',
-  'building-office-2',
-  'building-office',
-  'building-storefront',
-  'cake',
-  'calculator',
-  'calendar-days',
-  'calendar',
-  'camera',
-  'chart-bar-square',
-  'chart-bar',
-  'chart-pie',
-  'chat-bubble-bottom-center-text',
-  'chat-bubble-bottom-center',
-  'chat-bubble-left-ellipsis',
-  'chat-bubble-left-right',
-  'chat-bubble-left',
-  'chat-bubble-oval-left-ellipsis',
-  'chat-bubble-oval-left',
-  'check-badge',
-  'check-circle',
-  'check',
-  'chevron-double-down',
-  'chevron-double-left',
-  'chevron-double-right',
-  'chevron-double-up',
-  'chevron-down',
-  'chevron-left',
-  'chevron-right',
-  'chevron-up-down',
-  'chevron-up',
-  'circle-stack',
-  'clipboard-document-check',
-  'clipboard-document-list',
-  'clipboard-document',
-  'clipboard',
-  'clock',
-  'cloud-arrow-down',
-  'cloud-arrow-up',
-  'cloud',
-  'code-bracket-square',
-  'code-bracket',
-  'cog-6-tooth',
-  'cog-8-tooth',
-  'cog',
-  'command-line',
-  'computer-desktop',
-  'cpu-chip',
-  'credit-card',
-  'cube-transparent',
-  'cube',
-  'currency-bangladeshi',
-  'currency-dollar',
-  'currency-euro',
-  'currency-pound',
-  'currency-rupee',
-  'currency-yen',
-  'cursor-arrow-rays',
-  'cursor-arrow-ripple',
-  'device-phone-mobile',
-  'device-tablet',
-  'document-arrow-down',
-  'document-arrow-up',
-  'document-chart-bar',
-  'document-check',
-  'document-duplicate',
-  'document-magnifying-glass',
-  'document-minus',
-  'document-plus',
-  'document-text',
-  'document',
-  'ellipsis-horizontal-circle',
-  'ellipsis-horizontal',
-  'ellipsis-vertical',
-  'envelope-open',
-  'envelope',
-  'exclamation-circle',
-  'exclamation-triangle',
-  'eye-dropper',
-  'eye-slash',
-  'eye',
-  'face-frown',
-  'face-smile',
-  'film',
-  'finger-print',
-  'fire',
-  'flag',
-  'folder-arrow-down',
-  'folder-minus',
-  'folder-open',
-  'folder-plus',
-  'folder',
-  'forward',
-  'funnel',
-  'gif',
-  'gift-top',
-  'gift',
-  'globe-alt',
-  'globe-americas',
-  'globe-asia-australia',
-  'globe-europe-africa',
-  'hand-raised',
-  'hand-thumb-down',
-  'hand-thumb-up',
-  'hashtag',
-  'heart',
-  'home-modern',
-  'home',
-  'identification',
-  'inbox-arrow-down',
-  'inbox-stack',
-  'inbox',
-  'information-circle',
-  'key',
-  'language',
-  'lifebuoy',
-  'light-bulb',
-  'link',
-  'list-bullet',
-  'lock-closed',
-  'lock-open',
-  'magnifying-glass-circle',
-  'magnifying-glass-minus',
-  'magnifying-glass-plus',
-  'magnifying-glass',
-  'map-pin',
-  'map',
-  'megaphone',
-  'microphone',
-  'minus-circle',
-  'minus-small',
-  'minus',
-  'moon',
-  'musical-note',
-  'newspaper',
-  'no-symbol',
-  'paint-brush',
-  'paper-airplane',
-  'paper-clip',
-  'pause-circle',
-  'pause',
-  'pencil-square',
-  'pencil',
-  'phone-arrow-down-left',
-  'phone-arrow-up-right',
-  'phone-x-mark',
-  'phone',
-  'photo',
-  'play-circle',
-  'play-pause',
-  'play',
-  'plus-circle',
-  'plus-small',
-  'plus',
-  'power',
-  'presentation-chart-bar',
-  'presentation-chart-line',
-  'printer',
-  'puzzle-piece',
-  'qr-code',
-  'question-mark-circle',
-  'queue-list',
-  'radio',
-  'receipt-percent',
-  'receipt-refund',
-  'rectangle-group',
-  'rectangle-stack',
-  'rocket-launch',
-  'rss',
-  'scale',
-  'scissors',
-  'server-stack',
-  'server',
-  'share',
-  'shield-check',
-  'shield-exclamation',
-  'shopping-bag',
-  'shopping-cart',
-  'signal-slash',
-  'signal',
-  'sparkles',
-  'speaker-wave',
-  'speaker-x-mark',
-  'square-2-stack',
-  'square-3-stack-3d',
-  'squares-2x2',
-  'squares-plus',
-  'star',
-  'stop-circle',
-  'stop',
-  'sun',
-  'swatch',
-  'table-cells',
-  'tag',
-  'ticket',
-  'trash',
-  'trophy',
-  'truck',
-  'tv',
-  'user-circle',
-  'user-group',
-  'user-minus',
-  'user-plus',
-  'user',
-  'users',
-  'variable',
-  'video-camera-slash',
-  'video-camera',
-  'view-columns',
-  'viewfinder-circle',
-  'wallet',
-  'wifi',
-  'window',
-  'wrench-screwdriver',
-  'wrench',
-  'x-circle',
-  'x-mark',
-]
-</script>
-
-<style scoped></style>

resources/admin/components/admin/paginate/index.vue

@@ -1,25 +0,0 @@
-<template>
-  <div class="flex justify-end pt-5">
-    <el-pagination background :layout="layout" :current-page="page" :page-size="limit" @current-change="changePage" @size-change="changeLimit" :total="total" :page-sizes="pageSizes" />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { inject } from 'vue'
-
-const layout = 'total,sizes,prev, pager,next'
-
-const pageSizes = [10, 20, 30, 50]
-
-interface paginate {
-  page: number
-  limit: number
-  total: number
-  changePage: number
-  changeLimit: number
-}
-
-const { page, limit, total, changePage, changeLimit } = inject('paginate') as paginate
-</script>
-
-<style scoped></style>

resources/admin/components/admin/select/index.vue

@@ -1,63 +0,0 @@
-<template>
-  <el-select v-bind="$attrs" class="w-full" clearable filterable>
-    <el-option-group v-for="group in elOptions" :key="group.label" :label="group.label" v-if="group">
-      <el-option v-for="item in group.options" :key="item.value" :label="item.label" :value="item.value" />
-    </el-option-group>
-    <el-option v-for="option in elOptions" :key="option.value" :label="option.label" :value="option.value" v-else>
-      <slot />
-    </el-option>
-  </el-select>
-</template>
-
-<script lang="ts" setup>
-import http from '/admin/support/http'
-import { ref, watch } from 'vue'
-
-const props = defineProps({
-  options: {
-    type: Array,
-    default: [],
-  },
-  api: {
-    type: String,
-    default: '',
-  },
-  group: {
-    type: Boolean,
-    default: false,
-  },
-  query: {
-    type: Object,
-    default: null,
-  },
-})
-
-interface Option {
-  label: string
-  value: string | number
-}
-
-interface GroupOption {
-  label: string
-  options: Array<Option>
-}
-
-const getOptions = () => {
-  http.get('options/' + props.api, props.query).then(r => {
-    elOptions.value = r.data.data
-  })
-}
-
-const elOptions: any = props.group ? ref<Array<GroupOption>>() : ref<Array<Option>>()
-if (props.api) {
-  if (!props.query) {
-    getOptions()
-  } else {
-    watch(props, function () {
-      getOptions()
-    })
-  }
-} else {
-  elOptions.value = props.options
-}
-</script>

resources/admin/components/admin/status/index.vue

@@ -1,44 +0,0 @@
-<template>
-  <el-switch @change="enabled(api, id)" :active-value="activeValue" :inactive-value="inactiveValue" :model-value="modelValue" :loading="loading" />
-</template>
-
-<script lang="ts" setup>
-import { useEnabled } from '/admin/composables/curd/useEnabled'
-import { Status } from '/admin/enum/app'
-import { ref } from 'vue'
-
-const props = defineProps({
-  modelValue: [Boolean, Number, String],
-  api: {
-    required: true,
-    type: String,
-  },
-  id: {
-    required: true,
-    type: [String, Number],
-  },
-})
-
-const emits = defineEmits(['update:modelValue', 'refresh'])
-// @ts-ignore
-const { enabled, success, loading, afterEnabled } = useEnabled()
-
-const activeValue = ref<boolean | number | string>()
-const inactiveValue = ref<boolean | number | string>()
-
-if (typeof props.modelValue === 'boolean') {
-  activeValue.value = true
-  inactiveValue.value = false
-} else {
-  activeValue.value = Status.ENABLE
-  inactiveValue.value = Status.DISABLE
-}
-
-success(() => {
-  emits('update:modelValue', props.modelValue === activeValue.value ? inactiveValue.value : activeValue.value)
-})
-
-afterEnabled.value = () => {
-  emits('refresh')
-}
-</script>

resources/admin/components/admin/table/operate.vue

@@ -1,17 +0,0 @@
-<template>
-  <div class="pt-5 pl-2">
-    <Add @click="show(showParams)" />
-    <slot name="operate" />
-  </div>
-</template>
-
-<script lang="ts" setup>
-defineProps({
-  show: {
-    type: Function,
-    required: true,
-  },
-
-  showParams: null,
-})
-</script>

resources/admin/components/admin/table/search.vue

@@ -1,33 +0,0 @@
-<template>
-  <div class="w-full min-h-0 bg-white dark:bg-regal-dark pl-5 pt-5 pr-5 rounded-lg">
-    <el-form :inline="true">
-      <slot name="body" />
-      <el-form-item>
-        <el-button type="primary" @click="search()">
-          <Icon name="magnifying-glass" className="w-4 h-4 mr-1 -ml-1" />
-          搜索
-        </el-button>
-        <el-button @click="reset()">
-          <Icon name="arrow-path" className="w-4 h-4 mr-1 -ml-1" />
-          重置
-        </el-button>
-      </el-form-item>
-    </el-form>
-  </div>
-</template>
-
-<script lang="ts" setup>
-defineProps({
-  search: {
-    type: Function,
-    required: true,
-  },
-
-  reset: {
-    type: Function,
-    required: true,
-  },
-})
-</script>
-
-<style scoped></style>

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

@@ -1,33 +0,0 @@
-<template>
-  <el-upload ref="upload" :action="actionApi" :auto-upload="auto" :headers="{ authorization: token, 'Request-from': 'Dashboard' }" v-bind="$attrs">
-    <template v-for="(index, name) in $slots" v-slot:[name]>
-      <slot :name="name"></slot>
-    </template>
-  </el-upload>
-</template>
-
-<script setup lang="ts">
-import { ref } from 'vue'
-import { env } from '/admin/support/helper'
-import { getAuthToken } from '/admin/support/helper'
-
-const props = defineProps({
-  action: {
-    type: String,
-    default: 'upload',
-  },
-  auto: {
-    type: Boolean,
-    default: true,
-  },
-})
-
-const baseURL = env('VITE_BASE_URL')
-
-const actionApi = ref<string>('')
-
-actionApi.value = baseURL + props.action
-
-const token = ref<string>()
-token.value = 'Bearer ' + getAuthToken()
-</script>