reactor:【infra 基础设施】codegen 进一步统一代码风格(50%)
parent
08b4176fb3
commit
044db12224
|
@ -71,7 +71,7 @@ export namespace InfraCodegenApi {
|
|||
}
|
||||
|
||||
/** 创建代码生成请求 */
|
||||
export interface CodegenCreateListReq {
|
||||
export interface CodegenCreateListReqVO {
|
||||
dataSourceConfigId?: number;
|
||||
tableNames: string[];
|
||||
}
|
||||
|
@ -136,7 +136,7 @@ export function getSchemaTableList(params: any) {
|
|||
}
|
||||
|
||||
/** 基于数据库的表结构,创建代码生成器的表定义 */
|
||||
export function createCodegenList(data: InfraCodegenApi.CodegenCreateListReq) {
|
||||
export function createCodegenList(data: InfraCodegenApi.CodegenCreateListReqVO) {
|
||||
return requestClient.post('/infra/codegen/create-list', data);
|
||||
}
|
||||
|
||||
|
|
|
@ -61,7 +61,7 @@ async function submitForm() {
|
|||
// 提交表单
|
||||
const hideLoading = message.loading({
|
||||
content: $t('ui.actionMessage.updating'),
|
||||
key: 'action_process_msg',
|
||||
duration: 0,
|
||||
});
|
||||
try {
|
||||
// 拼接相关信息
|
||||
|
@ -73,10 +73,7 @@ async function submitForm() {
|
|||
columns,
|
||||
});
|
||||
// 关闭并提示
|
||||
message.success({
|
||||
content: $t('ui.actionMessage.operationSuccess'),
|
||||
key: 'action_key_msg',
|
||||
});
|
||||
message.success($t('ui.actionMessage.operationSuccess'));
|
||||
close();
|
||||
} catch (error) {
|
||||
console.error('保存失败', error);
|
||||
|
@ -84,8 +81,9 @@ async function submitForm() {
|
|||
hideLoading();
|
||||
}
|
||||
}
|
||||
const tabs = useTabs();
|
||||
|
||||
/** 返回列表 */
|
||||
const tabs = useTabs();
|
||||
function close() {
|
||||
tabs.closeCurrentTab();
|
||||
router.push('/infra/codegen');
|
||||
|
|
|
@ -73,7 +73,6 @@ async function handleDelete(row: InfraCodegenApi.CodegenTable) {
|
|||
const hideLoading = message.loading({
|
||||
content: $t('ui.actionMessage.deleting', [row.tableName]),
|
||||
duration: 0,
|
||||
key: 'action_process_msg',
|
||||
});
|
||||
try {
|
||||
await deleteCodegenTable(row.id);
|
||||
|
@ -98,7 +97,6 @@ async function handleDeleteBatch() {
|
|||
const hideLoading = message.loading({
|
||||
content: $t('ui.actionMessage.deleting'),
|
||||
duration: 0,
|
||||
key: 'action_process_msg',
|
||||
});
|
||||
try {
|
||||
await deleteCodegenTableList(checkedIds.value);
|
||||
|
@ -114,14 +112,11 @@ async function handleDeleteBatch() {
|
|||
async function handleSync(row: InfraCodegenApi.CodegenTable) {
|
||||
const hideLoading = message.loading({
|
||||
content: $t('ui.actionMessage.updating', [row.tableName]),
|
||||
key: 'action_key_msg',
|
||||
duration: 0,
|
||||
});
|
||||
try {
|
||||
await syncCodegenFromDB(row.id);
|
||||
message.success({
|
||||
content: $t('ui.actionMessage.updateSuccess', [row.tableName]),
|
||||
key: 'action_key_msg',
|
||||
});
|
||||
message.success($t('ui.actionMessage.updateSuccess', [row.tableName]));
|
||||
onRefresh();
|
||||
} finally {
|
||||
hideLoading();
|
||||
|
@ -132,7 +127,7 @@ async function handleSync(row: InfraCodegenApi.CodegenTable) {
|
|||
async function handleGenerate(row: InfraCodegenApi.CodegenTable) {
|
||||
const hideLoading = message.loading({
|
||||
content: '正在生成代码...',
|
||||
key: 'action_key_msg',
|
||||
duration: 0,
|
||||
});
|
||||
try {
|
||||
const res = await downloadCodegen(row.id);
|
||||
|
@ -143,10 +138,7 @@ async function handleGenerate(row: InfraCodegenApi.CodegenTable) {
|
|||
link.download = `codegen-${row.className}.zip`;
|
||||
link.click();
|
||||
window.URL.revokeObjectURL(url);
|
||||
message.success({
|
||||
content: '代码生成成功',
|
||||
key: 'action_key_msg',
|
||||
});
|
||||
message.success('代码生成成功');
|
||||
} finally {
|
||||
hideLoading();
|
||||
}
|
||||
|
@ -187,6 +179,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
|
|||
});
|
||||
|
||||
/** 获取数据源配置列表 */
|
||||
// TODO @芋艿:这种场景的最佳实践;
|
||||
async function initDataSourceConfig() {
|
||||
try {
|
||||
dataSourceConfigList.value = await getDataSourceConfigList();
|
||||
|
|
|
@ -25,6 +25,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
|
|||
keepSource: true,
|
||||
rowConfig: {
|
||||
keyField: 'id',
|
||||
isHover: true,
|
||||
},
|
||||
pagerConfig: {
|
||||
enabled: false,
|
||||
|
|
|
@ -21,7 +21,7 @@ const emit = defineEmits<{
|
|||
(e: 'success'): void;
|
||||
}>();
|
||||
|
||||
const formData = reactive<InfraCodegenApi.CodegenCreateListReq>({
|
||||
const formData = reactive<InfraCodegenApi.CodegenCreateListReqVO>({
|
||||
dataSourceConfigId: 0,
|
||||
tableNames: [], // 已选择的表列表
|
||||
});
|
||||
|
@ -53,6 +53,7 @@ const [Grid] = useVbenVxeGrid({
|
|||
},
|
||||
rowConfig: {
|
||||
keyField: 'name',
|
||||
isHover: true,
|
||||
},
|
||||
toolbarConfig: {
|
||||
enabled: false,
|
||||
|
@ -96,17 +97,14 @@ const [Modal, modalApi] = useVbenModal({
|
|||
// 2. 提交请求
|
||||
const hideLoading = message.loading({
|
||||
content: '导入中...',
|
||||
key: 'action_key_msg',
|
||||
duration: 0,
|
||||
});
|
||||
try {
|
||||
await createCodegenList(formData);
|
||||
// 关闭并提示
|
||||
await modalApi.close();
|
||||
emit('success');
|
||||
message.success({
|
||||
content: $t('ui.actionMessage.operationSuccess'),
|
||||
key: 'action_key_msg',
|
||||
});
|
||||
message.success($t('ui.actionMessage.operationSuccess'));
|
||||
} finally {
|
||||
hideLoading();
|
||||
modalApi.unlock();
|
||||
|
|
|
@ -86,19 +86,23 @@ async function copyCode() {
|
|||
|
||||
/** 文件节点点击事件 */
|
||||
function handleNodeClick(_: any[], e: any) {
|
||||
if (!e.node.isLeaf) return;
|
||||
if (!e.node.isLeaf) {
|
||||
return;
|
||||
}
|
||||
|
||||
activeKey.value = e.node.key;
|
||||
const file = previewFiles.value.find((item) => {
|
||||
const list = activeKey.value.split('.');
|
||||
// 特殊处理-包合并
|
||||
// 特殊处理 - 包合并
|
||||
if (list.length > 2) {
|
||||
const lang = list.pop();
|
||||
return item.filePath === `${list.join('/')}.${lang}`;
|
||||
}
|
||||
return item.filePath === activeKey.value;
|
||||
});
|
||||
if (!file) return;
|
||||
if (!file) {
|
||||
return;
|
||||
}
|
||||
|
||||
const lang = file.filePath.split('.').pop() || '';
|
||||
setCodeMap(activeKey.value, lang, file.code);
|
||||
|
@ -119,7 +123,7 @@ function handleFiles(data: InfraCodegenApi.CodegenPreview[]): FileNode[] {
|
|||
const path = paths[cursor] || '';
|
||||
const oldFullPath = fullPath;
|
||||
|
||||
// 处理Java包路径特殊情况
|
||||
// 处理 Java 包路径特殊情况
|
||||
if (path === 'java' && cursor + 1 < paths.length) {
|
||||
fullPath = fullPath ? `${fullPath}/${path}` : path;
|
||||
cursor++;
|
||||
|
@ -202,7 +206,9 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
|
||||
const row = modalApi.getData<InfraCodegenApi.CodegenTable>();
|
||||
if (!row) return;
|
||||
if (!row) {
|
||||
return;
|
||||
}
|
||||
|
||||
// 加载预览数据
|
||||
loading.value = true;
|
||||
|
|
|
@ -8,15 +8,14 @@ import type { SystemMenuApi } from '#/api/system/menu';
|
|||
import { h } from 'vue';
|
||||
|
||||
import { useAccess } from '@vben/access';
|
||||
import { DICT_TYPE } from '@vben/constants';
|
||||
import { getDictOptions } from '@vben/hooks';
|
||||
import { IconifyIcon } from '@vben/icons';
|
||||
import { handleTree } from '@vben/utils';
|
||||
|
||||
import { getDataSourceConfigList } from '#/api/infra/data-source-config';
|
||||
import { getMenuList } from '#/api/system/menu';
|
||||
import { $t } from '#/locales';
|
||||
import { DICT_TYPE } from '@vben/constants';
|
||||
import { getDictOptions } from '@vben/hooks';
|
||||
|
||||
import { getRangePickerDefaultProps } from '#/utils';
|
||||
|
||||
const { hasAccessByCodes } = useAccess();
|
||||
|
|
|
@ -31,7 +31,7 @@ const columnInfoRef = ref<InstanceType<typeof ColumnInfo>>();
|
|||
const generateInfoRef = ref<InstanceType<typeof GenerationInfo>>();
|
||||
|
||||
/** 获取详情数据 */
|
||||
const getDetail = async () => {
|
||||
async function getDetail() {
|
||||
const id = route.query.id as any;
|
||||
if (!id) {
|
||||
return;
|
||||
|
@ -42,10 +42,10 @@ const getDetail = async () => {
|
|||
} finally {
|
||||
loading.value = false;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
/** 提交表单 */
|
||||
const submitForm = async () => {
|
||||
async function submitForm() {
|
||||
// 表单验证
|
||||
const basicInfoValid = await basicInfoRef.value?.validate();
|
||||
if (!basicInfoValid) {
|
||||
|
@ -79,25 +79,26 @@ const submitForm = async () => {
|
|||
} finally {
|
||||
loadingInstance.close();
|
||||
}
|
||||
};
|
||||
const tabs = useTabs();
|
||||
}
|
||||
|
||||
/** 返回列表 */
|
||||
const close = () => {
|
||||
const tabs = useTabs();
|
||||
function close() {
|
||||
tabs.closeCurrentTab();
|
||||
router.push('/infra/codegen');
|
||||
};
|
||||
}
|
||||
|
||||
/** 下一步 */
|
||||
const nextStep = async () => {
|
||||
function nextStep() {
|
||||
currentStep.value += 1;
|
||||
};
|
||||
}
|
||||
|
||||
/** 上一步 */
|
||||
const prevStep = () => {
|
||||
function prevStep() {
|
||||
if (currentStep.value > 0) {
|
||||
currentStep.value -= 1;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
/** 步骤配置 */
|
||||
const steps = [
|
||||
|
@ -118,14 +119,8 @@ getDetail();
|
|||
|
||||
<template>
|
||||
<Page auto-content-height v-loading="loading">
|
||||
<div
|
||||
class="flex h-[95%] flex-col rounded-md bg-white p-4 dark:bg-[#1f1f1f] dark:text-gray-300"
|
||||
>
|
||||
<ElSteps
|
||||
:active="currentStep"
|
||||
class="mb-8 rounded shadow-sm dark:bg-[#141414]"
|
||||
simple
|
||||
>
|
||||
<div class="bg-card flex h-[95%] flex-col rounded-md p-4">
|
||||
<ElSteps :active="currentStep" class="mb-8 rounded shadow-sm" simple>
|
||||
<ElStep
|
||||
v-for="(step, index) in steps"
|
||||
:key="index"
|
||||
|
|
|
@ -181,6 +181,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
|
|||
},
|
||||
rowConfig: {
|
||||
keyField: 'id',
|
||||
isHover: true,
|
||||
},
|
||||
toolbarConfig: {
|
||||
refresh: true,
|
||||
|
|
|
@ -25,6 +25,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
|
|||
keepSource: true,
|
||||
rowConfig: {
|
||||
keyField: 'id',
|
||||
isHover: true,
|
||||
},
|
||||
pagerConfig: {
|
||||
enabled: false,
|
||||
|
|
|
@ -53,6 +53,7 @@ const [Grid] = useVbenVxeGrid({
|
|||
},
|
||||
rowConfig: {
|
||||
keyField: 'name',
|
||||
isHover: true,
|
||||
},
|
||||
toolbarConfig: {
|
||||
enabled: false,
|
||||
|
|
|
@ -46,7 +46,7 @@ const activeKey = ref<string>('');
|
|||
|
||||
/** 代码地图 */
|
||||
const codeMap = ref<Map<string, string>>(new Map<string, string>());
|
||||
const setCodeMap = (key: string, lang: string, code: string) => {
|
||||
function setCodeMap(key: string, lang: string, code: string) {
|
||||
// 处理可能的缩进问题,特别是对Java文件
|
||||
const trimmedCode = code.trimStart();
|
||||
// 如果已有缓存则不重新构建
|
||||
|
@ -61,8 +61,10 @@ const setCodeMap = (key: string, lang: string, code: string) => {
|
|||
} catch {
|
||||
codeMap.value.set(key, trimmedCode);
|
||||
}
|
||||
};
|
||||
const removeCodeMapKey = (targetKey: any) => {
|
||||
}
|
||||
|
||||
/** 删除代码地图 */
|
||||
function removeCodeMapKey(targetKey: any) {
|
||||
// 只有一个代码视图时不允许删除
|
||||
if (codeMap.value.size === 1) {
|
||||
return;
|
||||
|
@ -70,26 +72,10 @@ const removeCodeMapKey = (targetKey: any) => {
|
|||
if (codeMap.value.has(targetKey)) {
|
||||
codeMap.value.delete(targetKey);
|
||||
}
|
||||
};
|
||||
const handleTabsEdit = (
|
||||
targetName: TabPaneName | undefined,
|
||||
action: 'add' | 'remove',
|
||||
) => {
|
||||
switch (action) {
|
||||
case 'add': {
|
||||
// el-tab 原生添加的位置用来放复制图标了,所以添加就是复制
|
||||
copyCode();
|
||||
break;
|
||||
}
|
||||
case 'remove': {
|
||||
removeCodeMapKey(targetName);
|
||||
break;
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
/** 复制代码 */
|
||||
const copyCode = async () => {
|
||||
async function copyCode() {
|
||||
const { copy } = useClipboard();
|
||||
const file = previewFiles.value.find(
|
||||
(item) => item.filePath === activeKey.value,
|
||||
|
@ -98,30 +84,34 @@ const copyCode = async () => {
|
|||
await copy(file.code);
|
||||
ElMessage.success('复制成功');
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
/** 文件节点点击事件 */
|
||||
const handleNodeClick = (node: FileNode) => {
|
||||
if (!node.isLeaf) return;
|
||||
function handleNodeClick(node: FileNode) {
|
||||
if (!node.isLeaf) {
|
||||
return;
|
||||
}
|
||||
|
||||
activeKey.value = node.key;
|
||||
const file = previewFiles.value.find((item) => {
|
||||
const list = activeKey.value.split('.');
|
||||
// 特殊处理-包合并
|
||||
// 特殊处理 - 包合并
|
||||
if (list.length > 2) {
|
||||
const lang = list.pop();
|
||||
return item.filePath === `${list.join('/')}.${lang}`;
|
||||
}
|
||||
return item.filePath === activeKey.value;
|
||||
});
|
||||
if (!file) return;
|
||||
if (!file) {
|
||||
return;
|
||||
}
|
||||
|
||||
const lang = file.filePath.split('.').pop() || '';
|
||||
setCodeMap(activeKey.value, lang, file.code);
|
||||
};
|
||||
}
|
||||
|
||||
/** 处理文件树 */
|
||||
const handleFiles = (data: InfraCodegenApi.CodegenPreview[]): FileNode[] => {
|
||||
function handleFiles(data: InfraCodegenApi.CodegenPreview[]): FileNode[] {
|
||||
const exists: Record<string, boolean> = {};
|
||||
const files: FileNode[] = [];
|
||||
|
||||
|
@ -135,7 +125,7 @@ const handleFiles = (data: InfraCodegenApi.CodegenPreview[]): FileNode[] => {
|
|||
const path = paths[cursor] || '';
|
||||
const oldFullPath = fullPath;
|
||||
|
||||
// 处理Java包路径特殊情况
|
||||
// 处理 Java 包路径特殊情况
|
||||
if (path === 'java' && cursor + 1 < paths.length) {
|
||||
fullPath = fullPath ? `${fullPath}/${path}` : path;
|
||||
cursor++;
|
||||
|
@ -194,17 +184,35 @@ const handleFiles = (data: InfraCodegenApi.CodegenPreview[]): FileNode[] => {
|
|||
}
|
||||
|
||||
/** 构建树形结构 */
|
||||
const buildTree = (parentKey: string): FileNode[] => {
|
||||
function buildTree(parentKey: string): FileNode[] {
|
||||
return files
|
||||
.filter((file) => file.parentKey === parentKey)
|
||||
.map((file) => ({
|
||||
...file,
|
||||
children: buildTree(file.key),
|
||||
}));
|
||||
};
|
||||
}
|
||||
|
||||
return buildTree('/');
|
||||
};
|
||||
}
|
||||
|
||||
/** 处理标签页编辑事件 */
|
||||
function handleTabsEdit(
|
||||
targetName: TabPaneName | undefined,
|
||||
action: 'add' | 'remove',
|
||||
) {
|
||||
switch (action) {
|
||||
case 'add': {
|
||||
// el-tab 原生添加的位置用来放复制图标了,所以添加就是复制
|
||||
copyCode();
|
||||
break;
|
||||
}
|
||||
case 'remove': {
|
||||
removeCodeMapKey(targetName);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 模态框实例 */
|
||||
const [Modal, modalApi] = useVbenModal({
|
||||
|
@ -218,7 +226,9 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
|
||||
const row = modalApi.getData<InfraCodegenApi.CodegenTable>();
|
||||
if (!row) return;
|
||||
if (!row) {
|
||||
return;
|
||||
}
|
||||
|
||||
// 加载预览数据
|
||||
loading.value = true;
|
||||
|
@ -273,6 +283,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
<div
|
||||
class="h-full rounded-md bg-gray-50 !p-0 text-gray-800 dark:bg-gray-800 dark:text-gray-200"
|
||||
>
|
||||
<!-- eslint-disable-next-line vue/no-v-html -->
|
||||
<code
|
||||
v-html="codeMap.get(activeKey)"
|
||||
class="code-highlight"
|
||||
|
@ -280,6 +291,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
</div>
|
||||
</ElTabPane>
|
||||
<template #add-icon>
|
||||
<!-- TODO @芋艿:这里会报错; -->
|
||||
<Copy />
|
||||
</template>
|
||||
</ElTabs>
|
||||
|
|
Loading…
Reference in New Issue