Merge branch 'dev' into next

2020-08-15 07:28:06 +08:00
parent 2172cce8b6 272a89423e
commit 472f266c2c
11 changed files with 75 additions and 67 deletions
@@ -14,7 +14,7 @@ exports[`render icon-slot 1`] = `
  <div class="van-grid-item" style="flex-basis: 25%;">
    <div class="van-grid-item__content van-grid-item__content--center van-hairline">
      <div class="van-grid-item__icon-wrapper">
-        <div></div>
+        <div>Custom Icon</div>
        <div class="van-info">1</div>
      </div>
    </div>
@@ -50,7 +50,9 @@ test('render icon-slot', () => {
    template: `
      <van-grid icon-size="10">
        <van-grid-item info="1">
-          <div slot="icon" />
+          <template #icon>
+            <div>Custom Icon</div>
+          </template>
        </van-grid-item>
      </van-grid>
    `,