hy-app 0.4.3 → 0.4.5

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

@@ -99,8 +99,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";
 
@@ -254,8 +253,11 @@ const clickHandler = (e: TouchEvent) => {
   // }
   e.stopPropagation();
   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";
 
 /**
  * 搜索组件，集成了常见搜索框所需功能，用户可以一键引入，开箱即用。

package/components/hy-signature/hy-signature.vue

@@ -104,7 +104,7 @@ import {
   watch,
 } from "vue";
 import type { CSSProperties, PropType } from "vue";
-import { addUnit, getRect, guid } from "../../utils";
+import { addUnit, getRect, guid } from "../../libs";
 import type {
   SignatureExpose,
   SignatureResult,

package/components/hy-slider/hy-slider.vue

@@ -156,21 +156,11 @@ export default {
 </script>
 
 <script setup lang="ts">
-import {
-  computed,
-  getCurrentInstance,
-  onMounted,
-  ref,
-  toRefs,
-  watch,
-} from "vue";
+import { computed, getCurrentInstance, onMounted, ref, watch } from "vue";
 import type { CSSProperties, PropType } from "vue";
-import { addUnit, error, getRect, getPx } from "../../utils";
+import { addUnit, error, getRect, getPx } from "../../libs";
 import type { ISliderEmits } from "./typing";
-import type {
-  MovableViewOnChange,
-  SliderOnChangingEvent,
-} from "@uni-helper/uni-types";
+import type { SliderOnChangingEvent } from "@uni-helper/uni-types";
 
 /**
  * 一般用于表单中，手动选择一个区间范围的场景。

package/components/hy-slider/props.ts

@@ -1,5 +1,5 @@
 import type IProps from "./typing";
-import { ColorConfig } from "../../config";
+import { ColorConfig } from "../../libs/config";
 
 const defaultProps: IProps = {
   modelValue: 0,

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

@@ -12,7 +12,7 @@
 import type IProps from "./typing";
 import defaultProps from "./props";
 import { computed, type CSSProperties, ref } from "vue";
-import { addUnit, getWindowInfo } from "../../utils";
+import { addUnit, getWindowInfo } from "../../libs";
 
 const props = withDefaults(defineProps<IProps>(), defaultProps);
 

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

@@ -1,5 +1,5 @@
 import type IProps from "./typing";
-import { ColorConfig } from "../../config";
+import { ColorConfig } from "../../libs/config";
 
 const defaultProps: IProps = {
   bgColor: "transparent",

package/components/hy-steps/hy-steps.vue

@@ -148,8 +148,7 @@ import { computed, ref, onMounted, getCurrentInstance, watch } from "vue";
 import type { CSSProperties, PropType } from "vue";
 import type { IStepsEmits } from "./typing";
 import type { StepListVo } from "./typing";
-import { addUnit, getRect } from "../../utils";
-import { ColorConfig, IconConfig } from "../../config";
+import { addUnit, getRect, ColorConfig, IconConfig } from "../../libs";
 
 /**
  * 一般用于完成一个任务要分几个步骤，标识目前处于第几步的场景。

package/components/hy-subsection/hy-subsection.vue

@@ -35,7 +35,7 @@ export default {
 import { computed, ref, onMounted, getCurrentInstance } from "vue";
 import type { CSSProperties, PropType } from "vue";
 import type { ISubsectionEmits, SubSectionVo } from "./typing";
-import { addUnit, getRect, guid } from "../../utils";
+import { addUnit, getRect, guid } from "../../libs";
 
 /**
  * 该分段器一般用于用户从几个选项中选择某一个的场景

package/components/hy-subsection/props.ts

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

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

@@ -1,5 +1,4 @@
 import type { CSSProperties } from "vue";
-import { HyApp } from "@/package/typing/modules/common";
 
 export interface SubSectionItemVo extends AnyObject {
   name: string;

package/components/hy-swipe-action/hy-swipe-action.vue

@@ -81,9 +81,8 @@ import type {
   SwipeActionReason,
   SwipeActionOptionsVo,
 } from "./typing";
-import { useTouch } from "../../composables";
+import { useTouch, getRect, guid } from "../../libs";
 import { closeOther, pushToQueue, removeFromQueue } from "./index";
-import { getRect, guid } from "../../utils";
 
 /**
  * 常用于单元格左右滑删除等手势操作。

package/components/hy-swiper/hy-swiper-indicator.vue

@@ -34,7 +34,7 @@
 <script setup lang="ts">
 // 指示器为线型的样式
 import { computed, type CSSProperties, toRefs, ref } from "vue";
-import { addUnit } from "../../utils";
+import { addUnit } from "../../libs";
 
 interface IProps {
   length: number;

package/components/hy-swiper/hy-swiper.vue

@@ -103,10 +103,9 @@ export default {
 </script>
 
 <script setup lang="ts">
-import { computed, toRefs, ref, watch, getCurrentInstance } from "vue";
+import { computed, ref, watch, getCurrentInstance } from "vue";
 import type { CSSProperties, PropType } from "vue";
-import { addUnit, isVideo } from "../../utils";
-import { IconConfig } from "../../config";
+import { addUnit, isVideo, IconConfig } from "../../libs";
 import type { ISwiperEmits, SwiperList, SwiperVo } from "./typing";
 
 // 组件