hy-app 0.4.4 → 0.4.6

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

@@ -118,7 +118,7 @@ export default {
 <script lang="ts" setup>
 import { watch, ref } from "vue";
 import type { PropType, CSSProperties } from "vue";
-import { isArray } from "../../utils";
+import { isArray } from "../../libs";
 import type {
   IActionSheetPanel,
   IActionSheetEmits,

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

@@ -80,7 +80,7 @@ export default {
 import { onMounted, ref, toRefs } from "vue";
 import type { PropType, CSSProperties } from "vue";
 import type { IAddressPickerEmits } from "./typing";
-import address from "../../utils/address.json";
+import address from "../../libs/utils/address.json";
 import type HyInputProps from "../hy-input/typing";
 // 组件
 import HyInput from "../hy-input/hy-input.vue";

package/components/hy-avatar/hy-avatar.vue

@@ -65,7 +65,7 @@ export default {
 import { computed, ref, watch } from "vue";
 import type { CSSProperties, PropType } from "vue";
 import type { IAvatarEmit } from "./typing";
-import { addUnit, isNumber, random } from "../../utils";
+import { addUnit, isNumber, random } from "../../libs";
 // 组件
 import HyIcon from "../hy-icon/hy-icon.vue";
 

package/components/hy-back-top/hy-back-top.vue

@@ -37,8 +37,7 @@ export default {
 <script setup lang="ts">
 import { computed, toRefs } from "vue";
 import type { CSSProperties, PropType } from "vue";
-import { addUnit, getPx } from "../../utils";
-import { IconConfig } from "../../config";
+import { IconConfig, addUnit, getPx } from "../../libs";
 import type { IBackTopEmit } from "./typing";
 import type HyIconProps from "../hy-icon/typing";
 // 组件

package/components/hy-badge/hy-badge.vue

@@ -30,7 +30,7 @@ export default {
 import { computed } from "vue";
 import type { CSSProperties, PropType } from "vue";
 import type { IBadgeEmit } from "./typing";
-import { addUnit } from "../../utils";
+import { addUnit } from "../../libs";
 
 /**
  * 该组件一般用于图标右上角显示未读的消息数量，提示用户点击，有圆点和圆包含文字两种形式。

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

@@ -143,8 +143,7 @@ export default {
 <script setup lang="ts">
 import { computed } from "vue";
 import type { CSSProperties, PropType } from "vue";
-import { bem, throttle } from "../../utils";
-import { ColorConfig } from "../../config";
+import { ColorConfig, bem, throttle } from "../../libs";
 import type { IButtonEmits } from "./typing";
 import type HyIconProps from "../hy-icon/typing";
 // 组件

package/components/hy-calendar/hy-calendar.vue

@@ -76,15 +76,7 @@ export default {
 
 <script setup lang="ts">
 import type { ICalendarEmits } from "./typing";
-import {
-  computed,
-  nextTick,
-  onMounted,
-  type PropType,
-  ref,
-  toRefs,
-  watch,
-} from "vue";
+import { computed, nextTick, onMounted, type PropType, ref, watch } from "vue";
 import {
   addUnit,
   error,
@@ -92,8 +84,8 @@ import {
   isNumericString,
   padZero,
   range,
-} from "../../utils";
-import Calendar from "../../utils/calendar.js";
+} from "../../libs";
+import Calendar from "../../libs/utils/calendar.js";
 import dayjs from "dayjs/esm";
 // 组件
 import HyMount from "./month.vue";

package/components/hy-calendar/month.vue

@@ -63,7 +63,7 @@
 </template>
 
 <script>
-import { addUnit, colorGradient, deepClone, getRect, sleep } from "../../utils";
+import { addUnit, colorGradient, deepClone, getRect, sleep } from "../../libs";
 import dayjs from "dayjs/esm";
 export default {
   name: "hy-calendar-month",
@@ -384,7 +384,7 @@ export default {
     // 获取月份数据区域的宽度，因为nvue不支持百分比，所以无法通过css设置每个日期item的宽度
     getWrapperWidth() {
       // #ifndef APP-NVUE
-      getRect(".hy-calendar--month__wrapper").then((size) => {
+      getRect(".hy-calendar--month__wrapper", false, this).then((size) => {
         this.width = size.width;
       });
       // #endif
@@ -413,7 +413,7 @@ export default {
       // $uGetRect为uView自带的节点查询简化方法，详见文档介绍：https://ijry.github.io/uview-plus/js/getRect.html
       // 组件内部一般用this.$uGetRect，对外的为uni.$u.getRect，二者功能一致，名称不同
       return new Promise((resolve) => {
-        getRect(`.${el}`).then((size) => {
+        getRect(`.${el}`, false, this).then((size) => {
           resolve(size);
         });
       });

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

@@ -88,7 +88,7 @@ export default {
 import { computed } from "vue";
 import type { CSSProperties, PropType } from "vue";
 import type { ICardEmits } from "./typing";
-import { addUnit, getPx } from "../../utils";
+import { addUnit, getPx } from "../../libs";
 
 /**
  * 卡片组件一般用于多个列表条目，且风格统一的场景。

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

@@ -162,8 +162,7 @@ import { computed } from "vue";
 import type { CSSProperties, PropType } from "vue";
 import type { ICellEmits } from "./typing";
 import type { CellContentVo } from "./typing";
-import { IconConfig } from "../../config";
-import { addUnit } from "../../utils";
+import { IconConfig, addUnit } from "../../libs";
 // 组件
 import HyIcon from "../hy-icon/hy-icon.vue";
 import type HyIconProps from "../hy-icon/typing";

package/components/hy-cell/props.ts

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

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

@@ -27,11 +27,11 @@ export default {
 </script>
 
 <script setup lang="ts">
-import { toRefs, watch, ref, type PropType } from "vue";
+import { watch, ref, type PropType } from "vue";
 import type { ICheckButtonEmits, IFieldNames } from "./typing";
 import type { CheckboxColumnsVo } from "./typing";
 import HyTag from "../hy-tag/hy-tag.vue";
-import { isArray, isNumber } from "../../utils";
+import { isArray, isNumber } from "../../libs";
 import type { TagParamsVo } from "../hy-tag/typing";
 
 /**

package/components/hy-checkbox/hy-checkbox.vue

@@ -68,10 +68,9 @@ export default {
 </script>
 
 <script setup lang="ts">
-import { computed, toRefs, watch, ref, reactive } from "vue";
+import { computed, watch, ref, reactive } from "vue";
 import type { CSSProperties, PropType } from "vue";
-import { addUnit, bem, error } from "../../utils";
-import { IconConfig } from "../../config";
+import { IconConfig, addUnit, bem, error } from "../../libs";
 import type { ICheckBoxEmits } from "./typing";
 import type { CheckboxColumnsVo, IFieldNames } from "../hy-check-button/typing";
 // 组件

package/components/hy-checkbox-group/hy-checkbox-group.vue

@@ -7,7 +7,7 @@
 <script setup lang="ts">
 import { computed, provide, toRefs } from "vue";
 import type { CSSProperties, PropType } from "vue";
-import { bem } from "../../utils";
+import { bem } from "../../libs";
 import type { ICheckBoxGroupEmits } from "./typing";
 
 /**

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

@@ -70,8 +70,7 @@ export default {
 <script setup lang="ts">
 import { computed, watch, ref, reactive, inject } from "vue";
 import type { CSSProperties } from "vue";
-import { addUnit, error } from "../../utils";
-import { IconConfig } from "../../config";
+import { IconConfig, addUnit, error } from "../../libs";
 import type { ICheckboxGroupContext } from "./typing";
 // 组件
 import HyIcon from "../hy-icon/hy-icon.vue";

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

@@ -56,7 +56,7 @@ export default {
 import { computed, nextTick, onUnmounted, ref, watch } from "vue";
 import type { CSSProperties, PropType } from "vue";
 import type { ICodeInputEmits } from "./typing";
-import { addUnit, getPx } from "../../utils";
+import { addUnit, getPx } from "../../libs";
 import type { InputOnInputEvent } from "@uni-helper/uni-types";
 
 /**

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

@@ -17,10 +17,9 @@ export default {
 </script>
 
 <script setup lang="ts">
-import { computed, toRefs, watch } from "vue";
+import { computed } from "vue";
 import type { CSSProperties, PropType } from "vue";
-import { addUnit, colorGradient } from "../../utils";
-import { ColorConfig } from "../../config";
+import { ColorConfig, addUnit, colorGradient } from "../../libs";
 
 /**
  * 将 ConfigProvider 组件的 theme 属性设置为 dark，可以开启深色模式。 深色模式会全局生效，使页面上的所有 Wot 组件变为深色风格。

package/components/hy-config-provider/props.ts

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

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

@@ -1,4 +1,4 @@
-import { padZero } from "../../utils";
+import { padZero } from "../../libs";
 
 const SECOND = 1000;
 const MINUTE = 60 * SECOND;

package/components/hy-count-to/hy-count-to.vue

@@ -29,7 +29,7 @@ export default {
 import type { ICountToEmits } from "./typing";
 import { computed, onMounted, ref, watch } from "vue";
 import type { CSSProperties, PropType } from "vue";
-import { addUnit, isNumber } from "../../utils";
+import { addUnit, isNumber } from "../../libs";
 
 /**
  * 一般用于需要滚动数字到某一个值的场景，目标要求是一个递增的值。

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

@@ -73,11 +73,10 @@ export default {
 </script>
 
 <script setup lang="ts">
-import { computed, onMounted, ref, toRefs, watch } from "vue";
+import { computed, onMounted, ref, watch } from "vue";
 import type { CSSProperties, PropType } from "vue";
 import dayjs from "dayjs/esm";
-import { error, padZero } from "../../utils";
-import { DateModeEnum } from "../../typing";
+import { error, padZero, DateModeEnum } from "../../libs";
 import type HyInputProps from "../hy-input/typing";
 import type { IDatetimePickerEmits } from "./typing";
 // 组件

package/components/hy-datetime-picker/props.ts

@@ -1,5 +1,5 @@
 import type IProps from "./typing";
-import { DateModeEnum } from "../../typing";
+import { DateModeEnum } from "../../libs";
 
 const defaultProps: IProps = {
   show: false,

package/components/hy-divider/hy-divider.vue

@@ -36,8 +36,7 @@ export default {
 <script setup lang="ts">
 import { computed } from "vue";
 import type { CSSProperties, PropType } from "vue";
-import { addUnit } from "../../utils";
-import { IconConfig } from "../../config";
+import { addUnit, IconConfig } from "../../libs";
 // 组件
 import HyLine from "../hy-line/hy-line.vue";
 import HyLoading from "../hy-loading/hy-loading.vue";

package/components/hy-divider/props.ts

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

package/components/hy-dropdown/hy-dropdown.vue

@@ -18,8 +18,7 @@ export default {
 <script setup lang="ts">
 import { provide, ref, computed } from "vue";
 import type { CSSProperties, PropType } from "vue";
-import { IconConfig } from "../../config";
-import { addUnit } from "../../utils";
+import { IconConfig, addUnit } from "../../libs";
 
 /**
  * 主要提供筛选下拉筛选框，内置基础筛选功能，可以根据自己的需求自定义筛选项。
@@ -74,7 +73,7 @@ const dropdownStyle = computed(() => {
         top: "44px",
         // #endif
         // #ifndef H5
-        top: 0,
+        top: "0px",
         // #endif
       }
     : {};

package/components/hy-dropdown/props.ts

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

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

@@ -86,8 +86,7 @@ import {
 } from "vue";
 import type { IDropdownItemEmits, DropdownMenuItem } from "./typing";
 import type FatherIProps from "../hy-dropdown/typing";
-import { addUnit, getRect, throttle } from "../../utils";
-import { IconConfig } from "../../config";
+import { addUnit, getRect, throttle, IconConfig } from "../../libs";
 // 组件
 import HyOverlay from "../hy-overlay/hy-overlay.vue";
 import HyIcon from "../hy-icon/hy-icon.vue";

package/components/hy-empty/hy-empty.vue

@@ -45,7 +45,7 @@ export default {
 <script setup lang="ts">
 import { computed } from "vue";
 import type { CSSProperties, PropType } from "vue";
-import { addUnit } from "../../utils";
+import { addUnit } from "../../libs";
 import emptyIcon from "./icon";
 import type { HyButtonProps } from "../hy-button/typing";
 import type { IEmptyEmits } from "./typing";

package/components/hy-flex/hy-flex.vue

@@ -19,7 +19,7 @@ export default {
 import { computed, type CSSProperties } from "vue";
 import type { PropType } from "vue";
 import type { FlexAlign, FlexDirection, FlexJustify, FlexWrap } from "./typing";
-import { addUnit, isArray } from "../../utils";
+import { addUnit, isArray } from "../../libs";
 
 const props = defineProps({
   /** flex 主轴的方向是否垂直，使用 flex-direction: column */

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

@@ -85,8 +85,7 @@ import {
 import type { CSSProperties, PropType } from "vue";
 import type { IFloatButtonEmits, IGap } from "./typing";
 import type { MenusType } from "./typing";
-import { addUnit, getPx, getRect, guid, isH5 } from "../../utils";
-import { IconConfig } from "../../config";
+import { addUnit, getPx, getRect, guid, isH5, IconConfig } from "../../libs";
 // 组件
 import HyIcon from "../hy-icon/hy-icon.vue";
 import HyLine from "../hy-line/hy-line.vue";

package/components/hy-float-button/props.ts

@@ -1,27 +1,27 @@
-import type IProps from './typing'
-import { IconConfig } from '../../config'
+import type IProps from "./typing";
+import { IconConfig } from "../../libs";
 
 const defaultProps: IProps = {
   menus: [],
-  direction: 'column',
+  direction: "column",
   icon: IconConfig.PLUS,
-  iconSize: '',
-  iconColor: '',
+  iconSize: "",
+  iconColor: "",
   gap: { left: 16, right: 16, top: 16, bottom: 40 },
   zIndex: 10086,
-  bgColor: '',
-  text: '',
-  fontSize: '12px',
-  textColor: '',
-  size: 'medium',
-  shape: 'circle',
+  bgColor: "",
+  text: "",
+  fontSize: "12px",
+  textColor: "",
+  size: "medium",
+  shape: "circle",
   opacity: 1,
   shadow: true,
   float: true,
   fixed: true,
   draggable: true,
-  position: 'right-bottom',
+  position: "right-bottom",
   expandable: true,
-}
+};
 
-export default defaultProps
+export default defaultProps;

package/components/hy-folding-panel/hy-folding-panel.vue

@@ -50,11 +50,10 @@ export default {
 </script>
 
 <script setup lang="ts">
-import { toRefs, ref, watch } from "vue";
+import { ref, watch } from "vue";
 import type { CSSProperties, PropType } from "vue";
 import type { IFoldingPanel, PanelVo } from "./typing";
-import { addUnit } from "../../utils";
-import { ColorConfig } from "../../config";
+import { ColorConfig, addUnit } from "../../libs";
 // 组件
 import HyCell from "../hy-cell/hy-cell.vue";
 import HyLine from "../hy-line/hy-line.vue";

package/components/hy-folding-panel/props.ts

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

package/components/hy-form/hy-form.vue

@@ -19,7 +19,7 @@ export default {
 import { provide, reactive, ref, toRefs } from "vue";
 import type { PropType } from "vue";
 import type { FormItemRule } from "./typing";
-import { clearVal, isArray } from "../../utils";
+import { clearVal, isArray } from "../../libs";
 
 /**
  * 表单组件父组件，需要搭配hy-form-item