fix formatDate 未获取到语言配置

dist/js/cxcalendar.es.js

@@ -1,6 +1,6 @@
 /**
  * cxCalendar
- * @version 3.0.2
+ * @version 3.0.3
  * @author ciaoca
  * @email [email protected]
  * @site https://github.com/ciaoca/cxCalendar
@@ -182,9 +182,10 @@ theTool.parseDate = function(value, mustDef) {
 };
 
 // 格式化日期值
-theTool.formatDate = function(style, time) {
+theTool.formatDate = function(style, time, lang) {
   const self = this;
   const theDate = self.parseDate(time);
+  const language = self.extend({}, cxCalendar.languages.default, lang);
 
   if (typeof style !== 'string' || !self.isDate(theDate)) {
     return time;
@@ -207,7 +208,7 @@ theTool.formatDate = function(style, time) {
   attr.h = self.fillLeadZero(attr.g, 2);
   attr.i = self.fillLeadZero(theDate.getMinutes(), 2);
   attr.s = self.fillLeadZero(theDate.getSeconds(), 2);
-  attr.a = attr.G > 12 ? cacheApi.language.pm : cacheApi.language.am;
+  attr.a = attr.G > 12 ? language.pm : language.am;
 
   const keys = ['timestamp', 'Y', 'y', 'm', 'n', 'd', 'j', 'W', 'H', 'h', 'G', 'g', 'i', 's', 'a'];
   const reg = new RegExp('(' + keys.join('|') + ')', 'g');
@@ -1504,7 +1505,7 @@ picker.prototype.getDate = function(style) {
       newValue = [];
       break;
     }
-    newValue.push(theTool.formatDate(style, theDate.getTime()));
+    newValue.push(theTool.formatDate(style, theDate.getTime(), self.language));
   }
   newValue = self.settings.mode === 'range' ? newValue.join(self.settings.rangeSymbol) : newValue.join('');
 
@@ -1541,7 +1542,7 @@ picker.prototype.setDate = function(value) {
     } else if (theTime > self.maxDate.time) {
       theTime = self.maxDate.time;
     }
-    newValue.push(theTool.formatDate(self.settings.format, theTime));
+    newValue.push(theTool.formatDate(self.settings.format, theTime, self.language));
   }
   newValue = self.settings.mode === 'range' ? newValue.join(self.settings.rangeSymbol) : newValue.join('');
 

dist/js/cxcalendar.js

@@ -1,6 +1,6 @@
 /**
  * cxCalendar
- * @version 3.0.2
+ * @version 3.0.3
  * @author ciaoca
  * @email [email protected]
  * @site https://github.com/ciaoca/cxCalendar
@@ -188,9 +188,10 @@ theTool.parseDate = function(value, mustDef) {
 };
 
 // 格式化日期值
-theTool.formatDate = function(style, time) {
+theTool.formatDate = function(style, time, lang) {
   const self = this;
   const theDate = self.parseDate(time);
+  const language = self.extend({}, cxCalendar.languages.default, lang);
 
   if (typeof style !== 'string' || !self.isDate(theDate)) {
     return time;
@@ -213,7 +214,7 @@ theTool.formatDate = function(style, time) {
   attr.h = self.fillLeadZero(attr.g, 2);
   attr.i = self.fillLeadZero(theDate.getMinutes(), 2);
   attr.s = self.fillLeadZero(theDate.getSeconds(), 2);
-  attr.a = attr.G > 12 ? cacheApi.language.pm : cacheApi.language.am;
+  attr.a = attr.G > 12 ? language.pm : language.am;
 
   const keys = ['timestamp', 'Y', 'y', 'm', 'n', 'd', 'j', 'W', 'H', 'h', 'G', 'g', 'i', 's', 'a'];
   const reg = new RegExp('(' + keys.join('|') + ')', 'g');
@@ -1510,7 +1511,7 @@ picker.prototype.getDate = function(style) {
       newValue = [];
       break;
     }
-    newValue.push(theTool.formatDate(style, theDate.getTime()));
+    newValue.push(theTool.formatDate(style, theDate.getTime(), self.language));
   }
   newValue = self.settings.mode === 'range' ? newValue.join(self.settings.rangeSymbol) : newValue.join('');
 
@@ -1547,7 +1548,7 @@ picker.prototype.setDate = function(value) {
     } else if (theTime > self.maxDate.time) {
       theTime = self.maxDate.time;
     }
-    newValue.push(theTool.formatDate(self.settings.format, theTime));
+    newValue.push(theTool.formatDate(self.settings.format, theTime, self.language));
   }
   newValue = self.settings.mode === 'range' ? newValue.join(self.settings.rangeSymbol) : newValue.join('');
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cxcalendar3",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "description": "JavaScript date picker, support range, time, year, month.",
   "author": "ciaoca <[email protected]> (https://github.com/ciaoca/cxCalendar)",
   "license": "MIT",

src/index.js

@@ -197,9 +197,10 @@ theTool.parseDate = function(value, mustDef) {
 };
 
 // 格式化日期值
-theTool.formatDate = function(style, time) {
+theTool.formatDate = function(style, time, lang) {
   const self = this;
   const theDate = self.parseDate(time);
+  const language = self.extend({}, cxCalendar.languages.default, lang);
 
   if (typeof style !== 'string' || !self.isDate(theDate)) {
     return time;
@@ -223,7 +224,7 @@ theTool.formatDate = function(style, time) {
   attr.h = self.fillLeadZero(attr.g, 2);
   attr.i = self.fillLeadZero(theDate.getMinutes(), 2);
   attr.s = self.fillLeadZero(theDate.getSeconds(), 2);
-  attr.a = attr.G > 12 ? cacheApi.language.pm : cacheApi.language.am;
+  attr.a = attr.G > 12 ? language.pm : language.am;
 
   const keys = ['timestamp', 'Y', 'y', 'm', 'n', 'd', 'j', 'W', 'H', 'h', 'G', 'g', 'i', 's', 'a'];
   const reg = new RegExp('(' + keys.join('|') + ')', 'g');
@@ -1691,7 +1692,7 @@ picker.prototype.getDate = function(style) {
       break;
     };
 
-    newValue.push(theTool.formatDate(style, theDate.getTime()));
+    newValue.push(theTool.formatDate(style, theDate.getTime(), self.language));
   };
 
   newValue = self.settings.mode === 'range' ? newValue.join(self.settings.rangeSymbol) : newValue.join('');
@@ -1733,7 +1734,7 @@ picker.prototype.setDate = function(value) {
       theTime = self.maxDate.time;
     };
 
-    newValue.push(theTool.formatDate(self.settings.format, theTime));
+    newValue.push(theTool.formatDate(self.settings.format, theTime, self.language));
   };
 
   newValue = self.settings.mode === 'range' ? newValue.join(self.settings.rangeSymbol) : newValue.join('');