Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
dlarmor 2023-03-27 14:15:53 +08:00
commit 0c71d0dd93
12 changed files with 87 additions and 127 deletions

View File

@ -10,20 +10,13 @@ export interface RoleVO {
createTime: Date createTime: Date
} }
export interface RolePageReqVO extends PageParam {
name?: string
code?: string
status?: number
createTime?: Date[]
}
export interface UpdateStatusReqVO { export interface UpdateStatusReqVO {
id: number id: number
status: number status: number
} }
// 查询角色列表 // 查询角色列表
export const getRolePageApi = async (params: RolePageReqVO) => { export const getRolePage = async (params: PageParam) => {
return await request.get({ url: '/system/role/page', params }) return await request.get({ url: '/system/role/page', params })
} }
@ -33,26 +26,33 @@ export const getSimpleRoleList = async (): Promise<RoleVO[]> => {
} }
// 查询角色详情 // 查询角色详情
export const getRoleApi = async (id: number) => { export const getRole = async (id: number) => {
return await request.get({ url: '/system/role/get?id=' + id }) return await request.get({ url: '/system/role/get?id=' + id })
} }
// 新增角色 // 新增角色
export const createRoleApi = async (data: RoleVO) => { export const createRole = async (data: RoleVO) => {
return await request.post({ url: '/system/role/create', data }) return await request.post({ url: '/system/role/create', data })
} }
// 修改角色 // 修改角色
export const updateRoleApi = async (data: RoleVO) => { export const updateRole = async (data: RoleVO) => {
return await request.put({ url: '/system/role/update', data }) return await request.put({ url: '/system/role/update', data })
} }
// 修改角色状态 // 修改角色状态
export const updateRoleStatusApi = async (data: UpdateStatusReqVO) => { export const updateRoleStatus = async (data: UpdateStatusReqVO) => {
return await request.put({ url: '/system/role/update-status', data }) return await request.put({ url: '/system/role/update-status', data })
} }
// 删除角色 // 删除角色
export const deleteRoleApi = async (id: number) => { export const deleteRole = async (id: number) => {
return await request.delete({ url: '/system/role/delete?id=' + id }) return await request.delete({ url: '/system/role/delete?id=' + id })
} }
// 导出角色
export const exportRole = (params) => {
return request.download({
url: '/system/role/export-excel',
params
})
}

View File

@ -100,7 +100,6 @@ declare module '@vue/runtime-core' {
ScriptTask: typeof import('./../components/bpmnProcessDesigner/package/penal/task/task-components/ScriptTask.vue')['default'] ScriptTask: typeof import('./../components/bpmnProcessDesigner/package/penal/task/task-components/ScriptTask.vue')['default']
Search: typeof import('./../components/Search/src/Search.vue')['default'] Search: typeof import('./../components/Search/src/Search.vue')['default']
SignalAndMessage: typeof import('./../components/bpmnProcessDesigner/package/penal/signal-message/SignalAndMessage.vue')['default'] SignalAndMessage: typeof import('./../components/bpmnProcessDesigner/package/penal/signal-message/SignalAndMessage.vue')['default']
Src: typeof import('./../components/RightToolbar/src/index.vue')['default']
Sticky: typeof import('./../components/Sticky/src/Sticky.vue')['default'] Sticky: typeof import('./../components/Sticky/src/Sticky.vue')['default']
Table: typeof import('./../components/Table/src/Table.vue')['default'] Table: typeof import('./../components/Table/src/Table.vue')['default']
Tooltip: typeof import('./../components/Tooltip/src/Tooltip.vue')['default'] Tooltip: typeof import('./../components/Tooltip/src/Tooltip.vue')['default']

View File

@ -46,7 +46,6 @@
<script setup lang="ts"> <script setup lang="ts">
import { DICT_TYPE, getDictOptions } from '@/utils/dict' import { DICT_TYPE, getDictOptions } from '@/utils/dict'
import * as NoticeApi from '@/api/system/notice' import * as NoticeApi from '@/api/system/notice'
const { t } = useI18n() // const { t } = useI18n() //
const message = useMessage() // const message = useMessage() //

View File

@ -96,8 +96,8 @@ import type { FormExpose } from '@/components/Form'
import { handleTree, defaultProps } from '@/utils/tree' import { handleTree, defaultProps } from '@/utils/tree'
import { SystemDataScopeEnum } from '@/utils/constants' import { SystemDataScopeEnum } from '@/utils/constants'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import { listSimpleMenusApi } from '@/api/system/menu' import * as MenuApi from '@/api/system/menu'
import { listSimpleDeptApi } from '@/api/system/dept' import * as DeptApi from '@/api/system/dept'
import * as PermissionApi from '@/api/system/permission' import * as PermissionApi from '@/api/system/permission'
// ========== CRUD ========== // ========== CRUD ==========
const actionLoading = ref(false) // const actionLoading = ref(false) //
@ -131,7 +131,7 @@ const openModal = async (type: string, row: RoleApi.RoleVO) => {
actionScopeType.value = type actionScopeType.value = type
dialogScopeVisible.value = true dialogScopeVisible.value = true
if (type === 'menu') { if (type === 'menu') {
const menuRes = await listSimpleMenusApi() const menuRes = await MenuApi.getSimpleMenusList()
treeOptions.value = handleTree(menuRes) treeOptions.value = handleTree(menuRes)
const role = await PermissionApi.listRoleMenusApi(row.id) const role = await PermissionApi.listRoleMenusApi(row.id)
if (role) { if (role) {
@ -140,7 +140,7 @@ const openModal = async (type: string, row: RoleApi.RoleVO) => {
}) })
} }
} else if (type === 'data') { } else if (type === 'data') {
const deptRes = await listSimpleDeptApi() const deptRes = await DeptApi.getSimpleDeptList()
treeOptions.value = handleTree(deptRes) treeOptions.value = handleTree(deptRes)
const role = await RoleApi.getRole(row.id) const role = await RoleApi.getRole(row.id)
dataScopeForm.dataScope = role.dataScope dataScopeForm.dataScope = role.dataScope

View File

@ -1,5 +1,5 @@
<template> <template>
<Dialog :title="dialogTitle" v-model="modelVisible" width="800"> <Dialog :title="modelTitle" v-model="modelVisible">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"
@ -10,9 +10,6 @@
<el-form-item label="角色名称" prop="name"> <el-form-item label="角色名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入角色名称" /> <el-input v-model="formData.name" placeholder="请输入角色名称" />
</el-form-item> </el-form-item>
<el-form-item label="角色类型" prop="type">
<el-input :model-value="formData.type" placeholder="请输入角色类型" height="150px" />
</el-form-item>
<el-form-item label="角色标识" prop="code"> <el-form-item label="角色标识" prop="code">
<el-input :model-value="formData.code" placeholder="请输入角色标识" height="150px" /> <el-input :model-value="formData.code" placeholder="请输入角色标识" height="150px" />
</el-form-item> </el-form-item>
@ -22,10 +19,10 @@
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-select v-model="formData.status" placeholder="请选择状态" clearable> <el-select v-model="formData.status" placeholder="请选择状态" clearable>
<el-option <el-option
v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)" v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="parseInt(dict.value)" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="parseInt(dict.value)" :value="dict.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -34,35 +31,25 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<div class="dialog-footer"> <el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button> <el-button @click="modelVisible = false"> </el-button>
<el-button @click="modelVisible = false"> </el-button>
</div>
</template> </template>
</Dialog> </Dialog>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { getDictOptions } from '@/utils/dict'
import { CommonStatusEnum } from '@/utils/constants'
import type { FormExpose } from '@/components/Form'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import { CommonStatusEnum } from '@/utils/constants'
import * as RoleApi from '@/api/system/role' import * as RoleApi from '@/api/system/role'
// ========== CRUD ==========
const dialogTitle = ref('edit') //
const formRef = ref<FormExpose>() // Ref
const { t } = useI18n() // const { t } = useI18n() //
const dataScopeDictDatas = ref()
const message = useMessage() // const message = useMessage() //
const modelVisible = ref(false) // const modelVisible = ref(false) //
const modelTitle = ref('') // const modelTitle = ref('') //
const formLoading = ref(false) // 12 const formLoading = ref(false) // 12
const formType = ref('') // create - update - const formType = ref('') // create - update -
const formData = ref({ const formData = ref({
id: undefined, id: undefined,
name: '', name: '',
type: '',
code: '', code: '',
sort: undefined, sort: undefined,
status: CommonStatusEnum.ENABLE, status: CommonStatusEnum.ENABLE,
@ -75,9 +62,10 @@ const formRules = reactive({
status: [{ required: true, message: '岗位状态不能为空', trigger: 'change' }], status: [{ required: true, message: '岗位状态不能为空', trigger: 'change' }],
remark: [{ required: false, message: '岗位内容不能为空', trigger: 'blur' }] remark: [{ required: false, message: '岗位内容不能为空', trigger: 'blur' }]
}) })
const formRef = ref() // Ref
/** 打开弹窗 */ /** 打开弹窗 */
const openModal = async (type: string, id?: number) => { const open = async (type: string, id?: number) => {
modelVisible.value = true modelVisible.value = true
modelTitle.value = t('action.' + type) modelTitle.value = t('action.' + type)
formType.value = type formType.value = type
@ -92,6 +80,7 @@ const openModal = async (type: string, id?: number) => {
} }
} }
} }
/** 重置表单 */ /** 重置表单 */
const resetForm = () => { const resetForm = () => {
formData.value = { formData.value = {
@ -104,7 +93,8 @@ const resetForm = () => {
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
defineExpose({ openModal }) // openModal defineExpose({ open }) // open
/** 提交表单 */ /** 提交表单 */
const emit = defineEmits(['success']) // success const emit = defineEmits(['success']) // success
const submitForm = async () => { const submitForm = async () => {
@ -130,19 +120,4 @@ const submitForm = async () => {
formLoading.value = false formLoading.value = false
} }
} }
const init = () => {
dataScopeDictDatas.value = getIntDictOptions(DICT_TYPE.SYSTEM_DATA_SCOPE)
}
// ========== ==========
onMounted(() => {
init()
})
</script> </script>
<style scoped>
.card {
width: 100%;
max-height: 400px;
overflow-y: scroll;
}
</style>

View File

@ -14,6 +14,7 @@
placeholder="请输入角色名称" placeholder="请输入角色名称"
clearable clearable
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="角色标识" prop="code"> <el-form-item label="角色标识" prop="code">
@ -22,10 +23,11 @@
placeholder="请输入角色标识" placeholder="请输入角色标识"
clearable clearable
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable> <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
<el-option <el-option
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="dict.value" :key="dict.value"
@ -48,7 +50,12 @@
<el-form-item> <el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button> <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button> <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button type="primary" @click="openModal('create')" v-hasPermi="['system:role:create']"> <el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['system:role:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增 <Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button> </el-button>
<el-button <el-button
@ -66,7 +73,7 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" align="center"> <el-table v-loading="loading" :data="list">
<el-table-column label="角色编号" align="center" prop="id" /> <el-table-column label="角色编号" align="center" prop="id" />
<el-table-column label="角色名称" align="center" prop="name" /> <el-table-column label="角色名称" align="center" prop="name" />
<el-table-column label="角色类型" align="center" prop="type" /> <el-table-column label="角色类型" align="center" prop="type" />
@ -90,12 +97,11 @@
<el-button <el-button
link link
type="primary" type="primary"
@click="openModal('update', scope.row.id)" @click="openForm('update', scope.row.id)"
v-hasPermi="['system:role:update']" v-hasPermi="['system:role:update']"
> >
编辑 编辑
</el-button> </el-button>
<!-- 操作菜单权限 -->
<el-button <el-button
link link
type="primary" type="primary"
@ -106,7 +112,6 @@
> >
菜单权限 菜单权限
</el-button> </el-button>
<!-- 操作数据权限 -->
<el-button <el-button
link link
type="primary" type="primary"
@ -149,18 +154,12 @@ import MenuPermissionForm from './MenuPermissionForm.vue'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime' import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download' import download from '@/utils/download'
const message = useMessage() // const message = useMessage() //
const { t } = useI18n() // const { t } = useI18n() //
const loading = ref(true) // const loading = ref(true) //
const total = ref(0) // const total = ref(0) //
const list = ref([]) // const list = ref([]) //
const dialogTitle = ref('编辑') //
const actionType = ref('') //
const modelVisible = ref(false) //
const queryFormRef = ref() //
const exportLoading = ref(false) //
const queryParams = reactive({ const queryParams = reactive({
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
@ -169,13 +168,8 @@ const queryParams = reactive({
status: undefined, status: undefined,
createTime: [] createTime: []
}) })
const queryFormRef = ref() //
// const exportLoading = ref(false) //
const setDialogTile = (type: string) => {
dialogTitle.value = t('action.' + type)
actionType.value = type
modelVisible.value = true
}
/** 查询角色列表 */ /** 查询角色列表 */
const getList = async () => { const getList = async () => {
@ -203,9 +197,14 @@ const resetQuery = () => {
/** 添加/修改操作 */ /** 添加/修改操作 */
const formRef = ref() const formRef = ref()
const openModal = (type: string, id?: number) => { const openForm = (type: string, id?: number) => {
setDialogTile('编辑') formRef.value.open(type, id)
formRef.value.openModal(type, id) }
/** 数据权限操作 */
const menuPermissionFormRef = ref()
const handleScope = async (type: string, row: RoleApi.RoleVO) => {
menuPermissionFormRef.value.openForm(type, row)
} }
/** 删除按钮操作 */ /** 删除按钮操作 */
@ -228,20 +227,14 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const data = await RoleApi.exportPostApi(queryParams) const data = await RoleApi.exportRole(queryParams)
download.excel(data, '角色列表.xls') download.excel(data, '角色列表.xls')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false
} }
} }
/** 数据权限操作 */
const menuPermissionFormRef = ref()
//
const handleScope = async (type: string, row: RoleApi.RoleVO) => {
menuPermissionFormRef.value.openModal(type, row)
}
/** 初始化 **/ /** 初始化 **/
onMounted(() => { onMounted(() => {
getList() getList()

View File

@ -44,7 +44,7 @@
<el-radio <el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="dict.value" :key="dict.value"
:label="parseInt(dict.value)" :label="parseInt(dict.value as string)"
> >
{{ dict.label }} {{ dict.label }}
</el-radio> </el-radio>
@ -96,7 +96,7 @@ const formRules = reactive({
channelId: [{ required: true, message: '短信渠道编号不能为空', trigger: 'change' }] channelId: [{ required: true, message: '短信渠道编号不能为空', trigger: 'change' }]
}) })
const formRef = ref() // Ref const formRef = ref() // Ref
const channelList = ref([]) // const channelList = ref<SmsChannelApi.SmsChannelVO[]>([]) //
const open = async (type: string, id?: number) => { const open = async (type: string, id?: number) => {
modelVisible.value = true modelVisible.value = true

View File

@ -166,12 +166,7 @@
width="180" width="180"
:formatter="dateFormatter" :formatter="dateFormatter"
/> />
<el-table-column <el-table-column label="操作" align="center" width="210" fixed="right">
label="操作"
align="center"
width="210"
fixed="right"
>
<template #default="scope"> <template #default="scope">
<el-button <el-button
link link
@ -241,7 +236,7 @@ const queryParams = reactive({
createTime: [] createTime: []
}) })
const exportLoading = ref(false) // const exportLoading = ref(false) //
const channelList = ref([]) // const channelList = ref<SmsChannelApi.SmsChannelVO[]>([]) //
/** 查询列表 */ /** 查询列表 */
const getList = async () => { const getList = async () => {

View File

@ -332,26 +332,24 @@ const getPostOptions = async () => {
const res = await getSimplePostList() const res = await getSimplePostList()
postOptions.value.push(...res) postOptions.value.push(...res)
} }
const dataFormater = (val) => { const dataFormater = computed(() => (deptId: number) => deptFormater(deptOptions.value, deptId))
return deptFormater(deptOptions.value, val)
}
// //
const deptFormater = (ary, val: any) => { const deptFormater = (arr: Tree[], deptId: number) => {
var o = '' let deptName = ''
if (ary && val) { if (arr && deptId) {
for (const v of ary) { for (const item of arr) {
if (v.id == val) { if (item.id === deptId) {
o = v.name deptName = item.name
if (o) return o break
} else if (v.children?.length) { }
o = deptFormater(v.children, val) if (item.children) {
if (o) return o deptName = deptFormater(item.children, deptId) ?? ''
break
} }
} }
return o
} else {
return val
} }
return deptName
} }
// //

View File

@ -1,6 +1,7 @@
declare module 'vue' { declare module 'vue' {
export interface GlobalComponents { export interface GlobalComponents {
Icon: typeof import('../components/Icon/src/Icon.vue')['default'] Icon: typeof import('@/components/Icon')['Icon']
DictTag: typeof import('@/components/DictTag')['DictTag']
} }
} }

26
types/global.d.ts vendored
View File

@ -1,29 +1,29 @@
export {} export {}
declare global { declare global {
declare interface Fn<T = any> { interface Fn<T = any> {
(...arg: T[]): T (...arg: T[]): T
} }
declare type Nullable<T> = T | null type Nullable<T> = T | null
declare type ElRef<T extends HTMLElement = HTMLDivElement> = Nullable<T> type ElRef<T extends HTMLElement = HTMLDivElement> = Nullable<T>
declare type Recordable<T = any, K = string> = Record<K extends null | undefined ? string : K, T> type Recordable<T = any, K = string> = Record<K extends null | undefined ? string : K, T>
declare type ComponentRef<T> = InstanceType<T> type ComponentRef<T> = InstanceType<T>
declare type LocaleType = 'zh-CN' | 'en' type LocaleType = 'zh-CN' | 'en'
declare type AxiosHeaders = type AxiosHeaders =
| 'application/json' | 'application/json'
| 'application/x-www-form-urlencoded' | 'application/x-www-form-urlencoded'
| 'multipart/form-data' | 'multipart/form-data'
declare type AxiosMethod = 'get' | 'post' | 'delete' | 'put' | 'GET' | 'POST' | 'DELETE' | 'PUT' type AxiosMethod = 'get' | 'post' | 'delete' | 'put' | 'GET' | 'POST' | 'DELETE' | 'PUT'
declare type AxiosResponseType = 'arraybuffer' | 'blob' | 'document' | 'json' | 'text' | 'stream' type AxiosResponseType = 'arraybuffer' | 'blob' | 'document' | 'json' | 'text' | 'stream'
declare interface AxiosConfig { interface AxiosConfig {
params?: any params?: any
data?: any data?: any
url?: string url?: string
@ -32,17 +32,17 @@ declare global {
responseType?: AxiosResponseType responseType?: AxiosResponseType
} }
declare interface IResponse<T = any> { interface IResponse<T = any> {
code: string code: string
data: T extends any ? T : T & any data: T extends any ? T : T & any
} }
declare interface PageParam { interface PageParam {
pageSize?: number pageSize?: number
pageNo?: number pageNo?: number
} }
declare interface Tree { interface Tree {
id: number id: number
name: string name: string
children?: Tree[] | any[] children?: Tree[] | any[]

4
types/router.d.ts vendored
View File

@ -54,7 +54,7 @@ type Component<T = any> =
| (() => Promise<T>) | (() => Promise<T>)
declare global { declare global {
declare interface AppRouteRecordRaw extends Omit<RouteRecordRaw, 'meta'> { interface AppRouteRecordRaw extends Omit<RouteRecordRaw, 'meta'> {
name: string name: string
meta: RouteMeta meta: RouteMeta
component?: Component | string component?: Component | string
@ -64,7 +64,7 @@ declare global {
keepAlive?: boolean keepAlive?: boolean
} }
declare interface AppCustomRouteRecordRaw extends Omit<RouteRecordRaw, 'meta'> { interface AppCustomRouteRecordRaw extends Omit<RouteRecordRaw, 'meta'> {
icon: any icon: any
name: string name: string
meta: RouteMeta meta: RouteMeta