diff --git a/package.json b/package.json index 5541ed8..f66eb71 100644 --- a/package.json +++ b/package.json @@ -67,6 +67,7 @@ "@typescript-eslint/eslint-plugin": "^5.58.0", "@typescript-eslint/parser": "^5.58.0", "@unocss/preset-wind": "^0.51.4", + "@unocss/transformer-variant-group": "^0.51.4", "@vitejs/plugin-legacy": "^4.0.2", "@vitejs/plugin-vue": "^4.1.0", "@vitejs/plugin-vue-jsx": "^3.0.1", diff --git a/src/components/Logo/src/Logo.vue b/src/components/Logo/src/Logo.vue index bd7f9ab..602ad98 100644 --- a/src/components/Logo/src/Logo.vue +++ b/src/components/Logo/src/Logo.vue @@ -60,8 +60,7 @@ watch( :class="[ prefixCls, layout !== 'classic' ? `${prefixCls}__Top` : '', - 'flex !h-[var(--logo-height)] items-center cursor-pointer pl-8px relative', - 'dark:bg-[var(--el-bg-color)]' + 'flex !h-[var(--logo-height)] items-center cursor-pointer pl-8px relative decoration-none' ]" to="/" > diff --git a/src/components/Menu/src/Menu.vue b/src/components/Menu/src/Menu.vue index cd50db2..1f63d12 100644 --- a/src/components/Menu/src/Menu.vue +++ b/src/components/Menu/src/Menu.vue @@ -138,14 +138,15 @@ export default defineComponent({ position: relative; transition: width var(--transition-time-02); - &:after { - position: absolute; - top: 0; - right: 0; - height: 100%; - border-left: 1px solid var(--left-menu-border-color); - content: ''; - } + // &:after { + // position: absolute; + // top: 0; + // right: 0; + // height: 100%; + // width: 1px; + // background-color: var(--el-border-color); + // content: ''; + // } :deep(.@{elNamespace}-menu) { width: 100% !important; diff --git a/src/components/TabMenu/src/TabMenu.vue b/src/components/TabMenu/src/TabMenu.vue index 9b64e31..5dd6f71 100644 --- a/src/components/TabMenu/src/TabMenu.vue +++ b/src/components/TabMenu/src/TabMenu.vue @@ -141,7 +141,7 @@ export default defineComponent({ id={`${variables.namespace}-menu`} class={[ prefixCls, - 'relative bg-[var(--left-menu-bg-color)] top-1px z-3000', + 'relative bg-[var(--left-menu-bg-color)] top-1px z-3000 layout-border__right', { 'w-[var(--tab-menu-max-width)]': !unref(collapse), 'w-[var(--tab-menu-min-width)]': unref(collapse) @@ -197,7 +197,7 @@ export default defineComponent({ { return tagsViewStore.getCachedViews }) + +const tagsView = computed(() => appStore.getTagsView)