diff --git a/src/components/date-picker/panel/date-range.vue b/src/components/date-picker/panel/date-range.vue
index f67cf44..a65ca94 100644
--- a/src/components/date-picker/panel/date-range.vue
+++ b/src/components/date-picker/panel/date-range.vue
@@ -1,13 +1,27 @@
+
+
\ No newline at end of file
diff --git a/src/components/date-picker/picker/date-picker.js b/src/components/date-picker/picker/date-picker.js
index 7b5b8c7..2c8cbb9 100644
--- a/src/components/date-picker/picker/date-picker.js
+++ b/src/components/date-picker/picker/date-picker.js
@@ -16,7 +16,7 @@ export default {
props: {
type: {
validator (value) {
- return oneOf(value, ['year', 'month', 'week', 'date', 'daterange', 'datetime', 'datetimerange']);
+ return oneOf(value, ['year', 'month', 'date', 'daterange', 'datetime', 'datetimerange']);
},
default: 'date'
},
diff --git a/src/components/page/page.vue b/src/components/page/page.vue
index 9bb7e74..5c34031 100644
--- a/src/components/page/page.vue
+++ b/src/components/page/page.vue
@@ -1,5 +1,5 @@
-
+
-
+
共 {{ total }} 条
@@ -109,6 +109,12 @@
showSizer: {
type: Boolean,
default: false
+ },
+ class: {
+ type: String
+ },
+ style: {
+ type: Object
}
},
data () {
@@ -127,7 +133,10 @@
simpleWrapClasses () {
return [
`${prefixCls}`,
- `${prefixCls}-simple`
+ `${prefixCls}-simple`,
+ {
+ [`${this.class}`]: !!this.class
+ }
]
},
simplePagerClasses () {
@@ -137,6 +146,7 @@
return [
`${prefixCls}`,
{
+ [`${this.class}`]: !!this.class,
'mini': !!this.size
}
]
diff --git a/test/routers/date.vue b/test/routers/date.vue
index fbe5a11..518b4ad 100644
--- a/test/routers/date.vue
+++ b/test/routers/date.vue
@@ -15,10 +15,7 @@
@on-open-change="change2">
-
-
-
-
+
@@ -29,6 +26,10 @@
return {
// value: new Date(),
value: '2016-12-25',
+ value2: '',
+ options2: {
+
+ },
options: {
disabledDate(time) {
// console.log(time)
diff --git a/test/routers/page.vue b/test/routers/page.vue
index 921863b..0cbb08d 100644
--- a/test/routers/page.vue
+++ b/test/routers/page.vue
@@ -1,7 +1,7 @@
-
+
-
+
--
libgit2 0.21.4