hy-app 0.5.14 → 0.5.15

package/components/hy-icon/index.scss

@@ -1,7 +1,6 @@
 @use "../../libs/css/mixin" as *;
-@use "../../libs/css/iconfont.css" as *;
 @use "../../libs/css/theme" as *;
-
+@use "../../libs/css/iconfont" as *;
 
 @include b(icon) {
   /* #ifndef APP-NVUE */

package/components/hy-index-bar/hy-index-bar.vue

@@ -95,17 +95,6 @@ const indexItemStyles = computed(() => {
         height: addUnit(props.width),
         fontSize: addUnit(props.indexSize)
     } as CSSProperties
-    console.log(
-        props.indexList.reduce((styles: Record<string, CSSProperties>, item: IIndexItem) => {
-            const isActive = props.modelValue === indexValue.value(item)
-            styles[indexValue.value(item)] = {
-                ...commonStyle,
-                color: isActive ? props.activeIndexColor : props.indexColor,
-                backgroundColor: isActive ? props.activeIndexBgColor : props.indexBgColor
-            }
-            return styles
-        }, {})
-    )
 
     // 为每个索引项创建样式对象并缓存
     return props.indexList.reduce((styles: Record<string, CSSProperties>, item: IIndexItem) => {
@@ -121,7 +110,6 @@ const indexItemStyles = computed(() => {
 
 // 获取索引项样式的便捷方法
 const getIndexItemStyle = (index: string) => {
-    console.log(index, '===')
     return indexItemStyles.value[index] || {}
 }
 

package/components/hy-index-bar/index.scss

@@ -51,7 +51,7 @@
     border-radius: 100px 100px 0 100px;
     text-align: center;
     color: #ffffff;
-    background-color: #c9c9c9;
+    background-color: $hy-background--empty;
     transform: rotate(-45deg);
     display: flex;
     justify-content: center;

package/components/hy-notify/hy-notify.vue

@@ -1,174 +1,174 @@
-<template>
-    <hy-transition mode="slide-down" :customStyle="containerStyle" :show="open">
-        <view
-            :class="['hy-notify', `hy-notify--${tmpConfig?.type}`, customClass]"
-            :style="[backgroundColor, customStyle]"
-        >
-            <hy-status-bar v-if="tmpConfig?.safeAreaInsetTop"></hy-status-bar>
-            <view class="hy-notify__wrapper">
-                <template v-if="['success', 'warning', 'error'].includes(tmpConfig.type)">
-                    <slot v-if="$slots.icon" name="icon"></slot>
-                    <hy-icon
-                        v-else
-                        :name="tmpConfig?.icon || icon"
-                        :color="tmpConfig?.color"
-                        :size="tmpConfig.fontSize"
-                        :customStyle="{ marginRight: '4px' }"
-                    ></hy-icon>
-                </template>
-                <text
-                    class="hy-notify__wrapper--text"
-                    :style="{
-                        fontSize: addUnit(tmpConfig?.fontSize),
-                        color: tmpConfig?.color
-                    }"
-                >
-                    {{ tmpConfig?.message }}
-                </text>
-            </view>
-        </view>
-    </hy-transition>
-</template>
-
-<script lang="ts">
-export default {
-    name: 'hy-notify',
-    options: {
-        addGlobalClass: true,
-        virtualHost: true,
-        styleIsolation: 'shared'
-    }
-}
-</script>
-
-<script setup lang="ts">
-import type HyNotifyProps from './typing'
-import { computed, ref } from 'vue'
-import type { CSSProperties } from 'vue'
-import { addUnit, IconConfig } from '../../libs'
-import notifyProps from './props'
-// 组件
-import HyTransition from '../hy-transition/hy-transition.vue'
-import HyStatusBar from '../hy-status-bar/hy-status-bar.vue'
-import HyIcon from '../hy-icon/hy-icon.vue'
-
-/**
- * 一般用于页面顶部向下滑出一个提示，尔后自动收起的场景。
- * @displayName hy-notify
- */
-defineOptions({})
-
-const props = defineProps(notifyProps)
-
-const config = ref<HyNotifyProps>({
-    // 到顶部的距离
-    top: props.top,
-    // type主题，primary，success，warning，error
-    type: props.type,
-    // 字体颜色
-    color: props.color,
-    // 背景颜色
-    bgColor: props.bgColor,
-    // 展示的文字内容
-    message: props.message,
-    // 展示时长，为0时不消失，单位ms
-    duration: props.duration,
-    // 字体大小
-    fontSize: props.fontSize,
-    // 是否留出顶部安全距离（状态栏高度）
-    safeAreaInsetTop: props.safeAreaInsetTop
-})
-const tmpConfig = ref<HyNotifyProps>({})
-const open = ref(false)
-let timer: ReturnType<typeof setTimeout>
-
-/**
- * @description 容器样式
- * */
-const containerStyle = computed(() => {
-    let top = 0
-    if (tmpConfig.value.top === 0) {
-        // #ifdef H5
-        // H5端，导航栏为普通元素，需要将组件移动到导航栏的下边沿
-        // H5的导航栏高度为44px
-        top = 44
-        // #endif
-    }
-    const style: CSSProperties = {
-        top: addUnit(tmpConfig.value.top === 0 ? top : tmpConfig.value.top),
-        // 因为组件底层为hy-transition组件，必须将其设置为fixed定位
-        // 让其出现在导航栏底部
-        position: 'fixed',
-        left: 0,
-        right: 0,
-        zIndex: 10076
-    }
-    return style
-})
-/**
- * @description 组件背景颜色
- */
-const backgroundColor = computed(() => {
-    const style: CSSProperties = {}
-    if (tmpConfig.value.bgColor) {
-        style.backgroundColor = tmpConfig.value.bgColor
-    }
-    return style
-})
-
-/**
- * @description 默认主题下的图标
- * */
-const icon = computed(() => {
-    switch (tmpConfig.value.type) {
-        case 'success':
-            return IconConfig.SUCCESS
-        case 'error':
-            return IconConfig.CLOSE_CIRCLE
-        case 'warning':
-            return IconConfig.NOTICE
-        default:
-            return ''
-    }
-})
-
-const show = (options: HyNotifyProps) => {
-    // 不将结果合并到this.config变量，避免多次调用hy-toast，前后的配置造成混乱
-    tmpConfig.value = Object.assign(config.value, options)
-    // 任何定时器初始化之前，都要执行清除操作，否则可能会造成混乱
-    clearTimer()
-    open.value = true
-    if (tmpConfig.value.duration && tmpConfig.value.duration! > 0) {
-        timer = setTimeout(() => {
-            open.value = false
-            // 倒计时结束，清除定时器，隐藏toast组件
-            clearTimer()
-            // 判断是否存在callback方法，如果存在就执行
-            typeof tmpConfig.value.complete === 'function' && tmpConfig.value.complete()
-        }, tmpConfig.value.duration)
-    }
-}
-/**
- * @description 关闭notify
- * */
-const close = () => {
-    clearTimer()
-}
-/**
- * @description 清除定时任务
- * */
-const clearTimer = () => {
-    open.value = false
-    // 清除定时器
-    clearTimeout(timer)
-}
-
-defineExpose({
-    show,
-    close
-})
-</script>
-
-<style scoped lang="scss">
-@import './index.scss';
-</style>
+<template>
+    <hy-transition mode="slide-down" :customStyle="containerStyle" :show="open">
+        <view
+            :class="['hy-notify', `hy-notify--${tmpConfig?.type}`, customClass]"
+            :style="[backgroundColor, customStyle]"
+        >
+            <hy-status-bar v-if="tmpConfig?.safeAreaInsetTop"></hy-status-bar>
+            <view class="hy-notify__wrapper">
+                <template v-if="['success', 'warning', 'error'].includes(tmpConfig.type)">
+                    <slot v-if="$slots.icon" name="icon"></slot>
+                    <hy-icon
+                        v-else
+                        :name="tmpConfig?.icon || icon"
+                        :color="tmpConfig?.color"
+                        :size="tmpConfig.fontSize"
+                        :customStyle="{ marginRight: '4px' }"
+                    ></hy-icon>
+                </template>
+                <text
+                    class="hy-notify__wrapper--text"
+                    :style="{
+                        fontSize: addUnit(tmpConfig?.fontSize),
+                        color: tmpConfig?.color
+                    }"
+                >
+                    {{ tmpConfig?.message }}
+                </text>
+            </view>
+        </view>
+    </hy-transition>
+</template>
+
+<script lang="ts">
+export default {
+    name: 'hy-notify',
+    options: {
+        addGlobalClass: true,
+        virtualHost: true,
+        styleIsolation: 'shared'
+    }
+}
+</script>
+
+<script setup lang="ts">
+import type HyNotifyProps from './typing'
+import { computed, ref } from 'vue'
+import type { CSSProperties } from 'vue'
+import { addUnit, IconConfig } from '../../libs'
+import notifyProps from './props'
+// 组件
+import HyTransition from '../hy-transition/hy-transition.vue'
+import HyStatusBar from '../hy-status-bar/hy-status-bar.vue'
+import HyIcon from '../hy-icon/hy-icon.vue'
+
+/**
+ * 一般用于页面顶部向下滑出一个提示，尔后自动收起的场景。
+ * @displayName hy-notify
+ */
+defineOptions({})
+
+const props = defineProps(notifyProps)
+
+const config = ref<HyNotifyProps>({
+    // 到顶部的距离
+    top: props.top,
+    // type主题，primary，success，warning，error
+    type: props.type,
+    // 字体颜色
+    color: props.color,
+    // 背景颜色
+    bgColor: props.bgColor,
+    // 展示的文字内容
+    message: props.message,
+    // 展示时长，为0时不消失，单位ms
+    duration: props.duration,
+    // 字体大小
+    fontSize: props.fontSize,
+    // 是否留出顶部安全距离（状态栏高度）
+    safeAreaInsetTop: props.safeAreaInsetTop
+})
+const tmpConfig = ref<HyNotifyProps>({})
+const open = ref(false)
+let timer: ReturnType<typeof setTimeout>
+
+/**
+ * @description 容器样式
+ * */
+const containerStyle = computed(() => {
+    let top = 0
+    if (tmpConfig.value.top === 0) {
+        // #ifdef H5
+        // H5端，导航栏为普通元素，需要将组件移动到导航栏的下边沿
+        // H5的导航栏高度为44px
+        top = 44
+        // #endif
+    }
+    const style: CSSProperties = {
+        top: addUnit(tmpConfig.value.top === 0 ? top : tmpConfig.value.top),
+        // 因为组件底层为hy-transition组件，必须将其设置为fixed定位
+        // 让其出现在导航栏底部
+        position: 'fixed',
+        left: 0,
+        right: 0,
+        zIndex: 10076
+    }
+    return style
+})
+/**
+ * @description 组件背景颜色
+ */
+const backgroundColor = computed(() => {
+    const style: CSSProperties = {}
+    if (tmpConfig.value.bgColor) {
+        style.backgroundColor = tmpConfig.value.bgColor
+    }
+    return style
+})
+
+/**
+ * @description 默认主题下的图标
+ * */
+const icon = computed(() => {
+    switch (tmpConfig.value.type) {
+        case 'success':
+            return IconConfig.SUCCESS
+        case 'error':
+            return IconConfig.CLOSE_CIRCLE
+        case 'warning':
+            return IconConfig.NOTICE_CIRCLE
+        default:
+            return ''
+    }
+})
+
+const show = (options: HyNotifyProps) => {
+    // 不将结果合并到this.config变量，避免多次调用hy-toast，前后的配置造成混乱
+    tmpConfig.value = Object.assign(config.value, options)
+    // 任何定时器初始化之前，都要执行清除操作，否则可能会造成混乱
+    clearTimer()
+    open.value = true
+    if (tmpConfig.value.duration && tmpConfig.value.duration! > 0) {
+        timer = setTimeout(() => {
+            open.value = false
+            // 倒计时结束，清除定时器，隐藏toast组件
+            clearTimer()
+            // 判断是否存在callback方法，如果存在就执行
+            typeof tmpConfig.value.complete === 'function' && tmpConfig.value.complete()
+        }, tmpConfig.value.duration)
+    }
+}
+/**
+ * @description 关闭notify
+ * */
+const close = () => {
+    clearTimer()
+}
+/**
+ * @description 清除定时任务
+ * */
+const clearTimer = () => {
+    open.value = false
+    // 清除定时器
+    clearTimeout(timer)
+}
+
+defineExpose({
+    show,
+    close
+})
+</script>
+
+<style scoped lang="scss">
+@import './index.scss';
+</style>

package/components/hy-picker/hy-picker.vue

@@ -5,7 +5,6 @@
             <template v-else>
                 <hy-input
                     v-model="inputLabelValue"
-                    :readonly="true"
                     :disabled="input?.disabled"
                     :disabledColor="input?.disabledColor"
                     :shape="input?.shape"

package/components/hy-picker/index.scss

@@ -43,7 +43,7 @@
       }
 
       @include e(item) {
-        color: $hy-text-color;
+        color: $hy-text-color !important;
         @include lineEllipsis;
         @include m(disabled) {
           /* #ifndef APP-NVUE */

package/components/hy-tabs/index.scss

@@ -31,6 +31,7 @@
         /* #ifdef H5 */
         cursor: pointer;
         /* #endif */
+        flex-shrink: 0;
 
         @include m(disabled) {
           /* #ifdef H5 */

package/components/hy-text/hy-text.vue

@@ -120,7 +120,7 @@ const valueStyle = computed(() => {
 })
 
 /**
- * @description 格式化值
+ * 格式化值
  * */
 const value = computed(() => {
     switch (props.mode) {

package/components/hy-textarea/hy-textarea.vue

@@ -78,7 +78,7 @@ defineOptions({})
 
 const props = defineProps(textareaProps)
 const emit = defineEmits<ITextareaEmits>()
-const formItem = inject<FormItemContext>('formItem')
+const formItem = inject<FormItemContext | null>('formItem', null)
 
 // 输入框的值
 const innerValue = ref<string>('')

package/components/hy-textarea/index.scss

@@ -33,6 +33,7 @@
     min-height: 50rpx;
     max-height: 200rpx;
     color: $hy-text-color;
+    caret-color: $hy-text-color;
     flex: 1;
     font-size: 15px;
     width: 100%;
@@ -50,7 +51,3 @@
     border-radius: $hy-border-radius-sm;
   }
 }
-//textarea {
-//  background-color: transparent;
-//  border: none;
-//}