rogee/quyun-v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 添加用户和租户状态管理功能，包括状态列表和状态更新接口

Browse Source
This commit is contained in:
Rogee
2025-12-17 13:54:52 +08:00
parent 14842d989c
commit d5de64d6cf
14 changed files with 558 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/superadmin/dist/index.html vendored
View File

@@ -7,8 +7,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Sakai Vue</title>
<link href="https://fonts.cdnfonts.com/css/lato" rel="stylesheet">
<script type="module" crossorigin src="./assets/index-BRu67wro.js"></script>
<link rel="stylesheet" crossorigin href="./assets/index-BMyA_4RT.css">
<script type="module" crossorigin src="./assets/index-VWI_AnCM.js"></script>
<link rel="stylesheet" crossorigin href="./assets/index-B0E0aOXs.css">
</head>
<body>

10
frontend/superadmin/src/service/TenantService.js
View File

@@ -27,5 +27,15 @@ export const TenantService = {
method: 'PATCH',
body: { duration }
});
},
async getTenantStatuses() {
const data = await requestJson('/super/v1/tenants/statuses');
return Array.isArray(data) ? data : [];
},
async updateTenantStatus({ tenantID, status }) {
return requestJson(`/super/v1/tenants/${tenantID}/status`, {
method: 'PATCH',
body: { status }
});
}
};

10
frontend/superadmin/src/service/UserService.js
View File

@@ -21,5 +21,15 @@ export const UserService = {
total: data?.total ?? 0,
items: normalizeItems(data?.items)
};
},
async getUserStatuses() {
const data = await requestJson('/super/v1/users/statuses');
return Array.isArray(data) ? data : [];
},
async updateUserStatus({ userID, status }) {
return requestJson(`/super/v1/users/${userID}/status`, {
method: 'PATCH',
body: { status }
});
}
};

70
frontend/superadmin/src/views/superadmin/Tenants.vue
View File

@@ -124,6 +124,55 @@ function openRenewDialog(item) {
renewDialogVisible.value = true;
}
const tenantStatusDialogVisible = ref(false);
const tenantStatusLoading = ref(false);
const tenantStatusOptions = ref([]);
const tenantStatusTenant = ref(null);
const tenantStatusValue = ref(null);
async function ensureTenantStatusOptionsLoaded() {
if (tenantStatusOptions.value.length > 0) return;
const list = await TenantService.getTenantStatuses();
tenantStatusOptions.value = (list || [])
.map((kv) => ({
label: kv?.value ?? kv?.key ?? '-',
value: kv?.key ?? ''
}))
.filter((item) => item.value);
}
async function openTenantStatusDialog(tenant) {
tenantStatusTenant.value = tenant;
tenantStatusValue.value = tenant?.status ?? null;
tenantStatusDialogVisible.value = true;
tenantStatusLoading.value = true;
try {
await ensureTenantStatusOptionsLoaded();
} catch (error) {
toast.add({ severity: 'error', summary: '加载失败', detail: error?.message || '无法加载租户状态列表', life: 4000 });
} finally {
tenantStatusLoading.value = false;
}
}
async function confirmUpdateTenantStatus() {
const tenantID = tenantStatusTenant.value?.id;
if (!tenantID || !tenantStatusValue.value) return;
tenantStatusLoading.value = true;
try {
await TenantService.updateTenantStatus({ tenantID, status: tenantStatusValue.value });
toast.add({ severity: 'success', summary: '更新成功', detail: `TenantID: ${tenantID}`, life: 3000 });
tenantStatusDialogVisible.value = false;
await loadTenants();
} catch (error) {
toast.add({ severity: 'error', summary: '更新失败', detail: error?.message || '无法更新租户状态', life: 4000 });
} finally {
tenantStatusLoading.value = false;
}
}
async function confirmRenew() {
const tenantID = renewTenant.value?.id;
if (!tenantID) return;
@@ -192,7 +241,7 @@ onMounted(() => {
<Column field="name" header="名称" sortable style="min-width: 14rem" />
<Column field="status_description" header="状态" style="min-width: 10rem">
<template #body="{ data }">
<Tag :value="data.status_description || '-'" :severity="getStatusSeverity(data.status)" />
<Tag :value="data.status_description || data.status || '-'" :severity="getStatusSeverity(data.status)" class="cursor-pointer" @click="openTenantStatusDialog(data)" />
</template>
</Column>
<Column field="user_count" header="用户数" sortable style="min-width: 8rem" />
@@ -240,5 +289,24 @@ onMounted(() => {
<Button label="确认续期" icon="pi pi-check" @click="confirmRenew" :loading="renewing" />
</template>
</Dialog>
<Dialog v-model:visible="tenantStatusDialogVisible" :modal="true" :style="{ width: '420px' }">
<template #header>
<div class="flex items-center gap-2">
<span class="font-medium">更新租户状态</span>
<span class="text-muted-color truncate max-w-[240px]">{{ tenantStatusTenant?.name ?? '-' }}</span>
</div>
</template>
<div class="flex flex-col gap-4">
<div>
<label class="block font-medium mb-2">租户状态</label>
<Select v-model="tenantStatusValue" :options="tenantStatusOptions" optionLabel="label" optionValue="value" placeholder="选择状态" :disabled="tenantStatusLoading" fluid />
</div>
</div>
<template #footer>
<Button label="取消" icon="pi pi-times" text @click="tenantStatusDialogVisible = false" :disabled="tenantStatusLoading" />
<Button label="确认" icon="pi pi-check" @click="confirmUpdateTenantStatus" :loading="tenantStatusLoading" :disabled="!tenantStatusValue" />
</template>
</Dialog>
</div>
</template>

70
frontend/superadmin/src/views/superadmin/Users.vue
View File

@@ -41,6 +41,55 @@ function getStatusSeverity(status) {
}
}
const statusDialogVisible = ref(false);
const statusLoading = ref(false);
const statusOptions = ref([]);
const statusUser = ref(null);
const statusValue = ref(null);
async function ensureStatusOptionsLoaded() {
if (statusOptions.value.length > 0) return;
const list = await UserService.getUserStatuses();
statusOptions.value = (list || [])
.map((kv) => ({
label: kv?.value ?? kv?.key ?? '-',
value: kv?.key ?? ''
}))
.filter((item) => item.value);
}
async function openStatusDialog(user) {
statusUser.value = user;
statusValue.value = user?.status ?? null;
statusDialogVisible.value = true;
statusLoading.value = true;
try {
await ensureStatusOptionsLoaded();
} catch (error) {
toast.add({ severity: 'error', summary: '加载失败', detail: error?.message || '无法加载用户状态列表', life: 4000 });
} finally {
statusLoading.value = false;
}
}
async function confirmUpdateStatus() {
const userID = statusUser.value?.id;
if (!userID || !statusValue.value) return;
statusLoading.value = true;
try {
await UserService.updateUserStatus({ userID, status: statusValue.value });
toast.add({ severity: 'success', summary: '更新成功', detail: `用户ID: ${userID}`, life: 3000 });
statusDialogVisible.value = false;
await loadUsers();
} catch (error) {
toast.add({ severity: 'error', summary: '更新失败', detail: error?.message || '无法更新用户状态', life: 4000 });
} finally {
statusLoading.value = false;
}
}
async function loadUsers() {
loading.value = true;
try {
@@ -144,7 +193,7 @@ onMounted(() => {
<Column field="username" header="用户名" sortable style="min-width: 14rem" />
<Column field="status" header="状态" sortable style="min-width: 10rem">
<template #body="{ data }">
<Tag :value="data.status_description || '-'" :severity="getStatusSeverity(data.status)" />
<Tag :value="data.status_description || data.status || '-'" :severity="getStatusSeverity(data.status)" class="cursor-pointer" @click="openStatusDialog(data)" />
</template>
</Column>
<Column field="roles" header="角色" style="min-width: 16rem">
@@ -172,5 +221,24 @@ onMounted(() => {
</Column>
</DataTable>
</div>
<Dialog v-model:visible="statusDialogVisible" :modal="true" :style="{ width: '420px' }">
<template #header>
<div class="flex items-center gap-2">
<span class="font-medium">更新用户状态</span>
<span class="text-muted-color truncate max-w-[240px]">{{ statusUser?.username ?? '-' }}</span>
</div>
</template>
<div class="flex flex-col gap-4">
<div>
<label class="block font-medium mb-2">用户状态</label>
<Select v-model="statusValue" :options="statusOptions" optionLabel="label" optionValue="value" placeholder="选择状态" :disabled="statusLoading" fluid />
</div>
</div>
<template #footer>
<Button label="取消" icon="pi pi-times" text @click="statusDialogVisible = false" :disabled="statusLoading" />
<Button label="确认" icon="pi pi-check" @click="confirmUpdateStatus" :loading="statusLoading" :disabled="!statusValue" />
</template>
</Dialog>
</div>
</template>