Merge remote-tracking branch 'origin/main' into main

frontend/src/components/SvgIcon/index.vue

@@ -19,6 +19,10 @@ export default {
     className: {
       type: String,
       default: ''
+    },
+    customClass: {
+      type: String,
+      default: ''
     }
   },
   computed: {
@@ -31,9 +35,11 @@ export default {
     svgClass() {
       if (this.className) {
         return 'svg-icon ' + this.className
-      } else {
-        return 'svg-icon'
       }
+      if (this.customClass) {
+        return this.customClass
+      }
+      return 'svg-icon'
     },
     styleExternalIcon() {
       return {

frontend/src/icons/svg/DataEase.svg

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 902.97 232.66" style="enable-background:new 0 0 902.97 232.66;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#0A7BE0;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#0A7BE0;}
+	.st2{fill:#53BAF9;}
+	.st3{fill:#2DAAF7;}
+</style>
+<path id="XMLID_997_" class="st0" d="M108.42,7.03l94.65,54.65v109.3l-94.65,54.65l-94.65-54.65V61.68L108.42,7.03 M108.42,4.04
+	L11.18,60.19v112.28l97.24,56.14l97.24-56.14V60.19L108.42,4.04L108.42,4.04z"/>
+<g id="XMLID_963_">
+	<path id="XMLID_995_" class="st0" d="M610.32,104.68h30.73l-3.98,21.39h-26.74v25.21h36.71l1.64,23.15h-68.53V57.08h68.53
+		l-1.64,22.69h-36.71V104.68z"/>
+	<path id="XMLID_992_" class="st0" d="M420.83,122.77v51.5h-22.5l-0.11-5.21c-7.87,4.09-15.56,6.13-23.07,6.13h-2.22
+		c-7.72,0-13.85-2.96-18.39-8.89c-3.02-4.65-4.52-9.84-4.52-15.56v-0.61c0-10.12,3.55-16.83,10.65-20.16
+		c2.91-1.94,10.3-2.91,22.15-2.91h12.11v-2.84c0-5.82-0.84-9.17-2.53-10.04c-1.84-1.38-5.08-2.07-9.73-2.07h-24.14l0.41-20.63
+		l27.79-0.75c16.5,0,26.72,4.09,30.66,12.26C419.68,107.74,420.83,114.34,420.83,122.77z M377.49,144.16
+		c-0.77,0.91-1.57,3.88-1.57,5.97c0,4.6,2.35,6.9,7.05,6.9c2.81,0,6.79-1.15,11.96-3.45v-11.22
+		C394.92,142.35,380.28,140.83,377.49,144.16z"/>
+	<path id="XMLID_989_" class="st0" d="M571.04,122.77v51.5h-22.5l-0.11-5.21c-7.87,4.09-15.56,6.13-23.07,6.13h-2.22
+		c-7.72,0-13.85-2.96-18.39-8.89c-3.02-4.65-4.52-9.84-4.52-15.56v-0.61c0-10.12,3.55-16.83,10.65-20.16
+		c2.91-1.94,10.3-2.91,22.15-2.91h12.11v-2.84c0-5.82-0.84-9.17-2.53-10.04c-1.84-1.38-5.08-2.07-9.73-2.07h-24.14l0.41-20.63
+		l27.79-0.75c16.5,0,26.72,4.09,30.66,12.26C569.89,107.74,571.04,114.34,571.04,122.77z M527.7,144.16
+		c-0.77,0.91-1.57,3.88-1.57,5.97c0,4.6,2.35,6.9,7.05,6.9c2.81,0,6.79-1.15,11.96-3.45v-11.22
+		C545.13,142.35,530.5,140.83,527.7,144.16z"/>
+	<path id="XMLID_986_" class="st0" d="M728.13,122.77v51.5h-22.5l-0.11-5.21c-7.87,4.09-15.56,6.13-23.07,6.13h-2.22
+		c-7.72,0-13.85-2.96-18.39-8.89c-3.02-4.65-4.52-9.84-4.52-15.56v-0.61c0-10.12,3.55-16.83,10.65-20.16
+		c2.91-1.94,10.3-2.91,22.15-2.91h12.11v-2.84c0-5.82-0.84-9.17-2.53-10.04c-1.84-1.38-5.08-2.07-9.73-2.07h-24.14l0.41-20.63
+		l27.79-0.75c16.5,0,26.72,4.09,30.66,12.26C726.98,107.74,728.13,114.34,728.13,122.77z M684.79,144.16
+		c-0.77,0.91-1.57,3.88-1.57,5.97c0,4.6,2.35,6.9,7.05,6.9c2.81,0,6.79-1.15,11.96-3.45v-11.22
+		C702.22,142.35,687.59,140.83,684.79,144.16z"/>
+	<g id="XMLID_983_">
+		<path id="XMLID_984_" class="st0" d="M488.61,174.44h-13.03c-2.64,0-4.9-0.08-6.78-0.23c-5.03-0.35-9.15-1.3-12.35-2.82
+			c-3.91-1.88-6.88-4.75-8.92-8.61c-2.29-4.37-3.43-10.21-3.43-17.53l-0.15-32.92h-12.5V90.92h12.5v-26.6l25.61,4.94v21.67h19.51
+			l-2.67,21.41h-16.84v31.47c0,0.71,0.03,1.32,0.08,1.83c0.1,1.32,0.31,2.41,0.61,3.28c0.76,2.08,2.39,3.53,4.88,4.34
+			c1.93,0.81,4.65,1.47,8.15,1.98c0.61,0.1,1.24,0.18,1.9,0.23c0.56,0.05,1.09,0.1,1.6,0.15l1.83,0.08V174.44z"/>
+	</g>
+	<path id="XMLID_980_" class="st0" d="M889.77,125.26v14.8h-47.12l-0.09,2.69c0,5.65,2.25,8.91,5.71,10.13
+		c2.7,0.76,5.75,1.14,9.16,1.14h2.06c9.16,0,22.54-2.06,32.15-4.05h0.15l-3.87,20.91c0,0.25-4.5,2.17-13.25,3.59
+		c-5.49,0.61-11.8,0.92-18.92,0.92c-18.31,0-30.14-6.18-35.48-18.54c-1.98-4.88-3.82-9.97-3.82-15.31v-19.99
+		c0-14.65,6.99-24.42,19.31-29.25c5.44-1.78,11.27-2.67,17.47-2.67c17.24,0,28.43,5.62,33.57,16.86
+		C888.78,110.92,889.77,117.17,889.77,125.26z M865.08,121.37c0-5.8-1.73-9.68-4.22-10.74c-1.88-1.27-4.79-1.46-7.48-1.46
+		c-6.87,0-10.3,3.23-10.3,9.69l-0.43,3.89h22.44V121.37z"/>
+	<g id="XMLID_966_">
+		<g id="XMLID_65_">
+			<path id="XMLID_66_" class="st1" d="M288.16,55.9h-45.27v118.54h45.27c28.84-0.01,52.22-19.54,52.22-43.63V99.54
+				C340.39,75.44,317,55.92,288.16,55.9z M311.3,131.83c0,10.69-10.35,19.34-23.14,19.36h-15.12V79.15h15.12
+				c12.79,0.01,23.14,8.68,23.14,19.36V131.83z"/>
+		</g>
+	</g>
+	<path id="XMLID_964_" class="st0" d="M769.93,176.75c-4.8,0-10.07-0.28-15.8-0.83c-2.2-0.22-4.45-0.48-6.77-0.77l-5.43-0.77
+		l-3.01-22.63l5.83,2.25l7.19,1.82c2.85,0.4,5.53,0.71,8.05,0.93c3.01,0.26,5.74,0.39,8.18,0.39c8.87,0,13.99-0.21,15.38-3.84
+		c0.77-1.5,0.73-5.62-0.12-7.05c-0.85-1.58-2.67-2.93-5.43-4.07c-1.18-0.48-2.67-0.97-4.45-1.49l-5.25-1.43
+		c-2.32-0.51-4.39-1.03-6.22-1.54c-2.36-0.66-4.52-1.36-6.47-2.09c-4.84-1.83-8.6-3.96-11.29-6.38c-2.56-2.46-4.21-5.47-4.94-9.03
+		c-0.53-2.53-0.59-5.41-0.18-8.64c1.1-9.32,5.51-15.72,13.24-19.2c2.89-1.39,6.37-2.4,10.43-3.03c1.59-0.22,3.4-0.4,5.43-0.55
+		l5.25-0.33h3.54c4.03,0,8.46,0.22,13.3,0.66l5.92,0.61l5,0.66l2.08,20.33c-2.59-0.77-5.97-1.06-10-1.54
+		c-5.17-0.66-9.91-0.55-14.1-0.55c-9.27,0-14.73-0.51-16.35,3.27c-0.61,1.58-0.57,3.08,0.12,4.51c0.89,1.65,2.85,3.1,5.86,4.35
+		c1.26,0.51,2.85,1.06,4.76,1.65l12.08,3.25c2.32,0.66,4.39,1.34,6.22,2.04c4.43,1.69,7.79,3.63,10.07,5.83
+		c2.69,2.42,4.41,5.45,5.19,9.08c0.53,2.61,0.59,8.07,0.18,11.12c-1.1,9.25-5.51,15.65-13.24,19.2c-2.85,1.4-6.33,2.39-10.43,2.97
+		c-1.59,0.22-3.4,0.4-5.43,0.55l-4.7,0.28H769.93z"/>
+</g>
+<path id="XMLID_960_" class="st0" d="M108.42,40.31l65.83,38.01v76.02l-65.83,38.01l-65.83-38.01V78.32L108.42,40.31 M108.42,19.89
+	L24.91,68.11v96.43l83.51,48.22l83.51-48.22V68.11L108.42,19.89L108.42,19.89z"/>
+<g id="XMLID_958_">
+	<path id="XMLID_959_" class="st2" d="M68.03,117.32c-2.65,0-5.24-1.38-6.66-3.84c-2.12-3.67-0.86-8.37,2.82-10.49L91.4,87.3
+		c3.67-2.12,8.37-0.86,10.49,2.82s0.86,8.37-2.82,10.49l-27.21,15.7C70.65,116.99,69.33,117.32,68.03,117.32z"/>
+</g>
+<g id="XMLID_956_">
+	<path id="XMLID_957_" class="st2" d="M116.17,89.56c-2.65,0-5.24-1.38-6.66-3.84c-2.12-3.67-0.86-8.37,2.82-10.49l9.96-5.74
+		c3.67-2.12,8.37-0.86,10.49,2.82c2.12,3.67,0.86,8.37-2.82,10.49L120,88.53C118.79,89.23,117.47,89.56,116.17,89.56z"/>
+</g>
+<g id="XMLID_875_">
+	<path id="XMLID_876_" class="st3" d="M79.38,140.76c-2.65,0-5.23-1.37-6.65-3.83c-2.12-3.67-0.87-8.37,2.8-10.49l0.26-0.15
+		c3.67-2.12,8.37-0.87,10.49,2.8c2.12,3.67,0.87,8.37-2.8,10.49l-0.26,0.15C82.01,140.43,80.69,140.76,79.38,140.76z"/>
+</g>
+<g id="XMLID_780_">
+	<path id="XMLID_874_" class="st3" d="M100.31,128.9c-2.64,0-5.22-1.37-6.64-3.81c-2.13-3.66-0.89-8.37,2.77-10.5l37.17-21.65
+		c3.66-2.13,8.36-0.9,10.5,2.77c2.13,3.66,0.89,8.37-2.77,10.5l-37.17,21.65C102.95,128.57,101.62,128.9,100.31,128.9z"/>
+</g>
+<g id="XMLID_778_">
+	<path id="XMLID_779_" class="st0" d="M90.73,164.2c-2.65,0-5.24-1.38-6.66-3.84c-2.12-3.67-0.86-8.37,2.82-10.49l58.1-33.51
+		c3.67-2.12,8.37-0.86,10.49,2.82c2.12,3.67,0.86,8.37-2.82,10.49l-58.1,33.51C93.35,163.87,92.03,164.2,90.73,164.2z"/>
+</g>
+</svg>

frontend/src/layout/components/Topbar.vue

 <template>
   <div class="top-nav" :style="{'background-color': '#f1f3f8'}">
     <div class="log">
-      <img v-if="!logoUrl" src="@/assets/DataEase-color.png" width="140" alt="" style="padding-top: 10px;">
+<!--      <img      v-if="!logoUrl" src="@/assets/DataEase-color.png" width="140" alt="" style="padding-top: 10px;">-->
+      <svg-icon v-if="!logoUrl" icon-class="DataEase"  custom-class="top-nav-logo-icon"/>
       <img v-else :src="logoUrl" width="140" alt="" style="padding-top: 10px;">
     </div>
     <el-menu

frontend/src/styles/index.scss

@@ -246,4 +246,14 @@ div:focus {
     position: fixed!important;
   }
 }
+.login-logo-icon{
+  width: auto;
+  height: 60px;
+}
+
+.top-nav-logo-icon{
+  width: 140px;
+  height: 45px;
+  padding-top: 10px;
+}
 

frontend/src/views/login/index.vue

@@ -5,11 +5,11 @@
         <el-col :span="12">
           <el-form ref="loginForm" :model="loginForm" :rules="loginRules" size="default">
             <div class="login-logo">
-              <img v-if="!loginLogoUrl" src="@/assets/DataEase-color.png" alt="">
+              <svg-icon v-if="!loginLogoUrl" icon-class="DataEase"  custom-class="login-logo-icon"/>
               <img v-else :src="loginLogoUrl" alt="">
             </div>
             <div class="login-welcome">
-              {{ $t('login.welcome') + (uiInfo && uiInfo['ui.title'] && uiInfo['ui.title'].paramValue || 'DATAEASE') }}
+              {{ $t('login.welcome') + (uiInfo && uiInfo['ui.title'] && uiInfo['ui.title'].paramValue || ' DataEase') }}
             </div>
             <div class="login-form">
               <el-form-item prop="username">