github
/
jeecg-boot-vue3
mirror of https://github.com/jeecgboot/jeecgboot-vue3
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

升级@jeecg/online模块，支持erp风格&体积更小、聊天头像集成有问题修复

pull/755/head
zhangdaiscott 2023-08-28 18:35:44 +08:00
parent 7b1f11b88d
commit 46e8d51d46
5 changed files with 1799 additions and 1255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -21,7 +21,7 @@
"husky:install": "husky install" "husky:install": "husky install"
}, },
"dependencies": { "dependencies": {
"@jeecg/online": "3.5.3-beta3", "@jeecg/online": "3.5.3-vite4",
"@qiaoqiaoyun/drag-free": "^1.1.3", "@qiaoqiaoyun/drag-free": "^1.1.3",
"@iconify/iconify": "^3.1.1", "@iconify/iconify": "^3.1.1",
"@ant-design/colors": "^7.0.0", "@ant-design/colors": "^7.0.0",

3034
pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff

3
src/components/jeecg/comment/CommentList.vue
View File

@ -247,7 +247,8 @@
} }
}); });
const storageEmojiIndex = inject('$globalEmojiIndex') // const storageEmojiIndex = inject('$globalEmojiIndex')
const storageEmojiIndex = getGloablEmojiIndex()
const { getHtml } = useEmojiHtml(storageEmojiIndex); const { getHtml } = useEmojiHtml(storageEmojiIndex);
const bottomCommentRef = ref() const bottomCommentRef = ref()
function handleClickItem(){ function handleClickItem(){

3
src/components/jeecg/comment/MyComment.vue
View File

@ -220,7 +220,8 @@
visibleEmoji.value = !visibleEmoji.value; visibleEmoji.value = !visibleEmoji.value;
} }
const emojiIndex = inject('$globalEmojiIndex') //const emojiIndex = inject('$globalEmojiIndex')
const emojiIndex = getGloablEmojiIndex()
const { getHtml } = useEmojiHtml(emojiIndex); const { getHtml } = useEmojiHtml(emojiIndex);
const commentHtml = computed(() => { const commentHtml = computed(() => {

12
src/settings/registerThirdComp.ts
View File

@ -2,8 +2,8 @@ import type { App } from 'vue';
import { registerJVxeTable } from '/@/components/jeecg/JVxeTable'; import { registerJVxeTable } from '/@/components/jeecg/JVxeTable';
import { registerJVxeCustom } from '/@/components/JVxeCustom'; import { registerJVxeCustom } from '/@/components/JVxeCustom';
// // 注册全局聊天表情包 // 注册全局聊天表情包
// import { Picker } from 'emoji-mart-vue-fast/src'; import { Picker } from 'emoji-mart-vue-fast/src';
// import { EmojiIndex } from "emoji-mart-vue-fast/src"; // import { EmojiIndex } from "emoji-mart-vue-fast/src";
// import data from "emoji-mart-vue-fast/data/apple.json"; // import data from "emoji-mart-vue-fast/data/apple.json";
@ -17,9 +17,9 @@ export async function registerThirdComp(app: App) {
registerJVxeTable(app); registerJVxeTable(app);
// 注册 JVxeTable 自定义组件 // 注册 JVxeTable 自定义组件
await registerJVxeCustom(); await registerJVxeCustom();
// //--------------------------------------------------------------------- //---------------------------------------------------------------------
// // 注册全局聊天表情包 // 注册全局聊天表情包
// app.component('Picker', Picker); app.component('Picker', Picker);
// let myEmojiIndex = new EmojiIndex(data, { // let myEmojiIndex = new EmojiIndex(data, {
// function() { // function() {
// return true; // return true;
@ -28,7 +28,7 @@ export async function registerThirdComp(app: App) {
// }); // });
// app.config.globalProperties.$globalEmojiIndex = myEmojiIndex; // app.config.globalProperties.$globalEmojiIndex = myEmojiIndex;
// app.provide('$globalEmojiIndex', myEmojiIndex); // app.provide('$globalEmojiIndex', myEmojiIndex);
// //--------------------------------------------------------------------- //---------------------------------------------------------------------
// 注册全局dayjs // 注册全局dayjs
dayjs.locale('zh-cn'); dayjs.locale('zh-cn');
dayjs.extend(relativeTime); dayjs.extend(relativeTime);