diff --git a/uni_modules/uni-id-pages/components/cloud-image/cloud-image.vue b/uni_modules/uni-id-pages/components/cloud-image/cloud-image.vue index 831d9310398fa57366c2a55a787d44a89ad58a56..f36bb91a7097a973d5c7d7597ecb0828c0ff08df 100644 --- a/uni_modules/uni-id-pages/components/cloud-image/cloud-image.vue +++ b/uni_modules/uni-id-pages/components/cloud-image/cloud-image.vue @@ -1,9 +1,9 @@ - + \ No newline at end of file diff --git a/uni_modules/uni-im/changelog.md b/uni_modules/uni-im/changelog.md index 3b37d797adf9bafcc1c19e726005b7ee0b9e5068..27c686ee79b164b667c43eebf4e64a804c5d16f0 100644 --- a/uni_modules/uni-im/changelog.md +++ b/uni_modules/uni-im/changelog.md @@ -1,3 +1,8 @@ +## 1.3.2(2022-12-05) +- 修复 因vue2与vue3下 :key 的位置要求不同 引起的chat页面报错问题 +## 1.3.1(2022-12-05) +- 修复 1.3.0版引起的截图粘贴发送失败的问题 +- 修复 集成到 uni-admin 中样式设置失败的问题 ## 1.3.0(2022-12-02) - 修复 APP端当消息未满半屏时,弹出的键盘会将消息顶出界面外 - 新增 消息类型支持代码模式 diff --git a/uni_modules/uni-im/common/store.js b/uni_modules/uni-im/common/store.js index 40760a1896e8ef93de65fd5a4f6a11d7bff42a21..56daae58b85bb24a69cc38c9716ec041dbeadc7c 100644 --- a/uni_modules/uni-im/common/store.js +++ b/uni_modules/uni-im/common/store.js @@ -169,7 +169,7 @@ export default { }, async initConversationData(context){ getConversationDatasPage = 0 - getApp().globalData.uniIm = {"msgManagers":{}} + getApp().globalData.uniIm.msgManagers = {} await context.commit('clearConversationDatas') await context.dispatch('loadMoreConversation') }, diff --git a/uni_modules/uni-im/common/utils.js b/uni_modules/uni-im/common/utils.js index d99e3f5ebc2cb70651c660921012013ce4281fd5..5739c2364cc7e1a9ee18838008e29b2e5ffb27ff 100644 --- a/uni_modules/uni-im/common/utils.js +++ b/uni_modules/uni-im/common/utils.js @@ -12,7 +12,10 @@ export default { init(){ setTimeout(()=>{ // 初始化uniIm依赖的全局变量 - getApp().globalData.uniIm = {"msgManagers":{}} + getApp().globalData.uniIm = { + "msgManagers":{}, + audioContext:uni.createInnerAudioContext() + } },0) //监听im消息 @@ -59,11 +62,23 @@ export default { listenImMsg(){ uni.onPushMessage(async res => { const {currentConversationId} = $store.state.uniIm - // console.log('收到消息 onPushMessage===================',res.type, res.data,currentConversationId ); + console.log('收到消息 onPushMessage===================',res.type, res.data,currentConversationId ); const {payload} = res.data if (payload.type == 'im') { const msg = payload.data // console.log({msg}); + + const {msg_id} = payload + if(msg_id){ + const db = uniCloud.database(); + let res = await db.collection('uni-im-msg').doc(msg_id).get() + console.error(res); + if(res.result.code == 0){ + payload.data.body = res.result.data[0].body + } + } + + if(res.type =='receive'){ // console.log(777); const {conversation_id} = msg diff --git a/uni_modules/uni-im/components/uni-im-code-view/default.css b/uni_modules/uni-im/components/uni-im-code-view/default.css new file mode 100644 index 0000000000000000000000000000000000000000..a75ea911626816107a2a126d4a990e187bc9d7ee --- /dev/null +++ b/uni_modules/uni-im/components/uni-im-code-view/default.css @@ -0,0 +1,9 @@ +/*! + Theme: Default + Description: Original highlight.js style + Author: (c) Ivan Sagalaev + Maintainer: @highlightjs/core-team + Website: https://highlightjs.org/ + License: see project LICENSE + Touched: 2021 +*/pre code.hljs{display:block;overflow-x:auto;padding:1em}code.hljs{padding:3px 5px}.hljs{background:#f3f3f3;color:#444}.hljs-comment{color:#697070}.hljs-punctuation,.hljs-tag{color:#444a}.hljs-tag .hljs-attr,.hljs-tag .hljs-name{color:#444}.hljs-attribute,.hljs-doctag,.hljs-keyword,.hljs-meta .hljs-keyword,.hljs-name,.hljs-selector-tag{font-weight:700}.hljs-deletion,.hljs-number,.hljs-quote,.hljs-selector-class,.hljs-selector-id,.hljs-string,.hljs-template-tag,.hljs-type{color:#800}.hljs-section,.hljs-title{color:#800;font-weight:700}.hljs-link,.hljs-operator,.hljs-regexp,.hljs-selector-attr,.hljs-selector-pseudo,.hljs-symbol,.hljs-template-variable,.hljs-variable{color:#ab5656}.hljs-literal{color:#695}.hljs-addition,.hljs-built_in,.hljs-bullet,.hljs-code{color:#397300}.hljs-meta{color:#1f7199}.hljs-meta .hljs-string{color:#38a}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:700} \ No newline at end of file diff --git a/uni_modules/uni-im/components/uni-im-code-view/package-lock.json b/uni_modules/uni-im/components/uni-im-code-view/package-lock.json new file mode 100644 index 0000000000000000000000000000000000000000..c35689962ff786e565c29dcbfbd2c6a204b76a52 --- /dev/null +++ b/uni_modules/uni-im/components/uni-im-code-view/package-lock.json @@ -0,0 +1,31 @@ +{ + "name": "uni-im-code-view", + "version": "1.0.0", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "name": "uni-im-code-view", + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "highlight.js": "^11.7.0" + } + }, + "node_modules/highlight.js": { + "version": "11.7.0", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.7.0.tgz", + "integrity": "sha512-1rRqesRFhMO/PRF+G86evnyJkCgaZFOI+Z6kdj15TA18funfoqJXvgPCLSf0SWq3SRfg1j3HlDs8o4s3EGq1oQ==", + "engines": { + "node": ">=12.0.0" + } + } + }, + "dependencies": { + "highlight.js": { + "version": "11.7.0", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.7.0.tgz", + "integrity": "sha512-1rRqesRFhMO/PRF+G86evnyJkCgaZFOI+Z6kdj15TA18funfoqJXvgPCLSf0SWq3SRfg1j3HlDs8o4s3EGq1oQ==" + } + } +} diff --git a/uni_modules/uni-im/components/uni-im-code-view/package.json b/uni_modules/uni-im/components/uni-im-code-view/package.json new file mode 100644 index 0000000000000000000000000000000000000000..d9bd0742e98db509eba5ea9d0e0ccc315d914013 --- /dev/null +++ b/uni_modules/uni-im/components/uni-im-code-view/package.json @@ -0,0 +1,14 @@ +{ + "name": "uni-im-code-view", + "version": "1.0.0", + "description": "", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "ISC", + "dependencies": { + "highlight.js": "^11.7.0" + } +} diff --git a/uni_modules/uni-im/components/uni-im-code-view/uni-im-code-view.vue b/uni_modules/uni-im/components/uni-im-code-view/uni-im-code-view.vue new file mode 100644 index 0000000000000000000000000000000000000000..ac5e7482c53c540d5aa6f2a9de3ba9698fe25371 --- /dev/null +++ b/uni_modules/uni-im/components/uni-im-code-view/uni-im-code-view.vue @@ -0,0 +1,220 @@ + + + + + diff --git a/uni_modules/uni-im/components/uni-im-icons/uni-im-icons.ttf b/uni_modules/uni-im/components/uni-im-icons/uni-im-icons.ttf new file mode 100644 index 0000000000000000000000000000000000000000..990da612d58da44bcd9ba7e88053acf4e93e4471 Binary files /dev/null and b/uni_modules/uni-im/components/uni-im-icons/uni-im-icons.ttf differ diff --git a/uni_modules/uni-im/components/uni-im-icons/uni-im-icons.vue b/uni_modules/uni-im/components/uni-im-icons/uni-im-icons.vue new file mode 100644 index 0000000000000000000000000000000000000000..65771d56568211784bd1dec870ca8e263c17243f --- /dev/null +++ b/uni_modules/uni-im/components/uni-im-icons/uni-im-icons.vue @@ -0,0 +1,84 @@ + + + + + diff --git a/uni_modules/uni-im/components/uni-im-msg/uni-im-msg.vue b/uni_modules/uni-im/components/uni-im-msg/uni-im-msg.vue old mode 100755 new mode 100644 index dfb3ee5a27618c608da40591d4f84fbde5991efd..9cac881255ef104bafae185b5910df15e09bcd63 --- a/uni_modules/uni-im/components/uni-im-msg/uni-im-msg.vue +++ b/uni_modules/uni-im/components/uni-im-msg/uni-im-msg.vue @@ -6,12 +6,19 @@ - - - + + + + {{msg.body.time}}'' + + + + - - - - -