From 1cc04cf5b9f1b4ac9346ed047dcf1567c74b1ad9 Mon Sep 17 00:00:00 2001
From: luoyifan <luoyifan@qq.com>
Date: Fri, 23 May 2025 17:54:17 +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/viewWidgets/IWidgets.js               | 10 -------
 src/designer/viewWidgets/IWidgets.ts               | 31 ++++++++++++++++++++++
 src/designer/viewWidgets/alarm/AlarmView.vue       |  1 +
 src/designer/viewWidgets/logger/LoggerView.vue     |  1 +
 .../viewWidgets/modeltree/ModeltreeViewJs.js       |  6 +++--
 src/designer/viewWidgets/monitor/MonitorView.vue   |  3 ++-
 src/designer/viewWidgets/task/TaskView.vue         |  1 +
 7 files changed, 40 insertions(+), 13 deletions(-)
 delete mode 100644 src/designer/viewWidgets/IWidgets.js
 create mode 100644 src/designer/viewWidgets/IWidgets.ts

diff --git a/src/designer/viewWidgets/IWidgets.js b/src/designer/viewWidgets/IWidgets.js
deleted file mode 100644
index 31ce61d..0000000
--- a/src/designer/viewWidgets/IWidgets.js
+++ /dev/null
@@ -1,10 +0,0 @@
-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/IWidgets.ts b/src/designer/viewWidgets/IWidgets.ts
new file mode 100644
index 0000000..59486c8
--- /dev/null
+++ b/src/designer/viewWidgets/IWidgets.ts
@@ -0,0 +1,31 @@
+import { defineComponent } from 'vue'
+import { renderIcon } from '@/utils/webutils.js'
+
+export type IWidgetData = {
+  /**
+   * 是否激活
+   */
+  isActivated: boolean
+}
+
+export default defineComponent({
+  activated() {
+    this.isActivated = true
+    console.log('activated', this.$.type.name)
+  },
+  deactivated() {
+    this.isActivated = false
+  },
+  emits: ['close'],
+  data() {
+    return {
+      isActivated: false
+    } as IWidgetData
+  },
+  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 0163ca9..daa9431 100644
--- a/src/designer/viewWidgets/alarm/AlarmView.vue
+++ b/src/designer/viewWidgets/alarm/AlarmView.vue
@@ -59,6 +59,7 @@ import IWidgets from '../IWidgets.js'
 
 export default {
   name: 'AlarmView',
+  webSocketSubscribe: ['alarm'],
   emits: ['close'],
   mixins: [IWidgets],
   data() {
diff --git a/src/designer/viewWidgets/logger/LoggerView.vue b/src/designer/viewWidgets/logger/LoggerView.vue
index 2505a37..78a4a65 100644
--- a/src/designer/viewWidgets/logger/LoggerView.vue
+++ b/src/designer/viewWidgets/logger/LoggerView.vue
@@ -58,6 +58,7 @@ import IWidgets from '../IWidgets.js'
 
 export default {
   name: 'LoggerView',
+  webSocketSubscribe: ['logs'],
   mixins: [IWidgets],
   data() {
     return {
diff --git a/src/designer/viewWidgets/modeltree/ModeltreeViewJs.js b/src/designer/viewWidgets/modeltree/ModeltreeViewJs.js
index 6f9d022..0104c9c 100644
--- a/src/designer/viewWidgets/modeltree/ModeltreeViewJs.js
+++ b/src/designer/viewWidgets/modeltree/ModeltreeViewJs.js
@@ -1,7 +1,9 @@
+import { defineComponent } from 'vue'
 import { renderIcon } from '@/utils/webutils.js'
 import IWidgets from '../IWidgets.js'
 
-export default {
+
+export default defineComponent({
   name: 'ModeltreeView',
   mixins: [IWidgets],
   data() {
@@ -36,7 +38,7 @@ export default {
       return designer.allLevels
     }
   }
-}
+})
 
 const data = [
   {
diff --git a/src/designer/viewWidgets/monitor/MonitorView.vue b/src/designer/viewWidgets/monitor/MonitorView.vue
index d3b09e9..d5356db 100644
--- a/src/designer/viewWidgets/monitor/MonitorView.vue
+++ b/src/designer/viewWidgets/monitor/MonitorView.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>
@@ -58,6 +58,7 @@ import IWidgets from '../IWidgets.js'
 
 export default {
   name: 'MonitorView',
+  webSocketSubscribe: ['deviceStatus'],
   mixins: [IWidgets],
   data() {
     return {
diff --git a/src/designer/viewWidgets/task/TaskView.vue b/src/designer/viewWidgets/task/TaskView.vue
index 20c7041..6d8e331 100644
--- a/src/designer/viewWidgets/task/TaskView.vue
+++ b/src/designer/viewWidgets/task/TaskView.vue
@@ -38,6 +38,7 @@ import IWidgets from '../IWidgets.js'
 
 export default {
   name: 'TaskView',
+  webSocketSubscribe: ['task'],
   mixins: [IWidgets],
   data() {
     return {