diff --git a/web-vue/packages/core/layouts/default/footer/index.vue b/web-vue/packages/core/layouts/default/footer/index.vue index 81c90193..6191177c 100644 --- a/web-vue/packages/core/layouts/default/footer/index.vue +++ b/web-vue/packages/core/layouts/default/footer/index.vue @@ -1,13 +1,6 @@ @@ -15,10 +8,7 @@ import { computed, defineComponent, unref, ref } from 'vue'; import { Layout } from 'ant-design-vue'; import { Icon } from '@jeesite/core/components/Icon'; - - import { DOC_URL, GITHUB_URL, SITE_URL } from '@jeesite/core/settings/siteSetting'; import { openWindow } from '@jeesite/core/utils'; - import { useI18n } from '@jeesite/core/hooks/web/useI18n'; import { useRootSetting } from '@jeesite/core/hooks/setting/useRootSetting'; import { useRouter } from 'vue-router'; diff --git a/web-vue/packages/core/layouts/default/tabs/components/TabContent.vue b/web-vue/packages/core/layouts/default/tabs/components/TabContent.vue index 6ea041ea..5d26ab53 100644 --- a/web-vue/packages/core/layouts/default/tabs/components/TabContent.vue +++ b/web-vue/packages/core/layouts/default/tabs/components/TabContent.vue @@ -38,7 +38,7 @@ const getIcon = computed(() => { const { tabItem: { meta } = {} } = props; - return meta && t(meta.tabIcon as string); + return meta && t((meta.tabIcon as string) || (meta.icon as string)); }); const getTitle = computed(() => { diff --git a/web-vue/packages/core/layouts/default/tabs/index.vue b/web-vue/packages/core/layouts/default/tabs/index.vue index 9f6579d8..952b0443 100644 --- a/web-vue/packages/core/layouts/default/tabs/index.vue +++ b/web-vue/packages/core/layouts/default/tabs/index.vue @@ -17,7 +17,6 @@ -