new feature

modules/Options/Repository/Controllers.php

@@ -17,9 +17,9 @@ class Controllers implements OptionInterface
 
             foreach ($controllerFiles as $controllerFile) {
                 $controllers[] = [
-                    'label' => Str::of(File::name($controllerFile))->remove('Controller'),
+                    'label' => Str::of(File::name($controllerFile))->lcfirst()->remove('Controller'),
 
-                    'value' => Str::of(File::name($controllerFile))->remove('Controller'),
+                    'value' => Str::of(File::name($controllerFile))->lcfirst()->remove('Controller'),
                 ];
             }
         }

modules/Options/Repository/Modules.php

@@ -14,9 +14,9 @@ class Modules implements OptionInterface
 
             ->each(function ($module) use (&$modules) {
                 $modules[] = [
-                    'label' => $module['name'],
+                    'label' => $module['title'],
 
-                    'value' => $module['path']
+                    'value' => $module['name']
                 ];
             });
 

modules/Permissions/Http/Controllers/PermissionsController.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Modules\Permissions\Http\Controllers;
 
 use Catch\Base\CatchController as Controller;
+use Modules\Permissions\Enums\MenuType;
 use Modules\Permissions\Models\PermissionsModel;
 use Illuminate\Http\Request;
 
@@ -16,12 +17,13 @@ class PermissionsController extends Controller
     }
 
     /**
-     * @param Request $request
      * @return mixed
      */
-    public function index(Request $request): mixed
+    public function index(): mixed
     {
-        return $this->model->getList();
+        return $this->model->setBeforeGetList(function ($query){
+            return $query->with('actions')->whereIn('type', [MenuType::Top->value(), MenuType::Menu->value]);
+        })->getList();
     }
 
     public function store(Request $request)

modules/Permissions/Http/Controllers/RolesController.php

@@ -20,7 +20,9 @@ class RolesController extends Controller
      */
     public function index(): mixed
     {
-        return $this->model->getList();
+        return $this->model->setBeforeGetList(function ($query){
+            return $query->with(['permissions' => function($query){ $query->select('id');}]);
+        })->getList();
     }
 
     public function store(RoleRequest $request)
@@ -30,7 +32,11 @@ class RolesController extends Controller
 
     public function show($id)
     {
-        return $this->model->firstBy($id);
+        $role = $this->model->firstBy($id);
+
+        $role->setAttribute('permissions', $role->permissions()->get()->toTree());
+
+        return $role;
     }
 
     public function update($id, RoleRequest $request)

modules/Permissions/Models/PermissionsModel.php

@@ -6,6 +6,7 @@ namespace Modules\Permissions\Models;
 
 use Catch\Base\CatchModel as Model;
 use Catch\Enums\Status;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Modules\Permissions\Enums\MenuStatus;
 use Modules\Permissions\Enums\MenuType;
 
@@ -51,8 +52,11 @@ class PermissionsModel extends Model
      */
     public array $searchable = [
         'permission_name' => 'like',
+
+        'role_id' => '='
     ];
 
+    protected $hidden = ['pivot'];
 
     /**
      * @var bool
@@ -88,4 +92,37 @@ class PermissionsModel extends Model
     {
         return $this->type == MenuType::Action;
     }
+
+    /**
+     * actions
+     *
+     * @return HasMany
+     */
+    public function actions(): HasMany
+    {
+        return $this->hasMany(self::class, 'parent_id', 'id')->where('type', MenuType::Action);
+    }
+
+    /**
+     *
+     * @param array $data
+     * @return bool
+     */
+    public function storeBy(array $data): bool
+    {
+       $model = $this->fill($data);
+
+       if ($model->isAction()) {
+          $parentMenu =  $this->firstBy($model->parent_id, 'id');
+          $model->setAttribute('module', $parentMenu->module);
+          $model->setAttribute('permission_mark', $parentMenu->permission_mark . '@' . $data['permission_mark']);
+          $model->setAttribute('route', '');
+           $model->setAttribute('icon', '');
+           $model->setAttribute('component', '');
+           $model->setAttribute('redirect', '');
+          return $model->setCreatorId()->save();
+       } else {
+           return parent::storeBy($data);
+       }
+    }
 }

modules/Permissions/Models/RolesModel.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Modules\Permissions\Models;
 
 use Catch\Base\CatchModel as Model;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
 /**
  * @property $role_name
@@ -33,6 +34,7 @@ class RolesModel extends Model
      */
     protected array $form = ['role_name','identify','parent_id','description','data_range'];
 
+    protected array $formRelations = ['permissions'];
 
     /**
      * @var bool
@@ -44,8 +46,19 @@ class RolesModel extends Model
      */
     public array $searchable = [
         'role_name' => 'like',
+
+        'id' => '<>'
     ];
 
-
     protected bool $asTree = true;
+
+
+    /**
+     *
+     * @return BelongsToMany
+     */
+    public function permissions(): BelongsToMany
+    {
+        return $this->belongsToMany(PermissionsModel::class, 'role_has_permissions', 'role_id', 'permission_id');
+    }
 }

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

@@ -136,7 +136,7 @@ onMounted(() => {
   // 监听 form data
   watch(
     formData,
-    (value, oldValue) => {
+    () => {
       const type: number = formData.value.type
 
       if (type === 1) {

modules/Permissions/views/permissions/index.vue

@@ -12,7 +12,13 @@
       <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="权限标识" />
+        <el-table-column prop="permission_mark" label="权限标识" width="300">
+          <template #default="scope">
+            <div v-if="scope.row.actions.length" class="flex gap gap-1">
+              <el-tag v-for="action in scope.row.actions" class="cursor-pointer" @click="open(action.id)" closable @close="destroy(api, action.id)">{{ action.permission_name }}</el-tag>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column prop="hidden" label="状态">
           <template #default="scope">
             <Status v-model="scope.row.hidden" :id="scope.row.id" :api="api" />

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

@@ -1,7 +1,16 @@
 <template>
   <el-form :model="formData" label-width="120px" ref="form" v-loading="loading" class="pr-6">
     <el-form-item label="上级角色" prop="parent_id">
-      <el-cascader :options="roles" name="parent_id" v-model="formData.parent_id" clearable :props="{ value: 'id', label: 'role_name', checkStrictly: true }" class="w-full" />
+      <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="角色名称"
@@ -31,22 +40,23 @@
     <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="permissions">
       <el-tree
+        ref="permissionTree"
         v-model="formData.permissions"
-        :default-expanded-keys="formData.permissions"
         :data="permissions"
-        value-key="id"
-        check-strictly
+        node-key="id"
         class="w-full"
         :props="{ label: 'permission_name', value: 'id' }"
         show-checkbox
+        default-expand-all
+        @check="selectPermissions"
+        :empty-text="permissionLoadingText"
       />
     </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>
     <div class="flex justify-end">
       <el-button type="primary" @click="submitForm(form)">{{ $t('system.confirm') }}</el-button>
     </div>
@@ -56,28 +66,17 @@
 <script lang="ts" setup>
 import { useCreate } from '/admin/composables/curd/useCreate'
 import { useShow } from '/admin/composables/curd/useShow'
-import { onMounted, ref, unref, watch } from 'vue'
+import { nextTick, onMounted, ref, unref } from 'vue'
 import http from '/admin/support/http'
 
 const props = defineProps({
   primary: String | Number,
   api: String,
+  hasPermissions: Array<Object>,
 })
 
 const { formData, form, loading, submitForm, close, beforeCreate, beforeUpdate } = useCreate(props.api, props.primary)
 
-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)
 
@@ -96,21 +95,66 @@ if (props.primary) {
 const emit = defineEmits(['close'])
 const roles = ref()
 const permissions = ref()
-onMounted(() => {
-  http.get(props.api).then(r => {
+// 权限树对象
+const permissionTree = ref()
+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').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
   })
+}
 
+onMounted(() => {
+  getRoles()
+  getPermissions()
   close(() => emit('close'))
-
-  http.get('permissions/permissions').then(r => {
-    permissions.value = r.data.data
-  })
 })
-</script>
 
-<style scoped lang="scss">
-:deep(.el-tree .el-tree-node__children:last-child) {
-  @apply flex flex-row;
+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 = () => {
+  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

@@ -9,7 +9,7 @@
     </Search>
     <div class="pl-2 pr-2 bg-white dark:bg-regal-dark rounded-lg mt-4 pb-6">
       <div class="pt-5 pl-2">
-        <Add @click="open(null)" />
+        <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="角色名称" />
@@ -18,20 +18,20 @@
         <el-table-column prop="created_at" label="创建时间" />
         <el-table-column label="操作" width="200">
           <template #default="scope">
-            <Update @click="open(scope.row.id)" />
+            <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" />
+      <Create @close="close(reset)" :primary="id" :api="api" :has-permissions="rolePermissions" />
     </Dialog>
   </div>
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted } from 'vue'
+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'
@@ -45,6 +45,11 @@ 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()
 

modules/User/Http/Controllers/UserController.php

@@ -3,6 +3,7 @@
 namespace Modules\User\Http\Controllers;
 
 use Catch\Base\CatchController as Controller;
+use Catch\Support\Module\ModuleRepository;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Http\Request;
 use Modules\User\Models\LogLogin;
@@ -44,18 +45,17 @@ class UserController extends Controller
      */
     public function show($id)
     {
-        return $this->user->setAfterFirstBy(function (User $user){
-            $relations = array_keys($user->getRelations());
-            if (in_array('roles', $relations)) {
-                $user->setRelations([
-                    'roles' => $user->roles->pluck('id'),
+        $user = $this->user->firstBy($id)->makeHidden('password');
 
-                    'jobs' => $user->jobs->pluck('id')
-                ]);
-            }
+        if (app(ModuleRepository::class)->enabled('permissions')) {
+            $user->setRelations([
+                'roles' => $user->roles->pluck('id'),
 
-            return $user;
-        })->firstBy($id)->makeHidden('password');
+                'jobs' => $user->jobs->pluck('id')
+            ]);
+        }
+
+        return $user;
     }
 
     /**

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

@@ -107,8 +107,6 @@ export default defineComponent({
     // 后端的 permissions 返回 undefined，则认为该后端无权限系统
     const permissions = userStore.getPermissions === undefined ? [] : userStore.getPermissions
 
-    console.log(permissionsStore.getMenusFrom(permissions))
-    console.log(filterMenus(permissionsStore.getMenusFrom(permissions)))
     const vnodes = getVNodes(filterMenus(permissionsStore.getMenusFrom(permissions)), props.subMenuClass)
     return () => {
       return h(

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

@@ -16,7 +16,6 @@ interface Permissions {
 
   menuPathMap: Map<string, string>
 }
-
 export const usePermissionsStore = defineStore('PermissionsStore', {
   state: (): Permissions => {
     return {
@@ -125,7 +124,6 @@ export const usePermissionsStore = defineStore('PermissionsStore', {
      */
     getAsnycMenus(permissions: Permission[], parentId: number = 0, path: string = '', viewComponents: any): Menu[] {
       const menus: Menu[] = []
-      console.log(viewComponents)
       permissions.forEach(permission => {
         if (permission.parent_id === parentId) {
           // menu