refactor: 角色管理 useBeforeCloseDiff
This commit is contained in:
parent
eb9f278e7f
commit
e6dab8300d
@ -1,3 +1,6 @@
|
|||||||
|
<!--
|
||||||
|
TODO: 这个页面要优化逻辑
|
||||||
|
-->
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import type { MenuOption } from '#/api/system/menu/model';
|
import type { MenuOption } from '#/api/system/menu/model';
|
||||||
|
|
||||||
@ -11,6 +14,7 @@ import { useVbenForm } from '#/adapter/form';
|
|||||||
import { menuTreeSelect, roleMenuTreeSelect } from '#/api/system/menu';
|
import { menuTreeSelect, roleMenuTreeSelect } from '#/api/system/menu';
|
||||||
import { roleAdd, roleInfo, roleUpdate } from '#/api/system/role';
|
import { roleAdd, roleInfo, roleUpdate } from '#/api/system/role';
|
||||||
import { MenuSelectTable } from '#/components/tree';
|
import { MenuSelectTable } from '#/components/tree';
|
||||||
|
import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
|
||||||
|
|
||||||
import { drawerSchema } from './data';
|
import { drawerSchema } from './data';
|
||||||
|
|
||||||
@ -62,14 +66,31 @@ async function setupMenuTree(id?: number | string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function customFormValueGetter() {
|
||||||
|
const v = await defaultFormValueGetter(formApi)();
|
||||||
|
// 获取勾选信息
|
||||||
|
const menuIds = menuSelectRef.value?.getCheckedKeys?.() ?? [];
|
||||||
|
const mixStr = v + menuIds.join(',');
|
||||||
|
return mixStr;
|
||||||
|
}
|
||||||
|
|
||||||
|
const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
|
||||||
|
{
|
||||||
|
initializedGetter: customFormValueGetter,
|
||||||
|
currentGetter: customFormValueGetter,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
const [BasicDrawer, drawerApi] = useVbenDrawer({
|
const [BasicDrawer, drawerApi] = useVbenDrawer({
|
||||||
onCancel: handleCancel,
|
onBeforeClose,
|
||||||
|
onClosed: handleClosed,
|
||||||
onConfirm: handleConfirm,
|
onConfirm: handleConfirm,
|
||||||
async onOpenChange(isOpen) {
|
async onOpenChange(isOpen) {
|
||||||
if (!isOpen) {
|
if (!isOpen) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
drawerApi.drawerLoading(true);
|
drawerApi.drawerLoading(true);
|
||||||
|
|
||||||
const { id } = drawerApi.getData() as { id?: number | string };
|
const { id } = drawerApi.getData() as { id?: number | string };
|
||||||
isUpdate.value = !!id;
|
isUpdate.value = !!id;
|
||||||
|
|
||||||
@ -79,6 +100,7 @@ const [BasicDrawer, drawerApi] = useVbenDrawer({
|
|||||||
}
|
}
|
||||||
// init菜单 注意顺序要放在赋值record之后 内部watch会依赖record
|
// init菜单 注意顺序要放在赋值record之后 内部watch会依赖record
|
||||||
await setupMenuTree(id);
|
await setupMenuTree(id);
|
||||||
|
await markInitialized();
|
||||||
|
|
||||||
drawerApi.drawerLoading(false);
|
drawerApi.drawerLoading(false);
|
||||||
},
|
},
|
||||||
@ -87,7 +109,8 @@ const [BasicDrawer, drawerApi] = useVbenDrawer({
|
|||||||
const menuSelectRef = ref<InstanceType<typeof MenuSelectTable>>();
|
const menuSelectRef = ref<InstanceType<typeof MenuSelectTable>>();
|
||||||
async function handleConfirm() {
|
async function handleConfirm() {
|
||||||
try {
|
try {
|
||||||
drawerApi.drawerLoading(true);
|
drawerApi.lock(true);
|
||||||
|
|
||||||
const { valid } = await formApi.validate();
|
const { valid } = await formApi.validate();
|
||||||
if (!valid) {
|
if (!valid) {
|
||||||
return;
|
return;
|
||||||
@ -99,17 +122,18 @@ async function handleConfirm() {
|
|||||||
data.menuIds = menuIds;
|
data.menuIds = menuIds;
|
||||||
await (isUpdate.value ? roleUpdate(data) : roleAdd(data));
|
await (isUpdate.value ? roleUpdate(data) : roleAdd(data));
|
||||||
emit('reload');
|
emit('reload');
|
||||||
await handleCancel();
|
resetInitialized();
|
||||||
|
drawerApi.close();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
} finally {
|
} finally {
|
||||||
drawerApi.drawerLoading(false);
|
drawerApi.lock(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function handleCancel() {
|
async function handleClosed() {
|
||||||
drawerApi.close();
|
|
||||||
await formApi.resetForm();
|
await formApi.resetForm();
|
||||||
|
resetInitialized();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -122,7 +146,7 @@ function handleMenuCheckStrictlyChange(value: boolean) {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<BasicDrawer :close-on-click-modal="false" :title="title" class="w-[800px]">
|
<BasicDrawer :title="title" class="w-[800px]">
|
||||||
<BasicForm>
|
<BasicForm>
|
||||||
<template #menuIds="slotProps">
|
<template #menuIds="slotProps">
|
||||||
<div class="h-[600px] w-full">
|
<div class="h-[600px] w-full">
|
||||||
|
Loading…
Reference in New Issue
Block a user