hy-app 0.4.4 → 0.4.6

package/components/hy-list/hy-list.vue

@@ -3,7 +3,7 @@
     ref="hyVirtualContainer"
     @scroll="onScroll"
     @scrolltolower="scrollToLower"
-    :lower-threshold="showDivider ? 40 : 10"
+    :lower-threshold="showDivider ? 100 : 50"
     :scroll-y="true"
     scroll-with-animation
     class="hy-virtual-container"
@@ -60,7 +60,8 @@
       </template>
       <!--加载更多样式-->
     </view>
-    <!--    <HyDivider :text="load" v-if="showDivider"></HyDivider>-->
+    <slot v-if="$slots.footer" name="footer"></slot>
+    <hy-divider :text="load" v-else-if="showDivider"></hy-divider>
   </scroll-view>
 </template>
 
@@ -81,15 +82,16 @@ import {
   getCurrentInstance,
   nextTick,
   onMounted,
-  type PropType,
   reactive,
   ref,
   useSlots,
   watch,
 } from "vue";
-import type { CSSProperties } from "vue";
-import { addUnit, getPx, getRect } from "../../utils";
+import type { CSSProperties, PropType } from "vue";
+import { addUnit, getPx, getRect } from "../../libs";
 import type { IListEmits } from "./typing";
+// 组件
+import HyDivider from "@/package/components/hy-divider/hy-divider.vue";
 
 /**
  * 实现只展示可视内容的dom，减少dom创建，优化滚动性能

package/components/hy-loading/hy-loading.vue

@@ -1,9 +1,8 @@
 <template>
   <view
-    class="hy-loading-icon"
-    :style="customStyle"
-    :class="[vertical && 'hy-loading-icon__vertical']"
     v-if="show"
+    :style="customStyle"
+    :class="['hy-loading-icon', `hy-loading-icon__${direction}`]"
   >
     <view
       v-if="!webviewHide"
@@ -34,7 +33,7 @@
     </view>
     <text
       v-if="text"
-      class="hy-loading-icon__text"
+      :class="['hy-loading-icon__text', `hy-loading-icon__${direction}--text`]"
       :style="{
         fontSize: addUnit(textSize),
         color: textColor,
@@ -59,7 +58,7 @@ export default {
 <script setup lang="ts">
 import { ref, computed } from "vue";
 import type { CSSProperties, PropType } from "vue";
-import { addUnit, colorGradient } from "../../utils";
+import { addUnit, colorGradient } from "../../libs";
 
 /**
  * 目前用在华玥的loadMore加载更多等组件的正在加载状态场景。
@@ -84,10 +83,13 @@ const props = defineProps({
     type: String,
     default: "#909399",
   },
-  /** 文字和图标是否垂直排列 */
-  vertical: {
-    type: Boolean,
-    default: false,
+  /**
+   * 文字和图标是否垂直排列
+   * @values row,column
+   * */
+  direction: {
+    type: String as PropType<HyApp.DirectionType>,
+    default: "row",
   },
   /** 模式选择，见官网说明 */
   mode: {

package/components/hy-loading/index.scss

@@ -3,13 +3,11 @@
 
 
 @include b(loading-icon) {
-  @include flex(row);
   align-items: center;
   justify-content: center;
   color: #c8c9cc;
 
   @include e(text) {
-    margin-left: 4px;
     color: $hy-text-color--grey;
     font-size: 14px;
     line-height: 20px;
@@ -37,8 +35,20 @@
     }
   }
 
-  @include m(vertical) {
-    flex-direction: column;
+  @include e(row) {
+    @include flex(row);
+
+    @include m(text) {
+      margin-left: $hy-border-margin-padding-base;
+    }
+  }
+
+  @include e(column) {
+    @include flex(column);
+
+    @include m(text) {
+      margin-top: $hy-border-margin-padding-base;
+    }
   }
 }
 
@@ -60,7 +70,6 @@
   }
 
   @include e(vertical, text) {
-    margin: 6px 0 0;
     color: $hy-text-color--grey;
   }
 

package/components/hy-menu/hy-menu.vue

@@ -62,7 +62,7 @@ export default {
 import { computed, ref, watch } from "vue";
 import type { CSSProperties, PropType } from "vue";
 import type { IMenuEmits, MenusType, ModelValueVo } from "./typing";
-import { addUnit } from "../../utils";
+import { addUnit } from "../../libs";
 import type HyBadgeProps from "../hy-badge/typing";
 import type HyIconProps from "../hy-icon/typing";
 // 组件

package/components/hy-modal/hy-modal.vue

@@ -104,9 +104,9 @@ export default {
 </script>
 
 <script setup lang="ts">
-import { ref, toRefs, watch } from "vue";
+import { ref, watch } from "vue";
 import type { IModalEmits } from "./typing";
-import { addUnit, sleep } from "../../utils";
+import { addUnit, sleep } from "../../libs";
 // 组件
 import HyPopup from "../hy-popup/hy-popup.vue";
 import HyLoading from "../hy-loading/hy-loading.vue";

package/components/hy-modal/props.ts

@@ -1,25 +1,25 @@
-import type IProps from './typing'
-import { ColorConfig } from '../../config'
+import type IProps from "./typing";
+import { ColorConfig } from "../../libs";
 
 const defaultProps: IProps = {
   modelValue: false,
-  title: '',
-  content: '',
-  confirmText: '确认',
-  cancelText: '取消',
+  title: "",
+  content: "",
+  confirmText: "确认",
+  cancelText: "取消",
   showConfirmButton: true,
   showCancelButton: false,
-  confirmColor: '',
-  cancelColor: '',
+  confirmColor: "",
+  cancelColor: "",
   buttonReverse: false,
   zoom: true,
   round: 16,
   asyncClose: false,
   closeOnClickOverlay: false,
   negativeTop: 0,
-  width: '550rpx',
-  confirmButtonShape: '',
-  contentTextAlign: 'left',
-}
+  width: "550rpx",
+  confirmButtonShape: "",
+  contentTextAlign: "left",
+};
 
-export default defaultProps
+export default defaultProps;

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

@@ -7,79 +7,83 @@
         height: addUnit(getPx(height) + statusBarHeight),
       }"
     ></view>
-    <view :class="[fixed && 'hy-navbar__fixed']">
+    <view
+      :class="[fixed && 'hy-navbar__fixed']"
+      :style="{ backgroundColor: bgColor }"
+    >
       <HyStatusBar v-if="safeAreaInsetTop" :bgColor="bgColor"></HyStatusBar>
       <view
         :class="[border && 'hy-border__bottom', 'hy-navbar__content']"
         :style="{
           height: addUnit(height),
-          backgroundColor: bgColor,
         }"
       >
+        <!-- 左边 -->
+        <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"
         >
-          <slot name="left">
-            <HyIcon
-              v-if="leftIcon"
-              :name="leftIcon"
-              :size="leftIconSize"
-              :color="leftIconColor"
-            ></HyIcon>
-            <text
-              v-if="leftText"
-              :style="{
-                color: leftIconColor,
-              }"
-              class="hy-navbar__content__left--text"
-            >
-              {{ leftText }}
-            </text>
-          </slot>
+          <HyIcon
+            v-if="leftIcon"
+            :name="leftIcon"
+            :size="leftIconSize"
+            :color="leftIconColor"
+          ></HyIcon>
+          <text
+            v-if="leftText"
+            :style="{
+              color: leftIconColor,
+            }"
+            class="hy-navbar__content__left--text"
+          >
+            {{ leftText }}
+          </text>
         </view>
-        <slot name="center">
-          <view class="hy-navbar__content__center">
-            <text
-              class="hy-navbar__content__center--title"
-              :style="[
-                {
-                  width: addUnit(titleWidth),
-                  color: titleColor,
-                },
-                titleStyle,
-              ]"
-            >
-              {{ title }}
-            </text>
-            <text
-              class="hy-navbar__content__center--sub"
-              :style="[
-                {
-                  width: addUnit(titleWidth),
-                  color: titleColor,
-                },
-                titleStyle,
-              ]"
-            >
-              {{ sub }}
-            </text>
-          </view>
-        </slot>
-        <view
-          class="hy-navbar__content__right"
-          v-if="$slots.right || rightIcon || rightText"
-          @tap="rightClick"
-        >
-          <slot name="right">
-            <HyIcon v-if="rightIcon" :name="rightIcon" size="20"></HyIcon>
-            <text v-if="rightText" class="hy-navbar__content__right--text">{{
-              rightText
-            }}</text>
-          </slot>
+        <!-- 左边 -->
+
+        <!-- 中间 -->
+        <slot v-if="$slots.center" name="center"></slot>
+        <view v-else class="hy-navbar__content__center">
+          <text
+            class="hy-navbar__content__center--title"
+            :style="[
+              {
+                width: addUnit(titleWidth),
+                color: titleColor,
+              },
+              titleStyle,
+            ]"
+          >
+            {{ title }}
+          </text>
+          <text
+            class="hy-navbar__content__center--sub"
+            :style="[
+              {
+                width: addUnit(titleWidth),
+                color: titleColor,
+              },
+              titleStyle,
+            ]"
+          >
+            {{ sub }}
+          </text>
+        </view>
+        <!-- 中间 -->
+
+        <!-- 右边 -->
+        <slot v-if="$slots.right" name="right"></slot>
+        <view class="hy-navbar__content__right" v-else @tap="rightClick">
+          <HyIcon v-if="rightIcon" :name="rightIcon" size="20"></HyIcon>
+          <text v-if="rightText" class="hy-navbar__content__right--text">{{
+            rightText
+          }}</text>
         </view>
+        <!-- 右边 -->
       </view>
     </view>
   </view>
@@ -99,8 +103,7 @@ export default {
 <script setup lang="ts">
 import type { CSSProperties, PropType } from "vue";
 import type { INavbarEmits } from "./typing";
-import { addUnit, getPx, getWindowInfo } from "../../utils";
-import { IconConfig } from "../../config";
+import { addUnit, getPx, getWindowInfo, IconConfig } from "../../libs";
 // 组件
 import HyIcon from "../hy-icon/hy-icon.vue";
 import HyStatusBar from "../hy-status-bar/hy-status-bar.vue";

package/components/hy-navbar/props.ts

@@ -1,5 +1,5 @@
 import type IProps from "./typing";
-import { IconConfig } from "../../config";
+import { IconConfig } from "../../libs/config";
 
 const defaultProps: IProps = {
   safeAreaInsetTop: true,

package/components/hy-notice-bar/hy-column-notice.vue

@@ -51,8 +51,7 @@
 import { type CSSProperties, toRefs, computed, ref, watch } from "vue";
 import type IProps from "./typing";
 import defaultProps from "./props";
-import { addUnit, error } from "../../utils";
-import { IconConfig } from "../../config";
+import { addUnit, error, IconConfig } from "../../libs";
 
 // 组件
 import HyIcon from "../hy-icon/hy-icon.vue";

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

@@ -58,7 +58,7 @@ export default {
 import { ref } from "vue";
 import type { PropType, CSSProperties } from "vue";
 import type { INoticeBarEmits, NoticeBarModeVo } from "./typing";
-import { IconConfig } from "../../config";
+import { IconConfig } from "../../libs";
 // 组件
 import HyRowNotice from "./hy-row-notice.vue";
 import HyColumnNotice from "./hy-column-notice.vue";

package/components/hy-notice-bar/hy-row-notice.vue

@@ -51,8 +51,7 @@ import {
 } from "vue";
 import type IProps from "./typing";
 import defaultProps from "./props";
-import { addUnit, getRect, sleep } from "../../utils";
-import { IconConfig } from "../../config";
+import { addUnit, getRect, sleep, IconConfig } from "../../libs";
 // 组件
 import HyIcon from "../hy-icon/hy-icon.vue";
 

package/components/hy-notice-bar/props.ts

@@ -1,5 +1,5 @@
 import type IProps from "./typing";
-import { IconConfig } from "../../config";
+import { IconConfig } from "../../libs";
 
 const defaultProps: IProps = {
   text: [],

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

@@ -47,8 +47,7 @@ export default {
 import type IProps from "./typing";
 import { computed, ref } from "vue";
 import type { CSSProperties, PropType } from "vue";
-import { IconConfig } from "../../config";
-import { addUnit } from "../../utils";
+import { addUnit, IconConfig } from "../../libs";
 // 组件
 import HyTransition from "../hy-transition/hy-transition.vue";
 import HyStatusBar from "../hy-status-bar/hy-status-bar.vue";

package/components/hy-number-step/hy-number-step.vue

@@ -139,8 +139,7 @@ export default {
 <script setup lang="ts">
 import { computed, ref, watch, onMounted, nextTick } from "vue";
 import type { CSSProperties, PropType } from "vue";
-import { addUnit } from "../../utils";
-import { IconConfig } from "../../config";
+import { addUnit, IconConfig } from "../../libs";
 import type HyIconProps from "../hy-icon/typing";
 import type { INumberStepEmits } from "./typing";
 // 组件

package/components/hy-overlay/hy-overlay.vue

@@ -22,7 +22,7 @@ export default {
 </script>
 
 <script setup lang="ts">
-import { computed, toRefs } from "vue";
+import { computed } from "vue";
 import type { CSSProperties, PropType } from "vue";
 import type { IOverlayEmits } from "./typing";
 import HyTransition from "../hy-transition/hy-transition.vue";

package/components/hy-pagination/hy-pagination.vue

@@ -73,7 +73,7 @@ export default {
 import { ref, watch } from "vue";
 import type { CSSProperties, PropType } from "vue";
 import type { IPaginationEmits } from "./typing";
-import { IconConfig } from "../../config";
+import { IconConfig } from "../../libs";
 // 组件
 import HyIcon from "../hy-icon/hy-icon.vue";
 import HyButton from "../hy-button/hy-button.vue";

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

@@ -125,8 +125,7 @@ export default {
 <script setup lang="ts">
 import { computed, ref, watch } from "vue";
 import type { PropType } from "vue";
-import { deepClone, sleep, addUnit, isArray } from "../../utils";
-import { IconConfig } from "../../config";
+import { deepClone, sleep, addUnit, isArray, IconConfig } from "../../libs";
 import type { IPickerEmits, PickerColumnVo } from "./typing";
 import type HyInputProps from "../hy-input/typing";
 // 组件

package/components/hy-popover/hy-popover.vue

@@ -130,9 +130,15 @@ import type {
   IPopoverEmits,
   PopoverExpose,
 } from "./typing";
-import { isArray } from "../../utils";
-import { type Queue, queueKey, usePopover } from "../../composables";
-import { closeOther, pushToQueue, removeFromQueue } from "../../common";
+import {
+  type Queue,
+  queueKey,
+  usePopover,
+  closeOther,
+  pushToQueue,
+  removeFromQueue,
+  isArray,
+} from "../../libs";
 // 组件
 import HyIcon from "../hy-icon/hy-icon.vue";
 import HyTransition from "../hy-transition/hy-transition.vue";

package/components/hy-popup/hy-popup.vue

@@ -56,11 +56,10 @@ export default {
 </script>
 
 <script setup lang="ts">
-import { computed, ref, toRefs, watch } from "vue";
+import { computed, ref, watch } from "vue";
 import type { CSSProperties, PropType } from "vue";
 import type { IPopupEmits } from "./typing";
-import { addUnit, getWindowInfo } from "../../utils";
-import { IconConfig } from "../../config";
+import { addUnit, getWindowInfo, IconConfig } from "../../libs";
 
 // 组件
 import HyTransition from "../hy-transition/hy-transition.vue";

package/components/hy-price/hy-price.vue

@@ -31,7 +31,7 @@ export default {
 <script setup lang="ts">
 import { computed } from "vue";
 import type { CSSProperties, PropType } from "vue";
-import { addUnit, getPx, error, addZero } from "../../utils";
+import { addUnit, getPx, error, addZero } from "../../libs";
 
 /**
  * 业务组件,突出金额小数点前大，小数点后小
@@ -106,7 +106,8 @@ const priceStyle = computed<CSSProperties>(() => {
  * @description 价格处理
  * */
 const priceOne = computed(() => {
-  if (props.text === undefined) return error("text值不能为空");
+  if (props.text === undefined || props.text === null)
+    return error("text值不能为空");
 
   let value =
     typeof props.text === "string" ? props.text : props.text.toString();

package/components/hy-qrcode/hy-qrcode.vue

@@ -35,7 +35,7 @@ export default {
 import { getCurrentInstance, ref, onMounted } from "vue";
 import type { IQrcodeEmits } from "./typing";
 import QRCode from "./qrcode.js";
-import { addUnit, error } from "../../utils";
+import { addUnit, error } from "../../libs";
 // 组件
 import HyLoading from "../hy-loading/hy-loading.vue";
 

package/components/hy-radio/hy-radio.vue

@@ -73,8 +73,7 @@ import { computed, reactive, ref, watch } from "vue";
 import type { CSSProperties, PropType } from "vue";
 import type { IRadioEmits } from "./typing";
 import type { CheckboxColumnsVo, IFieldNames } from "../hy-check-button/typing";
-import { addUnit, bem, error } from "../../utils";
-import { IconConfig } from "../../config";
+import { addUnit, bem, error, IconConfig } from "../../libs";
 // 组件
 import HyIcon from "../hy-icon/hy-icon.vue";
 

package/components/hy-rate/hy-rate.vue

@@ -74,11 +74,10 @@ export default {
 </script>
 
 <script setup lang="ts">
-import { addUnit, getRect, guid, range, sleep } from "../../utils";
 import { ref, watch, onMounted, getCurrentInstance } from "vue";
 import type { CSSProperties, PropType } from "vue";
 import type { IRateEmits } from "./typing";
-import { IconConfig } from "../../config";
+import { addUnit, getRect, guid, range, sleep, IconConfig } from "../../libs";
 // 组件
 import HyIcon from "../hy-icon/hy-icon.vue";
 
@@ -253,9 +252,13 @@ const clickHandler = (e: TouchEvent) => {
   //   return;
   // }
   e.stopPropagation();
+  console.log(e, "微信");
   let x = 0;
-  // #ifndef APP-NVUE
-  x = e.changedTouches[0].pageX;
+  // #ifndef APP-NVUE || MP-ALIPAY
+  x = e.detail.x;
+  // #endif
+  // #ifdef MP-ALIPAY
+  x = e.detail.pageX;
   // #endif
   getActiveIndex(x, true);
 };

package/components/hy-rate/props.ts

@@ -1,5 +1,5 @@
-import { ColorConfig, IconConfig } from '../../config'
-import type IProps from './typing'
+import { ColorConfig, IconConfig } from "../../libs/config";
+import type IProps from "./typing";
 
 const defaultProps: IProps = {
   modelValue: 1,
@@ -7,13 +7,13 @@ const defaultProps: IProps = {
   disabled: false,
   readonly: false,
   size: 18,
-  inactiveColor: '#b2b2b2',
-  activeColor: '#FFF00D',
+  inactiveColor: "#b2b2b2",
+  activeColor: "#FFF00D",
   gutter: 4,
   minCount: 1,
   allowHalf: false,
   activeIcon: IconConfig.STAR_FILL,
   inactiveIcon: IconConfig.STAR,
   touchable: true,
-}
-export default defaultProps
+};
+export default defaultProps;

package/components/hy-read-more/hy-read-more.vue

@@ -65,8 +65,7 @@ export default {
 import { computed, ref, onMounted, getCurrentInstance } from "vue";
 import type { CSSProperties, PropType } from "vue";
 import type { IReadMoreEmits } from "./typing";
-import { addUnit, getRect, guid, sleep } from "../../utils";
-import { IconConfig } from "../../config";
+import { addUnit, getRect, guid, sleep, IconConfig } from "../../libs";
 // 组件
 import HyIcon from "../hy-icon/hy-icon.vue";
 

package/components/hy-scroll-list/hy-scroll-list.vue

@@ -43,7 +43,7 @@ export default {
 import { computed, ref, onMounted, getCurrentInstance } from "vue";
 import type { CSSProperties } from "vue";
 import type { IScrollListEmits } from "./typing";
-import { addUnit, colorGradient, getRect, sleep } from "../../utils";
+import { addUnit, colorGradient, getRect, sleep } from "../../libs";
 
 /**
  * 该组件一般用于同时展示多个商品、分类的场景，也可以完成左右滑动的列表。

package/components/hy-scroll-list/props.ts

@@ -1,5 +1,4 @@
 import type IProps from "./typing";
-import { ColorConfig } from "../../config";
 
 const defaultProps: IProps = {
   indicatorWidth: 50,

package/components/hy-search/hy-search.vue

@@ -102,9 +102,7 @@ export default {
 import { computed, nextTick, ref, watch } from "vue";
 import type { PropType, CSSProperties } from "vue";
 import type { ISearchEmits } from "./typing";
-import { addUnit } from "../../utils";
-import { IconConfig } from "../../config";
-import HyIcon from "../hy-icon/hy-icon.vue";
+import { addUnit, IconConfig } from "../../libs";
 import type HyIconProps from "../hy-icon/typing";
 import type {
   InputOnBlurEvent,
@@ -113,6 +111,8 @@ import type {
   InputOnInputEvent,
   InputConfirmType,
 } from "@uni-helper/uni-types";
+// 组件
+import HyIcon from "../hy-icon/hy-icon.vue";
 
 /**
  * 搜索组件，集成了常见搜索框所需功能，用户可以一键引入，开箱即用。
@@ -210,7 +210,7 @@ const props = defineProps({
   /** placeholder的颜色 */
   placeholderColor: {
     type: String,
-    default: "#909399",
+    default: "",
   },
   /** 输入框左边的图标属性集合，可以为图标名称或图片路径 */
   searchIcon: [Boolean, Object] as PropType<HyIconProps | boolean>,

package/components/hy-search/index.scss

@@ -62,6 +62,7 @@ $hy-search-close-size: 20px !default;
       @include m(placeholder) {
         font-size: 25rpx;
         color: $hy-text-color--placeholder;
+        line-height: 30rpx;
       }
     }
   }