hy-app 0.2.8 → 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

@@ -3,10 +3,13 @@
     <!-- 使用插槽时无法获取正确宽高 -->
     <view class="hy-popover__pos hy-popover__hidden" id="pos">
       <view class="hy-popover__container">
-        <view v-if="mode === 'normal'" class="hy-popover__inner">
+        <view v-if="!slots.content && mode === 'normal'" class="hy-popover__inner">
           {{ content }}
         </view>
-        <view v-if="mode === 'menu' && typeof content === 'object'" class="hy-popover__menu">
+        <view
+          v-if="!slots.content && mode === 'menu' && typeof content === 'object'"
+          class="hy-popover__menu"
+        >
           <view
             v-for="(item, index) in content"
             :key="index"
@@ -17,6 +20,9 @@
             <text>{{ item.content }}</text>
           </view>
         </view>
+
+        <!-- 用户自定义样式 -->
+        <slot name="content" v-else />
       </view>
     </view>
     <hy-transition
@@ -35,13 +41,13 @@
         <!-- 三角形 -->
 
         <!-- 普通模式 -->
-        <view v-if="mode === 'normal'" class="hy-popover__inner">
+        <view v-if="!slots.content && mode === 'normal'" class="hy-popover__inner">
           {{ content }}
         </view>
         <!-- 普通模式 -->
 
         <!-- 列表模式 -->
-        <view v-if="mode === 'menu'" class="hy-popover__menu">
+        <view v-if="!slots.content && mode === 'menu'" class="hy-popover__menu">
           <view
             v-for="(item, index) in content"
             :key="index"
@@ -90,11 +96,22 @@ export default {
 </script>
 
 <script lang="ts" setup>
-import { getCurrentInstance, onMounted, ref, toRefs, watch } from 'vue'
+import {
+  getCurrentInstance,
+  onMounted,
+  onBeforeMount,
+  onBeforeUnmount,
+  ref,
+  toRefs,
+  useSlots,
+  watch,
+  inject,
+} from 'vue'
 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'
@@ -104,6 +121,7 @@ const props = withDefaults(defineProps<IProps>(), defaultProps)
 const { modelValue, content, mode, placement } = toRefs(props)
 const emit = defineEmits(['update:modelValue', 'menuClick', 'change', 'open', 'close'])
 
+const slots = useSlots()
 const queue = inject<Queue | null>(queueKey, null)
 const selector: string = 'popover'
 const { proxy } = getCurrentInstance() as any
@@ -140,10 +158,12 @@ watch(
   (newValue) => {
     if (newValue) {
       popover.control(placement.value, props.offset)
-      // if (queue && queue.closeOther) {
-      //   queue.closeOther(proxy)
-      // }
-      queue.closeOther(proxy)
+      // provide/inject在微信小程序不能使用，所以执行两个保存方法
+      if (queue && queue.closeOther) {
+        queue.closeOther(proxy)
+      } else {
+        closeOther(proxy)
+      }
     }
     popover.showStyle.value = newValue ? 'display: inline-block;' : 'display: none;'
     emit('change', { show: newValue })
@@ -156,12 +176,20 @@ onMounted(() => {
 })
 
 onBeforeMount(() => {
-  queue.pushToQueue(proxy)
+  if (queue && queue.pushToQueue) {
+    queue.pushToQueue(proxy)
+  } else {
+    pushToQueue(proxy)
+  }
   popover.showStyle.value = showPopover.value ? 'opacity: 1;' : 'opacity: 0;'
 })
 
 onBeforeUnmount(() => {
-  queue.removeFromQueue(proxy)
+  if (queue && queue.removeFromQueue) {
+    queue.removeFromQueue(proxy)
+  } else {
+    removeFromQueue(proxy)
+  }
 })
 
 const menuClick = (index: number) => {

package/package.json

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