lex 1 năm trước cách đây
mục cha
commit
fc2915bbfe

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/assets/index-7692fd3e.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/assets/index-be7e2b62.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/assets/index-cab2e141.css


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/assets/index-e3f87878.css


+ 5 - 0
dist/index.html

@@ -6,8 +6,13 @@
   <link rel="icon" type="image/svg+xml" href="./vite.svg" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>IM</title>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index-be7e2b62.js"></script>
   <link rel="stylesheet" href="./assets/index-e3f87878.css">
+=======
+  <script type="module" crossorigin src="./assets/index-7692fd3e.js"></script>
+  <link rel="stylesheet" href="./assets/index-cab2e141.css">
+>>>>>>> master
 </head>
 
 <body>

+ 1 - 1
src/TUIKit/TUIComponents/container/TUIChat/components/message-bubble.vue

@@ -513,7 +513,7 @@ export default messageBubble;
     width: fit-content;
     &-in {
       background: #fbfbfb;
-      border-radius: 0px 10px 10px 10px;
+      border-radius: 10px 10px 10px 10px;
     }
     &-out {
       background: #dceafd;

+ 1 - 1
src/TUIKit/TUIComponents/container/TUIChat/manage-components/style/color.scss

@@ -1,6 +1,6 @@
 .manage {
   background: #ffffff;
-  box-shadow: 0 1Px 10Px 0 rgba(2, 16, 43, 0.15);
+  // box-shadow: 0 1Px 10Px 0 rgba(2, 16, 43, 0.15);
 
   &-header {
     border-bottom: 1Px solid #e8e8e9;

+ 2 - 2
src/TUIKit/TUIComponents/container/TUIChat/manage-components/style/web.scss

@@ -4,7 +4,7 @@
   box-sizing: border-box;
   width: 360Px;
   overflow-y: auto;
-  border-radius: 8Px 0 0 8Px;
+  // border-radius: 8Px 0 0 8Px;
   position: absolute;
   right: 0;
   height: calc(100% - 54px);
@@ -329,5 +329,5 @@
 }
 
 .icon-chat-setting {
-  margin-right: 35Px;
+  margin-right: 40Px;
 }

+ 2 - 1
src/TUIKit/TUIComponents/container/TUIChat/utils/utils.ts

@@ -155,7 +155,8 @@ export function handleTipMessageShowContext(message: any) {
         options.text = `${t("message.tip.群成员")}:${userName} ${t("message.tip.退出群组")}`;
         break;
       case TIM.TYPES.GRP_TIP_MBR_KICKED_OUT:
-        options.text = `${t("message.tip.群成员")}:${userName} ${t("message.tip.被")}${message.payload.operatorID}${t("message.tip.踢出群组")}`;
+        // ${t("message.tip.被")}${message.payload.operatorID}
+        options.text = `${t("message.tip.群成员")}:${userName} ${t("message.tip.踢出群组")}`;
         break;
       case TIM.TYPES.GRP_TIP_MBR_SET_ADMIN:
         options.text = `${t("message.tip.群成员")}:${userName} ${t("message.tip.成为管理员")}`;

+ 1 - 1
src/TUIKit/TUIComponents/container/TUIConversation/components/list-item/style/color.scss

@@ -1,7 +1,7 @@
 .TUI-conversation {
   &-item {
     &:hover {
-      background: rgba(0, 110, 255, 0.1);
+      background: #F5F6FA;
     }
 
     .left {

+ 6 - 3
src/TUIKit/TUIComponents/container/TUIConversation/components/list-item/style/web.scss

@@ -4,7 +4,9 @@
   }
 
   &-item {
-    padding: 16Px 12Px;
+    margin: 0 6px 6px;
+    padding: 12Px 12Px;
+    border-radius: 8px;
     display: flex;
     align-items: center;
     cursor: pointer;
@@ -91,7 +93,8 @@
       .name {
         width: 110Px;
         letter-spacing: 0;
-        font-size: 14Px;
+        font-size: 15Px;
+        font-weight: 600;
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
@@ -113,7 +116,7 @@
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
-        font-size: 12Px;
+        font-size: 13Px;
         line-height: 16Px;
       }
     }

+ 40 - 56
src/TUIKit/TUIComponents/container/TUIConversation/components/list/index.vue

@@ -1,11 +1,5 @@
 <template>
-  <ul
-    class="TUI-conversation-list"
-    :class="[isH5 ? 'list-h5' : '']"
-    ref="list"
-    @mousewheel="scrollChange"
-    @scroll="scrollChange"
-  >
+  <ul class="TUI-conversation-list" :class="[isH5 ? 'list-h5' : '']" ref="list" @mousewheel="scrollChange" @scroll="scrollChange">
     <LiteItem
       :isH5="isH5"
       v-for="(item, index) in data.list"
@@ -19,7 +13,7 @@
         showAt: data.handleShowAt,
         showMessage: data.handleShowMessage,
         time: data.handleItemTime,
-        userID: data.handleItemUserID
+        userID: data.handleItemUserID,
       }"
       :displayOnlineStatus="displayOnlineStatus"
       :userStatusList="userStatusList"
@@ -31,48 +25,41 @@
   </ul>
 </template>
 <script lang="ts">
-import {
-  defineComponent,
-  reactive,
-  ref,
-  toRefs,
-  watch,
-  watchEffect
-} from 'vue';
-import LiteItem from '../list-item';
+import { defineComponent, reactive, ref, toRefs, watch, watchEffect } from "vue";
+import LiteItem from "../list-item";
 const TUIConversationList: any = defineComponent({
   props: {
     data: {
       type: Object,
-      default: () => ({})
+      default: () => ({}),
     },
     currentID: {
       type: String,
-      default: () => ''
+      default: () => "",
     },
     isH5: {
       type: Boolean,
-      default: () => false
+      default: () => false,
     },
     displayOnlineStatus: {
       type: Boolean,
-      default: () => false
+      default: () => false,
     },
     userStatusList: {
       type: Map,
-      default: () => new Map()
-    }
+      default: () => new Map(),
+    },
   },
   components: { LiteItem },
   setup(props: any, ctx: any) {
     const TUIServer: any = TUIConversationList?.TUIServer;
     const obj = reactive({
       data: {},
-      currentID: '',
-      toggleID: '',
+      currentID: "",
+      toggleID: "",
       displayOnlineStatus: false,
       userStatusList: new Map(),
-      types: TUIServer.TUICore.TIM.TYPES
+      types: TUIServer.TUICore.TIM.TYPES,
     });
     const list: any = ref();
 
@@ -92,64 +79,62 @@ const TUIConversationList: any = defineComponent({
     );
 
     const handleListItem = (item: any) => {
-      ctx.emit('handleItem', item);
+      ctx.emit("handleItem", item);
     };
 
     const handleItem = (params: any) => {
       const { name, conversation } = params;
       switch (name) {
-        case 'delete':
+        case "delete":
           handleDeleteConversation(conversation);
           break;
-        case 'ispinned':
+        case "ispinned":
           handlePinConversation(name, conversation);
           break;
-        case 'dispinned':
+        case "dispinned":
           handlePinConversation(name, conversation);
           break;
-        case 'mute':
+        case "mute":
           handleMuteConversation(name, conversation);
           break;
-        case 'notMute':
+        case "notMute":
           handleMuteConversation(name, conversation);
           break;
       }
     };
 
     const handleDeleteConversation = (conversation: any) => {
-      TUIServer.deleteConversation(conversation.conversationID).then(
-        (imResponse: any) => {
-          const { conversationID } = imResponse.data;
-          const { conversation } = TUIServer.TUICore.getStore().TUIChat;
-          // 删除会话,判断当前删除的会话是否为打开的会话
-          // 若为打开的会话,通知 TUIChat 关闭当前会话
-          // Delete session: judge whether the currently deleted session is an open session
-          // If it is an open session, notify tuichat to close the current session
-          if (conversation.conversationID === conversationID) {
-            TUIServer.TUICore.getStore().TUIChat.conversation = {
-              conversationID: ''
-            };
-          }
+      TUIServer.deleteConversation(conversation.conversationID).then((imResponse: any) => {
+        const { conversationID } = imResponse.data;
+        const { conversation } = TUIServer.TUICore.getStore().TUIChat;
+        // 删除会话,判断当前删除的会话是否为打开的会话
+        // 若为打开的会话,通知 TUIChat 关闭当前会话
+        // Delete session: judge whether the currently deleted session is an open session
+        // If it is an open session, notify tuichat to close the current session
+        if (conversation.conversationID === conversationID) {
+          TUIServer.TUICore.getStore().TUIChat.conversation = {
+            conversationID: "",
+          };
         }
-      );
+      });
     };
 
     const handlePinConversation = (type: string, conversation: any) => {
       const options: any = {
         conversationID: conversation.conversationID,
-        isPinned: true
+        isPinned: true,
       };
 
-      if (type === 'dispinned') {
+      if (type === "dispinned") {
         options.isPinned = false;
       }
-      console.log('dispinned', options);
+      console.log("dispinned", options);
       TUIServer.pinConversation(options);
     };
 
     const handleMuteConversation = (type: string, conversation: any) => {
       const options: any = {
-        messageRemindType: TUIServer.TUICore.TIM.TYPES.MSG_REMIND_ACPT_NOT_NOTE
+        messageRemindType: TUIServer.TUICore.TIM.TYPES.MSG_REMIND_ACPT_NOT_NOTE,
       };
 
       if (conversation.type === TUIServer.TUICore.TIM.TYPES.CONV_C2C) {
@@ -158,9 +143,8 @@ const TUIConversationList: any = defineComponent({
         options.groupID = conversation.groupProfile.groupID;
       }
 
-      if (type === 'notMute') {
-        options.messageRemindType =
-          TUIServer.TUICore.TIM.TYPES.MSG_REMIND_ACPT_AND_NOTE;
+      if (type === "notMute") {
+        options.messageRemindType = TUIServer.TUICore.TIM.TYPES.MSG_REMIND_ACPT_AND_NOTE;
       }
 
       TUIServer.muteConversation(options);
@@ -171,7 +155,7 @@ const TUIConversationList: any = defineComponent({
     };
 
     const scrollChange = () => {
-      obj.toggleID && (obj.toggleID = '');
+      obj.toggleID && (obj.toggleID = "");
     };
 
     return {
@@ -180,9 +164,9 @@ const TUIConversationList: any = defineComponent({
       handleItem,
       handleToggleListItem,
       list,
-      scrollChange
+      scrollChange,
     };
-  }
+  },
 });
 export default TUIConversationList;
 </script>

+ 1 - 1
src/TUIKit/TUIComponents/container/TUIConversation/components/list/style/web.scss

@@ -2,4 +2,4 @@
   &-list {
     list-style: none;
   }
-}
+}

+ 3 - 2
src/TUIKit/TUIComponents/container/TUIGroup/style/web.scss

@@ -236,7 +236,8 @@
    .name {
      width: 110Px;
      letter-spacing: 0;
-     font-size: 14Px;
+     font-size: 15Px;
+     font-weight: 600;
      overflow: hidden;
      text-overflow: ellipsis;
      white-space: nowrap;
@@ -261,7 +262,7 @@
      overflow: hidden;
      text-overflow: ellipsis;
      white-space: nowrap;
-     font-size: 12Px;
+     font-size: 13Px;
      line-height: 16Px;
    }
  }

+ 3 - 2
src/TUIKit/TUIComponents/container/TUIPerson/style/web.scss

@@ -232,7 +232,8 @@
    .name {
      width: 110Px;
      letter-spacing: 0;
-     font-size: 14Px;
+     font-size: 15Px;
+     font-weight: 600;
      overflow: hidden;
      text-overflow: ellipsis;
      white-space: nowrap;
@@ -257,7 +258,7 @@
      overflow: hidden;
      text-overflow: ellipsis;
      white-space: nowrap;
-     font-size: 12Px;
+     font-size: 13Px;
      line-height: 16Px;
    }
  }

+ 2 - 2
src/TUIKit/locales/zh_cn/message.json

@@ -4,7 +4,7 @@
     "加入群组": "加入群组",
     "退出群组": "退出群组",
     "被": "被",
-    "踢出群组": "出群组",
+    "踢出群组": "移除出群组",
     "成为管理员": "成为管理员",
     "被撤销管理员": "被撤销管理员",
     "被禁言": "被禁言",
@@ -24,7 +24,7 @@
     "解散": "解散",
     "创建群": "创建群",
     "邀请你加群": "邀请你加群",
-    "你退出群组" : "你退出群组",
+    "你退出群组": "你退出群组",
     "你被": "你被",
     "设置为群": "设置为群",
     "的管理员": "的管理员",

+ 4 - 4
src/TUIKit/locales/zh_cn/translate.json

@@ -69,7 +69,7 @@
   "TUIKit-TUIContact-10": "群类型",
   "TUIKit-TUIContact-11": "请填写验证信息",
   "TUIKit-TUIContact-12": "申请加入",
-  "TUIKit-TUIContact-13":"已申请",
+  "TUIKit-TUIContact-13": "已申请",
   "TUIKit-TUIContact-14": "接受",
   "TUIKit-TUIContact-15": "拒绝",
   "TUIKit-TUIContact-16": "已处理",
@@ -98,7 +98,7 @@
   "TUIKit-TUIProfile-07": "男",
   "TUIKit-TUIProfile-08": "女",
   "TUIKit-TUIProfile-09": "不显示",
-  "TUIKit-TUIProfile-10":"出生年月",
+  "TUIKit-TUIProfile-10": "出生年月",
   "TUIKit-TUIProfile-11": "取消",
   "TUIKit-TUIProfile-12": "保存",
   "TUIKit-time-01": "周",
@@ -111,7 +111,7 @@
   "TUIKit-message-tip-02": "加入群组",
   "TUIKit-message-tip-03": "退出群组",
   "TUIKit-message-tip-04": "被",
-  "TUIKit-message-tip-05": "出群组",
+  "TUIKit-message-tip-05": "移除出群组",
   "TUIKit-message-tip-06": "成为管理员",
   "TUIKit-message-tip-07": "被撤销管理员",
   "TUIKit-message-tip-08": "被禁言",
@@ -131,7 +131,7 @@
   "TUIKit-message-tip-22": "解散",
   "TUIKit-message-tip-23": "创建群",
   "TUIKit-message-tip-24": "邀请你加群",
-  "TUIKit-message-tip-25" : "你退出群组",
+  "TUIKit-message-tip-25": "你退出群组",
   "TUIKit-message-tip-26": "你被",
   "TUIKit-message-tip-27": "设置为群",
   "TUIKit-message-tip-28": "的管理员",

BIN
src/assets/icon-close.png


+ 2 - 2
src/index.scss

@@ -730,7 +730,7 @@
       display: flex;
 
       .conversation {
-        min-width: 285Px;
+        min-width: 300Px;
         flex: 0 0 24%;
         display: flex;
         flex-direction: column;
@@ -1164,6 +1164,6 @@
   height: 20Px;
   background: url('./assets/icon-close.png') no-repeat center;
   background-size: contain;
-  z-index: 99;
+  z-index: 11;
   cursor: pointer;
 }

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác