hy-app 0.4.4 → 0.4.6

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";
 
 // 组件

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

@@ -1,128 +1,127 @@
-import type { CSSProperties, PropType } from 'vue'
-import { HyApp } from '@/package/typing/modules/common'
+import type { CSSProperties } from "vue";
 
 export default interface HySwiperProps {
   /**
    * @description 轮播图数据
    * */
-  list: (string | Record<string, unknown>)[]
+  list: (string | Record<string, unknown>)[];
   /**
    * @description list数组中指定对象的目标属性名（默认 'url' ）
    * */
-  keyName?: string
+  keyName?: string;
   /**
    * @description 是否显示面板指示器（默认 false ）
    * */
-  indicator?: boolean
+  indicator?: boolean;
   /**
    * @description 指示器非激活颜色（默认 '#FFFFFF' ）
    * */
-  indicatorActiveColor?: string
+  indicatorActiveColor?: string;
   /**
    * @description 指示器的激活颜色（默认 'rgba(255, 255, 255, 0.35)' ）
    * */
-  indicatorInactiveColor?: string
+  indicatorInactiveColor?: string;
   /**
    * @description 指示器样式，可通过bottom，left，right进行定位
    * */
-  indicatorStyle?: CSSProperties
+  indicatorStyle?: CSSProperties;
   /**
    * @description 指示器模式（默认 'line' ）
    * */
-  indicatorMode?: HyApp.SwiperIndicatorModeType
+  indicatorMode?: HyApp.SwiperIndicatorModeType;
   /**
    * @description 是否自动切换（默认 true ）
    * */
-  autoplay?: boolean
+  autoplay?: boolean;
   /**
    * @description 当前所在滑块的 index（默认 0 ）
    * */
-  current?: number | string
+  current?: number | string;
   /**
    * @description 当前所在滑块的 item-id ，不能与 current 被同时指定
    * */
-  currentItemId?: string
+  currentItemId?: string;
   /**
    * @description 滑块自动切换时间间隔（ms）（默认 3000 ）
    * */
-  interval?: number
+  interval?: number;
   /**
    * @description 滑块切换过程所需时间（ms）（默认 300 ）
    * */
-  duration?: number
+  duration?: number;
   /**
    * @description 播放到末尾后是否重新回到开头（默认 false ）
    * */
-  circular?: boolean
+  circular?: boolean;
   /**
    * @description 前边距，可用于露出前一项的一小部分，nvue和支付宝不支持（默认 0 ）
    * */
-  previousMargin?: number | string
+  previousMargin?: number | string;
   /**
    * @description 后边距，可用于露出后一项的一小部分，nvue和支付宝不支持（默认 0 ）
    * */
-  nextMargin?: number | string
+  nextMargin?: number | string;
   /**
    * @description 当开启时，会根据滑动速度，连续滑动多屏，支付宝不支持（默认 false ）
    * */
-  acceleration?: boolean
+  acceleration?: boolean;
   /**
    * @description 同时显示的滑块数量，nvue、支付宝小程序不支持（默认 1 ）
    * */
-  displayMultipleItems?: number
+  displayMultipleItems?: number;
   /**
    * @description 指定swiper切换缓动动画类型， 只对微信小程序有效（默认 'default' ）
    * */
-  easingFunction?: string
+  easingFunction?: string;
   /**
    * @description 图片的裁剪模式（默认 'aspectFill' ）
    * */
-  imgMode?: HyApp.ImageModeVo
+  imgMode?: HyApp.ImageModeVo;
   /**
    * @description 组件高度（默认 130 ）
    * */
-  height?: number
+  height?: number;
   /**
    * @description 背景颜色（默认 	'#f3f4f6' ）
    * */
-  bgColor?: string
+  bgColor?: string;
   /**
    * @description 组件圆角，数值或带单位的字符串（默认 4 ）
    * */
-  radius?: number | string
+  radius?: number | string;
   /**
    * @description 是否加载中（默认 false ）
    * */
-  loading?: boolean
+  loading?: boolean;
   /**
    * @description 是否显示标题，要求数组对象中有title属性（默认 false ）
    * */
-  showTitle?: boolean
+  showTitle?: boolean;
 }
 
 export interface SwiperList {
-  [key: string]: any
+  [key: string]: any;
   /** 线上地址 */
-  url?: string
+  url?: string;
   /** 标题 */
-  title?: string
+  title?: string;
   /** 海报，为视频必填 */
-  poster?: string
+  poster?: string;
   /** 轮播图展示类型 */
-  type?: 'image' | 'video'
+  type?: "image" | "video";
 }
 
 export interface SwiperVo {
   detail: {
-    current: number
-  }
+    current: number;
+  };
 }
 
 export interface ISwiperEmits {
   /** 点击轮播图触发 */
-  (e: 'click', index: number): void
+  (e: "click", index: number): void;
   /** 滑动轮播图触发 */
-  (e: 'change', temp: SwiperVo['detail']): void
+  (e: "change", temp: SwiperVo["detail"]): void;
   /** 滑动轮播图触发 */
-  (e: 'update:current', value: string | number): void
+  (e: "update:current", value: string | number): void;
 }

package/components/hy-switch/hy-switch.vue

@@ -54,9 +54,9 @@ export default {
 </script>
 
 <script setup lang="ts">
-import { toRefs, watch, nextTick, computed } from "vue";
+import { watch, nextTick, computed } from "vue";
 import type { CSSProperties, PropType } from "vue";
-import { addUnit, error, isNumber } from "../../utils";
+import { addUnit, error, isNumber } from "../../libs";
 import type { ISwitchEmits, SwiperValue } from "./typing";
 // 组件
 import HyLoading from "../hy-loading/hy-loading.vue";

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

@@ -1,5 +1,4 @@
 import type { CSSProperties } from "vue";
-import { HyApp } from "@/package/typing/modules/common";
 import type IconProps from "../hy-icon/typing";
 
 export default interface HySwitchProps {

package/components/hy-tabs/hy-tabs.vue

@@ -158,10 +158,9 @@ import {
   getCurrentInstance,
 } from "vue";
 import type { CSSProperties, PropType } from "vue";
-import type { ITabsEmits } from "./typing";
-import type { TabsItemVo } from "./typing";
+import type { ITabsEmits, TabsItemVo } from "./typing";
 import type HyBadgeProps from "../hy-badge/typing";
-import { addUnit, getPx, getRect, sleep } from "../../utils";
+import { addUnit, getPx, getRect, sleep } from "../../libs";
 // 组件
 import HyBadge from "../hy-badge/hy-badge.vue";
 import HyIcon from "../hy-icon/hy-icon.vue";

package/components/hy-tag/hy-tag.vue

@@ -58,8 +58,7 @@ export default {
 import { computed } from "vue";
 import type { CSSProperties, PropType } from "vue";
 import type { ITagEmits } from "./typing";
-import { IconConfig } from "../../config";
-import { colorGradient } from "../../utils";
+import { IconConfig, colorGradient } from "../../libs";
 import type HyIconProps from "../hy-icon/typing";
 
 // 组件

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

@@ -89,11 +89,11 @@ import {
   formatTime,
   isDate,
   priceFormat,
-} from "../../utils";
+} from "../../libs";
+import type { InputOnConfirmEvent } from "@uni-helper/uni-types";
 
 // 组件
 import HyIcon from "../hy-icon/hy-icon.vue";
-import type { InputOnConfirmEvent } from "@uni-helper/uni-types";
 
 /**
  * 此组件集成了文本类在项目中的常用功能，包括状态，拨打电话，格式化日期，*替换，超链接...等功能。 您大可不必在使用特殊文本时自己定义，text组件几乎涵盖您能使用的大部分场景。

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

@@ -1,103 +1,103 @@
-import type { CSSProperties } from 'vue'
+import type { CSSProperties } from "vue";
 
-export type TextMode = 'text' | 'price' | 'phone' | 'name' | 'date' | 'link'
+export type TextMode = "text" | "price" | "phone" | "name" | "date" | "link";
 
 export default interface HyTextProps {
   /**
    * @description 显示的值
    * */
-  text: string | number
+  text: string | number;
   /**
    * @description 主题颜色
    * */
-  type?: HyApp.ThemeType
+  type?: HyApp.ThemeType | "";
   /**
    * @description 是否显示（默认 true ）
    * */
-  show?: boolean
+  show?: boolean;
   /**
    * @description 前置图标
    * */
-  prefixIcon?: string
+  prefixIcon?: string;
   /**
    * @description 后置图标
    * */
-  suffixIcon?: string
+  suffixIcon?: string;
   /**
    * @description 文本处理的匹配模式 text-普通文本，price-价格，phone-手机号，name-姓名，date-日期，link-超链接
    * */
-  mode?: TextMode
+  mode?: TextMode;
   /**
    * @description mode=link下，配置的链接
    * */
-  href?: string
+  href?: string;
   /**
    * @description 格式化规则
    * */
-  format?: Function | string
+  format?: Function | string;
   /**
    * @description mode=phone时，点击文本是否拨打电话（默认 false ）
    * */
-  call?: boolean
+  call?: boolean;
   /**
    * @description 小程序的打开方式
    * */
-  openType?: string
+  openType?: string;
   /**
    * @description 是否粗体，默认normal（默认 false ）
    * */
-  bold?: boolean
+  bold?: boolean;
   /**
    * @description 是否块状（默认 false ）
    * */
-  block?: boolean
+  block?: boolean;
   /**
    * @description 文本显示的行数，如果设置，超出此行数，将会显示省略号
    * */
-  lines?: string | number
+  lines?: string | number;
   /**
    * @description 文本颜色（默认 '#303133' ）
    * */
-  color?: string
+  color?: string;
   /**
    * @description 字体大小（默认 15 ）
    * */
-  size?: number | string
+  size?: number | string;
   /**
    * @description 图标的样式 （默认 {fontSize: '15px'} ）
    * */
-  iconStyle?: CSSProperties
+  iconStyle?: CSSProperties;
   /**
    * @description 文字装饰，下划线，中划线等，可选值 none|underline|line-through（默认 'none' ）
    * */
-  decoration?: '' | 'none' | 'underline' | 'line-through'
+  decoration?: "" | "none" | "underline" | "line-through";
   /**
    * @description 外边距，对象、字符串，数值形式均可（默认 0 ）
    * */
-  margin?: string
+  margin?: string;
   /**
    * @description 文本行高
    * */
-  lineHeight?: string | number
+  lineHeight?: string | number;
   /**
    * @description 文本对齐方式，可选值left|center|right（默认 'left' ）
    * */
-  align?: HyApp.RowCenterType
+  align?: HyApp.RowCenterType;
   /**
    * @description 文字换行，可选值break-word|normal|anywhere（默认 'normal' ）
    * */
-  wordWrap?: 'normal' | 'break-word' | 'anywhere'
+  wordWrap?: "normal" | "break-word" | "anywhere";
   /**
    * @description 是否占满剩余空间（默认：true）
    * */
-  flex?: boolean
+  flex?: boolean;
   /**
    * @description 定义需要用到的外部样式
    * */
-  customStyle?: CSSProperties
+  customStyle?: CSSProperties;
 }
 
 export interface ITextEmits {
   /** 点击触发 */
-  (e: 'click', event: any): void
+  (e: "click", event: any): void;
 }

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

@@ -6,7 +6,7 @@
     <textarea
       class="hy-textarea__field"
       :value="innerValue"
-      :style="{ height: autoHeight ? 'auto' : addUnit(height) }"
+      :style="`height: ${autoHeight ? 'auto' : addUnit(height)}`"
       :placeholder="placeholder || ''"
       :placeholder-style="placeholderStyle"
       :placeholder-class="placeholderClass"
@@ -60,7 +60,7 @@ export default {
 import { computed, ref, watch, nextTick, inject } from "vue";
 import type { CSSProperties, PropType } from "vue";
 import type { ITextareaEmits } from "./typing";
-import { addUnit } from "../../utils";
+import { addUnit } from "../../libs";
 import type { FormItemContext } from "../hy-form-item/typing";
 import type {
   InputOnBlurEvent,

package/components/hy-toast/hy-toast.vue

@@ -4,16 +4,7 @@
     :zIndex="tmpConfig.overlay ? 10070 : -1"
     :custom-style="overlayStyle"
   >
-    <view
-      :style="[contentStyle]"
-      :class="[
-        'hy-toast__content',
-        'hy-toast__' + tmpConfig.type,
-        tmpConfig.type === 'loading' || tmpConfig.loading
-          ? 'hy-toast__content--loading'
-          : '',
-      ]"
-    >
+    <view :style="[contentStyle]" :class="contentClass">
       <HyLoading
         v-if="tmpConfig.loading"
         :mode="tmpConfig.loadMode || 'circle'"
@@ -31,7 +22,12 @@
       >
         <HyIcon :name="iconNameCom" size="17" color="#FFFFFF"></HyIcon>
       </view>
-      <text class="hy-toast__content--text" style="max-width: 400rpx">
+      <text
+        :class="[
+          'hy-toast__content--text',
+          !tmpConfig.icon ? `hy-toast__content--text__${tmpConfig.type}` : '',
+        ]"
+      >
         {{ tmpConfig.message }}
       </text>
     </view>
@@ -50,11 +46,10 @@ export default {
 </script>
 
 <script setup lang="ts">
-import { computed, reactive, ref } from "vue";
+import { computed, onMounted, onUnmounted, reactive, ref } from "vue";
 import type { CSSProperties } from "vue";
-import type ToastParamsVo from "./typing";
-import { getWindowInfo, hexToRgb } from "../../utils";
-import { ColorConfig, iconName } from "../../config";
+import type ToastOptions from "./typing";
+import { ColorConfig, iconName, getWindowInfo, hexToRgb } from "../../libs";
 // 组件
 import HyOverlay from "../hy-overlay/hy-overlay.vue";
 import HyIcon from "../hy-icon/hy-icon.vue";
@@ -67,10 +62,10 @@ import HyLoading from "../hy-loading/hy-loading.vue";
 defineOptions({});
 
 const isShow = ref(false);
-const tmpConfig = ref<ToastParamsVo>({});
-const config: ToastParamsVo = reactive({
+const tmpConfig = ref<ToastOptions>({});
+const config: ToastOptions = reactive({
   message: "",
-  type: "info",
+  type: "",
   duration: 2000,
   icon: false,
   position: "center",
@@ -127,6 +122,14 @@ const contentStyle = computed(() => {
   return style;
 });
 
+const contentClass = computed(() => {
+  return [
+    "hy-toast__content",
+    "hy-toast__" + tmpConfig.value.type,
+    tmpConfig.value.loading && "hy-toast__content--loading",
+  ];
+});
+
 const loadingIconColor = computed(() => {
   let colorTmp = "rgb(255, 255, 255)";
   if (isThemeType(tmpConfig.value.type!)) {
@@ -137,10 +140,21 @@ const loadingIconColor = computed(() => {
   return colorTmp;
 });
 
+onMounted(() => {
+  // 监听全局事件
+  uni.$on("__hy_toast_open__", show);
+  uni.$on("__hy_toast_close__", hide);
+});
+
+onUnmounted(() => {
+  uni.$off("__hy_toast_open__", show);
+  uni.$off("__hy_toast_close__", hide);
+});
+
 /**
  * @description 显示toast组件，由父组件通过xxx.show(options)形式调用
  * */
-const show = (options: ToastParamsVo) => {
+const show = (options: ToastOptions) => {
   // 不将结果合并到this.config变量，避免多次调用u-toast，前后的配置造成混乱
   tmpConfig.value = Object.assign(config, options);
   // 清除定时器
@@ -160,6 +174,7 @@ const show = (options: ToastParamsVo) => {
 
 // 隐藏toast组件，由父组件通过this.$refs.xxx.hide()形式调用
 const hide = () => {
+  config.loading = false;
   clearTimer();
 };
 /**

package/components/hy-toast/index.scss

@@ -59,9 +59,10 @@
       color: #ffffff;
       font-size: 15px;
       line-height: 15px;
+      max-width: 400rpx;
 
-      @include e(default) {
-        color: #ffffff;
+      @include e(info) {
+        color: $hy-info;
       }
 
       @include e(error) {

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

@@ -6,7 +6,7 @@ export default interface ToastOptions {
   /**
    * @description 主题类型，primary，success，error，warning，info
    * */
-  type?: HyApp.ThemeType;
+  type?: HyApp.ThemeType | "";
   /**
    * @description toast出现的位置
    * */

package/components/hy-tooltip/hy-tooltip.vue

@@ -146,9 +146,15 @@ import {
 } from "vue";
 import type { CSSProperties, PropType } from "vue";
 import type { ITooltipEmits } from "./typing";
-import { type Queue, queueKey, usePopover } from "../../composables";
 import type { IPlacementVo } from "../hy-popover/typing";
-import { closeOther, removeFromQueue, pushToQueue } from "../../common";
+import {
+  type Queue,
+  queueKey,
+  usePopover,
+  closeOther,
+  removeFromQueue,
+  pushToQueue,
+} from "../../libs";
 
 // 组件
 import HyTransition from "../hy-transition/hy-transition.vue";