public/FastapiAdmin
1
0
Fork 0
mirror of https://github.com/fastapiadmin/FastapiAdmin.git synced 2026-09-26 22:31:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: 统一状态字段为字符串类型并标准化状态显示

Browse Source 
refactor: 将状态字段从布尔值改为字符串类型'0'和'1'
fix: 修复前端组件中状态显示和判断逻辑
docs: 更新相关字段描述为'0:启用 1:禁用'
style: 统一时间查询字段为created_time和created_id
This commit is contained in:
zhangtao
2025-11-30 09:12:13 +08:00
parent 959eb6f19c
commit 463e2fca23
36 changed files with 215 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/views/module_application/job/components/JobLogDrawer.vue
+5 -9
View File
@@ -140,7 +140,7 @@
<el-table-column label="任务组名" prop="job_group" min-width="120" show-overflow-tooltip />
<el-table-column label="执行状态" prop="status" min-width="100" show-overflow-tooltip>
<template #default="scope">
<el-tag :type="scope.row.status === true ? 'success' : 'danger'">
<el-tag :type="scope.row.status === '0' ? 'success' : 'danger'">
{{ scope.row.status ? "成功" : "失败" }}
</el-tag>
</template>
@@ -320,8 +320,7 @@ const queryFormData = reactive<JobLogPageQuery>({
page_no: 1,
page_size: 10,
status: undefined,
start_time: undefined,
end_time: undefined,
created_time: undefined,
job_id: props.jobId,
});
@@ -339,11 +338,9 @@ const dateRange = ref<[Date, Date] | []>([]);
function handleDateRangeChange(range: [Date, Date]) {
dateRange.value = range;
if (range && range.length === 2) {
queryFormData.start_time = formatToDateTime(range[0]);
queryFormData.end_time = formatToDateTime(range[1]);
queryFormData.created_time = [formatToDateTime(range[0]), formatToDateTime(range[1])];
} else {
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
}
}
@@ -378,8 +375,7 @@ async function handleResetQuery() {
queryFormRef.value.resetFields();
queryFormData.page_no = 1;
queryFormData.status = undefined;
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
dateRange.value = [];
loadingData();
}
frontend/src/views/module_application/job/index.vue
+7 -12
View File
@@ -30,7 +30,7 @@
</el-form-item>
<el-form-item v-if="isExpand" prop="creator" label="创建人">
<UserTableSelect
v-model="queryFormData.creator"
v-model="queryFormData.created_id"
@confirm-click="handleConfirm"
@clear-click="handleQuery"
/>
@@ -199,7 +199,7 @@
</el-table-column>
<el-table-column label="状态" prop="status" min-width="100">
<template #default="scope">
<el-tag :type="scope.row.status === true ? 'success' : 'danger'">
<el-tag :type="scope.row.status === '0' ? 'success' : 'danger'">
{{ scope.row.status === true ? "运行中" : "暂停" }}
</el-tag>
</template>
@@ -657,10 +657,8 @@ const queryFormData = reactive<JobPageQuery>({
page_size: 10,
name: undefined,
status: undefined,
start_time: undefined,
end_time: undefined,
// 创建人
creator: undefined,
created_time: undefined,
created_id: undefined,
});
// 编辑表单
@@ -709,11 +707,9 @@ const dateRange = ref<[Date, Date] | []>([]);
function handleDateRangeChange(range: [Date, Date]) {
dateRange.value = range;
if (range && range.length === 2) {
queryFormData.start_time = formatToDateTime(range[0]);
queryFormData.end_time = formatToDateTime(range[1]);
queryFormData.created_time = [formatToDateTime(range[0]), formatToDateTime(range[1])];
} else {
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
}
}
@@ -753,8 +749,7 @@ async function handleResetQuery() {
queryFormData.page_no = 1;
// 额外清空日期范围与时间查询参数
dateRange.value = [];
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
loadingData();
}
frontend/src/views/module_application/myapp/index.vue
+6 -7
View File
@@ -26,7 +26,7 @@
</el-form-item>
<el-form-item v-if="isExpand" prop="creator" label="创建人">
<UserTableSelect
v-model="queryFormData.creator"
v-model="queryFormData.created_id"
@confirm-click="handleConfirm"
@clear-click="handleQuery"
/>
@@ -209,8 +209,8 @@
<el-form-item label="应用状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :value="true">启用</el-radio>
<el-radio :value="false">停用</el-radio>
<el-radio :value="0">启用</el-radio>
<el-radio :value="1">停用</el-radio>
</el-radio-group>
</el-form-item>
@@ -275,8 +275,7 @@ const queryFormData = reactive<ApplicationPageQuery>({
page_no: 1,
page_size: 12,
name: undefined,
status: undefined,
creator: undefined,
status: undefined, created_id: undefined,
});
// 应用列表数据
@@ -287,7 +286,7 @@ const formData = reactive<ApplicationForm>({
name: "",
access_url: "",
icon_url: "",
status: true,
status: '0',
description: "",
});
@@ -460,7 +459,7 @@ function resetForm() {
name: "",
access_url: "",
icon_url: "",
status: true,
status: '0',
description: "",
});
formRef.value?.resetFields();
frontend/src/views/module_application/workflow/index.vue
+14 -18
View File
@@ -89,10 +89,10 @@
</el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item icon="Check" @click="handleMoreClick(true)">
<el-dropdown-item icon="Check" @click="handleMoreClick('0')">
批量启用
</el-dropdown-item>
<el-dropdown-item icon="CircleClose" @click="handleMoreClick(false)">
<el-dropdown-item icon="CircleClose" @click="handleMoreClick('1')">
批量停用
</el-dropdown-item>
</el-dropdown-menu>
@@ -166,8 +166,8 @@
min-width="80"
>
<template #default="scope">
<el-tag :type="scope.row.status === true ? 'success' : 'danger'">
{{ scope.row.status === true ? "启用" : "停用" }}
<el-tag :type="scope.row.status === '0' ? 'success' : 'danger'">
{{ scope.row.status === '0' ? "启用" : "停用" }}
</el-tag>
</template>
</el-table-column>
@@ -301,8 +301,8 @@
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :value="true">启用</el-radio>
<el-radio :value="false">停用</el-radio>
<el-radio :value="0">启用</el-radio>
<el-radio :value="1">停用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="描述" prop="description">
@@ -377,11 +377,9 @@ const dateRange = ref<[Date, Date] | []>([]);
function handleDateRangeChange(range: [Date, Date]) {
dateRange.value = range;
if (range && range.length === 2) {
queryFormData.start_time = formatToDateTime(range[0]);
queryFormData.end_time = formatToDateTime(range[1]);
queryFormData.created_time = [formatToDateTime(range[0]), formatToDateTime(range[1])];
} else {
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
}
}
@@ -391,15 +389,14 @@ const queryFormData = reactive<DemoPageQuery>({
page_size: 10,
name: undefined,
status: undefined,
start_time: undefined,
end_time: undefined,
created_time: undefined,
});
// 编辑表单
const formData = reactive<DemoForm>({
id: undefined,
name: "",
status: true,
status: '0',
description: undefined,
});
@@ -447,8 +444,7 @@ async function handleResetQuery() {
queryFormData.page_no = 1;
// 重置日期范围选择器
dateRange.value = [];
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
loadingData();
}
@@ -456,7 +452,7 @@ async function handleResetQuery() {
const initialFormData: DemoForm = {
id: undefined,
name: "",
status: true,
status: '0',
description: "",
};
@@ -561,9 +557,9 @@ async function handleDelete(ids: number[]) {
}
// 批量启用/停用
async function handleMoreClick(status: boolean) {
async function handleMoreClick(status: string) {
if (selectIds.value.length) {
ElMessageBox.confirm(`确认${status ? "启用" : "停用"}该项数据?`, "警告", {
ElMessageBox.confirm(`确认${status === "0" ? "启用" : "停用"}该项数据?`, "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",