hy-app 0.5.12 → 0.5.14

package/components/hy-button/index.scss

@@ -14,6 +14,9 @@
   box-sizing: border-box;
   /* #endif */
   flex-direction: row;
+  /* 防止文字内容被压缩换行 */
+  flex-shrink: 0;
+
 
   /* 亮光效果 */
   &::before {

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

@@ -1,161 +1,161 @@
-<template>
-    <view
-        :class="cellClass"
-        :hover-class="hoverClass"
-        :style="customStyle"
-        :hover-stay-time="250"
-        @tap="clickHandler"
-    >
-        <view class="hy-cell-item__left">
-            <view v-if="icon || $slots.icon" class="hy-cell-item__left--icon">
-                <!-- @slot 图标插槽 -->
-                <slot v-if="$slots.icon" name="icon" :icon="item?.icon"></slot>
-                <hy-icon
-                    v-else
-                    :size="iconSize"
-                    :name="icon?.name"
-                    :color="!!(disabled || cellConfig?.disabled.value) ? '#FFFFFF3F' : icon?.color"
-                    :bold="icon?.bold"
-                    :customPrefix="icon?.customPrefix"
-                    :imgMode="icon?.imgMode"
-                    :width="icon?.width"
-                    :height="icon?.height"
-                    :top="icon?.top"
-                    :stop="icon?.stop"
-                    :round="icon?.round"
-                    :customStyle="icon?.customStyle"
-                    :customClass="icon?.customClass"
-                ></hy-icon>
-            </view>
-            <view class="hy-cell-item__left--title">
-                <!-- @slot 列表标题插槽 -->
-                <slot v-if="$slots.title" name="title" :title="title"></slot>
-                <text v-else class="hy-cell-item__left--title__text">
-                    {{ title }}
-                </text>
-                <!-- @slot 列表小标题插槽 -->
-                <slot v-if="$slots.sub" name="sub" :sub="sub"></slot>
-                <text v-else-if="sub" class="hy-cell-item__left--title__sub">
-                    {{ sub }}
-                </text>
-            </view>
-        </view>
-        <view
-            class="hy-cell-item__center"
-            :style="{
-                justifyContent:
-                    cellConfig?.arrange.value === 'left'
-                        ? 'flex-start'
-                        : cellConfig?.arrange.value === 'right'
-                          ? 'flex-end'
-                          : 'center'
-            }"
-        >
-            <!-- @slot 值内容插槽 -->
-            <slot v-if="$slots.value" name="value" :record="item"></slot>
-            <text v-else-if="value" class="hy-cell-item__center--value">
-                {{ value }}
-            </text>
-        </view>
-        <view
-            :class="[
-                'hy-cell-item__right',
-                `hy-cell-item__right--${cellConfig?.arrowDirection.value}`
-            ]"
-            v-if="cellConfig?.isRightIcon.value"
-        >
-            <!-- @slot 右边按钮插槽 -->
-            <slot v-if="$slots['right-icon']" name="right-icon" :icon="rightIcon"></slot>
-            <hy-icon
-                v-else
-                :name="rightIcon?.name || IconConfig.RIGHT"
-                :color="!!(disabled || cellConfig?.disabled.value) ? '#FFFFFF3F' : rightIcon?.color"
-                :bold="rightIcon?.bold"
-                :customPrefix="rightIcon?.customPrefix"
-                :imgMode="rightIcon?.imgMode"
-                :width="rightIcon?.width"
-                :height="rightIcon?.height"
-                :stop="rightIcon?.stop"
-                :round="rightIcon?.round"
-                :customStyle="rightIcon?.customStyle"
-                :customClass="rightIcon?.customClass"
-            ></hy-icon>
-        </view>
-    </view>
-</template>
-
-<script lang="ts">
-export default {
-    name: 'hy-cell-item',
-    options: {
-        virtualHost: true,
-        styleIsolation: 'shared'
-    }
-}
-</script>
-
-<script setup lang="ts">
-import { computed, inject } from 'vue'
-import cellItemProps from './props'
-import type { ICellContext } from './typing'
-import { IconConfig } from '../../libs'
-import type { ICellEmits } from '../hy-cell/typing'
-// 组件
-import HyIcon from '../hy-icon/hy-icon.vue'
-
-const props = defineProps(cellItemProps)
-const emit = defineEmits<ICellEmits>()
-const cellConfig = inject<ICellContext>('hy-cell')
-
-// 单元格类名
-const cellClass = computed(() => {
-    return [
-        'hy-cell-item',
-        `hy-cell-item--${cellConfig?.size.value}`,
-        cellConfig?.border.value && 'hy-border__bottom',
-        (props.disabled || cellConfig?.disabled.value) && 'hy-cell-item__disabled',
-        props.customClass
-    ]
-})
-
-// 计算什么时候出现点击状态
-const hoverClass = computed(() => {
-    if (!(props.disabled || cellConfig?.disabled.value) && cellConfig?.clickable.value) {
-        return 'hy-cell-item__clickable'
-    } else {
-        return ''
-    }
-})
-
-// 图标大小
-const iconSize = computed(() => {
-    switch (cellConfig?.size.value) {
-        case 'large':
-            return 25
-        case 'medium':
-            return 20
-        case 'small':
-            return 15
-    }
-})
-
-/**
- * 点击cell
- * */
-const clickHandler = (e: Event) => {
-    if (cellConfig?.disabled.value || props.disabled) return
-    if (props.stop) e.stopPropagation()
-
-    emit('click', props.name)
-    cellConfig?.onClick(props.name)
-    if (props.url) {
-        ;(uni as any)[props.linkType]({
-            url: props.url
-        })
-    }
-}
-</script>
-
-<style lang="scss" scoped>
-@import './index.scss';
-</style>
+<template>
+    <view
+        :class="cellClass"
+        :hover-class="hoverClass"
+        :style="customStyle"
+        :hover-stay-time="250"
+        @tap="clickHandler"
+    >
+        <view class="hy-cell-item__left">
+            <view v-if="icon || $slots.icon" class="hy-cell-item__left--icon">
+                <!-- @slot 图标插槽 -->
+                <slot v-if="$slots.icon" name="icon" :icon="item?.icon"></slot>
+                <hy-icon
+                    v-else
+                    :size="iconSize"
+                    :name="icon?.name"
+                    :color="!!(disabled || cellConfig?.disabled.value) ? '#FFFFFF3F' : icon?.color"
+                    :bold="icon?.bold"
+                    :customPrefix="icon?.customPrefix"
+                    :imgMode="icon?.imgMode"
+                    :width="icon?.width"
+                    :height="icon?.height"
+                    :top="icon?.top"
+                    :stop="icon?.stop"
+                    :round="icon?.round"
+                    :customStyle="icon?.customStyle"
+                    :customClass="icon?.customClass"
+                ></hy-icon>
+            </view>
+            <view class="hy-cell-item__left--title">
+                <!-- @slot 列表标题插槽 -->
+                <slot v-if="$slots.title" name="title" :title="title"></slot>
+                <text v-else class="hy-cell-item__left--title__text">
+                    {{ title }}
+                </text>
+                <!-- @slot 列表小标题插槽 -->
+                <slot v-if="$slots.sub" name="sub" :sub="sub"></slot>
+                <text v-else-if="sub" class="hy-cell-item__left--title__sub">
+                    {{ sub }}
+                </text>
+            </view>
+        </view>
+        <view
+            class="hy-cell-item__center"
+            :style="{
+                justifyContent:
+                    cellConfig?.arrange.value === 'left'
+                        ? 'flex-start'
+                        : cellConfig?.arrange.value === 'right'
+                          ? 'flex-end'
+                          : 'center'
+            }"
+        >
+            <!-- @slot 值内容插槽 -->
+            <slot v-if="$slots.value" name="value" :record="item"></slot>
+            <text v-else-if="value" class="hy-cell-item__center--value">
+                {{ value }}
+            </text>
+        </view>
+        <view
+            :class="[
+                'hy-cell-item__right',
+                `hy-cell-item__right--${cellConfig?.arrowDirection.value}`
+            ]"
+            v-if="cellConfig?.isRightIcon.value"
+        >
+            <!-- @slot 右边按钮插槽 -->
+            <slot v-if="$slots['right-icon']" name="right-icon" :icon="rightIcon"></slot>
+            <hy-icon
+                v-else
+                :name="rightIcon?.name || IconConfig.RIGHT"
+                :color="!!(disabled || cellConfig?.disabled.value) ? '#FFFFFF3F' : rightIcon?.color"
+                :bold="rightIcon?.bold"
+                :customPrefix="rightIcon?.customPrefix"
+                :imgMode="rightIcon?.imgMode"
+                :width="rightIcon?.width"
+                :height="rightIcon?.height"
+                :stop="rightIcon?.stop"
+                :round="rightIcon?.round"
+                :customStyle="rightIcon?.customStyle"
+                :customClass="rightIcon?.customClass"
+            ></hy-icon>
+        </view>
+    </view>
+</template>
+
+<script lang="ts">
+export default {
+    name: 'hy-cell-item',
+    options: {
+        virtualHost: true,
+        styleIsolation: 'shared'
+    }
+}
+</script>
+
+<script setup lang="ts">
+import { computed, inject } from 'vue'
+import cellItemProps from './props'
+import type { ICellContext } from './typing'
+import { IconConfig } from '../../libs'
+import type { ICellEmits } from '../hy-cell/typing'
+// 组件
+import HyIcon from '../hy-icon/hy-icon.vue'
+
+const props = defineProps(cellItemProps)
+const emit = defineEmits<ICellEmits>()
+const cellConfig = inject<ICellContext>('hy-cell')
+
+// 单元格类名
+const cellClass = computed(() => {
+    return [
+        'hy-cell-item',
+        `hy-cell-item--${cellConfig?.size.value}`,
+        cellConfig?.border.value && 'hy-border__bottom',
+        (props.disabled || cellConfig?.disabled.value) && 'hy-cell-item__disabled',
+        props.customClass
+    ]
+})
+
+// 计算什么时候出现点击状态
+const hoverClass = computed(() => {
+    if (!(props.disabled || cellConfig?.disabled.value) && cellConfig?.clickable.value) {
+        return 'hy-cell-item__clickable'
+    } else {
+        return ''
+    }
+})
+
+// 图标大小
+const iconSize = computed(() => {
+    switch (cellConfig?.size.value) {
+        case 'large':
+            return 25
+        case 'medium':
+            return 20
+        case 'small':
+            return 15
+    }
+})
+
+/**
+ * 点击cell
+ * */
+const clickHandler = (e: Event) => {
+    if (cellConfig?.disabled.value || props.disabled) return
+    if (props.stop) e.stopPropagation()
+
+    emit('click', props.name)
+    cellConfig?.onClick(props.name)
+    if (props.url) {
+        uni.navigateTo({
+            url: props.url
+        })
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+@import './index.scss';
+</style>

package/components/hy-cell-item/props.ts

@@ -1,66 +1,59 @@
-import type { CSSProperties, PropType } from 'vue'
-import type { HyIconProps } from '../hy-icon/typing'
-
-const cellItemProps = {
-    /** 头部标题 */
-    title: String,
-    /** 标题下面小提示 */
-    sub: String,
-    /** 是否禁用cell */
-    disabled: {
-        type: Boolean,
-        default: false
-    },
-    /** 右侧的内容 */
-    value: String,
-    /** 图标，接收icon对象 */
-    icon: {
-        type: Object as PropType<HyIconProps>
-    },
-    /** 右边图标，默认是向左图标 */
-    rightIcon: {
-        type: Object as PropType<HyIconProps>
-    },
-    /**
-     * 右侧箭头的方向
-     * @values left,up,down
-     * */
-    arrowDirection: {
-        type: String,
-        default: 'right'
-    },
-    /**
-     * 点击后跳转的URL地址
-     * */
-    url: {
-        type: String,
-        default: ''
-    },
-    /**
-     * 链接跳转的方式，内部使用的是uview-plus封装的route方法，可能会进行拦截操作
-     * */
-    linkType: {
-        type: String,
-        default: 'navigateTo'
-    },
-    /**
-     * 点击cell是否阻止事件传播
-     * */
-    stop: {
-        type: Boolean,
-        default: true
-    },
-    /**
-     * 标识符，用于在click事件中进行返回
-     * */
-    name: {
-        type: [String, Number],
-        default: ''
-    },
-    /** 定义需要用到的外部样式 */
-    customStyle: Object as PropType<CSSProperties>,
-    /** 自定义外部类名 */
-    customClass: String
-}
-
-export default cellItemProps
+import type { CSSProperties, PropType } from 'vue'
+import type { HyIconProps } from '../hy-icon/typing'
+
+const cellItemProps = {
+    /** 头部标题 */
+    title: String,
+    /** 标题下面小提示 */
+    sub: String,
+    /** 是否禁用cell */
+    disabled: {
+        type: Boolean,
+        default: false
+    },
+    /** 右侧的内容 */
+    value: String,
+    /** 图标，接收icon对象 */
+    icon: {
+        type: Object as PropType<HyIconProps>
+    },
+    /** 右边图标，默认是向左图标 */
+    rightIcon: {
+        type: Object as PropType<HyIconProps>
+    },
+    /**
+     * 右侧箭头的方向
+     * @values left,up,down
+     * */
+    arrowDirection: {
+        type: String,
+        default: 'right'
+    },
+    /**
+     * 点击后跳转的URL地址
+     * */
+    url: {
+        type: String,
+        default: ''
+    },
+    /**
+     * 点击cell是否阻止事件传播
+     * */
+    stop: {
+        type: Boolean,
+        default: true
+    },
+    /**
+     * 标识符，用于在click事件中进行返回
+     * */
+    name: {
+        type: [String, Number],
+        default: ''
+    },
+    /** 定义需要用到的外部样式 */
+    customStyle: Object as PropType<CSSProperties>,
+    /** 自定义外部类名 */
+    customClass: String
+}
+
+export default cellItemProps

package/components/hy-config-provider/index.scss

@@ -5,14 +5,11 @@
 @include b(config-provider) {
   box-sizing: border-box;
   width: 100%;
-  /* #ifdef H5 */
-  height: calc(100vh - 44px);
-  /* #endif */
-  /* #ifndef H5 */
-  height: 100vh;
-  /* #endif */
-  overflow-y: auto;
-  overflow-x: hidden;
+  height: calc(100vh - var(--window-top));
+  height: calc(100vh - var(--window-top) - constant(safe-area-inset-bottom));
+  height: calc(100vh - var(--window-top) - env(safe-area-inset-bottom));
+  //overflow-y: auto;
+  //overflow-x: hidden;
   background-color: $hy-background;
   color: $hy-text-color;
 }

package/components/hy-coupon/index.scss

@@ -1,7 +1,8 @@
 @use '../../libs/css/mixin' as *;
 @use '../../libs/css/theme.scss' as *;
 
-$hy-box-width: 180rpx;
+$hy-coupon--box-width: 180rpx;
+$hy-coupon--bg-height: 166rpx;
 @include b(coupon) {
   width: 100%;
   min-height: 190rpx;
@@ -32,10 +33,10 @@ $hy-box-width: 180rpx;
   /* 不同类型优惠券的背景色 */
   @include m(moneyOff) {
     background:
-            radial-gradient(circle at $hy-box-width top, transparent 15rpx, #ff7d00 0) top / 100% 85px
+            radial-gradient(circle at $hy-coupon--box-width top, transparent 15rpx, #ff7d00 0) top / 100% $hy-coupon--bg-height
             no-repeat,
-            radial-gradient(circle at $hy-box-width bottom, transparent 15rpx, #ff7d00 0) bottom / 100%
-            85px no-repeat;
+            radial-gradient(circle at $hy-coupon--box-width bottom, transparent 15rpx, #ff7d00 0) bottom / 100%
+            $hy-coupon--bg-height no-repeat;
     //background:
     //        radial-gradient(circle at left center, transparent 15rpx, #ff7d00 0) left center / 30rpx 100% no-repeat,
     //        radial-gradient(circle at right center, transparent 15rpx, #ff7d00 0) right center / 30rpx 100% no-repeat;
@@ -44,17 +45,17 @@ $hy-box-width: 180rpx;
   }
   @include m(discount) {
     background:
-            radial-gradient(circle at $hy-box-width top, transparent 15rpx, #00c6ff 0) top / 100% 70px
+            radial-gradient(circle at $hy-coupon--box-width top, transparent 15rpx, #00c6ff 0) top / 100% $hy-coupon--bg-height
             no-repeat,
-            radial-gradient(circle at $hy-box-width bottom, transparent 15rpx, #00c6ff 0) bottom / 100%
-            51px no-repeat;
+            radial-gradient(circle at $hy-coupon--box-width bottom, transparent 15rpx, #00c6ff 0) bottom / 100%
+            $hy-coupon--bg-height no-repeat;
   }
   @include m(fixedAmount) {
     background:
-            radial-gradient(circle at $hy-box-width top, transparent 15rpx, $hy-error 0) top / 100% 70px
+            radial-gradient(circle at $hy-coupon--box-width top, transparent 15rpx, $hy-error 0) top / 100% $hy-coupon--bg-height
             no-repeat,
-            radial-gradient(circle at $hy-box-width bottom, transparent 15rpx, $hy-error 0) bottom / 100%
-            51px no-repeat;
+            radial-gradient(circle at $hy-coupon--box-width bottom, transparent 15rpx, $hy-error 0) bottom / 100%
+            $hy-coupon--bg-height no-repeat;
   }
 
   /* 优惠券内容区域 */
@@ -72,7 +73,7 @@ $hy-box-width: 180rpx;
       justify-content: center;
       align-items: center;
       height: 100%;
-      width: $hy-box-width;
+      width: $hy-coupon--box-width;
       padding: $hy-border-margin-padding-base;
       box-sizing: border-box;
       flex-shrink: 0;

package/components/hy-coupon/props.ts

@@ -35,6 +35,11 @@ const couponProps = {
         type: String,
         default: ''
     },
+    /** 描述省略行数，none不省略，1代表一行省略 */
+    desEllipsis: {
+        type: [String, Number],
+        default: 'none'
+    },
     /** 优惠券金额 */
     amount: {
         type: [String, Number],
@@ -45,11 +50,6 @@ const couponProps = {
         type: String,
         default: ''
     },
-    /** 描述省略行数，none不省略，1代表一行省略 */
-    desEllipsis: {
-        type: [String, Number],
-        default: 'none'
-    },
     /** 优惠券开始时间 */
     startDate: {
         type: String,