diff --git a/components.d.ts b/components.d.ts index ca374cd..d2dbebc 100644 --- a/components.d.ts +++ b/components.d.ts @@ -63,6 +63,7 @@ declare module 'vue' { NotificationApi: typeof import('./src/components/common/NotificationApi.vue')['default'] NPopover: typeof import('naive-ui')['NPopover'] NRadio: typeof import('naive-ui')['NRadio'] + NScrollbar: typeof import('naive-ui')['NScrollbar'] NSpin: typeof import('naive-ui')['NSpin'] NTag: typeof import('naive-ui')['NTag'] NVirtualList: typeof import('naive-ui')['NVirtualList'] diff --git a/src/components/common/customModal.vue b/src/components/common/customModal.vue index bfee602..1191784 100644 --- a/src/components/common/customModal.vue +++ b/src/components/common/customModal.vue @@ -80,7 +80,7 @@ const props = defineProps({ } }) -const emit = defineEmits(['update:show', 'cancel', 'confirm']) +const emit = defineEmits(['update:show', 'cancel', 'confirm', 'customCloseModal']) const show = computed({ get: () => props.show, @@ -111,7 +111,7 @@ const state = reactive({ const handleCloseModal = () => { if (props.customCloseEvent) { - emit('closeModal') + emit('customCloseModal') } else { show.value = false } diff --git a/src/components/group/GroupPanel.vue b/src/components/group/GroupPanel.vue index d69f576..2c11bed 100644 --- a/src/components/group/GroupPanel.vue +++ b/src/components/group/GroupPanel.vue @@ -663,7 +663,10 @@ const handleEditGroupNameConfirm = () => { 清空聊天记录 { > 解散该群 - + 退出群聊 @@ -731,7 +740,8 @@ const handleEditGroupNameConfirm = () => { diff --git a/src/components/search/searchList.vue b/src/components/search/searchList.vue index 7c69137..539e26a 100644 --- a/src/components/search/searchList.vue +++ b/src/components/search/searchList.vue @@ -1,60 +1,73 @@ - - - + + + - - - {{ getResultKeysValue(searchResultKey) }} - - - - - - - - - {{ getHasMoreResult(searchResultKey) }} - + + + + + + + + + + {{ getHasMoreResult(searchResultKey) }} + + - + 正在加载数据中 ... @@ -296,53 +330,96 @@ onMounted(() => { 没有更多消息了 - + - + - + - + - + - + @{{ item.nickname }} {{ parseTime(item.created_at, '{y}/{m}/{d} {h}:{i}') }} - - - - + + + + - + + - + 回复 {{ item.extra?.reply?.nickname }}: @@ -383,8 +464,15 @@ onMounted(() => { - +