@nutui/nutui-react 4.0.0-beta.2 → 4.0.0-beta.4

package/dist/cjs/packages/indicator/style-jmapp/indicator.scss

@@ -6,7 +6,7 @@
   align-items: center;
 
   &-fixed-width {
-    width: scale-px(21px);
+    width: $indicator-track-width;
   }
 
   &-dot,
@@ -16,9 +16,10 @@
     width: $indicator-dot-size;
     height: $indicator-dot-size;
     border-radius: 50%;
-    background-color: $color-border-disabled;
+    background-color: $indicator-dot-inactive-color;
+    border: $indicator-dot-border;
+    box-sizing: border-box;
     margin-left: $indicator-dot-margin;
-    opacity: 0.4;
 
     &-0 {
       margin-left: 0;
@@ -26,21 +27,23 @@
 
     &-active {
       width: $indicator-dot-active-size;
+      height: $indicator-dot-size;
       border-radius: $indicator-border-radius;
       background: $indicator-color;
-      opacity: 1;
+      border: $indicator-dot-border;
     }
   }
 
-  // 固定宽度
+  // 双屏模式
   &-fixed-width {
-    // 两个页码的时候
     .nut-indicator-dot {
-      width: scale-px(12px);
+      width: $indicator-dual-screen-inactive-width;
+      height: $indicator-dot-size;
       border-radius: $indicator-border-radius;
 
       &-active {
-        width: scale-px(6px);
+        width: $indicator-dot-active-size;
+        height: $indicator-dot-size;
       }
     }
   }
@@ -49,44 +52,71 @@
     // 竖向固定高度
     &.nut-indicator-fixed-width {
       justify-content: flex-start;
-      height: scale-px(21px);
+      height: $indicator-track-width;
       width: auto;
 
-      // 竖向两个页码
+      // 竖向双屏
       .nut-indicator-dot {
-        width: scale-px(3px);
-        height: scale-px(12px);
+        width: $indicator-dot-size;
+        height: $indicator-dual-screen-inactive-width;
         border-radius: $indicator-border-radius;
 
         &-active {
-          height: scale-px(6px);
-        }
-      }
-
-      &.nut-indicator-fixed-width {
-        &.nut-indicator-white {
-          .nut-indicator-dot {
-            &-active {
-              height: scale-px(6px);
-            }
-          }
+          width: $indicator-dot-size;
+          height: $indicator-dot-active-size;
         }
       }
     }
   }
 
   &-line {
-    width: $indicator-dot-active-size;
+    width: $indicator-slider-width;
     margin: 0;
-
     border-radius: $indicator-border-radius;
     background-color: transparent;
+    border: none;
 
     &-active {
+      position: relative;
+      z-index: 1;
       transition: transform 0.3s ease-in-out;
       background: $indicator-color;
+      border: $indicator-dot-border;
+      transform: translateX(
+        calc(
+          var(--nutui-indicator-current, 0) /
+            (var(--nutui-indicator-total, 2) - 1) *
+            (#{$indicator-track-width} - #{$indicator-slider-width})
+        )
+      );
     }
   }
+
+  // 定位布局
+  &-outside {
+    margin-top: $indicator-placement-gap;
+    margin-bottom: $indicator-placement-safe-gap;
+    justify-content: center;
+  }
+
+  &-inside-top-right {
+    position: absolute;
+    top: $indicator-placement-gap;
+    right: $indicator-placement-gap;
+  }
+
+  &-inside-bottom-center {
+    position: absolute;
+    bottom: $indicator-placement-gap;
+    left: 50%;
+    transform: translateX(-50%);
+  }
+
+  &-inside-bottom-left {
+    position: absolute;
+    bottom: $indicator-placement-gap;
+    left: $indicator-placement-gap;
+  }
 }
 
 .nut-indicator-track {
@@ -100,8 +130,8 @@
     height: 100%;
     box-sizing: border-box;
     border-radius: $indicator-border-radius;
-    background-color: $color-border-disabled;
-    opacity: 0.4;
+    background-color: $indicator-dot-inactive-color;
+    border: $indicator-dot-border;
   }
 }
 
@@ -110,11 +140,8 @@
     &-dot,
     &-line {
       position: relative;
-      /* #ifndef dynamic*/
-      box-sizing: content-box;
-      /* #endif */
-      background: rgba(255, 255, 255, 0.4);
-      opacity: 1;
+      background: $color-primary-text;
+      opacity: 0.4;
     }
 
     &-line {
@@ -122,13 +149,14 @@
 
       &-active {
         opacity: 1;
-        background: rgba(255, 255, 255, 1);
+        background: $color-primary-text;
       }
     }
 
     &-dot {
       &-active {
-        background: rgba(255, 255, 255, 1);
+        background: $color-primary-text;
+        opacity: 1;
       }
     }
   }
@@ -136,8 +164,8 @@
 
 .nut-indicator-track.nut-indicator-white {
   &:after {
-    border: scale-px(1px) solid rgba(0, 0, 0, 0.06);
-    background: rgba(255, 255, 255, 0.4);
+    background: $color-primary-text;
+    opacity: 0.4;
   }
 }
 
@@ -167,7 +195,17 @@
     .nut-indicator {
       &-line {
         width: $indicator-dot-size;
-        height: $indicator-dot-active-size;
+        height: $indicator-slider-width;
+
+        &-active {
+          transform: translateY(
+            calc(
+              var(--nutui-indicator-current, 0) /
+                (var(--nutui-indicator-total, 2) - 1) *
+                (#{$indicator-track-width} - #{$indicator-slider-width})
+            )
+          );
+        }
       }
     }
   }
@@ -181,4 +219,14 @@
       margin-left: 0;
     }
   }
+
+  &-inside-top-right {
+    right: auto;
+    left: $indicator-placement-gap;
+  }
+
+  &-inside-bottom-left {
+    left: auto;
+    right: $indicator-placement-gap;
+  }
 }

package/dist/cjs/packages/indicator/style-jmapp/style.css

@@ -10,7 +10,7 @@
   align-items: center;
 }
 .nut-indicator-fixed-width {
-  width: scale-px(21px);
+  width: var(--nutui-indicator-track-width, 24px);
 }
 .nut-indicator-dot, .nut-indicator-line {
   display: inline-block;
@@ -18,51 +18,79 @@
   width: var(--nutui-indicator-dot-size, 6px);
   height: var(--nutui-indicator-dot-size, 6px);
   border-radius: 50%;
-  background-color: var(--nutui-color-border-disabled, #c2c4cc);
+  background-color: var(--nutui-indicator-dot-inactive-color, #f0f2f7);
+  border: var(--nutui-indicator-dot-border, 0.33px solid var(--nutui-color-border));
+  box-sizing: border-box;
   margin-left: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xs));
-  opacity: 0.4;
 }
 .nut-indicator-dot-0, .nut-indicator-line-0 {
   margin-left: 0;
 }
 .nut-indicator-dot-active, .nut-indicator-line-active {
   width: var(--nutui-indicator-dot-active-size, 20px);
+  height: var(--nutui-indicator-dot-size, 6px);
   border-radius: var(--nutui-indicator-border-radius, 2px);
   background: var(--nutui-indicator-color, var(--nutui-color-primary));
-  opacity: 1;
+  border: var(--nutui-indicator-dot-border, 0.33px solid var(--nutui-color-border));
 }
 .nut-indicator-fixed-width .nut-indicator-dot {
-  width: scale-px(12px);
+  width: var(--nutui-indicator-dual-screen-inactive-width, 16px);
+  height: var(--nutui-indicator-dot-size, 6px);
   border-radius: var(--nutui-indicator-border-radius, 2px);
 }
 .nut-indicator-fixed-width .nut-indicator-dot-active {
-  width: scale-px(6px);
+  width: var(--nutui-indicator-dot-active-size, 20px);
+  height: var(--nutui-indicator-dot-size, 6px);
 }
 .nut-indicator-vertical.nut-indicator-fixed-width {
   justify-content: flex-start;
-  height: scale-px(21px);
+  height: var(--nutui-indicator-track-width, 24px);
   width: auto;
 }
 .nut-indicator-vertical.nut-indicator-fixed-width .nut-indicator-dot {
-  width: scale-px(3px);
-  height: scale-px(12px);
+  width: var(--nutui-indicator-dot-size, 6px);
+  height: var(--nutui-indicator-dual-screen-inactive-width, 16px);
   border-radius: var(--nutui-indicator-border-radius, 2px);
 }
 .nut-indicator-vertical.nut-indicator-fixed-width .nut-indicator-dot-active {
-  height: scale-px(6px);
-}
-.nut-indicator-vertical.nut-indicator-fixed-width.nut-indicator-fixed-width.nut-indicator-white .nut-indicator-dot-active {
-  height: scale-px(6px);
+  width: var(--nutui-indicator-dot-size, 6px);
+  height: var(--nutui-indicator-dot-active-size, 20px);
 }
 .nut-indicator-line {
-  width: var(--nutui-indicator-dot-active-size, 20px);
+  width: var(--nutui-indicator-slider-width, 8px);
   margin: 0;
   border-radius: var(--nutui-indicator-border-radius, 2px);
   background-color: transparent;
+  border: none;
 }
 .nut-indicator-line-active {
+  position: relative;
+  z-index: 1;
   transition: transform 0.3s ease-in-out;
   background: var(--nutui-indicator-color, var(--nutui-color-primary));
+  border: var(--nutui-indicator-dot-border, 0.33px solid var(--nutui-color-border));
+  transform: translateX(calc(var(--nutui-indicator-current, 0) / (var(--nutui-indicator-total, 2) - 1) * (var(--nutui-indicator-track-width, 24px) - var(--nutui-indicator-slider-width, 8px))));
+}
+.nut-indicator-outside {
+  margin-top: var(--nutui-indicator-placement-gap, 8px);
+  margin-bottom: var(--nutui-indicator-placement-safe-gap, 12px);
+  justify-content: center;
+}
+.nut-indicator-inside-top-right {
+  position: absolute;
+  top: var(--nutui-indicator-placement-gap, 8px);
+  right: var(--nutui-indicator-placement-gap, 8px);
+}
+.nut-indicator-inside-bottom-center {
+  position: absolute;
+  bottom: var(--nutui-indicator-placement-gap, 8px);
+  left: 50%;
+  transform: translateX(-50%);
+}
+.nut-indicator-inside-bottom-left {
+  position: absolute;
+  bottom: var(--nutui-indicator-placement-gap, 8px);
+  left: var(--nutui-indicator-placement-gap, 8px);
 }
 
 .nut-indicator-track {
@@ -76,32 +104,30 @@
   height: 100%;
   box-sizing: border-box;
   border-radius: var(--nutui-indicator-border-radius, 2px);
-  background-color: var(--nutui-color-border-disabled, #c2c4cc);
-  opacity: 0.4;
+  background-color: var(--nutui-indicator-dot-inactive-color, #f0f2f7);
+  border: var(--nutui-indicator-dot-border, 0.33px solid var(--nutui-color-border));
 }
 
 .nut-indicator-white .nut-indicator-dot, .nut-indicator-white .nut-indicator-line {
   position: relative;
-  /* #ifndef dynamic*/
-  box-sizing: content-box;
-  /* #endif */
-  background: rgba(255, 255, 255, 0.4);
-  opacity: 1;
+  background: var(--nutui-color-text-dark);
+  opacity: 0.4;
 }
 .nut-indicator-white .nut-indicator-line {
   opacity: 0;
 }
 .nut-indicator-white .nut-indicator-line-active {
   opacity: 1;
-  background: rgb(255, 255, 255);
+  background: var(--nutui-color-text-dark);
 }
 .nut-indicator-white .nut-indicator-dot-active {
-  background: rgb(255, 255, 255);
+  background: var(--nutui-color-text-dark);
+  opacity: 1;
 }
 
 .nut-indicator-track.nut-indicator-white:after {
-  border: scale-px(1px) solid rgba(0, 0, 0, 0.06);
-  background: rgba(255, 255, 255, 0.4);
+  background: var(--nutui-color-text-dark);
+  opacity: 0.4;
 }
 
 .nut-indicator-vertical {
@@ -123,11 +149,24 @@
 }
 .nut-indicator-vertical.nut-indicator-track .nut-indicator-line {
   width: var(--nutui-indicator-dot-size, 6px);
-  height: var(--nutui-indicator-dot-active-size, 20px);
+  height: var(--nutui-indicator-slider-width, 8px);
+}
+.nut-indicator-vertical.nut-indicator-track .nut-indicator-line-active {
+  transform: translateY(calc(var(--nutui-indicator-current, 0) / (var(--nutui-indicator-total, 2) - 1) * (var(--nutui-indicator-track-width, 24px) - var(--nutui-indicator-slider-width, 8px))));
 }
 
 [dir=rtl] .nut-indicator-dot-0,
 .nut-rtl .nut-indicator-dot-0 {
   margin-right: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xs));
   margin-left: 0;
+}
+[dir=rtl] .nut-indicator-inside-top-right,
+.nut-rtl .nut-indicator-inside-top-right {
+  right: auto;
+  left: var(--nutui-indicator-placement-gap, 8px);
+}
+[dir=rtl] .nut-indicator-inside-bottom-left,
+.nut-rtl .nut-indicator-inside-bottom-left {
+  left: auto;
+  right: var(--nutui-indicator-placement-gap, 8px);
 }

package/dist/cjs/packages/indicator/style-jrkf/indicator.scss

@@ -6,7 +6,7 @@
   align-items: center;
 
   &-fixed-width {
-    width: scale-px(21px);
+    width: $indicator-track-width;
   }
 
   &-dot,
@@ -16,9 +16,10 @@
     width: $indicator-dot-size;
     height: $indicator-dot-size;
     border-radius: 50%;
-    background-color: $color-border-disabled;
+    background-color: $indicator-dot-inactive-color;
+    border: $indicator-dot-border;
+    box-sizing: border-box;
     margin-left: $indicator-dot-margin;
-    opacity: 0.4;
 
     &-0 {
       margin-left: 0;
@@ -26,21 +27,23 @@
 
     &-active {
       width: $indicator-dot-active-size;
+      height: $indicator-dot-size;
       border-radius: $indicator-border-radius;
       background: $indicator-color;
-      opacity: 1;
+      border: $indicator-dot-border;
     }
   }
 
-  // 固定宽度
+  // 双屏模式
   &-fixed-width {
-    // 两个页码的时候
     .nut-indicator-dot {
-      width: scale-px(12px);
+      width: $indicator-dual-screen-inactive-width;
+      height: $indicator-dot-size;
       border-radius: $indicator-border-radius;
 
       &-active {
-        width: scale-px(6px);
+        width: $indicator-dot-active-size;
+        height: $indicator-dot-size;
       }
     }
   }
@@ -49,44 +52,71 @@
     // 竖向固定高度
     &.nut-indicator-fixed-width {
       justify-content: flex-start;
-      height: scale-px(21px);
+      height: $indicator-track-width;
       width: auto;
 
-      // 竖向两个页码
+      // 竖向双屏
       .nut-indicator-dot {
-        width: scale-px(3px);
-        height: scale-px(12px);
+        width: $indicator-dot-size;
+        height: $indicator-dual-screen-inactive-width;
         border-radius: $indicator-border-radius;
 
         &-active {
-          height: scale-px(6px);
-        }
-      }
-
-      &.nut-indicator-fixed-width {
-        &.nut-indicator-white {
-          .nut-indicator-dot {
-            &-active {
-              height: scale-px(6px);
-            }
-          }
+          width: $indicator-dot-size;
+          height: $indicator-dot-active-size;
         }
       }
     }
   }
 
   &-line {
-    width: $indicator-dot-active-size;
+    width: $indicator-slider-width;
     margin: 0;
-
     border-radius: $indicator-border-radius;
     background-color: transparent;
+    border: none;
 
     &-active {
+      position: relative;
+      z-index: 1;
       transition: transform 0.3s ease-in-out;
       background: $indicator-color;
+      border: $indicator-dot-border;
+      transform: translateX(
+        calc(
+          var(--nutui-indicator-current, 0) /
+            (var(--nutui-indicator-total, 2) - 1) *
+            (#{$indicator-track-width} - #{$indicator-slider-width})
+        )
+      );
     }
   }
+
+  // 定位布局
+  &-outside {
+    margin-top: $indicator-placement-gap;
+    margin-bottom: $indicator-placement-safe-gap;
+    justify-content: center;
+  }
+
+  &-inside-top-right {
+    position: absolute;
+    top: $indicator-placement-gap;
+    right: $indicator-placement-gap;
+  }
+
+  &-inside-bottom-center {
+    position: absolute;
+    bottom: $indicator-placement-gap;
+    left: 50%;
+    transform: translateX(-50%);
+  }
+
+  &-inside-bottom-left {
+    position: absolute;
+    bottom: $indicator-placement-gap;
+    left: $indicator-placement-gap;
+  }
 }
 
 .nut-indicator-track {
@@ -100,8 +130,8 @@
     height: 100%;
     box-sizing: border-box;
     border-radius: $indicator-border-radius;
-    background-color: $color-border-disabled;
-    opacity: 0.4;
+    background-color: $indicator-dot-inactive-color;
+    border: $indicator-dot-border;
   }
 }
 
@@ -110,11 +140,8 @@
     &-dot,
     &-line {
       position: relative;
-      /* #ifndef dynamic*/
-      box-sizing: content-box;
-      /* #endif */
-      background: rgba(255, 255, 255, 0.4);
-      opacity: 1;
+      background: $color-primary-text;
+      opacity: 0.4;
     }
 
     &-line {
@@ -122,13 +149,14 @@
 
       &-active {
         opacity: 1;
-        background: rgba(255, 255, 255, 1);
+        background: $color-primary-text;
       }
     }
 
     &-dot {
       &-active {
-        background: rgba(255, 255, 255, 1);
+        background: $color-primary-text;
+        opacity: 1;
       }
     }
   }
@@ -136,8 +164,8 @@
 
 .nut-indicator-track.nut-indicator-white {
   &:after {
-    border: scale-px(1px) solid rgba(0, 0, 0, 0.06);
-    background: rgba(255, 255, 255, 0.4);
+    background: $color-primary-text;
+    opacity: 0.4;
   }
 }
 
@@ -167,7 +195,17 @@
     .nut-indicator {
       &-line {
         width: $indicator-dot-size;
-        height: $indicator-dot-active-size;
+        height: $indicator-slider-width;
+
+        &-active {
+          transform: translateY(
+            calc(
+              var(--nutui-indicator-current, 0) /
+                (var(--nutui-indicator-total, 2) - 1) *
+                (#{$indicator-track-width} - #{$indicator-slider-width})
+            )
+          );
+        }
       }
     }
   }
@@ -181,4 +219,14 @@
       margin-left: 0;
     }
   }
+
+  &-inside-top-right {
+    right: auto;
+    left: $indicator-placement-gap;
+  }
+
+  &-inside-bottom-left {
+    left: auto;
+    right: $indicator-placement-gap;
+  }
 }