sard-uniapp 1.1.1 → 1.1.3

package/changelog.md

@@ -1,3 +1,15 @@
+## <small>1.1.3 (2024-05-11)</small>
+
+* fix: 修复下拉刷新组件有时不触发的问题 close #18 ([3bbe3a9](https://github.com/sutras/sard-uniapp/commit/3bbe3a9)), closes [#18](https://github.com/sutras/sard-uniapp/issues/18)
+
+
+
+## <small>1.1.2 (2024-05-10)</small>
+
+* fix: 移除属性选择器  close #23 ([89ef3fc](https://github.com/sutras/sard-uniapp/commit/89ef3fc)), closes [#23](https://github.com/sutras/sard-uniapp/issues/23)
+
+
+
 ## <small>1.1.1 (2024-05-05)</small>
 
 * fix: 修复upload-preview的image在h5环境下，没有宽度导致图片显示不全 ([e155724](https://github.com/sutras/sard-uniapp/commit/e155724))

package/components/button/index.scss

@@ -154,13 +154,17 @@
 
   // # active 状态
   @include m(default, pale, mild, outline, text) {
-    &:not([disabled]):active::before {
+    &:not(#{bem($b: button, $m: disabled)}):not(
+        #{bem($b: button, $m: loading)}
+      ):active::before {
       opacity: 1;
     }
   }
 
   @include m(pale-text) {
-    &:active {
+    &:not(#{bem($b: button, $m: disabled)}):not(
+        #{bem($b: button, $m: loading)}
+      ):active {
       opacity: var(--sar-button-active-opacity);
     }
   }

package/components/input/index.scss

@@ -58,10 +58,6 @@
       height: var(--sar-input-control-textarea-height);
       min-height: var(--sar-input-control-textarea-height);
     }
-
-    :deep([type='password']::-ms-reveal) {
-      display: none;
-    }
   }
 
   @include e(placeholder) {
@@ -116,3 +112,15 @@
     }
   }
 }
+
+/* #ifdef H5 */
+@include bem(input) {
+  @include b() {
+    @include e(control) {
+      :deep([type='password']::-ms-reveal) {
+        display: none;
+      }
+    }
+  }
+}
+/* #endif */

package/components/pull-down-refresh/common.d.ts

@@ -51,5 +51,5 @@ export interface PullDownRefreshEmits {
     (e: 'refresh'): void;
 }
 export interface PullDownRefreshExpose {
-    setScrollTop: (scrollTop: number) => void;
+    enableToRefresh: (canRefresh: boolean) => void;
 }

package/components/pull-down-refresh/pull-down-refresh.vue

@@ -36,7 +36,7 @@
     :prop="status"
     :change:prop="wxsswipe.statusYWatch"
     :data-status="status"
-    :data-scrolltop="scrollTop"
+    :data-canrefresh="canRefresh"
     :data-threshold="threshold"
     :data-headerheight="headerHeight"
     :data-duration="transitionDuration"
@@ -144,7 +144,7 @@ export default {
     let lockDirection = "";
     const isDragging = ref(false);
     const onTouchStart = (event) => {
-      if (props.disabled || status.value !== "initial" || scrollTop.value !== 0) {
+      if (props.disabled || status.value !== "initial" || !canRefresh.value) {
         return;
       }
       startX = event.touches[0].clientX;
@@ -204,12 +204,12 @@ export default {
       document.addEventListener("mouseup", upHandler);
       // #endif
     };
-    const scrollTop = ref(0);
-    const setScrollTop = (sTop) => {
-      scrollTop.value = sTop;
+    const canRefresh = ref(true);
+    const enableToRefresh = (can) => {
+      canRefresh.value = can;
     };
     expose({
-      setScrollTop,
+      enableToRefresh,
       _setStatus: (newStatus) => {
         status.value = newStatus;
       },
@@ -251,7 +251,7 @@ export default {
       pullDownRefreshStyle,
       headerStyle,
       loadingClass,
-      scrollTop
+      canRefresh
     };
   }
 };

package/components/pull-down-refresh/wx.wxs

@@ -12,11 +12,7 @@ function setStyle(instance, offsetY, duration) {
 
 function onTouchStart(event) {
   var dataset = event.instance.getDataset()
-  if (
-    dataset.disabled ||
-    dataset.status !== 'initial' ||
-    dataset.scrolltop !== 0
-  ) {
+  if (dataset.disabled || dataset.status !== 'initial' || !dataset.canrefresh) {
     return
   }
   startX = event.touches[0].clientX

package/components/style/functions.scss

@@ -35,5 +35,16 @@
 }
 
 @function bem-ns($str) {
-  @return $sar-namespace + '-' + $str;
+  @return $sar-namespace + $sar-block-separator + $str;
+}
+
+@function bem($b, $e: null, $m: null) {
+  $result: '.' + $sar-namespace + $sar-block-separator + $b;
+  @if $e {
+    $result: $result + $sar-element-separator + $e;
+  }
+  @if $m {
+    $result: $result + $sar-modifier-separator + $m;
+  }
+  @return $result;
 }

package/components/style/mixins/button.scss

@@ -1,8 +1,4 @@
-@mixin button-active {
-  &:not([disabled]):not(.sar-button-disabled):not(.sar-button-loading):active {
-    @content;
-  }
-}
+@use '../functions' as *;
 
 @mixin button-size(
   $height,
@@ -31,8 +27,10 @@
 
 @mixin button-set-theme {
   &,
-  &[disabled],
-  &[disabled]:not([type]) {
-    @content;
+  &#{bem($b: button, $m: disabled)},
+  &#{bem($b: button, $m: loading)} {
+    &#{bem($b: button)} {
+      @content;
+    }
   }
 }

package/package.json

@@ -2,7 +2,7 @@
   "id": "sard-uniapp",
   "name": "sard-uniapp",
   "displayName": "sard-uniapp",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "sard-uniapp 是一套基于 Uniapp + Vue3 框架开发的兼容多端的 UI 组件库",
   "keywords": [
     "uniapp",