diff --git a/src/designer/ModelEditor.vue b/src/designer/Model2DEditor.vue
similarity index 98%
rename from src/designer/ModelEditor.vue
rename to src/designer/Model2DEditor.vue
index a517723..69f54d1 100644
--- a/src/designer/ModelEditor.vue
+++ b/src/designer/Model2DEditor.vue
@@ -39,7 +39,7 @@
import { renderIcon } from '@/utils/webutils.ts'
export default {
- name: 'ModelEditor',
+ name: 'Model2DEditor',
components: {
renderIcon
},
diff --git a/src/designer/viewWidgets/IWidgets.js b/src/designer/viewWidgets/IWidgets.js
new file mode 100644
index 0000000..31ce61d
--- /dev/null
+++ b/src/designer/viewWidgets/IWidgets.js
@@ -0,0 +1,10 @@
+import { renderIcon } from '@/utils/webutils.js'
+
+export default {
+ methods: {
+ renderIcon,
+ closeMe() {
+ this.$emit('close')
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/designer/viewWidgets/alarm/AlarmView.vue b/src/designer/viewWidgets/alarm/AlarmView.vue
index 94fb226..0163ca9 100644
--- a/src/designer/viewWidgets/alarm/AlarmView.vue
+++ b/src/designer/viewWidgets/alarm/AlarmView.vue
@@ -6,7 +6,7 @@
-
+
@@ -55,21 +55,16 @@
\ No newline at end of file
diff --git a/src/designer/viewWidgets/logger/LoggerView.vue b/src/designer/viewWidgets/logger/LoggerView.vue
index 8e7ba01..2505a37 100644
--- a/src/designer/viewWidgets/logger/LoggerView.vue
+++ b/src/designer/viewWidgets/logger/LoggerView.vue
@@ -54,21 +54,15 @@
\ No newline at end of file
diff --git a/src/designer/viewWidgets/modeltree/ModeltreeViewJs.js b/src/designer/viewWidgets/modeltree/ModeltreeViewJs.js
index cceda75..6f9d022 100644
--- a/src/designer/viewWidgets/modeltree/ModeltreeViewJs.js
+++ b/src/designer/viewWidgets/modeltree/ModeltreeViewJs.js
@@ -1,8 +1,9 @@
import { renderIcon } from '@/utils/webutils.js'
+import IWidgets from '../IWidgets.js'
export default {
name: 'ModeltreeView',
- emits: ['close'],
+ mixins: [IWidgets],
data() {
return {
currentLevel: '',
@@ -11,7 +12,6 @@ export default {
}
},
methods: {
- renderIcon,
allowDrop(event) {
return true
},
diff --git a/src/designer/viewWidgets/monitor/MonitorView.vue b/src/designer/viewWidgets/monitor/MonitorView.vue
index 99ae190..d3b09e9 100644
--- a/src/designer/viewWidgets/monitor/MonitorView.vue
+++ b/src/designer/viewWidgets/monitor/MonitorView.vue
@@ -54,21 +54,16 @@
\ No newline at end of file
diff --git a/src/designer/viewWidgets/property/PropertyView.vue b/src/designer/viewWidgets/property/PropertyView.vue
index 7d70107..2791ace 100644
--- a/src/designer/viewWidgets/property/PropertyView.vue
+++ b/src/designer/viewWidgets/property/PropertyView.vue
@@ -55,21 +55,15 @@
\ No newline at end of file
diff --git a/src/designer/viewWidgets/script/ScriptView.vue b/src/designer/viewWidgets/script/ScriptView.vue
index 0a1abb3..0c7d762 100644
--- a/src/designer/viewWidgets/script/ScriptView.vue
+++ b/src/designer/viewWidgets/script/ScriptView.vue
@@ -15,21 +15,15 @@
\ No newline at end of file
diff --git a/src/designer/viewWidgets/task/TaskView.vue b/src/designer/viewWidgets/task/TaskView.vue
index f682cea..20c7041 100644
--- a/src/designer/viewWidgets/task/TaskView.vue
+++ b/src/designer/viewWidgets/task/TaskView.vue
@@ -34,21 +34,15 @@
\ No newline at end of file
diff --git a/src/designer/viewWidgets/toolbox/ToolboxView.vue b/src/designer/viewWidgets/toolbox/ToolboxView.vue
index 8df6daf..275c701 100644
--- a/src/designer/viewWidgets/toolbox/ToolboxView.vue
+++ b/src/designer/viewWidgets/toolbox/ToolboxView.vue
@@ -6,7 +6,7 @@
-
+
@@ -15,7 +15,7 @@
@open="handleOpen"
@close="handleClose"
:default-openeds="defaultExpandedKeys"
- >
+ >
@@ -32,11 +32,12 @@
diff --git a/src/views/ModelMain.vue b/src/views/ModelMain.vue
index f3e5757..f3ff126 100644
--- a/src/views/ModelMain.vue
+++ b/src/views/ModelMain.vue
@@ -52,7 +52,7 @@
-
+
@@ -107,13 +107,13 @@ import './ModelMain.less'
import { ModelMainInit, ModelMainMounted, ModelMainUnmounted } from '@/views/ModelMainInit.js'
import { getRootMenu } from '@/runtime/DefineMenu.js'
import { getWidgetByName, getWidgetBySide, getAllWidget } from '@/runtime/DefineWidget.js'
-import ModelEditor from '@/designer/ModelEditor.vue'
+import Model2DEditor from '@/designer/Model2DEditor.vue'
import ModelView from '@/designer/ModelView.vue'
import { normalizeShortKey } from '@/utils/webutils.ts'
export default {
- components: { ModelEditor, ModelView, Split, SplitArea },
+ components: { Model2DEditor, ModelView, Split, SplitArea },
created() {
ModelMainInit()
},