feat: 新增系统模块安装器

composer.json

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

modules/Develop/Models/Schemas.php

@@ -8,7 +8,6 @@ use Exception;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 use Modules\Develop\Support\Generate\Create\Schema;
-use Illuminate\Support\Facades\Schema as SchemaFacade;
 
 class Schemas extends CatchModel
 {
@@ -108,22 +107,4 @@ class Schemas extends CatchModel
 
         return $schema;
     }
-
-    /**
-     * delete
-     *
-     * @param $id
-     * @param bool $force
-     * @return bool|null
-     */
-    public function deleteBy($id, bool $force = false): ?bool
-    {
-        $schema = parent::firstBy($id);
-
-        if ($schema->delete()) {
-            SchemaFacade::dropIfExists($schema->name);
-        }
-
-        return true;
-    }
 }

modules/Develop/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/views/generate/components/structure.vue

@@ -60,6 +60,20 @@ import { Delete } from '@element-plus/icons-vue'
 const generateStore = useGenerateStore()
 
 const structures = computed(() => {
+  generateStore.getStructures.forEach(struct => {
+    if (struct.field === 'id' || struct.field === 'created_at' || struct.field === 'updated_at') {
+      struct.form = false
+    }
+
+    if (struct.field === 'sort') {
+      struct.form_component = 'input-number'
+    }
+
+    if (struct.field === 'status') {
+      struct.form_component = 'select'
+    }
+  })
+
   return generateStore.getStructures
 })
 

modules/Develop/views/module/index.vue

@@ -41,7 +41,7 @@
 
     <!-- 安装 -->
     <Dialog v-model="installVisible" title="安装模块" destroy-on-close>
-      <Install />
+      <Install @close="closeInstall" />
     </Dialog>
   </div>
 </template>
@@ -62,6 +62,9 @@ const { open, close, title, visible, id } = useOpen()
 
 const tableData = computed(() => data.value?.data)
 const installVisible = ref<boolean>(false)
+const closeInstall = () => {
+  installVisible.value = false
+}
 
 onMounted(() => {
   search()

modules/Develop/views/module/install.vue

@@ -22,9 +22,21 @@
           required: true,
           message: '模块名称必须填写',
         },
+        {
+          validator: (rule: any, value: any, callback: any) => {
+            if (! /^[A-Za-z]+$/.test(value)) {
+                callback('模块名称只允许大小字母组合')
+            } else  {
+                callback()
+            }
+          },
+          trigger: 'blur',
+        },
       ]"
     >
-      <el-input v-model="formData.title" />
+      <el-select v-model="formData.title" placeholder="选择安装模块">
+        <el-option v-for="item in modules" :key="item.value" :label="item.label" :value="item.value" />
+      </el-select>
     </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">
@@ -63,4 +75,19 @@ const moduleUpload = (response, uploadFile) => {
     Message.error(response.message)
   }
 }
+
+const modules = [
+  {
+    label: '权限管理',
+    value: 'permissions',
+  },
+  {
+    label: '内容管理',
+    value: 'cms',
+  },
+  {
+    label: '系统管理',
+    value: 'system',
+  },
+]
 </script>

modules/Develop/views/schema/index.vue

@@ -64,7 +64,7 @@ const schemaVisible = ref<boolean>(false)
 const api = 'schema'
 
 const { data, query, search, reset, loading } = useGetList(api)
-const { destroy, deleted } = useDestroy('确认删除吗? 将会删除数据库的 Schema，请提前做好备份，一旦删除，将无法恢复!')
+const { destroy, deleted } = useDestroy('确认删除吗? 删除后数据表将会保留，如需删除相关表，请手动进行删除!')
 const { open, close, title, visible, id } = useOpen()
 
 const tableData = computed(() => data.value?.data)

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

@@ -88,14 +88,13 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { computed, onMounted, Ref, ref } from 'vue'
+import { computed, 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'])
@@ -120,27 +119,6 @@ const updateField = (id: number) => {
   })
 }
 
-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

modules/Permissions/Http/Controllers/RolesController.php

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

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

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

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

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

modules/User/Http/Controllers/UserController.php

@@ -159,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/Models/Traits/UserRelations.php

@@ -58,16 +58,16 @@ trait UserRelations
 
         /* @var Permissions $permissionsModel */
         $permissionsModel = app($this->getPermissionsModel());
-
         if ($this->isSuperAdmin()) {
             $permissions = $permissionsModel->get();
         } else {
-            $permissions = Collection::make();
+            $permissionIds = Collection::make();
             $this->roles()->with('permissions')->get()
-                ->each(function ($role) use (&$permissions) {
+                ->each(function ($role) use (&$permissionIds) {
-                    $permissions = $permissions->concat($role->permissions);
+                    $permissionIds = $permissionIds->concat($role->permissions?->pluck('id'));
                 });
-            $permissions = $permissions->unique();
+
+            $permissions = $permissionsModel->whereIn('id', $permissionIds->unique())->get();
         }
 
         $this->setAttribute('permissions', $permissions->each(fn ($permission) => $permission->setAttribute('hidden', $permission->isHidden())));

modules/User/Models/User.php

@@ -37,7 +37,7 @@ class User extends Model implements AuthenticatableContract
     public array $searchable = [
         'username' => 'like',
         'email' => 'like',
-        'status' => '='
+        'status' => '=',
     ];
 
     /**
@@ -96,7 +96,7 @@ 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']);
         }
 

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/user/index.vue

@@ -16,12 +16,17 @@
         </template>
       </Search>
       <div class="table-default">
-        <Operate :show="open" />
+        <Operate :show="open">
+          <template #operate>
+            <el-button @click="download('/user')">导出</el-button>
+          </template>
+        </Operate>
         <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" />
+              <el-avatar :icon="UserFilled" v-if="!scope.row.avatar" />
+              <el-avatar :src="scope.row.avatar" v-else />
             </template>
           </el-table-column>
           <el-table-column prop="email" label="邮箱" />
@@ -50,6 +55,7 @@
 </template>
 
 <script lang="ts" setup>
+// @ts-nocheck
 import { computed, onMounted, ref } from 'vue'
 import Create from './create.vue'
 import { useGetList } from '/admin/composables/curd/useGetList'
@@ -58,14 +64,16 @@ import { useOpen } from '/admin/composables/curd/useOpen'
 import Department from './components/department.vue'
 import { useUserStore } from '/admin/stores/modules/user'
 import { isUndefined } from '/admin/support/helper'
+import { UserFilled } from '@element-plus/icons-vue'
+import { useExcelDownload } from '/resources/admin/composables/curd/useExcelDownload'
 
 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 { download } = useExcelDownload()
 
 const tableData = computed(() => data.value?.data)
 
@@ -74,9 +82,7 @@ const hasRoles = ref<boolean>(false)
 
 onMounted(() => {
   search()
-
   deleted(reset)
-
   hasRoles.value = !isUndefined(userStore.getRoles)
 })
 </script>

package.json

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

resources/admin/composables/curd/useExcelDownload.ts

@@ -0,0 +1,50 @@
+import Request from '/admin/support/request'
+import { ref, watch } from 'vue'
+import Message from '/admin/support/message'
+
+export function useExcelDownload() {
+  const http = new Request()
+  const isSuccess = ref(false)
+  const loading = ref<boolean>(false)
+  const afterDownload = ref()
+  function download(path: string, data: object = {}) {
+    loading.value = true
+    http
+      .setResponseType('blob')
+      .init()
+      .get(path + '/export', data)
+      .then(r => {
+        if (r.headers['content-type'] === 'application/json') {
+          const blob = new Blob([r.data], { type: r.headers['content-type'] })
+          const blobReader = new Response(blob).json()
+          blobReader.then(res => {
+            if (res.code === 1e4) {
+              Message.success(res.message)
+            } else {
+              Message.error(res.message)
+            }
+          })
+        } else {
+          const downloadLink = document.createElement('a')
+          const blob = new Blob([r.data], { type: r.headers['content-type'] })
+          downloadLink.href = URL.createObjectURL(blob)
+          downloadLink.download = r.headers.filename
+          document.body.appendChild(downloadLink)
+          downloadLink.click()
+          document.body.removeChild(downloadLink)
+        }
+      })
+      .finally(() => {
+        loading.value = false
+      })
+  }
+
+  const success = (func: Function) => {
+    watch(isSuccess, function () {
+      isSuccess.value = false
+      func()
+    })
+  }
+
+  return { download, success, loading, afterDownload }
+}

resources/admin/directives/permission/action.ts

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

resources/admin/layout/components/Menu/item.vue

@@ -13,13 +13,16 @@
     <el-icon>
       <Icon :name="menu?.meta?.icon" v-if="menu?.meta?.icon" class="text-sm" />
     </el-icon>
-    <span>{{ menu?.meta?.title }}</span>
+    <span v-if="menu?.path.indexOf('https://') !== -1 || menu?.path.indexOf('http://') !== -1">
+      <span @click="openUrl(menu?.path as string)">{{ menu?.meta?.title }}</span>
+    </span>
+    <span v-else>{{ menu?.meta?.title }}</span>
   </el-menu-item>
 </template>
 
-<script lang="ts" name="MenuItem" setup>
+<script lang="ts" setup>
 import { Menu } from '/admin/types/Menu'
-import { onMounted, PropType, ref } from 'vue'
+import { PropType } from 'vue'
 import { useAppStore } from '/admin/stores/modules/app'
 import { isMiniScreen } from '/admin/support/helper'
 
@@ -37,6 +40,12 @@ defineProps({
     require: true,
   },
 })
+
+const openUrl = (path: string) => {
+  const start = path.indexOf('https://') || path.indexOf('http://')
+  window.open(path.substring(start))
+  return false
+}
 </script>
 
 <style scoped lang="scss">

resources/admin/layout/components/Menu/menus.vue

@@ -7,22 +7,15 @@
     :collapse="!appStore.isExpand"
     :collapse-transition="false"
     :router="true"
-    @select="selectMenu"
     :unique-opened="true"
   >
     <slot />
   </el-menu>
 </template>
-<script lang="ts" setup name="menus">
+<script lang="ts" setup>
 import { useAppStore } from '/admin/stores/modules/app'
 
 const appStore = useAppStore()
-
-const selectMenu = (index: string) => {
-  if (index.startsWith('http') || index.startsWith('https')) {
-    window.open(index)
-  }
-}
 </script>
 
 <style scoped lang="scss">

resources/admin/support/http.ts

@@ -1,216 +1,4 @@
-import { Code } from '/admin/enum/app'
+import Request from './request'
-import axios, { AxiosInstance, AxiosRequestConfig } from 'axios'
-import { getAuthToken, getBaseUrl, removeAuthToken } from './helper'
-import Message from './message'
-import router from '/admin/router'
-import ResponseData from '/admin/types/responseData'
 
-/**
+const http = new Request()
- * http util
- */
-class Http {
-  /**
-   * axios config
-   * @protected
-   */
-  protected config: AxiosRequestConfig = {}
-
-  /**
-   * base url
-   * @protected
-   */
-  protected baseURL: string = ''
-
-  /**
-   * http request timeout
-   *
-   * @protected
-   */
-  protected timeout: number = 0
-
-  /**
-   * http request headers
-   *
-   * @protected
-   */
-  protected headers: { [k: string]: string } = {}
-
-  /**
-   * axios instance
-   *
-   * @protected
-   */
-  protected request: AxiosInstance
-
-  /**
-   * instance
-   */
-  constructor() {
-    this.request = axios.create(this.getConfig())
-  }
-
-  /**
-   * get request
-   *
-   * @param path
-   * @param params
-   */
-  public get(path: string, params: object = {}) {
-    return this.request.get(this.baseURL + path, {
-      params,
-    })
-  }
-
-  /**
-   * post request
-   *
-   * @param path
-   * @param data
-   */
-  public post(path: string, data: object = {}) {
-    return this.request.post(this.baseURL + path, data)
-  }
-
-  /**
-   * put request
-   *
-   * @param path
-   * @param data
-   */
-  public put(path: string, data: object = {}) {
-    return this.request.put(this.baseURL + path, data)
-  }
-
-  /**
-   * delete request
-   *
-   * @param path
-   */
-  public delete(path: string) {
-    return this.request.delete(this.baseURL + path)
-  }
-
-  /**
-   * set timeout
-   *
-   * @param timeout
-   * @returns
-   */
-  public setTimeout(timeout: number): Http {
-    this.timeout = timeout
-
-    return this
-  }
-
-  /**
-   * set baseurl
-   *
-   * @param url
-   * @returns
-   */
-  public setBaseUrl(url: string): Http {
-    this.baseURL = url
-
-    return this
-  }
-
-  /**
-   * set headers
-   *
-   * @param key
-   * @param value
-   * @returns
-   */
-  public setHeader(key: string, value: string): Http {
-    this.headers.key = value
-
-    return this
-  }
-
-  /**
-   * get axios 配置
-   *
-   * @returns
-   */
-  protected getConfig(): AxiosRequestConfig {
-    // set base url
-    this.config.baseURL = getBaseUrl()
-
-    // set timeout
-    this.config.timeout = this.timeout ? this.timeout : 10000
-
-    // set ajax request
-    this.headers['X-Requested-With'] = 'XMLHttpRequest'
-    // set dashboard request
-    this.headers['Request-from'] = 'Dashboard'
-    this.config.headers = this.headers
-
-    return this.config
-  }
-
-  /**
-   * 添加请求拦截器
-   *
-   */
-  public interceptorsOfRequest(): void {
-    // @ts-ignore
-    this.request.interceptors.request.use((config: AxiosRequestConfig) => {
-      const token = getAuthToken()
-      if (token) {
-        if (!config.headers) {
-          config.headers = {}
-        }
-
-        config.headers.authorization = 'Bearer ' + token
-      }
-
-      return config
-    })
-  }
-
-  /**
-   * 添加响应拦截器
-   *
-   */
-  public interceptorsOfResponse(): void {
-    this.request.interceptors.response.use(
-      response => {
-        const r: ResponseData = response.data
-        const code = r.code
-        const message = r.message
-        if (code === 1e4) {
-          return response
-        }
-
-        if (code === 10004) {
-          Message.error(message || 'Error')
-        } else if (code === Code.LOST_LOGIN || code === Code.LOGIN_EXPIRED) {
-          // to re-login
-          Message.confirm(message + '，需要重新登陆', function () {
-            removeAuthToken()
-            router.push('/login')
-          })
-        } else if (code === Code.LOGIN_BLACKLIST || code === Code.USER_FORBIDDEN) {
-          Message.error(message || 'Error')
-          removeAuthToken()
-          // to login page
-          router.push('/login')
-        } else {
-          Message.error(message || 'Error')
-        }
-
-        return Promise.reject(new Error(message || 'Error'))
-      },
-      error => {
-        Message.error(error.message)
-        return Promise.reject(error)
-      },
-    )
-  }
-}
-
-const http = new Http()
-http.interceptorsOfRequest()
-
-http.interceptorsOfResponse()
 export default http

resources/admin/support/request.ts

@@ -0,0 +1,235 @@
+import { Code } from '/admin/enum/app'
+import axios, { AxiosInstance, AxiosRequestConfig } from 'axios'
+import { getAuthToken, getBaseUrl, removeAuthToken } from './helper'
+import Message from './message'
+import router from '/admin/router'
+import ResponseData from '/admin/types/responseData'
+
+type responseType = 'arraybuffer' | 'document' | 'json' | 'text' | 'stream' | 'blob'
+
+/**
+ * http util
+ */
+class Request {
+  /**
+   * axios config
+   * @protected
+   */
+  protected config: AxiosRequestConfig = {}
+
+  /**
+   * base url
+   * @protected
+   */
+  protected baseURL: string = ''
+
+  /**
+   * http request timeout
+   *
+   * @protected
+   */
+  protected timeout: number = 0
+
+  /**
+   * http request headers
+   *
+   * @protected
+   */
+  protected headers: { [k: string]: string } = {}
+
+  /**
+   * axios instance
+   *
+   * @protected
+   */
+  // @ts-ignore
+  protected request: AxiosInstance
+
+  /**
+   * 响应结构
+   *
+   * @protected
+   */
+  protected responseType: responseType = 'json'
+
+  public init() {
+    this.request = axios.create(this.getConfig())
+    this.interceptorsOfRequest()
+    this.interceptorsOfResponse()
+    return this
+  }
+
+  /**
+   * get request
+   *
+   * @param path
+   * @param params
+   */
+  public get(path: string, params: object = {}) {
+    this.init()
+    return this.request.get(this.baseURL + path, {
+      params,
+    })
+  }
+
+  /**
+   * post request
+   *
+   * @param path
+   * @param data
+   */
+  public post(path: string, data: object = {}) {
+    this.init()
+    return this.request.post(this.baseURL + path, data)
+  }
+
+  /**
+   * put request
+   *
+   * @param path
+   * @param data
+   */
+  public put(path: string, data: object = {}) {
+    this.init()
+    return this.request.put(this.baseURL + path, data)
+  }
+
+  /**
+   * delete request
+   *
+   * @param path
+   */
+  public delete(path: string) {
+    this.init()
+    return this.request.delete(this.baseURL + path)
+  }
+
+  /**
+   * set timeout
+   *
+   * @param timeout
+   * @returns
+   */
+  public setTimeout(timeout: number): Request {
+    this.timeout = timeout
+
+    return this
+  }
+
+  /**
+   * set baseurl
+   *
+   * @param url
+   * @returns
+   */
+  public setBaseUrl(url: string): Request {
+    this.baseURL = url
+
+    return this
+  }
+
+  /**
+   * set headers
+   *
+   * @param key
+   * @param value
+   * @returns
+   */
+  public setHeader(key: string, value: string): Request {
+    this.headers.key = value
+
+    return this
+  }
+
+  /**
+   * get axios 配置
+   *
+   * @returns
+   */
+  protected getConfig(): AxiosRequestConfig {
+    // set base url
+    this.config.baseURL = getBaseUrl()
+    //
+    this.config.responseType = this.responseType
+    // set timeout
+    this.config.timeout = this.timeout ? this.timeout : 10000
+
+    // set ajax request
+    this.headers['X-Requested-With'] = 'XMLHttpRequest'
+    // set dashboard request
+    this.headers['Request-from'] = 'Dashboard'
+    this.config.headers = this.headers
+    return this.config
+  }
+
+  public setResponseType(type: responseType) {
+    this.responseType = type
+
+    return this
+  }
+
+  /**
+   * 添加请求拦截器
+   *
+   */
+  public interceptorsOfRequest(): void {
+    // @ts-ignore
+    this.request.interceptors.request.use((config: AxiosRequestConfig) => {
+      const token = getAuthToken()
+      if (token) {
+        if (!config.headers) {
+          config.headers = {}
+        }
+
+        config.headers.authorization = 'Bearer ' + token
+      }
+
+      return config
+    })
+  }
+
+  /**
+   * 添加响应拦截器
+   *
+   */
+  public interceptorsOfResponse(): void {
+    this.request.interceptors.response.use(
+      response => {
+        // 如果是 blob response type, 直接返回 response
+        if (response.request.responseType === 'blob') {
+          return response
+        }
+
+        const r: ResponseData = response.data
+        const code = r.code
+        const message = r.message
+        if (code === 1e4) {
+          return response
+        }
+
+        if (code === 10004) {
+          Message.error(message || 'Error')
+        } else if (code === Code.LOST_LOGIN || code === Code.LOGIN_EXPIRED) {
+          // to re-login
+          Message.confirm(message + '，需要重新登陆', function () {
+            removeAuthToken()
+            router.push('/login')
+          })
+        } else if (code === Code.LOGIN_BLACKLIST || code === Code.USER_FORBIDDEN) {
+          Message.error(message || 'Error')
+          removeAuthToken()
+          // to login page
+          router.push('/login')
+        } else {
+          Message.error(message || 'Error')
+        }
+        return Promise.reject(new Error(message || 'Error'))
+      },
+      error => {
+        Message.error(error.message)
+        return Promise.reject(error)
+      },
+    )
+  }
+}
+export default Request