hy-app 0.3.3 → 0.3.5

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/index.scss

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

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/index.scss

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

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 *;
 
 

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;

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/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/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

@@ -55,7 +55,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 { ITagEmits } from "./typing";
 import { IconConfig } from "../../config";
@@ -93,7 +93,7 @@ const props = defineProps({
   },
   /**
    * 标签的大小
-   * @values large,medium,small
+   * @values large,medium,small,mini
    * */
   size: {
     type: String,

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 *;
 
 
@@ -26,6 +26,12 @@ $hy-background--disabled);
   }
 
   @include e(text) {
+
+    @include m(mini) {
+      font-size: 20rpx;
+      line-height: 20rpx;
+    }
+
     @include m(small) {
       font-size: $hy-font-size-sm;
       line-height: $hy-font-size-sm;
@@ -42,6 +48,12 @@ $hy-background--disabled);
     }
   }
 
+  @include m(mini) {
+    height: 17px;
+    line-height: 17px;
+    padding: 0 $hy-border-margin-padding-sm;
+  }
+
   @include m(small) {
     height: 22px;
     line-height: 22px;

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

@@ -98,8 +98,11 @@ const props = defineProps({
     default: "",
     required: true,
   },
-  /** 主题颜色 */
-  type: String,
+  /**
+   * 主题颜色
+   * @values primary,success,error,warning,info
+   * */
+  type: String as PropType<HyApp.ThemeType>,
   /** 是否显示 */
   show: {
     type: Boolean,

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/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-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;
       }
     }