Skip to content

Commit e30d32e

Browse files
YunaiVgitee-org
authored andcommitted
!75 Vue3重构租户套餐
Merge pull request !75 from puhui999/dev
2 parents 98afdfc + a9df146 commit e30d32e

File tree

7 files changed

+359
-245
lines changed

7 files changed

+359
-245
lines changed

src/api/system/tenantPackage/index.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,27 @@ export interface TenantPackagePageReqVO extends PageParam {
2020
}
2121

2222
// 查询租户套餐列表
23-
export const getTenantPackageTypePageApi = (params: TenantPackagePageReqVO) => {
23+
export const getTenantPackageTypePage = (params: TenantPackagePageReqVO) => {
2424
return request.get({ url: '/system/tenant-package/page', params })
2525
}
2626

2727
// 获得租户
28-
export const getTenantPackageApi = (id: number) => {
28+
export const getTenantPackage = (id: number) => {
2929
return request.get({ url: '/system/tenant-package/get?id=' + id })
3030
}
3131

3232
// 新增租户套餐
33-
export const createTenantPackageTypeApi = (data: TenantPackageVO) => {
33+
export const createTenantPackageType = (data: TenantPackageVO) => {
3434
return request.post({ url: '/system/tenant-package/create', data })
3535
}
3636

3737
// 修改租户套餐
38-
export const updateTenantPackageTypeApi = (data: TenantPackageVO) => {
38+
export const updateTenantPackageType = (data: TenantPackageVO) => {
3939
return request.put({ url: '/system/tenant-package/update', data })
4040
}
4141

4242
// 删除租户套餐
43-
export const deleteTenantPackageTypeApi = (id: number) => {
43+
export const deleteTenantPackageType = (id: number) => {
4444
return request.delete({ url: '/system/tenant-package/delete?id=' + id })
4545
}
4646
// 获取租户套餐精简信息列表

src/types/auto-components.d.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ declare module '@vue/runtime-core' {
5252
ElForm: typeof import('element-plus/es')['ElForm']
5353
ElFormItem: typeof import('element-plus/es')['ElFormItem']
5454
ElIcon: typeof import('element-plus/es')['ElIcon']
55-
ElImage: typeof import('element-plus/es')['ElImage']
5655
ElImageViewer: typeof import('element-plus/es')['ElImageViewer']
5756
ElInput: typeof import('element-plus/es')['ElInput']
5857
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
@@ -73,10 +72,7 @@ declare module '@vue/runtime-core' {
7372
ElTabPane: typeof import('element-plus/es')['ElTabPane']
7473
ElTabs: typeof import('element-plus/es')['ElTabs']
7574
ElTag: typeof import('element-plus/es')['ElTag']
76-
ElTimeline: typeof import('element-plus/es')['ElTimeline']
77-
ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
7875
ElTooltip: typeof import('element-plus/es')['ElTooltip']
79-
ElTransfer: typeof import('element-plus/es')['ElTransfer']
8076
ElTree: typeof import('element-plus/es')['ElTree']
8177
ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
8278
ElUpload: typeof import('element-plus/es')['ElUpload']

src/views/system/role/MenuPermissionForm.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
show-checkbox
6060
:check-strictly="!checkStrictly"
6161
:props="defaultProps"
62-
:data="dataScopeForm"
62+
:data="treeOptions"
6363
empty-text="加载中,请稍后"
6464
/>
6565
</el-card>

src/views/system/role/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ const openForm = (type: string, id?: number) => {
204204
/** 数据权限操作 */
205205
const menuPermissionFormRef = ref()
206206
const handleScope = async (type: string, row: RoleApi.RoleVO) => {
207-
menuPermissionFormRef.value.openForm(type, row)
207+
menuPermissionFormRef.value.openModal(type, row)
208208
}
209209
210210
/** 删除按钮操作 */
Lines changed: 199 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,199 @@
1+
<template>
2+
<Dialog :title="modelTitle" v-model="modelVisible" width="50%">
3+
<el-form
4+
ref="formRef"
5+
:model="formData"
6+
:rules="formRules"
7+
label-width="80px"
8+
v-loading="formLoading"
9+
>
10+
<el-form-item label="套餐名" prop="name">
11+
<el-input v-model="formData.name" placeholder="请输入套餐名" />
12+
</el-form-item>
13+
<el-form-item label="菜单权限">
14+
<el-card class="cardHeight">
15+
<template #header>
16+
父子联动(选中父节点,自动选择子节点):
17+
<el-switch
18+
v-model="menuCheckStrictly"
19+
inline-prompt
20+
active-text=""
21+
inactive-text=""
22+
/>
23+
全选/全不选:
24+
<el-switch
25+
v-model="treeNodeAll"
26+
inline-prompt
27+
active-text=""
28+
inactive-text=""
29+
@change="handleCheckedTreeNodeAll"
30+
/>
31+
全部展开/折叠:
32+
<el-switch
33+
v-model="menuExpand"
34+
inline-prompt
35+
active-text="展开"
36+
inactive-text="折叠"
37+
@change="handleCheckedTreeExpand"
38+
/>
39+
</template>
40+
<el-tree
41+
ref="treeRef"
42+
node-key="id"
43+
:check-strictly="!menuCheckStrictly"
44+
show-checkbox
45+
:props="defaultProps"
46+
:data="menuOptions as any[]"
47+
empty-text="加载中,请稍候"
48+
/>
49+
</el-card>
50+
</el-form-item>
51+
<el-form-item label="状态" prop="status">
52+
<el-radio-group v-model="formData.status">
53+
<el-radio
54+
v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
55+
:key="dict.value"
56+
:label="parseInt(dict.value)"
57+
>
58+
{{ dict.label }}
59+
</el-radio>
60+
</el-radio-group>
61+
</el-form-item>
62+
<el-form-item label="备注" prop="remark">
63+
<el-input v-model="formData.remark" placeholder="请输入备注" />
64+
</el-form-item>
65+
</el-form>
66+
<template #footer>
67+
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
68+
<el-button @click="modelVisible = false">取 消</el-button>
69+
</template>
70+
</Dialog>
71+
</template>
72+
<script setup lang="ts" name="TenantPackageForm">
73+
import { DICT_TYPE, getDictOptions } from '@/utils/dict'
74+
import { CommonStatusEnum } from '@/utils/constants'
75+
import type { FormRules } from 'element-plus'
76+
import { defaultProps } from '@/utils/tree'
77+
// 业务相关
78+
import * as TenantPackageApi from '@/api/system/tenantPackage'
79+
import { getSimpleMenusList } from '@/api/system/menu'
80+
import { ElTree } from 'element-plus'
81+
import { handleTree } from '@/utils/tree'
82+
83+
const { t } = useI18n() // 国际化
84+
const message = useMessage() // 消息弹窗
85+
const modelVisible = ref(false) // 弹窗的是否展示
86+
const modelTitle = ref('') // 弹窗的标题
87+
const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
88+
const formType = ref('') // 表单的类型:create - 新增;update - 修改
89+
const formData: Record<string, any> = ref<Record<string, any>>({
90+
id: null,
91+
name: null,
92+
remark: null,
93+
menuIds: [],
94+
status: CommonStatusEnum.ENABLE
95+
})
96+
const formRules: FormRules = ref<FormRules>({
97+
name: [{ required: true, message: '套餐名不能为空', trigger: 'blur' }],
98+
status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
99+
menuIds: [{ required: true, message: '关联的菜单编号不能为空', trigger: 'blur' }]
100+
})
101+
const formRef = ref() // 表单 Ref
102+
const menuOptions = ref<any[]>([]) // 树形结构数据
103+
const menuCheckStrictly = ref(false) // 在显示复选框的情况下,是否严格的遵循父子不互相关联的做法,默认为 true
104+
const menuExpand = ref(false) // 展开/折叠
105+
const treeRef = ref<InstanceType<typeof ElTree>>() // 树组件Ref
106+
const treeNodeAll = ref(false) // 全选/全不选
107+
108+
// 全选/全不选
109+
const handleCheckedTreeNodeAll = () => {
110+
treeRef.value!.setCheckedNodes(treeNodeAll.value ? menuOptions.value : [])
111+
}
112+
// 全部(展开/折叠)TODO:for循环全部展开和折叠树组件数据
113+
const handleCheckedTreeExpand = () => {
114+
const nodes = treeRef.value?.store.nodesMap
115+
for (let node in nodes) {
116+
nodes[node].expanded = !nodes[node].expanded
117+
}
118+
}
119+
120+
/** 打开弹窗 */
121+
const open = async (type: string, id?: number) => {
122+
modelVisible.value = true
123+
modelTitle.value = t('action.' + type)
124+
formType.value = type
125+
resetForm()
126+
// 加载Menu列表
127+
menuOptions.value = handleTree(await getSimpleMenusList())
128+
// 修改时,设置数据
129+
if (id) {
130+
formLoading.value = true
131+
try {
132+
const res = await TenantPackageApi.getTenantPackage(id)
133+
// 设置选中
134+
formData.value = res
135+
// 设置选中
136+
res.menuIds?.forEach((item: any) => {
137+
treeRef.value?.setChecked(item, true, false)
138+
})
139+
} finally {
140+
formLoading.value = false
141+
}
142+
}
143+
}
144+
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
145+
146+
/** 提交表单 */
147+
const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调
148+
const submitForm = async () => {
149+
// 校验表单
150+
if (!formRef) return
151+
const valid = await formRef.value.validate()
152+
if (!valid) return
153+
// 提交请求
154+
formLoading.value = true
155+
try {
156+
const data = formData.value as unknown as TenantPackageApi.TenantPackageVO
157+
data.menuIds = [
158+
...(treeRef.value!.getCheckedKeys(false) as unknown as Array<number>),
159+
...(treeRef.value!.getHalfCheckedKeys() as unknown as Array<number>)
160+
]
161+
if (formType.value === 'create') {
162+
await TenantPackageApi.createTenantPackageType(data)
163+
message.success(t('common.createSuccess'))
164+
} else {
165+
await TenantPackageApi.updateTenantPackageType(data)
166+
message.success(t('common.updateSuccess'))
167+
}
168+
modelVisible.value = false
169+
// 发送操作成功的事件
170+
emit('success')
171+
} finally {
172+
formLoading.value = false
173+
}
174+
}
175+
176+
/** 重置表单 */
177+
const resetForm = () => {
178+
formData.value = {
179+
id: null,
180+
name: null,
181+
remark: null,
182+
menuIds: [],
183+
status: CommonStatusEnum.ENABLE
184+
}
185+
treeRef.value?.setCheckedNodes([])
186+
treeNodeAll.value = false
187+
menuExpand.value = false
188+
// 设置为非严格,继续使用半选中
189+
menuCheckStrictly.value = false
190+
formRef.value?.resetFields()
191+
}
192+
</script>
193+
<style lang="scss" scoped>
194+
.cardHeight {
195+
width: 100%;
196+
max-height: 400px;
197+
overflow-y: scroll;
198+
}
199+
</style>

0 commit comments

Comments
 (0)