From 7d05d7f6fdc62547291de71d7e588ef46e429ec5 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Sat, 26 Aug 2023 15:50:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=9C=80=E5=8A=A0=E8=BD=BD=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=81=8A?=
 =?UTF-8?q?=E5=A4=A9=E5=A4=B4=E5=83=8F=E5=A4=AA=E5=A4=A7=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E6=8C=89=E9=9C=80=E5=8A=A0=E8=BD=BD=E3=80=81=E8=A1=8C=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E7=9A=84=E7=BB=84=E4=BB=B6=E5=BC=95=E5=85=A5=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E5=85=A8=E5=B1=80=E6=B3=A8=E5=86=8C=E6=95=B4=E4=B8=AA?=
 =?UTF-8?q?form?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/JVxeDepartSelectCell.vue   |  3 +-
 .../src/components/JVxePopupCell.vue          |  3 +-
 .../src/components/JVxeUserSelectCell.vue     |  3 +-
 src/components/jeecg/comment/CommentList.vue  |  2 +-
 src/components/jeecg/comment/MyComment.vue    |  2 +-
 src/components/jeecg/comment/useComment.ts    | 17 +++++++++
 src/settings/registerThirdComp.ts             | 36 +++++++++----------
 7 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/src/components/JVxeCustom/src/components/JVxeDepartSelectCell.vue b/src/components/JVxeCustom/src/components/JVxeDepartSelectCell.vue
index edafba1..ca0aa75 100644
--- a/src/components/JVxeCustom/src/components/JVxeDepartSelectCell.vue
+++ b/src/components/JVxeCustom/src/components/JVxeDepartSelectCell.vue
@@ -30,7 +30,8 @@
 
 <script lang="ts">
   import { computed, defineComponent } from 'vue';
-  import { JSelectDept } from '/@/components/Form';
+  //import { JSelectDept } from '/@/components/Form';
+  import JSelectDept from '/src/components/form/src/jeecg/components/JSelectDept.vue';
   import { JVxeComponent } from '/@/components/jeecg/JVxeTable/types';
   import { useJVxeComponent, useJVxeCompProps } from '/@/components/jeecg/JVxeTable/hooks';
 
diff --git a/src/components/JVxeCustom/src/components/JVxePopupCell.vue b/src/components/JVxeCustom/src/components/JVxePopupCell.vue
index 5efe444..deb4c5b 100644
--- a/src/components/JVxeCustom/src/components/JVxePopupCell.vue
+++ b/src/components/JVxeCustom/src/components/JVxePopupCell.vue
@@ -3,7 +3,8 @@
 </template>
 <script lang="ts">
   import { computed, defineComponent, ref } from 'vue';
-  import { JPopup } from '/@/components/Form';
+  //import { JPopup } from '/@/components/Form';
+  import JPopup from '/src/components/form/src/jeecg/components/JPopup.vue';
   import { JVxeComponent } from '/@/components/jeecg/JVxeTable/types';
   import { useJVxeComponent, useJVxeCompProps } from '/@/components/jeecg/JVxeTable/hooks';
   import { dispatchEvent, vModel } from '/@/components/jeecg/JVxeTable/utils';
diff --git a/src/components/JVxeCustom/src/components/JVxeUserSelectCell.vue b/src/components/JVxeCustom/src/components/JVxeUserSelectCell.vue
index 773d023..37c19cf 100644
--- a/src/components/JVxeCustom/src/components/JVxeUserSelectCell.vue
+++ b/src/components/JVxeCustom/src/components/JVxeUserSelectCell.vue
@@ -6,7 +6,8 @@
 
 <script lang="ts">
   import { computed, defineComponent } from 'vue';
-  import { JSelectUser } from '/@/components/Form';
+  //import { JSelectUser } from '/@/components/Form';
+  import JSelectUser from '/src/components/form/src/jeecg/components/JSelectUser.vue';
   import { JVxeComponent } from '/@/components/jeecg/JVxeTable/types';
   import { useJVxeComponent, useJVxeCompProps } from '/@/components/jeecg/JVxeTable/hooks';
   import { dispatchEvent } from '/@/components/jeecg/JVxeTable/utils';
diff --git a/src/components/jeecg/comment/CommentList.vue b/src/components/jeecg/comment/CommentList.vue
index 5b02bba..e245589 100644
--- a/src/components/jeecg/comment/CommentList.vue
+++ b/src/components/jeecg/comment/CommentList.vue
@@ -88,7 +88,7 @@
   import { Comment, Tooltip } from 'ant-design-vue';
   import { useUserStore } from '/@/store/modules/user';
   import MyComment from './MyComment.vue';
-  import { list, saveOne, deleteOne, useCommentWithFile, useEmojiHtml, queryById } from './useComment';
+  import { list, saveOne, deleteOne, useCommentWithFile, useEmojiHtml, queryById, getGloablEmojiIndex } from './useComment';
   import { useMessage } from '/@/hooks/web/useMessage';
   import HistoryFileList from './HistoryFileList.vue';
   import { Popconfirm } from 'ant-design-vue';
diff --git a/src/components/jeecg/comment/MyComment.vue b/src/components/jeecg/comment/MyComment.vue
index 874e1f4..131e851 100644
--- a/src/components/jeecg/comment/MyComment.vue
+++ b/src/components/jeecg/comment/MyComment.vue
@@ -53,7 +53,7 @@
   import { useModal } from '/@/components/Modal';
   import UploadChunk from './UploadChunk.vue';
   import 'emoji-mart-vue-fast/css/emoji-mart.css';
-  import { useEmojiHtml } from './useComment';
+  import { getGloablEmojiIndex, useEmojiHtml } from './useComment';
 
   const optionsName = {
     categories: {
diff --git a/src/components/jeecg/comment/useComment.ts b/src/components/jeecg/comment/useComment.ts
index 058f818..4a9cfea 100644
--- a/src/components/jeecg/comment/useComment.ts
+++ b/src/components/jeecg/comment/useComment.ts
@@ -13,6 +13,8 @@ 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 data from "emoji-mart-vue-fast/data/apple.json";
+import { EmojiIndex } from "emoji-mart-vue-fast/src";
 
 enum Api {
   list = '/sys/comment/listByForm',
@@ -38,6 +40,21 @@ const getViewFileDomain = () => defHttp.get({ url: Api.getFileViewDomain });
  */
 export const list = (params) => defHttp.get({ url: Api.list, params });
 
+export function getGloablEmojiIndex(){
+  if(window['myEmojiIndex']){
+    console.log("----走window['myEmojiIndex']缓存，不new新对象！")
+    return window['myEmojiIndex'];
+  }
+
+  window['myEmojiIndex'] = new EmojiIndex(data, {
+    function() {
+      return true;
+    },
+    exclude:['recent','people','nature','foods','activity','places','objects','symbols','flags']
+  });
+  return window['myEmojiIndex'];
+}
+
 /**
  * 查询单条记录
  * @param params
diff --git a/src/settings/registerThirdComp.ts b/src/settings/registerThirdComp.ts
index 2001a45..395a64a 100644
--- a/src/settings/registerThirdComp.ts
+++ b/src/settings/registerThirdComp.ts
@@ -2,10 +2,10 @@ 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 { 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";
 
 // 注册全局dayjs
 import dayjs from 'dayjs';
@@ -17,23 +17,23 @@ export async function registerThirdComp(app: App) {
   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)
-  //---------------------------------------------------------------------
+  // //---------------------------------------------------------------------
+  // // 注册全局聊天表情包
+  // 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-cn');
   dayjs.extend(relativeTime);
   dayjs.extend(customParseFormat);
-  app.config.globalProperties.$dayjs = dayjs
-  app.provide('$dayjs', dayjs)
+  app.config.globalProperties.$dayjs = dayjs;
+  app.provide('$dayjs', dayjs);
   //---------------------------------------------------------------------
 }