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

demo.html

@@ -4,10 +4,7 @@
     <meta charset="utf-8" />
     <meta content="telephone=no" name="format-detection" />
     <link rel="shortcut icon" href="https://img14.360buyimg.com/imagetools/jfs/t1/167902/2/8762/791358/603742d7E9b4275e3/e09d8f9a8bf4c0ef.png" />
-    <meta
-      content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
-      name="viewport"
-    />
+    <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=0, viewport-fit=cover">
     <title>NutUI - 移动端 Vue2、Vue3、小程序 组件库</title>
     <meta http-equiv="Cache-Control" content="no-cache" />
     <meta http-equiv="Pragma" content="no-cache" />

index.html

@@ -4,10 +4,8 @@
     <meta charset="utf-8" />
     <meta content="telephone=no" name="format-detection" />
     <link rel="shortcut icon" href="https://img14.360buyimg.com/imagetools/jfs/t1/167902/2/8762/791358/603742d7E9b4275e3/e09d8f9a8bf4c0ef.png" />
-    <meta
-      content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
-      name="viewport"
-    />
+    <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=0, viewport-fit=cover">
+    
     <title>NutUI - 移动端 Vue2、Vue3、小程序 组件库</title>
     <meta name="keywords" content="Vue3组件库,移动端组件库,Vite,Vue组件库,Vue3,Vue2" />
     <meta name="description" content="京东风格的轻量级移动端 Vue 组件库" />

package.json

@@ -46,8 +46,7 @@
     "upload": "yarn build:site:oss && node ./jd/upload.js",
     "add": "node jd/createComponentMode.js",
     "publish:beta": "npm publish --tag=beta",
-    "publish:next": "npm publish --tag=next",
-    "publish:taro": "npm publish",
+    "publish": "npm publish",
     "generate:file": "node jd/generate-nutui.js",
     "generate:file:taro:vue": "node jd/generate-nutui-taro-vue.js",
     "generate:types": "node jd/generate-types.js",
@@ -64,24 +63,23 @@
     }
   },
   "dependencies": {
-    "@tarojs/cli": "^3.4.0",
     "sass": "~1.32.0",
-    "vue-router": "^4.0.11"
+    "vue-router": "^4.0.12"
   },
   "devDependencies": {
     "@commitlint/cli": "^10.0.0",
     "@commitlint/config-conventional": "^10.0.0",
     "@tarojs/taro": "^3.4.0",
     "@types/jest": "^26.0.22",
-    "@types/node": "^14.14.31",
+    "@types/node": "^17.0.16",
     "@typescript-eslint/eslint-plugin": "^4.20.0",
     "@typescript-eslint/parser": "^4.20.0",
-    "@vitejs/plugin-legacy": "^1.4.0",
-    "@vitejs/plugin-vue": "^1.2.2",
-    "@vue/compiler-sfc": "^3.0.11",
+    "@vitejs/plugin-legacy": "^1.6.4",
+    "@vitejs/plugin-vue": "^2.1.0",
+    "@vue/compiler-sfc": "^3.2.30",
     "@vue/eslint-config-prettier": "^6.0.0",
     "@vue/eslint-config-typescript": "^7.0.0",
-    "@vue/test-utils": "^2.0.0-rc.17",
+    "@vue/test-utils": "^2.0.0-rc.18",
     "autoprefixer": "^10.3.4",
     "axios": "^0.21.0",
     "eslint": "^7.23.2",
@@ -102,9 +100,9 @@
     "transliteration": "^2.2.0",
     "ts-jest": "^26.5.5",
     "typescript": "^4.1.5",
-    "vite": "^2.3.4",
-    "vite-plugin-md": "^0.11.0",
-    "vue": "^3.2.19",
+    "vite": "^2.7.13",
+    "vite-plugin-md": "^0.11.8",
+    "vue": "^3.2.30",
     "vue-jest": "^5.0.0-alpha.7"
   },
   "eslintConfig": {

src/packages/__VUE/address/index.vue

@@ -308,7 +308,7 @@ export default create({
     };
     // 移动下面的红线
     const lineAnimation = () => {
-      console.log('滑动红线');
+      // console.log('滑动红线');
 
       nextTick(() => {
         const name = tabRegion.value && tabRegion.value.getElementsByClassName('active')[0];

src/packages/__VUE/card/index.vue

@@ -67,7 +67,7 @@ export default create({
   },
 
   setup(props, { emit, slots }) {
-    console.log(slots['origin']);
+    // console.log(slots['origin']);
 
     const isHaveSlot = (slot: string) => {
       return slots[slot];

src/packages/__VUE/circleprogress/doc.md

@@ -1,4 +1,4 @@
-# CricleProgress 进度条
+# CircleProgress 进度条
 
 ### 介绍
 
@@ -9,12 +9,12 @@
 ``` javascript
 import { createApp } from 'vue';
 //vue
-import { CirecleProgress } from '@nutui/nutui';
+import { CircleProgress } from '@nutui/nutui';
 //taro
-import { CirecleProgress } from '@nutui/nutui-taro';
+import { CircleProgress } from '@nutui/nutui-taro';
 
 const app = createApp();
-app.use(CirecleProgress);
+app.use(CircleProgress);
 
 ```
 

src/packages/__VUE/countdown/index.taro.vue

@@ -12,10 +12,8 @@
         <view class="nut-cd-dot">天</view>
       </template>
       <view class="nut-cd-block">{{ resttime.h }}</view
-      ><view class="nut-cd-dot">:</view
-      ><view class="nut-cd-block">{{ resttime.m }}</view
-      ><view class="nut-cd-dot">:</view
-      ><view class="nut-cd-block">{{ resttime.s }}</view>
+      ><view class="nut-cd-dot">:</view><view class="nut-cd-block">{{ resttime.m }}</view
+      ><view class="nut-cd-dot">:</view><view class="nut-cd-block">{{ resttime.s }}</view>
     </template>
   </view>
 </template>
@@ -76,7 +74,7 @@ export default create({
   emits: ['input', 'on-end', 'on-restart', 'on-paused'],
 
   setup(props, { emit, slots }) {
-    console.log('componentName', componentName);
+    // console.log('componentName', componentName);
 
     const state = reactive({
       restTime: 0,
@@ -209,10 +207,7 @@ export default create({
 
         const d = ts >= ds ? parseInt(ts / ds) : 0;
         const h = ts - d * ds >= hs ? parseInt((ts - d * ds) / hs) : 0;
-        const m =
-          ts - d * ds - h * hs >= ms
-            ? parseInt((ts - d * ds - h * hs) / ms)
-            : 0;
+        const m = ts - d * ds - h * hs >= ms ? parseInt((ts - d * ds - h * hs) / ms) : 0;
         const s = Math.round((ts - d * ds - h * hs - m * ms) / 1000);
 
         if (d >= 0) rest.d = d + '';

src/packages/__VUE/datepicker/index.vue

@@ -250,7 +250,7 @@ export default create({
     };
 
     const columns = computed(() => {
-      console.log(ranges.value);
+      // console.log(ranges.value);
       const val = ranges.value.map((res) => {
         return generateValue(res.range[0], res.range[1], getDateIndex(res.type), res.type);
       });

src/packages/__VUE/drag/index.taro.vue

@@ -17,14 +17,7 @@
 </template>
 
 <script lang="ts">
-import {
-  onMounted,
-  onDeactivated,
-  onActivated,
-  reactive,
-  ref,
-  computed
-} from 'vue';
+import { onMounted, onDeactivated, onActivated, reactive, ref, computed } from 'vue';
 import { createComponent } from '../../utils/create';
 import requestAniFrame from '../../utils/raf';
 const { componentName, create } = createComponent('drag');
@@ -94,7 +87,7 @@ export default create({
           state.initTop = rec.top;
         })
         .exec();
-      console.log(domElem.windowWidth);
+      // console.log(domElem.windowWidth);
 
       state.screenWidth = domElem.screenWidth;
       state.screenHeight = domElem.screenHeight;
@@ -142,8 +135,7 @@ export default create({
         state.xPum = state.startLeft + state.nx;
         state.yPum = state.startTop + state.ny;
 
-        const rightLocation =
-          state.screenWidth - state.elWidth - state.boundary.right;
+        const rightLocation = state.screenWidth - state.elWidth - state.boundary.right;
         if (Math.abs(state.xPum) > rightLocation) {
           state.xPum = rightLocation;
         } else if (state.xPum <= state.boundary.left) {
@@ -151,12 +143,8 @@ export default create({
         }
         if (state.yPum < state.boundary.top) {
           state.yPum = state.boundary.top;
-        } else if (
-          state.yPum >
-          state.screenHeight - state.elHeight - state.boundary.bottom
-        ) {
-          state.yPum =
-            state.screenHeight - state.elHeight - state.boundary.bottom;
+        } else if (state.yPum > state.screenHeight - state.elHeight - state.boundary.bottom) {
+          state.yPum = state.screenHeight - state.elHeight - state.boundary.bottom;
         }
 
         if (props.direction != 'y') {
@@ -172,15 +160,13 @@ export default create({
 
       const touch = e.changedTouches[0];
       let currX = touch.clientX;
-      const rightLocation =
-        state.screenWidth - state.elWidth - state.boundary.right;
+      const rightLocation = state.screenWidth - state.elWidth - state.boundary.right;
       if (currX > rightLocation) {
         currX = rightLocation;
       } else if (currX < state.boundary.left) {
         currX = state.boundary.left;
       } else {
-        currX =
-          currX < state.screenWidth / 2 ? state.boundary.left : rightLocation;
+        currX = currX < state.screenWidth / 2 ? state.boundary.left : rightLocation;
       }
       if (props.direction != 'y' && props.attract) {
         if (currX < state.screenWidth / 2) {

src/packages/__VUE/elevator/index.vue

@@ -134,7 +134,7 @@ export default create({
       state.touchState.y1 = firstTouch.pageY;
       state.anchorIndex = +index;
       state.currentIndex = +index;
-      console.log(state.currentIndex);
+      // console.log(state.currentIndex);
       scrollTo(+index);
     };
 

src/packages/__VUE/imagepreview/index.vue

@@ -130,7 +130,7 @@ export default create({
     };
 
     const onTouchStart = (event: any) => {
-      console.log('start');
+      // console.log('start');
       // 如果已经放大，双击应变回原尺寸；如果是原尺寸，双击应放大
       const curTouchTime = new Date().getTime();
       if (curTouchTime - state.lastTouchEndTime < 300) {
@@ -208,7 +208,7 @@ export default create({
     };
 
     const onTouchEnd = () => {
-      console.log('end');
+      // console.log('end');
       state.lastTouchEndTime = new Date().getTime();
       const store = state.store as any;
       store.moveable = false;

src/packages/__VUE/navbar/index.taro.vue

@@ -63,7 +63,7 @@ export default create({
 
     function switchTitle(id: number, name: string) {
       activeIndex.value = id;
-      console.log(id);
+      // console.log(id);
       emit('switch-tab', activeIndex.value, name);
     }
 

src/packages/__VUE/noticebar/index.taro.vue

@@ -8,26 +8,14 @@
       @click="handleClick"
       v-if="direction == 'across'"
     >
-      <view
-        class="left-icon"
-        v-if="iconShow"
-        :style="{ 'background-image': `url(${iconBg})` }"
-      >
-        <nut-icon
-          name="notice"
-          size="16"
-          :color="color"
-          v-if="!iconBg"
-        ></nut-icon>
+      <view class="left-icon" v-if="iconShow" :style="{ 'background-image': `url(${iconBg})` }">
+        <nut-icon name="notice" size="16" :color="color" v-if="!iconBg"></nut-icon>
       </view>
       <view ref="wrap" class="wrap">
         <view
           ref="content"
           class="content"
-          :class="[
-            animationClass,
-            { 'nut-ellipsis': !scrollable && !wrapable }
-          ]"
+          :class="[animationClass, { 'nut-ellipsis': !scrollable && !wrapable }]"
           :style="contentStyle"
           @animationend="onAnimationEnd"
           @webkitAnimationEnd="onAnimationEnd"
@@ -40,11 +28,7 @@
       </view>
     </view>
 
-    <view
-      class="nut-noticebar-vertical"
-      v-if="scrollList.length > 0 && direction == 'vertical'"
-      :style="barStyle"
-    >
+    <view class="nut-noticebar-vertical" v-if="scrollList.length > 0 && direction == 'vertical'" :style="barStyle">
       <template v-if="slots.default">
         <view class="horseLamp_list" :style="horseLampStyle">
           <ScrollItem
@@ -167,7 +151,7 @@ export default create({
   emits: ['click', 'close'],
 
   setup(props, { emit, slots }) {
-    console.log('componentName', componentName);
+    // console.log('componentName', componentName);
 
     const wrap = ref<null | HTMLElement>(null);
     const content = ref<null | HTMLElement>(null);
@@ -321,10 +305,7 @@ export default create({
      */
     const startRollEasy = () => {
       showhorseLamp();
-      (state.timer as any) = setInterval(
-        showhorseLamp,
-        ~~(props.height / props.speed / 4) * 1000 + props.standTime
-      );
+      (state.timer as any) = setInterval(showhorseLamp, ~~(props.height / props.speed / 4) * 1000 + props.standTime);
     };
     const showhorseLamp = () => {
       state.animate = true;
@@ -365,7 +346,7 @@ export default create({
     };
 
     onMounted(() => {
-      console.log(props.direction);
+      // console.log(props.direction);
       if (props.direction == 'vertical') {
         if (slots.default) {
           state.scrollList = [].concat(slots.default()[0].children as any);
@@ -373,7 +354,7 @@ export default create({
           state.scrollList = [].concat(props.list as any);
         }
 
-        console.log(state.scrollList);
+        // console.log(state.scrollList);
 
         setTimeout(() => {
           props.complexAm ? startRoll() : startRollEasy();

src/packages/__VUE/noticebar/index.vue

@@ -150,7 +150,7 @@ export default create({
   emits: ['click', 'close'],
 
   setup(props, { emit, slots }) {
-    console.log('componentName', componentName);
+    // console.log('componentName', componentName);
 
     const wrap = ref<null | HTMLElement>(null);
     const content = ref<null | HTMLElement>(null);
@@ -332,7 +332,7 @@ export default create({
     };
 
     onMounted(() => {
-      console.log(props.direction);
+      // console.log(props.direction);
       if (props.direction == 'vertical') {
         if (slots.default) {
           state.scrollList = [].concat(slots.default()[0].children as any);
@@ -340,7 +340,7 @@ export default create({
           state.scrollList = [].concat(props.list as any);
         }
 
-        console.log(state.scrollList);
+        // console.log(state.scrollList);
 
         setTimeout(() => {
           props.complexAm ? startRoll() : startRollEasy();

src/packages/__VUE/numberkeyboard/index.vue

@@ -110,7 +110,7 @@ export default create({
   },
   emits: ['input', 'delete', 'close', 'update:value'],
   setup(props, { emit }) {
-    console.log(props.overlay);
+    // console.log(props.overlay);
 
     const clickKeyIndex = ref(undefined);
     const show = ref(props.visible);

src/packages/__VUE/progress/index.vue

@@ -3,16 +3,10 @@
     <div
       class="nut-progress-outer"
       ref="progressOuter"
-      :class="[
-        showText && !textInside ? 'nut-progress-outer-part' : '',
-        size ? 'nut-progress-' + size : ''
-      ]"
+      :class="[showText && !textInside ? 'nut-progress-outer-part' : '', size ? 'nut-progress-' + size : '']"
       :style="{ height: height }"
     >
-      <div
-        :class="['nut-progress-inner', status == 'active' ? 'nut-active' : '']"
-        :style="bgStyle"
-      >
+      <div :class="['nut-progress-inner', status == 'active' ? 'nut-active' : '']" :style="bgStyle">
         <div
           class="nut-progress-text nut-progress-insidetext"
           :style="{ lineHeight: height, left: left }"
@@ -22,11 +16,7 @@
         </div>
       </div>
     </div>
-    <div
-      class="nut-progress-text"
-      :style="{ lineHeight: height }"
-      v-if="showText && !textInside"
-    >
+    <div class="nut-progress-text" :style="{ lineHeight: height }" v-if="showText && !textInside">
       <template v-if="status == 'active' || status == ''">
         <span :style="textStyle">{{ percentage }}%</span>
       </template>
@@ -38,15 +28,7 @@
 </template>
 
 <script lang="ts">
-import {
-  computed,
-  onMounted,
-  provide,
-  reactive,
-  nextTick,
-  ref,
-  watch
-} from 'vue';
+import { computed, onMounted, provide, reactive, nextTick, ref, watch } from 'vue';
 import { createComponent } from '../../utils/create';
 const { create } = createComponent('progress');
 export default create({
@@ -112,22 +94,18 @@ export default create({
     watch(
       () => props.percentage,
       (values) => {
-        console.log(
-          'progressOuter.value.offsetWidth',
-          progressOuter.value.offsetWidth
-        );
+        // console.log(
+        //   'progressOuter.value.offsetWidth',
+        //   progressOuter.value.offsetWidth
+        // );
 
-        console.log('values', values);
+        // console.log('values', values);
 
-        left.value =
-          progressOuter.value.offsetWidth * Number(values) * 0.01 - 5 + 'px';
+        left.value = progressOuter.value.offsetWidth * Number(values) * 0.01 - 5 + 'px';
       }
     );
     onMounted(() => {
-      left.value =
-        progressOuter.value.offsetWidth * Number(props.percentage) * 0.01 -
-        5 +
-        'px';
+      left.value = progressOuter.value.offsetWidth * Number(props.percentage) * 0.01 - 5 + 'px';
     });
     return {
       height,

src/packages/__VUE/pullrefresh/index.vue

@@ -7,24 +7,16 @@
     @touchmove="touchMove"
     @touchend="touchEnd"
   >
-    <view
-      class="pullrefresh-top"
-      :class="
-        direction == 'horizontal' ? 'pullrefresh-top-h' : 'pullrefresh-top-v'
-      "
-      >{{ refreshTopTem }}</view
-    >
+    <view class="pullrefresh-top" :class="direction == 'horizontal' ? 'pullrefresh-top-h' : 'pullrefresh-top-v'">{{
+      refreshTopTem
+    }}</view>
     <view class="pullrefresh-content" ref="pull">
       <slot></slot>
     </view>
 
     <view
       class="pullrefresh-bottom"
-      :class="
-        direction == 'horizontal'
-          ? 'pullrefresh-bottom-h'
-          : 'pullrefresh-bottom-v'
-      "
+      :class="direction == 'horizontal' ? 'pullrefresh-bottom-h' : 'pullrefresh-bottom-v'"
       :style="getBottomStyle"
       >{{ refreshBottomTem }}</view
     >
@@ -90,7 +82,7 @@ export default create({
   emits: ['refresh', 'downRefresh'], // refresh 上拉加载、右滑加载更多  downRefresh 下拉刷新、左滑刷新
 
   setup(props, { emit }) {
-    console.log('componentName', componentName);
+    // console.log('componentName', componentName);
 
     const { containerId, useWindow, direction, disabled } = toRefs(props);
 
@@ -116,28 +108,22 @@ export default create({
       const { deltaY, deltaX } = touch;
       if (
         direction.value == 'vertical' &&
-        ((reachTop.value && deltaY.value > 0) ||
-          (reachBottom.value && deltaY.value < 0)) &&
+        ((reachTop.value && deltaY.value > 0) || (reachBottom.value && deltaY.value < 0)) &&
         touch.isVertical()
       ) {
         style = {
           transitionDuration: `${state.duration}ms`,
-          transform: state.distance
-            ? `translate3d(0,${state.distance}px, 0)`
-            : `translate3d(0,0,0)`
+          transform: state.distance ? `translate3d(0,${state.distance}px, 0)` : `translate3d(0,0,0)`
         };
       }
       if (
         direction.value == 'horizontal' &&
-        ((reachLeft.value && deltaX.value > 0) ||
-          (reachRight.value && deltaX.value < 0)) &&
+        ((reachLeft.value && deltaX.value > 0) || (reachRight.value && deltaX.value < 0)) &&
         touch.isHorizontal()
       ) {
         style = {
           transitionDuration: `${state.duration}ms`,
-          transform: state.distance
-            ? `translate3d(${state.distance}px, 0,0)`
-            : `translate3d(0,0,0)`
+          transform: state.distance ? `translate3d(${state.distance}px, 0,0)` : `translate3d(0,0,0)`
         };
       }
 
@@ -146,24 +132,14 @@ export default create({
 
     const getBottomStyle = computed(() => {
       let style: CSSProperties = {};
-      if (
-        direction.value == 'vertical' &&
-        reachBottom.value &&
-        touch.deltaY.value < 0 &&
-        touch.isVertical()
-      ) {
+      if (direction.value == 'vertical' && reachBottom.value && touch.deltaY.value < 0 && touch.isVertical()) {
         const dis = Math.abs(state.distance) < 50 ? -state.distance : 50;
         style = {
           height: dis + 'px'
         };
       }
 
-      if (
-        direction.value == 'horizontal' &&
-        reachRight.value &&
-        touch.deltaX.value < 0 &&
-        touch.isVertical()
-      ) {
+      if (direction.value == 'horizontal' && reachRight.value && touch.deltaX.value < 0 && touch.isVertical()) {
         const dis = Math.abs(state.distance) < 50 ? -state.distance : 50;
         style = {
           width: dis + 'px'
@@ -177,27 +153,15 @@ export default create({
       const { status, distance } = state;
 
       const tag = direction.value == 'vertical' ? 'top' : 'left';
-      if (
-        status == 'loading' &&
-        (reachTop.value || reachLeft.value) &&
-        distance > 0
-      ) {
+      if (status == 'loading' && (reachTop.value || reachLeft.value) && distance > 0) {
         return props.loadingText[tag];
       }
 
-      if (
-        status == 'pulling' &&
-        (reachTop.value || reachLeft.value) &&
-        distance > 0
-      ) {
+      if (status == 'pulling' && (reachTop.value || reachLeft.value) && distance > 0) {
         return props.pullingText[tag];
       }
 
-      if (
-        status == 'loosing' &&
-        (reachTop.value || reachLeft.value) &&
-        distance > 0
-      ) {
+      if (status == 'loosing' && (reachTop.value || reachLeft.value) && distance > 0) {
         return props.loosingText[tag];
       }
 
@@ -208,27 +172,15 @@ export default create({
       const { status, distance } = state;
 
       const tag = direction.value == 'vertical' ? 'bottom' : 'right';
-      if (
-        status == 'loading' &&
-        (reachBottom.value || reachRight.value) &&
-        distance < 0
-      ) {
+      if (status == 'loading' && (reachBottom.value || reachRight.value) && distance < 0) {
         return props.loadingText[tag];
       }
 
-      if (
-        status == 'pulling' &&
-        (reachBottom.value || reachRight.value) &&
-        distance < 0
-      ) {
+      if (status == 'pulling' && (reachBottom.value || reachRight.value) && distance < 0) {
         return props.pullingText[tag];
       }
 
-      if (
-        status == 'loosing' &&
-        (reachBottom.value || reachRight.value) &&
-        distance < 0
-      ) {
+      if (status == 'loosing' && (reachBottom.value || reachRight.value) && distance < 0) {
         return props.loosingText[tag];
       }
 
@@ -298,8 +250,7 @@ export default create({
 
           /** 判断滚动条是否在底部*/
           const { scrollHeight, clientHeight, scrollTop } = scrollEl;
-          reachBottom.value =
-            clientHeight + scrollTop == scrollHeight ? true : false;
+          reachBottom.value = clientHeight + scrollTop == scrollHeight ? true : false;
 
           if (reachTop.value || reachBottom.value) {
             state.duration = 0;
@@ -312,8 +263,7 @@ export default create({
           reachLeft.value = Math.max(left, 0) == 0 ? true : false;
 
           /** 判断滚动条是否在右边 */
-          reachRight.value =
-            clientWidth + scrollLeft == scrollWidth ? true : false;
+          reachRight.value = clientWidth + scrollLeft == scrollWidth ? true : false;
 
           if (reachLeft.value || reachRight.value) {
             state.duration = 0;
@@ -332,8 +282,7 @@ export default create({
 
         if (
           direction.value == 'vertical' &&
-          ((reachBottom.value && deltaY.value < 0) ||
-            (reachTop.value && deltaY.value >= 0)) &&
+          ((reachBottom.value && deltaY.value < 0) || (reachTop.value && deltaY.value >= 0)) &&
           touch.isVertical()
         ) {
           preventDefault(event);
@@ -342,8 +291,7 @@ export default create({
 
         if (
           direction.value == 'horizontal' &&
-          ((reachLeft.value && deltaX.value >= 0) ||
-            (reachRight.value && deltaX.value < 0)) &&
+          ((reachLeft.value && deltaX.value >= 0) || (reachRight.value && deltaX.value < 0)) &&
           touch.isHorizontal()
         ) {
           preventDefault(event);
@@ -359,35 +307,19 @@ export default create({
         if (state.status === 'loosing') {
           let dis = 0;
 
-          if (
-            direction.value == 'vertical' &&
-            reachTop.value &&
-            deltaY.value > 0
-          ) {
+          if (direction.value == 'vertical' && reachTop.value && deltaY.value > 0) {
             dis = 50;
             emit('downRefresh', refreshDone);
           }
-          if (
-            direction.value == 'vertical' &&
-            reachBottom.value &&
-            deltaY.value < 0
-          ) {
+          if (direction.value == 'vertical' && reachBottom.value && deltaY.value < 0) {
             dis = -50;
             emit('refresh', refreshDone);
           }
-          if (
-            direction.value == 'horizontal' &&
-            reachLeft.value &&
-            deltaX.value > 0
-          ) {
+          if (direction.value == 'horizontal' && reachLeft.value && deltaX.value > 0) {
             dis = 50;
             emit('downRefresh', refreshDone);
           }
-          if (
-            direction.value == 'horizontal' &&
-            reachRight.value &&
-            deltaX.value < 0
-          ) {
+          if (direction.value == 'horizontal' && reachRight.value && deltaX.value < 0) {
             dis = -50;
             emit('refresh', refreshDone);
           }

src/packages/__VUE/shortpassword/index.taro.vue

@@ -113,7 +113,7 @@ export default create({
     }
     function focus() {
       let dom: any = '';
-      console.log(123);
+      // console.log(123);
 
       if (isWx.value) {
         setTimeout(() => {

src/packages/__VUE/shortpassword/index.vue

@@ -112,7 +112,7 @@ export default create({
       () => props.modelValue,
       (value) => {
         realInput.value = value;
-        console.log('watch', value);
+        // console.log('watch', value);
       }
     );
     function changeValue(e: Event) {

src/packages/__VUE/tabbar/index.scss

@@ -11,14 +11,16 @@
   &:last-child {
     border-right: 0;
   }
+
   &-bottom {
     position: fixed;
     bottom: 0px;
     left: 0px;
     z-index: 888;
   }
+
   &-safebottom {
-    padding-bottom: constant(safe-area-inset-bottom);
-    padding-bottom: env(safe-area-inset-bottom);
+    margin-bottom: constant(safe-area-inset-bottom);
+    margin-bottom: env(safe-area-inset-bottom);
   }
 }

src/packages/__VUE/temp/index.vue

@@ -23,7 +23,7 @@ export default create({
   emits: ['click'],
 
   setup(props, { emit }) {
-    console.log('componentName', componentName);
+    // console.log('componentName', componentName);
 
     const { name, txt } = toRefs(props);