Browse Source

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

yangjinjun3 2 years ago
parent
commit
cf123e188e

+ 25 - 13
src/packages/__VUE/range/doc.en-US.md

@@ -282,9 +282,12 @@ export default {
 .vertical_div {
   height: 180px;
   padding: 10px;
-  .div {
-    width: 150px;
-  }
+}
+.div {
+  width: 150px;
+}
+.cell {
+  padding: 40px 18px;
 }
 </style>
 <template>
@@ -308,8 +311,9 @@ export default {
     const value11 = ref([20,80]);
     const onChange = (value) => showToast.text('value:' + value);
     return {
-      value,
-      onChange,
+      value10,
+      value11,
+      onChange
     };
   },
 };
@@ -324,9 +328,12 @@ export default {
 .vertical_div {
   height: 180px;
   padding: 10px;
-  .div {
-    width: 150px;
-  }
+} 
+.div {
+  width: 150px;
+}
+.cell {
+  padding: 40px 18px;
 }
 </style>
 <template>
@@ -356,13 +363,17 @@ export default {
 </template>
 
 <script lang="ts">
-import { ref } from 'vue';
+import { ref,reactive,toRefs } from 'vue';
 import { showToast } from '@nutui/nutui';
 import '@nutui/nutui/dist/packages/toast/style'; 
 export default {
   setup() {
-    const value12 = ref(20);
-    const value13 = ref([20,80]);
+    const state = reactive({
+      value12: 60,
+      value13: [20, 80],
+      value14: 60,
+      value15: [20, 80],
+    })
     const marks=ref({
       0: 0,
       20: 20,
@@ -371,9 +382,10 @@ export default {
       80: 80,
       100: 100
     });
-    const onChange = (value) => showToast.text('value:' + value);
+    const onChange = (value) => showToast.text('当前值:' + value);
     return {
-      value,
+      ...toRefs(state),
+      marks,
       onChange,
     };
   },

+ 26 - 13
src/packages/__VUE/range/doc.md

@@ -285,13 +285,17 @@ export default {
 .vertical_div {
   height: 180px;
   padding: 10px;
-  .div {
-    width: 150px;
-  }
+  
+}
+.div {
+  width: 150px;
+}
+.cell {
+  padding: 40px 18px;
 }
 </style>
 <template>
-  <nut-cell class="vertical_div">
+  <nut-cell class="vertical_div cell">
     <div class="div">
       <nut-range v-model="value10" @change="onChange" :vertical="true"></nut-range>
     </div>
@@ -311,7 +315,8 @@ export default {
     const value11 = ref([20,80]);
     const onChange = (value) => showToast.text('当前值:' + value);
     return {
-      value,
+      value10,
+      value11,
       onChange,
     };
   },
@@ -326,9 +331,12 @@ export default {
 .vertical_div {
   height: 180px;
   padding: 10px;
-  .div {
-    width: 150px;
-  }
+} 
+.div {
+  width: 150px;
+}
+.cell {
+  padding: 40px 18px;
 }
 </style>
 <template>
@@ -339,7 +347,7 @@ export default {
     <nut-cell class="cell">
       <nut-range range v-model="value13" @change="onChange" :marks="marks" :hiddenRange="true"></nut-range>
     </nut-cell>
-    <nut-cell class="vertical_div">
+    <nut-cell class="vertical_div cell">
       <div class="div">
         <nut-range v-model="value14" @change="onChange" :vertical="true" :marks="marks" :hiddenRange="true"></nut-range>
       </div>
@@ -358,13 +366,17 @@ export default {
 </template>
 
 <script lang="ts">
-import { ref } from 'vue';
+import { ref,reactive,toRefs } from 'vue';
 import { showToast } from '@nutui/nutui';
 import '@nutui/nutui/dist/packages/toast/style'; 
 export default {
   setup() {
-    const value12 = ref(20);
-    const value13 = ref([20,80]);
+    const state = reactive({
+      value12: 60,
+      value13: [20, 80],
+      value14: 60,
+      value15: [20, 80],
+    })
     const marks=ref({
       0: 0,
       20: 20,
@@ -375,7 +387,8 @@ export default {
     });
     const onChange = (value) => showToast.text('当前值:' + value);
     return {
-      value,
+      ...toRefs(state),
+      marks,
       onChange,
     };
   },

+ 24 - 12
src/packages/__VUE/range/doc.taro.md

@@ -267,9 +267,12 @@ export default {
 .vertical_div {
   height: 180px;
   padding: 10px;
-  .div {
-    width: 150px;
-  }
+}
+.div {
+  width: 150px;
+}
+.cell {
+  padding: 40px 18px;
 }
 </style>
 <template>
@@ -291,7 +294,8 @@ export default {
     const value11 = ref([20,80]);
     const onChange = (value) => console.log('当前值:' + value);
     return {
-      value,
+      value10,
+      value11,
       onChange,
     };
   },
@@ -306,9 +310,12 @@ export default {
 .vertical_div {
   height: 180px;
   padding: 10px;
-  .div {
-    width: 150px;
-  }
+}
+.div {
+  width: 150px;
+}
+.cell {
+  padding: 40px 18px;
 }
 </style>
 <template>
@@ -338,12 +345,16 @@ export default {
 </template>
 
 <script lang="ts">
-import { ref } from 'vue';
+import { ref,reactive,toRefs } from 'vue';
 export default {
   setup() {
-    const value12 = ref(20);
-    const value13 = ref([20,80]);
-    const marks=ref({
+    const state = reactive({
+      value12: 60,
+      value13: [20, 80],
+      value14: 60,
+      value15: [20, 80],
+    })
+    const marks = ref({
       0: 0,
       20: 20,
       40: 40,
@@ -353,7 +364,8 @@ export default {
     });
     const onChange = (value) => console.log('当前值:' + value);
     return {
-      value,
+      ...toRefs(state),
+      marks,
       onChange,
     };
   },