From 6c52de8bc790603365e9dcc2c664532e04a055f2 Mon Sep 17 00:00:00 2001 From: "734913414@qq.com" <734913414@qq.com> Date: Wed, 16 Nov 2022 16:47:06 +0800 Subject: [PATCH] =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- .../Configuration/CodeGen.json | 2 +- .../CodeGen/SysCodeGenConfigService.cs | 2 + Web/.env.production | 2 +- Web/src/api/main/generatetest.ts | 40 - Web/src/api/system/admin.ts | 243 ------ Web/src/api/system/enum.ts | 30 - Web/src/api/system/interface.ts | 754 ------------------ ...eDialog.vue => editCodeGenerateDialog.vue} | 94 +-- .../system/codeGen/component/fkDialog.vue | 11 +- .../component/generateConfigDialog.vue | 16 +- .../system/codeGen/component/treeDialog.vue | 14 +- Web/src/views/system/codeGen/index.vue | 39 +- .../system/tenant/component/editTenant.vue | 1 + 14 files changed, 81 insertions(+), 1169 deletions(-) delete mode 100644 Web/src/api/main/generatetest.ts delete mode 100644 Web/src/api/system/admin.ts delete mode 100644 Web/src/api/system/enum.ts delete mode 100644 Web/src/api/system/interface.ts rename Web/src/views/system/codeGen/component/{codeGenerateDialog.vue => editCodeGenerateDialog.vue} (76%) diff --git a/.gitignore b/.gitignore index 5d8fec04b..343bb525b 100644 --- a/.gitignore +++ b/.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 diff --git a/Admin.NET/Admin.NET.Application/Configuration/CodeGen.json b/Admin.NET/Admin.NET.Application/Configuration/CodeGen.json index 64bd30eda..78b6cdf8e 100644 --- a/Admin.NET/Admin.NET.Application/Configuration/CodeGen.json +++ b/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" //后端生成到的项目 } } \ No newline at end of file diff --git a/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenConfigService.cs b/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenConfigService.cs index 7b32b4494..f0b6909cd 100644 --- a/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenConfigService.cs +++ b/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenConfigService.cs @@ -24,6 +24,8 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient return await _db.Queryable() .Where(u => u.CodeGenId == input.CodeGenId && u.WhetherCommon != YesNoEnum.Y.ToString()) .Select().ToListAsync(); + + } /// diff --git a/Web/.env.production b/Web/.env.production index 7073e33c9..77efa8dda 100644 --- a/Web/.env.production +++ b/Web/.env.production @@ -2,4 +2,4 @@ ENV = 'production' # 线上环境接口地址 -VITE_API_URL = 'https://localhost:5005' \ No newline at end of file +VITE_API_URL = 'https://localhost:44326' \ No newline at end of file diff --git a/Web/src/api/main/generatetest.ts b/Web/src/api/main/generatetest.ts deleted file mode 100644 index 46d983c39..000000000 --- a/Web/src/api/main/generatetest.ts +++ /dev/null @@ -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, - }); - diff --git a/Web/src/api/system/admin.ts b/Web/src/api/system/admin.ts deleted file mode 100644 index ba330409c..000000000 --- a/Web/src/api/system/admin.ts +++ /dev/null @@ -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, - }); diff --git a/Web/src/api/system/enum.ts b/Web/src/api/system/enum.ts deleted file mode 100644 index 485642234..000000000 --- a/Web/src/api/system/enum.ts +++ /dev/null @@ -1,30 +0,0 @@ -/** - * - * @export - * @enum {string} - */ - export enum DbObjectType { - NUMBER_0 = 0, - NUMBER_1 = 1, - NUMBER_2 = 2 -} -/** - * 系统菜单类型枚举
 目录 Dir = 1
 菜单 Menu = 2
 按钮 Btn = 3
- * @export - * @enum {string} - */ - export enum MenuTypeEnum { - NUMBER_1 = 1, - NUMBER_2 = 2, - NUMBER_3 = 3 -} - -/** - * 通用状态枚举
 启用 Enable = 1
 停用 Disable = 2
- * @export - * @enum {string} - */ - export enum StatusEnum { - NUMBER_1 = 1, - NUMBER_2 = 2 -} diff --git a/Web/src/api/system/interface.ts b/Web/src/api/system/interface.ts deleted file mode 100644 index ba66dbcfc..000000000 --- a/Web/src/api/system/interface.ts +++ /dev/null @@ -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} - * @memberof SysMenu - */ - children?: Array | null; -} - -/* tslint:disable */ -/* eslint-disable */ -/** - * Admin.NET - * 让 .NET 开发更简单、更通用、更流行。前后端分离架构(.NET6/Vue3)，开箱即用紧随前沿技术。
https://gitee.com/zuohuaijun/Admin.NET - * - * 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; -} diff --git a/Web/src/views/system/codeGen/component/codeGenerateDialog.vue b/Web/src/views/system/codeGen/component/editCodeGenerateDialog.vue similarity index 76% rename from Web/src/views/system/codeGen/component/codeGenerateDialog.vue rename to Web/src/views/system/codeGen/component/editCodeGenerateDialog.vue index ec09647f3..ee9323b16 100644 --- a/Web/src/views/system/codeGen/component/codeGenerateDialog.vue +++ b/Web/src/views/system/codeGen/component/editCodeGenerateDialog.vue @@ -12,7 +12,24 @@ - + + + + + + + + + + + + + + + + + + @@ -81,8 +98,10 @@