diff --git a/src/assets/style/theme/d2/setting.scss b/src/assets/style/theme/d2/setting.scss index 827d5af..30adb36 100644 --- a/src/assets/style/theme/d2/setting.scss +++ b/src/assets/style/theme/d2/setting.scss @@ -5,6 +5,11 @@ $theme-bg-color: #ebf1f6; // 主题背景图片遮罩 $theme-bg-mask: rgba(#000, 0); +// 消息提示 +$theme-message-info-background-color: $color-bg; +$theme-message-info-text-color: $color-text-normal; +$theme-message-info-border-color: $color-border-1; + // container组件 $theme-container-background-color: rgba(#FFF, 1); $theme-container-header-footer-background-color: #FFF; diff --git a/src/assets/style/theme/line/setting.scss b/src/assets/style/theme/line/setting.scss index 1b56ce2..6962499 100644 --- a/src/assets/style/theme/line/setting.scss +++ b/src/assets/style/theme/line/setting.scss @@ -5,6 +5,11 @@ $theme-bg-color: #f8f8f9; // 主题背景图片遮罩 $theme-bg-mask: rgba(#000, 0); +// 消息提示 +$theme-message-info-background-color: $color-bg; +$theme-message-info-text-color: $color-text-normal; +$theme-message-info-border-color: $color-border-1; + // container组件 $theme-container-background-color: rgba(#FFF, .8); $theme-container-header-footer-background-color: #FFF; diff --git a/src/assets/style/theme/star/setting.scss b/src/assets/style/theme/star/setting.scss index 88fd395..38cf867 100644 --- a/src/assets/style/theme/star/setting.scss +++ b/src/assets/style/theme/star/setting.scss @@ -5,6 +5,11 @@ $theme-bg-color: #EFF4F8; // 主题背景图片遮罩 $theme-bg-mask: rgba(#000, .3); +// 消息提示 +$theme-message-info-background-color: $color-bg; +$theme-message-info-text-color: $color-text-normal; +$theme-message-info-border-color: $color-border-1; + // container组件 $theme-container-background-color: rgba(#FFF, .9); $theme-container-header-footer-background-color: #FFF; diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss index 9202418..243c3a7 100644 --- a/src/assets/style/theme/theme.scss +++ b/src/assets/style/theme/theme.scss @@ -1,6 +1,14 @@ // 每个主题特有的设置 .theme-#{$theme-name} { + .el-message { + &.el-message--info { + background-color: $theme-message-info-background-color; + color: $theme-message-info-text-color; + border-color: $theme-message-info-border-color; + } + } + .el-card { &.d2-card { border: $theme-container-border-outer; @@ -255,9 +263,6 @@ &:hover { padding: 0px 20px; } - .el-icon-close { - display: none; - } } } .el-tabs__item.is-active { diff --git a/src/assets/style/theme/tomorrow-night-blue/setting.scss b/src/assets/style/theme/tomorrow-night-blue/setting.scss index f80e797..1f59ca8 100644 --- a/src/assets/style/theme/tomorrow-night-blue/setting.scss +++ b/src/assets/style/theme/tomorrow-night-blue/setting.scss @@ -5,6 +5,11 @@ $theme-bg-color: #002253; // 主题背景图片遮罩 $theme-bg-mask: rgba(#000, 0); +// 消息提示 +$theme-message-info-background-color: $color-bg; +$theme-message-info-text-color: $color-text-normal; +$theme-message-info-border-color: $color-border-1; + // container组件 $theme-container-background-color: rgba(#FFF, 1); $theme-container-header-footer-background-color: #FFF; diff --git a/src/assets/style/theme/violet/setting.scss b/src/assets/style/theme/violet/setting.scss index 441b1b2..9101095 100644 --- a/src/assets/style/theme/violet/setting.scss +++ b/src/assets/style/theme/violet/setting.scss @@ -5,6 +5,11 @@ $theme-bg-color: #000; // 主题背景图片遮罩 $theme-bg-mask: rgba(#000, 0); +// 消息提示 +$theme-message-info-background-color: $color-bg; +$theme-message-info-text-color: $color-text-normal; +$theme-message-info-border-color: $color-border-1; + // container组件 $theme-container-background-color: #FFF; $theme-container-header-footer-background-color: #FFF; diff --git a/src/layout/header-aside/components/panel-search/index.vue b/src/layout/header-aside/components/panel-search/index.vue index d7f6828..a6dba23 100644 --- a/src/layout/header-aside/components/panel-search/index.vue +++ b/src/layout/header-aside/components/panel-search/index.vue @@ -24,7 +24,7 @@
- +
{ - this.handleMenuSelect(path) - }) + await this.$nextTick() + this.handleMenuSelect(path) }, /** * @augments 关闭输入框的下拉菜单 @@ -161,11 +160,10 @@ export default { /** * @augments 接收用户触发的关闭 */ - handleEsc () { + async handleEsc () { this.closeSuggestion() - this.$nextTick(() => { - this.$emit('close') - }) + await this.$nextTick() + this.$emit('close') } } } diff --git a/src/layout/header-aside/components/tabs/index.vue b/src/layout/header-aside/components/tabs/index.vue index 065b421..830e54d 100644 --- a/src/layout/header-aside/components/tabs/index.vue +++ b/src/layout/header-aside/components/tabs/index.vue @@ -2,23 +2,36 @@
- - + + - +
- + @@ -46,6 +59,7 @@