From 7b6fdb3a893275ff82ba5c868287a1e12dcd75f1 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sun, 27 Apr 2025 11:56:21 +0800
Subject: [PATCH] remove all semicolons
---
ruoyi-ui/src/components/HeaderSearch/index.vue | 164 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 104 insertions(+), 60 deletions(-)
diff --git a/ruoyi-ui/src/components/HeaderSearch/index.vue b/ruoyi-ui/src/components/HeaderSearch/index.vue
index 114ae04..91496fb 100644
--- a/ruoyi-ui/src/components/HeaderSearch/index.vue
+++ b/ruoyi-ui/src/components/HeaderSearch/index.vue
@@ -1,27 +1,48 @@
<template>
- <div :class="{'show':show}" class="header-search">
+ <div class="header-search">
<svg-icon class-name="search-icon" icon-class="search" @click.stop="click" />
- <el-select
- ref="headerSearchSelect"
- v-model="search"
- :remote-method="querySearch"
- filterable
- default-first-option
- remote
- placeholder="Search"
- class="header-search-select"
- @change="change"
+ <el-dialog
+ :visible.sync="show"
+ width="600px"
+ @close="close"
+ :show-close="false"
+ append-to-body
>
- <el-option v-for="item in options" :key="item.path" :value="item" :label="item.title.join(' > ')" />
- </el-select>
+ <el-input
+ v-model="search"
+ ref="headerSearchSelectRef"
+ size="large"
+ @input="querySearch"
+ prefix-icon="Search"
+ placeholder="菜单搜索，支持标题、URL模糊查询"
+ clearable
+ >
+ </el-input>
+ <el-scrollbar wrap-class="right-scrollbar-wrapper">
+ <div class="result-wrap">
+ <div class="search-item" v-for="item in options" :key="item.path">
+ <div class="left">
+ <svg-icon class="menu-icon" :icon-class="item.icon" />
+ </div>
+ <div class="search-info" @click="change(item)">
+ <div class="menu-title">
+ {{ item.title.join(" / ") }}
+ </div>
+ <div class="menu-path">
+ {{ item.path }}
+ </div>
+ </div>
+ </div>
+ </div>
+ </el-scrollbar>
+ </el-dialog>
</div>
</template>
<script>
-// fuse is a lightweight fuzzy-search module
-// make search results more in line with expectations
-import Fuse from 'fuse.js'
+import Fuse from 'fuse.js/dist/fuse.min.js'
import path from 'path'
+import { isHttp } from '@/utils/validate'
export default {
name: 'HeaderSearch',
@@ -36,7 +57,7 @@
},
computed: {
routes() {
- return this.$store.getters.permission_routes
+ return this.$store.getters.defaultRoutes
}
},
watch: {
@@ -45,13 +66,6 @@
},
searchPool(list) {
this.initFuse(list)
- },
- show(value) {
- if (value) {
- document.body.addEventListener('click', this.close)
- } else {
- document.body.removeEventListener('click', this.close)
- }
}
},
mounted() {
@@ -62,19 +76,28 @@
this.show = !this.show
if (this.show) {
this.$refs.headerSearchSelect && this.$refs.headerSearchSelect.focus()
+ this.options = this.searchPool
}
},
close() {
this.$refs.headerSearchSelect && this.$refs.headerSearchSelect.blur()
+ this.search = ''
this.options = []
this.show = false
},
change(val) {
- if(this.ishttp(val.path)) {
+ const path = val.path
+ const query = val.query
+ if(isHttp(val.path)) {
// http(s):// 路径新窗口打开
- window.open(val.path, "_blank");
+ const pindex = path.indexOf("http")
+ window.open(path.substr(pindex, path.length), "_blank")
} else {
- this.$router.push(val.path)
+ if (query) {
+ this.$router.push({ path: path, query: JSON.parse(query) })
+ } else {
+ this.$router.push(path)
+ }
}
this.search = ''
this.options = []
@@ -88,7 +111,6 @@
threshold: 0.4,
location: 0,
distance: 100,
- maxPatternLength: 32,
minMatchCharLength: 1,
keys: [{
name: 'title',
@@ -109,18 +131,24 @@
if (router.hidden) { continue }
const data = {
- path: !this.ishttp(router.path) ? path.resolve(basePath, router.path) : router.path,
- title: [...prefixTitle]
+ path: !isHttp(router.path) ? path.resolve(basePath, router.path) : router.path,
+ title: [...prefixTitle],
+ icon: ''
}
if (router.meta && router.meta.title) {
data.title = [...data.title, router.meta.title]
+ data.icon = router.meta.icon
if (router.redirect !== 'noRedirect') {
// only push the routes with title
// special case: need to exclude parent router without redirect
res.push(data)
}
+ }
+
+ if (router.query) {
+ data.query = router.query
}
// recursive child routes
@@ -135,54 +163,70 @@
},
querySearch(query) {
if (query !== '') {
- this.options = this.fuse.search(query)
+ this.options = this.fuse.search(query).map((item) => item.item) ?? this.searchPool
} else {
- this.options = []
+ this.options = this.searchPool
}
- },
- ishttp(url) {
- return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
}
}
}
</script>
-<style lang="scss" scoped>
-.header-search {
- font-size: 0 !important;
+<style lang='scss' scoped>
+::v-deep {
+ .el-dialog__header {
+ padding: 0 !important;
+ }
+}
+.header-search {
.search-icon {
cursor: pointer;
font-size: 18px;
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;
+.result-wrap {
+ height: 280px;
+ margin: 12px 0;
- ::v-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;
+ .search-item {
+ display: flex;
+ height: 48px;
+
+ .left {
+ width: 60px;
+ text-align: center;
+
+ .menu-icon {
+ width: 18px;
+ height: 18px;
+ margin-top: 5px;
+ }
+ }
+
+ .search-info {
+ padding-left: 5px;
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+
+ .menu-title,
+ .menu-path {
+ height: 20px;
+ }
+ .menu-path {
+ color: #ccc;
+ font-size: 10px;
+ }
}
}
- &.show {
- .header-search-select {
- width: 210px;
- margin-left: 10px;
- }
+ .search-item:hover {
+ cursor: pointer;
}
}
</style>
+
--
Gitblit v1.9.3