hy-app 0.2.9 → 0.2.10

package/common/index.ts

@@ -1,2 +1,3 @@
 export * from './versionControl'
 export * from './shakeService'
+export * from './queue'

package/common/queue.ts

@@ -0,0 +1,34 @@
+/*
+ * @Author: weisheng
+ * @Date: 2023-07-02 22:51:06
+ * @LastEditTime: 2024-03-16 19:59:07
+ * @LastEditors: weisheng
+ * @Description:
+ * @FilePath: /wot-design-uni/src/uni_modules/wot-design-uni/components/common/clickoutside.ts
+ * 记得注释
+ */
+let queue: any[] = []
+
+export function pushToQueue(comp: any) {
+  queue.push(comp)
+}
+
+export function removeFromQueue(comp: any) {
+  queue = queue.filter((item) => {
+    return item.$.uid !== comp.$.uid
+  })
+}
+
+export function closeOther(comp: any) {
+  queue.forEach((item) => {
+    if (item.$.uid !== comp.$.uid) {
+      item.$.exposed.close()
+    }
+  })
+}
+
+export function closeOutside() {
+  queue.forEach((item) => {
+    item.$.exposed.close()
+  })
+}

package/components/hy-popover/hy-popover.vue

@@ -111,6 +111,7 @@ import defaultProps from './props'
 import IProps, { type PopoverExpose } from './typing'
 import { isArray } from '../../utils'
 import { type Queue, queueKey, usePopover } from '../../composables'
+import { closeOther, pushToQueue, removeFromQueue } from '../../common'
 
 // 组件
 import HyIcon from '../hy-icon/hy-icon.vue'
@@ -157,8 +158,11 @@ watch(
   (newValue) => {
     if (newValue) {
       popover.control(placement.value, props.offset)
+      // provide/inject在微信小程序不能使用，所以执行两个保存方法
       if (queue && queue.closeOther) {
         queue.closeOther(proxy)
+      } else {
+        closeOther(proxy)
       }
     }
     popover.showStyle.value = newValue ? 'display: inline-block;' : 'display: none;'
@@ -174,6 +178,8 @@ onMounted(() => {
 onBeforeMount(() => {
   if (queue && queue.pushToQueue) {
     queue.pushToQueue(proxy)
+  } else {
+    pushToQueue(proxy)
   }
   popover.showStyle.value = showPopover.value ? 'opacity: 1;' : 'opacity: 0;'
 })
@@ -181,6 +187,8 @@ onBeforeMount(() => {
 onBeforeUnmount(() => {
   if (queue && queue.removeFromQueue) {
     queue.removeFromQueue(proxy)
+  } else {
+    removeFromQueue(proxy)
   }
 })
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hy-app",
-  "version": "0.2.9",
-  "description": "fix: 气泡组件在小程序列表不默认关闭",
+  "version": "0.2.10",
+  "description": "fix: 微信小程序气泡组件在小程序列表不默认关闭",
   "main": "./index.ts",
   "private": false,
   "scripts": {},