feat 还原代码生成器的UI 和接口格式

This commit is contained in:
damonyuan 2024-10-19 23:43:19 +08:00
parent 74a57c9543
commit f0451376f9
12 changed files with 439 additions and 397 deletions

View File

@ -2,50 +2,74 @@ import request from '@/utils/request'
// 代码生成已选数据表列表接口 // 代码生成已选数据表列表接口
export function generateTable(params: any) { export function generateTable(params: any) {
return request.get({ url: '/tools.generator/generateTable', params }) return request.get({ url: '/gen/list', params })
} }
// 数据表列表接口 // 数据表列表接口
export function dataTable(params: any) { export function dataTable(params: any) {
return request.get({ url: '/tools.generator/dataTable', params }) return request.get({ url: '/gen/db', params })
} }
// 数据表所有列表接口
export function dataTableAll() {
return request.get({ url: '/gen/dbAll' })
}
//表名查字段
export function dataTableToColumn(params: any) {
return request.get({ url: '/gen/dbColumn', params })
}
//选择要生成代码的数据表 //选择要生成代码的数据表
export function selectTable(params: any) { export function selectTable(params: any) {
return request.post({ url: '/tools.generator/selectTable', params }) return request.post(
{ url: '/gen/importTable', params },
{
isParamsToData: false
}
)
} }
// 已选择的数据表详情 // 已选择的数据表详情
export function tableDetail(params: any) { export function tableDetail(params: any) {
return request.get({ url: '/tools.generator/detail', params }) return request.get({ url: '/gen/detail', params })
} }
//同步字段 //同步字段
export function syncColumn(params: any) { export function syncColumn(params: any) {
return request.post({ url: '/tools.generator/syncColumn', params }) return request.post(
{ url: '/gen/syncTable', params },
{
isParamsToData: false
}
)
} }
//删除已选择的数据表 //删除已选择的数据表
export function generateDelete(params: any) { export function generateDelete(params: any) {
return request.post({ url: '/tools.generator/delete', params }) return request.post({ url: '/gen/delTable', params })
} }
//编辑已选表字段 //编辑已选表字段
export function generateEdit(params: any) { export function generateEdit(params: any) {
return request.post({ url: '/tools.generator/edit', params }) return request.post({ url: '/gen/editTable', params })
} }
//预览代码 //预览代码
export function generatePreview(params: any) { export function generatePreview(params: any) {
return request.post({ url: '/tools.generator/preview', params }) return request.get({ url: '/gen/previewCode', params })
} }
//生成代码 //生成代码
export function generateCode(params: any) { export function generateCode(params: any) {
return request.post({ url: '/tools.generator/generate', params }) return request.get({ url: '/gen/genCode', params })
} }
//获取模型 //下载代码
export function getModels() { export function downloadCode(params: any) {
return request.get({ url: '/tools.generator/getModels' }) return request.get(
{ responseType: 'blob', url: '/gen/downloadCode', params },
{
isTransformResponse: false
}
)
} }

16
admin/src/utils/file.ts Normal file
View File

@ -0,0 +1,16 @@
/**
* @description
* @param file
*/
export function streamFileDownload(file: any, fileName = '文件名称.zip') {
const blob = new Blob([file], { type: 'application/octet-stream;charset=UTF-8' })
const url = window.URL.createObjectURL(blob)
const link = document.createElement('a')
link.style.display = 'none'
link.href = url
link.setAttribute('download', fileName)
document.body.appendChild(link)
link.click()
document.body.removeChild(link) // 下载完成移除元素
window.URL.revokeObjectURL(url)
}

View File

@ -8,38 +8,52 @@
ref="formRef" ref="formRef"
class="ls-form" class="ls-form"
:model="formData" :model="formData"
label-width="100px" label-width="130px"
:rules="rules" :rules="rules"
> >
<el-tabs v-model="activeName"> <el-tabs v-model="activeName">
<el-tab-pane label="基础信息" name="base"> <el-tab-pane label="基础信息" name="base">
<el-form-item label="表名称" prop="table_name"> <el-form-item label="表名称" prop="base.tableName">
<div class="w-80"> <div class="w-80">
<el-input <el-input
v-model="formData.table_name" v-model="formData.base.tableName"
placeholder="请输入表名称" placeholder="请输入表名称"
clearable clearable
/> />
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="表描述" prop="table_comment"> <el-form-item label="表描述" prop="base.tableComment">
<div class="w-80"> <div class="w-80">
<el-input <el-input
v-model="formData.table_comment" v-model="formData.base.tableComment"
placeholder="请输入表描述" placeholder="请输入表描述"
clearable clearable
/> />
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="作者"> <el-form-item label="实体类名称" prop="base.entityName">
<div class="w-80"> <div class="w-80">
<el-input v-model="formData.author" clearable /> <el-input
v-model="formData.base.entityName"
placeholder="请输入实体类名称"
clearable
/>
</div>
</el-form-item>
<el-form-item label="作者" prop="base.authorName">
<div class="w-80">
<el-input
v-model="formData.base.authorName"
placeholder="请输入作者"
clearable
/>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item label="备注">
<div class="w-80"> <div class="w-80">
<el-input <el-input
v-model="formData.remark" v-model="formData.base.remarks"
class="w-full" class="w-full"
type="textarea" type="textarea"
:autosize="{ minRows: 4, maxRows: 4 }" :autosize="{ minRows: 4, maxRows: 4 }"
@ -51,18 +65,36 @@
</el-form-item> </el-form-item>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="字段管理" name="column"> <el-tab-pane label="字段管理" name="column">
<el-table :data="formData.table_column"> <el-table :data="formData.column">
<el-table-column label="字段列名" prop="column_name" /> <el-table-column label="字段列名" prop="columnName" />
<el-table-column label="字段描述" prop="column_comment" min-width="120"> <el-table-column label="字段描述" prop="columnComment" min-width="120">
<template v-slot="{ row }"> <template v-slot="{ row }">
<el-input v-model="row.column_comment" clearable /> <el-input v-model="row.columnComment"></el-input>
</template>
</el-table-column>
<el-table-column label="物理类型" prop="columnType" min-width="100" />
<el-table-column label="Java类型" min-width="100">
<template v-slot="{ row }">
<el-select v-model="row.javaType">
<el-option label="Long" value="Long" />
<el-option label="String" value="String" />
<el-option label="Integer" value="Integer" />
<el-option label="Double" value="Double" />
<el-option label="BigDecimal" value="BigDecimal" />
<el-option label="Date" value="Date" />
<el-option label="Boolean" value="Boolean" />
</el-select>
</template>
</el-table-column>
<el-table-column label="Java属性" min-width="100">
<template v-slot="{ row }">
<el-input v-model="row.javaField" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物理类型" prop="column_type" />
<el-table-column label="必填" width="80"> <el-table-column label="必填" width="80">
<template v-slot="{ row }"> <template v-slot="{ row }">
<el-checkbox <el-checkbox
v-model="row.is_required" v-model="row.isRequired"
:true-label="1" :true-label="1"
:false-label="0" :false-label="0"
/> />
@ -71,7 +103,7 @@
<el-table-column label="插入" width="80"> <el-table-column label="插入" width="80">
<template v-slot="{ row }"> <template v-slot="{ row }">
<el-checkbox <el-checkbox
v-model="row.is_insert" v-model="row.isInsert"
:true-label="1" :true-label="1"
:false-label="0" :false-label="0"
/> />
@ -80,7 +112,7 @@
<el-table-column label="编辑" width="80"> <el-table-column label="编辑" width="80">
<template v-slot="{ row }"> <template v-slot="{ row }">
<el-checkbox <el-checkbox
v-model="row.is_update" v-model="row.isEdit"
:true-label="1" :true-label="1"
:false-label="0" :false-label="0"
/> />
@ -89,7 +121,7 @@
<el-table-column label="列表" width="80"> <el-table-column label="列表" width="80">
<template v-slot="{ row }"> <template v-slot="{ row }">
<el-checkbox <el-checkbox
v-model="row.is_lists" v-model="row.isList"
:true-label="1" :true-label="1"
:false-label="0" :false-label="0"
/> />
@ -98,7 +130,7 @@
<el-table-column label="查询" width="80"> <el-table-column label="查询" width="80">
<template v-slot="{ row }"> <template v-slot="{ row }">
<el-checkbox <el-checkbox
v-model="row.is_query" v-model="row.isQuery"
:true-label="1" :true-label="1"
:false-label="0" :false-label="0"
/> />
@ -106,28 +138,29 @@
</el-table-column> </el-table-column>
<el-table-column label="查询方式"> <el-table-column label="查询方式">
<template v-slot="{ row }"> <template v-slot="{ row }">
<el-select v-model="row.query_type"> <el-select v-model="row.queryType">
<el-option label="=" value="=" /> <el-option label="=" value="EQ" />
<el-option label="!=" value="!=" /> <el-option label="!=" value="NE" />
<el-option label=">" value=">" /> <el-option label=">" value="GT" />
<el-option label=">=" value=">=" /> <el-option label=">=" value="GTE" />
<el-option label="<" value="<" /> <el-option label="<" value="LT" />
<el-option label="<=" value="<=" /> <el-option label="<=" value="LTE" />
<el-option label="LIKE" value="like" /> <el-option label="LIKE" value="LIKE" />
<el-option label="BETWEEN" value="between" /> <el-option label="BETWEEN" value="BETWEEN" />
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="显示类型" min-width="120"> <el-table-column label="显示类型" min-width="120">
<template v-slot="{ row }"> <template v-slot="{ row }">
<el-select v-model="row.view_type"> <el-select v-model="row.htmlType">
<el-option label="文本框" value="input" /> <el-option label="文本框" value="input" />
<el-option label="数字框" value="number" />
<el-option label="文本域" value="textarea" /> <el-option label="文本域" value="textarea" />
<el-option label="下拉框" value="select" /> <el-option label="下拉框" value="select" />
<el-option label="单选框" value="radio" /> <el-option label="单选框" value="radio" />
<el-option label="复选框" value="checkbox" /> <el-option label="复选框" value="checkbox" />
<el-option label="日期控件" value="datetime" /> <el-option label="日期控件" value="datetime" />
<el-option label="图片选择控件" value="imageSelect" /> <el-option label="图片选择控件" value="imageUpload" />
<el-option label="富文本控件" value="editor" /> <el-option label="富文本控件" value="editor" />
</el-select> </el-select>
</template> </template>
@ -135,23 +168,23 @@
<el-table-column label="字典类型" min-width="120"> <el-table-column label="字典类型" min-width="120">
<template v-slot="{ row }"> <template v-slot="{ row }">
<el-select <el-select
v-model="row.dict_type" v-model="row.dictType"
clearable clearable
:disabled=" :disabled="
!( !(
row.view_type == 'select' || row.htmlType == 'select' ||
row.view_type == 'radio' || row.htmlType == 'radio' ||
row.view_type == 'checkbox' row.htmlType == 'checkbox'
) )
" "
placeholder="字典类型" placeholder="字典类型"
> >
<el-option <el-option
v-for="(item, index) in optionsData.dict_type" v-for="(item, index) in optionsData.dictType"
:key="index" :key="index"
:label="item.name" :label="item.dictName"
:value="item.type" :value="item.dictType"
:disabled="!item.status" :disabled="!item.dictStatus"
/> />
</el-select> </el-select>
</template> </template>
@ -159,365 +192,293 @@
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="生成配置" name="config"> <el-tab-pane label="生成配置" name="config">
<el-form-item label="模板类型" prop="template_type"> <el-form-item label="模板类型" prop="gen.genTpl" required>
<el-radio-group v-model="formData.template_type"> <el-radio-group v-model="formData.gen.genTpl">
<el-radio :label="0">单表curd</el-radio> <el-radio :label="GenTpl.CRUD">单表增删改查</el-radio>
<el-radio :label="1">树表curd</el-radio> <el-radio :label="GenTpl.TREE">树表增删改查</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="删除类型" prop="delete.type"> <el-form-item label="模块名" prop="gen.moduleName">
<el-radio-group v-model="formData.delete.type">
<el-radio :label="0">物理删除</el-radio>
<el-radio :label="1">软删除</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item
label="删除字段"
prop="delete.name"
v-if="formData.delete.type == 1"
>
<el-select class="w-80" v-model="formData.delete.name" clearable>
<el-option
v-for="item in formData.table_column"
:key="item.id"
:value="item.column_name"
:label="`${item.column_name}${item.column_comment}`"
/>
</el-select>
</el-form-item>
<template v-if="formData.template_type == 1">
<el-form-item label="树表ID" prop="treePrimary">
<div>
<el-select
class="w-80"
v-model="formData.tree.tree_id"
clearable
>
<el-option
v-for="item in formData.table_column"
:key="item.id"
:value="item.column_name"
:label="`${item.column_name}${item.column_comment}`"
/>
</el-select>
<div class="form-tips">指定树表的主要ID一般为主键</div>
</div>
</el-form-item>
<el-form-item label="树表父ID" prop="treeParent">
<div>
<el-select
class="w-80"
v-model="formData.tree.tree_pid"
clearable
>
<el-option
v-for="item in formData.table_column"
:key="item.id"
:value="item.column_name"
:label="`${item.column_name}${item.column_comment}`"
/>
</el-select>
<div class="form-tips">指定树表的父ID比如parent_id</div>
</div>
</el-form-item>
<el-form-item label="树名称" prop="treeName">
<el-select class="w-80" v-model="formData.tree.tree_name" clearable>
<el-option
v-for="item in formData.table_column"
:key="item.id"
:value="item.column_name"
:label="`${item.column_name}${item.column_comment}`"
/>
</el-select>
</el-form-item>
</template>
<el-form-item label="类描述">
<div class="w-80">
<div>
<el-input
v-model="formData.class_comment"
placeholder="请输入文件描述"
clearable
/>
</div>
<div class="form-tips">
<div>
填写test,生成文件描述为test控制器(test逻辑/test模型)
</div>
</div>
</div>
</el-form-item>
<el-form-item label="生成方式" prop="generate_type">
<el-radio-group v-model="formData.generate_type">
<el-radio :label="0">压缩包下载</el-radio>
<el-radio :label="1">生成到模块</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="模块名" prop="module_name">
<div class="w-80"> <div class="w-80">
<el-input <el-input
v-model="formData.module_name" v-model="formData.gen.moduleName"
placeholder="请输入模块名" placeholder="请输入模块名"
clearable clearable
/> />
<div class="form-tips">生成文件所在模块</div> <div class="form-tips">生成文件所在模块名</div>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="类目录"> <el-form-item label="功能名称" prop="gen.functionName">
<div class="w-80"> <div class="w-80">
<div> <el-input
<el-input v-model="formData.gen.functionName"
v-model="formData.class_dir" placeholder="请输入功能名称"
placeholder="请输入文件所在目录" clearable
clearable />
/> </div>
</div> </el-form-item>
<el-form-item label="生成方式" prop="gen.genType">
<div>
<el-radio-group v-model="formData.gen.genType">
<el-radio :label="GenType.ZIP">压缩包下载</el-radio>
<el-radio :label="GenType.CUSTOM_PATH">自定义路径</el-radio>
</el-radio-group>
<div class="form-tips">压縮包下载方式暂不支持自动构建菜单权限</div>
</div>
</el-form-item>
<el-form-item label="菜单构建" prop="gen.menuStatus" required>
<div>
<el-radio-group v-model="formData.gen.menuStatus">
<el-radio :label="1">自动构建</el-radio>
<el-radio :label="0">手动添加</el-radio>
</el-radio-group>
<div class="form-tips"> <div class="form-tips">
<div> 自动构建自动执行生成菜单sql 手动添加自行添加菜单
填写test,则在app/模块名/controller/test下生成控制器
</div>
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="父级菜单" prop="gen.menuPid">
<el-form-item label="父级菜单" prop="menu.pid">
<el-tree-select <el-tree-select
class="w-80" class="w-80"
v-model="formData.menu.pid" v-model="formData.gen.menuPid"
:data="optionsData.menu" :data="optionsData.menu"
clearable clearable
node-key="id" node-key="id"
:props="{ :props="{
label: 'name' label: 'menuName'
}" }"
default-expand-all default-expand-all
placeholder="请选择父级菜单" placeholder="请选择父级菜单"
check-strictly check-strictly
/> />
</el-form-item> </el-form-item>
<el-form-item label="菜单名称" prop="menu.name"> <el-form-item label="菜单名称" prop="gen.menuName">
<div class="w-80"> <div class="w-80">
<el-input <el-input
v-model="formData.menu.name" v-model="formData.gen.menuName"
placeholder="请输入菜单名称" placeholder="请输入菜单名称"
clearable clearable
/> />
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="菜单构建" prop="menu.type" required>
<div> <el-form-item
<el-radio-group v-model="formData.menu.type"> v-if="formData.gen.genType == GenType.CUSTOM_PATH"
<el-radio :label="1">自动构建</el-radio> label="自定义路径"
<el-radio :label="0">手动添加</el-radio> prop="gen.genPath"
</el-radio-group> >
<div class="form-tips"> <div class="w-80">
自动构建自动执行生成菜单sql手动添加自行添加菜单 <el-input
</div> v-model="formData.gen.genPath"
placeholder="请输入自定义路径"
clearable
/>
</div> </div>
</el-form-item> </el-form-item>
<template v-if="formData.gen.genTpl == GenTpl.TREE">
<el-form-item label="树主键字段" prop="gen.treePrimary">
<el-select
class="w-80"
v-model="formData.gen.treePrimary"
clearable
>
<el-option
v-for="item in formData.column"
:key="item.id"
:value="item.columnName"
:label="`${item.columnName}${item.columnComment}`"
/>
</el-select>
</el-form-item>
<el-form-item label="树父级字段" prop="gen.treeParent">
<el-select class="w-80" v-model="formData.gen.treeParent" clearable>
<el-option
v-for="item in formData.column"
:key="item.id"
:value="item.columnName"
:label="`${item.columnName}${item.columnComment}`"
/>
</el-select>
</el-form-item>
<el-form-item label="树名称字段" prop="gen.treeName">
<el-select class="w-80" v-model="formData.gen.treeName" clearable>
<el-option
v-for="item in formData.column"
:key="item.id"
:value="item.columnName"
:label="`${item.columnName}${item.columnComment}`"
/>
</el-select>
</el-form-item>
</template>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="关联配置" name="relations"> <el-tab-pane label="关联配置" name="relation">
<el-button type="primary" @click="showEditPopup('add')"> <el-form-item label="关联子表的表名" prop="gen.subTableName">
<template #icon> <el-select
<icon name="el-icon-Plus" /> class="w-80"
</template> v-model="formData.gen.subTableName"
新增关联 clearable
</el-button> @change="handleTableChange"
<div class="mt-4"> >
<el-table :data="formData.relations" size="mini"> <el-option
<el-table-column prop="type" label="关联类型"> v-for="item in optionsData.dataTable"
<template #default="{ row }"> :key="item.tableName"
<dict-value :value="row.type" :options="relationTypes" /> :value="item.tableName"
</template> :label="`${item.tableName}${item.tableComment}`"
</el-table-column> />
<el-table-column prop="name" label="关联名称" /> </el-select>
<el-table-column prop="model" label="关联模型" /> </el-form-item>
<el-table-column prop="local_key" label="关联键"> <el-form-item label="子表关联的外键名 " prop="gen.subTableFk">
<template #default="{ row }"> <el-select
<dict-value class="w-80"
:value="row.local_key" v-model="formData.gen.subTableFk"
:options="formData.table_column" clearable
:config="{ :loading="columnLoading"
label: 'column_comment', >
value: 'column_name' <el-option
}" v-for="item in tableColumn"
/> :key="item.id"
</template> :value="item.columnName"
</el-table-column> :label="`${item.columnName}${item.columnComment}`"
<el-table-column prop="foreign_key" label="外键" /> />
<el-table-column label="操作"> </el-select>
<template #default="{ row, $index }"> </el-form-item>
<el-button <el-form-item label="关联表主键 " prop="gen.subTableFr">
link <el-select class="w-80" v-model="formData.gen.subTableFr" clearable>
type="primary" <el-option
@click="showEditPopup('edit', row, $index)" v-for="item in formData.column"
> :key="item.id"
编辑 :value="item.columnName"
</el-button> :label="`${item.columnName}${item.columnComment}`"
<el-button link type="danger" @click="handelDelete($index)"> />
删除 </el-select>
</el-button> </el-form-item>
</template>
</el-table-column>
</el-table>
<relations-add
:column="formData.table_column"
:types="relationTypes"
v-if="showEdit"
ref="editRef"
@add="handleAdd"
@edit="handleEdit"
@close="showEdit = false"
/>
</div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</el-form> </el-form>
</el-card> </el-card>
<footer-btns> <footer-btns>
<el-button type="primary" @click="onSubmit">保存</el-button> <el-button type="primary" @click="handleSave">保存</el-button>
</footer-btns> </footer-btns>
</div> </div>
</template> </template>
<script lang="ts" setup name="tableEdit"> <script lang="ts" setup name="tableEdit">
import type { FormInstance } from 'element-plus' import { dataTableAll, generateEdit, tableDetail, dataTableToColumn } from '@/api/tools/code'
import { cloneDeep } from 'lodash'
import { menuAll } from '@/api/perms/menu'
import { dictTypeAll } from '@/api/setting/dict' import { dictTypeAll } from '@/api/setting/dict'
import { generateEdit, tableDetail } from '@/api/tools/code' import type { FormInstance } from 'element-plus'
import { useDictOptions } from '@/hooks/useDictOptions'
import feedback from '@/utils/feedback' import feedback from '@/utils/feedback'
import { menuLists } from '@/api/perms/menu'
import { useDictOptions } from '@/hooks/useDictOptions'
import useMultipleTabs from '@/hooks/useMultipleTabs'
enum GenTpl {
CRUD = 'crud',
TREE = 'tree'
}
import RelationsAdd from '../components/relations-add.vue' enum GenType {
ZIP,
CUSTOM_PATH
}
const route = useRoute() const route = useRoute()
const router = useRouter() const router = useRouter()
const { removeTab } = useMultipleTabs()
const activeName = ref('column') const activeName = ref('column')
const showEdit = ref(false)
const relationTypes = [
{
name: '一对一',
value: 'has_one'
},
{
name: '一对多',
value: 'has_many'
}
]
const formData = reactive({ const formData = reactive({
id: '', base: {
table_name: '', id: '',
table_comment: '', tableName: '',
author: '', tableComment: '',
remark: '', entityName: '',
template_type: 0, authorName: '',
generate_type: 0, remarks: ''
module_name: '',
class_dir: '',
class_comment: '',
table_column: [] as any[],
menu: {
pid: 0,
name: '',
type: 0
}, },
tree: { column: [] as any[],
tree_id: 0, gen: {
tree_pid: 0, functionName: '',
tree_name: 0 genPath: '',
}, genTpl: '',
delete: { genType: 0,
name: '', moduleName: '',
type: 0 subTableFk: '',
}, subTableName: '',
relations: [] as any[] subTableFr: '',
}) treeParent: '',
let editIndex = 0 treePrimary: '',
const formRef = shallowRef<FormInstance>() treeName: '',
const editRef = shallowRef<InstanceType<typeof RelationsAdd>>() menuName: '',
const rules = reactive({ menuStatus: 0,
table_name: [{ required: true, message: '请输入表名称' }], menuPid: 0
table_comment: [{ required: true, message: '请输入表描述' }],
module_name: [{ required: true, message: '请输入模块名' }],
generate_type: [{ required: true, trigger: 'change' }],
template_type: [{ required: true, trigger: 'change' }],
['menu.pid']: [{ required: true, message: '请选择父级菜单' }],
['menu.name']: [{ required: true, message: '请输入菜单名称' }],
['delete.type']: [{ required: true, trigger: 'change' }],
['delete.name']: [{ required: true, message: '请选择删除字段' }]
})
const showEditPopup = async (type: string, data?: any, index?: number) => {
showEdit.value = true
await nextTick()
if (data && index !== undefined) {
editRef.value?.setFormData(data)
editIndex = index
} }
editRef.value?.open(type) })
}
const handleAdd = (data: any) => { const formRef = shallowRef<FormInstance>()
const newData = cloneDeep(toRaw(data)) const rules = reactive({
formData.relations.push(newData) ['base.tableName']: [{ required: true, message: '请输入表名称', trigger: 'blur' }],
} ['base.tableComment']: [{ required: true, message: '请输入表描述', trigger: 'blur' }],
['base.entityName']: [{ required: true, message: '请输入实体类名称', trigger: 'blur' }],
['base.authorName']: [{ required: true, message: '请输入作者', trigger: 'blur' }],
['gen.moduleName']: [{ required: true, message: '请输入模块名', trigger: 'blur' }],
['gen.functionName']: [{ required: true, message: '请输入功能名称', trigger: 'blur' }],
['gen.treePrimary']: [{ required: true, message: '请选择树主键字段', trigger: 'blur' }],
['gen.treeParent']: [{ required: true, message: '请选择树父级字段', trigger: 'blur' }],
['gen.treeName']: [{ required: true, message: '请选择树名称字段', trigger: 'blur' }]
})
const handleEdit = async (data: any) => {
const newData = cloneDeep(toRaw(data))
console.log(editIndex)
formData.relations.splice(editIndex, 1, newData)
}
const handelDelete = (index: number) => {
formData.relations.splice(index, 1)
}
const getDetails = async () => { const getDetails = async () => {
const data = await tableDetail({ const data = await tableDetail({
id: route.query.id id: route.query.id
}) })
Object.keys(formData).forEach((key) => { Object.keys(formData).forEach((key) => {
//@ts-ignore //@ts-ignore
formData[key] = data[key] formData[key] = data[key]
}) })
getTableColumn()
watch(
() => formData.generate_type,
(value) => {
if (value == 1) {
feedback
.confirm('生成到模块方式如遇同名文件会覆盖旧文件,确定要选择此方式吗?')
.catch(() => {
formData.generate_type = 0
})
}
}
)
} }
const { optionsData } = useDictOptions<{ const { optionsData } = useDictOptions<{
dict_type: any[] dictType: any[]
menu: any[] menu: any[]
dataTable: any[]
}>({ }>({
dict_type: { dictType: {
api: dictTypeAll api: dictTypeAll
}, },
menu: { menu: {
api: menuAll, api: menuLists,
transformData(data) { transformData(data: any) {
const menu = { id: 0, name: '顶级', children: [] } const menu = { id: 0, menuName: '顶级', children: [] }
menu.children = data menu.children = data
return [menu] return [menu]
} }
},
dataTable: {
api: dataTableAll
} }
}) })
const onSubmit = async () => { const columnLoading = ref(false)
const tableColumn = ref<any[]>([])
const getTableColumn = async () => {
columnLoading.value = true
const res = await dataTableToColumn({ tableName: formData.gen.subTableName })
columnLoading.value = false
tableColumn.value = res
}
const handleTableChange = () => {
formData.gen.subTableFk = ''
getTableColumn()
}
const handleSave = async () => {
try { try {
await formRef.value?.validate() await formRef.value?.validate()
await generateEdit(formData) const { base, column, gen } = formData
await generateEdit({ ...base, ...gen, column })
feedback.msgSuccess('操作成功')
removeTab()
router.back() router.back()
} catch (error: any) { } catch (error: any) {
for (const err in error) { for (const err in error) {

View File

@ -5,7 +5,7 @@
<el-form-item label="表名称"> <el-form-item label="表名称">
<el-input <el-input
class="w-[280px]" class="w-[280px]"
v-model="formData.table_name" v-model="formData.tableName"
clearable clearable
@keyup.enter="resetPage" @keyup.enter="resetPage"
/> />
@ -13,7 +13,7 @@
<el-form-item label="表描述"> <el-form-item label="表描述">
<el-input <el-input
class="w-[280px]" class="w-[280px]"
v-model="formData.table_comment" v-model="formData.tableComment"
clearable clearable
@keyup.enter="resetPage" @keyup.enter="resetPage"
/> />
@ -27,7 +27,7 @@
<el-card class="!border-none mt-4" shadow="never" v-loading="pager.loading"> <el-card class="!border-none mt-4" shadow="never" v-loading="pager.loading">
<div class="flex"> <div class="flex">
<data-table <data-table
v-perms="['tools.generator/selectTable']" v-perms="['gen:importTable']"
class="inline-block mr-[10px]" class="inline-block mr-[10px]"
@success="getLists" @success="getLists"
> >
@ -39,9 +39,9 @@
</el-button> </el-button>
</data-table> </data-table>
<el-button <el-button
v-perms="['tools.generator/delete']" v-perms="['gen:delTable']"
:disabled="!selectData.length" :disabled="!selectData.length"
@click="handleDelete(selectData)" @click="handleDelete()"
type="danger" type="danger"
> >
<template #icon> <template #icon>
@ -50,7 +50,7 @@
删除 删除
</el-button> </el-button>
<el-button <el-button
v-perms="['tools.generator/generate']" v-perms="['gen:genCode', 'gen:downloadCode']"
:disabled="!selectData.length" :disabled="!selectData.length"
@click="handleGenerate(selectData)" @click="handleGenerate(selectData)"
> >
@ -64,15 +64,15 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column label="表名称" prop="table_name" min-width="180" /> <el-table-column label="表名称" prop="tableName" min-width="180" />
<el-table-column label="表描述" prop="table_comment" min-width="180" /> <el-table-column label="表描述" prop="tableComment" min-width="180" />
<el-table-column label="创建时间" prop="create_time" min-width="180" /> <el-table-column label="创建时间" prop="createTime" min-width="180" />
<el-table-column label="更新时间" prop="update_time" min-width="180" /> <el-table-column label="更新时间" prop="updateTime" min-width="180" />
<el-table-column label="操作" width="160" fixed="right"> <el-table-column label="操作" width="160" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<div class="flex items-center"> <div class="flex items-center">
<el-button <el-button
v-perms="['tools.generator/preview']" v-perms="['gen:previewCode']"
type="primary" type="primary"
link link
@click="handlePreview(row.id)" @click="handlePreview(row.id)"
@ -80,9 +80,8 @@
预览 预览
</el-button> </el-button>
<el-button type="primary" link> <el-button type="primary" link v-perms="['tools.generator/edit']">
<router-link <router-link
v-perms="['tools.generator/edit']"
:to="{ :to="{
path: getRoutePath('tools.generator/edit'), path: getRoutePath('tools.generator/edit'),
query: { query: {
@ -97,9 +96,10 @@
class="ml-2" class="ml-2"
@command="handleCommand($event, row)" @command="handleCommand($event, row)"
v-perms="[ v-perms="[
'tools.generator/generate', 'gen:genCode',
'tools.generator/syncColumn', 'gen:downloadCode',
'tools.generator/delete' 'gen:syncTable',
'gen:delTable'
]" ]"
> >
<el-button type="primary" link> <el-button type="primary" link>
@ -109,21 +109,21 @@
<template #dropdown> <template #dropdown>
<el-dropdown-menu> <el-dropdown-menu>
<div v-perms="['tools.generator/generate']"> <div v-perms="['gen:genCode', 'gen:downloadCode']">
<el-dropdown-item command="generate"> <el-dropdown-item command="generate">
<el-button type="primary" link> <el-button type="primary" link>
生成代码 生成代码
</el-button> </el-button>
</el-dropdown-item> </el-dropdown-item>
</div> </div>
<div v-perms="['tools.generator/syncColumn']"> <div v-perms="['gen:syncTable']">
<el-dropdown-item command="sync"> <el-dropdown-item command="sync">
<el-button type="primary" link> <el-button type="primary" link>
同步 同步
</el-button> </el-button>
</el-dropdown-item> </el-dropdown-item>
</div> </div>
<div v-perms="['tools.generator/delete']"> <div v-perms="['gen:delTable']">
<el-dropdown-item command="delete"> <el-dropdown-item command="delete">
<el-button type="danger" link> 删除 </el-button> <el-button type="danger" link> 删除 </el-button>
</el-dropdown-item> </el-dropdown-item>
@ -150,29 +150,29 @@
<script lang="ts" setup name="codeGenerate"> <script lang="ts" setup name="codeGenerate">
import { import {
generateCode, generateTable,
syncColumn,
generateDelete, generateDelete,
generatePreview, generatePreview,
generateTable, generateCode,
syncColumn downloadCode
} from '@/api/tools/code' } from '@/api/tools/code'
import { usePaging } from '@/hooks/usePaging' import { usePaging } from '@/hooks/usePaging'
import { getRoutePath } from '@/router'
import { isProdMode } from '@/utils/env'
import feedback from '@/utils/feedback'
import CodePreview from '../components/code-preview.vue'
import DataTable from '../components/data-table.vue' import DataTable from '../components/data-table.vue'
import CodePreview from '../components/code-preview.vue'
import feedback from '@/utils/feedback'
import { streamFileDownload } from '@/utils/file'
import { getRoutePath } from '@/router'
const formData = reactive({ const formData = reactive({
table_name: '', tableName: '',
table_comment: '' tableComment: ''
}) })
const previewState = reactive({ const previewState = reactive({
show: false, show: false,
loading: false, loading: false,
code: [] code: {}
}) })
const { pager, getLists, resetParams, resetPage } = usePaging({ const { pager, getLists, resetParams, resetPage } = usePaging({
@ -182,17 +182,20 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
const selectData = ref<any[]>([]) const selectData = ref<any[]>([])
const handleSelectionChange = (val: any[]) => { const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id) selectData.value = val
} }
const handleSync = async (id: number) => { const handleSync = async (id: number) => {
await feedback.confirm('确定要同步表结构?') await feedback.confirm('确定要同步表结构?')
await syncColumn({ id }) await syncColumn({ id })
feedback.msgSuccess('操作成功')
} }
const handleDelete = async (id: number | any[]) => { const handleDelete = async (ids?: number[]) => {
if (!ids) ids = selectData.value.map(({ id }) => id)
await feedback.confirm('确定要删除?') await feedback.confirm('确定要删除?')
await generateDelete({ id }) await generateDelete({ ids })
feedback.msgSuccess('删除成功')
getLists() getLists()
} }
@ -202,32 +205,42 @@ const handlePreview = async (id: number) => {
previewState.show = true previewState.show = true
} }
const hasGenerateTypeInModule = (data: any[]) => { const handleGenerate = async (selectData: any[]) => {
return data.some((item) => item.generate_type == 1) const downloadTables = getTables(selectData, 0)
const genTables = getTables(selectData, 1)
if (downloadTables) {
const file = await downloadCode({ tables: downloadTables })
streamFileDownload(file, 'likeadmin-curd.zip')
}
if (genTables) {
await generateCode({ tables: genTables })
feedback.msgSuccess('生成成功')
}
} }
const handleGenerate = async (selectData: any[]) => { const getTables = (selectData: any[], type: 0 | 1) => {
if (isProdMode() && hasGenerateTypeInModule(selectData)) { return selectData
return feedback.msgError('生成方式为生成到模块,请在前端开发模式下使用,详细参考文档') .filter(({ genType }) => genType == type)
} .map(({ tableName }) => tableName)
const data: any = await generateCode({ id: selectData }) .join()
if (data.file) {
window.open(data.file, '_blank')
}
} }
const handleCommand = (command: any, row: any) => { const handleCommand = (command: any, row: any) => {
switch (command) { switch (command) {
case 'generate': case 'generate':
handleGenerate([row.id]) handleGenerate([row])
break break
case 'sync': case 'sync':
handleSync(row.id) handleSync(row.id)
break break
case 'delete': case 'delete':
handleDelete(row.id) handleDelete([row.id])
} }
} }
onActivated(() => {
getLists()
})
getLists() getLists()
</script> </script>

View File

@ -3,17 +3,17 @@
<el-dialog v-model="show" width="900px" title="代码预览"> <el-dialog v-model="show" width="900px" title="代码预览">
<el-tabs v-model="activeTab"> <el-tabs v-model="activeTab">
<el-tab-pane <el-tab-pane
v-for="(item, index) in code" v-for="(item, key, index) in code"
:label="item.name" :label="key"
:name="`index${index}`" :name="`index${index}`"
:key="index" :key="key"
> >
<div class="flex" style="height: 50vh"> <div class="flex" style="height: 50vh">
<el-scrollbar class="flex-1"> <el-scrollbar class="flex-1">
<highlightjs autodetect :code="item.content" /> <highlightjs autodetect :code="item" />
</el-scrollbar> </el-scrollbar>
<div> <div>
<el-button @click="handleCopy(item.content)" type="primary" link> <el-button @click="handleCopy(item)" type="primary" link>
<template #icon> <template #icon>
<icon name="el-icon-CopyDocument" /> <icon name="el-icon-CopyDocument" />
</template> </template>
@ -28,13 +28,12 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import useClipboard from 'vue-clipboard3'
import feedback from '@/utils/feedback' import feedback from '@/utils/feedback'
import useClipboard from 'vue-clipboard3'
const props = defineProps<{ const props = defineProps<{
modelValue: boolean modelValue: boolean
code: any[] code: Record<string, string>
}>() }>()
const emit = defineEmits<{ const emit = defineEmits<{

View File

@ -15,7 +15,7 @@
<el-form-item label="表名称"> <el-form-item label="表名称">
<el-input <el-input
class="w-[280px]" class="w-[280px]"
v-model="formData.name" v-model="formData.tableName"
clearable clearable
@keyup.enter="resetPage" @keyup.enter="resetPage"
/> />
@ -23,7 +23,7 @@
<el-form-item label="表描述"> <el-form-item label="表描述">
<el-input <el-input
class="w-[280px]" class="w-[280px]"
v-model="formData.comment" v-model="formData.tableComment"
clearable clearable
@keyup.enter="resetPage" @keyup.enter="resetPage"
/> />
@ -41,9 +41,9 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column label="表名称" prop="name" min-width="150" /> <el-table-column label="表名称" prop="tableName" min-width="150" />
<el-table-column label="表描述" prop="comment" min-width="160" /> <el-table-column label="表描述" prop="tableComment" min-width="160" />
<el-table-column label="创建时间" prop="create_time" min-width="180" /> <el-table-column label="创建时间" prop="createTime" min-width="180" />
</el-table> </el-table>
</div> </div>
<div class="flex justify-end mt-4"> <div class="flex justify-end mt-4">
@ -54,10 +54,10 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { dataTable, selectTable } from '@/api/tools/code'
import Pagination from '@/components/pagination/index.vue'
import Popup from '@/components/popup/index.vue' import Popup from '@/components/popup/index.vue'
import Pagination from '@/components/pagination/index.vue'
import { usePaging } from '@/hooks/usePaging' import { usePaging } from '@/hooks/usePaging'
import { dataTable, selectTable } from '@/api/tools/code'
import feedback from '@/utils/feedback' import feedback from '@/utils/feedback'
const emit = defineEmits<{ const emit = defineEmits<{
@ -67,8 +67,8 @@ const emit = defineEmits<{
const popupRef = shallowRef<InstanceType<typeof Popup>>() const popupRef = shallowRef<InstanceType<typeof Popup>>()
const formData = reactive({ const formData = reactive({
name: '', // tableName: '', //
comment: '' // tableComment: '' //
}) })
const { pager, getLists, resetParams, resetPage } = usePaging({ const { pager, getLists, resetParams, resetPage } = usePaging({
@ -80,17 +80,15 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
const selectData = ref<any[]>([]) const selectData = ref<any[]>([])
const handleSelectionChange = (val: any[]) => { const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ name, comment }) => ({ selectData.value = val.map(({ tableName }) => tableName)
name,
comment
}))
} }
const handleConfirm = async () => { const handleConfirm = async () => {
if (!selectData.value.length) return feedback.msgError('请选择数据表') if (!selectData.value.length) return feedback.msgError('请选择数据表')
await selectTable({ await selectTable({
table: selectData.value tables: selectData.value.join()
}) })
feedback.msgSuccess('导入成功')
popupRef.value?.close() popupRef.value?.close()
emit('success') emit('success')
} }

View File

@ -24,7 +24,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
@RestController @RestController
@RequestMapping("/api/gen") @RequestMapping("/adminapi/gen")
public class GenController { public class GenController {
@Resource @Resource

View File

@ -1,5 +1,6 @@
package com.mdd.generator.vo; package com.mdd.generator.vo;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@ -9,8 +10,11 @@ public class DbColumnVo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@JsonProperty("columnName")
private String columnName; // 字段名称 private String columnName; // 字段名称
@JsonProperty("columnComment")
private String columnComment; // 字段描述 private String columnComment; // 字段描述
@JsonProperty("columnType")
private String columnType; // 字段类型 private String columnType; // 字段类型
} }

View File

@ -1,5 +1,6 @@
package com.mdd.generator.vo; package com.mdd.generator.vo;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@ -12,10 +13,15 @@ public class DbTableVo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@JsonProperty("tableName")
private String tableName; // 表的名称 private String tableName; // 表的名称
@JsonProperty("tableComment")
private String tableComment; // 表的描述 private String tableComment; // 表的描述
@JsonProperty("authorName")
private String authorName; // 作者名称 private String authorName; // 作者名称
@JsonProperty("createTime")
private String createTime; // 创建时间 private String createTime; // 创建时间
@JsonProperty("updateTime")
private String updateTime; // 更新时间 private String updateTime; // 更新时间
} }

View File

@ -1,5 +1,6 @@
package com.mdd.generator.vo; package com.mdd.generator.vo;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@ -13,21 +14,37 @@ public class GenColumnVo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private Integer id; // 字段主键 private Integer id; // 字段主键
@JsonProperty("columnName")
private String columnName; // 字段名称 private String columnName; // 字段名称
@JsonProperty("columnComment")
private String columnComment; // 字段描述 private String columnComment; // 字段描述
@JsonProperty("columnLength")
private Integer columnLength; // 字段长度 private Integer columnLength; // 字段长度
@JsonProperty("columnType")
private String columnType; // 字段类型 private String columnType; // 字段类型
@JsonProperty("javaType")
private String javaType; // JAVA类型 private String javaType; // JAVA类型
@JsonProperty("javaField")
private String javaField; // JAVA字段 private String javaField; // JAVA字段
@JsonProperty("isRequired")
private Integer isRequired; // 是否必填 private Integer isRequired; // 是否必填
@JsonProperty("isInsert")
private Integer isInsert; // 是否插入字段 private Integer isInsert; // 是否插入字段
@JsonProperty("isEdit")
private Integer isEdit; // 是否编辑字段 private Integer isEdit; // 是否编辑字段
@JsonProperty("isList")
private Integer isList; // 是否列表字段 private Integer isList; // 是否列表字段
@JsonProperty("isQuery")
private Integer isQuery; // 是否查询字段 private Integer isQuery; // 是否查询字段
@JsonProperty("queryType")
private String queryType; // 查询方式: [等于不等于大于小于范围] private String queryType; // 查询方式: [等于不等于大于小于范围]
@JsonProperty("htmlType")
private String htmlType; // 显示类型: [文本框文本域下拉框复选框单选框日期控件] private String htmlType; // 显示类型: [文本框文本域下拉框复选框单选框日期控件]
@JsonProperty("dictType")
private String dictType; // 字典类型 private String dictType; // 字典类型
@JsonProperty("createTime")
private String createTime; // 创建时间 private String createTime; // 创建时间
@JsonProperty("updateTime")
private String updateTime; // 更新时间 private String updateTime; // 更新时间
} }

View File

@ -1,5 +1,6 @@
package com.mdd.generator.vo; package com.mdd.generator.vo;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@ -13,10 +14,15 @@ public class GenTableVo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private Integer id; // 生成主键 private Integer id; // 生成主键
@JsonProperty("genType")
private Integer genType; // 生成类型: [0=zip压缩包, 1=自定义路径] private Integer genType; // 生成类型: [0=zip压缩包, 1=自定义路径]
@JsonProperty("tableName")
private String tableName; // 表的名称 private String tableName; // 表的名称
@JsonProperty("tableComment")
private String tableComment; // 表的描述 private String tableComment; // 表的描述
@JsonProperty("createTime")
private String createTime; // 创建时间 private String createTime; // 创建时间
@JsonProperty("updateTime")
private String updateTime; // 删除时间 private String updateTime; // 删除时间
} }

View File

@ -725,9 +725,7 @@ INSERT INTO `la_system_menu` (`id`, `pid`, `type`, `name`, `icon`, `sort`, `perm
(173, 175, 'C', '系统风格', 'el-icon-Brush', 80, '', 'style', 'decoration/style/style', '', '', 0, 1, 0, 1681635044, 1710929278), (173, 175, 'C', '系统风格', 'el-icon-Brush', 80, '', 'style', 'decoration/style/style', '', '', 0, 1, 0, 1681635044, 1710929278),
(174, 96, 'C', '素材中心', 'local-icon-shangchuanzhaopian', 0, 'file/listCate', 'material', 'material/index', '', '', 0, 1, 0, 1710734367, 1710734392), (174, 96, 'C', '素材中心', 'local-icon-shangchuanzhaopian', 0, 'file/listCate', 'material', 'material/index', '', '', 0, 1, 0, 1710734367, 1710734392),
(175, 96, 'M', '移动端', '', 100, '', 'mobile', '', '', '', 0, 1, 0, 1710901543, 1710929294), (175, 96, 'M', '移动端', '', 100, '', 'mobile', '', '', '', 0, 1, 0, 1710901543, 1710929294),
(176, 96, 'M', 'PC端', '', 90, '', 'pc', '', '', '', 0, 1, 0, 1710901592, 1710929299), (176, 96, 'M', 'PC端', '', 90, '', 'pc', '', '', '', 0, 1, 0, 1710901592, 1710929299);
(177, 29, 'C', '站点统计', '', 0, 'setting.web.web_setting/getSiteStatistics', 'statistics', 'setting/website/statistics', '', '', 0, 1, 0, 1726841481, 1726843434),
(178, 177, 'A', '保存', '', 0, 'setting.web.web_setting/saveSiteStatistics', '', '', '', '', 1, 1, 0, 1726841507, 1726841507);
DROP TABLE IF EXISTS `la_system_role`; DROP TABLE IF EXISTS `la_system_role`;
CREATE TABLE `la_system_role` ( CREATE TABLE `la_system_role` (