Commit 6e572d4428efe4198cb7070445ebecd1d5528662

Authored by 梁灏
1 parent cbd3591c

fixed #133

fixed #133
src/components/loading-bar/index.js
@@ -44,6 +44,8 @@ function clearTimer() { @@ -44,6 +44,8 @@ function clearTimer() {
44 44
45 export default { 45 export default {
46 start () { 46 start () {
  47 + if (timer) return;
  48 +
47 let percent = 0; 49 let percent = 0;
48 50
49 update({ 51 update({
src/styles/components/date-picker.less
@@ -192,6 +192,9 @@ @@ -192,6 +192,9 @@
192 padding: @btn-padding-large; 192 padding: @btn-padding-large;
193 transition: all @transition-time @ease-in-out; 193 transition: all @transition-time @ease-in-out;
194 cursor: pointer; 194 cursor: pointer;
  195 + overflow: hidden;
  196 + text-overflow: ellipsis;
  197 + white-space: nowrap;
195 198
196 &:hover{ 199 &:hover{
197 background: @border-color-split; 200 background: @border-color-split;
test/routers/date.vue
@@ -59,7 +59,7 @@ @@ -59,7 +59,7 @@
59 } 59 }
60 }, 60 },
61 { 61 {
62 - text: '一周前', 62 + text: '最近三个月',
63 value () { 63 value () {
64 const date = new Date(); 64 const date = new Date();
65 date.setTime(date.getTime() - 3600 * 1000 * 24 * 7); 65 date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
test/routers/more.vue
@@ -22,9 +22,22 @@ @@ -22,9 +22,22 @@
22 <i-col :xs="{ span: 11, offset: 1 }" :lg="{ span: 6, offset: 2 }"><div class="aaaaa">Col 2</div></i-col> 22 <i-col :xs="{ span: 11, offset: 1 }" :lg="{ span: 6, offset: 2 }"><div class="aaaaa">Col 2</div></i-col>
23 <i-col :xs="{ span: 5, offset: 1 }" :lg="{ span: 6, offset: 2 }"><div class="aaaaa">Col 3</div></i-col> 23 <i-col :xs="{ span: 5, offset: 1 }" :lg="{ span: 6, offset: 2 }"><div class="aaaaa">Col 3</div></i-col>
24 </Row> 24 </Row>
  25 + <i-button @click="start">Start</i-button>
  26 + <i-button @click="finish">Finish</i-button>
  27 + <i-button @click="error">Error</i-button>
25 </template> 28 </template>
26 <script> 29 <script>
27 export default { 30 export default {
28 - 31 + methods: {
  32 + start () {
  33 + this.$Loading.start();
  34 + },
  35 + finish () {
  36 + this.$Loading.finish();
  37 + },
  38 + error () {
  39 + this.$Loading.error();
  40 + }
  41 + }
29 } 42 }
30 </script> 43 </script>