From e078f8984a300eb4d7c44896985d34566ba122ee Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 04 一月 2023 17:24:30 +0800
Subject: [PATCH] 2023-01-04
---
src/components/tabview/index.jsx | 5
src/index.js | 7
src/views/design/index.jsx | 2
src/components/header/index.scss | 53 ++++-
src/menu/components/table/base-table/columns/index.scss | 5
src/views/design/index.scss | 18 -
src/assets/css/viewstyle.scss | 333 +++++++-------------------------
src/components/sidemenu/index.scss | 50 ++++
src/views/main/index.jsx | 2
src/tabviews/custom/components/share/normalTable/index.scss | 7
src/views/main/index.scss | 5
src/tabviews/custom/components/table/edit-table/normalTable/index.scss | 7
src/views/design/sidemenu/index.scss | 2
src/views/systemfunc/index.scss | 6
src/views/systemfunc/index.jsx | 5
src/menu/components/table/edit-table/columns/index.scss | 6
src/views/login/index.scss | 30 ++
src/menu/components/table/normal-table/columns/index.scss | 6
src/assets/css/main.scss | 11
19 files changed, 221 insertions(+), 339 deletions(-)
diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss
index 83fea01..630b514 100644
--- a/src/assets/css/main.scss
+++ b/src/assets/css/main.scss
@@ -36,11 +36,9 @@
/*鑳屾櫙鑹�*/
html, body {
+ --mk-sys-color: #1890ff;
width: 100%;
font-size: 14px;
- // .ant-table, .ant-dropdown {
- // color: rgba(0, 0, 0, 0.85);
- // }
}
#root {
height: 100%;
@@ -484,3 +482,10 @@
vertical-align: bottom;
}
}
+
+// 绯荤粺鑹茶缃�
+.mk-main-view {
+ display: flex;
+ flex: auto;
+ min-height: 100%;
+}
\ No newline at end of file
diff --git a/src/assets/css/viewstyle.scss b/src/assets/css/viewstyle.scss
index 76d8305..e3460e3 100644
--- a/src/assets/css/viewstyle.scss
+++ b/src/assets/css/viewstyle.scss
@@ -1,6 +1,3 @@
-// bg1 涓昏儗鏅壊
-// bg2 娆¤儗鏅壊
-// font1 涓诲瓧浣撻鑹�
// color1 1闃惰壊 - 搴曡壊
// color2 2闃惰壊
// color3 3闃惰壊
@@ -11,142 +8,8 @@
// color8 8闃惰壊
// color9 9闃惰壊
// color10 10闃惰壊
-@mixin viewstyle($bg1, $bg2, $font1, $font2, $color1, $color2, $color3, $color4, $color5, $color6, $color7) {
- .login-container {
- background-color: $bg1;
- .logo {
- border-color: $color6;
- .plat-name {
- color: $font1;
- }
- }
- .login-middle {
- border-color: $color6;
- .login-form-button {
- background-color: $color6;
- border-color: $color6;
- }
- .login-form-button[disabled] {
- background-color: $color5;
- border-color: $color5;
- }
- button.vercode {
- color: $color6;
- }
- .login-way-wrap {
- .login-way.active, .login-way:hover {
- color: $color6;
- }
- }
- .anticon-eye {
- color: $color6;
- }
- }
- .login-bottom {
- color: $font1;
- a {
- color: $font1;
- }
- }
- }
-
- .menu-board {
- .menu-wrap {
- .title {
- color: $color6;
- }
- .menu-detail {
- div:hover {
- color: $color5;
- }
- }
- }
- }
-
+@mixin viewstyle($color1, $color2, $color3, $color4, $color5, $color6, $color7) {
#root > .mk-main-view {
- > .header-container {
- background: $bg1;
- color: $font1;
- box-shadow: 0 1px 1px #d9d9d9;
-
- .header-setting span {
- color: $font1;
- }
- > .header-collapse .anticon {
- color: $font1;
- }
- > .header-menu {
- li {
- span {
- color: $font1;
- }
-
- &:hover {
- span {
- color: $color6;
- border-bottom: 4px solid $color6;
- }
- }
- &.active {
- span {
- color: $color6;
- border-bottom: 4px solid $color6;
- }
- }
- }
- }
- }
- > .mk-side-menu {
- border-right: 1px solid #d9d9d9;
- background: $bg1;
- > .ant-menu {
- background: $bg1;
- > .ant-menu-submenu {
- color: $font1;
- background: transparent;
- > .ant-menu-submenu-title {
- &:hover {
- color: $font1;
- }
- > .ant-menu-submenu-arrow:before {
- background: $font1;
- }
- > .ant-menu-submenu-arrow:after {
- background: $font1;
- }
- }
- > .ant-menu-sub {
- background: transparent;
- box-shadow: none;
- .ant-menu-item {
- a {
- color: $font2;
- }
- }
- }
- }
- > .ant-menu-submenu.ant-menu-submenu-open {
- > .ant-menu-submenu-title {
- background: $bg2;
- }
- }
- }
- }
- > .mk-side-menu:not(.edit) {
- > .ant-menu {
- > .ant-menu-submenu {
- > .ant-menu-sub {
- .ant-menu-item.ant-menu-item-active, .ant-menu-item.ant-menu-item-selected {
- background: $color5;
- color: #ffffff;
- a {
- color: #ffffff;
- }
- }
- }
- }
- }
- }
>.mk-tabview-wrap {
>.content-header {
>.ant-tabs {
@@ -493,6 +356,11 @@
}
}
}
+ .ant-spin {
+ .ant-spin-dot-item {
+ background-color: $color6;
+ }
+ }
}
body.hidden-split-line #root { // 鍘婚櫎鐧诲綍椤靛垎鍓茬嚎
@@ -506,152 +374,99 @@
}
}
-@mixin bgblack() {
- #root > .mk-main-view {
- > .header-container {
- box-shadow: none;
- > .header-menu {
- li {
- &:hover, &.active {
- span {
- color: #ffffff;
- }
- }
- }
- }
- .header-menu::-webkit-scrollbar-track {
- box-shadow: inset 0 0 5px rgba(255, 255, 255, 0.05);
- border: 1px solid rgba(255, 255, 255, 0.07);
- background: rgba(255, 255, 255, 255);
- border-radius: 3px;
- }
- }
- }
+// 鐨偆鑳屾櫙涓庡瓧浣撻鑹�
+body[class*='-black'] {
+ --mk-sys-background: #000000;
+ --mk-sys-light-background: #434343;
+ --mk-sys-font-color: rgba(255, 255, 255, 0.85);
+ --mk-sys-light-font-color: rgba(255, 255, 255, 0.65);
+}
+body[class*='-white'] {
+ --mk-sys-background: #ffffff;
+ --mk-sys-light-background: #ffffff;
+ --mk-sys-font-color: rgba(0, 0, 0, 0.85);
+ --mk-sys-light-font-color: rgba(0, 0, 0, 0.65);
+}
+body[class*='mk-blue-'] {
+ --mk-sys-color: #1890ff;
+ --mk-sys-color5: #40a9ff;
+ @include viewstyle(#e6f7ff, #bae7ff, #91d5ff, #69c0ff, #40a9ff, #1890ff, #096dd9);
}
-body.mk-blue-black {
- --mk-sys-color: #1890ff;
- @include viewstyle(#000000, #434343,rgba(255, 255, 255, 0.85), rgba(255, 255, 255, 0.65), #e6f7ff, #bae7ff, #91d5ff, #69c0ff, #40a9ff, #1890ff, #096dd9);
- @include bgblack();
-}
-body.mk-blue-white {
- --mk-sys-color: #1890ff;
- @include viewstyle(#ffffff, #ffffff, rgba(0, 0, 0, 0.85), rgba(0, 0, 0, 0.65), #e6f7ff, #bae7ff, #91d5ff, #69c0ff, #40a9ff, #1890ff, #096dd9);
-}
-body.mk-red-black {
+body[class*='mk-red-'] {
--mk-sys-color: #f5222d;
- @include viewstyle(#000000, #434343,rgba(255, 255, 255, 0.85), rgba(255, 255, 255, 0.65), #fff1f0, #ffccc7, #ffa39e, #ff7875, #ff4d4f, #f5222d, #cf1322);
- @include bgblack();
+ --mk-sys-color5: #ff4d4f;
+ @include viewstyle(#fff1f0, #ffccc7, #ffa39e, #ff7875, #ff4d4f, #f5222d, #cf1322);
}
-body.mk-red-white {
- --mk-sys-color: #f5222d;
- @include viewstyle(#ffffff, #ffffff, rgba(0, 0, 0, 0.85), rgba(0, 0, 0, 0.65), #fff1f0, #ffccc7, #ffa39e, #ff7875, #ff4d4f, #f5222d, #cf1322);
-}
-body.mk-orange-red-black {
+
+body[class*='mk-orange-red-'] {
--mk-sys-color: #fa541c;
- @include viewstyle(#000000, #434343,rgba(255, 255, 255, 0.85), rgba(255, 255, 255, 0.65), #fff2e8, #ffd8bf, #ffbb96, #ff9c6e, #ff7a45, #fa541c, #d4380d);
- @include bgblack();
+ --mk-sys-color5: #ff7a45;
+ @include viewstyle(#fff2e8, #ffd8bf, #ffbb96, #ff9c6e, #ff7a45, #fa541c, #d4380d);
}
-body.mk-orange-red-white {
- --mk-sys-color: #fa541c;
- @include viewstyle(#ffffff, #ffffff, rgba(0, 0, 0, 0.85), rgba(0, 0, 0, 0.65), #fff2e8, #ffd8bf, #ffbb96, #ff9c6e, #ff7a45, #fa541c, #d4380d);
-}
-body.mk-orange-black {
+
+body[class*='mk-orange-'] {
--mk-sys-color: #fa8c16;
- @include viewstyle(#000000, #434343,rgba(255, 255, 255, 0.85), rgba(255, 255, 255, 0.65), #fff7e6, #ffe7ba, #ffd591, #ffc069, #ffa940, #fa8c16, #d46b08);
- @include bgblack();
+ --mk-sys-color5: #ffa940;
+ @include viewstyle(#fff7e6, #ffe7ba, #ffd591, #ffc069, #ffa940, #fa8c16, #d46b08);
}
-body.mk-orange-white {
- --mk-sys-color: #fa8c16;
- @include viewstyle(#ffffff, #ffffff, rgba(0, 0, 0, 0.85), rgba(0, 0, 0, 0.65), #fff7e6, #ffe7ba, #ffd591, #ffc069, #ffa940, #fa8c16, #d46b08);
-}
-body.mk-orange-yellow-black {
+
+body[class*='mk-orange-yellow-'] {
--mk-sys-color: #faad14;
- @include viewstyle(#000000, #434343,rgba(255, 255, 255, 0.85), rgba(255, 255, 255, 0.65),#fffbe6, #fff1b8, #ffe58f, #ffd666, #ffc53d, #faad14, #d48806);
- @include bgblack();
+ --mk-sys-color5: #ffc53d;
+ @include viewstyle(#fffbe6, #fff1b8, #ffe58f, #ffd666, #ffc53d, #faad14, #d48806);
}
-body.mk-orange-yellow-white {
- --mk-sys-color: #faad14;
- @include viewstyle(#ffffff, #ffffff, rgba(0, 0, 0, 0.85), rgba(0, 0, 0, 0.65), #fffbe6, #fff1b8, #ffe58f, #ffd666, #ffc53d, #faad14, #d48806);
-}
-body.mk-yellow-black {
+
+body[class*='mk-yellow-'] {
--mk-sys-color: #fadb14;
- @include viewstyle(#000000, #434343,rgba(255, 255, 255, 0.85), rgba(255, 255, 255, 0.65),#feffe6, #ffffb8, #fffb8f, #fff566, #ffec3d, #fadb14, #d4b106);
- @include bgblack();
+ --mk-sys-color5: #ffec3d;
+ @include viewstyle(#feffe6, #ffffb8, #fffb8f, #fff566, #ffec3d, #fadb14, #d4b106);
}
-body.mk-yellow-white {
- --mk-sys-color: #fadb14;
- @include viewstyle(#ffffff, #ffffff, rgba(0, 0, 0, 0.85), rgba(0, 0, 0, 0.65), #feffe6, #ffffb8, #fffb8f, #fff566, #ffec3d, #fadb14, #d4b106);
-}
-body.mk-yellow-green-black {
+
+body[class*='mk-yellow-green-'] {
--mk-sys-color: #a0d911;
- @include viewstyle(#000000, #434343,rgba(255, 255, 255, 0.85), rgba(255, 255, 255, 0.65),#fcffe6, #f4ffb8, #eaff8f, #d3f261, #bae637, #a0d911, #7cb305);
- @include bgblack();
+ --mk-sys-color5: #bae637;
+ @include viewstyle(#fcffe6, #f4ffb8, #eaff8f, #d3f261, #bae637, #a0d911, #7cb305);
}
-body.mk-yellow-green-white {
- --mk-sys-color: #a0d911;
- @include viewstyle(#ffffff, #ffffff, rgba(0, 0, 0, 0.85), rgba(0, 0, 0, 0.65), #fcffe6, #f4ffb8, #eaff8f, #d3f261, #bae637, #a0d911, #7cb305);
-}
-body.mk-green-black {
+
+body[class*='mk-green-'] {
--mk-sys-color: #52c41a;
- @include viewstyle(#000000, #434343,rgba(255, 255, 255, 0.85), rgba(255, 255, 255, 0.65),#f6ffed, #d9f7be, #b7eb8f, #95de64, #73d13d, #52c41a, #389e0d);
- @include bgblack();
+ --mk-sys-color5: #73d13d;
+ @include viewstyle(#f6ffed, #d9f7be, #b7eb8f, #95de64, #73d13d, #52c41a, #389e0d);
}
-body.mk-green-white {
- --mk-sys-color: #52c41a;
- @include viewstyle(#ffffff, #ffffff, rgba(0, 0, 0, 0.85), rgba(0, 0, 0, 0.65), #f6ffed, #d9f7be, #b7eb8f, #95de64, #73d13d, #52c41a, #389e0d);
-}
-body.mk-cyan-black {
+
+body[class*='mk-cyan-'] {
--mk-sys-color: #13c2c2;
- @include viewstyle(#000000, #434343,rgba(255, 255, 255, 0.85), rgba(255, 255, 255, 0.65),#e6fffb, #b5f5ec, #87e8de, #5cdbd3, #36cfc9, #13c2c2, #08979c);
- @include bgblack();
+ --mk-sys-color5: #36cfc9;
+ @include viewstyle(#e6fffb, #b5f5ec, #87e8de, #5cdbd3, #36cfc9, #13c2c2, #08979c);
}
-body.mk-cyan-white {
- --mk-sys-color: #13c2c2;
- @include viewstyle(#ffffff, #ffffff, rgba(0, 0, 0, 0.85), rgba(0, 0, 0, 0.65), #e6fffb, #b5f5ec, #87e8de, #5cdbd3, #36cfc9, #13c2c2, #08979c);
-}
-body.mk-blue-purple-black {
+
+body[class*='mk-blue-purple-'] {
--mk-sys-color: #2f54eb;
- @include viewstyle(#000000, #434343,rgba(255, 255, 255, 0.85), rgba(255, 255, 255, 0.65),#f0f5ff, #d6e4ff, #adc6ff, #85a5ff, #597ef7, #2f54eb, #1d39c4);
- @include bgblack();
+ --mk-sys-color5: #597ef7;
+ @include viewstyle(#f0f5ff, #d6e4ff, #adc6ff, #85a5ff, #597ef7, #2f54eb, #1d39c4);
}
-body.mk-blue-purple-white {
- --mk-sys-color: #2f54eb;
- @include viewstyle(#ffffff, #ffffff, rgba(0, 0, 0, 0.85), rgba(0, 0, 0, 0.65), #f0f5ff, #d6e4ff, #adc6ff, #85a5ff, #597ef7, #2f54eb, #1d39c4);
-}
-body.mk-purple-black {
+
+body[class*='mk-purple-'] {
--mk-sys-color: #722ed1;
- @include viewstyle(#000000, #434343,rgba(255, 255, 255, 0.85), rgba(255, 255, 255, 0.65),#f9f0ff, #efdbff, #d3adf7, #b37feb, #9254de, #722ed1, #531dab);
- @include bgblack();
+ --mk-sys-color5: #9254de;
+ @include viewstyle(#f9f0ff, #efdbff, #d3adf7, #b37feb, #9254de, #722ed1, #531dab);
}
-body.mk-purple-white {
- --mk-sys-color: #722ed1;
- @include viewstyle(#ffffff, #ffffff, rgba(0, 0, 0, 0.85), rgba(0, 0, 0, 0.65), #f9f0ff, #efdbff, #d3adf7, #b37feb, #9254de, #722ed1, #531dab);
-}
-body.mk-magenta-black {
+
+body[class*='mk-magenta-'] {
--mk-sys-color: #eb2f96;
- @include viewstyle(#000000, #434343,rgba(255, 255, 255, 0.85), rgba(255, 255, 255, 0.65),#fff0f6, #ffd6e7, #ffadd2, #ff85c0, #f759ab, #eb2f96, #c41d7f);
- @include bgblack();
+ --mk-sys-color5: #f759ab;
+ @include viewstyle(#fff0f6, #ffd6e7, #ffadd2, #ff85c0, #f759ab, #eb2f96, #c41d7f);
}
-body.mk-magenta-white {
- --mk-sys-color: #eb2f96;
- @include viewstyle(#ffffff, #ffffff, rgba(0, 0, 0, 0.85), rgba(0, 0, 0, 0.65), #fff0f6, #ffd6e7, #ffadd2, #ff85c0, #f759ab, #eb2f96, #c41d7f);
-}
-body.mk-grass-green-black {
+
+body[class*='mk-grass-green-'] {
--mk-sys-color: #aeb303;
- @include viewstyle(#000000, #434343,rgba(255, 255, 255, 0.85), rgba(255, 255, 255, 0.65),#f2efda, #e6de97, #d9d26c, #ccc845, #bfbf22, #aeb303, #838c00);
- @include bgblack();
+ --mk-sys-color5: #bfbf22;
+ @include viewstyle(#f2efda, #e6de97, #d9d26c, #ccc845, #bfbf22, #aeb303, #838c00);
}
-body.mk-grass-green-white {
- --mk-sys-color: #aeb303;
- @include viewstyle(#ffffff, #ffffff, rgba(0, 0, 0, 0.85), rgba(0, 0, 0, 0.65), #f2efda, #e6de97, #d9d26c, #ccc845, #bfbf22, #aeb303, #838c00);
-}
-body.mk-deep-red-black {
+
+body[class*='mk-deep-red-'] {
--mk-sys-color: #c32539;
- @include viewstyle(#000000, #434343,rgba(255, 255, 255, 0.85), rgba(255, 255, 255, 0.65),#fff0f0, #f5cbcb, #e89b9e, #db7077, #cf4856, #c32539, #9c162c);
- @include bgblack();
-}
-body.mk-deep-red-white {
- --mk-sys-color: #c32539;
- @include viewstyle(#ffffff, #ffffff, rgba(0, 0, 0, 0.85), rgba(0, 0, 0, 0.65), #fff0f0, #f5cbcb, #e89b9e, #db7077, #cf4856, #c32539, #9c162c);
+ --mk-sys-color5: #cf4856;
+ @include viewstyle(#fff0f0, #f5cbcb, #e89b9e, #db7077, #cf4856, #c32539, #9c162c);
}
diff --git a/src/components/header/index.scss b/src/components/header/index.scss
index 0c8a8d0..913208f 100644
--- a/src/components/header/index.scss
+++ b/src/components/header/index.scss
@@ -7,6 +7,8 @@
width: 100%;
height: 48px;
display: flex;
+ background: var(--mk-sys-background);
+ color: var(--mk-sys-font-color);
.header-logo {
width: 180px;
@@ -39,7 +41,7 @@
position: relative;
top: 3px;
font-size: 20px;
- color: #ffffff;
+ color: var(--mk-sys-font-color);
}
}
.header-collapse.collapse {
@@ -62,18 +64,21 @@
padding: 0 10px;
height: 42px;
display: inline-block;
+ color: var(--mk-sys-font-color);
}
&:hover {
color: #eeeeee;
span {
- border-bottom: 4px solid #fafcfb;
+ color: var(--mk-sys-color);
+ border-bottom: 4px solid var(--mk-sys-color);
}
}
&.active {
color: #ffffff;
span {
- border-bottom: 4px solid #1890ff;
+ color: var(--mk-sys-color);
+ border-bottom: 4px solid var(--mk-sys-color);
}
}
}
@@ -95,9 +100,9 @@
border-radius: 5px;
}
.header-menu::-webkit-scrollbar-track {
- box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.05);
- border: 1px solid rgba(0, 0, 0, 0.07);
- background: rgba(0, 0, 0, 0);
+ box-shadow: inset 0 0 5px rgba(255, 255, 255, 0.05);
+ border: 1px solid rgba(255, 255, 255, 0.07);
+ background: rgba(255, 255, 255, 255);
border-radius: 3px;
}
@@ -111,7 +116,7 @@
margin-right: 7px;
}
span {
- color: #ffffff;
+ color: var(--mk-sys-font-color);
font-size: 0.95rem;
.username {
vertical-align: middle;
@@ -216,7 +221,7 @@
// left: 11.8%;
.menu-wrap {
.title {
- color: #1890ff;
+ color: var(--mk-sys-color);
font-size: 15px;
font-weight: 600;
}
@@ -224,18 +229,14 @@
max-width: 60vw;
padding: 5px 0 5px 15px;
div {
- // float: left;
display: inline-block;
vertical-align: top;
margin-bottom: 8px;
width: 120px;
- // overflow: hidden;
- // white-space: nowrap;
- // text-overflow: ellipsis;
cursor: pointer;
}
div:hover {
- color: #40a9ff;
+ color: var(--mk-sys-color5);
}
div:not(:last-child) {
margin-right: 15px;
@@ -247,4 +248,30 @@
clear: both;
}
}
+}
+
+body[class*='-white'] {
+ .header-container {
+ box-shadow: 0 1px 1px #d9d9d9;
+
+ .header-menu::-webkit-scrollbar-track {
+ box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.05);
+ border: 1px solid rgba(0, 0, 0, 0.07);
+ background: rgba(0, 0, 0, 0);
+ border-radius: 3px;
+ }
+ }
+}
+body[class*='-black'] {
+ .header-container {
+ .header-menu {
+ li {
+ &:hover, &.active {
+ span {
+ color: #ffffff;
+ }
+ }
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/src/components/sidemenu/index.scss b/src/components/sidemenu/index.scss
index c9b71c5..b92ca04 100644
--- a/src/components/sidemenu/index.scss
+++ b/src/components/sidemenu/index.scss
@@ -1,10 +1,12 @@
-@import '../../assets/css/iconfont.css';
+// @import '../../assets/css/iconfont.css';
.mk-side-menu {
flex: 0 0 235px;
width: 235px;
padding: 48px 0 40px;
transition: width 0.2s, flex 0.2s;
+ border-right: 1px solid #d9d9d9;
+ background: var(--mk-sys-background);
.ant-menu-item {
padding-left: 0!important;
cursor: default;
@@ -29,12 +31,6 @@
.edit-check {
top: -5px;
}
- }
- .ant-menu-sub.ant-menu-inline > .ant-menu-item.ant-menu-item-active {
- background: #06b4f7;
- }
- .ant-menu-sub.ant-menu-inline > .ant-menu-item.ant-menu-item-selected {
- background: #06b4f7;
}
.ant-menu-inline .ant-menu-item {
font-size: 1.1rem;
@@ -92,6 +88,46 @@
width: 48px;
left: 187px;
}
+
+ > .ant-menu {
+ background: var(--mk-sys-background);
+ > .ant-menu-submenu {
+ color: var(--mk-sys-font-color);
+ background: transparent;
+ > .ant-menu-submenu-title {
+ &:hover {
+ color: var(--mk-sys-font-color);
+ }
+ > .ant-menu-submenu-arrow:before {
+ background: var(--mk-sys-font-color);
+ }
+ > .ant-menu-submenu-arrow:after {
+ background: var(--mk-sys-font-color);
+ }
+ }
+ > .ant-menu-sub {
+ background: transparent;
+ box-shadow: none;
+ .ant-menu-item {
+ a {
+ color: var(--mk-sys-light-font-color);
+ }
+ }
+ .ant-menu-item.ant-menu-item-active, .ant-menu-item.ant-menu-item-selected {
+ background: var(--mk-sys-color5);
+ color: #ffffff;
+ a {
+ color: #ffffff;
+ }
+ }
+ }
+ }
+ > .ant-menu-submenu.ant-menu-submenu-open {
+ > .ant-menu-submenu-title {
+ background: var(--mk-sys-light-background);
+ }
+ }
+ }
}
// .mk-side-menu.mk-iframe { // tab椤典腑涓篿frame鏃�
diff --git a/src/components/tabview/index.jsx b/src/components/tabview/index.jsx
index 2d23bc8..d6f95ae 100644
--- a/src/components/tabview/index.jsx
+++ b/src/components/tabview/index.jsx
@@ -264,11 +264,11 @@
const { tabviews, activeId } = this.state
return (
- <section id="mk-tabview-wrap" className={'mk-tabview-wrap' + (this.props.collapse ? ' collapsed' : '') + (tabviews && tabviews.length > 0 ? ' hastab' : '')}>
+ <section className={'mk-tabview-wrap' + (this.props.collapse ? ' collapsed' : '')}>
<div className="content-header">
{tabviews && tabviews.length > 0 &&
<Tabs activeKey={activeId}>
- {tabviews.map((view, index) => {
+ {tabviews.map(view => {
return (
<Tabs.TabPane
tab={
@@ -292,7 +292,6 @@
</div>
</div>
</BackTop>
- {/* {options.sysType === 'local' && window.GLOB.systemType !== 'production' ? <div className="mk-water-mark">娴嬭瘯绯荤粺</div> : null} */}
</Tabs.TabPane>
)
})}
diff --git a/src/index.js b/src/index.js
index c2afd0c..7d8a887 100644
--- a/src/index.js
+++ b/src/index.js
@@ -8,7 +8,7 @@
import options, { styles } from '@/store/options.js'
import '@/assets/css/main.scss'
import '@/assets/css/action.scss'
-import '@/assets/css/minkeicon.css'
+// import '@/assets/css/minkeicon.css'
import '@/assets/css/viewstyle.scss'
if (window.location.href.indexOf('#/design') > -1) { // 缂栬緫椤甸潰鍒锋柊鏃讹紝璺宠浆鑷充富椤�
@@ -156,6 +156,7 @@
let _systemMsg = localStorage.getItem(_href + 'system')
GLOB.navBar = 'shutter' // 榛樿涓虹櫨鍙剁獥
+ let className = 'mk-blue-black'
if (_systemMsg) {
try {
@@ -184,13 +185,15 @@
document.getElementsByTagName('head')[0].appendChild(link)
}
if (GLOB.style && styles[GLOB.style]) {
- document.body.className = styles[GLOB.style] + ' ' + (GLOB.showline === 'false' ? 'hidden-split-line' : '')
+ className = styles[GLOB.style] + ' ' + (GLOB.showline === 'false' ? 'hidden-split-line' : '')
}
} catch (e) {
console.warn('Parse Failure')
}
}
+ document.body.className = className
+
if (/^https/.test(window.location.protocol)) { // https杞崲
let meta = document.createElement('meta')
meta.content = 'upgrade-insecure-requests'
diff --git a/src/menu/components/table/base-table/columns/index.scss b/src/menu/components/table/base-table/columns/index.scss
index 8f8cf70..46cb41d 100644
--- a/src/menu/components/table/base-table/columns/index.scss
+++ b/src/menu/components/table/base-table/columns/index.scss
@@ -105,16 +105,17 @@
}
table tr {
th .ant-table-column-title {
- // color: var(--mk-table-color)!important;
font-size: var(--mk-table-font-size)!important;
font-weight: var(--mk-table-font-weight)!important;
}
td {
- color: var(--mk-table-color)!important;
font-size: var(--mk-table-font-size)!important;
font-weight: var(--mk-table-font-weight)!important;
}
}
+ table tbody tr {
+ color: var(--mk-table-color);
+ }
}
.normal-table-columns.false {
.ant-pagination {
diff --git a/src/menu/components/table/edit-table/columns/index.scss b/src/menu/components/table/edit-table/columns/index.scss
index 699ad86..b7e3f7b 100644
--- a/src/menu/components/table/edit-table/columns/index.scss
+++ b/src/menu/components/table/edit-table/columns/index.scss
@@ -32,6 +32,7 @@
.col-copy {
margin-bottom: 0;
display: inline-block;
+ color: inherit;
.ant-typography-copy {
position: absolute;
left: 2px;
@@ -132,16 +133,17 @@
}
table tr {
th .ant-table-column-title, th .ant-table-column-title > span {
- // color: var(--mk-table-color)!important;
font-size: var(--mk-table-font-size)!important;
font-weight: var(--mk-table-font-weight)!important;
}
td {
- color: var(--mk-table-color)!important;
font-size: var(--mk-table-font-size)!important;
font-weight: var(--mk-table-font-weight)!important;
}
}
+ table tbody tr {
+ color: var(--mk-table-color);
+ }
}
.edit-table-columns.false {
.ant-pagination {
diff --git a/src/menu/components/table/normal-table/columns/index.scss b/src/menu/components/table/normal-table/columns/index.scss
index 7c8baaa..5de869d 100644
--- a/src/menu/components/table/normal-table/columns/index.scss
+++ b/src/menu/components/table/normal-table/columns/index.scss
@@ -23,6 +23,7 @@
.col-copy {
margin-bottom: 0;
display: inline-block;
+ color: inherit;
.ant-typography-copy {
position: absolute;
left: 2px;
@@ -124,16 +125,17 @@
}
table tr {
th .ant-table-column-title {
- // color: var(--mk-table-color)!important;
font-size: var(--mk-table-font-size)!important;
font-weight: var(--mk-table-font-weight)!important;
}
td {
- color: var(--mk-table-color)!important;
font-size: var(--mk-table-font-size)!important;
font-weight: var(--mk-table-font-weight)!important;
}
}
+ table tbody tr {
+ color: var(--mk-table-color);
+ }
}
.normal-table-columns.false {
.ant-pagination {
diff --git a/src/tabviews/custom/components/share/normalTable/index.scss b/src/tabviews/custom/components/share/normalTable/index.scss
index bcd3880..e27e134 100644
--- a/src/tabviews/custom/components/share/normalTable/index.scss
+++ b/src/tabviews/custom/components/share/normalTable/index.scss
@@ -94,7 +94,7 @@
// vertical-align: top;
.card-cell-list {
- color: var(--mk-table-color);
+ color: inherit;
}
.ant-mk-picture {
position: relative;
@@ -204,12 +204,10 @@
}
table tr {
th .ant-table-column-title {
- // color: var(--mk-table-color)!important;
font-size: var(--mk-table-font-size)!important;
font-weight: var(--mk-table-font-weight)!important;
}
td {
- color: var(--mk-table-color)!important;
font-size: var(--mk-table-font-size)!important;
font-weight: var(--mk-table-font-weight)!important;
@@ -218,6 +216,9 @@
}
}
}
+ table tbody tr {
+ color: var(--mk-table-color);
+ }
}
.normal-custom-table:not(.fixed-height) {
.ant-table-body::-webkit-scrollbar {
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
index 971228d..25f0089 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
@@ -72,7 +72,7 @@
// vertical-align: top;
.card-cell-list {
- color: rgba(0, 0, 0, 0.85);
+ color: inherit;
}
.action-col {
.ant-btn > .anticon + span {
@@ -292,12 +292,10 @@
}
table tr {
th .ant-table-column-title, th .ant-table-column-title span:not(.anticon) {
- // color: var(--mk-table-color)!important;
font-size: var(--mk-table-font-size)!important;
font-weight: var(--mk-table-font-weight)!important;
}
td {
- color: var(--mk-table-color)!important;
font-size: var(--mk-table-font-size)!important;
font-weight: var(--mk-table-font-weight)!important;
@@ -306,6 +304,9 @@
}
}
}
+ table tbody tr {
+ color: var(--mk-table-color);
+ }
}
.edit-custom-table.buoyMode {
.ant-table-scroll {
diff --git a/src/views/design/index.jsx b/src/views/design/index.jsx
index 0c565d0..9c1ea4c 100644
--- a/src/views/design/index.jsx
+++ b/src/views/design/index.jsx
@@ -23,7 +23,7 @@
render () {
return (
- <div className="mk-main-view mk-design-view">
+ <div className="mk-main-view">
<ConfigProvider locale={_locale}>
<Sidemenu key="sidemenu"/>
<Header key="header"/>
diff --git a/src/views/design/index.scss b/src/views/design/index.scss
index 037cdcb..2dd743a 100644
--- a/src/views/design/index.scss
+++ b/src/views/design/index.scss
@@ -1,24 +1,6 @@
.mk-main-view {
- display: flex;
- flex: auto;
- min-height: 100%;
-
.mk-save-menu[disabled] {
background: #ffffff!important;
- }
-}
-.mk-design-view {
- #mk-tabview-wrap {
- z-index: unset;
- >.content-header {
- >.ant-tabs {
- z-index: 21;
- background: #ffffff;
- }
- }
- }
- #mk-tabview-wrap.hastab + .sys-header-container .app-prod-entrance {
- display: none;
}
}
.mk-popover-control-wrap {
diff --git a/src/views/design/sidemenu/index.scss b/src/views/design/sidemenu/index.scss
index 22cc2fa..bc55c66 100644
--- a/src/views/design/sidemenu/index.scss
+++ b/src/views/design/sidemenu/index.scss
@@ -1,4 +1,4 @@
-@import '../../../assets/css/iconfont.css';
+// @import '../../../assets/css/iconfont.css';
.mk-sys-side-menu {
flex: 0 0 235px;
diff --git a/src/views/login/index.scss b/src/views/login/index.scss
index 608a846..5447f5a 100644
--- a/src/views/login/index.scss
+++ b/src/views/login/index.scss
@@ -1,7 +1,7 @@
.login-container {
height: 100vh;
min-height: 600px;
- background-color: #000000;
+ background-color: var(--mk-sys-background);
background-size: cover;
background-repeat: no-repeat;
background-position: center center;
@@ -10,13 +10,13 @@
height: 100px;
padding-top: 30px;
line-height: 80px;
- border-bottom: 2px solid #1890ff;
+ border-bottom: 2px solid var(--mk-sys-color);
img {
max-height: 100%;
}
.plat-name {
position: absolute;
- color: #ffffff;
+ color: var(--mk-sys-font-color);
line-height: 30px;
font-size: 30px;
font-weight: 600;
@@ -32,7 +32,22 @@
min-height: 420px;
background-size: cover;
background-position: center center;
- border-bottom: 2px solid #1890ff;
+ border-bottom: 2px solid var(--mk-sys-color);
+
+ .login-form-button {
+ background-color: var(--mk-sys-color);
+ border-color: var(--mk-sys-color);
+ }
+ .login-form-button[disabled] {
+ background-color: var(--mk-sys-color5);
+ border-color: var(--mk-sys-color5);
+ }
+
+ .login-way-wrap {
+ .login-way.active, .login-way:hover {
+ color: var(--mk-sys-color);
+ }
+ }
.login-form {
position: relative;
@@ -167,6 +182,7 @@
}
button.vercode {
border: 0;
+ color: var(--mk-sys-color);
}
button:not(.vercode) {
width: 100%;
@@ -198,7 +214,7 @@
font-size: 18px;
}
.anticon-eye {
- color: #1890ff;
+ color: var(--mk-sys-color);
}
}
.login-sync-button {
@@ -209,7 +225,7 @@
}
.login-bottom {
text-align: center;
- color: #ffffff;
+ color: var(--mk-sys-font-color);
padding-top: 20px;
p span.split {
margin-right: 15px;
@@ -217,7 +233,7 @@
a {
display: inline-block;
margin-bottom: 5px;
- color: #ffffff;
+ color: var(--mk-sys-font-color);
}
}
.ant-btn-primary[disabled] {
diff --git a/src/views/main/index.jsx b/src/views/main/index.jsx
index 5626c5c..8dd7821 100644
--- a/src/views/main/index.jsx
+++ b/src/views/main/index.jsx
@@ -10,7 +10,7 @@
import QueryLog from '@/components/querylog'
import ImgScale from '@/components/imgScale'
-import './index.scss'
+// import './index.scss'
const Tabview = asyncComponent(() => import('@/components/tabview'))
const Breadview = asyncComponent(() => import('@/components/breadview'))
diff --git a/src/views/main/index.scss b/src/views/main/index.scss
index c14dc8e..e69de29 100644
--- a/src/views/main/index.scss
+++ b/src/views/main/index.scss
@@ -1,5 +0,0 @@
-.mk-main-view {
- display: flex;
- flex: auto;
- min-height: 100%;
-}
\ No newline at end of file
diff --git a/src/views/systemfunc/index.jsx b/src/views/systemfunc/index.jsx
index 26ae9c0..c0ef10e 100644
--- a/src/views/systemfunc/index.jsx
+++ b/src/views/systemfunc/index.jsx
@@ -6,12 +6,13 @@
import Header from './header'
import Sidemenu from './sidemenu'
-import './index.scss'
+// import './index.scss'
const Tabview = asyncComponent(() => import('@/components/tabview'))
class Design extends Component {
UNSAFE_componentWillMount() {
+ document.body.className = 'mk-blue-black'
sessionStorage.setItem('isEditState', 'true')
window.GLOB.mkHS = true
@@ -27,7 +28,7 @@
render () {
return (
- <div className="mk-hs-view">
+ <div className="mk-main-view">
<ConfigProvider locale={zhCN}>
<Sidemenu key="sidemenu"/>
<Tabview key="tabview"/>
diff --git a/src/views/systemfunc/index.scss b/src/views/systemfunc/index.scss
index 8f5e059..8b13789 100644
--- a/src/views/systemfunc/index.scss
+++ b/src/views/systemfunc/index.scss
@@ -1,5 +1 @@
-.mk-hs-view {
- display: flex;
- flex: auto;
- min-height: 100%;
-}
+
--
Gitblit v1.8.0