hy-app 0.5.8 → 0.5.10

package/components/hy-action-sheet/index.scss

@@ -1,4 +1,4 @@
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 @use "../../libs/css/theme" as *;
 
 

package/components/hy-address-picker/index.scss

@@ -1,4 +1,4 @@
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 @include b(address-picker) {
   flex: 1;
   @include e(has-input) {

package/components/hy-avatar/index.scss

@@ -1,4 +1,4 @@
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 @use "../../libs/css/theme" as *;
 
 @include b(avatar) {

package/components/hy-back-top/index.scss

@@ -1,4 +1,4 @@
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 @use "../../libs/css/theme" as *;
 
 @include b(back-top) {

package/components/hy-badge/index.scss

@@ -1,4 +1,4 @@
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 @use "../../libs/css/theme" as *;
 
 $hy-badge-dot-size: 8px !default;

package/components/hy-button/index.scss

@@ -1,4 +1,4 @@
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 @use "../../libs/css/theme" as *;
 
 

package/components/hy-calendar/index.scss

@@ -1,4 +1,4 @@
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 @use "../../libs/css/theme" as *;
 
 

package/components/hy-card/hy-card.vue

@@ -44,7 +44,7 @@
                         </text>
                     </view>
                 </view>
-                <view class="hy-card__head--right" v-if="subTitle">
+                <view class="hy-card__head--right" v-if="rightText">
                     <text
                         class="hy-card__head--right__text"
                         :style="{

package/components/hy-card/index.scss

@@ -1,4 +1,4 @@
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 @use "../../libs/css/theme" as *;
 
 

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

@@ -24,6 +24,7 @@
                     :stop="icon?.stop"
                     :round="icon?.round"
                     :customStyle="icon?.customStyle"
+                    :customClass="icon?.customClass"
                 ></hy-icon>
             </view>
             <view class="hy-cell-item__left--title">

package/components/hy-cell-item/index.scss

@@ -1,4 +1,4 @@
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 @use "../../libs/css/theme" as *;
 
 

package/components/hy-check-button/hy-check-button.vue

@@ -1,8 +1,8 @@
 <template>
     <view class="hy-check-button">
         <template v-for="(item, i) in columns_1" :key="i">
-            <HyTag
-                :text="item?.[fieldNames.label] as string"
+            <hy-tag
+                :text="item?.[fieldNames.label]"
                 :name="i"
                 :type="type"
                 :size="size"
@@ -10,7 +10,7 @@
                 :disabled="isDisabled(item.disabled)"
                 :plain="!item?.[fieldNames.checked]"
                 @click="onCheckbox"
-            ></HyTag>
+            ></hy-tag>
         </template>
     </view>
 </template>
@@ -87,7 +87,7 @@ const onCheckbox = ({ name }: TagParamsVo) => {
 </script>
 
 <style lang="scss" scoped>
-@import '../../libs/css/mixin.scss';
+@import '../../libs/css/mixin';
 @include b(check-button) {
     display: grid;
     grid-template-columns: v-bind(col);

package/components/hy-checkbox/index.scss

@@ -1,4 +1,4 @@
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 @use "../../libs/css/theme" as *;
 
 @include b(checkbox) {

package/components/hy-checkbox-group/index.scss

@@ -1,4 +1,4 @@
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 
 @include b(checkbox) {
   @include m(group) {

package/components/hy-checkbox-item/index.scss

@@ -1,4 +1,4 @@
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 @use "../../libs/css/theme" as *;
 
 @include b(checkbox) {

package/components/hy-code-input/hy-code-input.vue

@@ -209,7 +209,7 @@ const inputHandler = (e: InputOnInputEvent) => {
 
 <style scoped lang="scss">
 @import './index.scss';
-@import '../../libs/css/mixin.scss';
+@import '../../libs/css/mixin';
 @import '../../libs/css/theme';
 @include b(code-input) {
     @include m(item) {

package/components/hy-code-input/index.scss

@@ -1,5 +1,5 @@
 @use "../../libs/css/theme" as *;
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 
 @include b(code-input) {
   @include flex;

package/components/hy-config-provider/hy-config-provider.vue

@@ -27,7 +27,6 @@ import configProviderProps from './props'
  */
 defineOptions({})
 
-// const props = withDefaults(defineProps<IProps>(), defaultProps);
 const props = defineProps(configProviderProps)
 
 const themeClass = computed(() => {
@@ -38,7 +37,10 @@ const themeStyle = computed(() => {
     return [
         {
             '--hy-theme-color': props.themeColor,
-            '--hy-theme--light': colorGradient(props.themeColor)[90],
+            '--hy-theme--light':
+                props.theme === 'light'
+                    ? colorGradient(props.themeColor)[80]
+                    : colorGradient(props.themeColor, '#000')[60],
             padding: addUnit(props.padding)
         },
         props.customStyle

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

@@ -1,4 +1,4 @@
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 @use "../../libs/css/theme" as *;
 
 

package/components/hy-count-down/index.scss

@@ -1,4 +1,4 @@
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 @use "../../libs/css/theme" as *;
 
 @include b(count-down) {

package/components/hy-count-to/index.scss

@@ -1,5 +1,5 @@
 @use "../../libs/css/theme" as *;
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 
 
 @include b(count-to) {

package/components/hy-coupon/index.scss

@@ -1,4 +1,4 @@
-@use '../../libs/css/mixin.scss' as *;
+@use '../../libs/css/mixin' as *;
 @use '../../libs/css/theme.scss' as *;
 
 $hy-box-width: 180rpx;

package/components/hy-datetime-picker/index.scss

@@ -1,4 +1,4 @@
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 
 @include b(datetime-picker) {
   flex: 1;

package/components/hy-divider/index.scss

@@ -1,4 +1,4 @@
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 @use "../../libs/css/theme" as *;
 
 @include b(divider) {

package/components/hy-dropdown/index.scss

@@ -1,5 +1,5 @@
 @use "../../libs/css/theme" as *;
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 
 @include b(dropdown) {
   width: 100%;

package/components/hy-dropdown-item/index.scss

@@ -1,5 +1,5 @@
 @use "../../libs/css/theme" as *;
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 
 @include b(dropdown-item) {
   @include e(header) {

package/components/hy-empty/index.scss

@@ -1,5 +1,5 @@
 @use "../../libs/css/theme" as *;
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 
 
 @include b(empty) {

package/components/hy-flex/index.scss

@@ -1,4 +1,4 @@
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 @include b(flex) {
   box-sizing: border-box;
 

package/components/hy-float-button/index.scss

@@ -1,5 +1,5 @@
 @use "../../libs/css/theme" as *;
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 
 
 @include b(float-button) {

package/components/hy-folding-panel-item/index.scss

@@ -1,5 +1,5 @@
 @use "../../libs/css/theme.scss" as *;
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 
 @include b(folding-panel-item) {
   position: relative;

package/components/hy-form-item/index.scss

@@ -1,5 +1,5 @@
 @use "../../libs/css/theme" as *;
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 
 @include b(form-item) {
   display: flex;

package/components/hy-grid/index.scss

@@ -1,4 +1,4 @@
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 @use "../../libs/css/theme" as *;
 
 @include b(grid) {

package/components/hy-icon/index.scss

@@ -1,4 +1,4 @@
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 @use "../../libs/css/iconfont.css" as *;
 @use "../../libs/css/theme" as *;
 

package/components/hy-image/index.scss

@@ -1,4 +1,4 @@
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 @use "../../libs/css/theme" as *;
 
 @include b(image) {

package/components/hy-input/hy-input.vue

@@ -177,7 +177,7 @@ const isShowClear = computed(() => {
 const inputClass = computed((): string => {
     let classes: string[] = [],
         { border, shape } = props
-    border === 'surround' && (classes = classes.concat(['hy-border', 'hy-input__radius']))
+    border === 'surround' && (classes = classes.concat(['hy-input__border', 'hy-input__radius']))
     classes.push(`hy-input__${shape}`)
     border === 'bottom' && (classes = classes.concat(['hy-border__bottom', 'hy-input__no-radius']))
     props.disabled && classes.push('hy-input__disabled')

package/components/hy-input/index.scss

@@ -1,4 +1,4 @@
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 @use "../../libs/css/theme" as *;
 
 @include b(input) {
@@ -7,6 +7,11 @@
   justify-content: space-between;
   flex: 1;
   color: $hy-text-color;
+  
+  @include e(border) {
+	/* TODO: 先这样写，因为在某些pda中写$hy-border-line，边框不显示，后续排除问题 */
+  	border: 1px solid #e8e8e8;
+  }
 
   @include e(radius, square) {
     border-radius: 4px;

package/components/hy-input/props.ts

@@ -181,6 +181,6 @@ const inputProps = {
     },
     /** 自定义外部类名 */
     customClass: String
-}
+} as const
 
 export default inputProps

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

@@ -4,6 +4,10 @@ import type {
     InputOnFocusEvent,
     InputOnKeyboardheightchange
 } from '@uni-helper/uni-types'
+import type { ExtractPropTypes } from 'vue'
+import type inputProps from './props'
+
+export interface HyInputProps extends ExtractPropTypes<typeof inputProps> {}
 
 export interface IInputEmits {
     /** 输入框失去焦点时触发 */

package/components/hy-line/index.scss

@@ -1,4 +1,4 @@
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 @use "../../libs/css/theme" as *;
 
 @include b(line) {

package/components/hy-line-progress/index.scss

@@ -1,4 +1,4 @@
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 @use "../../libs/css/theme" as *;
 
 @include b(line-progress) {
@@ -6,6 +6,7 @@
   position: relative;
   @include flex(row);
   flex: 1;
+  width: 100%;
   overflow: hidden;
   border-radius: $hy-border-radius-semicircle;
 

package/components/hy-list/index.scss

@@ -1,5 +1,5 @@
 @use "../../libs/css/theme" as *;
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 
 @include b(virtual-container) {
   padding: 0 $hy-border-margin-padding-base;

package/components/hy-loading/index.scss

@@ -1,5 +1,5 @@
 @use "../../libs/css/theme" as *;
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 
 
 @include b(loading-icon) {

package/components/hy-menu/index.scss

@@ -1,5 +1,5 @@
 @use "../../libs/css/theme" as *;
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 
 
 @include b(menu) {

package/components/hy-modal/index.scss

@@ -1,5 +1,5 @@
 @use "../../libs/css/theme" as *;
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 
 @include b(modal) {
   max-width: 650rpx;

package/components/hy-navbar/hy-navbar.vue

@@ -17,29 +17,30 @@
                 }"
             >
                 <!-- 左边 -->
-                <slot v-if="$slots.left" name="left"></slot>
                 <view
-                    v-else
                     class="hy-navbar__content__left"
                     hover-class="hy-navbar__content__left--hover"
                     hover-start-time="150"
                     @tap="leftClick"
                 >
-                    <hy-icon
-                        v-if="leftIcon"
-                        :name="leftIcon"
-                        :size="leftIconSize"
-                        :color="leftIconColor"
-                    ></hy-icon>
-                    <text
-                        v-if="leftText"
-                        :style="{
-                            color: leftIconColor
-                        }"
-                        class="hy-navbar__content__left--text"
-                    >
-                        {{ leftText }}
-                    </text>
+                    <slot v-if="$slots.left" name="left"></slot>
+                    <template v-else>
+                        <hy-icon
+                            v-if="leftIcon"
+                            :name="leftIcon"
+                            :size="leftIconSize"
+                            :color="leftIconColor"
+                        ></hy-icon>
+                        <text
+                            v-if="leftText"
+                            :style="{
+                                color: leftIconColor
+                            }"
+                            class="hy-navbar__content__left--text"
+                        >
+                            {{ leftText }}
+                        </text>
+                    </template>
                 </view>
                 <!-- 左边 -->
 
@@ -74,12 +75,14 @@
                 <!-- 中间 -->
 
                 <!-- 右边 -->
-                <slot v-if="$slots.right" name="right"></slot>
-                <view class="hy-navbar__content__right" v-else @tap="rightClick">
-                    <hy-icon v-if="rightIcon" :name="rightIcon" size="20"></hy-icon>
-                    <text v-if="rightText" class="hy-navbar__content__right--text">{{
-                        rightText
-                    }}</text>
+                <view class="hy-navbar__content__right" @tap="rightClick">
+                    <slot v-if="$slots.right" name="right"></slot>
+                    <template v-else>
+                        <hy-icon v-if="rightIcon" :name="rightIcon" size="20"></hy-icon>
+                        <text v-if="rightText" class="hy-navbar__content__right--text">{{
+                            rightText
+                        }}</text>
+                    </template>
                 </view>
                 <!-- 右边 -->
             </view>

package/components/hy-navbar/index.scss

@@ -1,5 +1,5 @@
 @use "../../libs/css/theme" as *;
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 
 
 @include b(navbar) {
@@ -15,7 +15,7 @@
     @include flex(row);
     align-items: center;
     height: 44px;
-    background-color: $hy-background;
+    background-color: $hy-background--container;
     position: relative;
     justify-content: center;
 

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

@@ -1,5 +1,5 @@
 @use "../../libs/css/theme" as *;
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 
 
 @include b(notice) {

package/components/hy-notify/index.scss

@@ -1,5 +1,5 @@
 @use "../../libs/css/theme" as *;
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 
 
 @include b(notify) {

package/components/hy-number-step/index.scss

@@ -1,5 +1,5 @@
 @use "../../libs/css/theme" as *;
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 
 
 @include b(number-box) {

package/components/hy-overlay/index.scss

@@ -1,5 +1,5 @@
 @use "../../libs/css/theme" as *;
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 
 @include b(overlay) {
   position: fixed;

package/components/hy-pagination/index.scss

@@ -1,5 +1,5 @@
 @use "../../libs/css/theme" as *;
-@use "../../libs/css/mixin.scss" as *;
+@use "../../libs/css/mixin" as *;
 
 
 @include b(pagination) {