github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-03-07 18:07:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix:修复已知bug

Browse Source
This commit is contained in:
kuaifan 2023-02-20 14:53:29 +08:00
parent 8a83015118
commit 071ddfad0f
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Api/DialogController.php
View File

@ -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(),
]);
}

2
resources/assets/js/pages/manage/setting/components/SystemTaskPriority.vue
View File

@ -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>

2
resources/assets/js/store/actions.js vendored
View File

@ -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

9
resources/assets/sass/pages/page-setting.scss vendored
View File

@ -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;