im-ui-mobile 0.0.82 → 0.0.84

package/components/im-chat-item/im-chat-item.vue

@@ -3,7 +3,7 @@
 		<!--rich-text中的表情包会屏蔽事件，所以这里用一个遮罩层捕获点击事件 -->
 		<view class="mask" @tap="showChatBox()"></view>
 		<view class="left">
-			<im-head-image :url="chat.headImage" :name="chat.showName" :online="online" />
+			<im-avatar :url="chat.headImage" :name="chat.showName" :online="online" />
 		</view>
 		<view class="chat-right">
 			<view class="chat-name">
@@ -26,8 +26,8 @@
 
 <script setup lang="ts">
 import { computed } from 'vue'
-import ImHeadImage from '../im-head-image/im-head-image.vue'
-import { datetime, dom, messageType } from '../../index'
+import ImAvatar from '../im-avatar/im-avatar.vue'
+import { datetime, dom, messageType, emoji } from '../../index'
 import { MESSAGE_TYPE } from '../../index'
 
 interface Props {
@@ -35,7 +35,6 @@ interface Props {
 	index?: number;
 	active?: boolean;
 	online: boolean;
-	emoji: any;
 }
 
 const $datetime = datetime
@@ -83,7 +82,7 @@ const isTextMessage = computed(() => {
 
 const nodesText = computed(() => {
 	const text = dom.html2Escape(props.chat?.lastContent || '');
-	return props.emoji.transform(text, 'emoji-small');
+	return emoji.transform(text, 'emoji-small');
 });
 
 // TODO:组件化（换为props.online）

package/components/{im-long-press-menu/im-long-press-menu.vue → im-context-menu/im-context-menu.vue}

@@ -1,5 +1,5 @@
 <template>
-	<view class="long-press-menu none-pointer-events">
+	<view class="context-menu none-pointer-events">
 		<view @longpress.prevent.stop="onLongPress($event)" @touchmove="onTouchMove" @touchend="onTouchEnd">
 			<slot></slot>
 		</view>
@@ -97,7 +97,7 @@ const itemStyle = (item: any) => {
 </script>
 
 <style lang="scss" scoped>
-.long-press-menu {
+.context-menu {
 	.menu-mask {
 		position: fixed;
 		left: 0;

package/components/im-file-upload/im-file-upload.vue

@@ -181,7 +181,7 @@ const uploadFileToServer = (file: AfterReadFile, uploadFile: UploadFile, fileId:
 		const headers = {
 			'Authorization': `Bearer ${props.token}`,
 			'AccessToken': props.token,
-			'Content-Type': 'multipart/form-data'
+			// 'Content-Type': 'multipart/form-data' // Commented by Joncky becauce of error "Failed to read the request form. Missing content-type boundary." 
 		}
 
 		uni.uploadFile({
@@ -203,7 +203,14 @@ const uploadFileToServer = (file: AfterReadFile, uploadFile: UploadFile, fileId:
 						...res,
 						status: 'success'
 					})
-					emit('success', file, JSON.parse(res.data).data)
+
+					const data = JSON.parse(res.data)
+					let url = data.data
+					if (!url && data.result) {
+						url = data.result?.url
+					}
+
+					emit('success', file, url)
 				} catch (error) {
 					uploadFile.status = 'error'
 					console.error(error)

package/components/im-friend-item/im-friend-item.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="friend-item" @click="showFriendInfo()">
-		<im-head-image :name="friend.nickName" :online="friend.online" :url="friend.headImage" size="small"/>
+		<im-avatar :name="friend.nickName" :online="friend.online" :url="friend.headImage" size="small" />
 		<view class="friend-info">
 			<view class="friend-name">{{ friend.nickName }}</view>
 			<view class="friend-online">
@@ -13,7 +13,7 @@
 </template>
 
 <script setup lang="ts">
-import ImHeadImage from '../im-head-image/im-head-image.vue'
+import ImAvatar from '../im-avatar/im-avatar.vue'
 
 interface Props {
 	friend?: any;

package/components/im-group-item/im-group-item.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="group-item" @click="showGroupInfo()">
-		<im-head-image :name="group.showGroupName" :url="group.headImageThumb" size="small"/>
+		<im-avatar :name="group.showGroupName" :url="group.headImageThumb" size="small" />
 		<view class="group-name">
 			<view>{{ group.showGroupName }}</view>
 		</view>
@@ -8,7 +8,7 @@
 </template>
 
 <script setup lang="ts">
-import ImHeadImage from '../im-head-image/im-head-image.vue'
+import ImAvatar from '../im-avatar/im-avatar.vue'
 
 interface Props {
 	group?: any;

package/components/im-group-member-selector/im-group-member-selector.vue

@@ -10,7 +10,7 @@
 			<scroll-view v-show="checkedIds.length > 0" scroll-x="true" scroll-left="120">
 				<view class="checked-users">
 					<view v-for="m in checkedMembers" class="user-item" :key="m.userId">
-						<im-head-image :name="m.showNickName" :url="m.headImage" :size="60" />
+						<im-avatar :name="m.showNickName" :url="m.headImage" :size="60" />
 					</view>
 				</view>
 			</scroll-view>
@@ -21,7 +21,7 @@
 				<im-virtual-scroller :items="showMembers">
 					<template v-slot="{ item }">
 						<view class="member-item" @click="onSwitchChecked(item)">
-							<im-head-image :name="item.showNickName" :online="item.online" :url="item.headImage"
+							<im-avatar :name="item.showNickName" :online="item.online" :url="item.headImage"
 								:size="90" />
 							<view class="member-name">{{ item.showNickName }}
 							</view>
@@ -40,7 +40,7 @@
 
 <script setup lang="ts">
 import { ref, computed } from 'vue'
-import ImHeadImage from '../im-head-image/im-head-image.vue'
+import ImAvatar from '../im-avatar/im-avatar.vue'
 import ImVirtualScroller from '../im-virtual-scroller/im-virtual-scroller.vue'
 
 interface Props {

package/components/im-group-rtc-join/im-group-rtc-join.vue

@@ -4,14 +4,14 @@
 			<div class="group-rtc-join">
 				<div class="host-info">
 					<div>发起人</div>
-					<im-head-image :name="rtcInfo.host.nickName" :url="rtcInfo.host.headImage" :size="80" />
+					<im-avatar :name="rtcInfo.host.nickName" :url="rtcInfo.host.headImage" :size="80" />
 				</div>
 				<div class="user-info">
 					<div>{{ rtcInfo.userInfos.length + '人正在通话中' }}</div>
 					<scroll-view scroll-x="true" scroll-left="120">
 						<view class="user-list">
 							<view v-for="user in rtcInfo.userInfos" class="user-item" :key="user.id">
-								<im-head-image :name="user.nickName" :url="user.headImage" :size="80" />
+								<im-avatar :name="user.nickName" :url="user.headImage" :size="80" />
 							</view>
 						</view>
 					</scroll-view>
@@ -22,7 +22,7 @@
 </template>
 
 <script setup lang="ts">
-import ImHeadImage from '../im-head-image/im-head-image.vue'
+import ImAvatar from '../im-avatar/im-avatar.vue'
 import { ref } from 'vue';
 import { UserInfo } from '../../libs';
 

package/components/im-image-upload/im-image-upload.vue

@@ -60,9 +60,10 @@ const uploadImage = (file: any) => {
 	uploadUrl += `&isPermanent=${props.isPermanent}&thumbSize=${props.thumbSize}`
 
 	uni.uploadFile({
-		url: uploadUrl, //env.BaseApiUrl + action,
+		url: uploadUrl,
 		header: {
-			accessToken: props.token // getToken()
+			accessToken: props.token,
+			authorization: `Bearer ${props.token}`
 		},
 		filePath: file.path,
 		name: 'file',

package/components/{im-chat-at-box/im-chat-at-box.vue → im-mention-picker/im-mention-picker.vue}

@@ -1,6 +1,6 @@
 <template>
 	<u-popup ref="popup" mode="bottom" @open="onChange" @close="onChange">
-		<view class="chat-at-box">
+		<view class="mention-picker">
 			<view class="chat-at-top">
 				<view class="chat-at-tip"> 选择要提醒的人</view>
 				<button class="chat-at-btn" size="mini" @click="onClean()">清空 </button>
@@ -10,7 +10,7 @@
 			<scroll-view v-show="atUserIds.length > 0" scroll-x="true" scroll-left="120">
 				<view class="at-user-items">
 					<view v-for="m in checkedMembers" class="at-user-item" :key="m.userId">
-						<im-head-image :name="m.showNickName" :url="m.headImage" size="mini" />
+						<im-avatar :name="m.showNickName" :url="m.headImage" size="mini" />
 					</view>
 				</view>
 			</scroll-view>
@@ -21,7 +21,7 @@
 				<im-virtual-scroller :items="memberItems">
 					<template v-slot="{ item }">
 						<view class="member-item" @click="onSwitchChecked(item)">
-							<im-head-image :name="item.showNickName" :online="item.online" :url="item.headImage"
+							<im-avatar :name="item.showNickName" :online="item.online" :url="item.headImage"
 								size="small" />
 							<view class="member-name">{{ item.showNickName }}</view>
 							<radio :checked="item.checked" :disabled="item.locked"
@@ -36,7 +36,7 @@
 
 <script setup lang="ts">
 import { ref, computed } from 'vue'
-import ImHeadImage from '../im-head-image/im-head-image.vue'
+import ImAvatar from '../im-avatar/im-avatar.vue'
 import ImVirtualScroller from '../im-virtual-scroller/im-virtual-scroller.vue'
 import { GroupMember } from '../../libs';
 
@@ -123,7 +123,7 @@ defineExpose({
 </script>
 
 <style lang="scss" scoped>
-.chat-at-box {
+.mention-picker {
 	position: relative;
 	display: flex;
 	flex-direction: column;

package/components/{im-chat-message-item/im-chat-message-item.vue → im-message-item/im-message-item.vue}

@@ -1,5 +1,5 @@
 <template>
-	<view class="chat-message-item">
+	<view class="message-item">
 		<view class="message-tip" v-if="msgInfo.type == MESSAGE_TYPE.TIP_TEXT">
 			{{ msgInfo.content }}
 		</view>
@@ -7,7 +7,7 @@
 			{{ $datetime.toTimeText(msgInfo.sendTime) }}
 		</view>
 		<view class="message-normal" v-else-if="isNormal" :class="{ 'message-mine': msgInfo.selfSend }">
-			<im-head-image class="avatar" @longpress.prevent="$emit('longPressHead')" :id="msgInfo.sendId" :url="avatar"
+			<im-avatar class="avatar" @longpress.prevent="$emit('longPressHead')" :id="msgInfo.sendId" :url="avatar"
 				:name="showName" size="small" />
 			<view class="content">
 				<view v-if="msgInfo.groupId && !msgInfo.selfSend" class="top">
@@ -16,27 +16,27 @@
 				<view class="bottom">
 					<view class="message-content-wrapper">
 						<view v-if="msgInfo.type == MESSAGE_TYPE.TEXT">
-							<im-long-press-menu :items="menuItems" @select="onSelectMenu">
+							<im-context-menu :items="menuItems" @select="onSelectMenu">
 								<!-- up-parse支持点击a标签,但是不支持显示emo表情，也不支持换行 -->
 								<up-parse
 									v-if="$url.containUrl(msgInfo.content) && !emoji.containEmoji(msgInfo.content)"
 									class="message-text" :showImgMenu="false" :content="nodesText" />
 								<!-- rich-text支持显示emo表情以及消息换行，但是不支持点击a标签 -->
 								<rich-text v-else class="message-text" :nodes="nodesText" />
-							</im-long-press-menu>
+							</im-context-menu>
 						</view>
 						<view class="message-image" v-else-if="msgInfo.type == MESSAGE_TYPE.IMAGE">
-							<im-long-press-menu :items="menuItems" @select="onSelectMenu">
+							<im-context-menu :items="menuItems" @select="onSelectMenu">
 								<view class="image-box">
 									<image class="send-image" :style="imageStyle" mode="aspectFill"
 										:src="contentData.thumbUrl" lazy-load="true" @click.stop="onShowFullImage()">
 									</image>
 									<im-loading v-if="sending"></im-loading>
 								</view>
-							</im-long-press-menu>
+							</im-context-menu>
 						</view>
 						<view class="message-file" v-else-if="msgInfo.type == MESSAGE_TYPE.FILE">
-							<im-long-press-menu :items="menuItems" @select="onSelectMenu">
+							<im-context-menu :items="menuItems" @select="onSelectMenu">
 								<view class="file-box">
 									<view class="file-info" style="overflow: hidden;">
 										<u-link class="file-name" :under-line="true" color="#007BFF"
@@ -46,9 +46,9 @@
 									<view class="file-icon iconfont icon-file"></view>
 									<im-loading v-if="sending"></im-loading>
 								</view>
-							</im-long-press-menu>
+							</im-context-menu>
 						</view>
-						<im-long-press-menu v-else-if="msgInfo.type == MESSAGE_TYPE.AUDIO" :items="menuItems"
+						<im-context-menu v-else-if="msgInfo.type == MESSAGE_TYPE.AUDIO" :items="menuItems"
 							@select="onSelectMenu">
 							<view class="message-audio message-text" @click="onPlayAudio()">
 								<text class="iconfont icon-voice-play"></text>
@@ -56,8 +56,8 @@
 								<text v-if="audioPlayState == 'PAUSE'" class="iconfont icon-play"></text>
 								<text v-if="audioPlayState == 'PLAYING'" class="iconfont icon-pause"></text>
 							</view>
-						</im-long-press-menu>
-						<im-long-press-menu v-if="isAction" :items="menuItems" @select="onSelectMenu">
+						</im-context-menu>
+						<im-context-menu v-if="isAction" :items="menuItems" @select="onSelectMenu">
 							<view class="chat-realtime message-text" @click="$emit('call')">
 								<text v-if="msgInfo.type == MESSAGE_TYPE.ACT_RT_VOICE"
 									class="iconfont icon-chat-voice"></text>
@@ -65,7 +65,7 @@
 									class="iconfont icon-chat-video"></text>
 								<text>{{ msgInfo.content }}</text>
 							</view>
-						</im-long-press-menu>
+						</im-context-menu>
 						<view v-if="sending && isTextMessage" class="sending">
 							<im-loading :size="40" icon-color="#656adf" :mask="false"></im-loading>
 						</view>
@@ -83,24 +83,22 @@
 				</view>
 			</view>
 		</view>
-		<im-chat-group-readed ref="chatGroupReaded" :groupMembers="groupMembers as any[]" :msgInfo="msgInfo" />
+		<im-read-receipt ref="chatGroupReaded" :groupMembers="groupMembers as any[]" :msgInfo="msgInfo" />
 	</view>
 </template>
 
 <script setup lang="ts">
 import { ref, computed } from 'vue'
-import ImHeadImage from '../im-head-image/im-head-image.vue'
-import ImChatGroupReaded from '../im-chat-group-readed/im-chat-group-readed.vue'
-import ImLongPressMenu from '../im-long-press-menu/im-long-press-menu.vue'
-import { MESSAGE_TYPE, MESSAGE_STATUS } from '../../index'
-import { datetime, dom, url, messageType } from '../../index'
+import ImAvatar from '../im-avatar/im-avatar.vue'
+import ImReadReceipt from '../im-read-receipt/im-read-receipt.vue'
+import ImContextMenu from '../im-context-menu/im-context-menu.vue'
+import { MESSAGE_TYPE, MESSAGE_STATUS, datetime, dom, url, messageType, emoji } from '../../index'
 
 interface Props {
 	avatar?: string;
 	showName: string;
 	msgInfo: any;
 	groupMembers?: any[];
-	emoji: any;
 }
 
 interface Emits {
@@ -261,7 +259,7 @@ const nodesText = computed(() => {
 	const color = props.msgInfo.selfSend ? 'white' : '';
 	let text = dom.html2Escape(props.msgInfo.content);
 	text = url.replaceURLWithHTMLLinks(text, color);
-	return props.emoji.transform(text, 'emoji-normal');
+	return emoji.transform(text, 'emoji-normal');
 });
 
 const imageStyle = computed(() => {
@@ -284,7 +282,7 @@ const imageStyle = computed(() => {
 </script>
 
 <style scoped lang="scss">
-.chat-message-item {
+.message-item {
 	padding: 2rpx 20rpx;
 
 	.message-tip {

package/components/{im-chat-group-readed/im-chat-group-readed.vue → im-read-receipt/im-read-receipt.vue}

@@ -1,6 +1,6 @@
 <template>
 	<u-popup ref="popup" mode="bottom">
-		<view class="chat-group-readed">
+		<view class="read-receipt">
 			<view class="uni-padding-wrap uni-common-mt">
 				<u-tabs :current="current" :list="items" :show-bar="false" @change="onClickItem"></u-tabs>
 			</view>
@@ -9,7 +9,7 @@
 					<im-virtual-scroller :items="readedMembers">
 						<template v-slot="{ item }">
 							<view class="member-item">
-								<im-head-image :name="item.showNickName" :online="item.online" :url="item.headImage"
+								<im-avatar :name="item.showNickName" :online="item.online" :url="item.headImage"
 									:size="90" />
 								<view class="member-name">{{ item.showNickName }}</view>
 							</view>
@@ -20,7 +20,7 @@
 					<im-virtual-scroller :items="unreadMembers">
 						<template v-slot="{ item }">
 							<view class="member-item">
-								<im-head-image :name="item.showNickName" :online="item.online" :url="item.headImage"
+								<im-avatar :name="item.showNickName" :online="item.online" :url="item.headImage"
 									:size="90" />
 								<view class="member-name">{{ item.showNickName }}</view>
 							</view>
@@ -34,7 +34,7 @@
 
 <script setup lang="ts">
 import { ref } from 'vue'
-import ImHeadImage from '../im-head-image/im-head-image.vue'
+import ImAvatar from '../im-avatar/im-avatar.vue'
 import ImVirtualScroller from '../im-virtual-scroller/im-virtual-scroller.vue'
 import { Chat, Message } from '../../libs';
 
@@ -143,7 +143,7 @@ defineExpose({
 </script>
 
 <style lang="scss" scoped>
-.chat-group-readed {
+.read-receipt {
 	position: relative;
 	display: flex;
 	flex-direction: column;