Browse Source

Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3

YunaiV 7 months ago
parent
commit
101ed368c3

+ 5 - 0
src/components/RouterSearch/index.vue

@@ -79,9 +79,14 @@ function remoteMethod(data) {
 
 
 function handleChange(path) {
 function handleChange(path) {
   router.push({ path })
   router.push({ path })
+  hiddenSearch()
   hiddenTopSearch()
   hiddenTopSearch()
 }
 }
 
 
+function hiddenSearch() {
+  showSearch.value = false
+}
+
 function hiddenTopSearch() {
 function hiddenTopSearch() {
   showTopSearch.value = false
   showTopSearch.value = false
 }
 }

+ 4 - 1
src/layout/components/Footer/src/Footer.vue

@@ -12,6 +12,9 @@ const prefixCls = getPrefixCls('footer')
 const appStore = useAppStore()
 const appStore = useAppStore()
 
 
 const title = computed(() => appStore.getTitle)
 const title = computed(() => appStore.getTitle)
+
+// 添加当前年份计算属性
+const currentYear = computed(() => new Date().getFullYear())
 </script>
 </script>
 
 
 <template>
 <template>
@@ -19,6 +22,6 @@ const title = computed(() => appStore.getTitle)
     :class="prefixCls"
     :class="prefixCls"
     class="h-[var(--app-footer-height)] bg-[var(--app-content-bg-color)] text-center leading-[var(--app-footer-height)] text-[var(--el-text-color-placeholder)] dark:bg-[var(--el-bg-color)] overflow-hidden"
     class="h-[var(--app-footer-height)] bg-[var(--app-content-bg-color)] text-center leading-[var(--app-footer-height)] text-[var(--el-text-color-placeholder)] dark:bg-[var(--el-bg-color)] overflow-hidden"
   >
   >
-    <span class="text-14px">Copyright ©2022-{{ title }}</span>
+    <span class="text-14px">Copyright ©{{ currentYear }} {{ title }}</span>
   </div>
   </div>
 </template>
 </template>