hy-app 0.2.0 → 0.2.2

package/components/hy-radio/index.scss

@@ -1,14 +1,6 @@
 @use "../../theme.scss" as *;
 @use "../../libs/css/mixin.scss" as *;
 
-/* 暗色主题 */
-@include b(theme){
-  @include m(dark) {
-    @include b(radio__label-wrap) {
-      color: $hy-dark-color;
-    }
-  }
-}
 
 @include b(radio) {
   @include flex(row);
@@ -64,28 +56,34 @@
 
     /* #endif */
 
-    &--circle {
+    @include m(circle) {
       border-radius: 50%;
     }
 
-    &--square {
+    @include m(square) {
       border-radius: 3px;
     }
 
-    &--checked {
+    @include m(checked) {
       color: #FFFFFF;
       background-color: $hy-primary;
       border-color: $hy-primary;
     }
 
-    &--disabled {
-      background-color: $hy-light-background-disabled;
+    @include m(disabled) {
+      background-color: $hy-text-color--disabled;
+      :deep(.hy-icon) {
+        display: none;
+      }
     }
 
-    &--disabled--checked {
+    @include m(disabled--checked) {
       background-color: $hy-primary;
       border-color: $hy-primary;
       opacity: 0.5;
+      :deep(.hy-icon) {
+        display: block;
+      }
     }
   }
 
@@ -93,13 +91,13 @@
     /* #ifndef APP-NVUE */
     word-wrap: break-word;
     /* #endif */
-    color:
-$hy-light-color;
+
+    color: $hy-text-color;
     font-size: $hy-font-size-base;
     margin-right: $hy-border-margin-padding-sm;
 
-    &--disabled {
-      color: $hy-text-color-disable;
+    @include m(disabled) {
+      color: $hy-text-color--disabled;
     }
   }
 }

package/components/hy-rate/index.scss

@@ -25,9 +25,4 @@
       }
     }
   }
-}
-//.hy-icon {
-//  /* #ifndef APP-NVUE */
-//  box-sizing: border-box;
-//  /* #endif */
-//}
+}

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

@@ -1,21 +1,6 @@
 @use "../../theme.scss" as *;
 @use "../../libs/css/mixin.scss" as *;
 
-/* 暗色主题 */
-@include b(theme){
-  @include m(dark) {
-    @include b(read-more) {
-      color: $hy-dark-color;
-      &__toggle--mask {
-        background-image:
-                linear-gradient(-180deg, rgba(0, 0, 0, 0) 0%, $hy-dark-background 80%);
-        padding-top: 100px;
-        margin-top: -100px;
-      }
-    }
-  }
-}
-
 @include b(read-more) {
   &__content {
     overflow: hidden;
@@ -31,7 +16,7 @@
 
     &--mask {
       background-image:
-              linear-gradient(-180deg, rgba(0, 0, 0, 0) 0%, #fff 80%);
+              linear-gradient(-180deg, rgba(0, 0, 0, 0) 0%, $hy-background--2 80%);
       padding-top: 100px;
       margin-top: -100px;
     }
@@ -42,10 +27,8 @@
       justify-content: center;
       margin-top: 5px;
       color: $hy-primary;
-      :deep() {
-        @include b(icon) {
-          color: $hy-primary;
-        }
+      :deep(.hy-icon) {
+        color: $hy-primary;
       }
     }
   }

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

@@ -30,7 +30,7 @@
       height: 4px;
       border-radius: $hy-border-radius-semicircle;
       overflow: hidden;
-      background-color: var(--hy-theme-color--light, $hy-border-color);
+      background-color: $hy-background--empty;
 
       &__bar {
         width: 20px;

package/components/hy-search/index.scss

@@ -10,24 +10,6 @@ $hy-search-close-size: 20px !default;
 }
 /* #endif */
 
-/* 暗色主题 */
-@include b(theme){
-  @include m(dark) {
-    @include b(search) {
-      color: $hy-dark-color;
-      &__content {
-        background-color: $hy-dark-background--empty;
-        &__input {
-          color: $hy-dark-color;
-        }
-      }
-      &__action {
-        color: $hy-dark-color;
-      }
-    }
-  }
-}
-
 @include b(search) {
   @include flex(row);
   align-items: center;
@@ -43,6 +25,7 @@ $hy-search-close-size: 20px !default;
     border-color: transparent;
     border-style: solid;
     overflow: hidden;
+    background-color: $hy-background--empty;
 
     &__icon {
       @include flex;
@@ -50,8 +33,7 @@ $hy-search-close-size: 20px !default;
     }
 
     &__label {
-      color:
-$hy-light-color;
+      color: $hy-text-color;
       font-size: $hy-font-size-base;
       margin: 0 4px;
     }
@@ -61,7 +43,7 @@ $hy-light-color;
       width: $hy-search-close-size;
       height: $hy-search-close-size;
       border-radius: $hy-border-radius-circle;
-      background-color: #c6c7cb;
+      background-color: $hy-background--track;
       @include flex(row);
       align-items: center;
       justify-content: center;
@@ -74,19 +56,17 @@ $hy-light-color;
       font-size: $hy-font-size-base;
       line-height: 1;
       margin: 0 $hy-border-margin-padding-sm;
-      color:
-$hy-light-color;
+      color: $hy-text-color;
 
       &--placeholder {
-        color: $hy-text-color-grey;
+        color: $hy-text-color--placeholder;
       }
     }
   }
 
   &__action {
     font-size: $hy-font-size-base;
-    color:
-$hy-light-color;
+    color: $hy-text-color;
     width: 0;
     overflow: hidden;
     transition-property: width;

package/components/hy-signature/canvasHelper.ts

@@ -0,0 +1,51 @@
+/**
+ * 适配 canvas 2d 上下文
+ * @param ctx canvas 2d 上下文
+ * @returns
+ */
+export function canvas2dAdapter(
+  ctx: CanvasRenderingContext2D,
+): UniApp.CanvasContext {
+  return Object.assign(ctx, {
+    setFillStyle(color: string | CanvasGradient) {
+      ctx.fillStyle = color;
+    },
+    setStrokeStyle(color: string | CanvasGradient | CanvasPattern) {
+      ctx.strokeStyle = color;
+    },
+    setLineWidth(lineWidth: number) {
+      ctx.lineWidth = lineWidth;
+    },
+    setLineCap(lineCap: "butt" | "round" | "square") {
+      ctx.lineCap = lineCap;
+    },
+
+    setFontSize(font: string) {
+      ctx.font = font;
+    },
+    setGlobalAlpha(alpha: number) {
+      ctx.globalAlpha = alpha;
+    },
+    setLineJoin(lineJoin: "bevel" | "round" | "miter") {
+      ctx.lineJoin = lineJoin;
+    },
+    setTextAlign(align: "left" | "center" | "right") {
+      ctx.textAlign = align;
+    },
+    setMiterLimit(miterLimit: number) {
+      ctx.miterLimit = miterLimit;
+    },
+    setShadow(offsetX: number, offsetY: number, blur: number, color: string) {
+      ctx.shadowOffsetX = offsetX;
+      ctx.shadowOffsetY = offsetY;
+      ctx.shadowBlur = blur;
+      ctx.shadowColor = color;
+    },
+    setTextBaseline(textBaseline: "top" | "bottom" | "middle") {
+      ctx.textBaseline = textBaseline;
+    },
+    createCircularGradient() {},
+    draw() {},
+    addColorStop() {},
+  }) as unknown as UniApp.CanvasContext;
+}