Merge branch '2.x' into dev

2020-11-22 16:06:24 +08:00
parent 2484329bf9 a77c620628
commit 8ce14496f5
123 changed files with 2400 additions and 95 deletions
@@ -123,9 +123,7 @@ export default {
  <van-swipe-item>3</van-swipe-item>
  <van-swipe-item>4</van-swipe-item>
  <template #indicator>
-    <div class="custom-indicator">
-      {{ current + 1 }}/4
-    </div>
+    <div class="custom-indicator">{{ current + 1 }}/4</div>
  </template>
 </van-swipe>

@@ -210,3 +208,16 @@ Use [ref](https://v3.vuejs.org/guide/component-template-refs.html) to get Swipe
 | --------- | ---------------- |
 | default   | Content          |
 | indicator | Custom indicator |
+
+### Less Variables
+
+How to use: [Custom Theme](#/en-US/theme).
+
+| Name                                       | Default Value   | Description |
+| ------------------------------------------ | --------------- | ----------- |
+| @swipe-indicator-size                      | `6px`           | -           |
+| @swipe-indicator-margin                    | `@padding-sm`   | -           |
+| @swipe-indicator-active-opacity            | `1`             | -           |
+| @swipe-indicator-inactive-opacity          | `0.3`           | -           |
+| @swipe-indicator-active-background-color   | `@blue`         | -           |
+| @swipe-indicator-inactive-background-color | `@border-color` | -           |
@@ -133,9 +133,7 @@ export default {
  <van-swipe-item>3</van-swipe-item>
  <van-swipe-item>4</van-swipe-item>
  <template #indicator>
-    <div class="custom-indicator">
-      {{ current + 1 }}/4
-    </div>
+    <div class="custom-indicator">{{ current + 1 }}/4</div>
  </template>
 </van-swipe>

@@ -221,6 +219,19 @@ export default {
 | default   | 轮播内容     |
 | indicator | 自定义指示器 |

+### 样式变量
+
+组件提供了下列 Less 变量，可用于自定义样式，使用方法请参考[主题定制](#/zh-CN/theme)。
+
+| 名称                                       | 默认值          | 描述 |
+| ------------------------------------------ | --------------- | ---- |
+| @swipe-indicator-size                      | `6px`           | -    |
+| @swipe-indicator-margin                    | `@padding-sm`   | -    |
+| @swipe-indicator-active-opacity            | `1`             | -    |
+| @swipe-indicator-inactive-opacity          | `0.3`           | -    |
+| @swipe-indicator-active-background-color   | `@blue`         | -    |
+| @swipe-indicator-inactive-background-color | `@border-color` | -    |
+
 ## 常见问题

 ### 滑动轮播时为什么触发了 click 事件？