Merge branch 'dev' into next

src/button/README.md

@@ -132,3 +132,10 @@ Vue.use(Button);
 | --- | --- | --- |
 | click | Triggered when click button and not disabled or loading | _event: Event_ |
 | touchstart | Triggered when touch start | _event: TouchEvent_ |
+
+### Slots
+
+| Name              | Description         |
+| ----------------- | ------------------- |
+| default           | Default slot        |
+| loading `v2.10.1` | Custom loading icon |

src/button/README.zh-CN.md

@@ -155,3 +155,10 @@ Vue.use(Button);
 | ---------- | ---------------------------------------- | ------------------- |
 | click      | 点击按钮，且按钮状态不为加载或禁用时触发 | _event: Event_      |
 | touchstart | 开始触摸按钮时触发                       | _event: TouchEvent_ |
+
+### Slots
+
+| 名称              | 说明           |
+| ----------------- | -------------- |
+| default           | 按钮内容       |
+| loading `v2.10.1` | 自定义加载图标 |

src/button/index.js

@@ -63,12 +63,16 @@ export default createComponent({
 
       if (this.loading) {
         Content.push(
-          <Loading
-            class={bem('loading')}
-            size={this.loadingSize}
-            type={this.loadingType}
-            color="currentColor"
-          />
+          this.$slots.loading ? (
+            this.$slots.loading()
+          ) : (
+            <Loading
+              class={bem('loading')}
+              size={this.loadingSize}
+              type={this.loadingType}
+              color="currentColor"
+            />
+          )
         );
       } else if (this.icon) {
         Content.push(

src/button/test/__snapshots__/index.spec.js.snap

@@ -7,6 +7,12 @@ exports[`icon-prefix prop 1`] = `
 </button>
 `;
 
+exports[`loading slot 1`] = `
+<button class="van-button van-button--default van-button--normal van-button--loading">
+  <div class="van-button__content">Custom Loading</div>
+</button>
+`;
+
 exports[`loading-size prop 1`] = `
 <button class="van-button van-button--default van-button--normal van-button--loading">
   <div class="van-button__content">

src/button/test/index.spec.js

@@ -93,3 +93,16 @@ test('icon-prefix prop', () => {
 
   expect(wrapper).toMatchSnapshot();
 });
+
+test('loading slot', () => {
+  const wrapper = mount(Button, {
+    propsData: {
+      loading: true,
+    },
+    scopedSlots: {
+      loading: () => 'Custom Loading',
+    },
+  });
+
+  expect(wrapper).toMatchSnapshot();
+});

src/locale/README.md

@@ -47,5 +47,6 @@ Current supported languages:
 | Spanish (Spain)          | es-ES    |
 | Japanese                 | ja-JP    |
 | Romanian                 | ro-RO    |
+| Norwegian                | nb-NO    |
 
 > View all language configs [Here](https://github.com/youzan/vant/tree/dev/src/locale/lang).

src/locale/README.zh-CN.md

@@ -47,6 +47,7 @@ Locale.add(messages);
 | 西班牙语       | es-ES  |
 | 日语           | ja-JP  |
 | 罗马尼亚语     | ro-RO  |
+| 挪威语         | nb-NO  |
 
 > 在 [这里](https://github.com/youzan/vant/tree/dev/src/locale/lang) 查看所有的 i18n 配置文件。
 

src/locale/lang/nb-NO.ts

@@ -0,0 +1,78 @@
+export default {
+    name: 'Navn',
+    tel: 'Telefon',
+    save: 'Lagre',
+    confirm: 'Bekreft',
+    cancel: 'Avbryt',
+    delete: 'Slett',
+    complete: 'Fullfør',
+    loading: 'Laster...',
+    telEmpty: 'Vennligst fyll inn telefonnummer',
+    nameEmpty: 'Vennligst fyll inn navn',
+    nameInvalid: 'Ugyldig navn',
+    confirmDelete: 'Er du sikker på at du vil slette?',
+    telInvalid: 'Ugyldig telefonnummer',
+    vanCalendar: {
+      end: 'Slutt',
+      start: 'Start',
+      title: 'Kalendar',
+      startEnd: 'Start/Slutt',
+      weekdays: ['Søn', 'Man', 'Tir', 'Ons', 'Tor', 'Fre', 'Lør'],
+      monthTitle: (year: number, month: number) => `${year}/${month}`,
+      rangePrompt: (maxRange: number) => `Maks. ${maxRange} dager`,
+    },
+    vanContactCard: {
+      addText: 'Legg til kontakt info',
+    },
+    vanContactList: {
+      addText: 'Legg til ny kontakt',
+    },
+    vanPagination: {
+      prev: 'Forrige',
+      next: 'Neste',
+    },
+    vanPullRefresh: {
+      pulling: 'Dra for oppdatering...',
+      loosing: 'Mist for oppdatering...',
+    },
+    vanSubmitBar: {
+      label: 'Totalt：',
+    },
+    vanCoupon: {
+      unlimited: 'Uendelig',
+      discount: (discount: number) => `${discount * 10}% avslag`,
+      condition: (condition: number) => `Minst ${condition}`,
+    },
+    vanCouponCell: {
+      title: 'Kupong',
+      tips: 'Ingen kuponger',
+      count: (count: number) => `Du har ${count} kuponger`,
+    },
+    vanCouponList: {
+      empty: 'Ingen kuponger',
+      exchange: 'Bytte',
+      close: 'Lukk',
+      enable: 'Tilgjengelig',
+      disabled: 'Utilgjengelig',
+      placeholder: 'Kupong kode',
+    },
+    vanAddressEdit: {
+      area: 'Område',
+      postal: 'Postkode',
+      areaEmpty: 'Vennligst fyll inn område',
+      addressEmpty: 'Addresse kan ikke være tomt',
+      postalEmpty: 'Feil postkode',
+      defaultAddress: 'Sett som standard adresse',
+      telPlaceholder: 'Telefon',
+      namePlaceholder: 'Navn',
+      areaPlaceholder: 'Område',
+    },
+    vanAddressEditDetail: {
+      label: 'Adresse',
+      placeholder: 'Adresse',
+    },
+    vanAddressList: {
+      add: 'Legg til ny adresse',
+    },
+  };
+  

src/share-sheet/README.zh-CN.md

@@ -159,7 +159,7 @@ export default {
 | v-model:show | 是否显示分享面板 | _boolean_ | `false` |
 | options | 分享选项 | _Option[]_ | `[]` |
 | title | 顶部标题 | _string_ | - |
-| cancel-text | 取消按钮文字 | _string_ | `'取消'` |
+| cancel-text | 取消按钮文字，传入空字符串可以隐藏按钮 | _string_ | `'取消'` |
 | description | 标题下方的辅助描述文字 | _string_ | - |
 | duration | 动画时长，单位秒 | _number \| string_ | `0.3` |
 | overlay | 是否显示遮罩层 | _boolean_ | `true` |