登录页面改造

EdgeAdmin/web/views/@default/@layout_override.css

@@ -115,4 +115,14 @@ body.swal2-shown {
   padding: 0 !important;
   margin: 0 !important;
 }
+.main-menu {
+  top: 2.6em !important;
+}
+.main-menu > .ui.menu > .item:first-child:empty {
+  display: none !important;
+  height: 0 !important;
+  min-height: 0 !important;
+  padding: 0 !important;
+  margin: 0 !important;
+}
 /*# sourceMappingURL=@layout_override.css.map */

EdgeAdmin/web/views/@default/@layout_override.less

@@ -150,3 +150,16 @@ body.swal2-shown {
 	padding: 0 !important;
 	margin: 0 !important;
 }
+
+// Align left menu with top nav and remove leading spacer item
+.main-menu {
+	top: 2.6em !important;
+}
+
+.main-menu > .ui.menu > .item:first-child:empty {
+	display: none !important;
+	height: 0 !important;
+	min-height: 0 !important;
+	padding: 0 !important;
+	margin: 0 !important;
+}

EdgeUser/internal/web/actions/default/index/index.go

@@ -67,6 +67,7 @@ func (this *IndexAction) RunGet(params struct {
 		this.Data["version"] = teaconst.Version
 	}
 	this.Data["faviconFileId"] = config.FaviconFileId
+	this.Data["logoFileId"] = config.LogoFileId
 	this.Data["themeBackgroundColor"] = config.Theme.BackgroundColor
 
 	// 是否可以注册

EdgeUser/internal/web/actions/default/login/index.go

@@ -63,6 +63,7 @@ func (this *IndexAction) RunGet(params struct {
 		this.Data["version"] = teaconst.Version
 	}
 	this.Data["faviconFileId"] = config.FaviconFileId
+	this.Data["logoFileId"] = config.LogoFileId
 	this.Data["themeBackgroundColor"] = config.Theme.BackgroundColor
 
 	// 是否可以注册

EdgeUser/web/views/@default/index/index.css

@@ -106,6 +106,23 @@ body.login-page > div {
   justify-content: center;
 }
 
+.logo-image-wrap {
+  width: 36px;
+  height: 36px;
+  border-radius: 6px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden;
+  background: #ffffff;
+}
+
+.logo-image {
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+}
+
 .logo-icon i.icon {
   margin: 0 !important;
   font-size: 16px;

EdgeUser/web/views/@default/index/index.html

@@ -38,7 +38,11 @@
 			<div class="login-card">
 				<div class="card-header">
 					<div class="brand-logo">
+						{$if gt .logoFileId 0}
+						<span class="logo-image-wrap"><img class="logo-image" src="/ui/image/{$.logoFileId}" alt="logo"/></span>
+						{$else}
 						<span class="logo-icon"><i class="shield alternate icon"></i></span>
+						{$end}
 						<span class="logo-text">{$ htmlEncode .systemName}</span>
 					</div>
 					<p class="header-title">&#26032;&#19968;&#20195; Web&#19982;APP &#24212;&#29992;&#38450;&#25252;&#24179;&#21488;</p>

EdgeUser/web/views/@default/index/index.less

@@ -106,6 +106,23 @@ body.login-page > div {
     justify-content: center;
 }
 
+.logo-image-wrap {
+    width: 36px;
+    height: 36px;
+    border-radius: 6px;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    overflow: hidden;
+    background: #ffffff;
+}
+
+.logo-image {
+    width: 100%;
+    height: 100%;
+    object-fit: contain;
+}
+
 .logo-icon i.icon {
     margin: 0 !important;
     font-size: 16px;

EdgeUser/web/views/@default/login/index.css

@@ -106,6 +106,23 @@ body.login-page > div {
   justify-content: center;
 }
 
+.logo-image-wrap {
+  width: 36px;
+  height: 36px;
+  border-radius: 6px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden;
+  background: #ffffff;
+}
+
+.logo-image {
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+}
+
 .logo-icon i.icon {
   margin: 0 !important;
   font-size: 16px;

EdgeUser/web/views/@default/login/index.html

@@ -38,7 +38,11 @@
 			<div class="login-card">
 				<div class="card-header">
 					<div class="brand-logo">
+						{$if gt .logoFileId 0}
+						<span class="logo-image-wrap"><img class="logo-image" src="/ui/image/{$.logoFileId}" alt="logo"/></span>
+						{$else}
 						<span class="logo-icon"><i class="shield alternate icon"></i></span>
+						{$end}
 						<span class="logo-text">{$ htmlEncode .systemName}</span>
 					</div>
 					<p class="header-title">&#26032;&#19968;&#20195; Web&#19982;APP &#24212;&#29992;&#38450;&#25252;&#24179;&#21488;</p>

EdgeUser/web/views/@default/login/index.less

@@ -106,6 +106,23 @@ body.login-page > div {
     justify-content: center;
 }
 
+.logo-image-wrap {
+    width: 36px;
+    height: 36px;
+    border-radius: 6px;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    overflow: hidden;
+    background: #ffffff;
+}
+
+.logo-image {
+    width: 100%;
+    height: 100%;
+    object-fit: contain;
+}
+
 .logo-icon i.icon {
     margin: 0 !important;
     font-size: 16px;