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

refactor:优化

Browse Source
This commit is contained in:
JaguarJack 2023-05-25 07:53:35 +08:00
parent 1849c85c39
commit 9abd62b801
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

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

2
modules/User/Models/User.php
View File

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

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

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

2
resources/admin/directives/permission/action.ts
View File

@ -18,7 +18,7 @@ function checkAction(el: any, action: any) {
el.parentNode && el.parentNode.removeChild(el) el.parentNode && el.parentNode.removeChild(el)
} }
} else { } 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"`)
} }
} }