From 071ddfad0fa8f8f46c1a8278fb0e77675e2cb4ca Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Mon, 20 Feb 2023 14:53:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/DialogController.php            | 4 ++--
 .../manage/setting/components/SystemTaskPriority.vue     | 2 +-
 resources/assets/js/store/actions.js                     | 2 +-
 resources/assets/sass/pages/page-setting.scss            | 9 +++++++++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Api/DialogController.php b/app/Http/Controllers/Api/DialogController.php
index 7b5a9d78c..b93cb4886 100755
--- a/app/Http/Controllers/Api/DialogController.php
+++ b/app/Http/Controllers/Api/DialogController.php
@@ -569,7 +569,7 @@ class DialogController extends AbstractController
                 'unread' => $dialogUser->webSocketDialog->unread,
                 'mention' => $dialogUser->webSocketDialog->mention,
                 'position_msgs' => $dialogUser->webSocketDialog->position_msgs,
-                'user_at' => $dialogUser->updated_at,
+                'user_at' =>  Carbon::parse($dialogUser->updated_at)->toDateTimeString(),
             ];
         }
         return Base::retSuccess('success', $data);
@@ -612,7 +612,7 @@ class DialogController extends AbstractController
             'unread' => $dialogUser->webSocketDialog->unread,
             'mention' => $dialogUser->webSocketDialog->mention,
             'position_msgs' => $dialogUser->webSocketDialog->position_msgs,
-            'user_at' => $dialogUser->updated_at,
+            'user_at' => Carbon::parse($dialogUser->updated_at)->toDateTimeString(),
         ]);
     }
 
diff --git a/resources/assets/js/pages/manage/setting/components/SystemTaskPriority.vue b/resources/assets/js/pages/manage/setting/components/SystemTaskPriority.vue
index ab9a62a15..7d68c4fa1 100644
--- a/resources/assets/js/pages/manage/setting/components/SystemTaskPriority.vue
+++ b/resources/assets/js/pages/manage/setting/components/SystemTaskPriority.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="setting-component-item">
         <Form ref="formDatum" label-width="auto" @submit.native.prevent>
-            <Row class="setting-color">
+            <Row class="setting-color color-label-box">
                 <Col span="12">{{$L('名称')}}</Col>
                 <Col span="4">
                     <ETooltip :disabled="windowSmall || $isEEUiApp" :content="$L('数值越小级别越高')" max-width="auto" placement="top" transfer>
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 99ae5a1c7..cdfeba922 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -2067,7 +2067,7 @@ export default {
             const index = state.cacheDialogs.findIndex(({id}) => id == data.id);
             if (index > -1) {
                 const original = state.cacheDialogs[index]
-                if ($A.Time(data.user_at) < $A.Time(original.user_at)) {
+                if ($A.Time(data.user_at) < $A.Time(original.user_at || original.updated_at)) {
                     typeof data.unread !== "undefined" && delete data.unread
                     typeof data.mention !== "undefined" && delete data.mention
                     typeof data.position_msgs !== "undefined" && delete data.position_msgs
diff --git a/resources/assets/sass/pages/page-setting.scss b/resources/assets/sass/pages/page-setting.scss
index 0ba0f54c6..0e228cd6b 100755
--- a/resources/assets/sass/pages/page-setting.scss
+++ b/resources/assets/sass/pages/page-setting.scss
@@ -144,6 +144,15 @@
                 color: $primary-desc-color;
             }
         }
+        .setting-color {
+            &.color-label-box {
+                .el-tooltip {
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                    overflow: hidden;
+                }
+            }
+        }
         .setting-template {
             > div {
                 flex-shrink: 0;