diff --git a/apps/web-antd/src/views/system/config/config-modal.vue b/apps/web-antd/src/views/system/config/config-modal.vue index d0dab65e..523ced03 100644 --- a/apps/web-antd/src/views/system/config/config-modal.vue +++ b/apps/web-antd/src/views/system/config/config-modal.vue @@ -11,11 +11,6 @@ import { modalSchema } from './data'; const emit = defineEmits<{ reload: [] }>(); -interface ModalProps { - update: boolean; - id: number | string; -} - const isUpdate = ref(false); const title = computed(() => { return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add'); @@ -38,14 +33,17 @@ const [BasicModal, modalApi] = useVbenModal({ return null; } modalApi.modalLoading(true); - const { id, update } = modalApi.getData() as ModalProps; - isUpdate.value = update; - if (update && id) { + + const { id } = modalApi.getData() as { id?: number | string }; + isUpdate.value = !!id; + + if (isUpdate.value && id) { const record = await configInfo(id); for (const key in record) { await formApi.setFieldValue(key, record[key as keyof typeof record]); } } + modalApi.modalLoading(false); }, }); diff --git a/apps/web-antd/src/views/system/config/index.vue b/apps/web-antd/src/views/system/config/index.vue index fe8d8cd0..1b551558 100644 --- a/apps/web-antd/src/views/system/config/index.vue +++ b/apps/web-antd/src/views/system/config/index.vue @@ -22,12 +22,12 @@ const [ConfigModal, modalApi] = useVbenModal({ }); function handleAdd() { - modalApi.setData({ update: false }); + modalApi.setData({}); modalApi.open(); } async function handleEdit(record: Recordable) { - modalApi.setData({ id: record.configId, update: true }); + modalApi.setData({ id: record.configId }); modalApi.open(); }