Merge branch 'main' of https://gitea-inner.fontree.cn/scout666/chat-app

* 'main' of https://gitea-inner.fontree.cn/scout666/chat-app:
  完成输入框组件中@样式和相对应的功能
  修改部门创建权限规则

components.d.ts

@@ -30,8 +30,6 @@ declare module 'vue' {
     LoginMessage: typeof import('./src/components/talk/message/LoginMessage.vue')['default']
     Message: typeof import('./src/components/x-message/message/index.vue')['default']
     MixedMessage: typeof import('./src/components/talk/message/MixedMessage.vue')['default']
-    NButton: typeof import('naive-ui')['NButton']
-    NIcon: typeof import('naive-ui')['NIcon']
     PageAnimation: typeof import('./src/components/page-animation/index.vue')['default']
     RevokeMessage: typeof import('./src/components/talk/message/RevokeMessage.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']

src/components/talk/message/TextMessage.vue

@@ -2,6 +2,7 @@
 import { textReplaceEmoji } from '@/utils/emojis'
 import { textReplaceLink, textReplaceMention } from '@/utils/strings'
 import { ITalkRecordExtraText, ITalkRecord } from '@/types/chat'
+import { computed } from 'vue'
 
 const props = defineProps<{
   extra: ITalkRecordExtraText
@@ -12,15 +13,14 @@ const props = defineProps<{
 
 const float = props.data.float
 
-let textContent = props.extra?.content || ''
+const textContent = computed(() => {
-
+  let text = props.extra?.content || ''
-textContent = textReplaceLink(textContent)
+  text = textReplaceLink(text)
-
+  if (props.data.talk_type == 2) {
-if (props.data.talk_type == 2) {
+    text = textReplaceMention(text, '#1890ff')
-  textContent = textReplaceMention(textContent, '#1890ff')
+  }
-}
+  return textReplaceEmoji(text)
-
+})
-textContent = textReplaceEmoji(textContent)
 </script>
 
 <template>

src/pages/chatSettings/index.vue

@@ -167,7 +167,7 @@
               @click="showConfirmPrompt(3)"
               class="clear-chat-record-btn-each"
               v-if="
-                groupParams?.groupInfo?.is_manager &&
+                groupParams?.groupInfo?.is_manager === false &&
                 dialogueParams.type === 2 &&
                 (groupParams?.groupInfo?.group_type === 1 ||
                   groupParams?.groupInfo?.group_type === 3)

src/pages/chooseGroupType/index.vue

@@ -96,6 +96,7 @@
                 </div>
               </div>
               <div
+                v-if="isCreateProjecy"
                 @click="groupActiveIndex = 2;depCheckedKeys = [];"
                 class="groupCard thirdPanel"
                 :class="groupActiveIndex === 2 ? 'activePanel' : ''"
@@ -144,6 +145,7 @@ onUnload(()=> {
 
 })
 const isHasPermission = ref(false)
+const isCreateProjecy = ref(false)
 onShow( async() =>{
   const isHasRes = await userHasPermission({
     erpUserId: userInfo?.value?.ID,
@@ -158,6 +160,7 @@ onShow( async() =>{
     } else{
       isHasPermission.value = false
     }
+    isCreateProjecy.value = isHasRes.data.btn_rule_create_project_group
   }
 })
 

src/pages/creatGroupChat/index.vue

@@ -219,8 +219,7 @@ onLoad(()=> {
   groupStore.$reset()
 })
 onUnload(()=> {
-  groupName.value = '';
+  resetGroupInfo();
-  groupActiveIndex.value = -1;
 })
 onMounted(() => {
   handleSetWebviewStyle()
@@ -332,7 +331,7 @@ const confirmBtnStatus = computed(() => {
   }
   switch (groupActiveIndex.value) {
     case 0:
-      if(allChooseMembers?.value?.length < 3) {
+      if(allChooseMembers?.value?.length < 2) {
         disabledT = true
       }
       break
@@ -345,7 +344,7 @@ const confirmBtnStatus = computed(() => {
       }
       break
     case 2:
-      if(allChooseMembers?.value?.length < 3) {
+      if(allChooseMembers?.value?.length < 2) {
         disabledT = true
       }
       break

src/pages/dialog/index.vue

@@ -194,17 +194,10 @@
         </div>
         <div class="load-toolbar pointer" style="transform: scaleY(-1);">
           <span v-if="loadConfig.status == 0">正在加载数据中 ...</span>
-          <span v-else-if="loadConfig.status == 1" @click="onScrollToLower">
+          <span v-if="loadConfig.status == 1" @click="onScrollToLower">
             查看更多消息 ...
           </span>
-          <span
+          <span v-if="loadConfig.status == 2" class="no-more">
-            v-else-if="
-              loadConfig.status != 0 &&
-              loadConfig.status != 1 &&
-              state.localPageLoadDone
-            "
-            class="no-more"
-          >
             没有更多消息了
           </span>
         </div>
@@ -1116,6 +1109,9 @@ watch(
         ) {
           //相同意味着分页加载缓存中的聊天记录完毕
           state.value.localPageLoadDone = true
+          if (dialogueList?.records?.[0]?.sequence !== 1) {
+            loadConfig.status = 1
+          }
         } else {
           state.value.localPageLoadDone = false
         }
@@ -1227,9 +1223,9 @@ const onScrollToUpper = async () => {
         virtualList.value = tempVirtualList
           .concat(
             dialogueList.records.slice(
-              Math.min(recordIndex + 11, dialogueList.records.length),
+              recordIndex + 1,
-              dialogueList.records.length,
+              Math.min(recordIndex + 11, dialogueList.records.length)
-            ),
+            )
           )
           .reverse()
 
@@ -1522,12 +1518,11 @@ const doMentionUser = (mentionSelect) => {
   // 构造正确的 mention 对象
   const mentionObj = {
     id: mentionSelect.user_id, // 使用 user_id 而不是 erp_user_id
-    nickname: mentionSelect.nickname
+    nickname: mentionSelect.nickname,
   }
   getMentionSelectLists([mentionObj])
 }
 
-
 let avatarPressTimer = null
 let currentPressItem = null
 

src/pages/index/components/chatItem.vue

@@ -7,9 +7,9 @@
       >
         <div class="avatarImg">
           <tm-badge
-            :count="props.data.is_disturb === 1 ? props.data.unread_num : ''"
+            :count="props.data.is_disturb === 0 ? props.data.unread_num : ''"
             :dot="
-              props.data.is_disturb === 0 && props.data.unread_num
+              props.data.is_disturb === 1 && props.data.unread_num
                 ? true
                 : false
             "