From 335c82e08afb33845c5f7a4360c2add740cb28aa Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Mon, 24 Oct 2022 18:39:36 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=87=8D=E8=A6=81=E6=80=A7=E8=83=BD?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=91=E8=A7=A3=E5=86=B3=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?online=E5=8A=9F=E8=83=BD=E6=B5=8B=E8=AF=95=EF=BC=8C=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E5=8A=A0=E8=BD=BD=E9=A6=96=E9=A1=B5=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20issues/I5XBZF=20src\settings\registerThirdComp.ts=20src\comp?=
 =?UTF-8?q?onents\jeecg\comment\useComment.ts=20src\components\jeecg\comme?=
 =?UTF-8?q?nt\MyComment.vue=20src\components\jeecg\comment\DataLogList.vue?=
 =?UTF-8?q?=20src\components\jeecg\comment\CommentList.vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/jeecg/comment/CommentList.vue | 21 ++++++++-------
 src/components/jeecg/comment/DataLogList.vue | 18 ++++++-------
 src/components/jeecg/comment/MyComment.vue   |  9 +++----
 src/components/jeecg/comment/useComment.ts   | 17 +++---------
 src/settings/registerThirdComp.ts            | 27 ++++++++++++++++++++
 5 files changed, 56 insertions(+), 36 deletions(-)

diff --git a/src/components/jeecg/comment/CommentList.vue b/src/components/jeecg/comment/CommentList.vue
index 3afcd3e..5b02bba 100644
--- a/src/components/jeecg/comment/CommentList.vue
+++ b/src/components/jeecg/comment/CommentList.vue
@@ -75,15 +75,15 @@
   /**
    * 评论列表
    */
-  import { defineComponent, ref, onMounted, watch, watchEffect } from 'vue';
+  import { defineComponent, ref, onMounted, watch, watchEffect ,inject } from 'vue';
   import { propTypes } from '/@/utils/propTypes';
-  import dayjs from 'dayjs';
-  import 'dayjs/locale/zh.js';
-  import relativeTime from 'dayjs/plugin/relativeTime';
-  import customParseFormat from 'dayjs/plugin/customParseFormat';
-  dayjs.locale('zh');
-  dayjs.extend(relativeTime);
-  dayjs.extend(customParseFormat);
+  // import dayjs from 'dayjs';
+  // import relativeTime from 'dayjs/plugin/relativeTime';
+  // import customParseFormat from 'dayjs/plugin/customParseFormat';
+  // dayjs.locale('zh');
+  // dayjs.extend(relativeTime);
+  // dayjs.extend(customParseFormat);
+  
   import { MessageOutlined } from '@ant-design/icons-vue';
   import { Comment, Tooltip } from 'ant-design-vue';
   import { useUserStore } from '/@/store/modules/user';
@@ -113,6 +113,8 @@
       const { createMessage } = useMessage();
       const dataList = ref([]);
       const { userInfo } = useUserStore();
+      const dayjs = inject('$dayjs')
+      
       /**
        * 获取当前用户名称
        */
@@ -245,7 +247,8 @@
         }
       });
 
-      const { getHtml } = useEmojiHtml();
+      const storageEmojiIndex = inject('$globalEmojiIndex')
+      const { getHtml } = useEmojiHtml(storageEmojiIndex);
       const bottomCommentRef = ref()
       function handleClickItem(){
         bottomCommentRef.value.changeActive()
diff --git a/src/components/jeecg/comment/DataLogList.vue b/src/components/jeecg/comment/DataLogList.vue
index 22fa619..7cee493 100644
--- a/src/components/jeecg/comment/DataLogList.vue
+++ b/src/components/jeecg/comment/DataLogList.vue
@@ -28,16 +28,15 @@
 <script>
   import { PlusOutlined, EditOutlined } from '@ant-design/icons-vue';
   import { getModalHeight, getLogList } from './useComment'
-  import {ref, watchEffect} from 'vue'
+  import {inject, ref, watchEffect} from 'vue'
   import { propTypes } from '/@/utils/propTypes';
   import { Tooltip } from 'ant-design-vue';
-  import dayjs from 'dayjs';
-  import 'dayjs/locale/zh.js';
-  import relativeTime from 'dayjs/plugin/relativeTime';
-  import customParseFormat from 'dayjs/plugin/customParseFormat';
-  dayjs.locale('zh');
-  dayjs.extend(relativeTime);
-  dayjs.extend(customParseFormat);
+  // import dayjs from 'dayjs';
+  // import relativeTime from 'dayjs/plugin/relativeTime';
+  // import customParseFormat from 'dayjs/plugin/customParseFormat';
+  // dayjs.locale('zh');
+  // dayjs.extend(relativeTime);
+  // dayjs.extend(customParseFormat);
   
   export default {
     name: "DataLogList",
@@ -52,6 +51,7 @@
       datetime:  propTypes.number.def(1),
     },
     setup(props){
+      const dayjs = inject('$dayjs')
       const winHeight = getModalHeight();
       const height = ref(300);
       height.value = winHeight - 46 - 57 -53 - 30;
@@ -174,4 +174,4 @@
     }
 
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/jeecg/comment/MyComment.vue b/src/components/jeecg/comment/MyComment.vue
index 42b6f2d..874e1f4 100644
--- a/src/components/jeecg/comment/MyComment.vue
+++ b/src/components/jeecg/comment/MyComment.vue
@@ -45,14 +45,13 @@
 </template>
 
 <script lang="ts">
-  import { ref, watch, computed } from 'vue';
+  import {ref, watch, computed, inject} from 'vue';
   import { propTypes } from '/@/utils/propTypes';
   import { UserAddOutlined, PaperClipOutlined, SmileOutlined } from '@ant-design/icons-vue';
   import { Tooltip } from 'ant-design-vue';
   import UserSelectModal from '/@/components/Form/src/jeecg/components/modal/UserSelectModal.vue';
   import { useModal } from '/@/components/Modal';
   import UploadChunk from './UploadChunk.vue';
-  import { Picker } from 'emoji-mart-vue-fast/src';
   import 'emoji-mart-vue-fast/css/emoji-mart.css';
   import { useEmojiHtml } from './useComment';
 
@@ -79,7 +78,6 @@
       PaperClipOutlined,
       UploadChunk,
       SmileOutlined,
-      Picker,
     },
     props: {
       inner: propTypes.bool.def(false),
@@ -221,8 +219,9 @@
         e.stopPropagation();
         visibleEmoji.value = !visibleEmoji.value;
       }
-
-      const { emojiIndex, getHtml } = useEmojiHtml();
+      
+      const emojiIndex = inject('$globalEmojiIndex')
+      const { getHtml } = useEmojiHtml(emojiIndex);
 
       const commentHtml = computed(() => {
         let temp = myComment.value;
diff --git a/src/components/jeecg/comment/useComment.ts b/src/components/jeecg/comment/useComment.ts
index 5f8aa18..058f818 100644
--- a/src/components/jeecg/comment/useComment.ts
+++ b/src/components/jeecg/comment/useComment.ts
@@ -13,8 +13,6 @@ import txt from '/@/assets/svg/fileType/txt.svg';
 import word from '/@/assets/svg/fileType/word.svg';
 import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
 import { createImgPreview } from '/@/components/Preview';
-import {EmojiIndex} from "emoji-mart-vue-fast/src";
-import data from "emoji-mart-vue-fast/data/apple.json";
 
 enum Api {
   list = '/sys/comment/listByForm',
@@ -365,16 +363,9 @@ export function useFileList() {
 /**
  * 用于emoji渲染
  */
-export function useEmojiHtml(){
+export function useEmojiHtml(globalEmojiIndex){
   const COLONS_REGEX = new RegExp('([^:]+)?(:[a-zA-Z0-9-_+]+:(:skin-tone-[2-6]:)?)','g');
-  let emojisToShowFilter = function() {
-    return true;
-  }
-  let emojiIndex = new EmojiIndex(data, {
-    emojisToShowFilter,
-    exclude:['recent','people','nature','foods','activity','places','objects','symbols','flags']
-  });
-  
+
   function getHtml(text) {
     if(!text){
       return ''
@@ -384,7 +375,7 @@ export function useEmojiHtml(){
       if (endsWith(before, 'alt="') || endsWith(before, 'data-text="')) {
         return match
       }
-      let emoji = emojiIndex.findEmoji(p2)
+      let emoji = globalEmojiIndex.findEmoji(p2)
       if (!emoji) {
         return match
       }
@@ -403,7 +394,7 @@ export function useEmojiHtml(){
   }
   
   return {
-    emojiIndex,
+    globalEmojiIndex,
     getHtml
   }
 }
diff --git a/src/settings/registerThirdComp.ts b/src/settings/registerThirdComp.ts
index 0118f0f..f6a4f33 100644
--- a/src/settings/registerThirdComp.ts
+++ b/src/settings/registerThirdComp.ts
@@ -2,9 +2,36 @@ import type { App } from 'vue';
 import { registerJVxeTable } from '/@/components/jeecg/JVxeTable';
 import { registerJVxeCustom } from '/@/components/JVxeCustom';
 
+import { Picker } 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 dayjs from 'dayjs';
+import relativeTime from 'dayjs/plugin/relativeTime';
+import customParseFormat from 'dayjs/plugin/customParseFormat';
+
 export async function registerThirdComp(app: App) {
   // 注册 JVxeTable 组件
   registerJVxeTable(app);
   // 注册 JVxeTable 自定义组件
   await registerJVxeCustom();
+  //---------------------------------------------------------------------
+  // 注册全局聊天表情包
+  app.component('Picker', Picker);
+  let myEmojiIndex = new EmojiIndex(data, {
+    function() {
+      return true;
+    },
+    exclude:['recent','people','nature','foods','activity','places','objects','symbols','flags']
+  });
+  app.config.globalProperties.$globalEmojiIndex = myEmojiIndex
+  app.provide('$globalEmojiIndex', myEmojiIndex)
+  //---------------------------------------------------------------------
+  // 注册全局dayjs
+  dayjs.locale('zh');
+  dayjs.extend(relativeTime);
+  dayjs.extend(customParseFormat);
+  app.config.globalProperties.$dayjs = dayjs
+  app.provide('$dayjs', dayjs)
+  //---------------------------------------------------------------------
 }