From 22e718423eaec80d989f0e7a50ff0d495f8ff2ce Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Fri, 21 Jan 2022 01:38:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9A=97=E9=BB=91=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/components/Flow.vue       |  6 +-
 resources/assets/js/components/OnlyOffice.vue |  4 +-
 resources/assets/js/components/TEditor.vue    |  4 +-
 resources/assets/js/pages/manage.vue          |  2 +
 .../pages/manage/components/TaskPriority.vue  | 14 ++++-
 resources/assets/js/store/state.js            |  1 +
 resources/assets/sass/dark.scss               | 55 +++++++++++++++++++
 .../sass/pages/components/project-list.scss   | 16 ++++--
 .../sass/pages/components/task-priority.scss  |  4 +-
 9 files changed, 95 insertions(+), 11 deletions(-)

diff --git a/resources/assets/js/components/Flow.vue b/resources/assets/js/components/Flow.vue
index 1b1ac2c0..06613d37 100644
--- a/resources/assets/js/components/Flow.vue
+++ b/resources/assets/js/components/Flow.vue
@@ -79,6 +79,7 @@
 </style>
 <script>
     import JSPDF from "jspdf";
+    import {mapState} from "vuex";
 
     export default {
         name: "Flow",
@@ -115,7 +116,7 @@
                     break;
             }
             let route = this.readOnly ? 'viewer' : 'index';
-            let theme = $A.dark.isDarkEnabled() ? 'dark' : 'light'
+            let theme = this.themeIsDark ? 'dark' : 'light'
             this.url = $A.originUrl('js/grapheditor/' + route + '.html?lang=' + language + '&theme=' + theme);
         },
         mounted() {
@@ -144,6 +145,9 @@
                 }, '*')
             }
         },
+        computed: {
+            ...mapState(['themeIsDark'])
+        },
         methods: {
             formatZoom(val) {
                 return val + '%';
diff --git a/resources/assets/js/components/OnlyOffice.vue b/resources/assets/js/components/OnlyOffice.vue
index 2731efe9..43e577e8 100644
--- a/resources/assets/js/components/OnlyOffice.vue
+++ b/resources/assets/js/components/OnlyOffice.vue
@@ -82,7 +82,7 @@ export default {
     },
 
     computed: {
-        ...mapState(['userToken', 'userInfo']),
+        ...mapState(['userToken', 'userInfo', 'themeIsDark']),
 
         fileType() {
             return this.getType(this.value.type);
@@ -159,7 +159,7 @@ export default {
                         "name": this.userInfo.nickname
                     },
                     "customization": {
-                        "uiTheme": $A.dark.isDarkEnabled() ? "theme-dark" : "theme-classic-light",
+                        "uiTheme": this.themeIsDark ? "theme-dark" : "theme-classic-light",
                     },
                     "callbackUrl": 'http://nginx/api/file/content/office?id=' + fileKey + '&token=' + this.userToken,
                 }
diff --git a/resources/assets/js/components/TEditor.vue b/resources/assets/js/components/TEditor.vue
index 37badff3..713c8dc2 100755
--- a/resources/assets/js/components/TEditor.vue
+++ b/resources/assets/js/components/TEditor.vue
@@ -158,7 +158,7 @@
             $A(this.$refs.myTextarea).show();
         },
         computed: {
-            ...mapState(['userToken']),
+            ...mapState(['userToken', 'themeIsDark']),
 
             headers() {
                 return {
@@ -250,7 +250,7 @@
                     resize: !isFull,
                     convert_urls:false,
                     toolbar_mode: 'sliding',
-                    content_css: $A.dark.isDarkEnabled() ? 'dark' : 'default',
+                    content_css: this.themeIsDark ? 'dark' : 'default',
                     setup: (editor) => {
                         editor.ui.registry.addMenuButton('uploadImages', {
                             text: this.$L('图片'),
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index 30c4ef52..8e9bb6f3 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -218,6 +218,7 @@ import DrawerOverlay from "../components/DrawerOverlay";
 import DragBallComponent from "../components/DragBallComponent";
 import TaskAdd from "./manage/components/TaskAdd";
 import {Store} from "le5le-store";
+import state from "../store/state";
 
 export default {
     components: {
@@ -481,6 +482,7 @@ export default {
                     break;
             }
             this.$store.state.themeMode = mode;
+            this.$store.state.themeIsDark = $A.dark.isDarkEnabled();
             $A.setStorage("cacheThemeMode", mode);
         },
 
diff --git a/resources/assets/js/pages/manage/components/TaskPriority.vue b/resources/assets/js/pages/manage/components/TaskPriority.vue
index 3ed18b2e..63734471 100644
--- a/resources/assets/js/pages/manage/components/TaskPriority.vue
+++ b/resources/assets/js/pages/manage/components/TaskPriority.vue
@@ -3,6 +3,8 @@
 </template>
 
 <script>
+import {mapState} from "vuex";
+
 export default {
     name: "TaskPriority",
     props: {
@@ -22,10 +24,20 @@ export default {
         }
     },
     computed: {
+        ...mapState(['themeIsDark']),
+
         myStyle() {
-            const {color, background, backgroundColor} = this;
+            const {color, background, backgroundColor, themeIsDark} = this;
+            if (themeIsDark) {
+                return {
+                    color: backgroundColor || background,
+                    borderColor: backgroundColor || background,
+                    backgroundColor: 'transparent',
+                }
+            }
             return {
                 color: color,
+                borderColor: backgroundColor || background,
                 backgroundColor: backgroundColor || background,
             }
         }
diff --git a/resources/assets/js/store/state.js b/resources/assets/js/store/state.js
index 96205031..78294b6f 100644
--- a/resources/assets/js/store/state.js
+++ b/resources/assets/js/store/state.js
@@ -125,5 +125,6 @@ switch (state.themeMode) {
         $A.dark.autoDarkMode()
         break;
 }
+state.themeIsDark = $A.dark.isDarkEnabled();
 
 export default state
diff --git a/resources/assets/sass/dark.scss b/resources/assets/sass/dark.scss
index 58a13cfd..78eaedaa 100644
--- a/resources/assets/sass/dark.scss
+++ b/resources/assets/sass/dark.scss
@@ -17,6 +17,11 @@ body.dark-mode-reverse {
         box-shadow: 0 4px 12px rgba(255, 255, 255, 0.15);
     }
 
+    .ivu-message-notice-content {
+        box-shadow: 0 1px 6px rgba(255, 255, 255, 0.2);
+        border: 1px solid #e3e8ed;
+    }
+
     .ivu-tooltip-inner,
     .ivu-poptip-inner {
         border: 1px solid #e3e8ed;
@@ -83,6 +88,48 @@ body.dark-mode-reverse {
                 }
             }
         }
+        .project-column {
+            > ul {
+                > li {
+                    .column-task {
+                        .task-item {
+                            .task-progress {
+                                .task-time {
+                                    &.overdue {
+                                        color: #ed4014;
+                                        background-color: transparent;
+                                    }
+                                    &.today {
+                                        color: #ff9900;
+                                        background-color: transparent;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        .project-table {
+            .project-table-body {
+                .task-row {
+                    > div {
+                        &.row-time {
+                            .task-time {
+                                &.overdue {
+                                    color: #ed4014;
+                                    background-color: transparent;
+                                }
+                                &.today {
+                                    color: #ff9900;
+                                    background-color: transparent;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }
 
     .dialog-wrapper {
@@ -109,6 +156,14 @@ body.dark-mode-reverse {
         }
     }
 
+    .page-login {
+        .login-body {
+            .login-box {
+                box-shadow: none;
+            }
+        }
+    }
+
     .page-manage {
         .manage-box-menu {
             .manage-box-dropdown {
diff --git a/resources/assets/sass/pages/components/project-list.scss b/resources/assets/sass/pages/components/project-list.scss
index 5a60a0a3..57ca10c9 100644
--- a/resources/assets/sass/pages/components/project-list.scss
+++ b/resources/assets/sass/pages/components/project-list.scss
@@ -489,21 +489,26 @@
                                 flex-shrink: 0;
                                 color: #777777;
                                 background-color: #EAEDF2;
-                                padding: 1px 4px;
+                                border: 1px solid #EAEDF2;
+                                padding: 0 3px;
                                 margin-left: 18px;
                                 font-size: 12px;
                                 border-radius: 3px;
                                 display: flex;
                                 align-items: center;
+                                &.overdue,
+                                &.today {
+                                    color: #ffffff;
+                                }
                                 &.overdue {
                                     font-weight: 600;
-                                    color: #ffffff;
                                     background-color: #ed4014;
+                                    border-color: #ed4014;
                                 }
                                 &.today {
                                     font-weight: 500;
-                                    color: #ffffff;
                                     background-color: #ff9900;
+                                    border-color: #ff9900;
                                 }
                                 .taskfont {
                                     margin-right: 3px;
@@ -813,17 +818,20 @@
                             &.overdue,
                             &.today {
                                 color: #ffffff;
-                                padding: 1px 5px;
+                                padding: 0 4px;
+                                border: 1px solid transparent;
                                 font-size: 13px;
                                 border-radius: 3px;
                             }
                             &.overdue {
                                 font-weight: 600;
                                 background-color: #ed4014;
+                                border-color: #ed4014;
                             }
                             &.today {
                                 font-weight: 500;
                                 background-color: #ff9900;
+                                border-color: #ff9900;
                             }
                         }
                     }
diff --git a/resources/assets/sass/pages/components/task-priority.scss b/resources/assets/sass/pages/components/task-priority.scss
index 669238f3..3379f7d4 100644
--- a/resources/assets/sass/pages/components/task-priority.scss
+++ b/resources/assets/sass/pages/components/task-priority.scss
@@ -1,10 +1,12 @@
 .task-priority {
     font-size: 13px;
     display: inline-block;
-    padding: 2px 6px;
+    padding: 2px 5px;
     border-radius: 3px;
     max-width: 100%;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
+    background: transparent;
+    border: 1px solid transparent;
 }