0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new feature

Browse Source
This commit is contained in:
JaguarJack
2022-12-14 19:25:52 +08:00
parent b63cd5d01c
commit 098463f4e1
35 changed files with 391 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/User/Http/Controllers/UserController.php
View File

@@ -6,12 +6,12 @@ use Catch\Base\CatchController as Controller;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Http\Request;
use Modules\User\Models\LogLogin;
use Modules\User\Models\Users;
use Modules\User\Models\User;
class UserController extends Controller
{
public function __construct(
protected readonly Users $user
protected readonly User $user
) {
}
@@ -44,7 +44,18 @@ class UserController extends Controller
*/
public function show($id)
{
return $this->user->firstBy($id)->makeHidden('password');
return $this->user->setAfterFirstBy(function (User $user){
$relations = array_keys($user->getRelations());
if (in_array('roles', $relations)) {
$user->setRelations([
'roles' => $user->roles->pluck('id'),
'jobs' => $user->jobs->pluck('id')
]);
}
return $user;
})->firstBy($id)->makeHidden('password');
}
/**
@@ -78,7 +89,7 @@ class UserController extends Controller
*/
public function enable($id)
{
return $this->user->disOrEnable($id);
return $this->user->toggleBy($id);
}
/**
@@ -88,7 +99,7 @@ class UserController extends Controller
*/
public function online(Request $request)
{
/* @var Users $user */
/* @var User $user */
$user = $this->getLoginUser()->withPermissions();
if ($request->isMethod('post')) {

4
modules/User/Listeners/Login.php
View File

@@ -9,7 +9,7 @@ use Illuminate\Support\Str;
use Illuminate\Support\Stringable;
use Modules\User\Events\Login as Event;
use Modules\User\Models\LogLogin;
use Modules\User\Models\Users;
use Modules\User\Models\User;
class Login
{
@@ -26,7 +26,7 @@ class Login
$this->log($request, (bool) $event->token);
if ($event->token) {
/* @var Users $user */
/* @var User $user */
$user = Auth::guard(getGuardName())->user();
$user->login_ip = $request->ip();

38
modules/User/Models/Observers/UsersObserver.php Normal file
View File

@@ -0,0 +1,38 @@
<?php
namespace Modules\User\Models\Observers;
use Modules\User\Models\User;
class UsersObserver
{
/**
*
* @param User $user
* @return void
*/
public function created(User $user): void
{
//
}
/**
*
* @param User $user
* @return void
*/
public function updated(User $user): void
{
//
}
/**
*
* @param User $user
* @return void
*/
public function deleted(User $user): void
{
//
}
}

52
modules/User/Models/Traits/UserRelations.php
View File

@@ -1,22 +1,27 @@
<?php
namespace Modules\User\Models\Traits;
namespace Modules\User\Models\Traits;
use Catch\CatchAdmin;
use Catch\Support\Module\ModuleRepository;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Route;
trait UserRelations
{
protected bool $isPermissionModuleEnabled = false;
/**
* init traits
*/
public function initializeUserRelations(): void
{
if (app(ModuleRepository::class)->enabled('permissions')) {
$this->with = ['roles', 'jobs'];
}
$this->isPermissionModuleEnabled = app(ModuleRepository::class)->enabled('permissions');
if ($this->isPermissionModuleEnabled) {
$this->with = ['roles', 'jobs'];
}
}
/**
@@ -56,11 +61,42 @@ trait UserRelations
$permissions = [];
}
$this->setAttribute('permissions', $permissions->each(fn($permission) => $permission->setAttribute('hidden', $permission->isHidden())));
$this->setAttribute('permissions', $permissions->each(fn ($permission) => $permission->setAttribute('hidden', $permission->isHidden())));
return $this;
}
/**
*
* permission module controller.action
*
* @param string|null $permission
* @return bool
*/
public function can(string $permission = null): bool
{
if (! $this->isPermissionModuleEnabled) {
return true;
}
if ($this->isSuperAdmin()) {
return true;
}
$this->withPermissions();
$actions = Collection::make();
$this->permissions->each(function ($permission) use (&$actions) {
if ($permission->isAction()) {
[$controller, $action] = explode('@', $permission->permission_mark);
$actions->add(CatchAdmin::getModuleControllerNamespace($permission->module).$controller.'Controller@'.$action);
}
});
return $actions->contains($permission ?: Route::currentRouteAction());
}
/**
* get RolesModel
@@ -70,7 +106,7 @@ trait UserRelations
*/
protected function getRolesModel(): string
{
return '\\' . CatchAdmin::getModuleModelNamespace('permissions') . 'RolesModel';
return '\\'.CatchAdmin::getModuleModelNamespace('permissions').'RolesModel';
}
@@ -82,7 +118,7 @@ trait UserRelations
*/
protected function getJobsModel(): string
{
return '\\'. CatchAdmin::getModuleModelNamespace('permissions') . 'JobsModel';
return '\\'.CatchAdmin::getModuleModelNamespace('permissions').'JobsModel';
}
/**
@@ -93,6 +129,6 @@ trait UserRelations
*/
protected function getPermissionsModel(): string
{
return '\\'. CatchAdmin::getModuleModelNamespace('permissions') . 'PermissionsModel';
return '\\'.CatchAdmin::getModuleModelNamespace('permissions').'PermissionsModel';
}
}

13
modules/User/Models/Users.php → modules/User/Models/User.php
View File

@@ -23,12 +23,12 @@ use Illuminate\Auth\Authenticatable;
* @property int $updated_at
* @property string $remember_token
*/
class Users extends Model implements AuthenticatableContract, JWTSubject
class User extends Model implements AuthenticatableContract, JWTSubject
{
use Authenticatable, UserRelations;
protected $fillable = [
'id', 'username', 'email', 'avatar', 'password', 'remember_token', 'creator_id', 'status', 'login_ip', 'login_at', 'created_at', 'updated_at', 'deleted_at'
'id', 'username', 'email', 'avatar', 'password', 'remember_token', 'creator_id', 'status', 'department_id', 'login_ip', 'login_at', 'created_at', 'updated_at', 'deleted_at'
];
/**
@@ -45,10 +45,17 @@ class Users extends Model implements AuthenticatableContract, JWTSubject
*/
protected $table = 'users';
protected array $fields = ['id', 'username', 'email', 'avatar', 'creator_id', 'status', 'department_id', 'created_at'];
/**
* @var array|string[]
*/
protected array $form = ['username', 'email', 'password'];
protected array $form = ['username', 'email', 'password', 'department_id'];
/**
* @var array|string[]
*/
protected array $formRelations = ['roles', 'jobs'];
/**
*

2
modules/User/database/migrations/2022_12_04_060250_create_users.php
View File

@@ -25,6 +25,8 @@ return new class () extends Migration {
$table->string('remember_token', 1000)->nullable()->comment('token');
$table->integer('department_id')->default(0)->comment('部门ID');
$table->integer('creator_id')->default(0);
$table->status();

34
modules/User/views/user/create.vue
View File

@@ -33,6 +33,21 @@
<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">
@@ -46,9 +61,6 @@
</el-form-item>
</div>
</div>
<el-form-item label="角色" prop="role_id" :rules="[{ required: true, message: '请选择角色' }]">
<el-tree v-model="formData.role_id" empty-text="" :data="roles" check-strictly :props="{ label: 'role_name', value: 'id' }" show-checkbox class="w-full mt-1" default-checked-keys />
</el-form-item>
<div class="flex justify-end">
<el-button type="primary" @click="submitForm(form)">{{ $t('system.confirm') }}</el-button>
</div>
@@ -59,8 +71,8 @@
import { useCreate } from '/admin/composables/curd/useCreate'
import { useShow } from '/admin/composables/curd/useShow'
import { onMounted, watch, ref } from 'vue'
import http from '../../../../resources/admin/support/http'
import { onMounted, ref } from 'vue'
import http from '/admin/support/http'
const props = defineProps({
primary: String | Number,
@@ -91,20 +103,16 @@ const { formData, form, loading, submitForm, close } = useCreate(props.api, prop
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(() => {
close(() => emit('close'))
if (props.hasRoles) {
http.get('permissions/roles').then(r => {
roles.value = r.data.data
})
http.get('permissions/departments').then(r => {
departments.value = r.data.data
})
@@ -112,6 +120,10 @@ onMounted(() => {
http.get('permissions/jobs').then(r => {
jobs.value = r.data.data
})
http.get('permissions/roles').then(r => {
roles.value = r.data.data
})
}
})
</script>

83
modules/User/views/user/index.vue
View File

@@ -1,52 +1,52 @@
<template>
<div class="flex flex-col sm:flex-row w-full justify-between">
<Department v-model="query.department_id" @searchDepartmentUsers="search" v-if="false"/>
<div class="w-full ml-5">
<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="pl-2 pr-2 bg-white dark:bg-regal-dark rounded-lg mt-4 pb-6">
<Operate :show="open" />
<el-table :data="tableData" class="mt-3" v-loading="loading">
<el-table-column prop="username" label="用户名" width="180" />
<el-table-column prop="avatar" label="头像" width="180" />
<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>
<Department v-model="query.department_id" @searchDepartmentUsers="search" v-if="false" />
<div class="w-full ml-5">
<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="pl-2 pr-2 bg-white dark:bg-regal-dark rounded-lg mt-4 pb-6">
<Operate :show="open" />
<el-table :data="tableData" class="mt-3" v-loading="loading">
<el-table-column prop="username" label="用户名" width="180" />
<el-table-column prop="avatar" label="头像" width="180" />
<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 />
<Paginate />
</div>
<Dialog v-model="visible" :title="title" destroy-on-close>
<Create @close="close(reset)" :primary="id" :api="api" />
</Dialog>
</div>
<Dialog v-model="visible" :title="title" destroy-on-close>
<Create @close="close" :primary="id" :api="api" />
</Dialog>
</div>
</div>
</template>
<script lang="ts" setup>
import { computed, onMounted } from 'vue'
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'
@@ -61,6 +61,7 @@ const { open, close, title, visible, id } = useOpen()
const tableData = computed(() => data.value?.data)
const roles = ref<Array<Object>>()
onMounted(() => {
search()