From 79b5ca4db06daa1206960e760acd9a183981a030 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sun, 19 Feb 2023 17:51:15 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E8=AE=BE=E5=BE=85=E5=8A=9E=E5=BF=AB?=
 =?UTF-8?q?=E9=80=9F=E9=80=89=E6=8B=A9=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/manage/components/DialogWrapper.vue  | 18 ++++++++++++------
 .../sass/pages/components/dialog-wrapper.scss  | 16 ++++++++++++++++
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index 71ae7a117..833daed3d 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -320,17 +320,22 @@
                 <FormItem prop="type" :label="$L('当前会话')">
                     <RadioGroup v-model="todoSettingData.type">
                         <Radio label="all">{{$L('所有成员')}}</Radio>
+                        <Radio label="user">{{$L('指定成员')}}</Radio>
                         <Radio v-if="todoSettingData.my_id" label="my">
-                            <div style="display:inline-block">
-                                <UserAvatar :userid="todoSettingData.my_id" :show-icon="false" :show-name="true"/>
+                            <div class="dialog-wrapper-todo">
+                                <div>
+                                    <UserAvatar :userid="todoSettingData.my_id" :show-icon="false" :show-name="true"/>
+                                    <Tag>{{$L('自己')}}</Tag>
+                                </div>
                             </div>
                         </Radio>
                         <Radio v-if="todoSettingData.you_id" label="you">
-                            <div style="display:inline-block">
-                                <UserAvatar :userid="todoSettingData.you_id" :show-icon="false" :show-name="true"/>
+                            <div class="dialog-wrapper-todo">
+                                <div>
+                                    <UserAvatar :userid="todoSettingData.you_id" :show-icon="false" :show-name="true"/>
+                                </div>
                             </div>
                         </Radio>
-                        <Radio label="user">{{$L('指定成员')}}</Radio>
                     </RadioGroup>
                 </FormItem>
                 <FormItem v-if="todoSettingData.type === 'user'" prop="userids">
@@ -2215,12 +2220,13 @@ export default {
                     this.todoSettingLoad--
                 })
             } else {
+                const youId = this.dialogData.dialog_user?.userid
                 this.todoSettingData = {
                     type: 'all',
                     userids: [],
                     msg_id: this.operateItem.id,
                     my_id: this.userId,
-                    you_id: this.dialogData.dialog_user?.userid,
+                    you_id: youId != this.userId ? youId : 0,
                 }
                 if (this.operateItem.todo) {
                     $A.modalConfirm({
diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss
index abaa2252e..dd6228e8a 100644
--- a/resources/assets/sass/pages/components/dialog-wrapper.scss
+++ b/resources/assets/sass/pages/components/dialog-wrapper.scss
@@ -1383,6 +1383,22 @@
     }
 }
 
+.dialog-wrapper-todo {
+    display: inline-block;
+    > div {
+        display: flex;
+        align-items: center;
+        .ivu-tag {
+            display: flex;
+            align-items: center;
+            margin-left: 4px;
+            height: 20px;
+            line-height: 20px;
+            padding: 0 5px;
+        }
+    }
+}
+
 .dialog-wrapper-operate {
     .ivu-dropdown-item {
         padding: 0;