perf: 修复一些问题

kuaifan · Jan 21, 2024 · 8f4399d · 8f4399d
1 parent c8b8cc5
commit 8f4399d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
@@ -571,9 +571,9 @@ public function search()
         $list->transform(function (User $userInfo) use ($user, $state) {
             $tags = [];
             $dep = $userInfo->getDepartmentName();
-            $dep = array_filter(explode(",", $dep), function($item) {
+            $dep = array_values(array_filter(explode(",", $dep), function($item) {
                 return preg_match("/\(M\)$/", $item);
-            });
+            }));
             if ($dep) {
                 $tags[] = preg_replace("/\(M\)$/", "", trim($dep[0])) . Doo::translate("负责人");
             }

diff --git a/app/Models/WebSocketDialog.php b/app/Models/WebSocketDialog.php
@@ -115,6 +115,7 @@ public static function getDialogUnread($userid, $beforeAt, $take = 20)
         $list = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.mark_unread', 'u.silence', 'u.color', 'u.updated_at as user_at'])
             ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
             ->join('web_socket_dialog_msg_reads as r', 'web_socket_dialogs.id', '=', 'r.dialog_id')
+            ->where('u.userid', $userid)
             ->where('r.userid', $userid)
             ->where('r.silence', 0)
             ->where('r.read_at')

diff --git a/resources/assets/sass/components/report.scss b/resources/assets/sass/components/report.scss
@@ -66,7 +66,6 @@
         flex-shrink: 0;
         font-size: 16px;
         font-weight: bold;
-        margin-bottom: 12px;
         padding: 20px 24px;
         border-bottom: 1px solid #eeeeee;
         @media (max-width: 500px) {
@@ -77,7 +76,7 @@
     .report-detail-context {
         flex: 1;
         height: 0;
-        padding: 12px 0 12px 24px;
+        padding: 24px;
         display: flex;
         flex-direction: column;
         overflow: auto;

diff --git a/resources/assets/statics/public/js/loading-theme.js b/resources/assets/statics/public/js/loading-theme.js
@@ -2,7 +2,11 @@ let themeName = window.localStorage.getItem('__system:themeConf__')
 if (!['dark', 'light'].includes(themeName)) {
     let isDark = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches
     if (/eeui/i.test(window.navigator.userAgent)) {
-        isDark = /system_theme\/dark;/i.test(window.navigator.userAgent)
+        if (typeof requireModuleJs === 'function') {
+            isDark = requireModuleJs("eeui").getThemeName() === 'dark'
+        } else {
+            isDark = /system_theme\/dark;/i.test(window.navigator.userAgent)
+        }
     }
     themeName = isDark ? 'dark' : 'light'
 }