Merge branch '2.x' into dev

packages/vant-cli/src/compiler/compile-package.ts

@@ -6,8 +6,8 @@ export async function compilePackage(isMinify: boolean) {
     const config = getPackageConfig(isMinify);
 
     webpack(config, (err, stats) => {
-      if (err || (stats && stats.hasErrors())) {
-        reject();
+      if (err || (stats?.hasErrors())) {
+        reject(err || stats?.toString());
       } else {
         resolve();
       }

src/cascader/README.md

@@ -15,10 +15,10 @@ Vue.use(Cascader);
 
 ```html
 <van-field
+  v-model="fieldValue"
   is-link
   readonly
   label="Area"
-  :value="fieldValue"
   placeholder="Select Area"
   @click="show = true"
 />
@@ -78,10 +78,10 @@ export default {
 
 ```html
 <van-field
+  v-model="fieldValue"
   is-link
   readonly
   label="Area"
-  :value="fieldValue"
   placeholder="Select Area"
   @click="show = true"
 />

src/cascader/README.zh-CN.md

@@ -21,17 +21,17 @@ Vue.use(Cascader);
 
 ```html
 <van-field
+  v-model="fieldValue"
   is-link
   readonly
   label="地区"
-  :value="fieldValue"
-  placeholder="请选择地区"
+  placeholder="请选择所在地区"
   @click="show = true"
 />
 <van-popup v-model:show="show" round position="bottom">
   <van-cascader
     v-model="cascaderValue"
-    title="请选择地区"
+    title="请选择所在地区"
     @close="show = false"
     @finish="onFinish"
   />
@@ -77,7 +77,7 @@ export default {
 ```html
 <van-cascader
   v-model="cascaderValue"
-  title="请选择地区"
+  title="请选择所在地区"
   active-color="#1989fa"
   @close="show = false"
   @finish="onFinish"
@@ -90,17 +90,17 @@ export default {
 
 ```html
 <van-field
+  v-model="fieldValue"
   is-link
   readonly
   label="地区"
-  :value="fieldValue"
-  placeholder="请选择地区"
+  placeholder="请选择所在地区"
   @click="show = true"
 />
 <van-popup v-model:show="show" round position="bottom">
   <van-cascader
     v-model="cascaderValue"
-    title="请选择地区"
+    title="请选择所在地区"
     @close="show = false"
     @change="onChange"
     @finish="onFinish"

src/cascader/index.less

@@ -17,7 +17,7 @@
 
   &__close-icon {
     color: @cascader-close-icon-color;
-    font-size: @cascader-close-icon-color;
+    font-size: @cascader-close-icon-size;
 
     &:active {
       color: @cascader-close-icon-active-color;
@@ -32,7 +32,11 @@
 
     &.van-tabs--line .van-tabs__wrap {
       height: @cascader-tabs-height;
-      padding: 0 6px;
+    }
+
+    .van-tabs__nav--complete {
+      padding-right: 6px;
+      padding-left: 6px;
     }
   }
 
@@ -42,6 +46,7 @@
 
     &--unselected {
       color: @cascader-unselected-tab-color;
+      font-weight: normal;
     }
   }
 
@@ -59,6 +64,7 @@
 
     &--selected {
       color: @cascader-active-color;
+      font-weight: @font-weight-bold;
     }
   }
 

src/tabs/index.less

@@ -62,11 +62,6 @@
         &::-webkit-scrollbar {
           display: none;
         }
-
-        &--complete {
-          padding-right: 8px;
-          padding-left: 8px;
-        }
       }
     }
   }
@@ -83,6 +78,11 @@
       padding-bottom: 15px; /* 15px padding to hide scrollbar in mobile safari */
     }
 
+    &--complete {
+      padding-right: @padding-xs;
+      padding-left: @padding-xs;
+    }
+
     &--card {
       box-sizing: border-box;
       height: @tabs-card-height;