From 136a716136eff9d4909739fb8496978e6eb8bf55 Mon Sep 17 00:00:00 2001
From: luoyifan <luoyifan@qq.com>
Date: Fri, 23 May 2025 17:32:06 +0800
Subject: [PATCH] =?UTF-8?q?ModelMain=20=E4=B8=BB=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/designer/Model2DEditor.vue                     | 68 ++++++++++++++++++++++
 src/designer/ModelEditor.vue                       | 68 ----------------------
 src/designer/viewWidgets/IWidgets.js               | 10 ++++
 src/designer/viewWidgets/alarm/AlarmView.vue       | 11 +---
 src/designer/viewWidgets/logger/LoggerView.vue     | 10 +---
 .../viewWidgets/modeltree/ModeltreeViewJs.js       |  4 +-
 src/designer/viewWidgets/monitor/MonitorView.vue   | 11 +---
 src/designer/viewWidgets/property/PropertyView.vue | 10 +---
 src/designer/viewWidgets/script/ScriptView.vue     | 10 +---
 src/designer/viewWidgets/task/TaskView.vue         | 10 +---
 src/designer/viewWidgets/toolbox/ToolboxView.vue   | 34 +++++------
 src/views/ModelMain.vue                            |  6 +-
 12 files changed, 114 insertions(+), 138 deletions(-)
 create mode 100644 src/designer/Model2DEditor.vue
 delete mode 100644 src/designer/ModelEditor.vue
 create mode 100644 src/designer/viewWidgets/IWidgets.js

diff --git a/src/designer/Model2DEditor.vue b/src/designer/Model2DEditor.vue
new file mode 100644
index 0000000..69f54d1
--- /dev/null
+++ b/src/designer/Model2DEditor.vue
@@ -0,0 +1,68 @@
+<template>
+  <div class="section-canvas">
+    <div class="section-top-toolbar section-toolbar">
+      <el-button type="primary" :icon="renderIcon('element TopLeft')" link></el-button>
+      <span class="section-toolbar-line"></span>
+      <el-cascader placeholder="选择楼层" size="small" v-model="currentLevel" :options="allLevels" filterable />
+    </div>
+    <div class="section-content"></div>
+    <div class="section-bottom-toolbar section-toolbar">
+      <div class="section-toolbar-left">
+        <el-button type="primary" :icon="renderIcon('fa MousePointer')" link></el-button>
+        <span class="section-toolbar-line"></span>
+        <el-button type="primary" :icon="renderIcon('element Aim')" link></el-button>
+        <span class="section-toolbar-line"></span>
+        <el-button type="primary" :icon="renderIcon('antd LineOutlined')" link></el-button>
+        <span class="section-toolbar-line"></span>
+        <el-button type="primary" :icon="renderIcon('icon5 BandageSharp')" link></el-button>
+        <span class="section-toolbar-line"></span>
+        <el-button type="primary" :icon="renderIcon('antd InsertRowLeftOutlined')" link></el-button>
+      </div>
+      <div class="section-toolbar-right">
+        <el-input v-model="searchKeyword" size="small" style="width: 110px" placeholder="Search">
+          <template #prefix>
+            <component :is="renderIcon('element Search')"></component>
+          </template>
+        </el-input>
+        <span class="section-toolbar-line"></span>
+        <el-text type="warning">1</el-text>
+        <span class="section-toolbar-line"></span>
+        <el-text type="danger">0</el-text>
+        <div class="infor">
+          X=14.091,Y=12.397
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { renderIcon } from '@/utils/webutils.ts'
+
+export default {
+  name: 'Model2DEditor',
+  components: {
+    renderIcon
+  },
+  data() {
+    return {
+      currentLevel: '',
+      searchKeyword: '',
+      sectionLeftSearch: '',
+      sectionRightSize: 0,
+      sectionBottomSize: 0,
+      hideRight: false,
+      hideBottom: false,
+      calcRightPanel: null,
+      calcBottomPanel: null
+    }
+  },
+  methods: {
+    renderIcon
+  },
+  computed: {
+    allLevels() {
+      return designer.allLevels
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/designer/ModelEditor.vue b/src/designer/ModelEditor.vue
deleted file mode 100644
index a517723..0000000
--- a/src/designer/ModelEditor.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
-  <div class="section-canvas">
-    <div class="section-top-toolbar section-toolbar">
-      <el-button type="primary" :icon="renderIcon('element TopLeft')" link></el-button>
-      <span class="section-toolbar-line"></span>
-      <el-cascader placeholder="选择楼层" size="small" v-model="currentLevel" :options="allLevels" filterable />
-    </div>
-    <div class="section-content"></div>
-    <div class="section-bottom-toolbar section-toolbar">
-      <div class="section-toolbar-left">
-        <el-button type="primary" :icon="renderIcon('fa MousePointer')" link></el-button>
-        <span class="section-toolbar-line"></span>
-        <el-button type="primary" :icon="renderIcon('element Aim')" link></el-button>
-        <span class="section-toolbar-line"></span>
-        <el-button type="primary" :icon="renderIcon('antd LineOutlined')" link></el-button>
-        <span class="section-toolbar-line"></span>
-        <el-button type="primary" :icon="renderIcon('icon5 BandageSharp')" link></el-button>
-        <span class="section-toolbar-line"></span>
-        <el-button type="primary" :icon="renderIcon('antd InsertRowLeftOutlined')" link></el-button>
-      </div>
-      <div class="section-toolbar-right">
-        <el-input v-model="searchKeyword" size="small" style="width: 110px" placeholder="Search">
-          <template #prefix>
-            <component :is="renderIcon('element Search')"></component>
-          </template>
-        </el-input>
-        <span class="section-toolbar-line"></span>
-        <el-text type="warning">1</el-text>
-        <span class="section-toolbar-line"></span>
-        <el-text type="danger">0</el-text>
-        <div class="infor">
-          X=14.091,Y=12.397
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import { renderIcon } from '@/utils/webutils.ts'
-
-export default {
-  name: 'ModelEditor',
-  components: {
-    renderIcon
-  },
-  data() {
-    return {
-      currentLevel: '',
-      searchKeyword: '',
-      sectionLeftSearch: '',
-      sectionRightSize: 0,
-      sectionBottomSize: 0,
-      hideRight: false,
-      hideBottom: false,
-      calcRightPanel: null,
-      calcBottomPanel: null
-    }
-  },
-  methods: {
-    renderIcon
-  },
-  computed: {
-    allLevels() {
-      return designer.allLevels
-    }
-  }
-}
-</script>
\ No newline at end of file
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 @@
         <component :is="renderIcon('element Search')"></component>
       </template>
     </el-input>
-    <span class="close" @click="closeMe('hideReft')">
+    <span class="close" @click="closeMe">
       <component :is="renderIcon('element Close')" />
     </span>
   </div>
@@ -55,21 +55,16 @@
 
 </template>
 <script>
-import { renderIcon } from '@/utils/webutils.js'
+import IWidgets from '../IWidgets.js'
 
 export default {
   name: 'AlarmView',
   emits: ['close'],
+  mixins: [IWidgets],
   data() {
     return {
       searchKeyword: ''
     }
-  },
-  methods: {
-    renderIcon,
-    closeMe() {
-      this.$emit('close')
-    }
   }
 }
 </script>
\ 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 @@
   </div>
 </template>
 <script>
-import { renderIcon } from '@/utils/webutils.js'
+import IWidgets from '../IWidgets.js'
 
 export default {
   name: 'LoggerView',
-  emits: ['close'],
+  mixins: [IWidgets],
   data() {
     return {
       searchKeyword: ''
     }
-  },
-  methods: {
-    renderIcon,
-    closeMe() {
-      this.$emit('close')
-    }
   }
 }
 </script>
\ 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 @@
   </div>
 </template>
 <script>
-import { renderIcon } from '@/utils/webutils.js'
+import IWidgets from '../IWidgets.js'
 
 export default {
   name: 'MonitorView',
-  emits: ['close'],
+  mixins: [IWidgets],
   data() {
     return {
       searchKeyword: ''
     }
   },
-  methods: {
-    renderIcon,
-    closeMe(name) {
-      this.$emit('close', name)
-    }
-  }
+  methods: {}
 }
 </script>
\ 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 @@
 
 </template>
 <script>
-import { renderIcon } from '@/utils/webutils.js'
+import IWidgets from '../IWidgets.js'
 
 export default {
   name: 'PropertyView',
-  emits: ['close'],
+  mixins: [IWidgets],
   data() {
     return {
       searchKeyword: ''
     }
-  },
-  methods: {
-    renderIcon,
-    closeMe() {
-      this.$emit('close')
-    }
   }
 }
 </script>
\ 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 @@
   </div>
 </template>
 <script>
-import { renderIcon } from '@/utils/webutils.js'
+import IWidgets from '@/designer/viewWidgets/IWidgets.js'
 
 export default {
   name: 'ScriptView',
-  emits: ['close'],
+  mixins: [IWidgets],
   data() {
     return {
       searchKeyword: ''
     }
-  },
-  methods: {
-    renderIcon,
-    closeMe() {
-      this.$emit('close')
-    }
   }
 }
 </script>
\ 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 @@
   </div>
 </template>
 <script>
-import { renderIcon } from '@/utils/webutils.js'
+import IWidgets from '../IWidgets.js'
 
 export default {
   name: 'TaskView',
-  emits: ['close'],
+  mixins: [IWidgets],
   data() {
     return {
       searchKeyword: ''
     }
-  },
-  methods: {
-    renderIcon,
-    closeMe() {
-      this.$emit('close')
-    }
   }
 }
 </script>
\ 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 @@
         <component :is="renderIcon('element Search')"></component>
       </template>
     </el-input>
-    <span class="close" @click="closeMe('hideLeft')">
+    <span class="close" @click="closeMe">
       <component :is="renderIcon('element Close')" />
     </span>
   </div>
@@ -15,7 +15,7 @@
              @open="handleOpen"
              @close="handleClose"
              :default-openeds="defaultExpandedKeys"
-             >
+    >
       <el-sub-menu v-for="itemType in itemTypes" :title="itemType.label" :index="itemType.name">
         <template #title>
           <component :is="renderIcon(itemType.icon)" />
@@ -32,11 +32,12 @@
   </div>
 </template>
 <script>
-import { renderIcon } from '@/utils/webutils.js'
+
+import IWidgets from '../IWidgets.js'
 
 export default {
   name: 'ToolboxView',
-  emits: ['close'],
+  mixins: [IWidgets],
   data() {
     return {
       searchKeyword: '',
@@ -113,7 +114,6 @@ export default {
     }
   },
   methods: {
-    renderIcon,
     closeMe() {
       this.$emit('close')
     },
@@ -124,34 +124,34 @@ export default {
       console.log(key, keyPath)
     },
     updateFilteredItemsAndExpand() {
-      const expandedKeys = [];
+      const expandedKeys = []
       this.itemTypes.forEach(itemType => {
         const filteredChildren = itemType.children.filter(item =>
-            item.label.includes(this.searchKeyword) || item.name.includes(this.searchKeyword));
+          item.label.includes(this.searchKeyword) || item.name.includes(this.searchKeyword))
         if (filteredChildren.length > 0) {
-          expandedKeys.push(itemType.name);
+          expandedKeys.push(itemType.name)
         }
-        itemType.children = filteredChildren;
-      });
-      this.defaultExpandedKeys = expandedKeys;
+        itemType.children = filteredChildren
+      })
+      this.defaultExpandedKeys = expandedKeys
     }
   },
-  watch:{
+  watch: {
     searchKeyword(newVal) {
       if (!newVal) {
         // 如果搜索框为空，则重置菜单状态
         this.itemTypes.forEach(itemType => {
-          itemType.children = this.originalItemTypes.find(originalItemType => originalItemType.name === itemType.name).children;
-        });
-        this.defaultExpandedKeys = [];
+          itemType.children = this.originalItemTypes.find(originalItemType => originalItemType.name === itemType.name).children
+        })
+        this.defaultExpandedKeys = []
       } else {
-        this.updateFilteredItemsAndExpand();
+        this.updateFilteredItemsAndExpand()
       }
     }
   },
   mounted() {
     // 保存原始的 itemTypes 用于重置
-    this.originalItemTypes = JSON.parse(JSON.stringify(this.itemTypes));
+    this.originalItemTypes = JSON.parse(JSON.stringify(this.itemTypes))
   }
 }
 </script>
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 @@
             <SplitArea class="section-center" :class="{'hidden-split':hideRight}" :size="calcCenterSize">
               <el-tabs type="card" class="section-tabs" v-model="centerActiveName" @tab-click="handleCenterTabClick">
                 <el-tab-pane label="2D视图" name="ModelEditor" lazy>
-                  <ModelEditor />
+                  <Model2DEditor />
                 </el-tab-pane>
                 <el-tab-pane label="3D视图" name="ModelView" lazy>
                   <ModelView />
@@ -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()
   },