refactor(setting): 优化系统设置组件的数据处理逻辑
- 将 updateSetting 替换为 updateSettingByKey 方法调用 - 统一设置表单中的 settingKey 字段值 - 重构 watch 数据监听逻辑,增强数据类型检查 - 改进表单初始化和数据回显流程 - 添加对 content 字段的 JSON 解析错误处理 - 标准化各设置组件的表单数据结构 - 优化数组和对象数据的查找匹配逻辑
This commit is contained in:
@@ -86,7 +86,7 @@ import { useThemeStore } from '@/store/modules/theme';
|
||||
import { storeToRefs } from 'pinia';
|
||||
import { FormInstance } from 'ant-design-vue/es/form';
|
||||
import useFormData from '@/utils/use-form-data';
|
||||
import { addSetting, updateSetting } from "@/api/system/setting";
|
||||
import { addSetting, updateSettingByKey } from "@/api/system/setting";
|
||||
import { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
|
||||
import { uploadFile } from "@/api/system/file";
|
||||
import { FILE_SERVER } from "@/config/setting";
|
||||
@@ -116,6 +116,8 @@ const isUpdate = ref(false);
|
||||
const formRef = ref<FormInstance | null>(null);
|
||||
// 表单数据
|
||||
const { form, resetFields, assignFields } = useFormData<Setting>({
|
||||
settingId: undefined,
|
||||
settingKey: settingKey.value,
|
||||
appId: '',
|
||||
appSecret: '',
|
||||
tenantId: localStorage.getItem('TenantId')
|
||||
@@ -169,11 +171,12 @@ const save = () => {
|
||||
.validate()
|
||||
.then(() => {
|
||||
loading.value = true;
|
||||
form.settingKey = settingKey.value;
|
||||
const appForm = {
|
||||
...form,
|
||||
content: JSON.stringify(form)
|
||||
};
|
||||
const saveOrUpdate = isUpdate.value ? updateSetting : addSetting;
|
||||
const saveOrUpdate = isUpdate.value ? updateSettingByKey : addSetting;
|
||||
saveOrUpdate(appForm)
|
||||
.then((msg) => {
|
||||
message.success('保存成功');
|
||||
@@ -189,23 +192,45 @@ const save = () => {
|
||||
watch(
|
||||
() => props.data,
|
||||
(data) => {
|
||||
if(data?.settingId){
|
||||
isUpdate.value = true
|
||||
// 表单赋值
|
||||
if(data.content){
|
||||
const jsonData = JSON.parse(data.content);
|
||||
assignFields(jsonData);
|
||||
}
|
||||
// 其他必要参数
|
||||
form.settingId = data.settingId
|
||||
form.settingKey = data.settingKey
|
||||
} else {
|
||||
// 新增
|
||||
isUpdate.value = false
|
||||
const activeMatch = props.value === settingKey.value;
|
||||
if (!data || typeof data !== 'object') {
|
||||
if (!activeMatch) return;
|
||||
isUpdate.value = false;
|
||||
resetFields();
|
||||
form.settingKey = props.value
|
||||
form.settingId = undefined;
|
||||
form.settingKey = settingKey.value;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
const normalized: any = Array.isArray(data)
|
||||
? data.find((d) => d?.settingKey === settingKey.value) ?? data[0]
|
||||
: (data as any).data && typeof (data as any).data === 'object'
|
||||
? (data as any).data
|
||||
: data;
|
||||
|
||||
let parsedContent: any | undefined;
|
||||
const rawContent = (normalized as any).content;
|
||||
if (rawContent) {
|
||||
if (typeof rawContent === 'string') {
|
||||
try {
|
||||
parsedContent = JSON.parse(rawContent);
|
||||
} catch {
|
||||
parsedContent = undefined;
|
||||
}
|
||||
} else if (typeof rawContent === 'object') {
|
||||
parsedContent = rawContent;
|
||||
}
|
||||
}
|
||||
const contentOrRow = parsedContent ?? normalized;
|
||||
const incomingKey = (contentOrRow as any).settingKey ?? (normalized as any).settingKey;
|
||||
if (!activeMatch && incomingKey !== settingKey.value) return;
|
||||
|
||||
isUpdate.value = true;
|
||||
assignFields(contentOrRow);
|
||||
form.settingId = (normalized as any).settingId;
|
||||
form.settingKey = settingKey.value;
|
||||
},
|
||||
{ immediate: true }
|
||||
);
|
||||
</script>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user