Merge branch 'release' into dev

src/components/VersionNotice/index.vue

@@ -62,7 +62,7 @@ const props = defineProps({
   }
 })
 
-const emit = defineEmits(['update:modelValue']);
+const emit = defineEmits(['update:modelValue', 'confirm']);
 const dialogVisible = ref(props.modelValue);
 const showVersionList = ref(props.versionList.map((o) => o.title))
 

src/layout/components/Navbar.vue

@@ -108,6 +108,8 @@ const nowVersion = ref('') // 当前最新版本
 // 判断是否有新版本出现（监听 pinia 值的变化）
 watch(() => versionStore.version, (newVal, oldVal) => {
   const oldVersion = proxy.$cache.local.get('version')
+  const versionObj = versionStore.version[0]
+  nowVersion.value = versionObj.version
   if (oldVersion !== nowVersion.value) {
     handleVersionList()
   }
@@ -120,6 +122,7 @@ const showVersionFn = () => {
 
 // 处理版本通知数据结构
 const handleVersionList = () => {
+  console.log(versionStore)
   const versionObj = versionStore.version[0]
   nowVersion.value = versionObj.version
   showVersionNoticeVisible.value = true