hy-app 0.3.2 → 0.3.4

package/components/hy-popover/index.scss

@@ -1,4 +1,4 @@
-@use "../../theme.scss" as *;
+@use "../../libs/css/theme" as *;
 @use "../../libs/css/mixin.scss" as *;
 
 $z-index: 998;
@@ -31,7 +31,7 @@ $z-index: 998;
     white-space: nowrap;
     z-index: $z-index;
     position: relative;
-    background-color: $hy-background--container;
+    background-color: $hy-background--box;
     border-radius: $hy-border-radius-sm;
   }
 
@@ -63,7 +63,7 @@ $z-index: 998;
     padding: $hy-border-margin-padding-base;
     line-height: 22px;
     z-index: $z-index;
-    background-color: $hy-background--container;
+    background-color: $hy-background--box;
     border-radius: $hy-border-radius-sm;
     box-sizing: content-box;
     width: 200px;
@@ -79,5 +79,5 @@ $z-index: 998;
     z-index: $z-index;
   }
 
-  @include squareArrow(6px, $hy-background--container, $z-index, $hy-box-shadow);
+  @include squareArrow(6px, $hy-background--box, $z-index, $hy-box-shadow);
 }

package/components/hy-popup/index.scss

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

package/components/hy-price/index.scss

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

package/components/hy-qrcode/index.scss

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

package/components/hy-radio/index.scss

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

package/components/hy-read-more/index.scss

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

package/components/hy-scroll-list/index.scss

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

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

@@ -17,7 +17,7 @@
         borderColor: borderColor,
       }"
     >
-      <template v-if="$slots.label || label !== null">
+      <template v-if="$slots.label || label">
         <slot name="label">
           <text class="hy-search__content__label">{{ label }}</text>
         </slot>
@@ -72,14 +72,7 @@
         v-if="keyword && clear && focused"
         @click="clear"
       >
-        <HyIcon
-          :name="IconConfig.CLOSE"
-          size="11"
-          color="#ffffff"
-          :customStyle="{
-            lineHeight: '12px',
-          }"
-        ></HyIcon>
+        <HyIcon :name="IconConfig.CLOSE" color="#ffffff"></HyIcon>
       </view>
     </view>
     <text

package/components/hy-search/index.scss

@@ -1,4 +1,4 @@
-@use "../../theme.scss" as *;
+@use "../../libs/css/theme" as *;
 @use "../../libs/css/mixin.scss" as *;
 
 $hy-search-close-size: 20px !default;

package/components/hy-signature/index.scss

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

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

@@ -187,7 +187,7 @@ const props = defineProps({
   },
   /** 滑块的大小，取值范围为 12 - 28 */
   blockSize: {
-    type: Number,
+    type: [String, Number],
     default: 18,
   },
   /** 最小值 */

package/components/hy-slider/index.scss

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

package/components/hy-steps/index.scss

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

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

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

package/components/hy-subsection/index.scss

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

package/components/hy-swipe-action/index.scss

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

package/components/hy-swiper/index.scss

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

package/components/hy-switch/index.scss

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

package/components/hy-tabBar/index.scss

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

package/components/hy-tabs/index.scss

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

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

@@ -101,7 +101,7 @@ const props = defineProps({
   },
   /**
    * tag的形状
-   * @values circle,square
+   * @values circle,square,opposite
    * */
   shape: {
     type: String,
@@ -143,7 +143,7 @@ const props = defineProps({
   /** 定义需要用到的外部样式 */
   customStyle: {
     type: Object as PropType<CSSProperties>,
-    default: "",
+    default: () => {},
   },
   /** 自定义外部类名 */
   customClass: {

package/components/hy-tag/index.scss

@@ -1,4 +1,4 @@
-@use "../../theme.scss" as *;
+@use "../../libs/css/theme" as *;
 @use "../../libs/css/mixin.scss" as *;
 
 
@@ -19,41 +19,42 @@ $hy-background--disabled);
   /*圆角*/
   @include borderRadio(circle);
   @include borderRadio(square);
+  @include borderRadio(opposite);
 
-  &__icon {
+  @include e(icon) {
     margin-right: $hy-border-margin-padding-sm;
   }
 
-  &__text {
-    &--small {
+  @include e(text) {
+    @include m(small) {
       font-size: $hy-font-size-sm;
       line-height: $hy-font-size-sm;
     }
 
-    &--medium {
+    @include m(medium) {
       font-size: $hy-font-size-base;
       line-height: $hy-font-size-base;
     }
 
-    &--large {
+    @include m(large) {
       font-size: $hy-font-size-lg;
       line-height: $hy-font-size-lg;
     }
   }
 
-  &--small {
+  @include m(small) {
     height: 22px;
     line-height: 22px;
     padding: 0 $hy-border-margin-padding-sm;
   }
 
-  &--medium {
+  @include m(medium) {
     height: 26px;
     line-height: 26px;
     padding: 0 $hy-border-margin-padding-base;
   }
 
-  &--large {
+  @include m(large) {
     height: 32px;
     line-height: 32px;
     padding: 0 15px;
@@ -82,7 +83,7 @@ $hy-background--disabled);
   @include themeColor(info--plain__fill, $hy-info-light, $hy-info, $hy-info);
 
   /* 关闭按钮 */
-  &__close {
+  @include e(close) {
     position: absolute;
     z-index: 999;
     top: 10px;
@@ -99,17 +100,17 @@ $hy-background--disabled);
     transform: scale(0.6) translate(50%, -50%);
     /* #endif */
 
-    &--small {
+    @include m(small) {
       width: 18px;
       height: 18px;
     }
 
-    &--medium {
+    @include m(medium) {
       width: 22px;
       height: 22px;
     }
 
-    &--large {
+    @include m(large) {
       width: 25px;
       height: 25px;
     }

package/components/hy-text/index.scss

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

package/components/hy-textarea/index.scss

@@ -1,4 +1,4 @@
-@use "../../theme.scss" as *;
+@use "../../libs/css/theme" as *;
 @use "../../libs/css/mixin.scss" as *;
 
 @include b(textarea) {
@@ -30,6 +30,8 @@
     flex: 1;
     font-size: 15px;
     width: 100%;
+    background-color: transparent;
+    border: none;
   }
 
   @include m(count) {
@@ -42,3 +44,7 @@
     border-radius: $hy-border-radius-sm;
   }
 }
+textarea {
+  background-color: transparent;
+  border: none;
+}

package/components/hy-toast/index.scss

@@ -1,5 +1,5 @@
 @use "../../libs/css/mixin.scss" as *;
-@use "../../theme.scss" as *;
+@use "../../libs/css/theme" as *;
 
 @include b(toast){
   &__content {

package/components/hy-tooltip/index.scss

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

package/components/hy-upload/hy-upload.vue

@@ -25,7 +25,7 @@
             class="hy-upload__wrap__preview__other"
             @tap="onClickPreview(item, index)"
           >
-            <u-icon
+            <HyIcon
               color="#80CBF9"
               size="26"
               :name="
@@ -33,7 +33,7 @@
                   ? 'movie'
                   : 'folder'
               "
-            ></u-icon>
+            ></HyIcon>
             <text class="hy-upload__wrap__preview__other__text">
               {{
                 item.isVideo || (item.type && item.type === "video")
@@ -139,8 +139,8 @@ export default {
 <script setup lang="ts">
 import { ref, watch } from "vue";
 import type { PropType, CSSProperties } from "vue";
-import type { FileVo, ReadFunctionVo } from "./typing";
-import { addUnit, chooseFile, isArray } from "../../utils";
+import type { FileVo, IUploadEmits, ReadFunctionVo } from "./typing";
+import { addUnit, bytesToSize, chooseFile, isArray } from "../../utils";
 import { IconConfig } from "../../config";
 // 组件
 import HyIcon from "../hy-icon/hy-icon.vue";
@@ -278,14 +278,7 @@ const props = defineProps({
     type: Object as PropType<CSSProperties>,
   },
 });
-const emit = defineEmits([
-  "clickPreview",
-  "beforeRead",
-  "error",
-  "delete",
-  "afterRead",
-  "oversize",
-]);
+const emit = defineEmits<IUploadEmits>();
 
 const lists = ref<FileVo[]>([]);
 // 上传按钮

package/components/hy-upload/index.scss

@@ -1,5 +1,5 @@
 @use "../../libs/css/mixin.scss" as *;
-@use "../../theme.scss" as *;
+@use "../../libs/css/theme" as *;
 
 $hy-upload-image-width: 80px !default;
 $hy-upload-text-font-size: 11px !default;

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

@@ -150,3 +150,24 @@ export default interface HyUploadProps {
    * */
   customStyle?: CSSProperties;
 }
+
+export interface UploadFileParams {
+  file: FileVo | FileVo[];
+  name: string;
+  index: number;
+}
+
+export interface IUploadEmits {
+  /** 点击预览大图触发 */
+  (e: "clickPreview", params: UploadFileParams): void;
+  /** 上传前触发 */
+  (e: "beforeRead", params: UploadFileParams): void;
+  /** 上传错误触发 */
+  (e: "error", error: any): void;
+  /** 删除触发 */
+  (e: "delete", params: UploadFileParams): void;
+  /** 上传完成触发 */
+  (e: "afterRead", params: UploadFileParams): void;
+  /** 超出最大值 */
+  (e: "oversize", params: UploadFileParams): void;
+}

package/components/hy-warn/index.scss

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

package/components/hy-watermark/index.scss

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

package/index.scss

@@ -1,3 +1,4 @@
 @use "./libs/css/common.scss";
-@use "./libs/css/vars.css";
-//@use "./libs/css/mixin.scss";
+@use "./libs/css/vars.scss";
+@use "./libs/css/mixin.scss";
+@use "./libs/css/theme.scss";

package/libs/css/common.scss

@@ -1,4 +1,4 @@
-@use "../../theme.scss" as *;
+@use "theme" as *;
 .hy-border__bottom {
   border-bottom: $hy-border-line;
 }

package/libs/css/mixin.scss

@@ -1,10 +1,10 @@
-@use "../../theme.scss";
-@import "config";
-@import "function";
+@use "theme";
+@use "config";
+@use "function";
 
 
 @mixin b($block) {
-  $B: $namespace + '-' + $block !global;
+  $B: config.$namespace + '-' + $block !global;
 
   .#{$B} {
     @content;
@@ -18,7 +18,7 @@
   @each $unit in $modifier {
     $currentSelector: #{$currentSelector +
       $selector +
-      $modifier-separator +
+      config.$modifier-separator +
       $unit +
       ','};
   }
@@ -35,9 +35,9 @@
   $selector: &;
   $selectors: "";
 
-  @if containsPseudo($selector) {
+  @if function.containsPseudo($selector) {
     @each $item in $element {
-      $selectors: #{$selectors + "." + $B + $element-separator + $item + ","};
+      $selectors: #{$selectors + "." + $B + config.$element-separator + $item + ","};
     }
 
     @at-root {
@@ -51,7 +51,7 @@
 
   @else {
     @each $item in $element {
-      $selectors: #{$selectors + $selector + $element-separator + $item + ","};
+      $selectors: #{$selectors + $selector + config.$element-separator + $item + ","};
     }
 
     @at-root {
@@ -68,9 +68,9 @@
   $selector: &;
   $selectors: "";
 
-  @if containsPseudo($selector) {
+  @if function.containsPseudo($selector) {
     @each $item in $element {
-      $selectors: #{$selectors + "." + $B + $element-separator + $item + ","};
+      $selectors: #{$selectors + "." + $B + config.$element-separator + $item + ","};
     }
 
     @at-root {
@@ -86,7 +86,7 @@
 
   @else {
     @each $item in $element {
-      $selectors: #{$selectors + $selector + $element-separator + $item + ","};
+      $selectors: #{$selectors + $selector + config.$element-separator + $item + ","};
     }
 
     @at-root {
@@ -103,7 +103,7 @@
 @mixin is($states...) {
   @at-root {
     @each $state in $states {
-      &.#{$state-prefix + $state} {
+      &.#{config.$state-prefix + $state} {
         @content;
       }
     }
@@ -139,9 +139,12 @@
     @if $shape == circle {
       border-radius:  theme.$hy-border-radius-semicircle;
     }
-    @else {
+    @else if($shape == square) {
       border-radius: theme.$hy-border-radius-sm;
     }
+    @else {
+      border-radius: 28rpx theme.$hy-border-radius-sm;
+    }
   }
 }
 

package/{theme.scss → libs/css/theme.scss}

@@ -1,3 +1,4 @@
+@use "vars" as *;
 /* 主题是相关颜色 */
 $hy-primary: var(--hy-theme-color, #2979ff) !default;
 $hy-primary-dark: var(--hy-theme--dark, #2b85e4) !default;
@@ -49,6 +50,7 @@ $hy-background--hover: var(--hy-background--hover, rgba(0,0,0,0.05)) !default; /
 $hy-light-background-mask: var(--hy-light-background-mask, rgba(0, 0, 0, 0.5)); //遮罩颜色
 $hy-background--active: var(--hy-background--active, #FFFFFF); // 选中背景色
 $hy-background--close: var(--hy-background--close, #f0f0f0); // 选中背景色
+$hy-background--box: var(--hy-background--box, #FFFFFF); // 选中背景色
 
 /* 文字尺寸 */
 $hy-font-size-sm: 24rpx; // 提示文字大小

package/libs/css/{vars.css → vars.scss}

@@ -20,6 +20,7 @@
   --hy-background--hover: rgba(0,0,0,0.05);
   --hy-background--active: #FFFFFF;
   --hy-background--close:  #f0f0f0;
+  --hy-background--box:  #FFFFFF;
 
   --hy-border-line: 1rpx solid #e8e8e8;
   --hy-border-color: #c2c2c4;
@@ -52,6 +53,7 @@
   --hy-background--hover: rgba(255,255,255,0.2);
   --hy-background--active: #000000;
   --hy-background--close:  #323233;
+  --hy-background--box:  #4b4c4d;
 
   --hy-border-line: 1rpx solid #3c3f44;
   --hy-border-color: #3c3f44;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hy-app",
-  "version": "0.3.2",
-  "description": "修复上传提示功能",
+  "version": "0.3.4",
+  "description": "修改微信小程序适配",
   "main": "./index.ts",
   "private": false,
   "scripts": {},
@@ -12,5 +12,8 @@
   ],
   "web-types": "./web-types.json",
   "author": "gaoxianhua",
-  "license": "MIT"
+  "license": "MIT",
+  "dependencies": {
+    "hy-app": "0.3.*"
+  }
 }

package/typing/modules/common.d.ts

@@ -121,6 +121,8 @@ declare namespace HyApp {
     | "slide-right"
     | "zoom-in"
     | "zoom-out";
+  /** label位置 */
+  type LabelPosition = "left" | "top";
   interface IFieldNames {
     /**
      * @description 自定义columns的文本键