Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
前端资源
RuoYi-Vue
比较版本
6ad345331d1bced7b402d686867c02cad1747d00...69bbccbd7634ddab76b349e957fd37c03d2144e7
R
RuoYi-Vue
项目概览
前端资源
/
RuoYi-Vue
9 个月 前同步成功
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
RuoYi-Vue
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
源分支
69bbccbd7634ddab76b349e957fd37c03d2144e7
选择Git版本
...
目标分支
6ad345331d1bced7b402d686867c02cad1747d00
选择Git版本
比较
Commits (13)
https://gitcode.net/front-end/ruoyi-vue/-/commit/4952ac0a3dba9880a2ab5feef36b215c36457573
修改DictTag组件,当value没有匹配的值时,展示value
2023-04-12T15:14:09+08:00
刘鹏飞
17385020532@163.com
https://gitcode.net/front-end/ruoyi-vue/-/commit/de0a43285fe42719f6508a2cd4a5b120752d5321
update pom.xml.
2023-04-14T07:31:50+00:00
zouhuu
zouhugz@163.com
去除多余代码 Signed-off-by: <span data-trailer="Signed-off-by:" data-user="91890"><a href="https://gitcode.net/zouhuu" title="zouhugz@163.com"><img alt="zouhuu's avatar" src="https://profile.csdnimg.cn/8/3/7/1_zouhuu" class="avatar s16 avatar-inline" title="zouhuu"></a><a href="https://gitcode.net/zouhuu" title="zouhugz@163.com">zouhuu</a> <<a href="mailto:zouhugz@163.com" title="zouhugz@163.com">zouhugz@163.com</a>></span>
https://gitcode.net/front-end/ruoyi-vue/-/commit/b4f2a4f7dd8dc5b22d9b757c81b631aa4f988a52
恢复翻页/切换路由滚动功能
2023-04-15T17:01:18+08:00
刘元博
1553592282@qq.com
https://gitcode.net/front-end/ruoyi-vue/-/commit/f04ca57f7a3d8112e6c7f5c5a4dc72f1ba9e8edc
update ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapp...
2023-04-17T08:08:44+00:00
zouhuu
zouhugz@163.com
修复生成列字段注释显示不全问题 Signed-off-by: <span data-trailer="Signed-off-by:" data-user="91890"><a href="https://gitcode.net/zouhuu" title="zouhugz@163.com"><img alt="zouhuu's avatar" src="https://profile.csdnimg.cn/8/3/7/1_zouhuu" class="avatar s16 avatar-inline" title="zouhuu"></a><a href="https://gitcode.net/zouhuu" title="zouhugz@163.com">zouhuu</a> <<a href="mailto:zouhugz@163.com" title="zouhugz@163.com">zouhugz@163.com</a>></span>
https://gitcode.net/front-end/ruoyi-vue/-/commit/6a18e063394a1fdf1b4c7e0a3498b85a988221b9
去除element滚动条
2023-04-17T18:52:46+08:00
刘元博
1553592282@qq.com
https://gitcode.net/front-end/ruoyi-vue/-/commit/eff06c110f49db6c9632b53deb5ea4b6a926d4b2
修复路由跳转被阻止时vue-router内部产生报错信息问题
2023-04-20T15:02:38+08:00
loren-li
loren-li@outlook.com
https://gitcode.net/front-end/ruoyi-vue/-/commit/571393c32c976701a4875efee729792a4c6cf27d
缓存列表:多次清除操作,提示不变的问题;
2023-04-20T15:18:17+08:00
刘立伟
15046664475@139.com
https://gitcode.net/front-end/ruoyi-vue/-/commit/af15a3b2746e8b6da90debf7bc72efd34befeb78
!704 Vue的DictTag组件,当value没有匹配的值时,展示value
2023-04-23T06:53:11+00:00
若依
yzz_ivy@163.com
Merge pull request !704 from Aurora/master
https://gitcode.net/front-end/ruoyi-vue/-/commit/a4fe88ca611435ee33a6c872734c6f9da7489928
!707 恢复翻页/切换路由滚动功能
2023-04-23T06:53:45+00:00
若依
yzz_ivy@163.com
Merge pull request !707 from 也曾为你像超人/master
https://gitcode.net/front-end/ruoyi-vue/-/commit/848560514550a853b7a9d2b61adbfef9ac997a15
!710 修复代码生成表字段注释不全问题
2023-04-23T06:54:34+00:00
若依
yzz_ivy@163.com
Merge pull request !710 from zouhuu/dev
https://gitcode.net/front-end/ruoyi-vue/-/commit/4661edf7f07f6003195ebff8d3c3caaeb3567b87
!712 修复路由跳转被阻止时vue-router内部产生报错信息问题
2023-04-23T06:55:46+00:00
若依
yzz_ivy@163.com
Merge pull request !712 from 爱吃猫的鱼/master
https://gitcode.net/front-end/ruoyi-vue/-/commit/1eb7b3a03fd03de054d6b019df0e89fad10faf17
!713 缓存列表:多次清除操作,提示不变的问题
2023-04-23T06:57:17+00:00
若依
yzz_ivy@163.com
Merge pull request !713 from 刘立伟/master
https://gitcode.net/front-end/ruoyi-vue/-/commit/69bbccbd7634ddab76b349e957fd37c03d2144e7
添加新群号:136919097
2023-04-23T15:46:53+08:00
RuoYi
yzz_ivy@163.com
隐藏空白更改
内联
并排
Showing
11 changed file
with
196 addition
and
154 deletion
+196
-154
README.md
README.md
+1
-1
pom.xml
pom.xml
+0
-5
ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
.../main/resources/mapper/generator/GenTableColumnMapper.xml
+2
-2
ruoyi-ui/src/components/DictTag/index.vue
ruoyi-ui/src/components/DictTag/index.vue
+43
-3
ruoyi-ui/src/components/IconSelect/index.vue
ruoyi-ui/src/components/IconSelect/index.vue
+10
-18
ruoyi-ui/src/layout/components/AppMain.vue
ruoyi-ui/src/layout/components/AppMain.vue
+23
-0
ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
+94
-94
ruoyi-ui/src/layout/index.vue
ruoyi-ui/src/layout/index.vue
+11
-25
ruoyi-ui/src/router/index.js
ruoyi-ui/src/router/index.js
+6
-0
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/index.vue
+5
-5
ruoyi-ui/src/views/monitor/cache/list.vue
ruoyi-ui/src/views/monitor/cache/list.vue
+1
-1
未找到文件。
README.md
浏览文件 @
69bbccbd
...
...
@@ -94,4 +94,4 @@
## 若依前后端分离交流群
QQ群:
[
![加入QQ群
](
https://img.shields.io/badge/已满-937441-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=5bVB1og)
[
![加入QQ群
](
https://img.shields.io/badge/已满-887144332-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=5eiA4DH)
[
![加入QQ群
](
https://img.shields.io/badge/已满-180251782-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=5AxMKlC)
[
![加入QQ群
](
https://img.shields.io/badge/已满-104180207-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=51G72yr)
[
![加入QQ群
](
https://img.shields.io/badge/已满-186866453-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=VvjN2nvu)
[
![加入QQ群
](
https://img.shields.io/badge/已满-201396349-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=5vYAqA05)
[
![加入QQ群
](
https://img.shields.io/badge/已满-101456076-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=kOIINEb5)
[
![加入QQ群
](
https://img.shields.io/badge/已满-101539465-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=UKtX5jhs)
[
![加入QQ群
](
https://img.shields.io/badge/已满-264312783-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=EI9an8lJ)
[
![加入QQ群
](
https://img.shields.io/badge/已满-167385320-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=SWCtLnMz)
[
![加入QQ群
](
https://img.shields.io/badge/已满-104748341-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=96Dkdq0k)
[
![加入QQ群
](
https://img.shields.io/badge/已满-160110482-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=0fsNiYZt)
[
![加入QQ群
](
https://img.shields.io/badge/已满-170801498-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=7xw4xUG1)
[
![加入QQ群
](
https://img.shields.io/badge/已满-108482800-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=eCx8eyoJ)
[
![加入QQ群
](
https://img.shields.io/badge/101046199-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=SpyH2875) 点击按钮入群。
\ No newline at end of file
QQ群:
[
![加入QQ群
](
https://img.shields.io/badge/已满-937441-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=5bVB1og)
[
![加入QQ群
](
https://img.shields.io/badge/已满-887144332-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=5eiA4DH)
[
![加入QQ群
](
https://img.shields.io/badge/已满-180251782-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=5AxMKlC)
[
![加入QQ群
](
https://img.shields.io/badge/已满-104180207-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=51G72yr)
[
![加入QQ群
](
https://img.shields.io/badge/已满-186866453-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=VvjN2nvu)
[
![加入QQ群
](
https://img.shields.io/badge/已满-201396349-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=5vYAqA05)
[
![加入QQ群
](
https://img.shields.io/badge/已满-101456076-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=kOIINEb5)
[
![加入QQ群
](
https://img.shields.io/badge/已满-101539465-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=UKtX5jhs)
[
![加入QQ群
](
https://img.shields.io/badge/已满-264312783-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=EI9an8lJ)
[
![加入QQ群
](
https://img.shields.io/badge/已满-167385320-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=SWCtLnMz)
[
![加入QQ群
](
https://img.shields.io/badge/已满-104748341-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=96Dkdq0k)
[
![加入QQ群
](
https://img.shields.io/badge/已满-160110482-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=0fsNiYZt)
[
![加入QQ群
](
https://img.shields.io/badge/已满-170801498-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=7xw4xUG1)
[
![加入QQ群
](
https://img.shields.io/badge/已满-108482800-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=eCx8eyoJ)
[
![加入QQ群
](
https://img.shields.io/badge/已满-101046199-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=SpyH2875)
[
![加入QQ群
](
https://img.shields.io/badge/136919097-blue.svg
)
](https://jq.qq.com/?_wv=1027&k=tKEt51dz) 点击按钮入群。
\ No newline at end of file
pom.xml
浏览文件 @
69bbccbd
...
...
@@ -183,11 +183,6 @@
</modules>
<packaging>
pom
</packaging>
<dependencies>
</dependencies>
<build>
<plugins>
<plugin>
...
...
ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
浏览文件 @
69bbccbd
...
...
@@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)values(
<if
test=
"tableId != null and tableId != ''"
>
#{tableId},
</if>
<if
test=
"columnName != null and columnName != ''"
>
#{columnName},
</if>
<if
test=
"columnComment != null and columnComment != ''"
>
(select SUBSTRING_INDEX(#{columnComment}, ' ', 1))
,
</if>
<if
test=
"columnComment != null and columnComment != ''"
>
#{columnComment}
,
</if>
<if
test=
"columnType != null and columnType != ''"
>
#{columnType},
</if>
<if
test=
"javaType != null and javaType != ''"
>
#{javaType},
</if>
<if
test=
"javaField != null and javaField != ''"
>
#{javaField},
</if>
...
...
@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update
id=
"updateGenTableColumn"
parameterType=
"GenTableColumn"
>
update gen_table_column
<set>
<if
test=
"columnComment != null"
>
column_comment =
(select SUBSTRING_INDEX(#{columnComment}, ' ', 1))
,
</if>
<if
test=
"columnComment != null"
>
column_comment =
#{columnComment}
,
</if>
<if
test=
"javaType != null"
>
java_type = #{javaType},
</if>
<if
test=
"javaField != null"
>
java_field = #{javaField},
</if>
<if
test=
"isInsert != null"
>
is_insert = #{isInsert},
</if>
...
...
ruoyi-ui/src/components/DictTag/index.vue
浏览文件 @
69bbccbd
...
...
@@ -7,7 +7,7 @@
:key=
"item.value"
:index=
"index"
:class=
"item.raw.cssClass"
>
{{
item
.
label
}}
</span
>
{{
item
.
label
+
'
'
}}
</span
>
<el-tag
v-else
...
...
@@ -17,10 +17,13 @@
:type=
"item.raw.listClass == 'primary' ? '' : item.raw.listClass"
:class=
"item.raw.cssClass"
>
{{
item
.
label
}}
{{
item
.
label
+
'
'
}}
</el-tag>
</
template
>
</template>
<
template
v-if=
"unmatch && showValue"
>
{{
unmatchArray
|
handleArray
}}
</
template
>
</div>
</template>
...
...
@@ -33,6 +36,16 @@ export default {
default
:
null
,
},
value
:
[
Number
,
String
,
Array
],
// 当未找到匹配的数据时,显示value
showValue
:
{
type
:
Boolean
,
default
:
true
,
}
},
data
()
{
return
{
unmatchArray
:
[],
// 记录未匹配的项
}
},
computed
:
{
values
()
{
...
...
@@ -42,11 +55,38 @@ export default {
return
[];
}
},
unmatch
(){
this
.
unmatchArray
=
[];
if
(
this
.
value
!==
null
&&
typeof
this
.
value
!==
'
undefined
'
)
{
// 传入值为非数组
if
(
!
Array
.
isArray
(
this
.
value
)){
if
(
this
.
options
.
some
(
v
=>
v
.
value
==
this
.
value
))
return
false
;
this
.
unmatchArray
.
push
(
this
.
value
);
return
true
;
}
// 传入值为Array
this
.
value
.
forEach
(
item
=>
{
if
(
!
this
.
options
.
some
(
v
=>
v
.
value
==
item
))
this
.
unmatchArray
.
push
(
item
)
});
return
true
;
}
// 没有value不显示
return
false
;
},
},
filters
:
{
handleArray
(
array
)
{
if
(
array
.
length
===
0
)
return
''
;
return
array
.
reduce
((
pre
,
cur
)
=>
{
return
pre
+
'
'
+
cur
;
})
},
}
};
</
script
>
<
style
scoped
>
.el-tag
+
.el-tag
{
margin-left
:
10px
;
}
</
style
>
\ No newline at end of file
</
style
>
ruoyi-ui/src/components/IconSelect/index.vue
浏览文件 @
69bbccbd
...
...
@@ -5,16 +5,14 @@
<i
slot=
"suffix"
class=
"el-icon-search el-input__icon"
/>
</el-input>
<div
class=
"icon-list"
>
<el-scrollbar>
<div
class=
"list-container"
>
<div
v-for=
"(item, index) in iconList"
class=
"icon-item-wrapper"
:key=
"index"
@
click=
"selectedIcon(item)"
>
<div
:class=
"['icon-item',
{ active: activeIcon === item }]">
<svg-icon
:icon-class=
"item"
class-name=
"icon"
style=
"height: 30px;width: 16px;"
/>
<span
:title=
"item"
>
{{
item
}}
</span>
</div>
<div
class=
"list-container"
>
<div
v-for=
"(item, index) in iconList"
class=
"icon-item-wrapper"
:key=
"index"
@
click=
"selectedIcon(item)"
>
<div
:class=
"['icon-item',
{ active: activeIcon === item }]">
<svg-icon
:icon-class=
"item"
class-name=
"icon"
style=
"height: 25px;width: 16px;"
/>
<span>
{{
item
}}
</span>
</div>
</div>
</
el-scrollbar
>
</
div
>
</div>
</div>
</
template
>
...
...
@@ -63,27 +61,21 @@ export default {
}
.icon-list
{
height
:
200px
;
::v-deep
.el-scrollbar
{
height
:
100%
;
.el-scrollbar__wrap
{
overflow-x
:
hidden
;
}
}
overflow
:
auto
;
.list-container
{
display
:
flex
;
flex-wrap
:
wrap
;
.icon-item-wrapper
{
width
:
calc
(
100%
/
3
);
height
:
30px
;
line-height
:
30px
;
margin-bottom
:
-5px
;
height
:
25px
;
line-height
:
25px
;
cursor
:
pointer
;
display
:
flex
;
.icon-item
{
display
:
flex
;
max-width
:
100%
;
height
:
100%
;
padding
:
0
2
px
;
padding
:
0
5
px
;
&
:hover
{
background
:
#ececec
;
border-radius
:
5px
;
...
...
ruoyi-ui/src/layout/components/AppMain.vue
浏览文件 @
69bbccbd
...
...
@@ -50,3 +50,26 @@ export default {
}
}
</
style
>
<
style
lang=
"scss"
>
// fix css style bug in open el-dialog
.el-popup-parent--hidden
{
.fixed-header
{
padding-right
:
6px
;
}
}
::-webkit-scrollbar
{
width
:
6px
;
height
:
6px
;
}
::-webkit-scrollbar-track
{
background-color
:
#f1f1f1
;
}
::-webkit-scrollbar-thumb
{
background-color
:
#c0c0c0
;
border-radius
:
3px
;
}
</
style
>
ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
浏览文件 @
69bbccbd
<
template
>
<el-scrollbar
ref=
"scrollContainer"
:vertical=
"false"
class=
"scroll-container"
@
wheel.native.prevent=
"handleScroll"
>
<slot
/>
</el-scrollbar>
</
template
>
<
script
>
const
tagAndTagSpacing
=
4
// tagAndTagSpacing
export
default
{
name
:
'
ScrollPane
'
,
data
()
{
return
{
left
:
0
}
},
computed
:
{
scrollWrapper
()
{
return
this
.
$refs
.
scrollContainer
.
$refs
.
wrap
}
},
mounted
()
{
this
.
scrollWrapper
.
addEventListener
(
'
scroll
'
,
this
.
emitScroll
,
true
)
},
beforeDestroy
()
{
this
.
scrollWrapper
.
removeEventListener
(
'
scroll
'
,
this
.
emitScroll
)
},
methods
:
{
handleScroll
(
e
)
{
const
eventDelta
=
e
.
wheelDelta
||
-
e
.
deltaY
*
40
const
$scrollWrapper
=
this
.
scrollWrapper
$scrollWrapper
.
scrollLeft
=
$scrollWrapper
.
scrollLeft
+
eventDelta
/
4
},
emitScroll
()
{
this
.
$emit
(
'
scroll
'
)
},
moveToTarget
(
currentTag
)
{
const
$container
=
this
.
$refs
.
scrollContainer
.
$el
const
$containerWidth
=
$container
.
offsetWidth
const
$scrollWrapper
=
this
.
scrollWrapper
const
tagList
=
this
.
$parent
.
$refs
.
tag
let
firstTag
=
null
let
lastTag
=
null
// find first tag and last tag
if
(
tagList
.
length
>
0
)
{
firstTag
=
tagList
[
0
]
lastTag
=
tagList
[
tagList
.
length
-
1
]
}
if
(
firstTag
===
currentTag
)
{
$scrollWrapper
.
scrollLeft
=
0
}
else
if
(
lastTag
===
currentTag
)
{
$scrollWrapper
.
scrollLeft
=
$scrollWrapper
.
scrollWidth
-
$containerWidth
}
else
{
// find preTag and nextTag
const
currentIndex
=
tagList
.
findIndex
(
item
=>
item
===
currentTag
)
const
prevTag
=
tagList
[
currentIndex
-
1
]
const
nextTag
=
tagList
[
currentIndex
+
1
]
// the tag's offsetLeft after of nextTag
const
afterNextTagOffsetLeft
=
nextTag
.
$el
.
offsetLeft
+
nextTag
.
$el
.
offsetWidth
+
tagAndTagSpacing
// the tag's offsetLeft before of prevTag
const
beforePrevTagOffsetLeft
=
prevTag
.
$el
.
offsetLeft
-
tagAndTagSpacing
if
(
afterNextTagOffsetLeft
>
$scrollWrapper
.
scrollLeft
+
$containerWidth
)
{
$scrollWrapper
.
scrollLeft
=
afterNextTagOffsetLeft
-
$containerWidth
}
else
if
(
beforePrevTagOffsetLeft
<
$scrollWrapper
.
scrollLeft
)
{
$scrollWrapper
.
scrollLeft
=
beforePrevTagOffsetLeft
}
}
}
}
}
</
script
>
<
style
lang=
"scss"
scoped
>
.scroll-container
{
white-space
:
nowrap
;
position
:
relative
;
overflow
:
hidden
;
width
:
100%
;
::v-deep
{
.el-scrollbar__bar
{
bottom
:
0px
;
}
.el-scrollbar__wrap
{
height
:
49px
;
}
}
}
</
style
>
<
template
>
<el-scrollbar
ref=
"scrollContainer"
:vertical=
"false"
class=
"scroll-container"
@
wheel.native.prevent=
"handleScroll"
>
<slot
/>
</el-scrollbar>
</
template
>
<
script
>
const
tagAndTagSpacing
=
4
// tagAndTagSpacing
export
default
{
name
:
'
ScrollPane
'
,
data
()
{
return
{
left
:
0
}
},
computed
:
{
scrollWrapper
()
{
return
this
.
$refs
.
scrollContainer
.
$refs
.
wrap
}
},
mounted
()
{
this
.
scrollWrapper
.
addEventListener
(
'
scroll
'
,
this
.
emitScroll
,
true
)
},
beforeDestroy
()
{
this
.
scrollWrapper
.
removeEventListener
(
'
scroll
'
,
this
.
emitScroll
)
},
methods
:
{
handleScroll
(
e
)
{
const
eventDelta
=
e
.
wheelDelta
||
-
e
.
deltaY
*
40
const
$scrollWrapper
=
this
.
scrollWrapper
$scrollWrapper
.
scrollLeft
=
$scrollWrapper
.
scrollLeft
+
eventDelta
/
4
},
emitScroll
()
{
this
.
$emit
(
'
scroll
'
)
},
moveToTarget
(
currentTag
)
{
const
$container
=
this
.
$refs
.
scrollContainer
.
$el
const
$containerWidth
=
$container
.
offsetWidth
const
$scrollWrapper
=
this
.
scrollWrapper
const
tagList
=
this
.
$parent
.
$refs
.
tag
let
firstTag
=
null
let
lastTag
=
null
// find first tag and last tag
if
(
tagList
.
length
>
0
)
{
firstTag
=
tagList
[
0
]
lastTag
=
tagList
[
tagList
.
length
-
1
]
}
if
(
firstTag
===
currentTag
)
{
$scrollWrapper
.
scrollLeft
=
0
}
else
if
(
lastTag
===
currentTag
)
{
$scrollWrapper
.
scrollLeft
=
$scrollWrapper
.
scrollWidth
-
$containerWidth
}
else
{
// find preTag and nextTag
const
currentIndex
=
tagList
.
findIndex
(
item
=>
item
===
currentTag
)
const
prevTag
=
tagList
[
currentIndex
-
1
]
const
nextTag
=
tagList
[
currentIndex
+
1
]
// the tag's offsetLeft after of nextTag
const
afterNextTagOffsetLeft
=
nextTag
.
$el
.
offsetLeft
+
nextTag
.
$el
.
offsetWidth
+
tagAndTagSpacing
// the tag's offsetLeft before of prevTag
const
beforePrevTagOffsetLeft
=
prevTag
.
$el
.
offsetLeft
-
tagAndTagSpacing
if
(
afterNextTagOffsetLeft
>
$scrollWrapper
.
scrollLeft
+
$containerWidth
)
{
$scrollWrapper
.
scrollLeft
=
afterNextTagOffsetLeft
-
$containerWidth
}
else
if
(
beforePrevTagOffsetLeft
<
$scrollWrapper
.
scrollLeft
)
{
$scrollWrapper
.
scrollLeft
=
beforePrevTagOffsetLeft
}
}
}
}
}
</
script
>
<
style
lang=
"scss"
scoped
>
.scroll-container
{
white-space
:
nowrap
;
position
:
relative
;
overflow
:
hidden
;
width
:
100%
;
::v-deep
{
.el-scrollbar__bar
{
bottom
:
0px
;
}
.el-scrollbar__wrap
{
height
:
39px
;
}
}
}
</
style
>
ruoyi-ui/src/layout/index.vue
浏览文件 @
69bbccbd
<
template
>
<div
:class=
"classObj"
class=
"app-wrapper"
:style=
"
{'--current-color': theme}">
<div
v-if=
"device==='mobile'&&sidebar.opened"
class=
"drawer-bg"
@
click=
"handleClickOutside"
/>
<sidebar
v-if=
"!sidebar.hide"
class=
"sidebar-container"
/>
<div
:class=
"
{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
<el-scrollbar>
<div
:class=
"
{'fixed-header':fixedHeader}">
<navbar/>
<tags-view
v-if=
"needTagsView"
/>
</div>
<app-main/>
<right-panel>
<settings/>
</right-panel>
</el-scrollbar>
<div
v-if=
"device==='mobile'&&sidebar.opened"
class=
"drawer-bg"
@
click=
"handleClickOutside"
/>
<sidebar
v-if=
"!sidebar.hide"
class=
"sidebar-container"
/>
<div
:class=
"
{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
<div
:class=
"
{'fixed-header':fixedHeader}">
<navbar/>
<tags-view
v-if=
"needTagsView"
/>
</div>
<app-main/>
<right-panel>
<settings/>
</right-panel>
</div>
</div>
</
template
>
...
...
@@ -74,18 +72,6 @@ export default {
height
:
100%
;
width
:
100%
;
.el-scrollbar
{
height
:
100%
;
}
::v-deep
.el-scrollbar__bar.is-vertical
{
z-index
:
10
;
}
::v-deep
.el-scrollbar__wrap
{
overflow-x
:
hidden
;
}
&
.mobile.openSidebar
{
position
:
fixed
;
top
:
0
;
...
...
ruoyi-ui/src/router/index.js
浏览文件 @
69bbccbd
...
...
@@ -166,9 +166,15 @@ export const dynamicRoutes = [
// 防止连续点击多次路由报错
let
routerPush
=
Router
.
prototype
.
push
;
let
routerReplace
=
Router
.
prototype
.
replace
;
// push
Router
.
prototype
.
push
=
function
push
(
location
)
{
return
routerPush
.
call
(
this
,
location
).
catch
(
err
=>
err
)
}
// replace
Router
.
prototype
.
replace
=
function
push
(
location
)
{
return
routerReplace
.
call
(
this
,
location
).
catch
(
err
=>
err
)
}
export
default
new
Router
({
mode
:
'
history
'
,
// 去掉url中的#
...
...
ruoyi-ui/src/views/index.vue
浏览文件 @
69bbccbd
...
...
@@ -118,11 +118,11 @@
>
</p>
<p>
<i
class=
"el-icon-user-solid"
></i>
QQ群:
<s>
满937441
</s>
<s>
满887144332
</s>
<s>
满180251782
</s>
<s>
满104180207
</s>
<s>
满186866453
</s>
<s>
满201396349
</s>
<s>
满101456076
</s>
<s>
满101539465
</s>
<s>
满264312783
</s>
<s>
满167385320
</s>
<s>
满104748341
</s>
<s>
满160110482
</s>
<s>
满170801498
</s>
<s>
满108482800
</s>
<
a
href=
"https://jq.qq.com/?_wv=1027&k=SpyH2875"
target=
"_blank"
>
101046199
</a>
<i
class=
"el-icon-user-solid"
></i>
QQ群:
<s>
满937441
</s>
<s>
满887144332
</s>
<s>
满180251782
</s>
<s>
满104180207
</s>
<s>
满186866453
</s>
<s>
满201396349
</s>
<s>
满101456076
</s>
<s>
满101539465
</s>
<s>
满264312783
</s>
<s>
满167385320
</s>
<s>
满104748341
</s>
<s>
满160110482
</s>
<s>
满170801498
</s>
<s>
满108482800
</s>
<
s>
满101046199
</s>
<a
href=
"https://jq.qq.com/?_wv=1027&k=tKEt51dz"
target=
"_blank"
>
136919097
</a>
</p>
<p>
<i
class=
"el-icon-chat-dot-round"
></i>
微信:
<a
...
...
ruoyi-ui/src/views/monitor/cache/list.vue
浏览文件 @
69bbccbd
...
...
@@ -187,7 +187,7 @@ export default {
/** 清理指定名称缓存 */
handleClearCacheName
(
row
)
{
clearCacheName
(
row
.
cacheName
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
"
清理缓存名称[
"
+
this
.
nowC
acheName
+
"
]成功
"
);
this
.
$modal
.
msgSuccess
(
"
清理缓存名称[
"
+
row
.
c
acheName
+
"
]成功
"
);
this
.
getCacheKeys
();
});
},
...
...