Эх сурвалжийг харах

合并调整代码生成功能(待优化)

zuohuaijun 3 жил өмнө
parent
commit
1089cb2384
24 өөрчлөгдсөн 465 нэмэгдсэн , 497 устгасан
  1. 2 2
      Admin.NET/Admin.NET.Application/Configuration/CodeGen.json
  2. 22 29
      Admin.NET/Admin.NET.Core/Admin.NET.Core.xml
  3. 4 4
      Admin.NET/Admin.NET.Core/Service/CodeGen/CustomViewEngine.cs
  4. 1 1
      Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/ColumnOuput.cs
  5. 1 1
      Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/DatabaseOutput.cs
  6. 0 8
      Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/SelectOutput.cs
  7. 1 1
      Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/TableOutput.cs
  8. 4 17
      Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenConfigService.cs
  9. 13 13
      Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs
  10. 5 6
      Admin.NET/Admin.NET.Core/Service/Dict/SysDictDataService.cs
  11. 213 213
      Web/src/api-services/apis/sys-code-gen-api.ts
  12. 92 92
      Web/src/api-services/apis/sys-code-gen-config-api.ts
  13. 11 11
      Web/src/api-services/models/admin-result-list-column-ouput.ts
  14. 7 7
      Web/src/api-services/models/column-ouput.ts
  15. 1 1
      Web/src/api-services/models/database-output.ts
  16. 2 2
      Web/src/api-services/models/index.ts
  17. 1 1
      Web/src/api-services/models/table-output.ts
  18. 26 29
      Web/src/views/system/codeGen/component/editCodeGenDialog.vue
  19. 7 7
      Web/src/views/system/codeGen/component/fkDialog.vue
  20. 6 6
      Web/src/views/system/codeGen/component/genConfigDialog.vue
  21. 8 10
      Web/src/views/system/codeGen/component/treeDialog.vue
  22. 37 34
      Web/src/views/system/codeGen/index.vue
  23. 1 1
      Web/src/views/system/database/component/editTable.vue
  24. 0 1
      Web/src/views/system/tenant/component/editTenant.vue

+ 2 - 2
Admin.NET/Admin.NET.Application/Configuration/CodeGen.json

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

+ 22 - 29
Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -4345,59 +4345,59 @@
             菜单父级
             </summary>
         </member>
-        <member name="T:Admin.NET.Core.Service.DatabaseOutput">
+        <member name="T:Admin.NET.Core.Service.ColumnOuput">
             <summary>
-            多库代码生成库列表输出
+            数据库表列
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.DatabaseOutput.ConfigId">
+        <member name="P:Admin.NET.Core.Service.ColumnOuput.ColumnName">
             <summary>
-            库定位器
+            字段
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.DatabaseOutput.DbType">
+        <member name="P:Admin.NET.Core.Service.ColumnOuput.DataType">
             <summary>
-            数据库类型
+            数据库类型
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.DatabaseOutput.ConnectionString">
+        <member name="P:Admin.NET.Core.Service.ColumnOuput.NetType">
             <summary>
-            数据库连接字符串
+            .NET字段类型
             </summary>
         </member>
-        <member name="T:Admin.NET.Core.Service.TableColumnOuput">
+        <member name="P:Admin.NET.Core.Service.ColumnOuput.ColumnComment">
             <summary>
-            数据库表列
+            字段描述
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.TableColumnOuput.ColumnName">
+        <member name="P:Admin.NET.Core.Service.ColumnOuput.ColumnKey">
             <summary>
-            字段名
+            主外键
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.TableColumnOuput.DataType">
+        <member name="T:Admin.NET.Core.Service.DatabaseOutput">
             <summary>
-            数据库中类型
+            数据库
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.TableColumnOuput.NetType">
+        <member name="P:Admin.NET.Core.Service.DatabaseOutput.ConfigId">
             <summary>
-            .NET字段类型
+            库定位器名
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.TableColumnOuput.ColumnComment">
+        <member name="P:Admin.NET.Core.Service.DatabaseOutput.DbType">
             <summary>
-            字段描述
+            数据库类型
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.TableColumnOuput.ColumnKey">
+        <member name="P:Admin.NET.Core.Service.DatabaseOutput.ConnectionString">
             <summary>
-            主外键
+            数据库连接字符串
             </summary>
         </member>
         <member name="T:Admin.NET.Core.Service.TableOutput">
             <summary>
-            数据库表列表参数
+            数据库表
             </summary>
         </member>
         <member name="P:Admin.NET.Core.Service.TableOutput.ConfigId">
@@ -4442,13 +4442,6 @@
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.SysCodeGenConfigService.Add(Admin.NET.Core.Service.CodeGenConfig)">
-            <summary>
-            增加
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
         <member name="M:Admin.NET.Core.Service.SysCodeGenConfigService.Delete(System.Int64)">
             <summary>
             删除
@@ -4470,7 +4463,7 @@
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.SysCodeGenConfigService.AddList(System.Collections.Generic.List{Admin.NET.Core.Service.TableColumnOuput},Admin.NET.Core.SysCodeGen)">
+        <member name="M:Admin.NET.Core.Service.SysCodeGenConfigService.AddList(System.Collections.Generic.List{Admin.NET.Core.Service.ColumnOuput},Admin.NET.Core.SysCodeGen)">
             <summary>
             批量增加
             </summary>

+ 4 - 4
Admin.NET/Admin.NET.Core/Service/CodeGen/CustomViewEngine.cs

@@ -44,7 +44,7 @@ public class CustomViewEngine : ViewEngineModel
 
     public bool IsUpload { get; set; }
 
-    private List<TableColumnOuput> ColumnList { get; set; }
+    private List<ColumnOuput> ColumnList { get; set; }
 
     public string GetColumnNetType(object tbName, object colName)
     {
@@ -53,9 +53,9 @@ public class CustomViewEngine : ViewEngineModel
         return col.NetType;
     }
 
-    public List<TableColumnOuput> GetColumnListByTableName(string tableName)
+    public List<ColumnOuput> GetColumnListByTableName(string tableName)
     {
-        //多库代码生成切换库
+        // 多库代码生成切换库
         var provider = _db.AsTenant().GetConnectionScope(ConfigId != SqlSugarConst.ConfigId ? ConfigId : SqlSugarConst.ConfigId);
 
         // 获取实体类型属性
@@ -63,7 +63,7 @@ public class CustomViewEngine : ViewEngineModel
         if (entityType == null) return null;
 
         // 按原始类型的顺序获取所有实体类型属性(不包含导航属性,会返回null)
-        return provider.DbMaintenance.GetColumnInfosByTableName(entityType.Name).Select(u => new TableColumnOuput
+        return provider.DbMaintenance.GetColumnInfosByTableName(entityType.Name).Select(u => new ColumnOuput
         {
             ColumnName = u.DbColumnName,
             ColumnKey = u.IsPrimarykey.ToString(),

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/TableColumnOuput.cs → Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/ColumnOuput.cs

@@ -3,7 +3,7 @@
 /// <summary>
 /// 数据库表列
 /// </summary>
-public class TableColumnOuput
+public class ColumnOuput
 {
     /// <summary>
     /// 字段名

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/DatabaseOutput.cs

@@ -1,7 +1,7 @@
 namespace Admin.NET.Core.Service;
 
 /// <summary>
-/// 多库代码生成库列表输出
+/// 数据库
 /// </summary>
 public class DatabaseOutput
 {

+ 0 - 8
Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/SelectOutput.cs

@@ -1,8 +0,0 @@
-namespace Admin.NET.Core.Service;
-
-public class SelectOutput
-{
-    public object Code { get; set; }
-
-    public string Name { get; set; }
-}

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/TableOutput.cs

@@ -1,7 +1,7 @@
 namespace Admin.NET.Core.Service;
 
 /// <summary>
-/// 数据库表列表参数
+/// 数据库表
 /// </summary>
 public class TableOutput
 {

+ 4 - 17
Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenConfigService.cs

@@ -18,25 +18,12 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    [HttpGet("/sysCodeGenerateConfig/list")]
+    [HttpGet("/sysCodeGenConfig/list")]
     public async Task<List<CodeGenConfig>> List([FromQuery] CodeGenConfig input)
     {
         return await _db.Queryable<SysCodeGenConfig>()
             .Where(u => u.CodeGenId == input.CodeGenId && u.WhetherCommon != YesNoEnum.Y.ToString())
             .Select<CodeGenConfig>().ToListAsync();
-
-
-    }
-
-    /// <summary>
-    /// 增加
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    private async Task Add(CodeGenConfig input)
-    {
-        var codeGenConfig = input.Adapt<SysCodeGenConfig>();
-        await _db.Insertable(codeGenConfig).ExecuteCommandAsync();
     }
 
     /// <summary>
@@ -55,7 +42,7 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="inputList"></param>
     /// <returns></returns>
-    [HttpPost("/sysCodeGenerateConfig/edit")]
+    [HttpPost("/sysCodeGenConfig/update")]
     public async Task Update(List<CodeGenConfig> inputList)
     {
         if (inputList == null || inputList.Count < 1) return;
@@ -67,7 +54,7 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    [HttpGet("/sysCodeGenerateConfig/detail")]
+    [HttpGet("/sysCodeGenConfig/detail")]
     public async Task<SysCodeGenConfig> Detail([FromQuery] CodeGenConfig input)
     {
         return await _db.Queryable<SysCodeGenConfig>().FirstAsync(u => u.Id == input.Id);
@@ -79,7 +66,7 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
     /// <param name="tableColumnOuputList"></param>
     /// <param name="codeGenerate"></param>
     [NonAction]
-    public void AddList(List<TableColumnOuput> tableColumnOuputList, SysCodeGen codeGenerate)
+    public void AddList(List<ColumnOuput> tableColumnOuputList, SysCodeGen codeGenerate)
     {
         if (tableColumnOuputList == null) return;
 

+ 13 - 13
Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs

@@ -31,7 +31,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    [HttpGet("/codeGenerate/page")]
+    [HttpGet("/sysCodeGen/page")]
     public async Task<SqlSugarPagedList<SysCodeGen>> GetCodeGenPage([FromQuery] CodeGenInput input)
     {
         return await _db.Queryable<SysCodeGen>()
@@ -44,7 +44,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    [HttpPost("/codeGenerate/add")]
+    [HttpPost("/sysCodeGen/add")]
     public async Task AddCodeGen(AddCodeGenInput input)
     {
         var isExist = await _db.Queryable<SysCodeGen>().Where(u => u.TableName == input.TableName).AnyAsync();
@@ -62,7 +62,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="inputs"></param>
     /// <returns></returns>
-    [HttpPost("/codeGenerate/delete")]
+    [HttpPost("/sysCodeGen/delete")]
     public async Task DeleteCodeGen(List<DeleteCodeGenInput> inputs)
     {
         if (inputs == null || inputs.Count < 1) return;
@@ -83,7 +83,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    [HttpPost("/codeGenerate/edit")]
+    [HttpPost("/sysCodeGen/update")]
     public async Task UpdateCodeGen(UpdateCodeGenInput input)
     {
         var isExist = await _db.Queryable<SysCodeGen>().AnyAsync(u => u.TableName == input.TableName && u.Id != input.Id);
@@ -98,7 +98,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    [HttpGet("/codeGenerate/detail")]
+    [HttpGet("/sysCodeGen/detail")]
     public async Task<SysCodeGen> GetCodeGen([FromQuery] QueryCodeGenInput input)
     {
         return await _db.Queryable<SysCodeGen>().SingleAsync(m => m.Id == input.Id);
@@ -108,7 +108,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
     /// 获取数据库库集合
     /// </summary>
     /// <returns></returns>
-    [HttpGet("codeGenerate/databaseList")]
+    [HttpGet("/sysCodeGen/databaseList")]
     public async Task<List<DatabaseOutput>> GetDatabaseList()
     {
         var dblist = await Task.FromResult(App.GetOptions<DbConnectionOptions>().ConnectionConfigs);
@@ -119,7 +119,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
     /// 获取数据库表(实体)集合
     /// </summary>
     /// <returns></returns>
-    [HttpGet("/codeGenerate/InformationList/{configId}")]
+    [HttpGet("/sysCodeGen/tableList/{configId}")]
     public async Task<List<TableOutput>> GetTableList(string configId = SqlSugarConst.ConfigId)
     {
         // 切库---多库代码生成用
@@ -148,8 +148,8 @@ public class SysCodeGenService : IDynamicApiController, ITransient
     /// 根据表名获取列
     /// </summary>
     /// <returns></returns>
-    [HttpGet("/codeGenerate/ColumnList/{configId}/{tableName}")]
-    public List<TableColumnOuput> GetColumnListByTableName(string tableName, string configId = SqlSugarConst.ConfigId)
+    [HttpGet("/sysCodeGen/columnList/{configId}/{tableName}")]
+    public List<ColumnOuput> GetColumnListByTableName(string tableName, string configId = SqlSugarConst.ConfigId)
     {
         // 切库---多库代码生成用
         var provider = _db.AsTenant().GetConnectionScope(configId);
@@ -158,7 +158,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
         var entityType = provider.DbMaintenance.GetTableInfoList(false).FirstOrDefault(u => u.Name == tableName);
         if (entityType == null) return null;
         // 按原始类型的顺序获取所有实体类型属性(不包含导航属性,会返回null)
-        return provider.DbMaintenance.GetColumnInfosByTableName(entityType.Name).Select(u => new TableColumnOuput
+        return provider.DbMaintenance.GetColumnInfosByTableName(entityType.Name).Select(u => new ColumnOuput
         {
             ColumnName = u.DbColumnName,
             ColumnKey = u.IsPrimarykey.ToString(),
@@ -172,7 +172,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
     /// 获取数据表列(实体属性)集合
     /// </summary>
     /// <returns></returns>
-    private List<TableColumnOuput> GetColumnList([FromQuery] AddCodeGenInput input)
+    private List<ColumnOuput> GetColumnList([FromQuery] AddCodeGenInput input)
     {
         // 切库---多库代码生成用
         var provider = _db.AsTenant().GetConnectionScope(!string.IsNullOrEmpty(input.ConfigId) ? input.ConfigId : SqlSugarConst.ConfigId);
@@ -181,7 +181,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
         if (entityType == null)
             return null;
 
-        return provider.DbMaintenance.GetColumnInfosByTableName(entityType.DbTableName, false).Select(u => new TableColumnOuput
+        return provider.DbMaintenance.GetColumnInfosByTableName(entityType.DbTableName, false).Select(u => new ColumnOuput
         {
             ColumnName = u.DbColumnName,
             ColumnKey = u.IsPrimarykey.ToString(),
@@ -194,7 +194,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
     /// 代码生成_本地项目
     /// </summary>
     /// <returns></returns>
-    [HttpPost("/codeGenerate/runLocal")]
+    [HttpPost("/sysCodeGen/runLocal")]
     public async Task RunLocal(SysCodeGen input)
     {
         // 先删除该表已生成的菜单列表

+ 5 - 6
Admin.NET/Admin.NET.Core/Service/Dict/SysDictDataService.cs

@@ -140,10 +140,9 @@ public class SysDictDataService : IDynamicApiController, ITransient
     [HttpGet("/sysDictData/DictDataDropdown/{code}")]
     public async Task<dynamic> GetDictDataDropdown(string code)
     {
-        return await _sysDictDataRep.Context.Queryable<SysDictType, SysDictData>((a, b) =>
-            new JoinQueryInfos(JoinType.Left, a.Id == b.DictTypeId))
-            .Where(a => a.Code == code)
-            .Where((a, b) => a.Status == StatusEnum.Enable && b.Status == StatusEnum.Enable)
+        return await _sysDictDataRep.Context.Queryable<SysDictType>()
+            .LeftJoin<SysDictData>((a, b) => a.Id == b.DictTypeId)
+            .Where((a, b) => a.Code == code && a.Status == StatusEnum.Enable && b.Status == StatusEnum.Enable)
             .Select((a, b) => new
             {
                 Label = b.Value,
@@ -159,8 +158,8 @@ public class SysDictDataService : IDynamicApiController, ITransient
     [HttpGet("/sysDictData/queryDictDataDropdown")]
     public async Task<dynamic> QueryDictDataDropdown([FromQuery] QueryDictDataInput input)
     {
-        return await _sysDictDataRep.Context.Queryable<SysDictType, SysDictData>((a, b) =>
-            new JoinQueryInfos(JoinType.Left, a.Id == b.DictTypeId))
+        return await _sysDictDataRep.Context.Queryable<SysDictType>()
+            .LeftJoin<SysDictData>((a, b) => a.Id == b.DictTypeId)
             .Where((a, b) => a.Code == input.Code)
             .WhereIF(input.Status.HasValue, (a, b) => b.Status == (StatusEnum)input.Status.Value)
             .Select((a, b) => new

+ 213 - 213
Web/src/api-services/apis/sys-code-gen-api.ts

@@ -17,8 +17,8 @@ import { Configuration } from '../configuration';
 // @ts-ignore
 import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../base';
 import { AddCodeGenInput } from '../models';
+import { AdminResultListColumnOuput } from '../models';
 import { AdminResultListDatabaseOutput } from '../models';
-import { AdminResultListTableColumnOuput } from '../models';
 import { AdminResultListTableOutput } from '../models';
 import { AdminResultSqlSugarPagedListSysCodeGen } from '../models';
 import { AdminResultSysCodeGen } from '../models';
@@ -38,8 +38,8 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        codeGenerateAddPost: async (body?: AddCodeGenInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/codeGenerate/add`;
+        sysCodeGenAddPost: async (body?: AddCodeGenInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/sysCodeGen/add`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -80,16 +80,16 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        codeGenerateColumnListConfigIdTableNameGet: async (tableName: string, configId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        sysCodeGenColumnListConfigIdTableNameGet: async (tableName: string, configId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'tableName' is not null or undefined
             if (tableName === null || tableName === undefined) {
-                throw new RequiredError('tableName','Required parameter tableName was null or undefined when calling codeGenerateColumnListConfigIdTableNameGet.');
+                throw new RequiredError('tableName','Required parameter tableName was null or undefined when calling sysCodeGenColumnListConfigIdTableNameGet.');
             }
             // verify required parameter 'configId' is not null or undefined
             if (configId === null || configId === undefined) {
-                throw new RequiredError('configId','Required parameter configId was null or undefined when calling codeGenerateColumnListConfigIdTableNameGet.');
+                throw new RequiredError('configId','Required parameter configId was null or undefined when calling sysCodeGenColumnListConfigIdTableNameGet.');
             }
-            const localVarPath = `/codeGenerate/ColumnList/{configId}/{tableName}`
+            const localVarPath = `/sysCodeGen/columnList/{configId}/{tableName}`
                 .replace(`{${"tableName"}}`, encodeURIComponent(String(tableName)))
                 .replace(`{${"configId"}}`, encodeURIComponent(String(configId)));
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
@@ -126,8 +126,8 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        codeGenerateDatabaseListGet: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/codeGenerate/databaseList`;
+        sysCodeGenDatabaseListGet: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/sysCodeGen/databaseList`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -163,8 +163,8 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        codeGenerateDeletePost: async (body?: Array<DeleteCodeGenInput>, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/codeGenerate/delete`;
+        sysCodeGenDeletePost: async (body?: Array<DeleteCodeGenInput>, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/sysCodeGen/delete`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -204,12 +204,12 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        codeGenerateDetailGet: async (id: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        sysCodeGenDetailGet: async (id: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'id' is not null or undefined
             if (id === null || id === undefined) {
-                throw new RequiredError('id','Required parameter id was null or undefined when calling codeGenerateDetailGet.');
+                throw new RequiredError('id','Required parameter id was null or undefined when calling sysCodeGenDetailGet.');
             }
-            const localVarPath = `/codeGenerate/detail`;
+            const localVarPath = `/sysCodeGen/detail`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -242,89 +242,6 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
                 options: localVarRequestOptions,
             };
         },
-        /**
-         * 
-         * @summary 更新
-         * @param {UpdateCodeGenInput} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        codeGenerateEditPost: async (body?: UpdateCodeGenInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/codeGenerate/edit`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-            const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication Bearer required
-
-            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
-
-            const query = new URLSearchParams(localVarUrlObj.search);
-            for (const key in localVarQueryParameter) {
-                query.set(key, localVarQueryParameter[key]);
-            }
-            for (const key in options.params) {
-                query.set(key, options.params[key]);
-            }
-            localVarUrlObj.search = (new URLSearchParams(query)).toString();
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
-            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
-
-            return {
-                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @summary 获取数据库表(实体)集合
-         * @param {string} configId 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        codeGenerateInformationListConfigIdGet: async (configId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'configId' is not null or undefined
-            if (configId === null || configId === undefined) {
-                throw new RequiredError('configId','Required parameter configId was null or undefined when calling codeGenerateInformationListConfigIdGet.');
-            }
-            const localVarPath = `/codeGenerate/InformationList/{configId}`
-                .replace(`{${"configId"}}`, encodeURIComponent(String(configId)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-            const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication Bearer required
-
-            const query = new URLSearchParams(localVarUrlObj.search);
-            for (const key in localVarQueryParameter) {
-                query.set(key, localVarQueryParameter[key]);
-            }
-            for (const key in options.params) {
-                query.set(key, options.params[key]);
-            }
-            localVarUrlObj.search = (new URLSearchParams(query)).toString();
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
-                options: localVarRequestOptions,
-            };
-        },
         /**
          * 
          * @summary 分页查询
@@ -350,8 +267,8 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        codeGeneratePageGet: async (authorName?: string, className?: string, tablePrefix?: string, configId?: string, dbName?: string, dbType?: string, connectionString?: string, generateType?: string, tableName?: string, nameSpace?: string, busName?: string, tableComment?: string, menuApplication?: string, menuPid?: number, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/codeGenerate/page`;
+        sysCodeGenPageGet: async (authorName?: string, className?: string, tablePrefix?: string, configId?: string, dbName?: string, dbType?: string, connectionString?: string, generateType?: string, tableName?: string, nameSpace?: string, busName?: string, tableComment?: string, menuApplication?: string, menuPid?: number, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/sysCodeGen/page`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -463,8 +380,91 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        codeGenerateRunLocalPost: async (body?: SysCodeGen, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/codeGenerate/runLocal`;
+        sysCodeGenRunLocalPost: async (body?: SysCodeGen, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/sysCodeGen/runLocal`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+
+            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
+            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @summary 获取数据库表(实体)集合
+         * @param {string} configId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        sysCodeGenTableListConfigIdGet: async (configId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'configId' is not null or undefined
+            if (configId === null || configId === undefined) {
+                throw new RequiredError('configId','Required parameter configId was null or undefined when calling sysCodeGenTableListConfigIdGet.');
+            }
+            const localVarPath = `/sysCodeGen/tableList/{configId}`
+                .replace(`{${"configId"}}`, encodeURIComponent(String(configId)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @summary 更新
+         * @param {UpdateCodeGenInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        sysCodeGenUpdatePost: async (body?: UpdateCodeGenInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/sysCodeGen/update`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -513,8 +513,8 @@ export const SysCodeGenApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async codeGenerateAddPost(body?: AddCodeGenInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
-            const localVarAxiosArgs = await SysCodeGenApiAxiosParamCreator(configuration).codeGenerateAddPost(body, options);
+        async sysCodeGenAddPost(body?: AddCodeGenInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+            const localVarAxiosArgs = await SysCodeGenApiAxiosParamCreator(configuration).sysCodeGenAddPost(body, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -528,8 +528,8 @@ export const SysCodeGenApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async codeGenerateColumnListConfigIdTableNameGet(tableName: string, configId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListTableColumnOuput>>> {
-            const localVarAxiosArgs = await SysCodeGenApiAxiosParamCreator(configuration).codeGenerateColumnListConfigIdTableNameGet(tableName, configId, options);
+        async sysCodeGenColumnListConfigIdTableNameGet(tableName: string, configId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListColumnOuput>>> {
+            const localVarAxiosArgs = await SysCodeGenApiAxiosParamCreator(configuration).sysCodeGenColumnListConfigIdTableNameGet(tableName, configId, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -541,8 +541,8 @@ export const SysCodeGenApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async codeGenerateDatabaseListGet(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListDatabaseOutput>>> {
-            const localVarAxiosArgs = await SysCodeGenApiAxiosParamCreator(configuration).codeGenerateDatabaseListGet(options);
+        async sysCodeGenDatabaseListGet(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListDatabaseOutput>>> {
+            const localVarAxiosArgs = await SysCodeGenApiAxiosParamCreator(configuration).sysCodeGenDatabaseListGet(options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -555,8 +555,8 @@ export const SysCodeGenApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async codeGenerateDeletePost(body?: Array<DeleteCodeGenInput>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
-            const localVarAxiosArgs = await SysCodeGenApiAxiosParamCreator(configuration).codeGenerateDeletePost(body, options);
+        async sysCodeGenDeletePost(body?: Array<DeleteCodeGenInput>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+            const localVarAxiosArgs = await SysCodeGenApiAxiosParamCreator(configuration).sysCodeGenDeletePost(body, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -569,36 +569,8 @@ export const SysCodeGenApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async codeGenerateDetailGet(id: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultSysCodeGen>>> {
-            const localVarAxiosArgs = await SysCodeGenApiAxiosParamCreator(configuration).codeGenerateDetailGet(id, options);
-            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
-                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
-                return axios.request(axiosRequestArgs);
-            };
-        },
-        /**
-         * 
-         * @summary 更新
-         * @param {UpdateCodeGenInput} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async codeGenerateEditPost(body?: UpdateCodeGenInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
-            const localVarAxiosArgs = await SysCodeGenApiAxiosParamCreator(configuration).codeGenerateEditPost(body, options);
-            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
-                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
-                return axios.request(axiosRequestArgs);
-            };
-        },
-        /**
-         * 
-         * @summary 获取数据库表(实体)集合
-         * @param {string} configId 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async codeGenerateInformationListConfigIdGet(configId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListTableOutput>>> {
-            const localVarAxiosArgs = await SysCodeGenApiAxiosParamCreator(configuration).codeGenerateInformationListConfigIdGet(configId, options);
+        async sysCodeGenDetailGet(id: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultSysCodeGen>>> {
+            const localVarAxiosArgs = await SysCodeGenApiAxiosParamCreator(configuration).sysCodeGenDetailGet(id, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -629,8 +601,8 @@ export const SysCodeGenApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async codeGeneratePageGet(authorName?: string, className?: string, tablePrefix?: string, configId?: string, dbName?: string, dbType?: string, connectionString?: string, generateType?: string, tableName?: string, nameSpace?: string, busName?: string, tableComment?: string, menuApplication?: string, menuPid?: number, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultSqlSugarPagedListSysCodeGen>>> {
-            const localVarAxiosArgs = await SysCodeGenApiAxiosParamCreator(configuration).codeGeneratePageGet(authorName, className, tablePrefix, configId, dbName, dbType, connectionString, generateType, tableName, nameSpace, busName, tableComment, menuApplication, menuPid, page, pageSize, field, order, descStr, options);
+        async sysCodeGenPageGet(authorName?: string, className?: string, tablePrefix?: string, configId?: string, dbName?: string, dbType?: string, connectionString?: string, generateType?: string, tableName?: string, nameSpace?: string, busName?: string, tableComment?: string, menuApplication?: string, menuPid?: number, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultSqlSugarPagedListSysCodeGen>>> {
+            const localVarAxiosArgs = await SysCodeGenApiAxiosParamCreator(configuration).sysCodeGenPageGet(authorName, className, tablePrefix, configId, dbName, dbType, connectionString, generateType, tableName, nameSpace, busName, tableComment, menuApplication, menuPid, page, pageSize, field, order, descStr, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -643,8 +615,36 @@ export const SysCodeGenApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async codeGenerateRunLocalPost(body?: SysCodeGen, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
-            const localVarAxiosArgs = await SysCodeGenApiAxiosParamCreator(configuration).codeGenerateRunLocalPost(body, options);
+        async sysCodeGenRunLocalPost(body?: SysCodeGen, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+            const localVarAxiosArgs = await SysCodeGenApiAxiosParamCreator(configuration).sysCodeGenRunLocalPost(body, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+        /**
+         * 
+         * @summary 获取数据库表(实体)集合
+         * @param {string} configId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async sysCodeGenTableListConfigIdGet(configId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListTableOutput>>> {
+            const localVarAxiosArgs = await SysCodeGenApiAxiosParamCreator(configuration).sysCodeGenTableListConfigIdGet(configId, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+        /**
+         * 
+         * @summary 更新
+         * @param {UpdateCodeGenInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async sysCodeGenUpdatePost(body?: UpdateCodeGenInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+            const localVarAxiosArgs = await SysCodeGenApiAxiosParamCreator(configuration).sysCodeGenUpdatePost(body, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -666,8 +666,8 @@ export const SysCodeGenApiFactory = function (configuration?: Configuration, bas
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async codeGenerateAddPost(body?: AddCodeGenInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
-            return SysCodeGenApiFp(configuration).codeGenerateAddPost(body, options).then((request) => request(axios, basePath));
+        async sysCodeGenAddPost(body?: AddCodeGenInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+            return SysCodeGenApiFp(configuration).sysCodeGenAddPost(body, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -677,8 +677,8 @@ export const SysCodeGenApiFactory = function (configuration?: Configuration, bas
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async codeGenerateColumnListConfigIdTableNameGet(tableName: string, configId: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListTableColumnOuput>> {
-            return SysCodeGenApiFp(configuration).codeGenerateColumnListConfigIdTableNameGet(tableName, configId, options).then((request) => request(axios, basePath));
+        async sysCodeGenColumnListConfigIdTableNameGet(tableName: string, configId: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListColumnOuput>> {
+            return SysCodeGenApiFp(configuration).sysCodeGenColumnListConfigIdTableNameGet(tableName, configId, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -686,8 +686,8 @@ export const SysCodeGenApiFactory = function (configuration?: Configuration, bas
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async codeGenerateDatabaseListGet(options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListDatabaseOutput>> {
-            return SysCodeGenApiFp(configuration).codeGenerateDatabaseListGet(options).then((request) => request(axios, basePath));
+        async sysCodeGenDatabaseListGet(options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListDatabaseOutput>> {
+            return SysCodeGenApiFp(configuration).sysCodeGenDatabaseListGet(options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -696,8 +696,8 @@ export const SysCodeGenApiFactory = function (configuration?: Configuration, bas
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async codeGenerateDeletePost(body?: Array<DeleteCodeGenInput>, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
-            return SysCodeGenApiFp(configuration).codeGenerateDeletePost(body, options).then((request) => request(axios, basePath));
+        async sysCodeGenDeletePost(body?: Array<DeleteCodeGenInput>, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+            return SysCodeGenApiFp(configuration).sysCodeGenDeletePost(body, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -706,28 +706,8 @@ export const SysCodeGenApiFactory = function (configuration?: Configuration, bas
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async codeGenerateDetailGet(id: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSysCodeGen>> {
-            return SysCodeGenApiFp(configuration).codeGenerateDetailGet(id, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @summary 更新
-         * @param {UpdateCodeGenInput} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async codeGenerateEditPost(body?: UpdateCodeGenInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
-            return SysCodeGenApiFp(configuration).codeGenerateEditPost(body, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @summary 获取数据库表(实体)集合
-         * @param {string} configId 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async codeGenerateInformationListConfigIdGet(configId: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListTableOutput>> {
-            return SysCodeGenApiFp(configuration).codeGenerateInformationListConfigIdGet(configId, options).then((request) => request(axios, basePath));
+        async sysCodeGenDetailGet(id: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSysCodeGen>> {
+            return SysCodeGenApiFp(configuration).sysCodeGenDetailGet(id, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -754,8 +734,8 @@ export const SysCodeGenApiFactory = function (configuration?: Configuration, bas
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async codeGeneratePageGet(authorName?: string, className?: string, tablePrefix?: string, configId?: string, dbName?: string, dbType?: string, connectionString?: string, generateType?: string, tableName?: string, nameSpace?: string, busName?: string, tableComment?: string, menuApplication?: string, menuPid?: number, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSqlSugarPagedListSysCodeGen>> {
-            return SysCodeGenApiFp(configuration).codeGeneratePageGet(authorName, className, tablePrefix, configId, dbName, dbType, connectionString, generateType, tableName, nameSpace, busName, tableComment, menuApplication, menuPid, page, pageSize, field, order, descStr, options).then((request) => request(axios, basePath));
+        async sysCodeGenPageGet(authorName?: string, className?: string, tablePrefix?: string, configId?: string, dbName?: string, dbType?: string, connectionString?: string, generateType?: string, tableName?: string, nameSpace?: string, busName?: string, tableComment?: string, menuApplication?: string, menuPid?: number, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSqlSugarPagedListSysCodeGen>> {
+            return SysCodeGenApiFp(configuration).sysCodeGenPageGet(authorName, className, tablePrefix, configId, dbName, dbType, connectionString, generateType, tableName, nameSpace, busName, tableComment, menuApplication, menuPid, page, pageSize, field, order, descStr, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -764,8 +744,28 @@ export const SysCodeGenApiFactory = function (configuration?: Configuration, bas
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async codeGenerateRunLocalPost(body?: SysCodeGen, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
-            return SysCodeGenApiFp(configuration).codeGenerateRunLocalPost(body, options).then((request) => request(axios, basePath));
+        async sysCodeGenRunLocalPost(body?: SysCodeGen, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+            return SysCodeGenApiFp(configuration).sysCodeGenRunLocalPost(body, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @summary 获取数据库表(实体)集合
+         * @param {string} configId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async sysCodeGenTableListConfigIdGet(configId: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListTableOutput>> {
+            return SysCodeGenApiFp(configuration).sysCodeGenTableListConfigIdGet(configId, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @summary 更新
+         * @param {UpdateCodeGenInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async sysCodeGenUpdatePost(body?: UpdateCodeGenInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+            return SysCodeGenApiFp(configuration).sysCodeGenUpdatePost(body, options).then((request) => request(axios, basePath));
         },
     };
 };
@@ -785,8 +785,8 @@ export class SysCodeGenApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof SysCodeGenApi
      */
-    public async codeGenerateAddPost(body?: AddCodeGenInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
-        return SysCodeGenApiFp(this.configuration).codeGenerateAddPost(body, options).then((request) => request(this.axios, this.basePath));
+    public async sysCodeGenAddPost(body?: AddCodeGenInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return SysCodeGenApiFp(this.configuration).sysCodeGenAddPost(body, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
@@ -797,8 +797,8 @@ export class SysCodeGenApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof SysCodeGenApi
      */
-    public async codeGenerateColumnListConfigIdTableNameGet(tableName: string, configId: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListTableColumnOuput>> {
-        return SysCodeGenApiFp(this.configuration).codeGenerateColumnListConfigIdTableNameGet(tableName, configId, options).then((request) => request(this.axios, this.basePath));
+    public async sysCodeGenColumnListConfigIdTableNameGet(tableName: string, configId: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListColumnOuput>> {
+        return SysCodeGenApiFp(this.configuration).sysCodeGenColumnListConfigIdTableNameGet(tableName, configId, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
@@ -807,8 +807,8 @@ export class SysCodeGenApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof SysCodeGenApi
      */
-    public async codeGenerateDatabaseListGet(options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListDatabaseOutput>> {
-        return SysCodeGenApiFp(this.configuration).codeGenerateDatabaseListGet(options).then((request) => request(this.axios, this.basePath));
+    public async sysCodeGenDatabaseListGet(options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListDatabaseOutput>> {
+        return SysCodeGenApiFp(this.configuration).sysCodeGenDatabaseListGet(options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
@@ -818,8 +818,8 @@ export class SysCodeGenApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof SysCodeGenApi
      */
-    public async codeGenerateDeletePost(body?: Array<DeleteCodeGenInput>, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
-        return SysCodeGenApiFp(this.configuration).codeGenerateDeletePost(body, options).then((request) => request(this.axios, this.basePath));
+    public async sysCodeGenDeletePost(body?: Array<DeleteCodeGenInput>, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return SysCodeGenApiFp(this.configuration).sysCodeGenDeletePost(body, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
@@ -829,30 +829,8 @@ export class SysCodeGenApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof SysCodeGenApi
      */
-    public async codeGenerateDetailGet(id: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSysCodeGen>> {
-        return SysCodeGenApiFp(this.configuration).codeGenerateDetailGet(id, options).then((request) => request(this.axios, this.basePath));
-    }
-    /**
-     * 
-     * @summary 更新
-     * @param {UpdateCodeGenInput} [body] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof SysCodeGenApi
-     */
-    public async codeGenerateEditPost(body?: UpdateCodeGenInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
-        return SysCodeGenApiFp(this.configuration).codeGenerateEditPost(body, options).then((request) => request(this.axios, this.basePath));
-    }
-    /**
-     * 
-     * @summary 获取数据库表(实体)集合
-     * @param {string} configId 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof SysCodeGenApi
-     */
-    public async codeGenerateInformationListConfigIdGet(configId: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListTableOutput>> {
-        return SysCodeGenApiFp(this.configuration).codeGenerateInformationListConfigIdGet(configId, options).then((request) => request(this.axios, this.basePath));
+    public async sysCodeGenDetailGet(id: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSysCodeGen>> {
+        return SysCodeGenApiFp(this.configuration).sysCodeGenDetailGet(id, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
@@ -880,8 +858,8 @@ export class SysCodeGenApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof SysCodeGenApi
      */
-    public async codeGeneratePageGet(authorName?: string, className?: string, tablePrefix?: string, configId?: string, dbName?: string, dbType?: string, connectionString?: string, generateType?: string, tableName?: string, nameSpace?: string, busName?: string, tableComment?: string, menuApplication?: string, menuPid?: number, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSqlSugarPagedListSysCodeGen>> {
-        return SysCodeGenApiFp(this.configuration).codeGeneratePageGet(authorName, className, tablePrefix, configId, dbName, dbType, connectionString, generateType, tableName, nameSpace, busName, tableComment, menuApplication, menuPid, page, pageSize, field, order, descStr, options).then((request) => request(this.axios, this.basePath));
+    public async sysCodeGenPageGet(authorName?: string, className?: string, tablePrefix?: string, configId?: string, dbName?: string, dbType?: string, connectionString?: string, generateType?: string, tableName?: string, nameSpace?: string, busName?: string, tableComment?: string, menuApplication?: string, menuPid?: number, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSqlSugarPagedListSysCodeGen>> {
+        return SysCodeGenApiFp(this.configuration).sysCodeGenPageGet(authorName, className, tablePrefix, configId, dbName, dbType, connectionString, generateType, tableName, nameSpace, busName, tableComment, menuApplication, menuPid, page, pageSize, field, order, descStr, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
@@ -891,7 +869,29 @@ export class SysCodeGenApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof SysCodeGenApi
      */
-    public async codeGenerateRunLocalPost(body?: SysCodeGen, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
-        return SysCodeGenApiFp(this.configuration).codeGenerateRunLocalPost(body, options).then((request) => request(this.axios, this.basePath));
+    public async sysCodeGenRunLocalPost(body?: SysCodeGen, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return SysCodeGenApiFp(this.configuration).sysCodeGenRunLocalPost(body, options).then((request) => request(this.axios, this.basePath));
+    }
+    /**
+     * 
+     * @summary 获取数据库表(实体)集合
+     * @param {string} configId 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof SysCodeGenApi
+     */
+    public async sysCodeGenTableListConfigIdGet(configId: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListTableOutput>> {
+        return SysCodeGenApiFp(this.configuration).sysCodeGenTableListConfigIdGet(configId, options).then((request) => request(this.axios, this.basePath));
+    }
+    /**
+     * 
+     * @summary 更新
+     * @param {UpdateCodeGenInput} [body] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof SysCodeGenApi
+     */
+    public async sysCodeGenUpdatePost(body?: UpdateCodeGenInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return SysCodeGenApiFp(this.configuration).sysCodeGenUpdatePost(body, options).then((request) => request(this.axios, this.basePath));
     }
 }

+ 92 - 92
Web/src/api-services/apis/sys-code-gen-config-api.ts

@@ -58,8 +58,8 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        sysCodeGenerateConfigDetailGet: async (id?: number, codeGenId?: number, columnName?: string, lowerColumnName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/sysCodeGenerateConfig/detail`;
+        sysCodeGenConfigDetailGet: async (id?: number, codeGenId?: number, columnName?: string, lowerColumnName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/sysCodeGenConfig/detail`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -196,47 +196,6 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
                 options: localVarRequestOptions,
             };
         },
-        /**
-         * 
-         * @summary 更新
-         * @param {Array<CodeGenConfig>} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        sysCodeGenerateConfigEditPost: async (body?: Array<CodeGenConfig>, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/sysCodeGenerateConfig/edit`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-            const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication Bearer required
-
-            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
-
-            const query = new URLSearchParams(localVarUrlObj.search);
-            for (const key in localVarQueryParameter) {
-                query.set(key, localVarQueryParameter[key]);
-            }
-            for (const key in options.params) {
-                query.set(key, options.params[key]);
-            }
-            localVarUrlObj.search = (new URLSearchParams(query)).toString();
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
-            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
-
-            return {
-                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
-                options: localVarRequestOptions,
-            };
-        },
         /**
          * 
          * @summary 代码生成详细配置列表
@@ -270,8 +229,8 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        sysCodeGenerateConfigListGet: async (id?: number, codeGenId?: number, columnName?: string, lowerColumnName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/sysCodeGenerateConfig/list`;
+        sysCodeGenConfigListGet: async (id?: number, codeGenId?: number, columnName?: string, lowerColumnName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/sysCodeGenConfig/list`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -403,6 +362,47 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
 
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @summary 更新
+         * @param {Array<CodeGenConfig>} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        sysCodeGenConfigUpdatePost: async (body?: Array<CodeGenConfig>, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/sysCodeGenConfig/update`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+
+            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
+            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
+
             return {
                 url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
                 options: localVarRequestOptions,
@@ -450,22 +450,8 @@ export const SysCodeGenConfigApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async sysCodeGenerateConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, lowerColumnName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultSysCodeGenConfig>>> {
-            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).sysCodeGenerateConfigDetailGet(id, codeGenId, columnName, lowerColumnName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, options);
-            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
-                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
-                return axios.request(axiosRequestArgs);
-            };
-        },
-        /**
-         * 
-         * @summary 更新
-         * @param {Array<CodeGenConfig>} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async sysCodeGenerateConfigEditPost(body?: Array<CodeGenConfig>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
-            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).sysCodeGenerateConfigEditPost(body, options);
+        async sysCodeGenConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, lowerColumnName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultSysCodeGenConfig>>> {
+            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).sysCodeGenConfigDetailGet(id, codeGenId, columnName, lowerColumnName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -504,8 +490,22 @@ export const SysCodeGenConfigApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async sysCodeGenerateConfigListGet(id?: number, codeGenId?: number, columnName?: string, lowerColumnName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListCodeGenConfig>>> {
-            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).sysCodeGenerateConfigListGet(id, codeGenId, columnName, lowerColumnName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, options);
+        async sysCodeGenConfigListGet(id?: number, codeGenId?: number, columnName?: string, lowerColumnName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListCodeGenConfig>>> {
+            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).sysCodeGenConfigListGet(id, codeGenId, columnName, lowerColumnName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+        /**
+         * 
+         * @summary 更新
+         * @param {Array<CodeGenConfig>} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async sysCodeGenConfigUpdatePost(body?: Array<CodeGenConfig>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).sysCodeGenConfigUpdatePost(body, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -553,18 +553,8 @@ export const SysCodeGenConfigApiFactory = function (configuration?: Configuratio
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async sysCodeGenerateConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, lowerColumnName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSysCodeGenConfig>> {
-            return SysCodeGenConfigApiFp(configuration).sysCodeGenerateConfigDetailGet(id, codeGenId, columnName, lowerColumnName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @summary 更新
-         * @param {Array<CodeGenConfig>} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async sysCodeGenerateConfigEditPost(body?: Array<CodeGenConfig>, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
-            return SysCodeGenConfigApiFp(configuration).sysCodeGenerateConfigEditPost(body, options).then((request) => request(axios, basePath));
+        async sysCodeGenConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, lowerColumnName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSysCodeGenConfig>> {
+            return SysCodeGenConfigApiFp(configuration).sysCodeGenConfigDetailGet(id, codeGenId, columnName, lowerColumnName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -599,8 +589,18 @@ export const SysCodeGenConfigApiFactory = function (configuration?: Configuratio
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async sysCodeGenerateConfigListGet(id?: number, codeGenId?: number, columnName?: string, lowerColumnName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListCodeGenConfig>> {
-            return SysCodeGenConfigApiFp(configuration).sysCodeGenerateConfigListGet(id, codeGenId, columnName, lowerColumnName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, options).then((request) => request(axios, basePath));
+        async sysCodeGenConfigListGet(id?: number, codeGenId?: number, columnName?: string, lowerColumnName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListCodeGenConfig>> {
+            return SysCodeGenConfigApiFp(configuration).sysCodeGenConfigListGet(id, codeGenId, columnName, lowerColumnName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @summary 更新
+         * @param {Array<CodeGenConfig>} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async sysCodeGenConfigUpdatePost(body?: Array<CodeGenConfig>, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+            return SysCodeGenConfigApiFp(configuration).sysCodeGenConfigUpdatePost(body, options).then((request) => request(axios, basePath));
         },
     };
 };
@@ -646,19 +646,8 @@ export class SysCodeGenConfigApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof SysCodeGenConfigApi
      */
-    public async sysCodeGenerateConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, lowerColumnName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSysCodeGenConfig>> {
-        return SysCodeGenConfigApiFp(this.configuration).sysCodeGenerateConfigDetailGet(id, codeGenId, columnName, lowerColumnName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, options).then((request) => request(this.axios, this.basePath));
-    }
-    /**
-     * 
-     * @summary 更新
-     * @param {Array<CodeGenConfig>} [body] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof SysCodeGenConfigApi
-     */
-    public async sysCodeGenerateConfigEditPost(body?: Array<CodeGenConfig>, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
-        return SysCodeGenConfigApiFp(this.configuration).sysCodeGenerateConfigEditPost(body, options).then((request) => request(this.axios, this.basePath));
+    public async sysCodeGenConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, lowerColumnName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSysCodeGenConfig>> {
+        return SysCodeGenConfigApiFp(this.configuration).sysCodeGenConfigDetailGet(id, codeGenId, columnName, lowerColumnName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
@@ -694,7 +683,18 @@ export class SysCodeGenConfigApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof SysCodeGenConfigApi
      */
-    public async sysCodeGenerateConfigListGet(id?: number, codeGenId?: number, columnName?: string, lowerColumnName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListCodeGenConfig>> {
-        return SysCodeGenConfigApiFp(this.configuration).sysCodeGenerateConfigListGet(id, codeGenId, columnName, lowerColumnName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, options).then((request) => request(this.axios, this.basePath));
+    public async sysCodeGenConfigListGet(id?: number, codeGenId?: number, columnName?: string, lowerColumnName?: string, columnComment?: string, netType?: string, effectType?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListCodeGenConfig>> {
+        return SysCodeGenConfigApiFp(this.configuration).sysCodeGenConfigListGet(id, codeGenId, columnName, lowerColumnName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, options).then((request) => request(this.axios, this.basePath));
+    }
+    /**
+     * 
+     * @summary 更新
+     * @param {Array<CodeGenConfig>} [body] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof SysCodeGenConfigApi
+     */
+    public async sysCodeGenConfigUpdatePost(body?: Array<CodeGenConfig>, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return SysCodeGenConfigApiFp(this.configuration).sysCodeGenConfigUpdatePost(body, options).then((request) => request(this.axios, this.basePath));
     }
 }

+ 11 - 11
Web/src/api-services/models/admin-result-list-table-column-ouput.ts → Web/src/api-services/models/admin-result-list-column-ouput.ts

@@ -11,47 +11,47 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-import { TableColumnOuput } from './table-column-ouput';
+import { ColumnOuput } from './column-ouput';
 /**
  * 全局返回结果
  * @export
- * @interface AdminResultListTableColumnOuput
+ * @interface AdminResultListColumnOuput
  */
-export interface AdminResultListTableColumnOuput {
+export interface AdminResultListColumnOuput {
     /**
      * 状态码
      * @type {number}
-     * @memberof AdminResultListTableColumnOuput
+     * @memberof AdminResultListColumnOuput
      */
     code?: number;
     /**
      * 类型success、warning、error
      * @type {string}
-     * @memberof AdminResultListTableColumnOuput
+     * @memberof AdminResultListColumnOuput
      */
     type?: string | null;
     /**
      * 错误信息
      * @type {string}
-     * @memberof AdminResultListTableColumnOuput
+     * @memberof AdminResultListColumnOuput
      */
     message?: string | null;
     /**
      * 数据
-     * @type {Array<TableColumnOuput>}
-     * @memberof AdminResultListTableColumnOuput
+     * @type {Array<ColumnOuput>}
+     * @memberof AdminResultListColumnOuput
      */
-    result?: Array<TableColumnOuput> | null;
+    result?: Array<ColumnOuput> | null;
     /**
      * 附加数据
      * @type {any}
-     * @memberof AdminResultListTableColumnOuput
+     * @memberof AdminResultListColumnOuput
      */
     extras?: any | null;
     /**
      * 时间
      * @type {Date}
-     * @memberof AdminResultListTableColumnOuput
+     * @memberof AdminResultListColumnOuput
      */
     time?: Date;
 }

+ 7 - 7
Web/src/api-services/models/table-column-ouput.ts → Web/src/api-services/models/column-ouput.ts

@@ -14,37 +14,37 @@
 /**
  * 数据库表列
  * @export
- * @interface TableColumnOuput
+ * @interface ColumnOuput
  */
-export interface TableColumnOuput {
+export interface ColumnOuput {
     /**
      * 字段名
      * @type {string}
-     * @memberof TableColumnOuput
+     * @memberof ColumnOuput
      */
     columnName?: string | null;
     /**
      * 数据库中类型
      * @type {string}
-     * @memberof TableColumnOuput
+     * @memberof ColumnOuput
      */
     dataType?: string | null;
     /**
      * .NET字段类型
      * @type {string}
-     * @memberof TableColumnOuput
+     * @memberof ColumnOuput
      */
     netType?: string | null;
     /**
      * 字段描述
      * @type {string}
-     * @memberof TableColumnOuput
+     * @memberof ColumnOuput
      */
     columnComment?: string | null;
     /**
      * 主外键
      * @type {string}
-     * @memberof TableColumnOuput
+     * @memberof ColumnOuput
      */
     columnKey?: string | null;
 }

+ 1 - 1
Web/src/api-services/models/database-output.ts

@@ -13,7 +13,7 @@
  */
 import { DbType } from './db-type';
 /**
- * 多库代码生成库列表输出
+ * 数据库
  * @export
  * @interface DatabaseOutput
  */

+ 2 - 2
Web/src/api-services/models/index.ts

@@ -18,6 +18,7 @@ export * from './admin-result-iaction-result';
 export * from './admin-result-int32';
 export * from './admin-result-int64';
 export * from './admin-result-list-code-gen-config';
+export * from './admin-result-list-column-ouput';
 export * from './admin-result-list-const-output';
 export * from './admin-result-list-database-output';
 export * from './admin-result-list-db-column-output';
@@ -37,7 +38,6 @@ export * from './admin-result-list-sys-org';
 export * from './admin-result-list-sys-pos';
 export * from './admin-result-list-sys-region';
 export * from './admin-result-list-sys-user-ext-org';
-export * from './admin-result-list-table-column-ouput';
 export * from './admin-result-list-table-output';
 export * from './admin-result-login-output';
 export * from './admin-result-login-user-output';
@@ -71,6 +71,7 @@ export * from './admin-result-we-chat-pay-output';
 export * from './card-type-enum';
 export * from './change-pwd-input';
 export * from './code-gen-config';
+export * from './column-ouput';
 export * from './const-output';
 export * from './create-entity-input';
 export * from './culture-level-enum';
@@ -173,7 +174,6 @@ export * from './sys-role';
 export * from './sys-tenant';
 export * from './sys-user';
 export * from './sys-user-ext-org';
-export * from './table-column-ouput';
 export * from './table-output';
 export * from './tenant-input';
 export * from './tenant-type-enum';

+ 1 - 1
Web/src/api-services/models/table-output.ts

@@ -12,7 +12,7 @@
  * Do not edit the class manually.
  */
 /**
- * 数据库表列表参数
+ * 数据库表
  * @export
  * @interface TableOutput
  */

+ 26 - 29
Web/src/views/system/codeGen/component/editCodeGenerateDialog.vue → Web/src/views/system/codeGen/component/editCodeGenDialog.vue

@@ -1,18 +1,18 @@
 <template>
-	<div class="sys-codeGenerate-container">
+	<div class="sys-editCodeGen-container">
 		<el-dialog v-model="isShowDialog" :title="title" draggable width="700px">
-			<el-form :model="ruleForm" ref="ruleFormRef" size="default" label-width="100px">
+			<el-form :model="ruleForm" ref="ruleFormRef" size="default" label-width="80px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="库定位器" prop="configId">
-							<el-select clearable v-model="ruleForm.configId" placeholder="库名" filterable @change="DbChanged()">
+							<el-select v-model="ruleForm.configId" placeholder="库名" filterable @change="DbChanged()" class="w100">
 								<el-option v-for="item in dbData" :key="item.configId" :label="item.configId" :value="item.configId" />
 							</el-select>
 						</el-form-item>
 					</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-select v-model="ruleForm.dbType" placeholder="数据库类型" clearable disabled >
+						<el-form-item label="库类型" prop="dbType" :rules="[{ required: true, message: '描述不能为空', trigger: 'blur' }]">
+							<el-select v-model="ruleForm.dbType" placeholder="数据库类型" clearable disabled class="w100">
 								<el-option label="MySql" :value="'0'" />
 								<el-option label="SqlServer" :value="'1'" />
 								<el-option label="Sqlite" :value="'2'" />
@@ -32,14 +32,14 @@
 							</el-select>
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="链接串" prop="connectionString">
+					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
+						<el-form-item label="库地址" prop="connectionString">
 							<el-input v-model="ruleForm.connectionString" disabled clearable type="textarea" />
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="生成表" prop="tableName" :rules="[{ required: true, message: '生成表不能为空', trigger: 'blur' }]">
-							<el-select v-model="ruleForm.tableName" class="m-2" filterable clearable>
+							<el-select v-model="ruleForm.tableName" filterable clearable class="w100">
 								<el-option v-for="item in tableData" :key="item.entityName" :label="item.tableName" :value="item.entityName" />
 							</el-select>
 						</el-form-item>
@@ -78,8 +78,8 @@
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="生成方式" prop="generateType">
-							<el-select v-model="ruleForm.generateType" class="m-2" filterable clearable>
-								<el-option v-for="item in codeGenerateTypeList" :key="item.value" :label="item.label" :value="item.value" />
+							<el-select v-model="ruleForm.generateType" filterable class="w100">
+								<el-option v-for="item in codeGenTypeList" :key="item.value" :label="item.label" :value="item.value" />
 							</el-select>
 						</el-form-item>
 					</el-col>
@@ -99,26 +99,17 @@
 import { reactive, toRefs, onMounted, defineComponent, getCurrentInstance, ref } from 'vue';
 
 import { getAPI } from '/@/utils/axios-utils';
-import { SysCodeGenApi } from '/@/api-services/api';
-
-import { UpdateCodeGenInput,AddCodeGenInput } from '/@/api-services/models';
+import { SysCodeGenApi, SysDictDataApi, SysMenuApi } from '/@/api-services/api';
+import { UpdateCodeGenInput, AddCodeGenInput, SysMenu } from '/@/api-services/models';
 
 export default defineComponent({
-	name: 'codeGenerateDialog',
+	name: 'sysEditCodeGen',
 	components: {},
 	props: {
 		title: {
 			type: String,
 			default: '',
 		},
-		menuData: {
-			type: Array,
-			default: () => [],
-		},
-		codeGenerateTypeList: {
-			type: Array,
-			default: () => [] as any,
-		},
 	},
 	setup() {
 		const { proxy } = getCurrentInstance() as any;
@@ -128,17 +119,25 @@ export default defineComponent({
 			ruleForm: {} as UpdateCodeGenInput,
 			tableData: [] as any,
 			dbData: [] as any,
+			menuData: [] as Array<SysMenu>,
+			codeGenTypeList: [] as any,
 		});
 
 		onMounted(async () => {
-			var res = await getAPI(SysCodeGenApi).codeGenerateDatabaseListGet();
-			state.dbData = res.data.result;
+			var resDb = await getAPI(SysCodeGenApi).sysCodeGenDatabaseListGet();
+			state.dbData = resDb.data.result;
+
+			let resMenu = await getAPI(SysMenuApi).sysMenuListGet();
+			state.menuData = resMenu.data.result ?? [];
+
+			let resDicData = await getAPI(SysDictDataApi).sysDictDataDictDataDropdownCodeGet('code_gen_create_type');
+			state.codeGenTypeList = resDicData.data.result;
 		});
 
 		// DbChanged
 		const DbChanged = async () => {
 			if (state.ruleForm.configId === '') return;
-			let res = await getAPI(SysCodeGenApi).codeGenerateInformationListConfigIdGet(state.ruleForm.configId as string);
+			let res = await getAPI(SysCodeGenApi).sysCodeGenTableListConfigIdGet(state.ruleForm.configId as string);
 			state.tableData = res.data.result ?? [];
 
 			let db = state.dbData.filter((u: any) => u.configId == state.ruleForm.configId);
@@ -146,7 +145,6 @@ export default defineComponent({
 			state.ruleForm.dbType = db[0].dbType.toString();
 		};
 
-
 		// 打开弹窗
 		const openDialog = (row: any) => {
 			state.ruleForm = JSON.parse(JSON.stringify(row));
@@ -169,11 +167,10 @@ export default defineComponent({
 			ruleFormRef.value.validate(async (valid: boolean) => {
 				if (!valid) return;
 				if (state.ruleForm.id != undefined && state.ruleForm.id > 0) {
-					await getAPI(SysCodeGenApi).codeGenerateEditPost(state.ruleForm as UpdateCodeGenInput);
+					await getAPI(SysCodeGenApi).sysCodeGenUpdatePost(state.ruleForm as UpdateCodeGenInput);
 				} else {
-					await getAPI(SysCodeGenApi).codeGenerateAddPost(state.ruleForm as AddCodeGenInput);
+					await getAPI(SysCodeGenApi).sysCodeGenAddPost(state.ruleForm as AddCodeGenInput);
 				}
-				
 				closeDialog();
 			});
 		};

+ 7 - 7
Web/src/views/system/codeGen/component/fkDialog.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="fk-container">
+	<div class="sys-codeGenFk-container">
 		<el-dialog v-model="isShowDialog" title="外键配置" draggable width="600px">
 			<el-form :model="ruleForm" ref="ruleFormRef" size="default" label-width="100px">
 				<el-row :gutter="35">
@@ -43,7 +43,7 @@ import { getAPI } from '/@/utils/axios-utils';
 import { SysCodeGenApi } from '/@/api-services/api';
 
 export default defineComponent({
-	name: 'fk',
+	name: 'sysCodeGenFk',
 	components: {},
 	setup() {
 		const { proxy } = getCurrentInstance() as any;
@@ -58,7 +58,7 @@ export default defineComponent({
 		});
 
 		onMounted(async () => {
-			var res = await getAPI(SysCodeGenApi).codeGenerateDatabaseListGet();
+			var res = await getAPI(SysCodeGenApi).sysCodeGenDatabaseListGet();
 			state.dbData = res.data.result;
 		});
 
@@ -74,20 +74,20 @@ export default defineComponent({
 		};
 
 		const getDbList = async () => {
-			var res = await getAPI(SysCodeGenApi).codeGenerateDatabaseListGet();
+			var res = await getAPI(SysCodeGenApi).sysCodeGenDatabaseListGet();
 			state.dbData = res.data.result;
 		};
 
 		const getTableInfoList = async () => {
 			if (state.ruleForm.configId == '') return;
-			var res = await getAPI(SysCodeGenApi).codeGenerateInformationListConfigIdGet(state.ruleForm.configId);
+			var res = await getAPI(SysCodeGenApi).sysCodeGenTableListConfigIdGet(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 getAPI(SysCodeGenApi).codeGenerateColumnListConfigIdTableNameGet(state.ruleForm.tableName,state.ruleForm.configId);
+			var res = await getAPI(SysCodeGenApi).sysCodeGenColumnListConfigIdTableNameGet(state.ruleForm.tableName, state.ruleForm.configId);
 			state.columnData = res.data.result;
 		};
 
@@ -126,12 +126,12 @@ export default defineComponent({
 			closeDialog,
 			cancel,
 			submit,
-			...toRefs(state),
 			DbChanged,
 			TableChanged,
 			getDbList,
 			getTableInfoList,
 			getColumnInfoList,
+			...toRefs(state),
 		};
 	},
 });

+ 6 - 6
Web/src/views/system/codeGen/component/generateConfigDialog.vue → Web/src/views/system/codeGen/component/genConfigDialog.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="codeGenerateConfig-container">
+	<div class="sys-codeGenConfig-container">
 		<el-dialog v-model="isShowDialog" title="配置" draggable width="100%">
 			<el-table :data="tableData" style="width: 100%" v-loading="loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
@@ -71,10 +71,10 @@ import fkDialog from '/@/views/system/codeGen/component/fkDialog.vue';
 import treeDialog from '/@/views/system/codeGen/component/treeDialog.vue';
 
 import { getAPI } from '/@/utils/axios-utils';
-import { SysCodeGenConfigApi,SysConstApi,SysDictDataApi,SysDictTypeApi } from '/@/api-services/api';
+import { SysCodeGenConfigApi, SysConstApi, SysDictDataApi, SysDictTypeApi } from '/@/api-services/api';
 
 export default defineComponent({
-	name: 'codeGenerateConfig',
+	name: 'sysCodeGenConfig',
 	components: { fkDialog, treeDialog },
 	setup() {
 		const { proxy } = getCurrentInstance() as any;
@@ -134,7 +134,7 @@ export default defineComponent({
 		// 查询操作
 		const handleQuery = async (row: any) => {
 			state.loading = true;
-			var res = await getAPI(SysCodeGenConfigApi).sysCodeGenerateConfigListGet(undefined,row.id);
+			var res = await getAPI(SysCodeGenConfigApi).sysCodeGenConfigListGet(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 getAPI(SysCodeGenConfigApi).sysCodeGenerateConfigEditPost(lst);
+			await getAPI(SysCodeGenConfigApi).sysCodeGenConfigUpdatePost(lst);
 			state.loading = false;
 			closeDialog();
 		};
@@ -269,7 +269,6 @@ export default defineComponent({
 			closeDialog,
 			cancel,
 			submit,
-			...toRefs(state),
 			convertDbType,
 			isOrNotSelect,
 			handleQuery,
@@ -278,6 +277,7 @@ export default defineComponent({
 			openFkDialog,
 			openTreeDialog,
 			effectTypeChange,
+			...toRefs(state),
 		};
 	},
 });

+ 8 - 10
Web/src/views/system/codeGen/component/treeDialog.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="tree-container">
+	<div class="sys-codeGenTree-container">
 		<el-dialog v-model="isShowDialog" title="树选择配置" draggable width="600px">
 			<el-form :model="ruleForm" ref="ruleFormRef" size="default" label-width="100px">
 				<el-row :gutter="35">
@@ -53,13 +53,11 @@
 <script lang="ts">
 import { reactive, toRefs, defineComponent, getCurrentInstance, ref, onMounted } from 'vue';
 
-
 import { getAPI } from '/@/utils/axios-utils';
 import { SysCodeGenApi } from '/@/api-services/api';
 
-
 export default defineComponent({
-	name: 'tree',
+	name: 'sysCodeGenTree',
 	components: {},
 	setup() {
 		const { proxy } = getCurrentInstance() as any;
@@ -74,8 +72,7 @@ export default defineComponent({
 		});
 
 		onMounted(async () => {
-			var res = await getAPI(SysCodeGenApi).codeGenerateDatabaseListGet();
-			state.dbData = res.data.result;
+			await getDbList();
 		});
 
 		const DbChanged = async () => {
@@ -90,19 +87,19 @@ export default defineComponent({
 		};
 
 		const getDbList = async () => {
-			var res = await getAPI(SysCodeGenApi).codeGenerateDatabaseListGet();
+			var res = await getAPI(SysCodeGenApi).sysCodeGenDatabaseListGet();
 			state.dbData = res.data.result;
 		};
 
 		const getTableInfoList = async () => {
 			if (state.ruleForm.configId == '') return;
-			var res = await getAPI(SysCodeGenApi).codeGenerateInformationListConfigIdGet(state.ruleForm.configId);
+			var res = await getAPI(SysCodeGenApi).sysCodeGenTableListConfigIdGet(state.ruleForm.configId);
 			state.tableData = res.data.result;
 		};
 
 		const getColumnInfoList = async () => {
 			if (state.ruleForm.configId == '' || state.ruleForm.tableName == '') return;
-			var res = await getAPI(SysCodeGenApi).codeGenerateColumnListConfigIdTableNameGet(state.ruleForm.tableName,state.ruleForm.configId);
+			var res = await getAPI(SysCodeGenApi).sysCodeGenColumnListConfigIdTableNameGet(state.ruleForm.tableName, state.ruleForm.configId);
 			state.columnData = res.data.result;
 		};
 
@@ -129,6 +126,7 @@ export default defineComponent({
 		const cancel = () => {
 			state.isShowDialog = false;
 		};
+
 		// 提交
 		const submit = () => {
 			ruleFormRef.value.validate(async (valid: boolean) => {
@@ -144,12 +142,12 @@ export default defineComponent({
 			closeDialog,
 			cancel,
 			submit,
-			...toRefs(state),
 			DbChanged,
 			TableChanged,
 			getDbList,
 			getTableInfoList,
 			getColumnInfoList,
+			...toRefs(state),
 		};
 	},
 });

+ 37 - 34
Web/src/views/system/codeGen/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="sys-codegenerate-container">
+	<div class="sys-codeGen-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="queryParams" ref="queryForm" :inline="true" v-loading="loading">
 				<el-form-item>
@@ -18,7 +18,8 @@
 				<el-table-column prop="authorName" label="作者姓名" show-overflow-tooltip />
 				<el-table-column prop="generateType" label="生成方式" show-overflow-tooltip>
 					<template #default="scope">
-						<span>{{ getGenerateTypeString(scope.row.generateType) }}</span>
+						<el-tag v-if="scope.row.generateType === 1"> 下载压缩包 </el-tag>
+						<el-tag type="danger" v-else> 生成到本项目 </el-tag>
 					</template>
 				</el-table-column>
 				<el-table-column label="操作" width="200" fixed="right" align="center" show-overflow-tooltip>
@@ -42,7 +43,7 @@
 				layout="total, sizes, prev, pager, next, jumper"
 			/>
 		</el-card>
-		<EditCodeGenerateDialog :code-generate-type-list="codeGenerateTypeList" :menu-data="menudata" :title="editMenuTitle" ref="EditCodeGenerateRef" />
+		<EditCodeGenDialog :title="editMenuTitle" ref="EditCodeGenRef" />
 		<CodeConfigDialog ref="CodeConfigRef" />
 	</div>
 </template>
@@ -50,20 +51,19 @@
 <script lang="ts">
 import { toRefs, reactive, onMounted, ref, defineComponent, onUnmounted, getCurrentInstance } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
-import EditCodeGenerateDialog from '/@/views/system/codeGen/component/editCodeGenerateDialog.vue';
-import CodeConfigDialog from '/@/views/system/codeGen/component/generateConfigDialog.vue';
+import EditCodeGenDialog from './component/editCodeGenDialog.vue';
+import CodeConfigDialog from './component/genConfigDialog.vue';
 
 import { getAPI } from '/@/utils/axios-utils';
-import { SysCodeGenApi,SysMenuApi,SysDictDataApi } from '/@/api-services/api';
-
-import { SysCodeGen,SysMenu } from '/@/api-services/models';
+import { SysCodeGenApi } from '/@/api-services/api';
+import { SysCodeGen } from '/@/api-services/models';
 
 export default defineComponent({
-	name: 'codeGen',
-	components: { EditCodeGenerateDialog,CodeConfigDialog },
+	name: 'sysCodeGen',
+	components: { EditCodeGenDialog, CodeConfigDialog },
 	setup() {
 		const { proxy } = getCurrentInstance() as any;
-		const EditCodeGenerateRef = ref();
+		const EditCodeGenRef = ref();
 		const CodeConfigRef = ref();
 		const state = reactive({
 			loading: false,
@@ -83,17 +83,11 @@ export default defineComponent({
 				total: 0 as any,
 			},
 			editMenuTitle: '',
-			menudata: [] as Array<SysMenu>,
-			codeGenerateTypeList: [] as any,
 		});
 
 		onMounted(async () => {
 			handleQuery();
-			let res = await getAPI(SysMenuApi).sysMenuListGet();
-			state.menudata = res.data.result ?? [];
 
-			let list = await getAPI(SysDictDataApi).sysDictDataDictDataDropdownCodeGet('code_gen_create_type');
-			state.codeGenerateTypeList = list.data.result;
 			proxy.mittBus.on('submitRefresh', () => {
 				handleQuery();
 			});
@@ -114,19 +108,29 @@ export default defineComponent({
 		const handleQuery = async () => {
 			state.loading = true;
 			// 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);
+			let res = await getAPI(SysCodeGenApi).sysCodeGenPageGet(
+				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;
 		};
 
-		// 获取生成方式
-		const getGenerateTypeString = (val: string) => {
-			let lst = state.codeGenerateTypeList.filter((u: any) => u.value == val);
-			return lst[0]?.label;
-		};
-
 		// 改变页面容量
 		const handleSizeChange = (val: number) => {
 			state.tableParams.pageSize = val;
@@ -141,13 +145,13 @@ export default defineComponent({
 
 		// 打开表增加页面
 		const openAddDialog = () => {
-			state.editMenuTitle = '增';
-			EditCodeGenerateRef.value.openDialog({nameSpace:'Admin.NET.Application',authorName:'Admin.Net',generateType:'2'});
+			state.editMenuTitle = '增';
+			EditCodeGenRef.value.openDialog({ nameSpace: 'Admin.NET.Application', authorName: 'Admin.NET', generateType: '2' });
 		};
 		// 打开表编辑页面
 		const openEditDialog = (row: any) => {
 			state.editMenuTitle = '编辑';
-			EditCodeGenerateRef.value.openDialog(row);
+			EditCodeGenRef.value.openDialog(row);
 		};
 
 		// 删除表
@@ -158,7 +162,7 @@ export default defineComponent({
 				type: 'warning',
 			})
 				.then(async () => {
-					await getAPI(SysCodeGenApi).codeGenerateDeletePost([{ id: row.id }]);
+					await getAPI(SysCodeGenApi).sysCodeGenDeletePost([{ id: row.id }]);
 					handleQuery();
 					ElMessage.success('操作成功');
 				})
@@ -173,7 +177,7 @@ export default defineComponent({
 				type: 'warning',
 			})
 				.then(async () => {
-					await getAPI(SysCodeGenApi).codeGenerateRunLocalPost(row);
+					await getAPI(SysCodeGenApi).sysCodeGenRunLocalPost(row);
 					handleQuery();
 					ElMessage.success('操作成功');
 				})
@@ -181,18 +185,17 @@ export default defineComponent({
 		};
 
 		return {
+			EditCodeGenRef,
+			CodeConfigRef,
 			handleQuery,
 			openAddDialog,
 			openEditDialog,
 			deleConfig,
-			EditCodeGenerateRef,
 			handleSizeChange,
 			handleCurrentChange,
-			getGenerateTypeString,
-			...toRefs(state),
-			CodeConfigRef,
 			openConfigDialog,
 			handleGenerate,
+			...toRefs(state),
 		};
 	},
 });

+ 1 - 1
Web/src/views/system/database/component/editTable.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="sys-dbTable-container">
-		<el-dialog v-model="isShowDialog" title="表编辑" draggable width="1000px">
+		<el-dialog v-model="isShowDialog" title="表编辑" draggable width="600px">
 			<el-form :model="ruleForm" ref="ruleFormRef" size="default" label-width="80px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">

+ 0 - 1
Web/src/views/system/tenant/component/editTenant.vue

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