From e1023bb3313282b00d6dcdefd5d7e30d7aaa1bfc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 30 十一月 2023 11:13:29 +0800
Subject: [PATCH] update 优化 代码中存在的警告
---
src/components/HeaderSearch/index.vue | 112 +++++++++++++++++++++++++++++++------------------------
1 files changed, 63 insertions(+), 49 deletions(-)
diff --git a/src/components/HeaderSearch/index.vue b/src/components/HeaderSearch/index.vue
index 543559b..b922c6c 100644
--- a/src/components/HeaderSearch/index.vue
+++ b/src/components/HeaderSearch/index.vue
@@ -1,6 +1,6 @@
<template>
<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
ref="headerSearchSelectRef"
v-model="search"
@@ -12,54 +12,65 @@
class="header-search-select"
@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>
</div>
</template>
-<script setup>
-import Fuse from 'fuse.js'
-import { getNormalPath } from '@/utils/ruoyi'
-import { isHttp } from '@/utils/validate'
-import usePermissionStore from '@/store/modules/permission'
+<script setup lang="ts" name="HeaderSearch">
+import Fuse from 'fuse.js';
+import {getNormalPath} from '@/utils/ruoyi';
+import {isHttp} from '@/utils/validate';
+import usePermissionStore from '@/store/modules/permission';
+import {RouteOption} from 'vue-router';
+
+type Router = Array<{
+ path: string;
+ title: string[];
+}>
const search = ref('');
-const options = ref([]);
-const searchPool = ref([]);
+const options = ref<any>([]);
+const searchPool = ref<Router>([]);
const show = ref(false);
-const fuse = ref(undefined);
-const headerSearchSelectRef = ref(null);
+const fuse = ref();
+const headerSearchSelectRef = ref<ElSelectInstance>();
const router = useRouter();
const routes = computed(() => usePermissionStore().routes);
-function click() {
+const click = () => {
show.value = !show.value
if (show.value) {
headerSearchSelectRef.value && headerSearchSelectRef.value.focus()
}
};
-function close() {
+const close = () => {
headerSearchSelectRef.value && headerSearchSelectRef.value.blur()
options.value = []
show.value = false
}
-function change(val) {
+const change = (val: any) => {
const path = val.path;
+ const query = val.query;
if (isHttp(path)) {
// http(s):// 璺緞鏂扮獥鍙ｆ墦寮�
const pindex = path.indexOf("http");
window.open(path.substr(pindex, path.length), "_blank");
} else {
- router.push(path)
+ if (query) {
+ router.push({ path: path, query: JSON.parse(query) });
+ } else {
+ router.push(path)
+ }
}
-
search.value = ''
options.value = []
nextTick(() => {
show.value = false
})
}
-function initFuse(list) {
+const initFuse = (list: Router) => {
fuse.value = new Fuse(list, {
shouldSort: true,
threshold: 0.4,
@@ -77,39 +88,42 @@
}
// Filter out the routes that can be displayed in the sidebar
// And generate the internationalized title
-function generateRoutes(routes, basePath = '', prefixTitle = []) {
- let res = []
-
- for (const r of routes) {
+const generateRoutes = (routes: RouteOption[], basePath = '', prefixTitle: string[] = []) => {
+ let res: Router = []
+ routes.forEach(r => {
// skip hidden router
- if (r.hidden) { continue }
- const p = r.path.length > 0 && r.path[0] === '/' ? r.path : '/' + r.path;
- const data = {
- path: !isHttp(r.path) ? getNormalPath(basePath + p) : r.path,
- title: [...prefixTitle]
- }
+ if (!r.hidden) {
+ const p = r.path.length > 0 && r.path[0] === '/' ? r.path : '/' + r.path;
+ const data = {
+ path: !isHttp(r.path) ? getNormalPath(basePath + p) : r.path,
+ title: [...prefixTitle],
+ query: ''
+ }
+ if (r.meta && r.meta.title) {
+ data.title = [...data.title, r.meta.title];
+ if (r.redirect !== 'noRedirect') {
+ // only push the routes with title
+ // special case: need to exclude parent router without redirect
+ res.push(data);
+ }
+ }
- if (r.meta && r.meta.title) {
- data.title = [...data.title, r.meta.title]
+ if (r.query) {
+ data.query = r.query
+ }
- if (r.redirect !== 'noRedirect') {
- // only push the routes with title
- // 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];
+ }
}
}
-
- // recursive child routes
- if (r.children) {
- const tempRoutes = generateRoutes(r.children, data.path, data.title)
- if (tempRoutes.length >= 1) {
- res = [...res, ...tempRoutes]
- }
- }
- }
- return res
+ })
+ return res;
}
-function querySearch(query) {
+const querySearch = (query: string) => {
if (query !== '') {
options.value = fuse.value.search(query)
} else {
@@ -121,9 +135,9 @@
searchPool.value = generateRoutes(routes.value);
})
-watchEffect(() => {
- searchPool.value = generateRoutes(routes.value)
-})
+// watchEffect(() => {
+// searchPool.value = generateRoutes(routes.value)
+// })
watch(show, (value) => {
if (value) {
@@ -138,7 +152,7 @@
})
</script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
.header-search {
font-size: 0 !important;
@@ -176,4 +190,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3