Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
ac86a488
提交
ac86a488
authored
10月 09, 2021
作者:
fit2cloud-chenyw
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
style: 优化主题样式
上级
87eb91c0
隐藏空白字符变更
内嵌
并排
正在显示
15 个修改的文件
包含
174 行增加
和
88 行删除
+174
-88
package.json
frontend/package.json
+3
-4
DeAsideContainer.vue
frontend/src/components/dataease/DeAsideContainer.vue
+1
-1
DeLeft2RightDragBar.vue
...d/src/components/dataease/dragbar/DeLeft2RightDragBar.vue
+1
-1
index.vue
frontend/src/layout/components/Sidebar/index.vue
+1
-23
Topbar.vue
frontend/src/layout/components/Topbar.vue
+2
-2
index.vue
frontend/src/layout/index.vue
+2
-2
index.scss
frontend/src/styles/index.scss
+43
-21
sidebar.scss
frontend/src/styles/sidebar.scss
+54
-15
dark.scss
frontend/src/styles/theme/dark.scss
+25
-5
topbar.scss
frontend/src/styles/topbar.scss
+11
-7
setting.vue
frontend/src/views/msg/setting.vue
+3
-3
index.vue
frontend/src/views/panel/GrantAuth/dept/index.vue
+9
-1
index.vue
frontend/src/views/panel/edit/index.vue
+5
-0
PanelViewShow.vue
frontend/src/views/panel/list/PanelViewShow.vue
+5
-2
LazyTree.vue
frontend/src/views/system/authority/components/LazyTree.vue
+9
-1
没有找到文件。
frontend/package.json
浏览文件 @
ac86a488
...
...
@@ -27,10 +27,11 @@
"file-saver"
:
"^2.0.5"
,
"fit2cloud-ui"
:
"1.5.0-beta.0"
,
"html2canvasde"
:
"^v1.1.4-de"
,
"jquery"
:
"^3.1.1"
,
"js-cookie"
:
"2.2.0"
,
"jsencrypt"
:
"^3.0.0-rc.1"
,
"jspdf"
:
"^2.3.1"
,
"lodash"
:
"
4.17.21
"
,
"lodash"
:
"
^4.17.4
"
,
"normalize.css"
:
"7.0.0"
,
"nprogress"
:
"0.2.0"
,
"screenfull"
:
"4.2.0"
,
...
...
@@ -51,9 +52,7 @@
"vuedraggable"
:
"^2.24.3"
,
"vuex"
:
"3.1.0"
,
"webpack"
:
"^4.46.0"
,
"xlsx"
:
"^0.17.0"
,
"lodash"
:
"^4.17.4"
,
"jquery"
:
"^3.1.1"
"xlsx"
:
"^0.17.0"
},
"devDependencies"
:
{
"@babel/core"
:
"^7.4.0-0"
,
...
...
frontend/src/components/dataease/DeAsideContainer.vue
浏览文件 @
ac86a488
...
...
@@ -43,7 +43,7 @@ export default {
padding
:
10px
;
border-radius
:
2px
;
box-sizing
:
border-box
;
background-color
:
var
(
--
Main
BG
);
background-color
:
var
(
--
Sider
BG
);
height
:
calc
(
100vh
-
56px
);
border-right
:
0px
;
position
:
relative
;
...
...
frontend/src/components/dataease/dragbar/DeLeft2RightDragBar.vue
浏览文件 @
ac86a488
...
...
@@ -28,7 +28,7 @@ export default {
right
:
0px
;
top
:
0
;
cursor
:
col-resize
;
background-color
:
var
(
--
MainBorder
Color
)
!important
;
background-color
:
var
(
--
SiderText
Color
)
!important
;
border
:
0px
;
}
...
...
frontend/src/layout/components/Sidebar/index.vue
浏览文件 @
ac86a488
...
...
@@ -7,7 +7,7 @@
:collapse=
"isCollapse"
:unique-opened=
"false"
:collapse-transition=
"false"
background-color=
"var(--MainBG)"
mode=
"vertical"
>
<sidebar-item
v-for=
"route in routes"
:key=
"route.path"
:item=
"route"
:base-path=
"route.path"
/>
...
...
@@ -57,26 +57,4 @@ export default {
<
style
lang=
"scss"
scoped
>
/* .sidebar-container {
>>>li.el-menu-item.is-active {
background-color: var(--active-bg) !important;
}
>>>li.el-submenu.is-active:not(&:hover){
background-color: var(--active-bg) ;
}
>>>li.el-submenu__title {
&:hover {
background-color: var(--left-menu-hovor) !important;
}
}
>>>.el-submenu.is-active .el-submenu__title {
color: var(--theme) !important;
}
.is-active > .el-submenu__title {
color: var(--theme) !important;
}
} */
</
style
>
frontend/src/layout/components/Topbar.vue
浏览文件 @
ac86a488
...
...
@@ -22,7 +22,7 @@
</div>
</el-menu>
<div
class=
"right-menu"
style=
"color: var(--T
extPrimary
)"
>
<div
class=
"right-menu"
style=
"color: var(--T
opTextColor
)"
>
<template>
<notification
class=
"right-menu-item hover-effect"
/>
...
...
@@ -35,7 +35,7 @@
</
template
>
<el-dropdown
class=
"top-dropdown"
style=
"display: flex;align-items: center; width:100px;"
>
<span
class=
"el-dropdown-link"
style=
"color: var(--T
extPrimary
);font-size: 14px;max-width: 80px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"
>
<span
class=
"el-dropdown-link"
style=
"color: var(--T
opTextColor
);font-size: 14px;max-width: 80px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"
>
{{ name }}
<i
class=
"el-icon-arrow-down el-icon--right"
/>
</span>
...
...
frontend/src/layout/index.vue
浏览文件 @
ac86a488
...
...
@@ -80,7 +80,7 @@ export default {
position
:
relative
;
height
:
100%
;
// height: $contentHeight;
background-color
:
var
(
--
MainBG
);
background-color
:
var
(
--
Main
Content
BG
);
width
:
100%
;
&
.mobile.openSidebar
{
position
:
fixed
;
...
...
@@ -124,7 +124,7 @@ export default {
height
:
calc
(
100vh
-
80px
)
!
important
;
overflow-x
:
hidden
!
important
;
overflow-y
:
auto
!
important
;
background-color
:
var
(
--
Main
BG
)
!
important
;
background-color
:
var
(
--
Sider
BG
)
!
important
;
}
}
</
style
>
frontend/src/styles/index.scss
浏览文件 @
ac86a488
...
...
@@ -377,36 +377,40 @@ div:focus {
}
.el-table
{
background-color
:
var
(
--
Main
BG
)
!
important
;
background-color
:
var
(
--
Table
BG
)
!
important
;
tr
{
background-color
:
var
(
--
Main
BG
)
!
important
;
background-color
:
var
(
--
Table
BG
)
!
important
;
}
th
{
background-color
:
var
(
--
Main
BG
)
!
important
;
background-color
:
var
(
--
Table
BG
)
!
important
;
}
}
.blackTheme
.el-textarea__inner
{
color
:
var
(
--
TableColor
)
!
important
;
background-color
:
var
(
--
MainBG
)
!
important
;
}
.blackTheme
.el-textarea__inner
:not
(
:focus
)
{
color
:
var
(
--
TableColor
)
!
important
;
border-color
:
var
(
--
border-color-input
)
!
important
;
}
.blackTheme
.el-input__inner
{
background-color
:
var
(
--
MainBG
)
!
important
;
background-color
:
var
(
--
MainBG
)
!
important
;
color
:
var
(
--
TableColor
)
!
important
;
}
.blackTheme
.el-input__inner
:not
(
:focus
)
{
color
:
var
(
--
TableColor
)
!
important
;
border-color
:
var
(
--
border-color-input
)
!
important
;
}
.blackTheme
.el-input-number__decrease
{
color
:
var
(
--
TableColor
)
!
important
;
background-color
:
var
(
--
MainBG
)
!
important
;
border
:
none
!
important
;
}
.blackTheme
.el-input-number__increase
{
color
:
var
(
--
TableColor
)
!
important
;
background-color
:
var
(
--
MainBG
)
!
important
;
border
:
none
!
important
;
}
...
...
@@ -414,25 +418,42 @@ div:focus {
.el-pagination
{
button
:disabled
{
color
:
var
(
--
TableColor
)
!
important
;
background-color
:
var
(
--
MainBG
)
!
important
;
}
}
.el-pager
li
{
color
:
var
(
--
TableColor
)
!
important
;
background-color
:
var
(
--
MainBG
)
!
important
;
}
.blackTheme
.el-select-dropdown
{
/*
.blackTheme .el-select-dropdown {
background-color: var(--MainBG) !important;
}
}
*/
.fu-search-bar-button
{
background-color
:
var
(
--
Main
)
!
important
;
}
.fu-quick-search
input
{
.blackTheme
.fu-quick-search
input
{
color
:
var
(
--
TableColor
)
!
important
;
background-color
:
var
(
--
MainBG
)
!
important
;
}
.blackTheme
.vue-treeselect__single-value
{
color
:
var
(
--
TableColor
)
!
important
;
}
.blackTheme
.el-tag.el-tag--info
{
background-color
:
var
(
--
MainContentBG
);
border-color
:
var
(
--
TableBorderColor
);
color
:
var
(
--
TableColor
)
!
important
;
;
}
.blackTheme
.vue-treeselect__control
{
background-color
:
var
(
--
MainBG
)
!
important
;
color
:
var
(
--
TableColor
)
!
important
;
border-color
:
var
(
--
border-color-input
)
!
important
;
}
.blackTheme
.el-popover
{
background-color
:
var
(
--
MainBG
);
...
...
@@ -440,6 +461,7 @@ div:focus {
.blackTheme
.main-area-input
{
input
.el-input__inner
{
color
:
var
(
--
TableColor
)
!
important
;
background-color
:
var
(
--
ContentBG
)
!
important
;
}
.el-input-group__append
{
...
...
@@ -448,16 +470,16 @@ div:focus {
}
}
.el-tree
{
background-color
:
var
(
--
Main
BG
)
!
important
;
.
blackTheme
.
el-tree
{
background-color
:
var
(
--
Sider
BG
)
!
important
;
}
.el-tree-node__content
:hover
{
background-color
:
var
(
--
Content
BG
)
!
important
;
.
blackTheme
.
el-tree-node__content
:hover
{
background-color
:
var
(
--
Sider
BG
)
!
important
;
}
.is-current
>
.el-tree-node__content
{
background-color
:
var
(
--
Content
BG
)
!
important
;
.
blackTheme
.
is-current
>
.el-tree-node__content
{
background-color
:
var
(
--
Sider
BG
)
!
important
;
}
.blackTheme
.el-collapse-item__header
{
background-color
:
var
(
--
ContentBG
)
!
important
;
...
...
@@ -497,28 +519,28 @@ div:focus {
.blackTheme
.elx-table--main-wrapper
{
.body--wrapper
{
background-color
:
var
(
--
Content
BG
)
!
important
;
background-color
:
var
(
--
Table
BG
)
!
important
;
}
}
.blackTheme
.elx-table
{
color
:
var
(
--
T
extPrimary
)
!
important
;
color
:
var
(
--
T
ableColor
)
!
important
;
}
.blackTheme
.elx-body--column
{
background-image
:
linear-gradient
(
var
(
--
MainBorderColor
)
,
var
(
--
MainBorderColor
))
,
linear-gradient
(
var
(
--
MainBorderColor
)
,
var
(
--
Main
BorderColor
))
!
important
;
background-image
:
linear-gradient
(
var
(
--
TableBorderColor
)
,
var
(
--
TableBorderColor
))
,
linear-gradient
(
var
(
--
TableBorderColor
)
,
var
(
--
Table
BorderColor
))
!
important
;
}
.blackTheme
.elx-header--column
{
background-image
:
linear-gradient
(
--
MainBorderColor
,
--
MainBorderColor
)
,
linear-gradient
(
--
MainBorderColor
,
--
Main
BorderColor
)
!
important
;
background-image
:
linear-gradient
(
--
TableBorderColor
,
--
TableBorderColor
)
,
linear-gradient
(
--
TableBorderColor
,
--
Table
BorderColor
)
!
important
;
}
.blackTheme
tr
.row--current
{
background-color
:
var
(
--
MainBG
)
!
important
;
}
.blackTheme
tr
.elx-body--row
:hover
{
background-color
:
var
(
--
Main
BG
)
!
important
;
background-color
:
var
(
--
Table
BG
)
!
important
;
}
.blackTheme
.elx-table--header-border-line
{
border-color
:
var
(
--
Main
BorderColor
)
!
important
;
border-color
:
var
(
--
Table
BorderColor
)
!
important
;
}
.el-collapse-item__content
{
...
...
frontend/src/styles/sidebar.scss
浏览文件 @
ac86a488
...
...
@@ -14,7 +14,6 @@
.sidebar-container
{
transition
:
width
0
.28s
;
// background-color: $--background-color-base;
height
:
$contentHeight
;
position
:
fixed
;
font-size
:
0px
;
...
...
@@ -64,33 +63,71 @@
border
:
none
;
height
:
100%
;
width
:
100%
!
important
;
background-color
:
var
(
--
SiderBG
,
#ffffff
);
}
.submenu-title-noDropdown
,
.el-submenu__title
{
.submenu-title-noDropdown
:not
(
.is-active
),
.el-submenu__title
{
color
:
var
(
--
SiderTextColor
);
&
:hover
{
// background-color: $leftMenuHovor
!important;
background-color
:
var
(
--
ContentBG
)
!
important
;
background-color
:
var
(
--
MenuHovorBG
)
!
important
;
color
:
var
(
--
TextActive
)
;
}
&
:focus
{
background-color
:
var
(
--
MenuActiveBG
)
!
important
;
color
:
var
(
--
TextActive
);
}
}
.submenu-title-noDropdown.is-active
{
background-color
:
var
(
--
MenuActiveBG
)
!
important
;
color
:
var
(
--
TextActive
);
}
/* .is-active > .el-submenu__title {
color: $leftMenuTextActive !important;
.is-active
>
.el-submenu__title
{
background-color
:
var
(
--
MenuActiveBG
)
!
important
;
color
:
var
(
--
TextActive
);
}
/* .nest-menu {
.el-menu-item:not(.is-active) {
min-width: $sideBarWidth !important;
background-color: var(--SiderBG) !important;
color: var(--SiderTextColor);
&:hover {
color: var(--TextActive) !important;
}
&:focus {
background-color: var(--SiderBG) !important;
color: var(--TextActive) !important;
}
}
.el-menu-item.is-active {
color: var(--TextActive) !important;
}
} */
&
.nest-menu
.el-submenu
>
.el-submenu__title
,
&
.el-submenu
.el-menu-item
{
min-width
:
$sideBarWidth
!
important
;
// background-color: $leftMenuBg !important;
background-color
:
var
(
--
MainBG
)
!
important
;
background-color
:
var
(
--
SiderBG
)
!
important
;
color
:
var
(
--
SiderTextColor
);
&
:hover
{
// background-color: $leftMenuHovor
!important;
background-color
:
var
(
--
ContentBG
)
!
important
;
background-color
:
var
(
--
MenuHovorBG
)
!
important
;
color
:
var
(
--
TextActive
)
!
important
;
}
}
&
.nest-menu
.el-submenu
>
.el-submenu__title
,
&
.el-submenu
.is-active.el-menu-item
{
min-width
:
$sideBarWidth
!
important
;
background-color
:
var
(
--
SiderBG
)
!
important
;
color
:
var
(
--
TextActive
);
}
}
.hideSidebar
{
...
...
@@ -147,6 +184,8 @@
}
}
.el-menu--collapse
.el-menu
.el-submenu
{
min-width
:
$sideBarWidth
!
important
;
}
...
...
@@ -190,7 +229,7 @@
.el-menu-item
{
&
:hover
{
// background-color: $leftMenuHovor !important;
background-color
:
var
(
--
Content
BG
)
!
important
;
background-color
:
var
(
--
Sider
BG
)
!
important
;
}
}
...
...
frontend/src/styles/theme/dark.scss
浏览文件 @
ac86a488
...
...
@@ -11,14 +11,16 @@ $--color-text-regular: #EBEEF5;
$--color-text-secondary
:
#E4E7ED
;
$--color-text-placeholder
:
#DCDFE6
;
$--border-color-base
:
#
2681ff
;
$--border-color-light
:
#
2681ff
;
$--border-color-lighter
:
#
2681ff
;
$--border-color-extra-light
:
#
2681ff
;
$--border-color-base
:
#
495865
;
$--border-color-light
:
#
495865
;
$--border-color-lighter
:
#
495865
;
$--border-color-extra-light
:
#
495865
;
$--color-white
:
#FFFFFF
;
$--color-black
:
#000000
;
$--color-text-regular
:
#fff
;
$--background-color-base
:
#171b22
;
// 与CSS原生变量映射
...
...
@@ -27,12 +29,30 @@ $--background-color-base: #171b22;
--test
:
#FF9227
;
--color-primary
:
#000
;
--MainBG
:
#171b22
;
--ContentBG
:
#
303640
;
--ContentBG
:
#
1b2a32
;
--MainBorderColor
:
#2681ff
;
--TextActive
:
#FFFFFF
;
--TextPrimary
:
#F2F6FC
;
--border-color-input
:
#303640
;
--border-color-input-hovor
:
#303640
;
--TopBG
:
#00364d
;
--TopTextColor
:
#fafafa
;
--MenuHovorBG
:
#28404d
;
--MenuActiveBG
:
#324f62
;
--SiderBG
:
#17242b
;
--SiderTextColor
:
#acbac3
;
--MainContentBG
:
#1b2a32
;
--TableBG
:
#21333b
;
--TableColor
:
#acbac3
;
--TableBorder
:
.05rem
solid
#495865
;
--TableBorderColor
:
#495865
;
}
frontend/src/styles/topbar.scss
浏览文件 @
ac86a488
...
...
@@ -5,8 +5,8 @@
left
:
0
;
z-index
:
1001
;
overflow
:
hidden
;
border-bottom
:
1px
solid
$--color-primary
;
border-bottom
:
1px
solid
var
(
--
TopBG
,
#E6E6E6
)
;
background-color
:
var
(
--
TopBG
,
#ffffff
);
.log
{
padding
:
0
16px
;
line-height
:
56px
;
...
...
@@ -25,24 +25,28 @@
.el-menu
{
float
:
left
;
border
:
none
!
important
;
background-color
:
var
(
--
Main
BG
,
#ffffff
)
!
important
;
background-color
:
var
(
--
Top
BG
,
#ffffff
)
!
important
;
.nav-item
{
display
:
inline-block
;
.el-menu-item
:not
(
.is-active
)
{
color
:
var
(
--
TopTextColor
);
opacity
:
0
.65
;
&
:hover
{
background-color
:
var
(
--
ContentBG
,
#ecf5ff
)
!
important
;
background-color
:
var
(
--
MenuHovorBG
,
#ecf5ff
)
!
important
;
opacity
:
1
;
}
&
:focus
{
background-color
:
var
(
--
ContentBG
,
#ecf5ff
)
!
important
;
background-color
:
var
(
--
MenuActiveBG
,
#ecf5ff
)
!
important
;
opacity
:
1
;
}
}
.el-menu-item.is-active
{
background-color
:
var
(
--
Content
BG
,
#ecf5ff
)
;
background-color
:
var
(
--
MenuActive
BG
,
#ecf5ff
)
;
color
:
var
(
--
TextActive
)
!
important
;
opacity
:
1
;
}
}
...
...
frontend/src/views/msg/setting.vue
浏览文件 @
ac86a488
...
...
@@ -244,10 +244,10 @@ export default {
.tree-head
{
height
:
30px
;
line-height
:
30px
;
border-bottom
:
1px
solid
#e6e6e6
;
background-color
:
#f7f8fa
;
border-bottom
:
1px
solid
var
(
--TableBorderColor
,
#e6e6e6
)
;
background-color
:
var
(
--SiderBG
,
#f7f8fa
)
;
font-size
:
12px
;
color
:
#3d4d66
;
color
:
var
(
--TableColor
,
#3d4d66
)
;
}
.auth-span
{
...
...
frontend/src/views/panel/GrantAuth/dept/index.vue
浏览文件 @
ac86a488
...
...
@@ -260,13 +260,21 @@ export default {
border
:
1px
solid
#e6e6e6
;
overflow-y
:
auto
;
}
.tree-head
{
/*
.tree-head{
height: 30px;
line-height: 30px;
border-bottom: 1px solid #e6e6e6;
background-color: #f7f8fa;
font-size: 12px;
color: #3d4d66 ;
} */
.tree-head
{
height
:
30px
;
line-height
:
30px
;
border-bottom
:
1px
solid
var
(
--TableBorderColor
,
#e6e6e6
);
background-color
:
var
(
--SiderBG
,
#f7f8fa
);
font-size
:
12px
;
color
:
var
(
--TableColor
,
#3d4d66
)
;
}
.auth-span
{
...
...
frontend/src/views/panel/edit/index.vue
浏览文件 @
ac86a488
...
...
@@ -773,6 +773,11 @@ export default {
.de-header
{
height
:
35px
!important
;
border-bottom
:
1px
solid
#E6E6E6
;
}
.blackTheme
.de-header
{
background-color
:
var
(
--SiderBG
)
!important
;
color
:
var
(
--TextActive
);
}
.showLeftPanel
{
...
...
frontend/src/views/panel/list/PanelViewShow.vue
浏览文件 @
ac86a488
...
...
@@ -62,7 +62,7 @@
</el-row>
</el-col>
<el-col
v-if=
"panelInfo.name.length===0"
style=
"height: 100%;"
>
<el-row
style=
"height: 100%; background-color: var(--MainBG);"
class=
"custom-position"
>
<el-row
style=
"height: 100%; background-color: var(--Main
Content
BG);"
class=
"custom-position"
>
{{
$t
(
'panel.select_panel_from_left'
)
}}
</el-row>
</el-col>
...
...
@@ -306,10 +306,13 @@ export default {
.panel-design-head
{
height
:
40px
;
background-color
:
white
;
background-color
:
var
(
--SiderBG
,
white
)
;
padding
:
0
10px
;
line-height
:
40px
;
}
.blackTheme
.panel-design-head
{
color
:
var
(
--TextActive
);
}
.panel-design-preview
{
width
:
100%
;
...
...
frontend/src/views/system/authority/components/LazyTree.vue
浏览文件 @
ac86a488
...
...
@@ -300,13 +300,21 @@ export default {
border
:
1px
solid
#e6e6e6
;
overflow-y
:
auto
!important
;
}
.tree-head
{
/*
.tree-head{
height: 30px;
line-height: 30px;
border-bottom: 1px solid #e6e6e6;
background-color: #f7f8fa;
font-size: 12px;
color: #3d4d66 ;
} */
.tree-head
{
height
:
30px
;
line-height
:
30px
;
border-bottom
:
1px
solid
var
(
--TableBorderColor
,
#e6e6e6
);
background-color
:
var
(
--SiderBG
,
#f7f8fa
);
font-size
:
12px
;
color
:
var
(
--TableColor
,
#3d4d66
)
;
}
.auth-span
{
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论