1、前端弹出框样式调整 2、其他优化

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

@@ -6882,7 +6882,7 @@
             </summary>
             <param name="db"></param>
         </member>
-        <member name="M:Admin.NET.Core.SqlSugarSetup.InitDataBase(SqlSugar.ITenant,Admin.NET.Core.DbConnectionConfig,System.Int64)">
+        <member name="M:Admin.NET.Core.SqlSugarSetup.InitDatabase(SqlSugar.ITenant,Admin.NET.Core.DbConnectionConfig,System.Int64)">
             <summary>
             初始化数据库结构
             </summary>

Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs

@@ -347,6 +347,10 @@ public class SysTenantService : IDynamicApiController, ITransient
         var db = App.GetRequiredService<ISqlSugarClient>();
         db.AsTenant().AddConnection(dbConnection);
         db.DbMaintenance.CreateDatabase();
-        SqlSugarSetup.InitDataBase(db.AsTenant(), dbConnection, tenant.Id);
+        SqlSugarSetup.InitDatabase(db.AsTenant(), dbConnection, tenant.Id);
+
+        // 去掉租户库里面的租户菜单（租户表）
+
+
     }
 }

Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs

@@ -26,8 +26,10 @@ public static class SqlSugarSetup
         dbOptions.ConnectionConfigs.ForEach(config =>
         {
             if (config.EnableInitDb && config.DbType != SqlSugar.DbType.Oracle)
+            {
                 sqlSugar.DbMaintenance.CreateDatabase();
-            InitDataBase(sqlSugar.AsTenant(), config);
+                InitDatabase(sqlSugar.AsTenant(), config);
+            }
         });
 
         services.AddSingleton<ISqlSugarClient>(sqlSugar); // 单例注册
@@ -171,7 +173,7 @@ public static class SqlSugarSetup
     /// <param name="db"></param>
     /// <param name="config"></param>
     /// <param name="tenantId"></param>
-    public static void InitDataBase(ITenant db, DbConnectionConfig config, long tenantId = 0)
+    public static void InitDatabase(ITenant db, DbConnectionConfig config, long tenantId = 0)
     {
         // 获取所有实体表-初始化表结构
         var entityTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass

Admin.NET/Admin.NET.Web.Core/Startup.cs

@@ -1,5 +1,4 @@
 using Admin.NET.Core;
-using Admin.NET.Core.Service;
 using AspNetCoreRateLimit;
 using Furion;
 using Furion.SpecificationDocument;
@@ -22,7 +21,7 @@ namespace Admin.NET.Web.Core;
 
 public class Startup : AppStartup
 {
-    public async void ConfigureServices(IServiceCollection services)
+    public void ConfigureServices(IServiceCollection services)
     {
         // 配置选项
         services.AddProjectOptions();

Web/src/theme/element.scss

@@ -250,6 +250,33 @@
 	overflow-y: auto;
 	overflow-x: hidden;
 }
+.el-dialog__title{
+	font-size: 14px;
+	color: #FFF;
+	font-weight: 700;
+}
+.el-dialog__header {
+	margin-right: 0;
+	padding-top: 10px;
+	// border-bottom: 1px solid var(--el-color-primary-light-1);
+	background: var(--el-color-primary);
+
+}
+.el-dialog__footer {
+	border-top: 1px dashed var(--el-color-primary-light-5);
+	padding-bottom: 10px;
+  }
+.el-dialog__headerbtn{
+	height: 40px;
+	font-weight: 900;
+	.el-dialog__close{
+		color: #FFF;
+	}
+}
+.el-dialog__headerbtn:hover .el-dialog__close{
+	color: var(--el-color-danger) !important;
+}
+
 
 /* Card 卡片
 ------------------------------- */

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

@@ -1,6 +1,6 @@
 <template>
 	<div class="sys-tenant-container">
-		<el-dialog v-model="isShowDialog" :title="title" draggable width="769px">
+		<el-dialog v-model="isShowDialog" :title="title" draggable :close-on-click-modal="false" width="769px">
 			<el-form :model="ruleForm" ref="ruleFormRef" size="default" label-width="100px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">

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

@@ -106,7 +106,7 @@ export default defineComponent({
 <style scoped lang="scss">
 .menu-data-tree {
 	width: 100%;
-	border: 1px solid var(--el-border-color);
+	// border: 1px solid var(--el-border-color);
 	border-radius: var(--el-input-border-radius, var(--el-border-radius-base));
 	padding: 5px;
 }