From c86dc207438b78059644fdd85e4e15da2cc2142d Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 17 十二月 2020 12:05:29 +0800
Subject: [PATCH] 移除path-to-regexp正则匹配插件
---
ruoyi-ui/src/components/HeaderSearch/index.vue | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/components/HeaderSearch/index.vue b/ruoyi-ui/src/components/HeaderSearch/index.vue
index 8974171..b2533f3 100644
--- a/ruoyi-ui/src/components/HeaderSearch/index.vue
+++ b/ruoyi-ui/src/components/HeaderSearch/index.vue
@@ -12,7 +12,7 @@
class="header-search-select"
@change="change"
>
- <el-option v-for="item in options" :key="item.path" :value="item" :label="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>
@@ -70,7 +70,12 @@
this.show = false
},
change(val) {
- this.$router.push(val.path)
+ if(this.ishttp(val.path)) {
+ // http(s):// 路径新窗口打开
+ window.open(val.path, "_blank");
+ } else {
+ this.$router.push(val.path)
+ }
this.search = ''
this.options = []
this.$nextTick(() => {
@@ -104,7 +109,7 @@
if (router.hidden) { continue }
const data = {
- path: path.resolve(basePath, router.path),
+ path: !this.ishttp(router.path) ? path.resolve(basePath, router.path) : router.path,
title: [...prefixTitle]
}
@@ -134,6 +139,9 @@
} else {
this.options = []
}
+ },
+ ishttp(url) {
+ return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
}
}
}
@@ -159,7 +167,7 @@
display: inline-block;
vertical-align: middle;
- /deep/ .el-input__inner {
+ ::v-deep .el-input__inner {
border-radius: 0;
border: 0;
padding-left: 0;
--
Gitblit v1.9.2