hy-app 0.2.9 → 0.2.11

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

@@ -1,5 +1,10 @@
 <template>
-  <view class="hy-popover" :style="customStyle" id="popover" @click.stop="popover.noop">
+  <view
+    :class="['hy-popover', customClass]"
+    :style="customStyle"
+    id="popover"
+    @click.stop="popover.noop"
+  >
     <!-- 使用插槽时无法获取正确宽高 -->
     <view class="hy-popover__pos hy-popover__hidden" id="pos">
       <view class="hy-popover__container">
@@ -111,6 +116,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 +163,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 +183,8 @@ onMounted(() => {
 onBeforeMount(() => {
   if (queue && queue.pushToQueue) {
     queue.pushToQueue(proxy)
+  } else {
+    pushToQueue(proxy)
   }
   popover.showStyle.value = showPopover.value ? 'opacity: 1;' : 'opacity: 0;'
 })
@@ -181,6 +192,8 @@ onBeforeMount(() => {
 onBeforeUnmount(() => {
   if (queue && queue.removeFromQueue) {
     queue.removeFromQueue(proxy)
+  } else {
+    removeFromQueue(proxy)
   }
 })
 

package/components/hy-popover/typing.d.ts

@@ -53,4 +53,8 @@ export default interface HyOverlayProps {
    * @description 定义需要用到的外部样式
    * */
   customStyle?: CSSProperties
+  /**
+   * @description 定义需要用到的类名
+   * */
+  customClass?: string
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hy-app",
-  "version": "0.2.9",
-  "description": "fix: 气泡组件在小程序列表不默认关闭",
+  "version": "0.2.11",
+  "description": "增加修改组件提示",
   "main": "./index.ts",
   "private": false,
   "scripts": {},
@@ -22,22 +22,12 @@
     "theme.scss",
     "README.md"
   ],
-  "dependencies": {
-    "@dcloudio/uni-app": "3.0.0-alpha-3081220230802001",
-    "pinia": "^2.3.1",
-    "pinia-plugin-unistorage": "^0.0.8",
-    "vue": "^3.5.13",
-    "vue-i18n": "^9.14.3"
-  },
-  "devDependencies": {
-    "@dcloudio/types": "^3.4.14",
-    "@vue/tsconfig": "^0.1.3",
-    "uni-app-types": "^0.1.7"
-  },
   "keywords": [
     "华玥组件库",
-    "ui组件库"
+    "ui组件库",
+    "暗黑模式"
   ],
+  "web-types": "web-types.json",
   "author": "gaoxianhua",
-  "license": "ISC"
+  "license": "MIT"
 }