fix: 警告问题修复
This commit is contained in:
@@ -153,8 +153,8 @@
|
|||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="页面类型">
|
<el-form-item label="页面类型">
|
||||||
<el-radio-group v-model="genConfigFormData.pageType">
|
<el-radio-group v-model="genConfigFormData.pageType">
|
||||||
<el-radio-button label="classic">普通</el-radio-button>
|
<el-radio-button value="classic">普通</el-radio-button>
|
||||||
<el-radio-button label="curd">封装(CURD)</el-radio-button>
|
<el-radio-button value="curd">封装(CURD)</el-radio-button>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
@@ -367,13 +367,13 @@
|
|||||||
<div class="flex-y-center gap-3">
|
<div class="flex-y-center gap-3">
|
||||||
<span class="text-sm color-#909399">预览范围</span>
|
<span class="text-sm color-#909399">预览范围</span>
|
||||||
<el-radio-group v-model="previewScope" size="small">
|
<el-radio-group v-model="previewScope" size="small">
|
||||||
<el-radio-button label="all">全部</el-radio-button>
|
<el-radio-button value="all">全部</el-radio-button>
|
||||||
<el-radio-button label="frontend">前端</el-radio-button>
|
<el-radio-button value="frontend">前端</el-radio-button>
|
||||||
<el-radio-button label="backend">后端</el-radio-button>
|
<el-radio-button value="backend">后端</el-radio-button>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
<span class="ml-3 text-sm color-#909399">类型</span>
|
<span class="ml-3 text-sm color-#909399">类型</span>
|
||||||
<el-checkbox-group v-model="previewTypes" size="small">
|
<el-checkbox-group v-model="previewTypes" size="small">
|
||||||
<el-checkbox-button v-for="t in previewTypeOptions" :key="t" :label="t">
|
<el-checkbox-button v-for="t in previewTypeOptions" :key="t" :value="t">
|
||||||
{{ t }}
|
{{ t }}
|
||||||
</el-checkbox-button>
|
</el-checkbox-button>
|
||||||
</el-checkbox-group>
|
</el-checkbox-group>
|
||||||
@@ -475,16 +475,16 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="写入范围">
|
<el-form-item label="写入范围">
|
||||||
<el-radio-group v-model="writeScope">
|
<el-radio-group v-model="writeScope">
|
||||||
<el-radio-button label="all">全部</el-radio-button>
|
<el-radio-button value="all">全部</el-radio-button>
|
||||||
<el-radio-button label="frontend">仅前端</el-radio-button>
|
<el-radio-button value="frontend">仅前端</el-radio-button>
|
||||||
<el-radio-button label="backend">仅后端</el-radio-button>
|
<el-radio-button value="backend">仅后端</el-radio-button>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="覆盖策略">
|
<el-form-item label="覆盖策略">
|
||||||
<el-radio-group v-model="overwriteMode">
|
<el-radio-group v-model="overwriteMode">
|
||||||
<el-radio-button label="overwrite">覆盖</el-radio-button>
|
<el-radio-button value="overwrite">覆盖</el-radio-button>
|
||||||
<el-radio-button label="skip">跳过已存在</el-radio-button>
|
<el-radio-button value="skip">跳过已存在</el-radio-button>
|
||||||
<el-radio-button label="ifChanged">仅在变更时覆盖</el-radio-button>
|
<el-radio-button value="ifChanged">仅在变更时覆盖</el-radio-button>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|||||||
@@ -359,11 +359,12 @@ function handleOpenDialog(id?: string) {
|
|||||||
if (id) {
|
if (id) {
|
||||||
dialog.title = "修改公告";
|
dialog.title = "修改公告";
|
||||||
NoticeAPI.getFormData(id).then((data) => {
|
NoticeAPI.getFormData(id).then((data) => {
|
||||||
const normalized = {
|
Object.assign(formData, {
|
||||||
...data,
|
...data,
|
||||||
targetUsers: normalizeTargetUsers(data?.targetUsers),
|
targetUsers: normalizeTargetUsers(
|
||||||
};
|
(data as NoticeForm & { targetUserIds?: unknown }).targetUserIds
|
||||||
Object.assign(formData, normalized);
|
),
|
||||||
|
});
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
Object.assign(formData, { level: "L", targetType: 1, targetUsers: [] });
|
Object.assign(formData, { level: "L", targetType: 1, targetUsers: [] });
|
||||||
@@ -392,12 +393,14 @@ function handleSubmit() {
|
|||||||
dataFormRef.value.validate((valid: any) => {
|
dataFormRef.value.validate((valid: any) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
loading.value = true;
|
loading.value = true;
|
||||||
if (formData.targetType !== 2) {
|
const payload = {
|
||||||
formData.targetUsers = [];
|
...formData,
|
||||||
}
|
targetUserIds: formData.targetType === 2 ? (formData.targetUsers ?? []) : [],
|
||||||
|
} as NoticeForm & { targetUserIds: number[] };
|
||||||
|
delete (payload as NoticeForm).targetUsers;
|
||||||
const id = formData.id;
|
const id = formData.id;
|
||||||
if (id) {
|
if (id) {
|
||||||
NoticeAPI.update(id, formData)
|
NoticeAPI.update(id, payload)
|
||||||
.then(() => {
|
.then(() => {
|
||||||
ElMessage.success("修改成功");
|
ElMessage.success("修改成功");
|
||||||
handleCloseDialog();
|
handleCloseDialog();
|
||||||
@@ -405,7 +408,7 @@ function handleSubmit() {
|
|||||||
})
|
})
|
||||||
.finally(() => (loading.value = false));
|
.finally(() => (loading.value = false));
|
||||||
} else {
|
} else {
|
||||||
NoticeAPI.create(formData)
|
NoticeAPI.create(payload)
|
||||||
.then(() => {
|
.then(() => {
|
||||||
ElMessage.success("新增成功");
|
ElMessage.success("新增成功");
|
||||||
handleCloseDialog();
|
handleCloseDialog();
|
||||||
|
|||||||
Reference in New Issue
Block a user