chenhaodong / mew-iview

Commit 5d0b89ced828df801b3206dac3367ca048772116

Authored by Rijn
1 parent f346ce4b

change scrolling to scrollable

Showing 2 changed files with 8 additions and 8 deletions   Show diff stats
Inline Side-by-side
src/components/modal/modal.vue
  Show/Hide comments   View file @5d0b89c
... ... @@ -77,7 +77,7 @@
77 77 type: Boolean,
78 78 default: false
79 79 },
80   - scrolling: {
  80 + scrollable: {
81 81 type: Boolean,
82 82 default: false
83 83 }
... ... @@ -208,7 +208,7 @@
208 208 } else {
209 209 if (this.timer) clearTimeout(this.timer);
210 210 this.wrapShow = true;
211   - if (!this.scrolling) {
  211 + if (!this.scrollable) {
212 212 this.addScrollEffect();
213 213 }
214 214 }
... ... @@ -218,7 +218,7 @@
218 218 this.buttonLoading = false;
219 219 }
220 220 },
221   - scrolling (val) {
  221 + scrollable (val) {
222 222 if (!val) {
223 223 this.addScrollEffect();
224 224 } else {
... ...
test/routers/more.vue
  Show/Hide comments   View file @5d0b89c
... ... @@ -5,18 +5,18 @@
5 5 </style>
6 6 <template>
7 7 <i-button type="primary" @click="modal1 = true">显示对话框</i-button>
8   - <i-button @click="scrolling = !scrolling">Toggle Scrolling</i-button>
9   - Scrolling:{{scrolling}}
  8 + <i-button @click="scrollable = !scrollable">Toggle scrollable</i-button>
  9 + scrollable:{{scrollable}}
10 10 <Modal
11 11 :visible.sync="modal1"
12 12 title="普通的Modal对话框标题"
13   - :scrolling="scrolling"
  13 + :scrollable="scrollable"
14 14 @on-ok="ok"
15 15 @on-cancel="cancel">
16 16 <p>对话框内容</p>
17 17 <p>对话框内容</p>
18 18 <p>对话框内容</p>
19   - <i-button @click="scrolling = !scrolling">Toggle Scrolling</i-button>
  19 + <i-button @click="scrollable = !scrollable">Toggle scrollable</i-button>
20 20 </Modal>
21 21 </template>
22 22 <script>
... ... @@ -24,7 +24,7 @@
24 24 data () {
25 25 return {
26 26 modal1: false,
27   - scrolling: false
  27 + scrollable: false
28 28 }
29 29 },
30 30 methods: {
... ...