Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
finance-manage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
finance-oa
finance-manage
Commits
bc8b5f10
Commit
bc8b5f10
authored
Jul 21, 2022
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化布局设置使用el-drawer抽屉显示
parent
5ec5e1a6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
66 additions
and
100 deletions
+66
-100
ruoyi-ui/src/components/RightPanel/index.vue
ruoyi-ui/src/components/RightPanel/index.vue
+3
-40
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/layout/components/Settings/index.vue
+63
-60
No files found.
ruoyi-ui/src/components/RightPanel/index.vue
View file @
bc8b5f10
<
template
>
<div
ref=
"rightPanel"
:class=
"
{show:show}"
class="rightPanel-container">
<div
ref=
"rightPanel"
class=
"rightPanel-container"
>
<div
class=
"rightPanel-background"
/>
<div
class=
"rightPanel"
>
<div
class=
"rightPanel-items"
>
...
...
@@ -10,18 +10,12 @@
</
template
>
<
script
>
import
{
addClass
,
removeClass
}
from
'
@/utils
'
export
default
{
name
:
'
RightPanel
'
,
props
:
{
clickNotClose
:
{
default
:
false
,
type
:
Boolean
},
buttonTop
:
{
default
:
250
,
type
:
Number
}
},
computed
:
{
...
...
@@ -35,21 +29,13 @@ export default {
value
:
val
})
}
},
theme
()
{
return
this
.
$store
.
state
.
settings
.
theme
},
}
},
watch
:
{
show
(
value
)
{
if
(
value
&&
!
this
.
clickNotClose
)
{
this
.
addEventClick
()
}
if
(
value
)
{
addClass
(
document
.
body
,
'
showRightPanel
'
)
}
else
{
removeClass
(
document
.
body
,
'
showRightPanel
'
)
}
}
},
mounted
()
{
...
...
@@ -65,7 +51,7 @@ export default {
window
.
addEventListener
(
'
click
'
,
this
.
closeSidebar
)
},
closeSidebar
(
evt
)
{
const
parent
=
evt
.
target
.
closest
(
'
.
rightPanel
'
)
const
parent
=
evt
.
target
.
closest
(
'
.
el-drawer__body
'
)
if
(
!
parent
)
{
this
.
show
=
false
window
.
removeEventListener
(
'
click
'
,
this
.
closeSidebar
)
...
...
@@ -80,14 +66,6 @@ export default {
}
</
script
>
<
style
>
.showRightPanel
{
overflow
:
hidden
;
position
:
relative
;
width
:
calc
(
100%
-
15px
);
}
</
style
>
<
style
lang=
"scss"
scoped
>
.rightPanel-background
{
position
:
fixed
;
...
...
@@ -113,21 +91,6 @@ export default {
z-index
:
40000
;
}
.show
{
transition
:
all
.3s
cubic-bezier
(
.7
,
.3
,
.1
,
1
);
.rightPanel-background
{
z-index
:
20000
;
opacity
:
1
;
width
:
100%
;
height
:
100%
;
}
.rightPanel
{
transform
:
translate
(
0
);
}
}
.handle-button
{
width
:
48px
;
height
:
48px
;
...
...
ruoyi-ui/src/layout/components/Settings/index.vue
View file @
bc8b5f10
<
template
>
<el-drawer
size=
"280px"
:visible=
"visible"
:with-header=
"false"
:append-to-body=
"true"
:show-close=
"false"
>
<div
class=
"drawer-container"
>
<div>
<div
class=
"setting-drawer-content"
>
...
...
@@ -10,10 +11,8 @@
<img
src=
"@/assets/images/dark.svg"
alt=
"dark"
>
<div
v-if=
"sideTheme === 'theme-dark'"
class=
"setting-drawer-block-checbox-selectIcon"
style=
"display: block;"
>
<i
aria-label=
"图标: check"
class=
"anticon anticon-check"
>
<svg
viewBox=
"64 64 896 896"
data-icon=
"check"
width=
"1em"
height=
"1em"
:fill=
"theme"
aria-hidden=
"true"
focusable=
"false"
class=
""
>
<path
d=
"M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"
/>
<svg
viewBox=
"64 64 896 896"
data-icon=
"check"
width=
"1em"
height=
"1em"
:fill=
"theme"
aria-hidden=
"true"
focusable=
"false"
class=
""
>
<path
d=
"M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"
/>
</svg>
</i>
</div>
...
...
@@ -22,10 +21,8 @@
<img
src=
"@/assets/images/light.svg"
alt=
"light"
>
<div
v-if=
"sideTheme === 'theme-light'"
class=
"setting-drawer-block-checbox-selectIcon"
style=
"display: block;"
>
<i
aria-label=
"图标: check"
class=
"anticon anticon-check"
>
<svg
viewBox=
"64 64 896 896"
data-icon=
"check"
width=
"1em"
height=
"1em"
:fill=
"theme"
aria-hidden=
"true"
focusable=
"false"
class=
""
>
<path
d=
"M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"
/>
<svg
viewBox=
"64 64 896 896"
data-icon=
"check"
width=
"1em"
height=
"1em"
:fill=
"theme"
aria-hidden=
"true"
focusable=
"false"
class=
""
>
<path
d=
"M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"
/>
</svg>
</i>
</div>
...
...
@@ -73,6 +70,7 @@
<el-button
size=
"small"
plain
icon=
"el-icon-refresh"
@
click=
"resetSetting"
>
重置配置
</el-button>
</div>
</div>
</el-drawer>
</
template
>
<
script
>
...
...
@@ -87,6 +85,11 @@ export default {
};
},
computed
:
{
visible
:
{
get
()
{
return
this
.
$store
.
state
.
settings
.
showSettings
}
},
fixedHeader
:
{
get
()
{
return
this
.
$store
.
state
.
settings
.
fixedHeader
...
...
@@ -232,7 +235,7 @@ export default {
}
.drawer-container
{
padding
:
2
4
px
;
padding
:
2
0
px
;
font-size
:
14px
;
line-height
:
1
.5
;
word-wrap
:
break-word
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment