From 602116e2fa63db23dd4032cbb17f60d12904e522 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Fri, 25 Aug 2023 17:17:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BB=AA=E8=A1=A8=E7=9B=98,?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=AA=E8=A1=A8=E7=9B=98=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E8=BF=87=E5=A4=A7=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                       |  2 +-
 src/components/registerGlobComp.ts | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 3fe2d18..6c48697 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@jeecg/online": "3.5.3-beta3",
-    "@qiaoqiaoyun/drag-free": "^1.0.52",
+    "@qiaoqiaoyun/drag-free": "^1.1.3",
     "@iconify/iconify": "^2.2.1",
     "@ant-design/colors": "^6.0.0",
     "@ant-design/icons-vue": "^6.1.0",
diff --git a/src/components/registerGlobComp.ts b/src/components/registerGlobComp.ts
index a1525e5..47100ff 100644
--- a/src/components/registerGlobComp.ts
+++ b/src/components/registerGlobComp.ts
@@ -2,8 +2,9 @@ import type { App } from 'vue';
 import { Icon } from './Icon';
 import AIcon from '/@/components/jeecg/AIcon.vue';
 import { Button, JUploadButton } from './Button';
-//敲敲云—仪表盘设计器（拖拽设计）
-import DragEngine from '@qiaoqiaoyun/drag-free';
+//Tinymce富文本
+import Editor from '/@/components/Tinymce/src/Editor.vue'
+
 import {
   // Need
   Button as AntButton,
@@ -58,13 +59,21 @@ import {
 
 const compList = [AntButton.Group, Icon, AIcon, JUploadButton];
 
+//敲敲云—仪表盘设计器（拖拽设计）
+import DragEngine from '@qiaoqiaoyun/drag-free';
+if (import.meta.env.DEV) {
+  import('@qiaoqiaoyun/drag-free/lib/index.css');
+}
+console.log('---初始化---， 全局注册仪表盘--------------');
+
 export function registerGlobComp(app: App) {
   compList.forEach((comp) => {
     app.component(comp.name || comp.displayName, comp);
   });
+  //仪表盘依赖Tinymce，需要提前加载（没办法按需加载了）
+  app.component(Editor.name, Editor)
 
-  app
-    .use(Select)
+  app.use(Select)
     .use(Alert)
     .use(Button)
     .use(Breadcrumb)
@@ -113,4 +122,5 @@ export function registerGlobComp(app: App) {
     .use(Skeleton)
     .use(Cascader)
     .use(Rate);
+  console.log("注册antd组件完成！");
 }