diff --git a/im-ui/package.json b/im-ui/package.json index a4c049a..950f505 100644 --- a/im-ui/package.json +++ b/im-ui/package.json @@ -49,7 +49,8 @@ "no-console": "off", "vue/no-unused-components": "off", "no-irregular-whitespace": "off", - "no-debugger": "off" + "no-debugger": "off", + "no-useless-escape": "off" } }, "browserslist": [ diff --git a/im-ui/src/api/element.js b/im-ui/src/api/element.js new file mode 100644 index 0000000..8a83926 --- /dev/null +++ b/im-ui/src/api/element.js @@ -0,0 +1,20 @@ +let fixTop = (e) => { + var offset = e.offsetTop + if (e.offsetParent != null) { + offset += fixTop(e.offsetParent) + } + return offset +} + +let fixLeft = (e) => { + var offset = e.offsetLeft + if (e.offsetParent != null) { + offset += fixLeft(e.offsetParent) + } + return offset +} + +export default{ + fixTop, + fixLeft +} diff --git a/im-ui/src/api/emotion.js b/im-ui/src/api/emotion.js new file mode 100644 index 0000000..3e571f2 --- /dev/null +++ b/im-ui/src/api/emotion.js @@ -0,0 +1,22 @@ +const emoTextList = ['微笑', '撇嘴', '色', '发呆', '得意', '流泪', '害羞', '闭嘴', '睡', '大哭', '尴尬', '发怒', '调皮', '呲牙', '惊讶', '难过', '酷', '冷汗', '抓狂', '吐', '偷笑', '可爱', '白眼', '傲慢', '饥饿', '困', '惊恐', '流汗', '憨笑', '大兵', '奋斗', '咒骂', '疑问', '嘘', '晕', '折磨', '衰', '骷髅', '敲打', '再见', '擦汗', '抠鼻', '鼓掌', '糗大了', '坏笑', '左哼哼', '右哼哼', '哈欠', '鄙视', '委屈', '快哭了', '阴险', '亲亲', '吓', '可怜', '菜刀', '西瓜', '啤酒', '篮球', '乒乓', '咖啡', '饭', '猪头', '玫瑰', '凋谢', '示爱', '爱心', '心碎', '蛋糕', '闪电', '炸弹', '刀', '足球', '瓢虫', '便便', '月亮', '太阳', '礼物', '拥抱', '强', '弱', '握手', '胜利', '抱拳', '勾引', '拳头', '差劲', '爱你', 'NO', 'OK', '爱情', '飞吻', '跳跳', '发抖', '怄火', '转圈', '磕头', '回头', '跳绳', '挥手', '激动', '街舞', '献吻', '左太极', '右太极']; + + +let transform = (content) => { + console.log(content) + return content.replace(/\#[\u4E00-\u9FA5]{1,3}\;/gi, textToImg); +} + +// 将匹配结果替换表情图片 +let textToImg = (emoText) => { + let word = emoText.replace(/\#|\;/gi, ''); + let idx = emoTextList.indexOf(word); + let url = require(`@/assets/emoji/${idx}.gif`); + return `` +} + + +export default { + emoTextList, + transform, + textToImg +} diff --git a/im-ui/src/assets/emoji/0.gif b/im-ui/src/assets/emoji/0.gif new file mode 100644 index 0000000..5be27cb Binary files /dev/null and b/im-ui/src/assets/emoji/0.gif differ diff --git a/im-ui/src/assets/emoji/1.gif b/im-ui/src/assets/emoji/1.gif new file mode 100644 index 0000000..a2644a9 Binary files /dev/null and b/im-ui/src/assets/emoji/1.gif differ diff --git a/im-ui/src/assets/emoji/10.gif b/im-ui/src/assets/emoji/10.gif new file mode 100644 index 0000000..905c15b Binary files /dev/null and b/im-ui/src/assets/emoji/10.gif differ diff --git a/im-ui/src/assets/emoji/100.gif b/im-ui/src/assets/emoji/100.gif new file mode 100644 index 0000000..92ad35d Binary files /dev/null and b/im-ui/src/assets/emoji/100.gif differ diff --git a/im-ui/src/assets/emoji/101.gif b/im-ui/src/assets/emoji/101.gif new file mode 100644 index 0000000..1f27663 Binary files /dev/null and b/im-ui/src/assets/emoji/101.gif differ diff --git a/im-ui/src/assets/emoji/102.gif b/im-ui/src/assets/emoji/102.gif new file mode 100644 index 0000000..748ded1 Binary files /dev/null and b/im-ui/src/assets/emoji/102.gif differ diff --git a/im-ui/src/assets/emoji/103.gif b/im-ui/src/assets/emoji/103.gif new file mode 100644 index 0000000..be9eaa0 Binary files /dev/null and b/im-ui/src/assets/emoji/103.gif differ diff --git a/im-ui/src/assets/emoji/104.gif b/im-ui/src/assets/emoji/104.gif new file mode 100644 index 0000000..d7c2066 Binary files /dev/null and b/im-ui/src/assets/emoji/104.gif differ diff --git a/im-ui/src/assets/emoji/11.gif b/im-ui/src/assets/emoji/11.gif new file mode 100644 index 0000000..b512dd5 Binary files /dev/null and b/im-ui/src/assets/emoji/11.gif differ diff --git a/im-ui/src/assets/emoji/12.gif b/im-ui/src/assets/emoji/12.gif new file mode 100644 index 0000000..547529c Binary files /dev/null and b/im-ui/src/assets/emoji/12.gif differ diff --git a/im-ui/src/assets/emoji/13.gif b/im-ui/src/assets/emoji/13.gif new file mode 100644 index 0000000..3475300 Binary files /dev/null and b/im-ui/src/assets/emoji/13.gif differ diff --git a/im-ui/src/assets/emoji/14.gif b/im-ui/src/assets/emoji/14.gif new file mode 100644 index 0000000..6a788f8 Binary files /dev/null and b/im-ui/src/assets/emoji/14.gif differ diff --git a/im-ui/src/assets/emoji/15.gif b/im-ui/src/assets/emoji/15.gif new file mode 100644 index 0000000..debab8e Binary files /dev/null and b/im-ui/src/assets/emoji/15.gif differ diff --git a/im-ui/src/assets/emoji/16.gif b/im-ui/src/assets/emoji/16.gif new file mode 100644 index 0000000..ed5d29f Binary files /dev/null and b/im-ui/src/assets/emoji/16.gif differ diff --git a/im-ui/src/assets/emoji/17.gif b/im-ui/src/assets/emoji/17.gif new file mode 100644 index 0000000..85886fe Binary files /dev/null and b/im-ui/src/assets/emoji/17.gif differ diff --git a/im-ui/src/assets/emoji/18.gif b/im-ui/src/assets/emoji/18.gif new file mode 100644 index 0000000..b6af218 Binary files /dev/null and b/im-ui/src/assets/emoji/18.gif differ diff --git a/im-ui/src/assets/emoji/19.gif b/im-ui/src/assets/emoji/19.gif new file mode 100644 index 0000000..e045ff2 Binary files /dev/null and b/im-ui/src/assets/emoji/19.gif differ diff --git a/im-ui/src/assets/emoji/2.gif b/im-ui/src/assets/emoji/2.gif new file mode 100644 index 0000000..40cfda4 Binary files /dev/null and b/im-ui/src/assets/emoji/2.gif differ diff --git a/im-ui/src/assets/emoji/20.gif b/im-ui/src/assets/emoji/20.gif new file mode 100644 index 0000000..efd650f Binary files /dev/null and b/im-ui/src/assets/emoji/20.gif differ diff --git a/im-ui/src/assets/emoji/21.gif b/im-ui/src/assets/emoji/21.gif new file mode 100644 index 0000000..cb8cf6d Binary files /dev/null and b/im-ui/src/assets/emoji/21.gif differ diff --git a/im-ui/src/assets/emoji/22.gif b/im-ui/src/assets/emoji/22.gif new file mode 100644 index 0000000..96b04df Binary files /dev/null and b/im-ui/src/assets/emoji/22.gif differ diff --git a/im-ui/src/assets/emoji/23.gif b/im-ui/src/assets/emoji/23.gif new file mode 100644 index 0000000..96516b8 Binary files /dev/null and b/im-ui/src/assets/emoji/23.gif differ diff --git a/im-ui/src/assets/emoji/24.gif b/im-ui/src/assets/emoji/24.gif new file mode 100644 index 0000000..5f925c7 Binary files /dev/null and b/im-ui/src/assets/emoji/24.gif differ diff --git a/im-ui/src/assets/emoji/25.gif b/im-ui/src/assets/emoji/25.gif new file mode 100644 index 0000000..97f8b1a Binary files /dev/null and b/im-ui/src/assets/emoji/25.gif differ diff --git a/im-ui/src/assets/emoji/26.gif b/im-ui/src/assets/emoji/26.gif new file mode 100644 index 0000000..a7cded7 Binary files /dev/null and b/im-ui/src/assets/emoji/26.gif differ diff --git a/im-ui/src/assets/emoji/27.gif b/im-ui/src/assets/emoji/27.gif new file mode 100644 index 0000000..bb46890 Binary files /dev/null and b/im-ui/src/assets/emoji/27.gif differ diff --git a/im-ui/src/assets/emoji/28.gif b/im-ui/src/assets/emoji/28.gif new file mode 100644 index 0000000..f59dd58 Binary files /dev/null and b/im-ui/src/assets/emoji/28.gif differ diff --git a/im-ui/src/assets/emoji/29.gif b/im-ui/src/assets/emoji/29.gif new file mode 100644 index 0000000..3c5227e Binary files /dev/null and b/im-ui/src/assets/emoji/29.gif differ diff --git a/im-ui/src/assets/emoji/3.gif b/im-ui/src/assets/emoji/3.gif new file mode 100644 index 0000000..6d6f762 Binary files /dev/null and b/im-ui/src/assets/emoji/3.gif differ diff --git a/im-ui/src/assets/emoji/30.gif b/im-ui/src/assets/emoji/30.gif new file mode 100644 index 0000000..e24a180 Binary files /dev/null and b/im-ui/src/assets/emoji/30.gif differ diff --git a/im-ui/src/assets/emoji/31.gif b/im-ui/src/assets/emoji/31.gif new file mode 100644 index 0000000..073e743 Binary files /dev/null and b/im-ui/src/assets/emoji/31.gif differ diff --git a/im-ui/src/assets/emoji/32.gif b/im-ui/src/assets/emoji/32.gif new file mode 100644 index 0000000..772eff2 Binary files /dev/null and b/im-ui/src/assets/emoji/32.gif differ diff --git a/im-ui/src/assets/emoji/33.gif b/im-ui/src/assets/emoji/33.gif new file mode 100644 index 0000000..217c1c5 Binary files /dev/null and b/im-ui/src/assets/emoji/33.gif differ diff --git a/im-ui/src/assets/emoji/34.gif b/im-ui/src/assets/emoji/34.gif new file mode 100644 index 0000000..e9d4213 Binary files /dev/null and b/im-ui/src/assets/emoji/34.gif differ diff --git a/im-ui/src/assets/emoji/35.gif b/im-ui/src/assets/emoji/35.gif new file mode 100644 index 0000000..d6da2c3 Binary files /dev/null and b/im-ui/src/assets/emoji/35.gif differ diff --git a/im-ui/src/assets/emoji/36.gif b/im-ui/src/assets/emoji/36.gif new file mode 100644 index 0000000..c1e6ac9 Binary files /dev/null and b/im-ui/src/assets/emoji/36.gif differ diff --git a/im-ui/src/assets/emoji/37.gif b/im-ui/src/assets/emoji/37.gif new file mode 100644 index 0000000..92efec6 Binary files /dev/null and b/im-ui/src/assets/emoji/37.gif differ diff --git a/im-ui/src/assets/emoji/38.gif b/im-ui/src/assets/emoji/38.gif new file mode 100644 index 0000000..489f0f9 Binary files /dev/null and b/im-ui/src/assets/emoji/38.gif differ diff --git a/im-ui/src/assets/emoji/39.gif b/im-ui/src/assets/emoji/39.gif new file mode 100644 index 0000000..734f6d8 Binary files /dev/null and b/im-ui/src/assets/emoji/39.gif differ diff --git a/im-ui/src/assets/emoji/4.gif b/im-ui/src/assets/emoji/4.gif new file mode 100644 index 0000000..6ccdaa2 Binary files /dev/null and b/im-ui/src/assets/emoji/4.gif differ diff --git a/im-ui/src/assets/emoji/40.gif b/im-ui/src/assets/emoji/40.gif new file mode 100644 index 0000000..24a8eb6 Binary files /dev/null and b/im-ui/src/assets/emoji/40.gif differ diff --git a/im-ui/src/assets/emoji/41.gif b/im-ui/src/assets/emoji/41.gif new file mode 100644 index 0000000..99139e1 Binary files /dev/null and b/im-ui/src/assets/emoji/41.gif differ diff --git a/im-ui/src/assets/emoji/42.gif b/im-ui/src/assets/emoji/42.gif new file mode 100644 index 0000000..f60897e Binary files /dev/null and b/im-ui/src/assets/emoji/42.gif differ diff --git a/im-ui/src/assets/emoji/43.gif b/im-ui/src/assets/emoji/43.gif new file mode 100644 index 0000000..4350491 Binary files /dev/null and b/im-ui/src/assets/emoji/43.gif differ diff --git a/im-ui/src/assets/emoji/44.gif b/im-ui/src/assets/emoji/44.gif new file mode 100644 index 0000000..650d3dd Binary files /dev/null and b/im-ui/src/assets/emoji/44.gif differ diff --git a/im-ui/src/assets/emoji/45.gif b/im-ui/src/assets/emoji/45.gif new file mode 100644 index 0000000..5c8e071 Binary files /dev/null and b/im-ui/src/assets/emoji/45.gif differ diff --git a/im-ui/src/assets/emoji/46.gif b/im-ui/src/assets/emoji/46.gif new file mode 100644 index 0000000..f3cb074 Binary files /dev/null and b/im-ui/src/assets/emoji/46.gif differ diff --git a/im-ui/src/assets/emoji/47.gif b/im-ui/src/assets/emoji/47.gif new file mode 100644 index 0000000..5b3057a Binary files /dev/null and b/im-ui/src/assets/emoji/47.gif differ diff --git a/im-ui/src/assets/emoji/48.gif b/im-ui/src/assets/emoji/48.gif new file mode 100644 index 0000000..27a30c1 Binary files /dev/null and b/im-ui/src/assets/emoji/48.gif differ diff --git a/im-ui/src/assets/emoji/49.gif b/im-ui/src/assets/emoji/49.gif new file mode 100644 index 0000000..dcfa48a Binary files /dev/null and b/im-ui/src/assets/emoji/49.gif differ diff --git a/im-ui/src/assets/emoji/5.gif b/im-ui/src/assets/emoji/5.gif new file mode 100644 index 0000000..ab0b81b Binary files /dev/null and b/im-ui/src/assets/emoji/5.gif differ diff --git a/im-ui/src/assets/emoji/50.gif b/im-ui/src/assets/emoji/50.gif new file mode 100644 index 0000000..029cf0f Binary files /dev/null and b/im-ui/src/assets/emoji/50.gif differ diff --git a/im-ui/src/assets/emoji/51.gif b/im-ui/src/assets/emoji/51.gif new file mode 100644 index 0000000..69f183f Binary files /dev/null and b/im-ui/src/assets/emoji/51.gif differ diff --git a/im-ui/src/assets/emoji/52.gif b/im-ui/src/assets/emoji/52.gif new file mode 100644 index 0000000..d41e8aa Binary files /dev/null and b/im-ui/src/assets/emoji/52.gif differ diff --git a/im-ui/src/assets/emoji/53.gif b/im-ui/src/assets/emoji/53.gif new file mode 100644 index 0000000..56352dd Binary files /dev/null and b/im-ui/src/assets/emoji/53.gif differ diff --git a/im-ui/src/assets/emoji/54.gif b/im-ui/src/assets/emoji/54.gif new file mode 100644 index 0000000..b28d848 Binary files /dev/null and b/im-ui/src/assets/emoji/54.gif differ diff --git a/im-ui/src/assets/emoji/55.gif b/im-ui/src/assets/emoji/55.gif new file mode 100644 index 0000000..e18da84 Binary files /dev/null and b/im-ui/src/assets/emoji/55.gif differ diff --git a/im-ui/src/assets/emoji/56.gif b/im-ui/src/assets/emoji/56.gif new file mode 100644 index 0000000..edf96f0 Binary files /dev/null and b/im-ui/src/assets/emoji/56.gif differ diff --git a/im-ui/src/assets/emoji/57.gif b/im-ui/src/assets/emoji/57.gif new file mode 100644 index 0000000..3f0e2b9 Binary files /dev/null and b/im-ui/src/assets/emoji/57.gif differ diff --git a/im-ui/src/assets/emoji/58.gif b/im-ui/src/assets/emoji/58.gif new file mode 100644 index 0000000..47b1aaa Binary files /dev/null and b/im-ui/src/assets/emoji/58.gif differ diff --git a/im-ui/src/assets/emoji/59.gif b/im-ui/src/assets/emoji/59.gif new file mode 100644 index 0000000..918288b Binary files /dev/null and b/im-ui/src/assets/emoji/59.gif differ diff --git a/im-ui/src/assets/emoji/6.gif b/im-ui/src/assets/emoji/6.gif new file mode 100644 index 0000000..ceab122 Binary files /dev/null and b/im-ui/src/assets/emoji/6.gif differ diff --git a/im-ui/src/assets/emoji/60.gif b/im-ui/src/assets/emoji/60.gif new file mode 100644 index 0000000..66d2113 Binary files /dev/null and b/im-ui/src/assets/emoji/60.gif differ diff --git a/im-ui/src/assets/emoji/61.gif b/im-ui/src/assets/emoji/61.gif new file mode 100644 index 0000000..034933e Binary files /dev/null and b/im-ui/src/assets/emoji/61.gif differ diff --git a/im-ui/src/assets/emoji/62.gif b/im-ui/src/assets/emoji/62.gif new file mode 100644 index 0000000..8d5c4fd Binary files /dev/null and b/im-ui/src/assets/emoji/62.gif differ diff --git a/im-ui/src/assets/emoji/63.gif b/im-ui/src/assets/emoji/63.gif new file mode 100644 index 0000000..d58fcf6 Binary files /dev/null and b/im-ui/src/assets/emoji/63.gif differ diff --git a/im-ui/src/assets/emoji/64.gif b/im-ui/src/assets/emoji/64.gif new file mode 100644 index 0000000..c4e00bd Binary files /dev/null and b/im-ui/src/assets/emoji/64.gif differ diff --git a/im-ui/src/assets/emoji/65.gif b/im-ui/src/assets/emoji/65.gif new file mode 100644 index 0000000..da23bfa Binary files /dev/null and b/im-ui/src/assets/emoji/65.gif differ diff --git a/im-ui/src/assets/emoji/66.gif b/im-ui/src/assets/emoji/66.gif new file mode 100644 index 0000000..310ec65 Binary files /dev/null and b/im-ui/src/assets/emoji/66.gif differ diff --git a/im-ui/src/assets/emoji/67.gif b/im-ui/src/assets/emoji/67.gif new file mode 100644 index 0000000..51761ba Binary files /dev/null and b/im-ui/src/assets/emoji/67.gif differ diff --git a/im-ui/src/assets/emoji/68.gif b/im-ui/src/assets/emoji/68.gif new file mode 100644 index 0000000..345cb43 Binary files /dev/null and b/im-ui/src/assets/emoji/68.gif differ diff --git a/im-ui/src/assets/emoji/69.gif b/im-ui/src/assets/emoji/69.gif new file mode 100644 index 0000000..e0f28a0 Binary files /dev/null and b/im-ui/src/assets/emoji/69.gif differ diff --git a/im-ui/src/assets/emoji/7.gif b/im-ui/src/assets/emoji/7.gif new file mode 100644 index 0000000..2f45399 Binary files /dev/null and b/im-ui/src/assets/emoji/7.gif differ diff --git a/im-ui/src/assets/emoji/70.gif b/im-ui/src/assets/emoji/70.gif new file mode 100644 index 0000000..24284cf Binary files /dev/null and b/im-ui/src/assets/emoji/70.gif differ diff --git a/im-ui/src/assets/emoji/71.gif b/im-ui/src/assets/emoji/71.gif new file mode 100644 index 0000000..a0ccf2e Binary files /dev/null and b/im-ui/src/assets/emoji/71.gif differ diff --git a/im-ui/src/assets/emoji/72.gif b/im-ui/src/assets/emoji/72.gif new file mode 100644 index 0000000..7e113ee Binary files /dev/null and b/im-ui/src/assets/emoji/72.gif differ diff --git a/im-ui/src/assets/emoji/73.gif b/im-ui/src/assets/emoji/73.gif new file mode 100644 index 0000000..c0293c3 Binary files /dev/null and b/im-ui/src/assets/emoji/73.gif differ diff --git a/im-ui/src/assets/emoji/74.gif b/im-ui/src/assets/emoji/74.gif new file mode 100644 index 0000000..1c52bde Binary files /dev/null and b/im-ui/src/assets/emoji/74.gif differ diff --git a/im-ui/src/assets/emoji/75.gif b/im-ui/src/assets/emoji/75.gif new file mode 100644 index 0000000..9cb9aa7 Binary files /dev/null and b/im-ui/src/assets/emoji/75.gif differ diff --git a/im-ui/src/assets/emoji/76.gif b/im-ui/src/assets/emoji/76.gif new file mode 100644 index 0000000..27019f8 Binary files /dev/null and b/im-ui/src/assets/emoji/76.gif differ diff --git a/im-ui/src/assets/emoji/77.gif b/im-ui/src/assets/emoji/77.gif new file mode 100644 index 0000000..8f882f5 Binary files /dev/null and b/im-ui/src/assets/emoji/77.gif differ diff --git a/im-ui/src/assets/emoji/78.gif b/im-ui/src/assets/emoji/78.gif new file mode 100644 index 0000000..d0d0856 Binary files /dev/null and b/im-ui/src/assets/emoji/78.gif differ diff --git a/im-ui/src/assets/emoji/79.gif b/im-ui/src/assets/emoji/79.gif new file mode 100644 index 0000000..61652a7 Binary files /dev/null and b/im-ui/src/assets/emoji/79.gif differ diff --git a/im-ui/src/assets/emoji/8.gif b/im-ui/src/assets/emoji/8.gif new file mode 100644 index 0000000..f6c8834 Binary files /dev/null and b/im-ui/src/assets/emoji/8.gif differ diff --git a/im-ui/src/assets/emoji/80.gif b/im-ui/src/assets/emoji/80.gif new file mode 100644 index 0000000..9a77936 Binary files /dev/null and b/im-ui/src/assets/emoji/80.gif differ diff --git a/im-ui/src/assets/emoji/81.gif b/im-ui/src/assets/emoji/81.gif new file mode 100644 index 0000000..2329101 Binary files /dev/null and b/im-ui/src/assets/emoji/81.gif differ diff --git a/im-ui/src/assets/emoji/82.gif b/im-ui/src/assets/emoji/82.gif new file mode 100644 index 0000000..644748a Binary files /dev/null and b/im-ui/src/assets/emoji/82.gif differ diff --git a/im-ui/src/assets/emoji/83.gif b/im-ui/src/assets/emoji/83.gif new file mode 100644 index 0000000..fbf275b Binary files /dev/null and b/im-ui/src/assets/emoji/83.gif differ diff --git a/im-ui/src/assets/emoji/84.gif b/im-ui/src/assets/emoji/84.gif new file mode 100644 index 0000000..076f0c6 Binary files /dev/null and b/im-ui/src/assets/emoji/84.gif differ diff --git a/im-ui/src/assets/emoji/85.gif b/im-ui/src/assets/emoji/85.gif new file mode 100644 index 0000000..d254af4 Binary files /dev/null and b/im-ui/src/assets/emoji/85.gif differ diff --git a/im-ui/src/assets/emoji/86.gif b/im-ui/src/assets/emoji/86.gif new file mode 100644 index 0000000..8f09d33 Binary files /dev/null and b/im-ui/src/assets/emoji/86.gif differ diff --git a/im-ui/src/assets/emoji/87.gif b/im-ui/src/assets/emoji/87.gif new file mode 100644 index 0000000..df70756 Binary files /dev/null and b/im-ui/src/assets/emoji/87.gif differ diff --git a/im-ui/src/assets/emoji/88.gif b/im-ui/src/assets/emoji/88.gif new file mode 100644 index 0000000..4d8b15e Binary files /dev/null and b/im-ui/src/assets/emoji/88.gif differ diff --git a/im-ui/src/assets/emoji/89.gif b/im-ui/src/assets/emoji/89.gif new file mode 100644 index 0000000..05726dc Binary files /dev/null and b/im-ui/src/assets/emoji/89.gif differ diff --git a/im-ui/src/assets/emoji/9.gif b/im-ui/src/assets/emoji/9.gif new file mode 100644 index 0000000..c2d8450 Binary files /dev/null and b/im-ui/src/assets/emoji/9.gif differ diff --git a/im-ui/src/assets/emoji/90.gif b/im-ui/src/assets/emoji/90.gif new file mode 100644 index 0000000..adaf20e Binary files /dev/null and b/im-ui/src/assets/emoji/90.gif differ diff --git a/im-ui/src/assets/emoji/91.gif b/im-ui/src/assets/emoji/91.gif new file mode 100644 index 0000000..608d0ad Binary files /dev/null and b/im-ui/src/assets/emoji/91.gif differ diff --git a/im-ui/src/assets/emoji/92.gif b/im-ui/src/assets/emoji/92.gif new file mode 100644 index 0000000..b909e16 Binary files /dev/null and b/im-ui/src/assets/emoji/92.gif differ diff --git a/im-ui/src/assets/emoji/93.gif b/im-ui/src/assets/emoji/93.gif new file mode 100644 index 0000000..7f71a8c Binary files /dev/null and b/im-ui/src/assets/emoji/93.gif differ diff --git a/im-ui/src/assets/emoji/94.gif b/im-ui/src/assets/emoji/94.gif new file mode 100644 index 0000000..4f26d7d Binary files /dev/null and b/im-ui/src/assets/emoji/94.gif differ diff --git a/im-ui/src/assets/emoji/95.gif b/im-ui/src/assets/emoji/95.gif new file mode 100644 index 0000000..5ef6d38 Binary files /dev/null and b/im-ui/src/assets/emoji/95.gif differ diff --git a/im-ui/src/assets/emoji/96.gif b/im-ui/src/assets/emoji/96.gif new file mode 100644 index 0000000..2b709e1 Binary files /dev/null and b/im-ui/src/assets/emoji/96.gif differ diff --git a/im-ui/src/assets/emoji/97.gif b/im-ui/src/assets/emoji/97.gif new file mode 100644 index 0000000..cf29be8 Binary files /dev/null and b/im-ui/src/assets/emoji/97.gif differ diff --git a/im-ui/src/assets/emoji/98.gif b/im-ui/src/assets/emoji/98.gif new file mode 100644 index 0000000..c70e7d3 Binary files /dev/null and b/im-ui/src/assets/emoji/98.gif differ diff --git a/im-ui/src/assets/emoji/99.gif b/im-ui/src/assets/emoji/99.gif new file mode 100644 index 0000000..05c1863 Binary files /dev/null and b/im-ui/src/assets/emoji/99.gif differ diff --git a/im-ui/src/components/chat/ChatGroup.vue b/im-ui/src/components/chat/ChatGroup.vue index 57197b3..f4079c0 100644 --- a/im-ui/src/components/chat/ChatGroup.vue +++ b/im-ui/src/components/chat/ChatGroup.vue @@ -19,8 +19,10 @@
-
-
+
+ +
+
@@ -42,7 +44,7 @@ - + @@ -51,13 +53,15 @@ import ChatGroupSide from "./ChatGroupSide.vue"; import MessageItem from "./MessageItem.vue"; import FileUpload from "../common/FileUpload.vue"; - + import Emotion from "../common/Emotion.vue"; + export default { name: "chatPrivate", components: { MessageItem, FileUpload, - ChatGroupSide + ChatGroupSide, + Emotion }, props: { chat: { @@ -69,7 +73,12 @@ sendText: "", showSide: false, group: {}, - groupMembers: [] + groupMembers: [], + showEmotion: false, + emoBoxPos: { + x: 0, + y: 0 + } } }, methods: { @@ -188,6 +197,17 @@ handleCloseSide() { this.showSide = false; }, + switchEmotionBox() { + this.showEmotion = !this.showEmotion; + let width = this.$refs.emotion.offsetWidth; + let left = this.$elm.fixLeft(this.$refs.emotion); + let top = this.$elm.fixTop(this.$refs.emotion); + this.emoBoxPos.y = top; + this.emoBoxPos.x = left + width / 2; + }, + handleEmotion(emoText) { + this.sendText += emoText; + }, sendTextMessage() { if (!this.sendText.trim()) { @@ -262,10 +282,10 @@ let size = this.groupMembers.filter(m => !m.quit).length; return `${this.chat.showName}(${size})`; }, - imageAction(){ + imageAction() { return `${process.env.VUE_APP_BASE_API}/image/upload`; }, - fileAction(){ + fileAction() { return `${process.env.VUE_APP_BASE_API}/file/upload`; } @@ -285,14 +305,14 @@ line-height: 60px; font-size: 22px; cursor: pointer; - + &:hover { font-size: 30px; } } - - .chat-group-side-box{ + + .chat-group-side-box { border: #dddddd solid 1px; animation: rtl-drawer-in .3s 1ms; } diff --git a/im-ui/src/components/chat/ChatItem.vue b/im-ui/src/components/chat/ChatItem.vue index 867253f..ad3e6a2 100644 --- a/im-ui/src/components/chat/ChatItem.vue +++ b/im-ui/src/components/chat/ChatItem.vue @@ -7,7 +7,7 @@
{{ chat.showName}}
-
{{chat.lastContent}}
+
diff --git a/im-ui/src/components/chat/ChatPrivate.vue b/im-ui/src/components/chat/ChatPrivate.vue index 5791c93..8ece220 100644 --- a/im-ui/src/components/chat/ChatPrivate.vue +++ b/im-ui/src/components/chat/ChatPrivate.vue @@ -16,7 +16,9 @@
-
+
+ +
@@ -42,12 +44,14 @@ + diff --git a/im-ui/src/main.js b/im-ui/src/main.js index 4afcdf7..f68bb2b 100644 --- a/im-ui/src/main.js +++ b/im-ui/src/main.js @@ -5,6 +5,8 @@ import ElementUI from 'element-ui'; import 'element-ui/lib/theme-chalk/index.css'; import httpRequest from './api/httpRequest'; import * as socketApi from './api/wssocket'; +import emotion from './api/emotion.js'; +import element from './api/element.js'; import store from './store'; @@ -13,7 +15,8 @@ Vue.use(ElementUI); // 挂载全局 Vue.prototype.$wsApi = socketApi; Vue.prototype.$http = httpRequest // http请求方法 - +Vue.prototype.$emo = emotion; // emo表情 +Vue.prototype.$elm = element; // 元素操作 Vue.config.productionTip = false; diff --git a/im-ui/src/view/Chat.vue b/im-ui/src/view/Chat.vue index ab31ca7..4b181f4 100644 --- a/im-ui/src/view/Chat.vue +++ b/im-ui/src/view/Chat.vue @@ -164,6 +164,8 @@ padding: 5px; background-color: white; line-height: 50px; + font-size: 20px; + font-weight: 600; border: #dddddd solid 1px; } diff --git a/im-ui/src/view/Friend.vue b/im-ui/src/view/Friend.vue index a04bd20..177f196 100644 --- a/im-ui/src/view/Friend.vue +++ b/im-ui/src/view/Friend.vue @@ -190,6 +190,7 @@ font-size: 20px; text-align: left; text-indent: 10px; + font-weight: 600; background-color: white; border: #dddddd solid 1px; } diff --git a/im-ui/src/view/Group.vue b/im-ui/src/view/Group.vue index 249fb4e..f2202ca 100644 --- a/im-ui/src/view/Group.vue +++ b/im-ui/src/view/Group.vue @@ -294,6 +294,7 @@ padding: 5px; line-height: 50px; font-size: 20px; + font-weight: 600; text-align: left; text-indent: 10px; background-color: white;