fix: Style optimization

Author: dataeaseShu

frontend/src/assets/svg/LOGO-custom.svg

@@ -1,6 +1,8 @@
 <script lang="ts" setup>
 import { ref, computed } from 'vue'
 import Menu from './Menu.vue'
+import LOGOCustom from '@/assets/svg/LOGO-custom.svg'
+import custom_small from '@/assets/svg/logo-custom_small.svg'
 import Workspace from './Workspace.vue'
 import Person from './Person.vue'
 import LOGO from '@/assets/LOGO.svg'
@@ -51,6 +53,10 @@ const showSysmenu = computed(() => {
         />
         <img v-else width="130" height="31" :src="logo_blue" style="margin-bottom: 6px" />
       </template>
+      <template v-else-if="appearanceStore.themeColor === 'custom'">
+        <custom_small v-if="collapse" style="margin: 0 0 6px 5px"></custom_small>
+        <LOGOCustom v-else style="margin-bottom: 6px"></LOGOCustom>
+      </template>
       <template v-else>
         <LOGO_fold v-if="collapse" style="margin: 0 0 6px 5px"></LOGO_fold>
         <LOGO v-else style="margin-bottom: 6px"></LOGO>

frontend/src/assets/svg/logo-custom_small.svg

@@ -350,6 +350,7 @@ strong {
 
 .icon-primary.icon-primary {
   color: var(--ed-color-primary);
+  fill: var(--ed-color-primary);
 }
 
 .icon-primary_15_d.icon-primary_15_d {
@@ -390,3 +391,11 @@ strong {
     }
   }
 }
+
+.ed-icon.done {
+  svg {
+    path {
+      fill: var(--ed-color-primary);
+    }
+  }
+}

frontend/src/components/layout/LayoutDsl.vue

@@ -148,12 +148,7 @@
                 <div class="navigate-preview" style="height: 425px">
                   <div class="navigate-head">
                     <div class="header-sql">
-                      <img
-                        v-if="navigate"
-                        class="logo"
-                        :src="navigate.startsWith('blob') ? navigate : baseUrl + navigate"
-                        alt=""
-                      />
+                      <custom_small v-if="themeColor === 'custom'" class="logo" />
 
                       <img
                         v-else-if="isBlue"
@@ -224,6 +219,7 @@
 
 <script lang="ts" setup>
 import logo from '@/assets/LOGO.svg'
+import custom_small from '@/assets/svg/LOGO-custom.svg'
 import { ref, unref, reactive, onMounted, onUnmounted, nextTick, computed } from 'vue'
 import {
   type FormInstance,
@@ -268,8 +264,6 @@ const COLOR_PANEL = [
   '#000000',
   '#FFFFFF',
 ]
-const basePath = import.meta.env.VITE_API_BASEPATH
-const baseUrl = basePath + '/system/appearance/image/'
 const fileList = ref<(UploadUserFile & { flag: string })[]>([])
 const navigateBg = ref('dark')
 const themeColor = ref('default')

frontend/src/style.less

@@ -97,6 +97,7 @@ const init = () => {
 const giveUp = () => {
   resetSqlBotForm(false)
   init()
+  dialogVisible.value = false
 }
 
 const emits = defineEmits(['refresh'])
@@ -201,7 +202,6 @@ const clearFiles = (array?: string[]) => {
 }
 
 const open = (row: any) => {
-  console.log(JSON.parse(row.configuration))
   rawData = JSON.parse(row.configuration)
   currentId.value = row.id
   dialogVisible.value = true

frontend/src/views/system/appearance/index.vue

@@ -667,6 +667,8 @@ const columnRules = {
                   display: flex;
                   align-items: center;
                   justify-content: space-between;
+                  font-size: 16px;
+                  font-weight: 500;
                 "
               >
                 {{ t('permission.permission_rule') }}