gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎调整代码生成页面

Browse Source
This commit is contained in:
zuohuaijun 2024-07-01 16:38:24 +08:00
parent 2c04c899f4
commit b7e51e7564
6 changed files with 168 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Web/src/views/system/codeGen/component/editCodeGenDialog.vue
View File

@ -8,7 +8,7 @@
</div>
</template>
<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="auto">
<el-row :gutter="35">
<el-row :gutter="10">
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="库定位器" prop="configId">
<el-select v-model="state.ruleForm.configId" placeholder="库名" filterable @change="dbChanged()" class="w100">
@ -258,6 +258,11 @@ const submit = () => {
});
};
const isOrNotSelect = () => [
{ label: '是', value: 1 },
{ label: '否', value: 0 },
];
// 导出对象
defineExpose({ openDialog });
</script>

4
Web/src/views/system/codeGen/component/fkDialog.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="sys-codeGenFk-container">
<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px" destroy-on-close>
<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px">
<template #header>
<div style="color: #fff">
<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
@ -8,7 +8,7 @@
</div>
</template>
<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="auto">
<el-row :gutter="35">
<el-row :gutter="10">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="库定位器" prop="configId">
<el-select clearable v-model="state.ruleForm.configId" placeholder="库名" filterable @change="DbChanged()" class="w100">

31
Web/src/views/system/codeGen/component/genConfigDialog.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="sys-codeGenConfig-container">
<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="1500px">
<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="80vw">
<template #header>
<div style="color: #fff">
<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
@ -8,9 +8,9 @@
</div>
</template>
<el-table :data="state.tableData" style="width: 100%" v-loading="state.loading" border>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column prop="propertyName" label="实体属性" width="180" show-overflow-tooltip />
<el-table-column prop="columnComment" label="描述" width="180" show-overflow-tooltip>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="columnName" label="字段" width="160" show-overflow-tooltip />
<el-table-column prop="columnComment" label="描述" width="160" show-overflow-tooltip>
<template #default="scope">
<el-input v-model="scope.row.columnComment" autocomplete="off" />
</template>
@ -31,17 +31,17 @@
</template>
</el-table-column>
<el-table-column prop="whetherTable" label="列表显示" width="85" align="center" show-overflow-tooltip>
<el-table-column prop="whetherTable" label="列表显示" width="70" align="center" show-overflow-tooltip>
<template #default="scope">
<el-checkbox v-model="scope.row.whetherTable" />
</template>
</el-table-column>
<el-table-column prop="whetherAddUpdate" label="增改" width="80" align="center" show-overflow-tooltip>
<el-table-column prop="whetherAddUpdate" label="增改" width="70" align="center" show-overflow-tooltip>
<template #default="scope">
<el-checkbox v-model="scope.row.whetherAddUpdate" :disabled="judgeColumns(scope.row)" />
</template>
</el-table-column>
<el-table-column prop="whetherRequired" label="必填" width="80" align="center" show-overflow-tooltip>
<el-table-column prop="whetherRequired" label="必填" width="70" align="center" show-overflow-tooltip>
<template #default="scope">
<el-checkbox v-model="scope.row.whetherRequired" :disabled="judgeColumns(scope.row)" />
</template>
@ -85,6 +85,7 @@
<script lang="ts" setup name="sysCodeGenConfig">
import { onMounted, onUnmounted, reactive, ref } from 'vue';
import mittBus from '/@/utils/mitt';
import fkDialog from '/@/views/system/codeGen/component/fkDialog.vue';
import treeDialog from '/@/views/system/codeGen/component/treeDialog.vue';
@ -276,18 +277,10 @@ const convertDbType = (dbType: number) => {
return result;
};
const isOrNotSelect = () => {
return [
{
label: '是',
value: 1,
},
{
label: '否',
value: 0,
},
];
};
const isOrNotSelect = () => [
{ label: '是', value: 1 },
{ label: '否', value: 0 },
];
// 导出对象
defineExpose({ openDialog });

7
Web/src/views/system/codeGen/component/previewDialog.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="sys-codeGenPreview-container">
<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="70%">
<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="80vw">
<template #header>
<div style="color: #fff">
<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
@ -17,7 +17,7 @@
</template>
</el-segmented>
</div>
<div ref="monacoEditorRef" style="width: 100%; height: 700px;"></div>
<div ref="monacoEditorRef" style="width: 100%; height: 700px; margin-top: 6px"></div>
<template #footer>
<span class="dialog-footer">
<el-button icon="ele-Close" @click="cancel">关 闭</el-button>
@ -123,11 +123,14 @@ defineExpose({ openDialog });
<style scoped>
.cs-style .el-segmented {
--el-segmented-item-selected-bg-color: #5c2d91;
--el-border-radius-base: 6px;
}
.vue-style .el-segmented {
--el-segmented-item-selected-bg-color: #42b883;
--el-border-radius-base: 6px;
}
.js-style .el-segmented {
--el-segmented-item-selected-bg-color: #e44d26;
--el-border-radius-base: 6px;
}
</style>

2
Web/src/views/system/codeGen/component/treeDialog.vue
View File

@ -8,7 +8,7 @@
</div>
</template>
<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="auto">
<el-row :gutter="35">
<el-row :gutter="10">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="库定位器" prop="configId">
<el-select clearable v-model="state.ruleForm.configId" placeholder="库名" filterable @change="DbChanged()" class="w100">

238
Web/src/views/system/codeGen/index.vue
View File

@ -1,94 +1,108 @@
<template>
<div class="sys-codeGen-container">
<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
<el-form :model="state.queryParams" ref="queryForm" :inline="true">
<el-form-item label="业务名">
<el-input placeholder="业务名" clearable @keyup.enter="handleQuery" v-model="state.queryParams.busName" />
</el-form-item>
<el-form-item label="数据库表名">
<el-input placeholder="数据库表名" clearable @keyup.enter="handleQuery" v-model="state.queryParams.tableName" />
</el-form-item>
<el-form-item>
<el-button-group>
<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysMenu:list'"> 查询 </el-button>
<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
</el-button-group>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="ele-Plus" @click="openAddDialog"> 增加 </el-button>
</el-form-item>
<div class="sys-codeGen-container" v-loading="options.loading">
<el-card shadow="hover" :body-style="{ padding: '5px 5px 0 5px', display: 'flex', width: '100%', height: '100%', alignItems: 'start' }">
<el-form :model="state.queryParams" ref="queryForm" :show-message="false" :inlineMessage="true" :label-width="'60px'" style="flex: 1 1 0%">
<el-row :gutter="10">
<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
<el-form-item label="业务名" prop="busName">
<el-input placeholder="业务名" clearable @keyup.enter="handleQuery" v-model="state.queryParams.busName" @keyup.enter.native="handleQuery(true)" />
</el-form-item>
</el-col>
<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
<el-form-item label="数据库表名" prop="tableName">
<el-input placeholder="数据库表名" clearable @keyup.enter="handleQuery" v-model="state.queryParams.tableName" @keyup.enter.native="handleQuery(true)" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-divider style="height: calc(100% - 5px); margin: 0 10px" direction="vertical" />
<el-row>
<el-col>
<el-button-group>
<el-button type="primary" icon="ele-Search" @click="handleQuery(true)" :loading="options.loading"> 查询 </el-button>
<el-button icon="ele-Refresh" @click="resetQuery" :loading="options.loading"> 重置 </el-button>
</el-button-group>
</el-col>
</el-row>
</el-card>
<el-card class="full-table" shadow="hover" style="margin-top: 5px">
<el-table :data="state.tableData" style="width: 100%" v-loading="state.loading" border>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column prop="configId" label="库定位器" align="center" show-overflow-tooltip />
<el-table-column prop="tableName" label="表名称" align="center" show-overflow-tooltip />
<el-table-column prop="busName" label="业务名" align="center" show-overflow-tooltip />
<el-table-column prop="nameSpace" label="命名空间" align="center" show-overflow-tooltip />
<el-table-column prop="authorName" label="作者姓名" align="center" show-overflow-tooltip />
<el-table-column prop="generateType" label="生成方式" align="center" show-overflow-tooltip>
<template #default="scope">
<el-tag v-if="scope.row.generateType == 100"> 下载压缩包 </el-tag>
<el-tag v-else-if="scope.row.generateType == 111"> 下载压缩包(前端) </el-tag>
<el-tag v-else-if="scope.row.generateType == 121"> 下载压缩包(后端) </el-tag>
<el-tag v-else-if="scope.row.generateType == 211"> 生成到本项目(前端) </el-tag>
<el-tag v-else-if="scope.row.generateType == 221"> 生成到本项目(后端) </el-tag>
<el-tag type="danger" v-else> 生成到本项目 </el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="350" fixed="right" align="center" show-overflow-tooltip>
<template #default="scope">
<el-button icon="ele-Position" size="small" text type="primary" @click="handleGenerate(scope.row)">开始生成</el-button>
<el-button icon="ele-View" size="small" text type="primary" @click="handlePreview(scope.row)">预览</el-button>
<el-button icon="ele-Setting" size="small" text type="primary" @click="openConfigDialog(scope.row)">配置</el-button>
<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditDialog(scope.row)">编辑</el-button>
<el-button icon="ele-Delete" size="small" text type="danger" @click="deleConfig(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination
v-model:currentPage="state.tableParams.page"
v-model:page-size="state.tableParams.pageSize"
:total="state.tableParams.total"
:page-sizes="[10, 20, 50, 100]"
small
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
layout="total, sizes, prev, pager, next, jumper"
/>
<vxe-grid ref="xGrid" class="xGrid-style" v-bind="options" @sort-change="sortChange">
<template #toolbar_buttons>
<el-button type="primary" icon="ele-Plus" @click="handleAdd"> 新增 </el-button>
</template>
<template #toolbar_tools> </template>
<template #empty>
<el-empty :image-size="200" />
</template>
<template #row_generateType="{ row }">
<el-tag v-if="row.generateType == 100"> 下载压缩包 </el-tag>
<el-tag v-else-if="row.generateType == 111"> 下载压缩包(前端) </el-tag>
<el-tag v-else-if="row.generateType == 121"> 下载压缩包(后端) </el-tag>
<el-tag v-else-if="row.generateType == 211"> 生成到本项目(前端) </el-tag>
<el-tag v-else-if="row.generateType == 221"> 生成到本项目(后端) </el-tag>
<el-tag type="danger" v-else> 生成到本项目 </el-tag>
</template>
<template #row_buttons="{ row }">
<el-tooltip content="编辑" placement="top">
<el-button icon="ele-Edit" text type="primary" @click="handleEdit(row)"> </el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button icon="ele-Delete" text type="danger" @click="handleDelete(row)"> </el-button>
</el-tooltip>
<el-tooltip content="配置" placement="top">
<el-button icon="ele-Setting" text type="danger" @click="handleConfig(row)">配置</el-button>
</el-tooltip>
<el-tooltip content="预览" placement="top">
<el-button icon="ele-Camera" text type="primary" @click="handlePreview(row)">预览</el-button>
</el-tooltip>
<el-tooltip content="开始生成" placement="top">
<el-button icon="ele-Cpu" text type="primary" @click="handleGenerate(row)">生成</el-button>
</el-tooltip>
</template>
<template #pager>
<vxe-pager
:loading="options.loading"
v-model:current-page="state.tableParams.page"
v-model:page-size="state.tableParams.pageSize"
:total="state.tableParams.total"
@page-change="pageChange"
/>
</template>
</vxe-grid>
</el-card>
<EditCodeGenDialog :title="state.editMenuTitle" ref="EditCodeGenRef" @handleQuery="handleQuery" :application-namespaces="state.applicationNamespaces" />
<EditCodeGenDialog :title="state.title" ref="EditCodeGenRef" @handleQuery="handleQuery" :application-namespaces="state.applicationNamespaces" />
<CodeConfigDialog ref="CodeConfigRef" @handleQuery="handleQuery" />
<PreviewDialog :title="state.editMenuTitle" ref="PreviewRef" />
<PreviewDialog :title="state.title" ref="PreviewRef" />
</div>
</template>
<script lang="ts" setup name="sysCodeGen">
import { onMounted, reactive, ref, defineAsyncComponent } from 'vue';
import { ElMessageBox, ElMessage } from 'element-plus';
import { auth } from '/@/utils/authFunction';
import { VxeGridInstance, VxePagerEvents, VxePagerDefines } from 'vxe-table';
import { useVxeTable } from '/@/hooks/vxeTableOptionsHook';
import { downloadByUrl } from '/@/utils/download';
import EditCodeGenDialog from './component/editCodeGenDialog.vue';
import CodeConfigDialog from './component/genConfigDialog.vue';
import { downloadByUrl } from '/@/utils/download';
import { getAPI } from '/@/utils/axios-utils';
import { SysCodeGenApi } from '/@/api-services/api';
import { SysCodeGen } from '/@/api-services/models';
const PreviewDialog = defineAsyncComponent(() => import('./component/previewDialog.vue'));
const xGrid = ref<VxeGridInstance>();
const EditCodeGenRef = ref<InstanceType<typeof EditCodeGenDialog>>();
const CodeConfigRef = ref<InstanceType<typeof CodeConfigDialog>>();
const PreviewRef = ref<InstanceType<typeof PreviewDialog>>();
const state = reactive({
loading: false,
loading1: false,
dbData: [] as any,
configId: '',
tableData: [] as Array<SysCodeGen>,
tableName: '',
queryParams: {
name: undefined,
@ -98,56 +112,88 @@ const state = reactive({
},
tableParams: {
page: 1,
pageSize: 10,
pageSize: 50,
field: 'id', // 默认的排序字段
order: 'aes', // 排序方向
descStr: 'desc', // 降序排序的关键字符
total: 0 as any,
},
editMenuTitle: '',
visible: false,
title: '',
applicationNamespaces: [] as Array<string>,
});
onMounted(async () => {
handleQuery();
// 表格参数配置
const options = useVxeTable<SysCodeGen>({
id: 'sysCodeGen',
name: '代码生成',
columns: [
// { type: 'checkbox', width: 40, fixed: 'left' },
{ type: 'seq', title: '序号', width: 60, fixed: 'left' },
{ field: 'configId', title: '库定位器', minWidth: 200, showOverflow: 'tooltip' },
{ field: 'tableName', title: '表名称', minWidth: 200, showOverflow: 'tooltip' },
{ field: 'busName', title: '业务名', minWidth: 200, showOverflow: 'tooltip' },
{ field: 'nameSpace', title: '命名空间', minWidth: 200, showOverflow: 'tooltip' },
{ field: 'authorName', title: '作者姓名', minWidth: 200, showOverflow: 'tooltip' },
{ field: 'generateType', title: '生成方式', minWidth: 140, showOverflow: 'tooltip', slots: { default: 'row_generateType' } },
{ title: '操作', fixed: 'right', width: 280, showOverflow: true, slots: { default: 'row_buttons' } },
],
enableExport: auth('sysCodeGen:export'),
searchCallback: () => handleQuery(),
queryAllCallback: () => fetchData({ pageSize: 99999 }),
});
// 页面初始化
onMounted(async () => {
await handleQuery();
let res = await getAPI(SysCodeGenApi).apiSysCodeGenApplicationNamespacesGet();
state.applicationNamespaces = res.data.result as Array<string>;
});
const openConfigDialog = (row: any) => {
CodeConfigRef.value?.openDialog(row);
// 查询操作
const handleQuery = async (reset = false) => {
options.loading = true;
if (reset) state.tableParams.page = 1;
var res = await fetchData(null);
xGrid.value?.loadData(res.data.result?.items ?? []);
state.tableParams.total = res.data.result?.total;
options.loading = false;
};
// 表查询操作
const handleQuery = async () => {
state.loading = true;
let params = Object.assign(state.queryParams, state.tableParams);
let res = await getAPI(SysCodeGenApi).apiSysCodeGenPagePost(params);
state.tableData = res.data.result?.items ?? [];
state.tableParams.total = res.data.result?.total;
state.loading = false;
// 获取数据
const fetchData = async (tableParams: any) => {
let params = Object.assign(state.queryParams, state.tableParams, tableParams);
return getAPI(SysCodeGenApi).apiSysCodeGenPagePost(params);
};
// 重置操作
const resetQuery = () => {
state.queryParams.busName = undefined;
state.queryParams.tableName = undefined;
handleQuery(true);
};
const handleConfig = (row: any) => {
CodeConfigRef.value?.openDialog(row);
};
// 改变页码序号或页面容量
const pageChange: VxePagerEvents.PageChange = ({ currentPage, pageSize }: VxePagerDefines.PageChangeEventParams) => {
state.tableParams.page = currentPage;
state.tableParams.pageSize = pageSize;
handleQuery();
};
// 改变页面容量
const handleSizeChange = (val: number) => {
state.tableParams.pageSize = val;
// 列排序
const sortChange = (options: any) => {
state.tableParams.field = options.field;
state.tableParams.order = options.order;
handleQuery();
};
// 改变页码序号
const handleCurrentChange = (val: number) => {
state.tableParams.page = val;
handleQuery();
};
// 打开表增加页面
const openAddDialog = () => {
state.editMenuTitle = '增加';
// 打开新增页面
const handleAdd = () => {
state.title = '增加';
EditCodeGenRef.value?.openDialog({
authorName: 'Admin.NET',
generateType: '200',
@ -155,18 +201,18 @@ const openAddDialog = () => {
menuIcon: 'ele-Menu',
pagePath: 'main',
nameSpace: state.applicationNamespaces[0],
generateMenu: true,
generateMenu: false,
});
};
// 打开表编辑页面
const openEditDialog = (row: any) => {
state.editMenuTitle = '编辑';
// 打开编辑页面
const handleEdit = (row: any) => {
state.title = '编辑';
EditCodeGenRef.value?.openDialog(row);
};
// 删除表
const deleConfig = (row: any) => {
// 删除
const handleDelete = (row: any) => {
ElMessageBox.confirm(`确定删除吗?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -198,7 +244,7 @@ const handleGenerate = (row: any) => {
// 预览代码
const handlePreview = (row: any) => {
state.editMenuTitle = '预览代码';
state.title = '预览代码';
PreviewRef.value?.openDialog(row);
};
</script>