diff --git a/apps/web-antd/src/views/tool/gen/edit-gen.vue b/apps/web-antd/src/views/tool/gen/edit-gen.vue index ee86b700..6045def5 100644 --- a/apps/web-antd/src/views/tool/gen/edit-gen.vue +++ b/apps/web-antd/src/views/tool/gen/edit-gen.vue @@ -22,7 +22,7 @@ const routes = useRoute(); // 获取路由参数 const tableId = routes.params.tableId as string; -const genInfoData = ref(); +const genInfoData = ref(); provide('genInfoData', genInfoData); @@ -30,7 +30,7 @@ onMounted(async () => { const resp = await genInfo(tableId); // 需要做菜单转换 严格相等 才能选中回显 resp.info.parentMenuId = safeParseNumber(resp.info.parentMenuId); - genInfoData.value = resp; + genInfoData.value = resp.info; setTabTitle(`生成配置: ${resp.info.tableName}`); }); diff --git a/apps/web-antd/src/views/tool/gen/edit-steps/basic-setting.vue b/apps/web-antd/src/views/tool/gen/edit-steps/basic-setting.vue index 4414f75e..9345f803 100644 --- a/apps/web-antd/src/views/tool/gen/edit-steps/basic-setting.vue +++ b/apps/web-antd/src/views/tool/gen/edit-steps/basic-setting.vue @@ -16,7 +16,7 @@ import { formSchema } from './basic'; /** * 从父组件注入 */ -const genInfoData = inject('genInfoData') as Ref; +const genInfoData = inject('genInfoData') as Ref; const [BasicForm, formApi] = useVbenForm({ commonConfig: { @@ -99,7 +99,7 @@ async function initMenuSelect() { } onMounted(async () => { - const { info } = genInfoData.value; + const info = genInfoData.value; for (const key in info) { formApi.setFieldValue(key, info[key as keyof typeof info]); } @@ -113,7 +113,7 @@ async function handleNext() { return null; } const data = await formApi.getValues(); - Object.assign(genInfoData.value.info, data); + Object.assign(genInfoData.value, data); toCurrentStep(1); } catch (error) { console.error(error); diff --git a/apps/web-antd/src/views/tool/gen/edit-steps/gen-config.vue b/apps/web-antd/src/views/tool/gen/edit-steps/gen-config.vue index 592a6e60..bfdf983f 100644 --- a/apps/web-antd/src/views/tool/gen/edit-steps/gen-config.vue +++ b/apps/web-antd/src/views/tool/gen/edit-steps/gen-config.vue @@ -4,6 +4,7 @@ import type { GenInfo } from '#/api/tool/gen/model'; import { inject, type Ref, unref } from 'vue'; import { Space, Table } from 'ant-design-vue'; +import { cloneDeep } from 'lodash-es'; import { editSave } from '#/api/tool/gen'; @@ -12,15 +13,16 @@ import { toCurrentStep } from '../mitt'; /** * 从父组件注入 */ -const genInfoData = inject('genInfoData') as Ref; +const genInfoData = inject('genInfoData') as Ref; async function handleSubmit() { try { - const requestData = unref(genInfoData).info; + const requestData = cloneDeep(unref(genInfoData)); // 树表需要添加这个参数 if (requestData && requestData.tplCategory === 'tree') { - const { treeCode, treeName, treeParentCode } = requestData; + const { parentMenuId, treeCode, treeName, treeParentCode } = requestData; requestData.params = { + parentMenuId, treeCode, treeName, treeParentCode, @@ -37,11 +39,6 @@ async function handleSubmit() { column.isQuery = transform(query); column.isRequired = transform(required); }); - // 需要手动添加父级菜单 - requestData.params = { - ...requestData.params, - parentMenuId: requestData.parentMenuId, - }; } await editSave(requestData); // 跳转到成功页面