hy-app 0.3.2 → 0.3.4

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

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

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

@@ -1,22 +1,22 @@
 <template>
   <view :class="['hy-empty', customClass]" v-if="show" :style="emptyStyle">
     <view class="hy-empty__img" :style="imgStyle">
-      <HyIcon
-        :name="imageUrl || emptyIcon[mode].icon"
+      <HyImage
+        :src="imageUrl || emptyIcon[mode].icon"
         :width="width"
         :height="height"
         img-mode="widthFix"
-      ></HyIcon>
+      ></HyImage>
     </view>
     <view v-if="$slots.default">
       <slot></slot>
     </view>
-    <view class="hy-empty__description" v-else>
+    <view class="hy-empty--description" v-else>
       <slot v-if="$slots.description" name="description"></slot>
       <text v-else :style="descriptionStyle">{{
-        emptyDescription || emptyIcon[mode].name
+        emptyDescription || emptyIcon[mode].desc
       }}</text>
-      <view class="hy-empty__button" v-if="button?.text">
+      <view class="hy-empty--button" v-if="button?.text">
         <HyButton
           :text="button?.text"
           :size="button?.size"
@@ -51,7 +51,7 @@ import type { HyButtonProps } from "../hy-button/typing";
 import type { IEmptyEmits } from "./typing";
 // 组件
 import HyButton from "../hy-button/hy-button.vue";
-import HyIcon from "../hy-icon/hy-icon.vue";
+import HyImage from "../hy-image/hy-image.vue";
 
 /**
  * 加载的第一页数据就为空
@@ -67,10 +67,13 @@ const props = defineProps({
     default: true,
     required: true,
   },
-  /** 缺省页内容 */
+  /**
+   * 缺省页内容
+   * @values content,search,address,network,order,coupon,favor,history,message,comment,integral
+   * */
   mode: {
     type: String,
-    default: "car",
+    default: "content",
   },
   /** 空状态图片 */
   imageUrl: String,
@@ -81,13 +84,13 @@ const props = defineProps({
   },
   /** 组件层级 */
   width: {
-    type: Number,
-    default: 350,
+    type: [String, Number],
+    default: "240px",
   },
   /** icon高度 */
   height: {
     type: [String, Number],
-    default: "auto",
+    default: "240px",
   },
   /** 提示信息 */
   description: String,

package/components/hy-empty/icon.ts

@@ -1,78 +1,52 @@
-export default {
-  car: {
-    name: '购物车为空',
-    icon: 'https://pic1.imgdb.cn/item/685b54cb58cb8da5c86d0d4c.png',
-  },
-  page: {
-    name: '页面不存在',
-    icon: 'https://pic1.imgdb.cn/item/685a6b3f58cb8da5c86b6f64.webp',
+import type { IEmptyIcon } from "./typing";
+
+const url = "https://registry.npmmirror.com/wot-design-uni-assets/*/files/";
+
+const emptyIcon: IEmptyIcon = {
+  content: {
+    desc: "暂无内容",
+    icon: url + "content.png",
   },
   search: {
-    name: '没有搜索结果',
-    icon: 'https://pic1.imgdb.cn/item/685a6b1f58cb8da5c86b6e84.webp',
+    desc: "没有搜索结果",
+    icon: url + "search.png",
   },
   address: {
-    name: '没有收货地址',
-    icon: 'https://pic1.imgdb.cn/item/685a6b3558cb8da5c86b6f1a.webp',
+    desc: "没有收货地址",
+    icon: url + "png",
   },
-  wifi: {
-    name: '没有网络',
-    icon: 'https://pic1.imgdb.cn/item/685a6b1f58cb8da5c86b6e87.webp',
+  network: {
+    desc: "没有网络",
+    icon: url + "network.png",
   },
   order: {
-    name: '订单为空',
-    icon: 'https://pic1.imgdb.cn/item/685a6b1f58cb8da5c86b6e85.webp',
+    desc: "订单为空",
+    icon: url + "png",
   },
   coupon: {
-    name: '没有优惠券',
-    icon: 'https://pic1.imgdb.cn/item/685a6b3f58cb8da5c86b6f63.webp',
+    desc: "没有优惠券",
+    icon: url + "png",
   },
   favor: {
-    name: '暂无收藏',
-    icon: 'https://pic1.imgdb.cn/item/685a6b3558cb8da5c86b6f1b.webp',
-  },
-  permission: {
-    name: '无权限',
-    icon: 'https://pic1.imgdb.cn/item/685a6b4358cb8da5c86b6f85.webp',
+    desc: "暂无收藏",
+    icon: url + "collect.png",
   },
   history: {
-    name: '无历史记录',
-    icon: 'https://pic1.imgdb.cn/item/685a6b3f58cb8da5c86b6f62.webp',
+    desc: "无历史记录",
+    icon: url + "png",
   },
   message: {
-    name: '消息列表为空',
-    icon: 'https://pic1.imgdb.cn/item/685a6aef58cb8da5c86b6d30.webp',
-  },
-  image: {
-    name: '暂无图片',
-    icon: 'https://pic1.imgdb.cn/item/685a6b3f58cb8da5c86b6f65.webp',
-  },
-  video: {
-    name: '暂无视频',
-    icon: 'https://pic1.imgdb.cn/item/685a6b3f58cb8da5c86b6f66.webp',
+    desc: "消息列表为空",
+    icon: url + "message.png",
   },
   comment: {
-    name: '暂无评论',
-    icon: 'https://pic1.imgdb.cn/item/685a6aef58cb8da5c86b6d30.webp',
+    desc: "暂无评论",
+    icon: url + "comment.png",
   },
   integral: {
-    name: '暂无积分',
-    icon: 'https://pic1.imgdb.cn/item/685a6aef58cb8da5c86b6d2f.webp',
-  },
-  subscribe: {
-    name: '暂无预约',
-    icon: 'https://pic1.imgdb.cn/item/685a6b1f58cb8da5c86b6e86.webp',
-  },
-  earnings: {
-    name: '暂无收益',
-    icon: 'https://pic1.imgdb.cn/item/685a6b3558cb8da5c86b6f1c.webp',
-  },
-  announcement: {
-    name: '暂无公告',
-    icon: 'https://pic1.imgdb.cn/item/685a6b3558cb8da5c86b6f1d.webp',
-  },
-  signIn: {
-    name: '暂无打卡',
-    icon: 'https://pic1.imgdb.cn/item/685a6b1f58cb8da5c86b6e83.webp',
+    desc: "暂无积分",
+    icon: url + "halo.png",
   },
-}
+};
+
+export default emptyIcon;

package/components/hy-empty/index.scss

@@ -1,4 +1,4 @@
-@use "../../theme.scss" as *;
+@use "../../libs/css/theme" as *;
 @use "../../libs/css/mixin.scss" as *;
 
 
@@ -12,14 +12,14 @@
   align-items: center;
   flex-direction: column;
   background: $hy-background;
-  &__description {
+  @include m(description) {
     width: 70%;
     text-align: center;
     margin-top: $hy-border-margin-padding-base;
     color: $hy-text-color--grey;
   }
 
-  &__button {
+  @include m(button) {
     margin-top: 100rpx;
   }
 }

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

@@ -1,83 +1,96 @@
-import type { CSSProperties } from 'vue'
-import type HyButtonProps from '../hy-button/typing'
+import type { CSSProperties } from "vue";
+import type HyButtonProps from "../hy-button/typing";
 
 type EmptyModeType =
-  | 'car'
-  | 'page'
-  | 'search'
-  | 'address'
-  | 'wifi'
-  | 'order'
-  | 'coupon'
-  | 'favor'
-  | 'permission'
-  | 'history'
-  | 'message'
-  | 'image'
-  | 'video'
-  | 'comment'
-  | 'integral'
-  | 'subscribe'
-  | 'earnings'
-  | 'announcement'
-  | 'signIn'
+  | "car"
+  | "page"
+  | "search"
+  | "address"
+  | "wifi"
+  | "order"
+  | "coupon"
+  | "favor"
+  | "permission"
+  | "history"
+  | "message"
+  | "image"
+  | "video"
+  | "comment"
+  | "integral"
+  | "subscribe"
+  | "earnings"
+  | "announcement"
+  | "signIn";
+
+export type IEmptyIcon = {
+  [key: string]: {
+    /**
+     * 提示信息
+     * */
+    desc: string;
+    /**
+     * 空状态图片地址
+     * */
+    icon: string;
+  };
+};
 
 export default interface HyEmptyProps {
   /**
    * @description 是否显示空状态
    * */
-  show?: boolean
+  show?: boolean;
   /**
    * @description 缺省页内容
    * */
-  mode?: EmptyModeType
+  mode?: EmptyModeType;
   /**
    * @description 空状态图片
    * */
-  imageUrl?: string
+  imageUrl?: string;
   /**
    * @description 组件层级
    * */
-  zIndex?: number
+  zIndex?: number;
   /**
    * @description icon宽度
    * */
-  width?: number | string
+  width?: number | string;
   /**
    * @description icon高度
    * */
-  height?: number | string
+  height?: number | string;
   /**
    * @description 提示信息
    * */
-  description?: string
+  description?: string;
   /**
    * @description 提示信息大小
    * */
-  desSize?: string | number
+  desSize?: string | number;
   /**
    * @description 提示信息颜色
    * */
-  desColor?: string
+  desColor?: string;
   /**
    * @description 图片margin
    * */
-  imgMargin?: string
+  imgMargin?: string;
   /**
    * @description 按钮属性只
    * */
-  button?: HyButtonProps
+  button?: HyButtonProps;
   /**
    * @description 跳转地址
    * */
-  navigateUrl?: string
+  navigateUrl?: string;
   /**
    * @description 自定义输入框外部样式
    * */
-  customStyle?: CSSProperties
+  customStyle?: CSSProperties;
 }
 
 export interface IEmptyEmits {
   /** 点击按钮触发 */
-  (e: 'click'): void
+  (e: "click"): void;
 }

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

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

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

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

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

@@ -20,6 +20,7 @@ import { provide, reactive, ref } from "vue";
 import type { PropType } from "vue";
 import type { FormItemRule } from "./typing";
 import { clearVal, isArray } from "../../utils";
+import type { AppType } from "vite";
 
 /**
  * 表单组件父组件，需要搭配hy-form-item
@@ -47,7 +48,7 @@ const props = defineProps({
    * @values left,top
    * */
   labelPosition: {
-    type: String,
+    type: String as PropType<HyApp.LabelPosition>,
     default: "left",
   },
   /**
@@ -55,7 +56,7 @@ const props = defineProps({
    * @values left,center,right
    * */
   labelAlign: {
-    type: String,
+    type: String as PropType<HyApp.ColumnCenterType>,
     default: "left",
   },
 });

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

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

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

@@ -1,41 +1,41 @@
-@use "../../theme.scss" as *;
-@use "../../libs/css/mixin.scss" as *;
-
-@include b(form-item) {
-  display: flex;
-  margin-bottom: 16px;
-
-  @include m(left) {
-    flex-direction: row;
-    align-items: flex-start;
-  }
-
-  @include m(top) {
-    flex-direction: column;
-  }
-
-  @include e(label) {
-    position: relative;
-    padding-right: 8px;
-    font-size: 14px;
-    color: $hy-text-color;
-    line-height: 2.5;
-
-    @include m(required) {
-      color: #ff4d4f;
-      margin-right: 2px;
-    }
-  }
-
-  @include e(content) {
-    flex: 1;
-    min-width: 0;
-  }
-
-  @include e(error) {
-    margin-top: 4px;
-    font-size: 12px;
-    color: #ff4d4f;
-    line-height: 1.5;
-  }
-}
+@use "../../libs/css/theme" as *;
+@use "../../libs/css/mixin.scss" as *;
+
+@include b(form-item) {
+  display: flex;
+  margin-bottom: 16px;
+
+  @include m(left) {
+    flex-direction: row;
+    align-items: flex-start;
+  }
+
+  @include m(top) {
+    flex-direction: column;
+  }
+
+  @include e(label) {
+    position: relative;
+    padding-right: 8px;
+    font-size: 14px;
+    color: $hy-text-color;
+    line-height: 2.5;
+
+    @include m(required) {
+      color: #ff4d4f;
+      margin-right: 2px;
+    }
+  }
+
+  @include e(content) {
+    flex: 1;
+    min-width: 0;
+  }
+
+  @include e(error) {
+    margin-top: 4px;
+    font-size: 12px;
+    color: #ff4d4f;
+    line-height: 1.5;
+  }
+}

package/components/hy-grid/index.scss

@@ -1,5 +1,5 @@
 @use "../../libs/css/mixin.scss" as *;
-@use "../../theme.scss" as *;
+@use "../../libs/css/theme" as *;
 
 @include b(grid) {
   justify-content: center;

package/components/hy-icon/index.scss

@@ -1,6 +1,6 @@
 @use "../../libs/css/mixin.scss" as *;
 @use "../../public/font/iconfont.css" as *;
-@use "../../theme.scss" as *;
+@use "../../libs/css/theme" as *;
 
 
 @include b(icon) {

package/components/hy-image/index.scss

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

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

@@ -291,7 +291,7 @@ const props = defineProps({
    * @values surround,bottom,none
    * */
   border: {
-    type: String,
+    type: String as PropType<HyApp.BorderType>,
     default: "surround",
   },
   /** 是否只读，与disabled不同之处在于disabled会置灰组件，而readonly则不会 */
@@ -304,7 +304,7 @@ const props = defineProps({
    * @values circle,square
    * */
   shape: {
-    type: String,
+    type: String as PropType<HyApp.ShapeType>,
     default: "square",
   },
   /** 是否忽略组件内对文本合成系统事件的处理 */

package/components/hy-input/index.scss

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

package/components/hy-line/index.scss

@@ -1,5 +1,5 @@
 @use "../../libs/css/mixin.scss" as *;
-@use "../../theme.scss" as *;
+@use "../../libs/css/theme" as *;
 
 @include b(line) {
   /* #ifndef APP-NVUE */

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

@@ -1,5 +1,5 @@
 @use "../../libs/css/mixin.scss" as *;
-@use "../../theme.scss" as *;
+@use "../../libs/css/theme" as *;
 
 @include b(line-progress) {
   align-items: stretch;

package/components/hy-list/index.scss

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

package/components/hy-loading/index.scss

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

package/components/hy-menu/index.scss

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

package/components/hy-modal/index.scss

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

package/components/hy-navbar/index.scss

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

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

@@ -8,8 +8,8 @@
     </slot>
     <swiper
       :disable-touch="disableTouch"
-      :vertical="step ? false : true"
-      circular
+      :vertical="!step"
+      :circular="true"
       :interval="duration"
       :autoplay="true"
       class="hy-notice__swiper"

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

@@ -53,7 +53,7 @@ import type IProps from "./typing";
 import defaultProps from "./props";
 import { addUnit, getRect, sleep } from "../../utils";
 import { IconConfig } from "../../config";
-
+// 组件
 import HyIcon from "../hy-icon/hy-icon.vue";
 
 const props = withDefaults(defineProps<IProps>(), defaultProps);

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

@@ -1,4 +1,4 @@
-@use "../../theme.scss" as *;
+@use "../../libs/css/theme" as *;
 @use "../../libs/css/mixin.scss" as *;
 
 
@@ -24,6 +24,12 @@
     }
   }
 
+  &__right-icon {
+    :deep(.hy-icon) {
+      color: $hy-warning;
+    }
+  }
+
   &__right-icon {
     margin-left: 5px;
     align-items: center;

package/components/hy-notify/index.scss

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

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

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

package/components/hy-overlay/index.scss

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

package/components/hy-pagination/index.scss

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

package/components/hy-picker/index.scss

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