refactor: 角色权限 useBeforeCloseDiff

This commit is contained in:
dap 2025-04-08 11:02:36 +08:00
parent ef390ae636
commit 133abe9ded

View File

@ -9,6 +9,7 @@ import { cloneDeep } from '@vben/utils';
import { useVbenForm } from '#/adapter/form'; import { useVbenForm } from '#/adapter/form';
import { roleDataScope, roleDeptTree, roleInfo } from '#/api/system/role'; import { roleDataScope, roleDeptTree, roleInfo } from '#/api/system/role';
import { TreeSelectPanel } from '#/components/tree'; import { TreeSelectPanel } from '#/components/tree';
import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
import { authModalSchemas } from './data'; import { authModalSchemas } from './data';
@ -33,9 +34,25 @@ async function setupDeptTree(id: number | string) {
deptTree.value = resp.depts; deptTree.value = resp.depts;
} }
async function customFormValueGetter() {
const v = await defaultFormValueGetter(formApi)();
//
const menuIds = deptSelectRef.value?.[0]?.getCheckedKeys() ?? [];
const mixStr = v + menuIds.join(',');
return mixStr;
}
const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
{
initializedGetter: customFormValueGetter,
currentGetter: customFormValueGetter,
},
);
const [BasicModal, modalApi] = useVbenModal({ const [BasicModal, modalApi] = useVbenModal({
fullscreenButton: false, fullscreenButton: false,
onCancel: handleCancel, onBeforeClose,
onCancel: handleClosed,
onConfirm: handleConfirm, onConfirm: handleConfirm,
onOpenChange: async (isOpen) => { onOpenChange: async (isOpen) => {
if (!isOpen) { if (!isOpen) {
@ -48,6 +65,7 @@ const [BasicModal, modalApi] = useVbenModal({
setupDeptTree(id); setupDeptTree(id);
const record = await roleInfo(id); const record = await roleInfo(id);
await formApi.setValues(record); await formApi.setValues(record);
markInitialized();
modalApi.modalLoading(false); modalApi.modalLoading(false);
}, },
@ -60,7 +78,7 @@ const deptSelectRef = ref();
async function handleConfirm() { async function handleConfirm() {
try { try {
modalApi.modalLoading(true); modalApi.lock(true);
const { valid } = await formApi.validate(); const { valid } = await formApi.validate();
if (!valid) { if (!valid) {
return; return;
@ -75,18 +93,19 @@ async function handleConfirm() {
data.deptIds = []; data.deptIds = [];
} }
await roleDataScope(data); await roleDataScope(data);
resetInitialized();
emit('reload'); emit('reload');
await handleCancel(); modalApi.close();
} catch (error) { } catch (error) {
console.error(error); console.error(error);
} finally { } finally {
modalApi.modalLoading(false); modalApi.lock(false);
} }
} }
async function handleCancel() { async function handleClosed() {
modalApi.close();
await formApi.resetForm(); await formApi.resetForm();
resetInitialized();
} }
/** /**
@ -99,11 +118,7 @@ function handleCheckStrictlyChange(value: boolean) {
</script> </script>
<template> <template>
<BasicModal <BasicModal class="min-h-[600px] w-[550px]" title="分配权限">
:close-on-click-modal="false"
class="min-h-[600px] w-[550px]"
title="分配权限"
>
<BasicForm> <BasicForm>
<template #deptIds="slotProps"> <template #deptIds="slotProps">
<TreeSelectPanel <TreeSelectPanel