ModelMain 主界面改造

src/designer/ModelEditor.vue → src/designer/Model2DEditor.vue

@@ -39,7 +39,7 @@
 import { renderIcon } from '@/utils/webutils.ts'
 
 export default {
-  name: 'ModelEditor',
+  name: 'Model2DEditor',
   components: {
     renderIcon
   },

src/designer/viewWidgets/IWidgets.js

@@ -0,0 +1,10 @@
+import { renderIcon } from '@/utils/webutils.js'
+
+export default {
+  methods: {
+    renderIcon,
+    closeMe() {
+      this.$emit('close')
+    }
+  }
+}

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>

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>

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
     },

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: {
+  methods: {}
-    renderIcon,
-    closeMe(name) {
-      this.$emit('close', name)
-    }
-  }
 }
 </script>

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>

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>

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>

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>
@@ -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,16 +124,16 @@ 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;
+        itemType.children = filteredChildren
-      });
+      })
-      this.defaultExpandedKeys = expandedKeys;
+      this.defaultExpandedKeys = expandedKeys
     }
   },
   watch: {
@@ -141,17 +141,17 @@ export default {
       if (!newVal) {
         // 如果搜索框为空，则重置菜单状态
         this.itemTypes.forEach(itemType => {
-          itemType.children = this.originalItemTypes.find(originalItemType => originalItemType.name === itemType.name).children;
+          itemType.children = this.originalItemTypes.find(originalItemType => originalItemType.name === itemType.name).children
-        });
+        })
-        this.defaultExpandedKeys = [];
+        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>

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()
   },