优化调整代码生成页面

.gitignore

@@ -29,6 +29,6 @@ dist/
 node_modules/
 /Admin.NET/Admin.NET.Web.Entry/wwwroot/Avatar
 /Admin.NET/Admin.NET.Web.Entry/wwwroot/Signature
-/Admin.NET/Admin.NET.Web.Entry/Admin.NET.db
+/Admin.NET/Admin.NET.Web.Entry/*.db
 /Admin.NET/Admin.NET.Web.Core/Admin.NET.Web.Core.csproj.user
 /Admin.NET/Admin.NET.Web.Entry/Admin.NET.Web.Entry.csproj.user

Admin.NET/Admin.NET.Application/Configuration/CodeGen.json

@@ -4,7 +4,7 @@
     // 代码生成配置项-程序集名称集合
     "CodeGen": {
         "EntityAssemblyNames": [ "Admin.NET.Core", "Admin.NET.Application" ],
-        "FrontRootPath": "Vben2", //前端文件根目录
+        "FrontRootPath": "Web", //前端文件根目录
         "BackendApplicationNamespace": "Admin.NET.Application" //后端生成到的项目
     }
 }

Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenConfigService.cs

@@ -24,6 +24,8 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
         return await _db.Queryable<SysCodeGenConfig>()
             .Where(u => u.CodeGenId == input.CodeGenId && u.WhetherCommon != YesNoEnum.Y.ToString())
             .Select<CodeGenConfig>().ToListAsync();
+
+
     }
 
     /// <summary>

Web/.env.production

@@ -2,4 +2,4 @@
 ENV = 'production'
 
 # 线上环境接口地址
-VITE_API_URL = 'https://localhost:5005'
+VITE_API_URL = 'https://localhost:44326'

Web/src/api/main/generatetest.ts

@@ -1,40 +0,0 @@
-import request from '/@/utils/request';
-enum Api {
-  Addgeneratetest = '/generatetest/add',
-  Deletegeneratetest = '/generatetest/delete',
-  Updategeneratetest = '/generatetest/edit',
-  GetgeneratetestPage = '/generatetest/page',
-}
-
-// 增加GenerateTest
-export const addgeneratetest = (params?: any) =>
-	request({
-		url: Api.Addgeneratetest,
-		method: 'post',
-		data: params,
-	});
-
-// 删除GenerateTest
-export const deletegeneratetest = (params?: any) => 
-	request({
-			url: Api.Deletegeneratetest,
-			method: 'post',
-			data: params,
-		});
-
-// 编辑GenerateTest
-export const updategeneratetest = (params?: any) => 
-	request({
-			url: Api.Updategeneratetest,
-			method: 'post',
-			data: params,
-		});
-
-// 分页查询GenerateTest
-export const getgeneratetestPageList = (params?: any) => 
-	request({
-			url: Api.GetgeneratetestPage,
-			method: 'get',
-			data: params,
-		});
-

Web/src/api/system/admin.ts

@@ -1,243 +0,0 @@
-import request from '/@/utils/request';
-
-enum Api {
-	// 获取菜单列表
-	GetMenuList = '/sysMenu/list',
-	// 字典接口
-	GetDictTypePageList = '/sysDictType/pageList',
-	GetDictTypeList = '/sysDictType/list',
-	AddDictType = '/sysDictType/add',
-	UpdateDictType = '/sysDictType/update',
-	DeleteDictType = '/sysDictType/delete',
-
-	GetDictDataPageList = '/sysDictData/pageList',
-	AddDictData = '/sysDictData/add',
-	UpdateDictData = '/sysDictData/update',
-	DeleteDictData = '/sysDictData/delete',
-	GetDictDataDropdown = '/sysDictData/DictDataDropdown',
-	QueryDictDataDropdown = '/sysDictData/queryDictDataDropdown',
-	// 代码生成接口
-	GetGeneratePage = '/codeGenerate/page',
-	AddGenerate = '/codeGenerate/add',
-	UpdateGenerate = '/codeGenerate/edit',
-	DeleGenerate = '/codeGenerate/delete',
-	GetTableList = '/codeGenerate/InformationList',
-	GetColumnList = '/codeGenerate/ColumnList',
-	GenerateRunLocal = '/codeGenerate/runLocal',
-	GenerateRunDown = '/codeGenerate/runDown',
-	GetGenerateConfigList = '/sysCodeGenerateConfig/list',
-	UpdateGenerateConfig = '/sysCodeGenerateConfig/edit',
-	GetDatabaseList = '/codeGenerate/DatabaseList',
-
-	// 数据库接口
-	GetColumnInfoList = '/sysDatabase/columnList',
-	GetTableInfoList = '/sysDatabase/tableList',
-	AddTable = '/sysDatabase/table/add',
-	UpdateTable = '/sysDatabase/table/update',
-	DeleTetable = '/sysDatabase/table/delete',
-	AddColumn = '/sysDatabase/column/add',
-	UpdateColumn = '/sysDatabase/column/update',
-	DeleteColumn = '/sysDatabase/column/delete',
-	CreateEntity = '/sysDatabase/entity/create',
-
-	// 常量下拉框接口
-	AllConstSelector = '/constSelector/allConstSelector',
-	ConstSelector = '/constSelector/constSelector',
-	AllConstSelectorWithOptions = '/constSelector/allConstSelectorWithOptions',
-}
-
-////////// 常量下拉框管理接口 //////////
-// 获取所有常量下拉框列表
-export const getAllConstSelector = () =>
-	request({
-		url: Api.AllConstSelector,
-		method: 'get',
-	});
-
-// 根据类名获取下拉框数据
-export const getConstSelector = (typeName?: string) =>
-	request({
-		url: Api.ConstSelector,
-		method: 'get',
-		data: { typeName },
-	});
-
-// 获取所有下拉框及选项
-export const getAllConstSelectorWithOptions = () =>
-	request({
-		url: Api.AllConstSelectorWithOptions,
-		method: 'get',
-	});
-
-export const getDictTypeList = (params?: any) =>
-	request({
-		url: Api.GetDictTypeList,
-		method: 'get',
-		data: params,
-	});
-
-export const getMenuList = (params?: any) =>
-	request({
-		url: Api.GetMenuList,
-		method: 'get',
-		data: params,
-	});
-
-// 从字典中值，下拉框控件使用
-export const getDictDataDropdown = (params: any) =>
-	request({
-		url: Api.GetDictDataDropdown + '/' + params,
-		method: 'get',
-	});
-
-////////// 代码生成接口 //////////
-// 分页查询代码生成
-export const getGeneratePage = (params?: any) =>
-	request({
-		url: Api.GetGeneratePage,
-		method: 'get',
-		data: params,
-	});
-
-// 增加代码生成
-export const addGenerate = (params: any) =>
-	request({
-		url: Api.AddGenerate,
-		method: 'post',
-		data: params,
-	});
-
-// 修改代码生成
-export const updateGenerate = (params: any) =>
-	request({
-		url: Api.UpdateGenerate,
-		method: 'post',
-		data: params,
-	});
-
-// 删除代码生成
-export const deleGenerate = (params: any) =>
-	request({
-		url: Api.DeleGenerate,
-		method: 'post',
-		data: params,
-	});
-
-// 获取数据库(上下文定位器)集合
-export const getDatabaseList = (params?: any) =>
-	request({
-		url: Api.GetDatabaseList,
-		method: 'get',
-		data: params,
-	});
-
-// 获取数据库表(实体)集合
-export const getTableList = (configId: string) =>
-	request({
-		url: Api.GetTableList + '/' + configId,
-		method: 'get',
-	});
-
-// 根据表名获取列
-export const getColumnList = (configId: string, tableName: string) =>
-	request({
-		url: Api.GetColumnList + '/' + configId + '/' + tableName,
-		method: 'get',
-	});
-
-// 本地生成
-export const generateRunLocal = (params: any) =>
-	request({
-		url: Api.GenerateRunLocal,
-		method: 'post',
-		data: params,
-	});
-
-// 代码生成详细配置列表
-export const getGenerateConfigList = (params?: any) =>
-	request({
-		url: Api.GetGenerateConfigList,
-		method: 'get',
-		data: params,
-	});
-
-// 编辑代码生成详细配置
-export const updateGenerateConfig = (params: any) =>
-	request({
-		url: Api.UpdateGenerateConfig,
-		method: 'post',
-		data: params,
-	});
-
-//////////数据库管理接口 //////////
-// 获取表字段
-export const getColumnInfoList = (params: any) =>
-	request({
-		url: Api.GetColumnInfoList,
-		method: 'get',
-		data: params,
-	});
-
-// 获取所有表
-export const getTableInfoList = (params?: any) =>
-	request({
-		url: Api.GetTableInfoList,
-		method: 'get',
-		data: params,
-	});
-
-// 添加表
-export const addTable = (params: any) =>
-	request({
-		url: Api.AddTable,
-		method: 'post',
-		data: params,
-	});
-
-// 修改表
-export const updateTable = (params: any) =>
-	request({
-		url: Api.UpdateTable,
-		method: 'post',
-		data: params,
-	});
-
-// 删除表
-export const deleteTable = (params: any) =>
-	request({
-		url: Api.DeleTetable,
-		method: 'post',
-		data: params,
-	});
-
-// 添加字段
-export const addColumn = (params: any) =>
-	request({
-		url: Api.AddColumn,
-		method: 'post',
-		data: params,
-	});
-
-// 修改字段
-export const updateColumn = (params: any) =>
-	request({
-		url: Api.UpdateColumn,
-		method: 'post',
-		data: params,
-	});
-
-// 删除字段
-export const deleteColumn = (params: any) =>
-	request({
-		url: Api.DeleteColumn,
-		method: 'post',
-		data: params,
-	});
-
-// 生成实体
-export const createEntity = (params: any) =>
-	request({
-		url: Api.CreateEntity,
-		method: 'post',
-		data: params,
-	});

Web/src/api/system/enum.ts

@@ -1,30 +0,0 @@
-/**
- * 
- * @export
- * @enum {string}
- */
- export enum DbObjectType {
-    NUMBER_0 = 0,
-    NUMBER_1 = 1,
-    NUMBER_2 = 2
-}
-/**
- * 系统菜单类型枚举<br />&nbsp;目录 Dir = 1<br />&nbsp;菜单 Menu = 2<br />&nbsp;按钮 Btn = 3<br />
- * @export
- * @enum {string}
- */
- export enum MenuTypeEnum {
-    NUMBER_1 = 1,
-    NUMBER_2 = 2,
-    NUMBER_3 = 3
-}
-
-/**
- * 通用状态枚举<br />&nbsp;启用 Enable = 1<br />&nbsp;停用 Disable = 2<br />
- * @export
- * @enum {string}
- */
- export enum StatusEnum {
-    NUMBER_1 = 1,
-    NUMBER_2 = 2
-}

Web/src/api/system/interface.ts

@@ -1,754 +0,0 @@
-import { DbObjectType, MenuTypeEnum, StatusEnum } from './enum';
-
-/**
- *
- * @export
- * @interface DbTableInfo
- */
-export interface DbTableInfo {
-	/**
-	 *
-	 * @type {string}
-	 * @memberof DbTableInfo
-	 */
-	name?: string | null;
-	/**
-	 *
-	 * @type {string}
-	 * @memberof DbTableInfo
-	 */
-	description?: string | null;
-	/**
-	 *
-	 * @type {DbObjectType}
-	 * @memberof DbTableInfo
-	 */
-	// dbObjectType?: DbObjectType;
-}
-
-/**
- *
- * @export
- * @interface EditRecordRow
- */
-export interface EditRecordRow {
-	columnDescription?: string | null;
-	dataType?: string | null;
-	dbColumnName?: string | null;
-	decimalDigits: number;
-	isIdentity: number;
-	isNullable: number;
-	isPrimarykey: number;
-	length: number;
-	key?: number;
-	editable?: boolean;
-	isNew: boolean;
-}
-
-/**
- *
- * @export
- * @interface UpdateDbTableInput
- */
-export interface UpdateDbTableInput {
-	/**
-	 *
-	 * @type {string}
-	 * @memberof UpdateDbTableInput
-	 */
-	configId?: string | null;
-	/**
-	 *
-	 * @type {string}
-	 * @memberof UpdateDbTableInput
-	 */
-	tableName?: string | null;
-	/**
-	 *
-	 * @type {string}
-	 * @memberof UpdateDbTableInput
-	 */
-	oldTableName?: string | null;
-	/**
-	 *
-	 * @type {string}
-	 * @memberof UpdateDbTableInput
-	 */
-	description?: string | null;
-}
-
-/**
- *
- * @export
- * @interface AddDbColumnInput
- */
-export interface AddDbColumnInput {
-	/**
-	 *
-	 * @type {string}
-	 * @memberof AddDbColumnInput
-	 */
-	configId?: string | null;
-	/**
-	 *
-	 * @type {string}
-	 * @memberof AddDbColumnInput
-	 */
-	tableName?: string | null;
-	/**
-	 *
-	 * @type {string}
-	 * @memberof AddDbColumnInput
-	 */
-	columnDescription?: string | null;
-	/**
-	 *
-	 * @type {string}
-	 * @memberof AddDbColumnInput
-	 */
-	dataType?: string | null;
-	/**
-	 *
-	 * @type {string}
-	 * @memberof AddDbColumnInput
-	 */
-	dbColumnName?: string | null;
-	/**
-	 *
-	 * @type {string}
-	 * @memberof AddDbColumnInput
-	 */
-	decimalDigits: number;
-	/**
-	 *
-	 * @type {string}
-	 * @memberof AddDbColumnInput
-	 */
-	isIdentity: number;
-	/**
-	 *
-	 * @type {string}
-	 * @memberof AddDbColumnInput
-	 */
-	isNullable: number;
-	/**
-	 *
-	 * @type {string}
-	 * @memberof AddDbColumnInput
-	 */
-	isPrimarykey: number;
-	/**
-	 *
-	 * @type {string}
-	 * @memberof AddDbColumnInput
-	 */
-	length: number;
-	/**
-	 *
-	 * @type {string}
-	 * @memberof AddDbColumnInput
-	 */
-	key: number;
-	/**
-	 *
-	 * @type {string}
-	 * @memberof AddDbColumnInput
-	 */
-	editable: boolean;
-	/**
-	 *
-	 * @type {string}
-	 * @memberof AddDbColumnInput
-	 */
-	isNew: boolean;
-}
-
-/**
- *
- * @export
- * @interface AddCodeGenInput
- */
-export interface AddCodeGenInput {
-	/**
-	 * 当前页码
-	 * @type {number}
-	 * @memberof AddCodeGenInput
-	 */
-	page?: number;
-	/**
-	 * 页码容量
-	 * @type {number}
-	 * @memberof AddCodeGenInput
-	 */
-	pageSize?: number;
-	/**
-	 * 排序字段
-	 * @type {string}
-	 * @memberof AddCodeGenInput
-	 */
-	field?: string | null;
-	/**
-	 * 排序方向
-	 * @type {string}
-	 * @memberof AddCodeGenInput
-	 */
-	order?: string | null;
-	/**
-	 * 降序排序
-	 * @type {string}
-	 * @memberof AddCodeGenInput
-	 */
-	descStr?: string | null;
-	/**
-	 * 类名
-	 * @type {string}
-	 * @memberof AddCodeGenInput
-	 */
-	className?: string | null;
-	/**
-	 * 是否移除表前缀
-	 * @type {string}
-	 * @memberof AddCodeGenInput
-	 */
-	tablePrefix?: string | null;
-	/**
-	 * 库定位器名
-	 * @type {string}
-	 * @memberof AddCodeGenInput
-	 */
-	configId?: string | null;
-	/**
-	 * 数据库名(保留字段)
-	 * @type {string}
-	 * @memberof AddCodeGenInput
-	 */
-	dbName?: string | null;
-	/**
-	 * 数据库类型
-	 * @type {string}
-	 * @memberof AddCodeGenInput
-	 */
-	dbType: string;
-	/**
-	 * 数据库类型
-	 * @type {string}
-	 * @memberof AddCodeGenInput
-	 */
-	dbTypeString?: string | null;
-	/**
-	 * 数据库链接
-	 * @type {string}
-	 * @memberof AddCodeGenInput
-	 */
-	connectionString?: string | null;
-	/**
-	 * 功能名（数据库表名称）
-	 * @type {string}
-	 * @memberof AddCodeGenInput
-	 */
-	tableComment?: string | null;
-	/**
-	 * 菜单应用分类（应用编码）
-	 * @type {string}
-	 * @memberof AddCodeGenInput
-	 */
-	menuApplication?: string | null;
-	/**
-	 * 数据库表名
-	 * @type {string}
-	 * @memberof AddCodeGenInput
-	 */
-	tableName: string;
-	/**
-	 * 业务名（业务代码包名称）
-	 * @type {string}
-	 * @memberof AddCodeGenInput
-	 */
-	busName: string;
-	/**
-	 * 命名空间
-	 * @type {string}
-	 * @memberof AddCodeGenInput
-	 */
-	nameSpace: string;
-	/**
-	 * 作者姓名
-	 * @type {string}
-	 * @memberof AddCodeGenInput
-	 */
-	authorName: string;
-	/**
-	 * 生成方式
-	 * @type {string}
-	 * @memberof AddCodeGenInput
-	 */
-	generateType: string;
-	/**
-	 * 菜单父级
-	 * @type {number}
-	 * @memberof AddCodeGenInput
-	 */
-	menuPid: number;
-	/**
-	 * 菜单父级
-	 * @type {number}
-	 * @memberof AddCodeGenInput
-	 */
-	id: number;
-	/**
-	 * 生成方式
-	 * @type {string}
-	 * @memberof AddCodeGenInput
-	 */
-	type: string;
-}
-/**
- * 代码生成表
- * @export
- * @interface SysCodeGen
- */
-export interface SysCodeGen {
-	/**
-	 * 雪花Id
-	 * @type {number}
-	 * @memberof SysCodeGen
-	 */
-	id?: number;
-	/**
-	 * 创建时间
-	 * @type {Date}
-	 * @memberof SysCodeGen
-	 */
-	createTime?: Date | null;
-	/**
-	 * 更新时间
-	 * @type {Date}
-	 * @memberof SysCodeGen
-	 */
-	updateTime?: Date | null;
-	/**
-	 * 创建者Id
-	 * @type {number}
-	 * @memberof SysCodeGen
-	 */
-	createUserId?: number | null;
-	/**
-	 * 修改者Id
-	 * @type {number}
-	 * @memberof SysCodeGen
-	 */
-	updateUserId?: number | null;
-	/**
-	 * 软删除
-	 * @type {boolean}
-	 * @memberof SysCodeGen
-	 */
-	isDelete?: boolean;
-	/**
-	 * 作者姓名
-	 * @type {string}
-	 * @memberof SysCodeGen
-	 */
-	authorName?: string | null;
-	/**
-	 * 是否移除表前缀
-	 * @type {string}
-	 * @memberof SysCodeGen
-	 */
-	tablePrefix?: string | null;
-	/**
-	 * 生成方式
-	 * @type {string}
-	 * @memberof SysCodeGen
-	 */
-	generateType?: string | null;
-	/**
-	 * 库定位器名
-	 * @type {string}
-	 * @memberof SysCodeGen
-	 */
-	configId?: string | null;
-	/**
-	 * 数据库名(保留字段)
-	 * @type {string}
-	 * @memberof SysCodeGen
-	 */
-	dbName?: string | null;
-	/**
-	 * 数据库类型
-	 * @type {string}
-	 * @memberof SysCodeGen
-	 */
-	dbType?: string | null;
-	/**
-	 * 数据库链接
-	 * @type {string}
-	 * @memberof SysCodeGen
-	 */
-	connectionString?: string | null;
-	/**
-	 * 数据库表名
-	 * @type {string}
-	 * @memberof SysCodeGen
-	 */
-	tableName?: string | null;
-	/**
-	 * 命名空间
-	 * @type {string}
-	 * @memberof SysCodeGen
-	 */
-	nameSpace?: string | null;
-	/**
-	 * 业务名
-	 * @type {string}
-	 * @memberof SysCodeGen
-	 */
-	busName?: string | null;
-	/**
-	 * 菜单编码
-	 * @type {number}
-	 * @memberof SysCodeGen
-	 */
-	menuPid?: number;
-}
-
-/**
- * 系统菜单表
- * @export
- * @interface SysMenu
- */
-export interface SysMenu {
-	/**
-	 * 雪花Id
-	 * @type {number}
-	 * @memberof SysMenu
-	 */
-	id?: number;
-	/**
-	 * 创建时间
-	 * @type {Date}
-	 * @memberof SysMenu
-	 */
-	createTime?: Date | null;
-	/**
-	 * 更新时间
-	 * @type {Date}
-	 * @memberof SysMenu
-	 */
-	updateTime?: Date | null;
-	/**
-	 * 创建者Id
-	 * @type {number}
-	 * @memberof SysMenu
-	 */
-	createUserId?: number | null;
-	/**
-	 * 修改者Id
-	 * @type {number}
-	 * @memberof SysMenu
-	 */
-	updateUserId?: number | null;
-	/**
-	 * 软删除
-	 * @type {boolean}
-	 * @memberof SysMenu
-	 */
-	isDelete?: boolean;
-	/**
-	 * 父Id
-	 * @type {number}
-	 * @memberof SysMenu
-	 */
-	pid?: number;
-	/**
-	 *
-	 * @type {MenuTypeEnum}
-	 * @memberof SysMenu
-	 */
-	type?: MenuTypeEnum;
-	/**
-	 * 名称
-	 * @type {string}
-	 * @memberof SysMenu
-	 */
-	name?: string | null;
-	/**
-	 * 路由地址
-	 * @type {string}
-	 * @memberof SysMenu
-	 */
-	path?: string | null;
-	/**
-	 * 组件路径
-	 * @type {string}
-	 * @memberof SysMenu
-	 */
-	component?: string | null;
-	/**
-	 * 重定向
-	 * @type {string}
-	 * @memberof SysMenu
-	 */
-	redirect?: string | null;
-	/**
-	 * 权限标识
-	 * @type {string}
-	 * @memberof SysMenu
-	 */
-	permission?: string | null;
-	/**
-	 * 标题
-	 * @type {string}
-	 * @memberof SysMenu
-	 */
-	title: string;
-	/**
-	 * 图标
-	 * @type {string}
-	 * @memberof SysMenu
-	 */
-	icon?: string | null;
-	/**
-	 * 是否内嵌
-	 * @type {boolean}
-	 * @memberof SysMenu
-	 */
-	isIframe?: boolean;
-	/**
-	 * 外链链接
-	 * @type {string}
-	 * @memberof SysMenu
-	 */
-	outLink?: string | null;
-	/**
-	 * 是否隐藏
-	 * @type {boolean}
-	 * @memberof SysMenu
-	 */
-	isHide?: boolean;
-	/**
-	 * 是否缓存
-	 * @type {boolean}
-	 * @memberof SysMenu
-	 */
-	isKeepAlive?: boolean;
-	/**
-	 * 是否固定
-	 * @type {boolean}
-	 * @memberof SysMenu
-	 */
-	isAffix?: boolean;
-	/**
-	 * 排序
-	 * @type {number}
-	 * @memberof SysMenu
-	 */
-	order?: number;
-	/**
-	 *
-	 * @type {StatusEnum}
-	 * @memberof SysMenu
-	 */
-	status?: StatusEnum;
-	/**
-	 * 备注
-	 * @type {string}
-	 * @memberof SysMenu
-	 */
-	remark?: string | null;
-	/**
-	 * 菜单子项
-	 * @type {Array<SysMenu>}
-	 * @memberof SysMenu
-	 */
-	children?: Array<SysMenu> | null;
-}
-
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Admin.NET
- * 让 .NET 开发更简单、更通用、更流行。前后端分离架构(.NET6/Vue3)，开箱即用紧随前沿技术。<br/><a href='https://gitee.com/zuohuaijun/Admin.NET/'>https://gitee.com/zuohuaijun/Admin.NET</a>
- *
- * OpenAPI spec version: 1.0.0
- * Contact: 515096995@qq.com
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-/**
- * 代码生成字段配置表
- * @export
- * @interface SysCodeGenConfig
- */
- export interface SysCodeGenConfig {
-    /**
-     * 雪花Id
-     * @type {number}
-     * @memberof SysCodeGenConfig
-     */
-    id?: number;
-    /**
-     * 创建时间
-     * @type {Date}
-     * @memberof SysCodeGenConfig
-     */
-    createTime?: Date | null;
-    /**
-     * 更新时间
-     * @type {Date}
-     * @memberof SysCodeGenConfig
-     */
-    updateTime?: Date | null;
-    /**
-     * 创建者Id
-     * @type {number}
-     * @memberof SysCodeGenConfig
-     */
-    createUserId?: number | null;
-    /**
-     * 修改者Id
-     * @type {number}
-     * @memberof SysCodeGenConfig
-     */
-    updateUserId?: number | null;
-    /**
-     * 软删除
-     * @type {boolean}
-     * @memberof SysCodeGenConfig
-     */
-    isDelete?: boolean;
-    /**
-     * 代码生成主表Id
-     * @type {number}
-     * @memberof SysCodeGenConfig
-     */
-    codeGenId?: number;
-    /**
-     * 数据库字段名
-     * @type {string}
-     * @memberof SysCodeGenConfig
-     */
-    columnName: string;
-    /**
-     * 字段描述
-     * @type {string}
-     * @memberof SysCodeGenConfig
-     */
-    columnComment?: string | null;
-    /**
-     * .NET数据类型
-     * @type {string}
-     * @memberof SysCodeGenConfig
-     */
-    netType?: string | null;
-    /**
-     * 作用类型（字典）
-     * @type {string}
-     * @memberof SysCodeGenConfig
-     */
-    effectType?: string | null;
-    /**
-     * 外键实体名称
-     * @type {string}
-     * @memberof SysCodeGenConfig
-     */
-    fkEntityName?: string | null;
-    /**
-     * 外键表名称
-     * @type {string}
-     * @memberof SysCodeGenConfig
-     */
-    fkTableName?: string | null;
-    /**
-     * 外键显示字段
-     * @type {string}
-     * @memberof SysCodeGenConfig
-     */
-    fkColumnName?: string | null;
-    /**
-     * 外键显示字段.NET类型
-     * @type {string}
-     * @memberof SysCodeGenConfig
-     */
-    fkColumnNetType?: string | null;
-    /**
-     * 字典编码
-     * @type {string}
-     * @memberof SysCodeGenConfig
-     */
-    dictTypeCode?: string | null;
-    /**
-     * 列表是否缩进（字典）
-     * @type {string}
-     * @memberof SysCodeGenConfig
-     */
-    whetherRetract?: string | null;
-    /**
-     * 是否必填（字典）
-     * @type {string}
-     * @memberof SysCodeGenConfig
-     */
-    whetherRequired?: string | null;
-    /**
-     * 是否是查询条件
-     * @type {string}
-     * @memberof SysCodeGenConfig
-     */
-    queryWhether?: string | null;
-    /**
-     * 查询方式
-     * @type {string}
-     * @memberof SysCodeGenConfig
-     */
-    queryType?: string | null;
-    /**
-     * 列表显示
-     * @type {string}
-     * @memberof SysCodeGenConfig
-     */
-    whetherTable?: string | null;
-    /**
-     * 增改
-     * @type {string}
-     * @memberof SysCodeGenConfig
-     */
-    whetherAddUpdate?: string | null;
-    /**
-     * 主键
-     * @type {string}
-     * @memberof SysCodeGenConfig
-     */
-    columnKey?: string | null;
-    /**
-     * 数据库中类型（物理类型）
-     * @type {string}
-     * @memberof SysCodeGenConfig
-     */
-    dataType?: string | null;
-    /**
-     * 是否通用字段
-     * @type {string}
-     * @memberof SysCodeGenConfig
-     */
-    whetherCommon?: string | null;
-    /**
-     * 显示文本字段
-     * @type {string}
-     * @memberof SysCodeGenConfig
-     */
-    displayColumn?: string | null;
-    /**
-     * 选中值字段
-     * @type {string}
-     * @memberof SysCodeGenConfig
-     */
-    valueColumn?: string | null;
-    /**
-     * 父级字段
-     * @type {string}
-     * @memberof SysCodeGenConfig
-     */
-    pidColumn?: string | null;
-}

Web/src/views/system/codeGen/component/codeGenerateDialog.vue → Web/src/views/system/codeGen/component/editCodeGenerateDialog.vue

@@ -12,7 +12,24 @@
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="数据库类型" prop="dbType" :rules="[{ required: true, message: '描述不能为空', trigger: 'blur' }]">
-							<el-input v-model="ruleForm.dbTypeString" disabled />
+							<el-select v-model="ruleForm.dbType" placeholder="数据库类型" clearable disabled >
+								<el-option label="MySql" :value="'0'" />
+								<el-option label="SqlServer" :value="'1'" />
+								<el-option label="Sqlite" :value="'2'" />
+								<el-option label="Oracle" :value="'3'" />
+								<el-option label="PostgreSQL" :value="'4'" />
+								<el-option label="Dm" :value="'5'" />
+								<el-option label="Kdbndp" :value="'6'" />
+								<el-option label="Oscar" :value="'7'" />
+								<el-option label="MySqlConnector" :value="'8'" />
+								<el-option label="Access" :value="'9'" />
+								<el-option label="OpenGauss" :value="'10'" />
+								<el-option label="QuestDB" :value="'11'" />
+								<el-option label="HG" :value="'12'" />
+								<el-option label="ClickHouse" :value="'13'" />
+								<el-option label="GBase" :value="'14'" />
+								<el-option label="Custom" :value="'900'" />
+							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
@@ -81,8 +98,10 @@
 <script lang="ts">
 import { reactive, toRefs, onMounted, defineComponent, getCurrentInstance, ref } from 'vue';
 
-import { getDatabaseList, getTableList, addGenerate, updateGenerate } from '/@/api/system/admin';
-import { AddCodeGenInput } from '/@/api/system/interface';
+import { getAPI } from '/@/utils/axios-utils';
+import { SysCodeGenApi } from '/@/api-services/api';
+
+import { UpdateCodeGenInput,AddCodeGenInput } from '/@/api-services/models';
 
 export default defineComponent({
 	name: 'codeGenerateDialog',
@@ -106,38 +125,31 @@ export default defineComponent({
 		const ruleFormRef = ref();
 		const state = reactive({
 			isShowDialog: false,
-			ruleForm: {} as AddCodeGenInput,
+			ruleForm: {} as UpdateCodeGenInput,
 			tableData: [] as any,
 			dbData: [] as any,
 		});
 
 		onMounted(async () => {
-			var res = await getDatabaseList();
+			var res = await getAPI(SysCodeGenApi).codeGenerateDatabaseListGet();
 			state.dbData = res.data.result;
 		});
 
 		// DbChanged
 		const DbChanged = async () => {
 			if (state.ruleForm.configId === '') return;
-			let res = await getTableList(state.ruleForm.configId as string);
+			let res = await getAPI(SysCodeGenApi).codeGenerateInformationListConfigIdGet(state.ruleForm.configId as string);
 			state.tableData = res.data.result ?? [];
 
 			let db = state.dbData.filter((u: any) => u.configId == state.ruleForm.configId);
 			state.ruleForm.connectionString = db[0].connectionString;
 			state.ruleForm.dbType = db[0].dbType.toString();
-			state.ruleForm.dbTypeString = convertDbType(db[0].dbType);
 		};
 
+
 		// 打开弹窗
-		const openDialog = (addRow: AddCodeGenInput) => {
-			state.ruleForm = addRow;
-			if (state.ruleForm.type === '1') {
-				state.ruleForm.nameSpace = 'Admin.NET.Application';
-				state.ruleForm.authorName = 'one';
-				state.ruleForm.generateType = '2';
-			} else {
-				state.ruleForm.dbTypeString = convertDbType(parseInt(state.ruleForm.dbType));
-			}
+		const openDialog = (row: any) => {
+			state.ruleForm = JSON.parse(JSON.stringify(row));
 			state.isShowDialog = true;
 		};
 
@@ -156,56 +168,15 @@ export default defineComponent({
 		const submit = () => {
 			ruleFormRef.value.validate(async (valid: boolean) => {
 				if (!valid) return;
-
-				if (state.ruleForm.type === '1') {
-					await addGenerate(state.ruleForm);
+				if (state.ruleForm.id != undefined && state.ruleForm.id > 0) {
+					await getAPI(SysCodeGenApi).codeGenerateEditPost(state.ruleForm as UpdateCodeGenInput);
 				} else {
-					await updateGenerate(state.ruleForm);
+					await getAPI(SysCodeGenApi).codeGenerateAddPost(state.ruleForm as AddCodeGenInput);
 				}
+				
 				closeDialog();
 			});
 		};
-
-		const convertDbType = (dbType: number) => {
-			let result = '';
-			switch (dbType) {
-				case 0:
-					result = 'MySql';
-					break;
-				case 1:
-					result = 'SqlServer';
-					break;
-				case 2:
-					result = 'Sqlite';
-					break;
-				case 3:
-					result = 'Oracle';
-					break;
-				case 4:
-					result = 'PostgreSql';
-					break;
-				case 5:
-					result = 'Dm';
-					break;
-				case 6:
-					result = 'Kdbndp';
-					break;
-				case 7:
-					result = 'Oscar';
-					break;
-				case 8:
-					result = 'MySqlConnector';
-					break;
-				case 9:
-					result = 'Access';
-					break;
-				default:
-					result = 'Custom';
-					break;
-			}
-			return result;
-		};
-
 		const isOrNotSelect = () => {
 			return [
 				{
@@ -226,7 +197,6 @@ export default defineComponent({
 			cancel,
 			submit,
 			...toRefs(state),
-			convertDbType,
 			isOrNotSelect,
 			DbChanged,
 		};

Web/src/views/system/codeGen/component/fkDialog.vue

@@ -39,7 +39,8 @@
 <script lang="ts">
 import { reactive, toRefs, defineComponent, getCurrentInstance, ref, onMounted } from 'vue';
 
-import { getDatabaseList, getTableList, getColumnList } from '/@/api/system/admin';
+import { getAPI } from '/@/utils/axios-utils';
+import { SysCodeGenApi } from '/@/api-services/api';
 
 export default defineComponent({
 	name: 'fk',
@@ -57,7 +58,7 @@ export default defineComponent({
 		});
 
 		onMounted(async () => {
-			var res = await getDatabaseList();
+			var res = await getAPI(SysCodeGenApi).codeGenerateDatabaseListGet();
 			state.dbData = res.data.result;
 		});
 
@@ -73,20 +74,20 @@ export default defineComponent({
 		};
 
 		const getDbList = async () => {
-			var res = await getDatabaseList();
+			var res = await getAPI(SysCodeGenApi).codeGenerateDatabaseListGet();
 			state.dbData = res.data.result;
 		};
 
 		const getTableInfoList = async () => {
 			if (state.ruleForm.configId == '') return;
-			var res = await getTableList(state.ruleForm.configId);
+			var res = await getAPI(SysCodeGenApi).codeGenerateInformationListConfigIdGet(state.ruleForm.configId);
 			state.tableData = res.data.result;
 		};
 
 		const getColumnInfoList = async () => {
 			if (state.ruleForm.configId == '' || state.ruleForm.tableName == '') return;
 			console.log(state.ruleForm.configId, state.ruleForm.tableName);
-			var res = await getColumnList(state.ruleForm.configId, state.ruleForm.tableName);
+			var res = await getAPI(SysCodeGenApi).codeGenerateColumnListConfigIdTableNameGet(state.ruleForm.tableName,state.ruleForm.configId);
 			state.columnData = res.data.result;
 		};
 

Web/src/views/system/codeGen/component/generateConfigDialog.vue

@@ -70,8 +70,8 @@ import { reactive, toRefs, onMounted, onUnmounted, defineComponent, getCurrentIn
 import fkDialog from '/@/views/system/codeGen/component/fkDialog.vue';
 import treeDialog from '/@/views/system/codeGen/component/treeDialog.vue';
 
-import { getGenerateConfigList, getDictDataDropdown, getDictTypeList, updateGenerateConfig, getAllConstSelector } from '/@/api/system/admin';
-import { AddCodeGenInput, DbTableInfo } from '/@/api/system/interface';
+import { getAPI } from '/@/utils/axios-utils';
+import { SysCodeGenConfigApi,SysConstApi,SysDictDataApi,SysDictTypeApi } from '/@/api-services/api';
 
 export default defineComponent({
 	name: 'codeGenerateConfig',
@@ -93,17 +93,17 @@ export default defineComponent({
 		});
 
 		onMounted(async () => {
-			let res = await getDictDataDropdown('code_gen_effect_type');
+			let res = await getAPI(SysDictDataApi).sysDictDataDictDataDropdownCodeGet('code_gen_effect_type');
 			state.effectTypeList = res.data.result;
 
-			res = await getDictTypeList();
+			res = await getAPI(SysDictTypeApi).sysDictTypeListGet();
 			state.dictTypeCodeList = res.data.result;
 			state.dictDataAll = res.data.result;
 
-			res = await getDictDataDropdown('code_gen_query_type');
+			res = await getAPI(SysDictDataApi).sysDictDataDictDataDropdownCodeGet('code_gen_query_type');
 			state.queryTypeList = res.data.result;
 
-			res = await getAllConstSelector();
+			res = await getAPI(SysConstApi).sysConstListGet();
 			state.allConstSelector = res.data.result;
 
 			proxy.mittBus.on('submitRefreshFk', (data: any) => {
@@ -134,7 +134,7 @@ export default defineComponent({
 		// 查询操作
 		const handleQuery = async (row: any) => {
 			state.loading = true;
-			var res = await getGenerateConfigList({ codeGenId: row.id });
+			var res = await getAPI(SysCodeGenConfigApi).sysCodeGenerateConfigListGet(undefined,row.id);
 			var data = res.data.result ?? [];
 			data.forEach((item: any) => {
 				for (const key in item) {
@@ -204,7 +204,7 @@ export default defineComponent({
 					}
 				}
 			});
-			await updateGenerateConfig(lst);
+			await getAPI(SysCodeGenConfigApi).sysCodeGenerateConfigEditPost(lst);
 			state.loading = false;
 			closeDialog();
 		};

Web/src/views/system/codeGen/component/treeDialog.vue

@@ -53,7 +53,10 @@
 <script lang="ts">
 import { reactive, toRefs, defineComponent, getCurrentInstance, ref, onMounted } from 'vue';
 
-import { getDatabaseList, getTableList, getColumnList } from '/@/api/system/admin';
+
+import { getAPI } from '/@/utils/axios-utils';
+import { SysCodeGenApi } from '/@/api-services/api';
+
 
 export default defineComponent({
 	name: 'tree',
@@ -71,7 +74,7 @@ export default defineComponent({
 		});
 
 		onMounted(async () => {
-			var res = await getDatabaseList();
+			var res = await getAPI(SysCodeGenApi).codeGenerateDatabaseListGet();
 			state.dbData = res.data.result;
 		});
 
@@ -87,20 +90,19 @@ export default defineComponent({
 		};
 
 		const getDbList = async () => {
-			var res = await getDatabaseList();
+			var res = await getAPI(SysCodeGenApi).codeGenerateDatabaseListGet();
 			state.dbData = res.data.result;
 		};
 
 		const getTableInfoList = async () => {
 			if (state.ruleForm.configId == '') return;
-			var res = await getTableList(state.ruleForm.configId);
+			var res = await getAPI(SysCodeGenApi).codeGenerateInformationListConfigIdGet(state.ruleForm.configId);
 			state.tableData = res.data.result;
 		};
 
 		const getColumnInfoList = async () => {
 			if (state.ruleForm.configId == '' || state.ruleForm.tableName == '') return;
-			console.log(state.ruleForm.configId, state.ruleForm.tableName);
-			var res = await getColumnList(state.ruleForm.configId, state.ruleForm.tableName);
+			var res = await getAPI(SysCodeGenApi).codeGenerateColumnListConfigIdTableNameGet(state.ruleForm.tableName,state.ruleForm.configId);
 			state.columnData = res.data.result;
 		};
 

Web/src/views/system/codeGen/index.vue

@@ -42,7 +42,7 @@
 				layout="total, sizes, prev, pager, next, jumper"
 			/>
 		</el-card>
-		<CodeGenerateDialog :code-generate-type-list="codeGenerateTypeList" :menu-data="menudata" :title="editMenuTitle" ref="CodeGenerateRef" />
+		<EditCodeGenerateDialog :code-generate-type-list="codeGenerateTypeList" :menu-data="menudata" :title="editMenuTitle" ref="EditCodeGenerateRef" />
 		<CodeConfigDialog ref="CodeConfigRef" />
 	</div>
 </template>
@@ -50,18 +50,20 @@
 <script lang="ts">
 import { toRefs, reactive, onMounted, ref, defineComponent, onUnmounted, getCurrentInstance } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
-import CodeGenerateDialog from '/@/views/system/codeGen/component/codeGenerateDialog.vue';
+import EditCodeGenerateDialog from '/@/views/system/codeGen/component/editCodeGenerateDialog.vue';
 import CodeConfigDialog from '/@/views/system/codeGen/component/generateConfigDialog.vue';
 
-import { SysCodeGen, SysMenu } from '/@/api/system/interface';
-import { getGeneratePage, getMenuList, getDictDataDropdown, deleGenerate, generateRunLocal } from '/@/api/system/admin';
+import { getAPI } from '/@/utils/axios-utils';
+import { SysCodeGenApi,SysMenuApi,SysDictDataApi } from '/@/api-services/api';
+
+import { SysCodeGen,SysMenu } from '/@/api-services/models';
 
 export default defineComponent({
 	name: 'codeGen',
-	components: { CodeGenerateDialog, CodeConfigDialog },
+	components: { EditCodeGenerateDialog,CodeConfigDialog },
 	setup() {
 		const { proxy } = getCurrentInstance() as any;
-		const CodeGenerateRef = ref();
+		const EditCodeGenerateRef = ref();
 		const CodeConfigRef = ref();
 		const state = reactive({
 			loading: false,
@@ -73,6 +75,7 @@ export default defineComponent({
 			queryParams: {
 				name: undefined,
 				code: undefined,
+				tableName: undefined,
 			},
 			tableParams: {
 				page: 1,
@@ -86,10 +89,10 @@ export default defineComponent({
 
 		onMounted(async () => {
 			handleQuery();
-			let res = await getMenuList();
-			state.menudata = res.data.result;
+			let res = await getAPI(SysMenuApi).sysMenuListGet();
+			state.menudata = res.data.result ?? [];
 
-			let list = await getDictDataDropdown('code_gen_create_type');
+			let list = await getAPI(SysDictDataApi).sysDictDataDictDataDropdownCodeGet('code_gen_create_type');
 			state.codeGenerateTypeList = list.data.result;
 			proxy.mittBus.on('submitRefresh', () => {
 				handleQuery();
@@ -110,8 +113,9 @@ export default defineComponent({
 		// 表查询操作
 		const handleQuery = async () => {
 			state.loading = true;
-			let params = Object.assign(state.queryParams, state.tableParams);
-			let res = await getGeneratePage(params);
+			// let params = Object.assign(state.queryParams, state.tableParams);
+			let res = await getAPI(SysCodeGenApi).codeGeneratePageGet(undefined,undefined,undefined,undefined,undefined,undefined,undefined
+			,undefined,state.queryParams.tableName,undefined,undefined,undefined,undefined,undefined,state.tableParams.page, state.tableParams.pageSize);
 			state.tableData = res.data.result?.items ?? [];
 			state.tableParams.total = res.data.result?.total;
 			state.loading = false;
@@ -138,13 +142,12 @@ export default defineComponent({
 		// 打开表增加页面
 		const openAddDialog = () => {
 			state.editMenuTitle = '新增';
-			CodeGenerateRef.value.openDialog({ type: '1' });
+			EditCodeGenerateRef.value.openDialog({nameSpace:'Admin.NET.Application',authorName:'Admin.Net',generateType:'2'});
 		};
-		// 打开列编辑页面
+		// 打开表编辑页面
 		const openEditDialog = (row: any) => {
 			state.editMenuTitle = '编辑';
-			row.type = '2';
-			CodeGenerateRef.value.openDialog(row);
+			EditCodeGenerateRef.value.openDialog(row);
 		};
 
 		// 删除表
@@ -155,7 +158,7 @@ export default defineComponent({
 				type: 'warning',
 			})
 				.then(async () => {
-					await deleGenerate([{ id: row.id }]);
+					await getAPI(SysCodeGenApi).codeGenerateDeletePost([{ id: row.id }]);
 					handleQuery();
 					ElMessage.success('操作成功');
 				})
@@ -170,7 +173,7 @@ export default defineComponent({
 				type: 'warning',
 			})
 				.then(async () => {
-					await generateRunLocal(row);
+					await getAPI(SysCodeGenApi).codeGenerateRunLocalPost(row);
 					handleQuery();
 					ElMessage.success('操作成功');
 				})
@@ -182,7 +185,7 @@ export default defineComponent({
 			openAddDialog,
 			openEditDialog,
 			deleConfig,
-			CodeGenerateRef,
+			EditCodeGenerateRef,
 			handleSizeChange,
 			handleCurrentChange,
 			getGenerateTypeString,

Web/src/views/system/tenant/component/editTenant.vue

@@ -116,6 +116,7 @@ export default defineComponent({
 		// 打开弹窗
 		const openDialog = (row: any) => {
 			state.ruleForm = JSON.parse(JSON.stringify(row));
+			console.log(state.ruleForm)
 			state.isShowDialog = true;
 		};
 		// 关闭弹窗