Merge branch 'dev' into next

README.md

@@ -7,7 +7,7 @@
 <p align="center">Mobile UI Components built on Vue</p>
 
 <p align="center">
-    <img src="https://img.shields.io/npm/v/vant/next?style=flat-square" alt="npm version" />
+    <img src="https://img.shields.io/npm/v/vant?style=flat-square" alt="npm version" />
     <img src="https://img.shields.io/github/workflow/status/youzan/vant/CI/dev?style=flat-square" alt="CI Status" />
     <img src="https://img.shields.io/codecov/c/github/youzan/vant/dev.svg?style=flat-square&color=#4fc08d" alt="Coverage Status" />
     <img src="https://img.shields.io/npm/dm/vant.svg?style=flat-square&color=#4fc08d" alt="downloads" />

README.zh-CN.md

@@ -7,7 +7,7 @@
 <p align="center">轻量、可靠的移动端 Vue 组件库</p>
 
 <p align="center">
-    <img src="https://img.shields.io/npm/v/vant/next?style=flat-square" alt="npm version" />
+    <img src="https://img.shields.io/npm/v/vant?style=flat-square" alt="npm version" />
     <img src="https://img.shields.io/github/workflow/status/youzan/vant/CI/dev?style=flat-square" alt="CI Status" />
     <img src="https://img.shields.io/codecov/c/github/youzan/vant/dev.svg?style=flat-square&color=#4fc08d" alt="Coverage Status" />
     <img src="https://img.shields.io/npm/dm/vant.svg?style=flat-square&color=#4fc08d" alt="downloads" />

packages/vant-cli/site/desktop/components/Header.vue

@@ -4,7 +4,10 @@
       <div class="van-doc-header__top">
         <a class="van-doc-header__logo">
           <img :src="config.logo" />
-          <span>{{ config.title }}</span>
+          <span class="van-doc-header__title">{{ config.title }}</span>
+          <span v-if="config.subtitle" class="van-doc-header__subtitle">
+            {{ config.subtitle }}
+          </span>
         </a>
 
         <ul class="van-doc-header__top-nav">
@@ -275,21 +278,27 @@ export default {
   &__logo {
     display: block;
 
-    img,
+    img {
-    span {
       display: inline-block;
+      width: 28px;
+      margin-right: 12px;
+      vertical-align: middle;
+    }
+  }
+
+  &__title {
+    display: inline-block;
+    color: #fff;
+    font-size: 22px;
     vertical-align: middle;
   }
 
-    img {
+  &__subtitle {
-      width: 28px;
+    display: inline-block;
-      margin-right: 12px;
+    color: #999;
-    }
+    margin-left: 8px;
-
+    vertical-align: -4px;
-    span {
+    font-size: 13px;
-      color: #fff;
-      font-size: 22px;
-    }
   }
 
   &__link {

packages/vant/docs/markdown/changelog.en-US.md

@@ -20,7 +20,7 @@ Vant follows [Semantic Versioning 2.0.0](https://semver.org/lang/zh-CN/).
 
 `2022-02-07`
 
-- Vant 3 对应的 npm tag 切换为 `latest`
+- switch default npm tag to `latest`
 
 ### [v3.4.3](https://github.com/compare/v3.4.2...v3.4.3)
 

packages/vant/docs/markdown/changelog.zh-CN.md

@@ -20,7 +20,7 @@ Vant 遵循 [Semver](https://semver.org/lang/zh-CN/) 语义化版本规范。
 
 `2022-02-07`
 
-- switch default npm tag to `latest`
+- Vant 3 对应的 npm tag 切换为 `latest`
 
 ### [v3.4.3](https://github.com/compare/v3.4.2...v3.4.3)
 

packages/vant/src/collapse-item/CollapseItem.tsx

@@ -35,6 +35,7 @@ const collapseItemProps = extend({}, cellSharedProps, {
   isLink: truthProp,
   disabled: Boolean,
   readonly: Boolean,
+  lazyRender: truthProp,
 });
 
 export type CollapseItemProps = ExtractPropTypes<typeof collapseItemProps>;
@@ -62,7 +63,7 @@ export default defineComponent({
     const expanded = computed(() => parent.isExpanded(name.value));
 
     const show = ref(expanded.value);
-    const lazyRender = useLazyRender(show);
+    const lazyRender = useLazyRender(() => show.value || !props.lazyRender);
 
     const onTransitionEnd = () => {
       if (!expanded.value) {

packages/vant/src/collapse/README.md

@@ -138,6 +138,7 @@ export default {
 | disabled | Whether to disabled collapse | _boolean_ | `false` |
 | readonly `v3.0.12` | Whether to be readonly | _boolean_ | `false` |
 | is-link | Whether to show link icon | _boolean_ | `true` |
+| lazy-render `v3.4.5` | Whether to lazy render util opened | _boolean_ | `true` |
 | title-class | Title className | _string_ | - |
 | value-class | Value className | _string_ | - |
 | label-class | Label className | _string_ | - |

packages/vant/src/collapse/README.zh-CN.md

@@ -154,6 +154,7 @@ export default {
 | is-link | 是否展示标题栏右侧箭头并开启点击反馈 | _boolean_ | `true` |
 | disabled | 是否禁用面板 | _boolean_ | `false` |
 | readonly `v3.0.12` | 是否为只读状态，只读状态下无法操作面板 | _boolean_ | `false` |
+| lazy-render `v3.4.5` | 是否在首次展开时才渲染面板内容 | _boolean_ | `true` |
 | title-class | 左侧标题额外类名 | _string_ | - |
 | value-class | 右侧内容额外类名 | _string_ | - |
 | label-class | 描述信息额外类名 | _string_ | - |

packages/vant/src/toast/Toast.tsx

@@ -33,6 +33,7 @@ const [name, bem] = createNamespace('toast');
 const popupInheritProps = [
   'show',
   'overlay',
+  'teleport',
   'transition',
   'overlayClass',
   'overlayStyle',

packages/vant/vant.config.mjs

@@ -28,7 +28,8 @@ export default {
     },
     locales: {
       'zh-CN': {
-        title: 'Vant',
+        title: 'Vant 3',
+        subtitle: '（适用于 Vue 3）',
         description: '轻量、可靠的移动端组件库',
         logo: 'https://img.yzcdn.cn/vant/logo.png',
         langLabel: '中',
@@ -469,7 +470,8 @@ export default {
         ],
       },
       'en-US': {
-        title: 'Vant',
+        title: 'Vant 3',
+        subtitle: ' (for Vue 3)',
         description: 'Mobile UI Components built on Vue',
         logo: 'https://img.yzcdn.cn/vant/logo.png',
         langLabel: 'EN',