修复轮询资源无法开窗的BUG,添加轮询资源删除协议

src/common/ClientConnection.ts

@@ -365,6 +365,26 @@ export default class ClientConnection {
     }
   }
 
+  public async deletePollingGroup(uuid: string) {
+    try {
+      return await this.doRpc<Protocol.DeletePollingGroupResponseEntity>(
+        new Protocol.DeletePollingGroupRequestEntity(0, uuid)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async deletePolling(uuid: string) {
+    try {
+      return await this.doRpc<Protocol.DeletePollingResponseEntity>(
+        new Protocol.DeletePollingRequestEntity(0, uuid)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
   public async getCurrentRunningPlan() {
     try {
       return await this.doRpc<Protocol.GetCurrentRunningPlanResponseEntity>(

src/components/PollingTree.vue

@@ -80,7 +80,7 @@
                   clickable
                   v-ripple
                   v-close-popup
-                  v-if="prop.node.item_data"
+                  v-if="prop.node.item_data && false"
                   @click="
                     () =>
                       (prop.node.is_group
@@ -176,30 +176,30 @@ export default defineComponent({
         is_group: boolean,
         uuid: string
       ) {
-        // let success = false;
+        let success = false;
-        // if (is_group) {
+        if (is_group) {
-        //   let response = await GlobalData.getInstance()
+          let response = await GlobalData.getInstance()
-        //     .getCurrentClient()
+            .getCurrentClient()
-        //     ?.deletePlanGroup(uuid);
+            ?.deletePollingGroup(uuid);
-        //   if (response) {
+          if (response) {
-        //     success = response.success;
+            success = response.success;
-        //   }
+          }
-        // } else {
+        } else {
-        //   let response = await GlobalData.getInstance()
+          let response = await GlobalData.getInstance()
-        //     .getCurrentClient()
+            .getCurrentClient()
-        //     ?.deletePlan(uuid);
+            ?.deletePolling(uuid);
-        //   if (response) {
+          if (response) {
-        //     success = response.success;
+            success = response.success;
-        //   }
+          }
-        // }
+        }
-        // $q.notify({
+        $q.notify({
-        //   color: success ? "positive" : "negative",
+          color: success ? "positive" : "negative",
-        //   icon: success ? "done" : "warning",
+          icon: success ? "done" : "warning",
-        //   message:
+          message:
-        //     $t.t("delete") + (success ? $t.t("success") : $t.t("fail")) + "!",
+            $t.t("delete") + (success ? $t.t("success") : $t.t("fail")) + "!",
-        //   position: "top",
+          position: "top",
-        //   timeout: 1500,
+          timeout: 1500,
-        // });
+        });
       },
       onDragStart(e: DragEvent, node: PollingTreeItemEntity) {
         e.dataTransfer?.setData("uuid", node.uuid);

src/components/SignalSourceTree.vue

@@ -5,7 +5,7 @@
         <q-item
           class="full-width"
           clickable
-          :draggable="!prop.node.is_group"
+          :draggable="!prop.node.is_group && !prop.node.local_file_flag"
           @dragstart="(evt) => onDragStart(evt, prop.node)"
           @click="
             $store.commit(

src/entities/WSProtocol.ts

@@ -1146,6 +1146,45 @@ export namespace Protocol {
     }
   }
 
+  export class DeletePollingGroupRequestEntity extends Protocol.PacketEntity {
+    uuid = "";
+
+    constructor(rcp_id?: number, uuid?: string) {
+      super();
+      this.rpc_id = rcp_id ?? 0;
+      this.command = Protocol.Commands.kRpcDeletePollingGroup;
+      this.uuid = uuid ?? "";
+    }
+  }
+
+  export class DeletePollingGroupResponseEntity extends Protocol.PacketEntity {
+    success = false;
+
+    constructor() {
+      super();
+      this.command = Protocol.Commands.kRpcDeletePollingGroup;
+    }
+  }
+
+  export class DeletePollingRequestEntity extends Protocol.PacketEntity {
+    uuid: string = "";
+    constructor(rcp_id?: number, uuid?: string) {
+      super();
+      this.rpc_id = rcp_id ?? 0;
+      this.command = Protocol.Commands.kRpcDeletePolling;
+      this.uuid = uuid ?? "";
+    }
+  }
+
+  export class DeletePollingResponseEntity extends Protocol.PacketEntity {
+    success = false;
+
+    constructor() {
+      super();
+      this.command = Protocol.Commands.kRpcDeletePolling;
+    }
+  }
+
   export class AddPlanRequestEntity extends Protocol.PacketEntity {
     entity: PlanEntity = new PlanEntity();
     constructor(rcp_id?: number, entity?: PlanEntity) {

src/pages/WallPage.vue

@@ -663,9 +663,7 @@ export default defineComponent({
             (item) => (item as any)?.uuid == uuid
           );
 
-          if (signal_sources.length) {
+          {
-            const signal_source = signal_sources[0];
-            if (signal_source) {
             const dom: HTMLElement | null = e.target as HTMLElement;
             if (wall.value && dom) {
               if (dom.classList.contains("wall_item_flag")) {
@@ -674,6 +672,7 @@ export default defineComponent({
                 const y = dom.offsetTop / wall.value.clientHeight;
                 const width = dom.offsetWidth / wall.value.clientWidth;
                 const height = dom.offsetHeight / wall.value.clientHeight;
+                console.log(type);
                 switch (type) {
                   case "polling":
                     GlobalData.getInstance()
@@ -689,6 +688,9 @@ export default defineComponent({
                       );
                     break;
                   case "signal_source" /**OpenPollingRequestEntity */:
+                    if (signal_sources.length) {
+                      const signal_source = signal_sources[0];
+                      if (signal_source) {
                         GlobalData.getInstance()
                           .getCurrentClient()
                           ?.openWindow(
@@ -700,6 +702,8 @@ export default defineComponent({
                               height
                             )
                           );
+                      }
+                    }
                     break;
                 }
               } else if (dom.classList.contains("window_flag")) {
@@ -734,6 +738,9 @@ export default defineComponent({
                               );
                             break;
                           case "signal_source":
+                            if (signal_sources.length) {
+                              const signal_source = signal_sources[0];
+                              if (signal_source) {
                                 client?.openWindow(
                                   new Protocol.OpenWindowRequestEntity(
                                     signal_source.uuid,
@@ -743,6 +750,8 @@ export default defineComponent({
                                     height
                                   )
                                 );
+                              }
+                            }
                             break;
                         }
                       }, 100);
@@ -753,7 +762,6 @@ export default defineComponent({
             }
           }
         }
-        }
       },
 
       onDragEnter(e: DragEvent) {