From 3d40766d530b5bc848ce17c2391731b6000197c5 Mon Sep 17 00:00:00 2001
From: mxie <15623530290@163.com>
Date: Thu, 12 Apr 2018 16:16:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BE=9B=E8=87=AA=E5=AE=9A=E4=B9=89la?=
 =?UTF-8?q?ng?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 datepicker/index.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/datepicker/index.vue b/datepicker/index.vue
index 05deb87..43af5d6 100644
--- a/datepicker/index.vue
+++ b/datepicker/index.vue
@@ -63,6 +63,10 @@
 import CalendarPanel from './calendar-panel.vue'
 import Languages from './languages.js'
 
+const isObject = function (obj) {
+  return obj !== null && typeof obj === 'object'
+}
+
 export default {
   name: 'DatePicker',
   components: { CalendarPanel },
@@ -86,7 +90,7 @@ export default {
     },
     placeholder: String,
     lang: {
-      type: String,
+      type: [String, Object],
       default: 'zh'
     },
     shortcuts: {
@@ -175,6 +179,9 @@ export default {
   },
   computed: {
     translation () {
+      if (isObject(this.lang)) {
+        return { ...Languages['en'], ...this.lang }
+      }
       return Languages[this.lang] || Languages['en']
     },
     innerPlaceholder () {