fix 修复 HeaderSearch组件跳转query参数丢失问题
This commit is contained in:
疯狂的狮子Li
parent
078bb50130
commit
a2f13185e1
@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div :class="{ 'show': show }" class="header-search">
|
<div :class="{ 'show': show }" class="header-search">
|
||||||
<svg-icon class-name="search-icon" icon-class="search" @click.stop="click" />
|
<svg-icon class-name="search-icon" icon-class="search" @click.stop="click"/>
|
||||||
<el-select
|
<el-select
|
||||||
ref="headerSearchSelectRef"
|
ref="headerSearchSelectRef"
|
||||||
v-model="search"
|
v-model="search"
|
||||||
@ -12,21 +12,22 @@
|
|||||||
class="header-search-select"
|
class="header-search-select"
|
||||||
@change="change"
|
@change="change"
|
||||||
>
|
>
|
||||||
<el-option v-for="option in options" :key="option.item.path" :value="option.item" :label="option.item.title.join(' > ')" />
|
<el-option v-for="option in options" :key="option.item.path" :value="option.item"
|
||||||
|
:label="option.item.title.join(' > ')"/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts" name="HeaderSearch">
|
<script setup lang="ts" name="HeaderSearch">
|
||||||
import Fuse from 'fuse.js';
|
import Fuse from 'fuse.js';
|
||||||
import { getNormalPath } from '@/utils/ruoyi';
|
import {getNormalPath} from '@/utils/ruoyi';
|
||||||
import { isHttp } from '@/utils/validate';
|
import {isHttp} from '@/utils/validate';
|
||||||
import usePermissionStore from '@/store/modules/permission';
|
import usePermissionStore from '@/store/modules/permission';
|
||||||
import { RouteOption } from 'vue-router';
|
import {RouteOption} from 'vue-router';
|
||||||
|
|
||||||
type Router = Array<{
|
type Router = Array<{
|
||||||
path: string;
|
path: string;
|
||||||
title: string[];
|
title: string[];
|
||||||
}>
|
}>
|
||||||
|
|
||||||
const search = ref('');
|
const search = ref('');
|
||||||
@ -39,88 +40,99 @@ const router = useRouter();
|
|||||||
const routes = computed(() => usePermissionStore().routes);
|
const routes = computed(() => usePermissionStore().routes);
|
||||||
|
|
||||||
const click = () => {
|
const click = () => {
|
||||||
show.value = !show.value
|
show.value = !show.value
|
||||||
if (show.value) {
|
if (show.value) {
|
||||||
headerSearchSelectRef.value && headerSearchSelectRef.value.focus()
|
headerSearchSelectRef.value && headerSearchSelectRef.value.focus()
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
const close = () => {
|
const close = () => {
|
||||||
headerSearchSelectRef.value && headerSearchSelectRef.value.blur()
|
headerSearchSelectRef.value && headerSearchSelectRef.value.blur()
|
||||||
options.value = []
|
options.value = []
|
||||||
show.value = false
|
show.value = false
|
||||||
}
|
}
|
||||||
const change = (val: any) => {
|
const change = (val: any) => {
|
||||||
const path = val.path;
|
const path = val.path;
|
||||||
if (isHttp(path)) {
|
const query = val.query;
|
||||||
// http(s):// 路径新窗口打开
|
if (isHttp(path)) {
|
||||||
const pindex = path.indexOf("http");
|
// http(s):// 路径新窗口打开
|
||||||
window.open(path.substr(pindex, path.length), "_blank");
|
const pindex = path.indexOf("http");
|
||||||
|
window.open(path.substr(pindex, path.length), "_blank");
|
||||||
|
} else {
|
||||||
|
if (query) {
|
||||||
|
router.push({ path: path, query: JSON.parse(query) });
|
||||||
} else {
|
} else {
|
||||||
router.push(path)
|
router.push(path)
|
||||||
}
|
}
|
||||||
search.value = ''
|
}
|
||||||
options.value = []
|
search.value = ''
|
||||||
nextTick(() => {
|
options.value = []
|
||||||
show.value = false
|
nextTick(() => {
|
||||||
})
|
show.value = false
|
||||||
|
})
|
||||||
}
|
}
|
||||||
const initFuse = (list: Router) => {
|
const initFuse = (list: Router) => {
|
||||||
fuse.value = new Fuse(list, {
|
fuse.value = new Fuse(list, {
|
||||||
shouldSort: true,
|
shouldSort: true,
|
||||||
threshold: 0.4,
|
threshold: 0.4,
|
||||||
location: 0,
|
location: 0,
|
||||||
distance: 100,
|
distance: 100,
|
||||||
minMatchCharLength: 1,
|
minMatchCharLength: 1,
|
||||||
keys: [{
|
keys: [{
|
||||||
name: 'title',
|
name: 'title',
|
||||||
weight: 0.7
|
weight: 0.7
|
||||||
}, {
|
}, {
|
||||||
name: 'path',
|
name: 'path',
|
||||||
weight: 0.3
|
weight: 0.3
|
||||||
}]
|
}]
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
// Filter out the routes that can be displayed in the sidebar
|
// Filter out the routes that can be displayed in the sidebar
|
||||||
// And generate the internationalized title
|
// And generate the internationalized title
|
||||||
const generateRoutes = (routes: RouteOption[], basePath = '', prefixTitle: string[] = []) => {
|
const generateRoutes = (routes: RouteOption[], basePath = '', prefixTitle: string[] = [], query: any = {}) => {
|
||||||
let res: Router = []
|
let res: Router = []
|
||||||
routes.forEach(r => {
|
routes.forEach(r => {
|
||||||
// skip hidden router
|
// skip hidden router
|
||||||
if (!r.hidden) {
|
if (!r.hidden) {
|
||||||
const p = r.path.length > 0 && r.path[0] === '/' ? r.path : '/' + r.path;
|
const p = r.path.length > 0 && r.path[0] === '/' ? r.path : '/' + r.path;
|
||||||
const data = {
|
const data = {
|
||||||
path: !isHttp(r.path) ? getNormalPath(basePath + p) : r.path,
|
path: !isHttp(r.path) ? getNormalPath(basePath + p) : r.path,
|
||||||
title: [...prefixTitle]
|
title: [...prefixTitle],
|
||||||
}
|
query: ''
|
||||||
if (r.meta && r.meta.title) {
|
}
|
||||||
data.title = [...data.title, r.meta.title];
|
if (r.meta && r.meta.title) {
|
||||||
if (r.redirect !== 'noRedirect') {
|
data.title = [...data.title, r.meta.title];
|
||||||
// only push the routes with title
|
if (r.redirect !== 'noRedirect') {
|
||||||
// special case: need to exclude parent router without redirect
|
// only push the routes with title
|
||||||
res.push(data);
|
// special case: need to exclude parent router without redirect
|
||||||
}
|
res.push(data);
|
||||||
}
|
|
||||||
// recursive child routes
|
|
||||||
if (r.children) {
|
|
||||||
const tempRoutes = generateRoutes(r.children, data.path, data.title);
|
|
||||||
if (tempRoutes.length >= 1) {
|
|
||||||
res = [...res, ...tempRoutes];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
})
|
}
|
||||||
return res;
|
|
||||||
|
if (r.query) {
|
||||||
|
data.query = r.query
|
||||||
|
}
|
||||||
|
|
||||||
|
// recursive child routes
|
||||||
|
if (r.children) {
|
||||||
|
const tempRoutes = generateRoutes(r.children, data.path, data.title, data.query);
|
||||||
|
if (tempRoutes.length >= 1) {
|
||||||
|
res = [...res, ...tempRoutes];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
return res;
|
||||||
}
|
}
|
||||||
const querySearch = (query: string) => {
|
const querySearch = (query: string) => {
|
||||||
if (query !== '') {
|
if (query !== '') {
|
||||||
options.value = fuse.value.search(query)
|
options.value = fuse.value.search(query)
|
||||||
} else {
|
} else {
|
||||||
options.value = []
|
options.value = []
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
searchPool.value = generateRoutes(routes.value);
|
searchPool.value = generateRoutes(routes.value);
|
||||||
})
|
})
|
||||||
|
|
||||||
// watchEffect(() => {
|
// watchEffect(() => {
|
||||||
@ -128,54 +140,54 @@ onMounted(() => {
|
|||||||
// })
|
// })
|
||||||
|
|
||||||
watch(show, (value) => {
|
watch(show, (value) => {
|
||||||
if (value) {
|
if (value) {
|
||||||
document.body.addEventListener('click', close)
|
document.body.addEventListener('click', close)
|
||||||
} else {
|
} else {
|
||||||
document.body.removeEventListener('click', close)
|
document.body.removeEventListener('click', close)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
watch(searchPool, (list) => {
|
watch(searchPool, (list) => {
|
||||||
initFuse(list)
|
initFuse(list)
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.header-search {
|
.header-search {
|
||||||
font-size: 0 !important;
|
font-size: 0 !important;
|
||||||
|
|
||||||
.search-icon {
|
.search-icon {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-search-select {
|
||||||
|
font-size: 18px;
|
||||||
|
transition: width 0.2s;
|
||||||
|
width: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
background: transparent;
|
||||||
|
border-radius: 0;
|
||||||
|
display: inline-block;
|
||||||
|
vertical-align: middle;
|
||||||
|
|
||||||
|
:deep(.el-input__inner) {
|
||||||
|
border-radius: 0;
|
||||||
|
border: 0;
|
||||||
|
padding-left: 0;
|
||||||
|
padding-right: 0;
|
||||||
|
box-shadow: none !important;
|
||||||
|
border-bottom: 1px solid #d9d9d9;
|
||||||
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&.show {
|
||||||
.header-search-select {
|
.header-search-select {
|
||||||
font-size: 18px;
|
width: 210px;
|
||||||
transition: width 0.2s;
|
margin-left: 10px;
|
||||||
width: 0;
|
|
||||||
overflow: hidden;
|
|
||||||
background: transparent;
|
|
||||||
border-radius: 0;
|
|
||||||
display: inline-block;
|
|
||||||
vertical-align: middle;
|
|
||||||
|
|
||||||
:deep(.el-input__inner) {
|
|
||||||
border-radius: 0;
|
|
||||||
border: 0;
|
|
||||||
padding-left: 0;
|
|
||||||
padding-right: 0;
|
|
||||||
box-shadow: none !important;
|
|
||||||
border-bottom: 1px solid #d9d9d9;
|
|
||||||
vertical-align: middle;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
&.show {
|
|
||||||
.header-search-select {
|
|
||||||
width: 210px;
|
|
||||||
margin-left: 10px;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user