Merge commit 'refs/pull/371/head' of https://gitee.com/zuohuaijun/Admin.NET into next

Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -4219,7 +4219,7 @@
             </summary>
             <param name="input"></param>
         </member>
-        <member name="M:Admin.NET.Core.Service.DataBaseManager.TableDelete(SqlSugar.DbTableInfo)">
+        <member name="M:Admin.NET.Core.Service.DataBaseManager.TableDelete(Admin.NET.Core.Service.DeleteTableInput)">
             <summary>
             删除表
             </summary>

Admin.NET/Admin.NET.Core/SeedData/SysDictDataSeedData.cs

@@ -45,7 +45,7 @@ public class SysDictDataSeedData : ISqlSugarEntitySeedData<SysDictData>
             new SysDictData{ Id=269037953120009, DictTypeId=269037954100003, Value="Guid", Code="Guid", Order=1, Remark="Guid", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysDictData{ Id=269037953120010, DictTypeId=269037954100003, Value="DateTimeOffset", Code="DateTimeOffset", Order=1, Remark="DateTimeOffset", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
 
-            new SysDictData{ Id=269037953130001, DictTypeId=269037954100004, Value="下载压缩包", Code="1", Order=1, Remark="下载压缩包", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953130001, DictTypeId=269037954100004, Value="下载压缩包", Code="1", Order=1, Remark="下载压缩包", Status=StatusEnum.Disable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysDictData{ Id=269037953130002, DictTypeId=269037954100004, Value="生成到本项目", Code="2", Order=1, Remark="生成到本项目", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
 
             new SysDictData{ Id=269037953140001, DictTypeId=269037954200001, Value="省级", Code="省级", Order=1, Remark="省级", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },

Admin.NET/Admin.NET.Core/Service/DataBase/DataBaseManager.cs

@@ -100,6 +100,7 @@ public class DataBaseManager : IDynamicApiController, ITransient
     [HttpPost("/table/add")]
     public void TableAdd(DbTableInfoInput input)
     {
+        var provider = _db.AsTenant().GetConnectionScope(input.ConfigId);
         var columns = new List<DbColumnInfo>();
         if (input.DbColumnInfoList == null || !input.DbColumnInfoList.Any())
         {
@@ -119,15 +120,15 @@ public class DataBaseManager : IDynamicApiController, ITransient
                 DecimalDigits = m.DecimalDigits
             });
         });
-        _db.DbMaintenance.CreateTable(input.Name, columns, false);
-        _db.DbMaintenance.AddTableRemark(input.Name, input.Description);
+        provider.DbMaintenance.CreateTable(input.Name, columns, false);
+        provider.DbMaintenance.AddTableRemark(input.Name, input.Description);
         if (columns.Any(m => m.IsPrimarykey))
         {
-            _db.DbMaintenance.AddPrimaryKey(input.Name, columns.FirstOrDefault(m => m.IsPrimarykey).DbColumnName);
+            provider.DbMaintenance.AddPrimaryKey(input.Name, columns.FirstOrDefault(m => m.IsPrimarykey).DbColumnName);
         }
         input.DbColumnInfoList.ForEach(m =>
         {
-            _db.DbMaintenance.AddColumnRemark(m.DbColumnName, input.Name, string.IsNullOrWhiteSpace(m.ColumnDescription) ? m.DbColumnName : m.ColumnDescription);
+            provider.DbMaintenance.AddColumnRemark(m.DbColumnName, input.Name, string.IsNullOrWhiteSpace(m.ColumnDescription) ? m.DbColumnName : m.ColumnDescription);
         });
     }
 
@@ -136,9 +137,10 @@ public class DataBaseManager : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     [HttpPost("/table/delete")]
-    public void TableDelete(DbTableInfo input)
+    public void TableDelete(DeleteTableInput input)
     {
-        _db.DbMaintenance.DropTable(input.Name);
+        var provider = _db.AsTenant().GetConnectionScope(input.ConfigId);
+        provider.DbMaintenance.DropTable(input.Name);
     }
 
     /// <summary>
@@ -148,12 +150,13 @@ public class DataBaseManager : IDynamicApiController, ITransient
     [HttpPost("/table/edit")]
     public void TableEdit(EditTableInput input)
     {
-        _db.DbMaintenance.RenameTable(input.OldName, input.Name);
-        if (_db.DbMaintenance.IsAnyTableRemark(input.Name))
+        var provider = _db.AsTenant().GetConnectionScope(input.ConfigId);
+        provider.DbMaintenance.RenameTable(input.OldName, input.Name);
+        if (provider.DbMaintenance.IsAnyTableRemark(input.Name))
         {
-            _db.DbMaintenance.DeleteTableRemark(input.Name);
+            provider.DbMaintenance.DeleteTableRemark(input.Name);
         }
-        _db.DbMaintenance.AddTableRemark(input.Name, input.Description);
+        provider.DbMaintenance.AddTableRemark(input.Name, input.Description);
     }
 
     /// <summary>

Admin.NET/Admin.NET.Core/Service/DataBase/Dto/DbTableInfoInput.cs

@@ -2,6 +2,7 @@
 
 public class DbTableInfoInput
 {
+    public string ConfigId { get; set; }
     public string Name { get; set; }
 
     public string Description { get; set; }

Admin.NET/Admin.NET.Core/Service/DataBase/Dto/EditTableInput.cs

@@ -2,9 +2,16 @@
 
 public class EditTableInput
 {
+    public string ConfigId { get; set; }
     public string Name { get; set; }
 
     public string OldName { get; set; }
 
     public string Description { get; set; }
+}
+public class DeleteTableInput 
+{
+    public string ConfigId { get; set; }
+    public string Name { get; set; }
+
 }

Admin.NET/Admin.NET.Core/Service/Dict/SysDictDataService.cs

@@ -145,6 +145,7 @@ public class SysDictDataService : IDynamicApiController, ITransient
         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)
             .Select((a, b) => new
             {
                 Label = b.Value,

Vben2/.env.development

@@ -6,7 +6,7 @@ VITE_PUBLIC_PATH = /
 
 # Cross-domain proxy, you can configure multiple
 # Please note that no line breaks
-VITE_PROXY = [["/api","https://localhost:44326"]]
+VITE_PROXY = [["/api","https://localhost:5005"]]
 
 # Delete console
 VITE_DROP_CONSOLE = false
@@ -15,7 +15,7 @@ VITE_DROP_CONSOLE = false
 VITE_GLOB_API_URL=/api
 
 # File upload address， optional
-VITE_GLOB_UPLOAD_URL=https://localhost:44326
+VITE_GLOB_UPLOAD_URL=https://localhost:5005
 
 # Interface prefix
 VITE_GLOB_API_URL_PREFIX=

Vben2/src/views/sys/admin/database/TableModal.vue

@@ -85,6 +85,9 @@
             ...data.record,
           });
         }
+        setFieldsValue({
+          configId: data.configId,
+        });
       });
 
       const getTitle = computed(() => (!unref(isUpdate) ? '新增表' : '编辑表'));
@@ -266,6 +269,7 @@
       async function handleSubmit() {
         try {
           const values = await validate();
+          debugger;
           setModalProps({ confirmLoading: true });
           if (!unref(isUpdate)) {
             let tbData: any = [];

Vben2/src/views/sys/admin/database/database.data.ts

@@ -85,6 +85,12 @@ export const tableShowColumns: BasicColumn[] = [
 ];
 
 export const tableFormSchema: FormSchema[] = [
+  {
+    field: 'configId',
+    label: '',
+    component: 'Input',
+    show: false,
+  },
   {
     field: 'oldName',
     label: '表名',

Vben2/src/views/sys/admin/database/index.vue

@@ -158,18 +158,20 @@
       function handleCreateTable() {
         openModal(true, {
           isUpdate: false,
+          configId: currentDB?.value,
         });
       }
 
       function handleEdit(record: Recordable) {
         openModal(true, {
           record,
+          configId: currentDB?.value,
           isUpdate: true,
         });
       }
 
       async function handleDelete(record: Recordable) {
-        await deleteTable(record);
+        await deleteTable({ configId: currentDB?.value, name: record.name });
         createMessage.success('删除成功！');
         reload();
         colReload();

Vben2/src/views/sys/admin/dict/dict.data.ts

@@ -88,7 +88,7 @@ export const formSchema: FormSchema[] = [
     componentProps: {
       options: [
         { label: '启用', value: 1 },
-        { label: '停用', value: 0 },
+        { label: '停用', value: 2 },
       ],
     },
     colProps: { span: 24 },

Vben2/src/views/sys/admin/dict/dictdata/dictData.data.ts

@@ -94,7 +94,7 @@ export const formSchema: FormSchema[] = [
     componentProps: {
       options: [
         { label: '启用', value: 1 },
-        { label: '停用', value: 0 },
+        { label: '停用', value: 2 },
       ],
     },
   },