Skip to content

Commit

Permalink
no message
Browse files Browse the repository at this point in the history
Former-commit-id: 81cdc84aa8fa9bcf60106a1ee86bd60a936fb50f [formerly 81cdc84aa8fa9bcf60106a1ee86bd60a936fb50f [formerly 81cdc84aa8fa9bcf60106a1ee86bd60a936fb50f [formerly 81cdc84aa8fa9bcf60106a1ee86bd60a936fb50f [formerly 3ad4291 [formerly 964fc2bde6461191a9847c94d7fd0724a816d47c]]]]]
Former-commit-id: 40ba23e
Former-commit-id: 7b4c85a
Former-commit-id: 19de61b8d3839fcbe1a14ca05b1e2d67b5d45462 [formerly 43adb3ef43d6213069978ce3fcd8732d4bcd0af9]
Former-commit-id: d377be5266686be8f154276ef8cfdcb770113de8
Former-commit-id: 1e74192498bea5ff3d88001c5e0b4c1c9917b3af
Former-commit-id: c7a56899ffdff1abe313f8646d137ae9feff5f49
Former-commit-id: bca43962597e3fc297befb2b61dbfa8f3d94ed0f
Former-commit-id: f778cd63618249c1d3ba5235706f5d5a6ab2783f
  • Loading branch information
FairyEver committed Sep 13, 2018
1 parent d7071aa commit f077050
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/assets/style/theme/theme-base.scss.REMOVED.git-id
Original file line number Diff line number Diff line change
@@ -1 +1 @@
875522462ce00aa53ebb933ad8a70561bf30dfc5
134f6af0a62409abc3a59f2e23a1a00817f44b4c
20 changes: 17 additions & 3 deletions src/layout/header-aside/components/panel-search/index.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
<template>
<div class="panel-search" flex="dir:top">
<div class="panel-search__input-group" flex-box="0" flex="dir:top main:center cross:center">
<div
class="panel-search"
flex="dir:top">
<div
class="panel-search__input-group"
flex-box="0"
flex="dir:top main:center cross:center"
@click.self="handlePanelClick">
<d2-icon-svg
class="panel-search__logo"
name="d2-admin-text"/>
Expand All @@ -15,7 +21,9 @@
:clearable="true"
@keydown.esc.native="handleEsc"
@select="handleSelect">
<d2-panel-search-item slot-scope="{ item }" :item="item"/>
<d2-panel-search-item
slot-scope="{ item }"
:item="item"/>
</el-autocomplete>
<div class="panel-search__tip">
您可以使用快捷键
Expand Down Expand Up @@ -155,6 +163,12 @@ export default {
this.$refs.input.activated = false
}
},
/**
* @augments 接收用户点击空白区域的关闭
*/
handlePanelClick () {
this.handleEsc()
},
/**
* @augments 接收用户触发的关闭
*/
Expand Down
4 changes: 2 additions & 2 deletions src/layout/header-aside/layout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<div
class="d2-theme-header"
:style="{
opacity: this.searchActive ? 0.3 : 1
opacity: this.searchActive ? 0.5 : 1
}"
flex-box="0">
<div class="logo-group" :style="{width: asideCollapse ? asideWidthCollapse : asideWidth}">
Expand Down Expand Up @@ -42,7 +42,7 @@
class="d2-theme-container-aside"
:style="{
width: asideCollapse ? asideWidthCollapse : asideWidth,
opacity: this.searchActive ? 0.3 : 1
opacity: this.searchActive ? 0.5 : 1
}">
<d2-menu-side/>
</div>
Expand Down

0 comments on commit f077050

Please sign in to comment.