From 717c264518352f66f29a542e339b1aa28a6bc26f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
<188633308@qq.com>
Date: Fri, 2 Jul 2021 14:11:48 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=A4=84=E7=90=86=E4=B8=80=E4=BA=9B?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web-react/craco.config.js | 4 +-
web-react/src/assets/style/dark/lib/card.less | 10 ++++
.../src/assets/style/dark/lib/table.less | 45 +++++++++++------
web-react/src/assets/style/dark/public.less | 2 +-
.../src/assets/style/default/lib/table.less | 45 +++++++++++------
web-react/src/index.js | 48 ++++++++++---------
.../src/pages/system/dict/dictdata/form.jsx | 8 +++-
7 files changed, 106 insertions(+), 56 deletions(-)
diff --git a/web-react/craco.config.js b/web-react/craco.config.js
index 0b2c146..e240718 100644
--- a/web-react/craco.config.js
+++ b/web-react/craco.config.js
@@ -29,7 +29,7 @@ module.exports = {
],
webpack: {
plugins: [
- //new MonacoWebpackPlugin()
+ new MonacoWebpackPlugin()
]
- }
+ },
}
\ No newline at end of file
diff --git a/web-react/src/assets/style/dark/lib/card.less b/web-react/src/assets/style/dark/lib/card.less
index 7ae210e..6fdc1e2 100644
--- a/web-react/src/assets/style/dark/lib/card.less
+++ b/web-react/src/assets/style/dark/lib/card.less
@@ -2,3 +2,13 @@
.ant-card {
margin-bottom: @padding-md;
}
+.ant-card-grid-hoverable {
+ &:hover {
+ box-shadow: 1px 0 0 0 #303030,
+ 0 1px 0 0 #303030,
+ 1px 1px 0 0 #303030,
+ 1px 0 0 0 #303030 inset,
+ 0 1px 0 0 #303030 inset,
+ @card-shadow;
+ }
+}
diff --git a/web-react/src/assets/style/dark/lib/table.less b/web-react/src/assets/style/dark/lib/table.less
index 684a4ea..72993b8 100644
--- a/web-react/src/assets/style/dark/lib/table.less
+++ b/web-react/src/assets/style/dark/lib/table.less
@@ -75,6 +75,9 @@
.ant-table-sticky-scroll {
display: none;
}
+.ant-table-expanded-row>td {
+ border-right: @border-width-base @border-style-base @table-border-color !important;
+}
.yo-table {
.ant-table {
margin: 0 !important;
@@ -196,11 +199,13 @@
}
}
.ant-table-tbody {
- >.ant-table-expanded-row-level-1>td {
+ >.ant-table-expanded-row>td {
padding: 0;
border-right: none !important;
.ant-table-wrapper {
+ margin-bottom: -1px;
+
border: none;
.ant-table {
margin: 0 !important;
@@ -215,20 +220,17 @@
padding-left: @padding-md;
}
}
- .ant-table-expanded-row-level-1>td {
- padding: @padding-sm @padding-xs @padding-sm @padding-xl;
-
- border-right: @border-width-base @border-style-base @table-border-color !important;
- .ant-card {
- max-width: fit-content;
- margin-bottom: 0;
-
- background: none;
- .ant-card-grid {
- width: 300px;
- padding: @padding-xs @padding-sm;
-
- background-color: @card-background;
+ .ant-table-tbody {
+ >tr {
+ &:last-child {
+ >td {
+ border-bottom: @border-width-base @border-style-base @table-border-color;
+ }
+ &:hover {
+ >td {
+ border-bottom-color: lighten(@primary-color, 30%);
+ }
+ }
}
}
}
@@ -237,4 +239,17 @@
}
}
}
+ .ant-card {
+ max-width: fit-content;
+ margin: @padding-sm @padding-xs @padding-sm @padding-xl;
+
+ background: none;
+ .ant-card-grid {
+ width: 300px;
+ height: 90px;
+ padding: @padding-xs @padding-sm;
+
+ background-color: @card-background;
+ }
+ }
}
diff --git a/web-react/src/assets/style/dark/public.less b/web-react/src/assets/style/dark/public.less
index 16a4aed..ee4716d 100644
--- a/web-react/src/assets/style/dark/public.less
+++ b/web-react/src/assets/style/dark/public.less
@@ -35,7 +35,7 @@
}
}
a.link-gray {
- color: fade(@black, 50%);
+ color: fade(@white, 50%);
&:hover {
color: @link-hover-color;
}
diff --git a/web-react/src/assets/style/default/lib/table.less b/web-react/src/assets/style/default/lib/table.less
index 48fbda4..72993b8 100644
--- a/web-react/src/assets/style/default/lib/table.less
+++ b/web-react/src/assets/style/default/lib/table.less
@@ -75,6 +75,9 @@
.ant-table-sticky-scroll {
display: none;
}
+.ant-table-expanded-row>td {
+ border-right: @border-width-base @border-style-base @table-border-color !important;
+}
.yo-table {
.ant-table {
margin: 0 !important;
@@ -196,11 +199,13 @@
}
}
.ant-table-tbody {
- >.ant-table-expanded-row-level-1>td {
+ >.ant-table-expanded-row>td {
padding: 0;
border-right: none !important;
.ant-table-wrapper {
+ margin-bottom: -1px;
+
border: none;
.ant-table {
margin: 0 !important;
@@ -215,20 +220,17 @@
padding-left: @padding-md;
}
}
- .ant-table-expanded-row-level-1>td {
- padding: @padding-sm @padding-xs @padding-sm @padding-xl;
-
- border-right: @border-width-base @border-style-base @table-border-color !important;
- .ant-card {
- max-width: fit-content;
- margin-bottom: 0;
-
- background: none;
- .ant-card-grid {
- width: 300px;
- padding: @padding-xs @padding-sm;
-
- background-color: @card-background;
+ .ant-table-tbody {
+ >tr {
+ &:last-child {
+ >td {
+ border-bottom: @border-width-base @border-style-base @table-border-color;
+ }
+ &:hover {
+ >td {
+ border-bottom-color: lighten(@primary-color, 30%);
+ }
+ }
}
}
}
@@ -237,4 +239,17 @@
}
}
}
+ .ant-card {
+ max-width: fit-content;
+ margin: @padding-sm @padding-xs @padding-sm @padding-xl;
+
+ background: none;
+ .ant-card-grid {
+ width: 300px;
+ height: 90px;
+ padding: @padding-xs @padding-sm;
+
+ background-color: @card-background;
+ }
+ }
}
diff --git a/web-react/src/index.js b/web-react/src/index.js
index 3d85d46..2d346e4 100644
--- a/web-react/src/index.js
+++ b/web-react/src/index.js
@@ -14,10 +14,12 @@ const SETTING = JSON.parse(window.localStorage.getItem(SETTING_KEY)) || {
theme: 'default'
};
+let imp
+
if (SETTING.theme === 'dark') {
- import('./assets/style/dark/index.less')
+ imp = import('./assets/style/dark/index.less')
} else {
- import('./assets/style/default/index.less')
+ imp = import('./assets/style/default/index.less')
}
moment.locale('zh-cn')
@@ -27,24 +29,26 @@ moment.locale('zh-cn')
const root = document.getElementById('root')
root.style.opacity = 0
-ReactDOM.render(
- (
-
- )
- }
- >
-
- ,
- root
-);
+imp.then(() => {
+ ReactDOM.render(
+ (
+
+ )
+ }
+ >
+
+ ,
+ root
+ );
-// If you want to start measuring performance in your app, pass a function
-// to log results (for example: reportWebVitals(console.log))
-// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
-reportWebVitals();
\ No newline at end of file
+ // If you want to start measuring performance in your app, pass a function
+ // to log results (for example: reportWebVitals(console.log))
+ // or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
+ reportWebVitals();
+})
\ No newline at end of file
diff --git a/web-react/src/pages/system/dict/dictdata/form.jsx b/web-react/src/pages/system/dict/dictdata/form.jsx
index 50ce9d7..764cd99 100644
--- a/web-react/src/pages/system/dict/dictdata/form.jsx
+++ b/web-react/src/pages/system/dict/dictdata/form.jsx
@@ -3,6 +3,9 @@ import { Form, message as Message, Spin } from 'antd'
import { AntIcon } from 'components'
import { cloneDeep } from 'lodash'
import MonacoEditor from 'react-monaco-editor'
+import store from 'store'
+
+const { getState } = store
const initialValues = {}
@@ -10,6 +13,7 @@ export default class form extends Component {
state = {
// 加载状态
loading: true,
+ ...getState('layout'),
}
// 表单实例
@@ -83,6 +87,8 @@ export default class form extends Component {
//#endregion
render() {
+ const { theme } = this.state
+
return (