Переглянути джерело

Merge branch 'feat_theme_zyh' of United_Software/k_online_ui into feat_theme

Jack Zhou 11 місяців тому
батько
коміт
87a8d6c970

+ 2 - 1
src/auto-imports.d.ts

@@ -3,6 +3,7 @@
 // @ts-nocheck
 // noinspection JSUnusedGlobalSymbols
 // Generated by unplugin-auto-import
+// biome-ignore lint: disable
 export {}
 declare global {
   const $api: typeof import('@/api/index')['default']
@@ -68,6 +69,6 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
   import('vue')
 }

+ 2 - 6
src/components/ContainerStatus/src/ContainerStatus.vue

@@ -65,12 +65,7 @@ watch(
       </el-collapse-item>
     </el-collapse>
     <div v-else class="empty-content" style="">
-      <img
-        :src="emptyImg"
-        :class="{ 'is-dark': themeStore.theme === 'dark' }"
-        fit="contain"
-        alt="empty"
-      />
+      <img :src="emptyImg" :class="{ 'is-dark': themeStore.theme === 'dark' }" alt="empty" />
       <div class="empty-text" style="">No data</div>
     </div>
     <div class="footer">
@@ -85,6 +80,7 @@ watch(
   position: relative;
   width: 100%;
   height: 100%;
+  overflow: auto;
   .container {
     height: 358px;
     padding-bottom: 8px;

+ 3 - 0
src/views/Booking/src/components/BookingDetail/src/components/EmailView.vue

@@ -302,6 +302,9 @@ const sendEmail = () => {
     padding-left: 0px;
 
     .avatar {
+      display: flex;
+      justify-content: center;
+      align-items: center;
       width: 24px;
       height: 24px;
       padding-top: 5px;

+ 6 - 0
src/views/Layout/src/components/Header/HeaderView.vue

@@ -290,6 +290,9 @@ const handleLogin = () => {
 
 <style lang="scss" scoped>
 .header-avatar {
+  display: flex;
+  align-items: center;
+  justify-content: center;
   width: 24px;
   height: 24px;
   padding: 2px;
@@ -435,6 +438,9 @@ div.el-popover.el-popper.user-config-popover {
     height: 70px;
     border-bottom: 1px solid var(--color-user-config-title-bottom-border);
     & > .avatar {
+      display: flex;
+      align-items: center;
+      justify-content: center;
       width: 48px;
       height: 48px;
       padding-top: 7px;

+ 3 - 0
src/views/Tracking/src/components/TrackingDetail/src/components/EmailDrawer.vue

@@ -305,6 +305,9 @@ const sendEmail = () => {
     padding-left: 0px;
 
     .avatar {
+      display: flex;
+      justify-content: center;
+      align-items: center;
       width: 24px;
       height: 24px;
       padding-top: 5px;

+ 6 - 2
src/views/Tracking/src/components/TrackingDetail/src/components/MapView.vue

@@ -55,7 +55,7 @@ const initMap = () => {
     return
   }
 
-  map = L.map('tracking-map', {}).setView([51.505, -0.09], 3)
+  map = L.map('tracking-map', { scrollWheelZoom: false }).setView([51.505, -0.09], 3)
 
   // 添加 TileLayer
   L.tileLayer('https://map.kerryapex.com/osm_tiles/{z}/{x}/{y}.png', {
@@ -530,7 +530,11 @@ onMounted(() => {
 })
 
 onUnmounted(() => {
-  map?.remove()
+  // 清除地图实例,防止内存泄漏
+  if (map) {
+    map.off() // 移除所有事件监听器
+    map.remove() // 移除地图
+  }
 })
 </script>