Merge branch 'next' of https://github.com/jdf2e/nutui into next

src/packages/tab/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <div :class="[direction === 'vertical' ? 'vertical-tab' : 'nutui-tab']">
-    <div class="tab-title" ref="navlist">
-      <div
+  <view :class="[direction === 'vertical' ? 'vertical-tab' : 'nutui-tab']">
+    <view class="tab-title" ref="navlist">
+      <view
         :class="['tab-title-box', { 'nut-tab-active': activeIndex == index }]"
         v-for="(item, index) in titles"
         :key="index"
@@ -9,15 +9,15 @@
       >
         {{ item.title }}
         <TabTitle v-bind:slots="item.content" v-if="item.content"></TabTitle>
-      </div>
-      <div class="underline"></div>
-    </div>
-    <div :class="['nutui-tab-swiper', swiperClassName]">
-      <div :class="['swiper-wrapper', { 'swiper-no-swiping': noSwiping }]">
+      </view>
+      <view class="underline"></view>
+    </view>
+    <view :class="['nutui-tab-swiper', swiperClassName]">
+      <view :class="['swiper-wrapper', { 'swiper-no-swiping': noSwiping }]">
         <slot></slot>
-      </div>
-    </div>
-  </div>
+      </view>
+    </view>
+  </view>
 </template>
 <script lang="ts">
 import { PropType, reactive, ref, onMounted, watch, VNode } from 'vue';
@@ -26,7 +26,7 @@ const { create } = createComponent('tab');
 import TabTitle from './tabTitle';
 import Swiper from 'swiper';
 import 'swiper/dist/css/swiper.min.css';
-import { extend } from '@vue/shared';
+// import { extend } from '@vue/shared';
 type TabDirection = 'horizontal' | 'vertical';
 
 interface DataTitle {
@@ -34,6 +34,10 @@ interface DataTitle {
   content?: VNode[];
 }
 
+type currChild = {
+  header: Function;
+} & VNode[];
+
 export default create({
   props: {
     defaultIndex: {
@@ -139,10 +143,8 @@ export default create({
                   ? item.props['tab-title']
                   : '',
               content:
-                //@ts-ignore：已经做了header是否存在的判断
-                item && item?.children?.header
-                  ? //@ts-ignore：已经做了header是否存在的判断
-                    (item.children as VNode[]).header()
+                item.children && (item.children as currChild).header
+                  ? (item.children as currChild).header()
                   : null
             });
           });

src/packages/uploader/index.scss

@@ -5,7 +5,7 @@
 
   .upload {
     position: relative;
-    background: $uploader-babackground;
+    background: $uploader-background;
     width: $uploader-width;
     height: $uploader-height;
     display: flex;

src/styles/variables.scss

@@ -101,7 +101,7 @@ $icon-line-height: 20px;
 
 $uploader-width: 100px;
 $uploader-height: 100px;
-$uploader-babackground: #f7f8fa;
+$uploader-background: #f7f8fa;
 
 // inputnumber