diff --git a/apps/web-antd/src/views/infra/codegen/data.ts b/apps/web-antd/src/views/infra/codegen/data.ts index 1b1a96e11..660b99d51 100644 --- a/apps/web-antd/src/views/infra/codegen/data.ts +++ b/apps/web-antd/src/views/infra/codegen/data.ts @@ -387,17 +387,17 @@ export function useGridFormSchema(): VbenFormSchema[] { ]; } -const dataSourceConfigList = await getDataSourceConfigList(); /** 列表的字段 */ export function useGridColumns( onActionClick: OnActionClickFn, + getDataSourceConfigName?: (dataSourceConfigId: number) => string | undefined, ): VxeTableGridOptions['columns'] { return [ { field: 'dataSourceConfigId', title: '数据源', minWidth: 120, - formatter: ({ cellValue }) => dataSourceConfigList.find((item) => item.id === cellValue)?.name || '', + formatter: (row) => getDataSourceConfigName?.(row.cellValue) || '-', }, { field: 'tableName', diff --git a/apps/web-antd/src/views/infra/codegen/index.vue b/apps/web-antd/src/views/infra/codegen/index.vue index 51ea81bed..e10d8391a 100644 --- a/apps/web-antd/src/views/infra/codegen/index.vue +++ b/apps/web-antd/src/views/infra/codegen/index.vue @@ -14,7 +14,7 @@ import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { deleteCodegenTable, downloadCodegen, getCodegenTablePage, syncCodegenFromDB } from '#/api/infra/codegen'; import { getDataSourceConfigList } from '#/api/infra/data-source-config'; import { $t } from '#/locales'; -import { computed, ref } from 'vue'; +import { ref } from 'vue'; import { useGridColumns, useGridFormSchema } from './data'; @@ -22,9 +22,11 @@ import { useRouter } from 'vue-router'; const router = useRouter(); const dataSourceConfigList = ref([]); -const getDataSourceConfigName = computed( - () => (cellValue: number) => dataSourceConfigList.value.find((item) => item.id === cellValue)?.name || '', -); + +/** 获取数据源名称 */ +const getDataSourceConfigName = (dataSourceConfigId: number) => { + return dataSourceConfigList.value.find((item) => item.id === dataSourceConfigId)?.name; +}; const [ImportModal, importModalApi] = useVbenModal({ connectedComponent: ImportTable, diff --git a/apps/web-antd/src/views/infra/demo/demo01/modules/form.vue b/apps/web-antd/src/views/infra/demo/demo01/modules/form.vue index 677992dd8..1965f1bae 100644 --- a/apps/web-antd/src/views/infra/demo/demo01/modules/form.vue +++ b/apps/web-antd/src/views/infra/demo/demo01/modules/form.vue @@ -47,6 +47,7 @@ const [Modal, modalApi] = useVbenModal({ }, async onOpenChange(isOpen: boolean) { if (!isOpen) { + // TODO @puhui999:这里置空的原因是啥? formData.value = undefined; return; }