hy-app 0.5.10 → 0.5.11

package/components/hy-tabbar-group/hy-tabbar-group.vue

@@ -1,87 +1,87 @@
-<template>
-    <view
-        :class="{
-            'hy-tabbar-group__placeholder':
-                fixed && placeholder && safeAreaInsetBottom && shape === 'round'
-        }"
-    >
-        <view :class="rootClass" :style="rootStyle">
-            <slot></slot>
-        </view>
-    </view>
-</template>
-
-<script lang="ts">
-export default {
-    name: 'hy-tabbar-group',
-    options: {
-        addGlobalClass: true,
-        virtualHost: true,
-        styleIsolation: 'shared'
-    }
-}
-</script>
-
-<script lang="ts" setup>
-import { computed, provide, toRefs, type CSSProperties, ref, onUnmounted } from 'vue'
-import tabbarGroupProps from './props'
-import type { ITabBarGroupEmits } from './typing'
-
-/**
- * 底部导航栏，用于在不同页面之间进行切换。
- * @displayName hy-tabbar-group
- */
-defineOptions({})
-
-const props = defineProps(tabbarGroupProps)
-const emit = defineEmits<ITabBarGroupEmits>()
-
-const index = ref(0) // 递增用
-const getIndex = () => {
-    return index.value++
-}
-
-provide('hy-tabbar', {
-    ...toRefs(props),
-    setChange,
-    getIndex
-})
-
-// 父属性值
-const rootStyle = computed(() => {
-    const style: CSSProperties = {
-        background: props.bgColor,
-        zIndex: props.zIndex
-    }
-    return Object.assign(style, props.customStyle)
-})
-// 父类名
-const rootClass = computed(() => {
-    return [
-        'hy-tabbar-group',
-        `hy-tabbar-group--${props.shape}`,
-        props.customClass,
-        props.fixed && 'is-fixed',
-        props.safeAreaInsetBottom && 'is-safe',
-        props.border && 'is-border'
-    ]
-})
-
-onUnmounted(() => {
-    index.value = 0
-})
-
-/**
- * 子项状态变更
- * @param index 子项
- */
-function setChange(index: string | number) {
-    emit('update:modelValue', index)
-    emit('change', {
-        value: index
-    })
-}
-</script>
-<style lang="scss" scoped>
-@import './index.scss';
-</style>
+<template>
+    <view
+        :class="{
+            'hy-tabbar-group__placeholder':
+                fixed && placeholder && safeAreaInsetBottom && shape === 'round'
+        }"
+    >
+        <view :class="rootClass" :style="rootStyle">
+            <slot></slot>
+        </view>
+    </view>
+</template>
+
+<script lang="ts">
+export default {
+    name: 'hy-tabbar-group',
+    options: {
+        addGlobalClass: true,
+        virtualHost: true,
+        styleIsolation: 'shared'
+    }
+}
+</script>
+
+<script lang="ts" setup>
+import { computed, provide, toRefs, type CSSProperties, ref, onUnmounted } from 'vue'
+import tabbarGroupProps from './props'
+import type { ITabBarGroupEmits } from './typing'
+
+/**
+ * 底部导航栏，用于在不同页面之间进行切换。
+ * @displayName hy-tabbar-group
+ */
+defineOptions({})
+
+const props = defineProps(tabbarGroupProps)
+const emit = defineEmits<ITabBarGroupEmits>()
+
+const index = ref(0) // 递增用
+const getIndex = () => {
+    return index.value++
+}
+
+provide('hy-tabbar', {
+    ...toRefs(props),
+    setChange,
+    getIndex
+})
+
+// 父属性值
+const rootStyle = computed(() => {
+    const style: CSSProperties = {
+        background: props.bgColor,
+        zIndex: props.zIndex
+    }
+    return Object.assign(style, props.customStyle)
+})
+// 父类名
+const rootClass = computed(() => {
+    return [
+        'hy-tabbar-group',
+        `hy-tabbar-group--${props.shape}`,
+        props.customClass,
+        props.fixed && 'is-fixed',
+        props.safeAreaInsetBottom && 'is-safe',
+        props.border && 'is-border'
+    ]
+})
+
+onUnmounted(() => {
+    index.value = 0
+})
+
+/**
+ * 子项状态变更
+ * @param index 子项
+ */
+function setChange(index: string | number) {
+    emit('update:modelValue', index)
+    emit('change', {
+        value: index
+    })
+}
+</script>
+<style lang="scss" scoped>
+@import './index.scss';
+</style>

package/components/hy-tabbar-group/props.ts

@@ -1,78 +1,78 @@
-import type { CSSProperties, PropType } from 'vue'
-import type { HyBadgeProps } from '../hy-badge/typing'
-
-const tabbarGroupProps = {
-    /** 选中项的索引值 */
-    modelValue: {
-        type: Number,
-        default: 0
-    },
-    /** 是否固定在底部 */
-    fixed: {
-        type: Boolean,
-        default: false
-    },
-    /** 是否显示顶部边框 */
-    border: {
-        type: Boolean,
-        default: true
-    },
-    /** 是否显示占位元素 */
-    placeholder: {
-        type: Boolean,
-        default: true
-    },
-    /**
-     * 导航栏的形状
-     * @values square, circle
-     * */
-    shape: {
-        type: String,
-        default: 'square'
-    },
-    /** 背景颜色 */
-    bgColor: {
-        type: String,
-        default: ''
-    },
-    /** 激活颜色 */
-    activeColor: {
-        type: String,
-        default: ''
-    },
-    /** 非激活颜色 */
-    inactiveColor: {
-        type: String,
-        default: ''
-    },
-    /** 底部安全区域适配 - 主要用于iPhone X及以上机型 */
-    safeAreaInsetBottom: {
-        type: Boolean,
-        default: true
-    },
-    /** 图标大小 */
-    iconSize: {
-        type: [String, Number],
-        default: ''
-    },
-    /** 文字大小 */
-    fontSize: {
-        type: [String, Number],
-        default: ''
-    },
-    /** 徽标部分属性 */
-    badgeProps: {
-        type: Object as PropType<HyBadgeProps>
-    },
-    /** z-index层级 */
-    zIndex: {
-        type: Number,
-        default: 10086
-    },
-    /** 定义需要用到的外部样式 */
-    customStyle: Object as PropType<CSSProperties>,
-    /** 自定义外部类名 */
-    customClass: String
-} as const
-
-export default tabbarGroupProps
+import type { CSSProperties, PropType } from 'vue'
+import type { HyBadgeProps } from '../hy-badge/typing'
+
+const tabbarGroupProps = {
+    /** 选中项的索引值 */
+    modelValue: {
+        type: Number,
+        default: 0
+    },
+    /** 是否固定在底部 */
+    fixed: {
+        type: Boolean,
+        default: false
+    },
+    /** 是否显示顶部边框 */
+    border: {
+        type: Boolean,
+        default: true
+    },
+    /** 是否显示占位元素 */
+    placeholder: {
+        type: Boolean,
+        default: true
+    },
+    /**
+     * 导航栏的形状
+     * @values square, circle
+     * */
+    shape: {
+        type: String,
+        default: 'square'
+    },
+    /** 背景颜色 */
+    bgColor: {
+        type: String,
+        default: ''
+    },
+    /** 激活颜色 */
+    activeColor: {
+        type: String,
+        default: ''
+    },
+    /** 非激活颜色 */
+    inactiveColor: {
+        type: String,
+        default: ''
+    },
+    /** 底部安全区域适配 - 主要用于iPhone X及以上机型 */
+    safeAreaInsetBottom: {
+        type: Boolean,
+        default: true
+    },
+    /** 图标大小 */
+    iconSize: {
+        type: [String, Number],
+        default: ''
+    },
+    /** 文字大小 */
+    fontSize: {
+        type: [String, Number],
+        default: ''
+    },
+    /** 徽标部分属性 */
+    badgeProps: {
+        type: Object as PropType<HyBadgeProps>
+    },
+    /** z-index层级 */
+    zIndex: {
+        type: Number,
+        default: 10086
+    },
+    /** 定义需要用到的外部样式 */
+    customStyle: Object as PropType<CSSProperties>,
+    /** 自定义外部类名 */
+    customClass: String
+} as const
+
+export default tabbarGroupProps

package/components/hy-tabbar-group/typing.d.ts

@@ -1,16 +1,16 @@
-import type { ExtractPropTypes, ToRefs } from 'vue'
-import type tabbarGroupProps from './props'
-
-export type TabBarGroupProps = ToRefs<ExtractPropTypes<typeof tabbarGroupProps>>
-
-export type ParamType = {
-    value: string | number
-}
-
-// ITabBarGroupEmits 接口定义组件的自定义事件
-export interface ITabBarGroupEmits {
-    /** 更新选中索引 */
-    (e: 'update:modelValue', value: string | number): void
-    /** 变化事件 */
-    (e: 'change', param: ParamType): void
-}
+import type { ExtractPropTypes, ToRefs } from 'vue'
+import type tabbarGroupProps from './props'
+
+export type TabBarGroupProps = ToRefs<ExtractPropTypes<typeof tabbarGroupProps>>
+
+export type ParamType = {
+    value: string | number
+}
+
+// ITabBarGroupEmits 接口定义组件的自定义事件
+export interface ITabBarGroupEmits {
+    /** 更新选中索引 */
+    (e: 'update:modelValue', value: string | number): void
+    /** 变化事件 */
+    (e: 'change', param: ParamType): void
+}

package/components/hy-tabbar-item/hy-tabbar-item.vue

@@ -1,103 +1,103 @@
-<template>
-    <view class="hy-tabbar-item" @click="handleClick">
-        <view class="hy-tabbar-item__body">
-            <hy-badge
-                :value="value"
-                :show="!!value"
-                absolute
-                :offset="tabbarConfig?.badgeProps.value?.offset || [-10, 18]"
-                :isDot="tabbarConfig?.badgeProps.value?.isDot"
-                :max="tabbarConfig?.badgeProps.value?.max"
-                :type="tabbarConfig?.badgeProps.value?.type"
-                :bgColor="tabbarConfig?.badgeProps.value?.bgColor"
-                :color="tabbarConfig?.badgeProps.value?.color"
-                :shape="tabbarConfig?.badgeProps.value?.shape"
-                :numberType="tabbarConfig?.badgeProps.value?.numberType"
-                :inverted="tabbarConfig?.badgeProps.value?.inverted"
-            >
-            </hy-badge>
-            <slot v-if="$slots.icon" name="icon" :active="active"></slot>
-            <hy-icon
-                v-else
-                :name="icon"
-                :color="iconColor"
-                :size="tabbarConfig?.iconSize?.value"
-                :custom-class="`hy-tabbar-item__body-icon ${active ? 'is-active' : 'is-inactive'}`"
-            ></hy-icon>
-            <text
-                v-if="title"
-                :style="{ color: iconColor, fontSize: tabbarConfig?.fontSize?.value }"
-                :class="`hy-tabbar-item__body-title ${active ? 'is-active' : 'is-inactive'}`"
-            >
-                {{ title }}
-            </text>
-        </view>
-    </view>
-</template>
-
-<script lang="ts">
-export default {
-    name: 'hy-tabbar-item',
-    options: {
-        addGlobalClass: true,
-        virtualHost: true,
-        styleIsolation: 'shared'
-    }
-}
-</script>
-
-<script lang="ts" setup>
-import { computed, inject, ref } from 'vue'
-import tabbarItemProps from './props'
-import type { ITabbarConfig } from './typing'
-
-// 组件
-import HyBadge from '../hy-badge/hy-badge.vue'
-import HyIcon from '../hy-icon/hy-icon.vue'
-
-/**
- * 底部导航栏，用于在不同页面之间进行切换。
- * @displayName hy-tabbar-item
- */
-defineOptions({})
-
-const props = defineProps(tabbarItemProps)
-
-// 尝试从父组件注入配置
-const tabbarConfig = inject<ITabbarConfig>('hy-tabbar')
-// 获取唯一 ID
-const uid = ref<number>(tabbarConfig?.getIndex()!)
-
-const iconColor = computed(() => {
-    if (tabbarConfig) {
-        if (active.value && tabbarConfig.activeColor?.value) {
-            return tabbarConfig.activeColor.value
-        }
-        if (!active.value && tabbarConfig.inactiveColor?.value) {
-            return tabbarConfig.inactiveColor.value
-        }
-    }
-})
-
-const active = computed(() => {
-    const name = props.name || uid.value
-    if (tabbarConfig) {
-        return tabbarConfig.modelValue.value === name
-    } else {
-        return false
-    }
-})
-
-/**
- * 点击tabbar选项
- */
-function handleClick() {
-    const index: string | number = props.name || uid.value
-    if (tabbarConfig && index !== tabbarConfig?.modelValue?.value) {
-        tabbarConfig.setChange(index)
-    }
-}
-</script>
-<style lang="scss" scoped>
-@import './index.scss';
-</style>
+<template>
+    <view class="hy-tabbar-item" @click="handleClick">
+        <view class="hy-tabbar-item__body">
+            <hy-badge
+                :value="value"
+                :show="!!value"
+                absolute
+                :offset="tabbarConfig?.badgeProps.value?.offset || [-10, 18]"
+                :isDot="tabbarConfig?.badgeProps.value?.isDot"
+                :max="tabbarConfig?.badgeProps.value?.max"
+                :type="tabbarConfig?.badgeProps.value?.type"
+                :bgColor="tabbarConfig?.badgeProps.value?.bgColor"
+                :color="tabbarConfig?.badgeProps.value?.color"
+                :shape="tabbarConfig?.badgeProps.value?.shape"
+                :numberType="tabbarConfig?.badgeProps.value?.numberType"
+                :inverted="tabbarConfig?.badgeProps.value?.inverted"
+            >
+            </hy-badge>
+            <slot v-if="$slots.icon" name="icon" :active="active"></slot>
+            <hy-icon
+                v-else
+                :name="icon"
+                :color="iconColor"
+                :size="tabbarConfig?.iconSize?.value"
+                :custom-class="`hy-tabbar-item__body-icon ${active ? 'is-active' : 'is-inactive'}`"
+            ></hy-icon>
+            <text
+                v-if="title"
+                :style="{ color: iconColor, fontSize: tabbarConfig?.fontSize?.value }"
+                :class="`hy-tabbar-item__body-title ${active ? 'is-active' : 'is-inactive'}`"
+            >
+                {{ title }}
+            </text>
+        </view>
+    </view>
+</template>
+
+<script lang="ts">
+export default {
+    name: 'hy-tabbar-item',
+    options: {
+        addGlobalClass: true,
+        virtualHost: true,
+        styleIsolation: 'shared'
+    }
+}
+</script>
+
+<script lang="ts" setup>
+import { computed, inject, ref } from 'vue'
+import tabbarItemProps from './props'
+import type { ITabbarConfig } from './typing'
+
+// 组件
+import HyBadge from '../hy-badge/hy-badge.vue'
+import HyIcon from '../hy-icon/hy-icon.vue'
+
+/**
+ * 底部导航栏，用于在不同页面之间进行切换。
+ * @displayName hy-tabbar-item
+ */
+defineOptions({})
+
+const props = defineProps(tabbarItemProps)
+
+// 尝试从父组件注入配置
+const tabbarConfig = inject<ITabbarConfig>('hy-tabbar')
+// 获取唯一 ID
+const uid = ref<number>(tabbarConfig?.getIndex()!)
+
+const iconColor = computed(() => {
+    if (tabbarConfig) {
+        if (active.value && tabbarConfig.activeColor?.value) {
+            return tabbarConfig.activeColor.value
+        }
+        if (!active.value && tabbarConfig.inactiveColor?.value) {
+            return tabbarConfig.inactiveColor.value
+        }
+    }
+})
+
+const active = computed(() => {
+    const name = props.name || uid.value
+    if (tabbarConfig) {
+        return tabbarConfig.modelValue.value === name
+    } else {
+        return false
+    }
+})
+
+/**
+ * 点击tabbar选项
+ */
+function handleClick() {
+    const index: string | number = props.name || uid.value
+    if (tabbarConfig && index !== tabbarConfig?.modelValue?.value) {
+        tabbarConfig.setChange(index)
+    }
+}
+</script>
+<style lang="scss" scoped>
+@import './index.scss';
+</style>

package/components/hy-tabbar-item/typing.d.ts

@@ -1,10 +1,10 @@
-import type { TabBarGroupProps } from '../hy-tabbar-group/typing'
-
-export interface ITabbarConfig extends TabBarGroupProps {
-    /**
-     * 子项状态变更触发父方法
-     * */
-    setChange: (option: string | number) => void
-    /** 获取默认唯一值，递增 */
-    getIndex: () => number
-}
+import type { TabBarGroupProps } from '../hy-tabbar-group/typing'
+
+export interface ITabbarConfig extends TabBarGroupProps {
+    /**
+     * 子项状态变更触发父方法
+     * */
+    setChange: (option: string | number) => void
+    /** 获取默认唯一值，递增 */
+    getIndex: () => number
+}