Browse Source

fix: Merge branch 'master' of http://192.168.0.115:3000/bill/traffic-laser

# Conflicts:
#	server/test/a0k4xu045_202305311600080410/attach/sceneStore
xzw 2 years ago
parent
commit
9aa340dbff

+ 2 - 1
src/views/scene/covers/actions.vue

@@ -3,7 +3,8 @@
     <ButtonPane
         v-for="menu in menus"
         :key="menu.key"
-        @touchstart.stop="menu.action"
+        @touchstart.stop
+        @click.stop="menu.action"
         class="action"
         :style="{backgroundColor: menu.color}">
       <UiIcon :type="menu.icon" class="icon" :style="{color: menu.iconColor}"/>

+ 2 - 1
src/views/scene/covers/basePoints.vue

@@ -29,8 +29,9 @@ const activeActionMenus = [
       const index = basePoints.value.indexOf(active.value)
       if (~index) {
         basePoints.value.splice(index, 1)
+        active.value = null
       }
     }
   }
 ]
-</script>
+</script>

+ 1 - 1
src/views/scene/covers/cover.vue

@@ -103,7 +103,7 @@ const clickHandler = ev => {
 
   const handler = (ev: MouseEvent) => {
     console.log("????????")
-    if (!dom.value.contains(ev.target as HTMLElement) && ev.target !== dom.value) {
+    if (dom.value && !dom.value.contains(ev.target as HTMLElement) && ev.target !== dom.value) {
       emit("blur")
       // document.documentElement.removeEventListener("click", handler)
       document.documentElement.removeEventListener("touchstart", handler)