Merge branch 'jdf2e:next' into next

src/packages/__VUE/cell/index.vue

@@ -35,7 +35,7 @@
 <script lang="ts">
 import { computed } from 'vue';
 import { createComponent } from '@/packages/utils/create';
-import { useRouter } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import CellGroup from '@/packages/__VUE/cellgroup/index.vue';
 const { componentName, create } = createComponent('cell');
 export default create({
@@ -66,8 +66,14 @@ export default create({
     const router = useRouter();
     const handleClick = (event: Event) => {
       emit('click', event);
+
       if (props.to && router) {
         router[props.replace ? 'replace' : 'push'](props.to);
+        // if(props.replace){
+        //   router.replace(props.to)
+        // }else{
+        //    router.push(props.to)
+        // }
       } else if (props.url) {
         props.replace
           ? location.replace(props.url)

src/packages/__VUE/navbar/index.vue

@@ -61,7 +61,6 @@
 <script lang="ts">
 import { computed, ref } from 'vue';
 import { createComponent } from '@/packages/utils/create';
-import { useRouter } from 'vue-router';
 const { componentName, create } = createComponent('navbar');
 export default create({
   props: {
@@ -104,7 +103,6 @@ export default create({
         [prefixCls]: true
       };
     });
-    const router = useRouter();
 
     function switchTitle(id: number, name: string) {
       activeIndex.value = id;

src/packages/__VUE/switch/index.vue

@@ -1,12 +1,12 @@
 <template>
   <view :class="classes" @click="onClick" :style="style">
     <view class="switch-button">
-      <view v-show="!isOpen" class="close-line"></view>
+      <view v-show="!modelValue" class="close-line"></view>
       <template v-if="activeText">
-        <view class="nut-switch-label open" v-show="isOpen">{{
+        <view class="nut-switch-label open" v-show="modelValue">{{
           activeText
         }}</view>
-        <view class="nut-switch-label close" v-show="!isOpen">{{
+        <view class="nut-switch-label close" v-show="!modelValue">{{
           inactiveText
         }}</view>
       </template>
@@ -25,10 +25,6 @@ export default create({
       type: Boolean,
       default: false
     },
-    checked: {
-      type: Boolean,
-      default: true
-    },
     disable: {
       type: Boolean,
       default: false

src/packages/__VUE/textarea/__tests__/textarea.spec.ts

@@ -3,7 +3,7 @@ import { mount } from '@vue/test-utils';
 import Textarea from '../index.vue';
 
 test('Textarea base', () => {
-  const wrapper = mount(Textarea);
+  //const wrapper = mount(Textarea);
   // const input = wrapper.find('input');
   // expect(input.exists()).toBe(true);
   // expect(input.element.value).toBe("3");