GTsoft/ruoyi-plus-soybean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复代码生成模块中导入列表Bug，纠正英文语法

Browse Source
This commit is contained in:
AN 2025-05-17 23:59:04 +08:00
parent c76b183108
commit 0c40aa32db
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/locales/langs/en-us.ts
View File

@ -457,7 +457,7 @@ const local: App.I18n.Schema = {
placeholder: { placeholder: {
defaultLeaderPlaceHolder: 'Please select leader', defaultLeaderPlaceHolder: 'Please select leader',
addDataLeaderPlaceHolder: 'Department leader can be selected only when updating', addDataLeaderPlaceHolder: 'Department leader can be selected only when updating',
deptUserIsEmptyLeaderPlaceHolder: 'Current dept no leader' deptUserIsEmptyLeaderPlaceHolder: 'Current dept has no leader'
}, },
addDept: 'Add Department', addDept: 'Add Department',
editDept: 'Edit Department' editDept: 'Edit Department'

36
src/views/tool/gen/modules/gen-table-import-drawer.vue
View File

@ -22,7 +22,7 @@ const emit = defineEmits<Emits>();
const appStore = useAppStore(); const appStore = useAppStore();
const { columns, data, getData, getDataByPage, loading, mobilePagination, searchParams, resetSearchParams } = useTable({ const { columns, data, getData, getDataByPage, loading, mobilePagination, searchParams } = useTable({
apiFn: fetchGetGenDbList, apiFn: fetchGetGenDbList,
immediate: false, immediate: false,
showTotal: true, showTotal: true,
@ -69,31 +69,37 @@ function closeDrawer() {
} }
async function handleSubmit() { async function handleSubmit() {
// request if (checkedRowKeys.value.length > 0) {
const { error } = await fetchImportGenTable(checkedRowKeys.value as string[], searchParams.dataName!); // request
if (error) return; const { error } = await fetchImportGenTable(checkedRowKeys.value as string[], searchParams.dataName!);
window.$message?.success('导入成功'); if (error) return;
window.$message?.success('导入成功');
emit('submitted');
}
closeDrawer(); closeDrawer();
emit('submitted');
} }
const dataNameOptions = ref<CommonType.Option[]>([]); const dataNameOptions = ref<CommonType.Option[]>([]);
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() { async function getDataNames() {
const { error, data: dataNames } = await fetchGetGenDataNames(); const { error, data: dataNames } = await fetchGetGenDataNames();
if (error) return; if (error) return;
dataNameOptions.value = dataNames.map(item => ({ label: item, value: item })); 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) { if (visible.value) {
getDataNames(); await getDataNames();
await handleResetSearchParams();
} }
}); });
</script> </script>
@ -105,7 +111,7 @@ watch(visible, () => {
<GenTableDbSearch <GenTableDbSearch
v-model:model="searchParams" v-model:model="searchParams"
:options="dataNameOptions" :options="dataNameOptions"
@reset="resetSearchParams" @reset="handleResetSearchParams"
@search="getDataByPage" @search="getDataByPage"
/> />
<TableRowCheckAlert v-model:checked-row-keys="checkedRowKeys" class="mb-16px" /> <TableRowCheckAlert v-model:checked-row-keys="checkedRowKeys" class="mb-16px" />

2
src/views/tool/gen/modules/gen-table-operate-drawer.vue
View File

@ -285,7 +285,7 @@ const columns: NaiveUI.TableColumn<Api.Tool.GenTableColumn>[] = [
<template> <template>
<NDrawer v-model:show="visible" display-directive="show" width="100%"> <NDrawer v-model:show="visible" display-directive="show" width="100%">
<NDrawerContent title="导入表" :native-scrollbar="false" closable> <NDrawerContent title="编辑表" :native-scrollbar="false" closable>
<NSpin :show="loading" class="h-full" content-class="h-full"> <NSpin :show="loading" class="h-full" content-class="h-full">
<NTabs v-model:value="tab" type="segment" animated class="h-full" pane-class="h-full"> <NTabs v-model:value="tab" type="segment" animated class="h-full" pane-class="h-full">
<NTabPane name="basic" tab="基本信息" display-directive="show"> <NTabPane name="basic" tab="基本信息" display-directive="show">