chenhaodong / mew-iview

Commit e0cd7f909aee9f3d9eea6197d6cc66d6b2536f78

Authored by 梁灏
1 parent 6e572d44

fixed #134 

fixed #134
Showing 5 changed files with 36 additions and 11 deletions   Show diff stats
Inline Side-by-side
src/components/date-picker/panel/date-range.vue
  Show/Hide comments   View file @e0cd7f9
1 1 <template>
  2 + <div :class="classes">
2 3  
  4 + </div>
3 5 </template>
4 6 <script>
  7 + const prefixCls = 'ivu-picker-panel';
  8 + const datePrefixCls = 'ivu-date-picker';
  9 +
5 10 export default {
6 11 props: {},
7 12 data () {
8 13 return {}
9 14 },
10   - computed: {},
  15 + computed: {
  16 + classes () {
  17 + return [
  18 + `${prefixCls}-body-wrapper`,
  19 + {
  20 + [`${prefixCls}-with-sidebar`]: this.shortcuts.length
  21 + }
  22 + ]
  23 + }
  24 + },
11 25 methods: {}
12 26 }
13 27 </script>
14 28 \ No newline at end of file
... ...
src/components/date-picker/picker/date-picker.js
  Show/Hide comments   View file @e0cd7f9
... ... @@ -16,7 +16,7 @@ export default {
16 16 props: {
17 17 type: {
18 18 validator (value) {
19   - return oneOf(value, ['year', 'month', 'week', 'date', 'daterange', 'datetime', 'datetimerange']);
  19 + return oneOf(value, ['year', 'month', 'date', 'daterange', 'datetime', 'datetimerange']);
20 20 },
21 21 default: 'date'
22 22 },
... ...
src/components/page/page.vue
  Show/Hide comments   View file @e0cd7f9
1 1 <template>
2   - <ul :class="simpleWrapClasses" v-if="simple">
  2 + <ul :class="simpleWrapClasses" :style="style" v-if="simple">
3 3 <li
4 4 title="上一页"
5 5 :class="prevClasses"
... ... @@ -23,7 +23,7 @@
23 23 <a><i class="ivu-icon ivu-icon-ios-arrow-right"></i></a>
24 24 </li>
25 25 </ul>
26   - <ul :class="wrapClasses" v-else>
  26 + <ul :class="wrapClasses" :style="style" v-else>
27 27 <span :class="[prefixCls + '-total']" v-if="showTotal">
28 28 <slot>共 {{ total }} 条</slot>
29 29 </span>
... ... @@ -109,6 +109,12 @@
109 109 showSizer: {
110 110 type: Boolean,
111 111 default: false
  112 + },
  113 + class: {
  114 + type: String
  115 + },
  116 + style: {
  117 + type: Object
112 118 }
113 119 },
114 120 data () {
... ... @@ -127,7 +133,10 @@
127 133 simpleWrapClasses () {
128 134 return [
129 135 `${prefixCls}`,
130   - `${prefixCls}-simple`
  136 + `${prefixCls}-simple`,
  137 + {
  138 + [`${this.class}`]: !!this.class
  139 + }
131 140 ]
132 141 },
133 142 simplePagerClasses () {
... ... @@ -137,6 +146,7 @@
137 146 return [
138 147 `${prefixCls}`,
139 148 {
  149 + [`${this.class}`]: !!this.class,
140 150 'mini': !!this.size
141 151 }
142 152 ]
... ...
test/routers/date.vue
  Show/Hide comments   View file @e0cd7f9
... ... @@ -15,10 +15,7 @@
15 15 @on-open-change="change2"></date-picker>
16 16 </i-col>
17 17 <i-col span="8">
18   - <date-picker type="year" style="width:200px" placeholder="请选择日期" :value.sync="value" :options="options"></date-picker>
19   - </i-col>
20   - <i-col span="8">
21   - <date-picker type="month" style="width:200px" placeholder="请选择日期" :value.sync="value" :options="options"></date-picker>
  18 + <date-picker type="daterange" style="width:200px" placeholder="请选择日期" :value.sync="value2" :options="options2"></date-picker>
22 19 </i-col>
23 20 </row>
24 21 </div>
... ... @@ -29,6 +26,10 @@
29 26 return {
30 27 // value: new Date(),
31 28 value: '2016-12-25',
  29 + value2: '',
  30 + options2: {
  31 +
  32 + },
32 33 options: {
33 34 disabledDate(time) {
34 35 // console.log(time)
... ...
test/routers/page.vue
  Show/Hide comments   View file @e0cd7f9
1 1 <template>
2   - <Page :total="1000" show-sizer show-elevator show-total></Page>
  2 + <Page :total="1000" show-sizer show-elevator show-total class="classr" :style="{float: 'right'}"></Page>
3 3 <br><br>
4   - <Page :total="1000" show-sizer show-elevator show-total size="small"></Page>
  4 + <Page :total="1000" show-sizer show-elevator show-total size="small" class="classr2"></Page>
5 5 <br><br>
6 6 <Page :current="2" :total="50" simple></Page>
7 7 </template>
... ...