From 0c40aa32db72ddd9c41043045ce3bd22efce1898 Mon Sep 17 00:00:00 2001 From: AN <1983933789@qq.com> Date: Sat, 17 May 2025 23:59:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A8=A1=E5=9D=97=E4=B8=AD=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=88=97=E8=A1=A8Bug=EF=BC=8C=E7=BA=A0=E6=AD=A3=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E8=AF=AD=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/langs/en-us.ts | 2 +- .../gen/modules/gen-table-import-drawer.vue | 36 +++++++++++-------- .../gen/modules/gen-table-operate-drawer.vue | 2 +- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts index f7cd578a..880f0798 100644 --- a/src/locales/langs/en-us.ts +++ b/src/locales/langs/en-us.ts @@ -457,7 +457,7 @@ const local: App.I18n.Schema = { placeholder: { defaultLeaderPlaceHolder: 'Please select leader', addDataLeaderPlaceHolder: 'Department leader can be selected only when updating', - deptUserIsEmptyLeaderPlaceHolder: 'Current dept no leader' + deptUserIsEmptyLeaderPlaceHolder: 'Current dept has no leader' }, addDept: 'Add Department', editDept: 'Edit Department' diff --git a/src/views/tool/gen/modules/gen-table-import-drawer.vue b/src/views/tool/gen/modules/gen-table-import-drawer.vue index 2305c58e..60dc9626 100644 --- a/src/views/tool/gen/modules/gen-table-import-drawer.vue +++ b/src/views/tool/gen/modules/gen-table-import-drawer.vue @@ -22,7 +22,7 @@ const emit = defineEmits(); const appStore = useAppStore(); -const { columns, data, getData, getDataByPage, loading, mobilePagination, searchParams, resetSearchParams } = useTable({ +const { columns, data, getData, getDataByPage, loading, mobilePagination, searchParams } = useTable({ apiFn: fetchGetGenDbList, immediate: false, showTotal: true, @@ -69,31 +69,37 @@ function closeDrawer() { } async function handleSubmit() { - // request - const { error } = await fetchImportGenTable(checkedRowKeys.value as string[], searchParams.dataName!); - if (error) return; - window.$message?.success('导入成功'); - + if (checkedRowKeys.value.length > 0) { + // request + const { error } = await fetchImportGenTable(checkedRowKeys.value as string[], searchParams.dataName!); + if (error) return; + window.$message?.success('导入成功'); + emit('submitted'); + } closeDrawer(); - emit('submitted'); } const dataNameOptions = ref([]); +async function handleResetSearchParams() { + searchParams.dataName = dataNameOptions.value.length ? dataNameOptions.value[0].value : null; + searchParams.tableName = null; + searchParams.tableComment = null; + data.value = []; + checkedRowKeys.value = []; + await getDataByPage(); +} + async function getDataNames() { const { error, data: dataNames } = await fetchGetGenDataNames(); if (error) return; dataNameOptions.value = dataNames.map(item => ({ label: item, value: item })); - - resetSearchParams(); - searchParams.dataName = dataNameOptions.value.length ? dataNameOptions.value[0].value : null; - data.value = []; - checkedRowKeys.value = []; } -watch(visible, () => { +watch(visible, async () => { if (visible.value) { - getDataNames(); + await getDataNames(); + await handleResetSearchParams(); } }); @@ -105,7 +111,7 @@ watch(visible, () => { diff --git a/src/views/tool/gen/modules/gen-table-operate-drawer.vue b/src/views/tool/gen/modules/gen-table-operate-drawer.vue index 0e583cd8..65eb58ba 100644 --- a/src/views/tool/gen/modules/gen-table-operate-drawer.vue +++ b/src/views/tool/gen/modules/gen-table-operate-drawer.vue @@ -285,7 +285,7 @@ const columns: NaiveUI.TableColumn[] = [