Merge remote-tracking branch 'origin/develop'
Former-commit-id: 66ea73f35c240a75d742eff7928d8c8bb86fb621 [formerly 66ea73f35c240a75d742eff7928d8c8bb86fb621 [formerly 66ea73f35c240a75d742eff7928d8c8bb86fb621 [formerly 66ea73f35c240a75d742eff7928d8c8bb86fb621 [formerly 69eb70a7e199fa4164304aec35943a4662d4cac4 [formerly 5f2b8269e6786572c43742e6600dd0974e3898f6]]]]] Former-commit-id: 5871dc543538641d92b281317672f771d97df96c Former-commit-id: 89ac1a9612639b6c4cf0a5745ab330f781cfef0d Former-commit-id: cc2395960037b658d423cdec8ba59113024b9303 [formerly c11a9b2343f65c535552b7d2bf8e3fb20385059f] Former-commit-id: 15fe08613e62058d6053c5572d2b5293478e2606 Former-commit-id: 6fb83bcd8f74bbdb15a7fcca50920bf0c846aae9 Former-commit-id: 9641a7f2154852dc7307dc3d1bb59611c4fb87a0 Former-commit-id: edc5b80b6ee8d1ac39d55ba6b3a5f7b75829c13f Former-commit-id: 8f40387c6bd9990328bf3d5b09967893dd786f4a
This commit is contained in:
@@ -1 +1 @@
|
|||||||
875522462ce00aa53ebb933ad8a70561bf30dfc5
|
134f6af0a62409abc3a59f2e23a1a00817f44b4c
|
||||||
@@ -1,6 +1,12 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="panel-search" flex="dir:top">
|
<div
|
||||||
<div class="panel-search__input-group" flex-box="0" flex="dir:top main:center cross:center">
|
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
|
<d2-icon-svg
|
||||||
class="panel-search__logo"
|
class="panel-search__logo"
|
||||||
name="d2-admin-text"/>
|
name="d2-admin-text"/>
|
||||||
@@ -15,7 +21,9 @@
|
|||||||
:clearable="true"
|
:clearable="true"
|
||||||
@keydown.esc.native="handleEsc"
|
@keydown.esc.native="handleEsc"
|
||||||
@select="handleSelect">
|
@select="handleSelect">
|
||||||
<d2-panel-search-item slot-scope="{ item }" :item="item"/>
|
<d2-panel-search-item
|
||||||
|
slot-scope="{ item }"
|
||||||
|
:item="item"/>
|
||||||
</el-autocomplete>
|
</el-autocomplete>
|
||||||
<div class="panel-search__tip">
|
<div class="panel-search__tip">
|
||||||
您可以使用快捷键
|
您可以使用快捷键
|
||||||
@@ -155,6 +163,12 @@ export default {
|
|||||||
this.$refs.input.activated = false
|
this.$refs.input.activated = false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* @augments 接收用户点击空白区域的关闭
|
||||||
|
*/
|
||||||
|
handlePanelClick () {
|
||||||
|
this.handleEsc()
|
||||||
|
},
|
||||||
/**
|
/**
|
||||||
* @augments 接收用户触发的关闭
|
* @augments 接收用户触发的关闭
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
<div
|
<div
|
||||||
class="d2-theme-header"
|
class="d2-theme-header"
|
||||||
:style="{
|
:style="{
|
||||||
opacity: this.searchActive ? 0.3 : 1
|
opacity: this.searchActive ? 0.5 : 1
|
||||||
}"
|
}"
|
||||||
flex-box="0">
|
flex-box="0">
|
||||||
<div class="logo-group" :style="{width: asideCollapse ? asideWidthCollapse : asideWidth}">
|
<div class="logo-group" :style="{width: asideCollapse ? asideWidthCollapse : asideWidth}">
|
||||||
@@ -42,7 +42,7 @@
|
|||||||
class="d2-theme-container-aside"
|
class="d2-theme-container-aside"
|
||||||
:style="{
|
:style="{
|
||||||
width: asideCollapse ? asideWidthCollapse : asideWidth,
|
width: asideCollapse ? asideWidthCollapse : asideWidth,
|
||||||
opacity: this.searchActive ? 0.3 : 1
|
opacity: this.searchActive ? 0.5 : 1
|
||||||
}">
|
}">
|
||||||
<d2-menu-side/>
|
<d2-menu-side/>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user