fanxb/bookmark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

fix:修复搜索相关问题

Browse Source
This commit is contained in:
fanxb 2021-03-31 11:21:21 +08:00
parent 2db39c0b77
commit c8c004e75b
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
bookmark_front/src/components/main/Search.vue
View File

@ -1,14 +1,14 @@
<template> <template>
<div class="search"> <div class="search">
<a-input-search id="searchInput" ref="searchInput" size="large" style="width: 100%" v-model="value" @change="search" @search="searchClick" allowClear @blur.prevent="inputBlur" @focus="inputFocus" @keydown="keyPress"> <a-input-search id="searchInput" ref="searchInput" size="large" style="width: 100%" v-model="value" @change="search" @search="searchClick" allowClear @blur.prevent="inputBlur" @focus="inputFocus" @keydown="keyPress">
<a-tooltip :title="searchBookmark?'搜索书签':'全网搜索'" slot="enterButton"> <a-tooltip title="全网搜索" slot="enterButton">
<a-button :icon="searchBookmark?'book':'search'" type="primary" /> <a-button icon="search" type="primary" />
</a-tooltip> </a-tooltip>
</a-input-search> </a-input-search>
<div v-if="focused && searchBookmark" class="searchContent"> <div v-if="focused && searchBookmark" class="searchContent">
<a-empty v-if="list.length == 0" /> <a-empty v-if="list.length == 0" />
<div class="listItem" :class="{ itemActive: index == hoverIndex || index == selectIndex }" v-for="(item, index) in list" :key="item.bookmarkId" @mouseenter="mouseEnterOut(index, 'enter')" @mouseleave="mouseEnterOut(index, 'leave')" @mouseup="onMouse" @click="itemClick(item)"> <div class="listItem" :class="{ itemActive: index == hoverIndex || index == selectIndex }" v-for="(item, index) in list" :key="item.bookmarkId" @mouseenter="mouseEnterOut(index, 'enter')" @mouseleave="mouseEnterOut(index, 'leave')" @mouseup="onMouse">
<a class="listItemUrl" style="padding-right: 1em; max-width: calc(100% - 2em)" :id="'bookmark:' + item.bookmarkId" :href="item.url" @click="itemClick($event,item.bookmarkId)" target="_blank"> <a class="listItemUrl" style="padding-right: 1em;min-width:3em; max-width: calc(100% - 2em)" :id="'bookmark:' + item.bookmarkId" :href="item.url" @click="itemClick($event,index)" target="_blank">
{{ item.name }} {{ item.name }}
</a> </a>
<a-tooltip v-if="showActions && hoverIndex === index" title="定位到书签树中"> <a-tooltip v-if="showActions && hoverIndex === index" title="定位到书签树中">
@ -75,7 +75,6 @@ export default {
if (this.timer != null) { if (this.timer != null) {
clearTimeout(this.timer); clearTimeout(this.timer);
} }
if (!this.searchBookmark) {
switch (this.userInfo.defaultSearchEngine) { switch (this.userInfo.defaultSearchEngine) {
case "bing": case "bing":
window.open("https://www.bing.com/search?q=" + encodeURIComponent(this.value)); window.open("https://www.bing.com/search?q=" + encodeURIComponent(this.value));
@ -86,23 +85,18 @@ export default {
default: default:
window.open("https://www.baidu.com/s?ie=UTF-8&wd=" + encodeURIComponent(this.value)); window.open("https://www.baidu.com/s?ie=UTF-8&wd=" + encodeURIComponent(this.value));
} }
}
}, },
itemClick(e, id) { itemClick(e, index) {
if (e) { if (e) {
this.stopDefault(e); this.stopDefault(e);
} }
if (!id) { if (!index) {
return; return;
} }
HttpUtil.post("/bookmark/visitNum", { id }); let bookmark = this.list[index];
if (this.selectIndex == null) { HttpUtil.post("/bookmark/visitNum", { id: bookmark.bookmarkId });
this.targetUrl = "https://www.baidu.com/s?ie=UTF-8&wd=" + encodeURIComponent(this.value);
} else {
this.targetUrl = this.list[this.selectIndex].url;
}
let a = this.$refs["targetA"]; let a = this.$refs["targetA"];
a.href = this.targetUrl; a.href = bookmark.url;
a.click(); a.click();
return false; return false;
}, },
@ -144,10 +138,19 @@ export default {
this.stopDefault(); this.stopDefault();
break; break;
case "Enter": case "Enter":
this.itemClick(e, this.list[this.selectIndex].bookmarkId); if (this.searchBookmark) {
this.itemClick(e, this.selectIndex);
} else {
this.searchClick();
}
break; break;
case "Tab": case "Tab":
this.searchBookmark = !this.searchBookmark; this.searchBookmark = !this.searchBookmark;
if (this.searchBookmark) {
this.$message.info("书签搜索");
} else {
this.$message.info("全网搜索");
}
this.stopDefault(); this.stopDefault();
break; break;
case "Escape": case "Escape":