From e30b7d08b5473fe09c6ace1db29c01014ac210c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=B4=E8=B5=9B=E9=9B=B7?= <hoslay@163.com>
Date: Tue, 4 Jun 2024 14:51:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86sheet=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E4=BD=86=E7=BC=A9=E6=94=BE=E5=80=BC=E4=B8=8D=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                            |  1 +
 package.json                          |  4 ++--
 plugins/core/panels/bottom/Sheets.vue |  2 ++
 src/App.vue                           | 31 +++++++++++++++++++++------
 vite.config.ts                        |  2 +-
 5 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index ccf6ec6..077bf40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ node_modules
 *.history
 *.zip
 yarn.*
+package-lock.json
diff --git a/package.json b/package.json
index 5f5cce7..b791e59 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ddei-editor",
-  "version": "1.2.13",
+  "version": "1.2.14-8",
   "private": false,
   "type": "module",
   "author": "hoslay <3697355039@qq.com>",
@@ -49,7 +49,7 @@
     "type-check": "vue-tsc --noEmit -p tsconfig.app.json --composite false"
   },
   "dependencies": {
-    "ddei-framework": "^1.2.37"
+    "ddei-framework": "file:/Users/hoslay/work/ddei/ddei-framework/ddei-framework-1.2.37-7.tgz"
   },
   "devDependencies": {
     "@tsconfig/node18": "^18.2.0",
diff --git a/plugins/core/panels/bottom/Sheets.vue b/plugins/core/panels/bottom/Sheets.vue
index 789f2f0..02ef837 100644
--- a/plugins/core/panels/bottom/Sheets.vue
+++ b/plugins/core/panels/bottom/Sheets.vue
@@ -381,6 +381,7 @@ export default {
         ddInstance.bus?.push(DDeiEditorEnumBusCommandType.AddFileHistroy);
         ddInstance.bus?.push(DDeiEnumBusCommandType.RefreshShape);
         ddInstance.bus?.push(DDeiEditorEnumBusCommandType.ClearTemplateUI);
+        ddInstance.bus.push(DDeiEditorEnumBusCommandType.RefreshEditorParts, {});
         ddInstance.bus.executeAll();
 
         DDeiEditorUtil.closeDialogs(this.editor,null, true)
@@ -420,6 +421,7 @@ export default {
 
         ddInstance.bus.push(DDeiEnumBusCommandType.RefreshShape);
         ddInstance.bus.push(DDeiEditorEnumBusCommandType.ClearTemplateUI);
+        ddInstance.bus.push(DDeiEditorEnumBusCommandType.RefreshEditorParts, {});
         ddInstance.bus.executeAll();
 
         DDeiEditorUtil.closeDialogs(this.editor, null, true)
diff --git a/src/App.vue b/src/App.vue
index 7fd7420..46903bd 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -20,12 +20,13 @@ export default defineComponent({
         //布局的配置
         DDeiCoreStandLayout.configuration({
           //配置插件
-          'top': [],
+          // 'top': [],
           'middle': ['ddei-core-panel-openfilesview', 'ddei-core-panel-canvasview', 'ddei-core-panel-quickcolorview'],// [!code ++]
-          'bottom': [],
-          'left': [],
-          'right': []
+          // 'bottom': [],
+          // 'left': [],
+          // 'right': []
         }),
+        DDeiExtUML
         // DDeiCoreThemeBlack.configuration({
         //   default: true
         // }),
@@ -191,11 +192,19 @@ export default defineComponent({
       options1:options1,
       options2:options2,
       options3:options3,
-      options4:options4
+      options4:options4,
+      jsontext:"无JSON"
     };
   },
 
   methods:{
+    getData(){
+      //获取编辑器实例
+      let editor = this.$refs["editorViewer3"].editor;
+      //获取整个editor的JSON
+      let editorJSON = editor.toJSON();
+      this.jsontext = JSON.stringify(editorJSON);
+    }
   }
 
   
@@ -204,12 +213,20 @@ export default defineComponent({
 
 
 <template>
-  <!-- <DDeiEditorView ref="editorViewer1" :options="options" id="ddei_editor_1"></DDeiEditorView> -->
+  <!--<DDeiEditorView ref="editorViewer1" :options="options" id="ddei_editor_1"></DDeiEditorView>
+
   <DDeiEditorView ref="editorViewer2" :options="options1" id="ddei_editor_2"></DDeiEditorView>
-  <!-- <div style="width:400px;height:400px;float:left">
+  -->
+  <div style="width:400px;height:400px;float:left">
     <DDeiEditorView ref="editorViewer3" :options="options2" id="ddei_editor_3"></DDeiEditorView>
   </div>
 
+  <button @click="getData" style="border:1px solid grey;margin-left:5px;padding:5px">获取JSON</button>
+  <div style="width:400px;height:400px;margin:100px auto;">
+    <textarea :value="jsontext"
+      style="border:1px solid grey;margin-left:5px;padding:5px;width:100%;height:100%"></textarea>
+  </div>
+  <!--
   <div style="width:500px;height:500px;float:left">
     <DDeiEditorView ref="editorViewer4" :options="options3" id="ddei_editor_4"></DDeiEditorView>
   </div>
diff --git a/vite.config.ts b/vite.config.ts
index 8fb691b..0c74d9c 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -13,7 +13,7 @@ export default defineConfig({
     alias: {
       '@': fileURLToPath(new URL('./src', import.meta.url)),
       '@ddei': fileURLToPath(new URL('./plugins', import.meta.url)),
-      // 'ddei-framework': fileURLToPath(new URL('/Users/hoslay/work/ddei/ddei-framework/dist/ddei-framework.js', import.meta.url)),
+      'ddei-framework': fileURLToPath(new URL('/Users/hoslay/work/ddei/ddei-framework/dist/ddei-framework.js', import.meta.url)),
     }
   },