npm publish

CHANGELOG.md

@@ -1,13 +1,15 @@
-<a name="2.1.3"></a>
-## [2.1.3](https://github.com/iuap-design/kero/compare/v3.0.6...v2.1.3) (2016-10-25)
+<a name="2.1.4"></a>
+## [2.1.4](https://github.com/iuap-design/kero/compare/v3.0.6...v2.1.4) (2016-10-27)
 
 
 ### Bug Fixes
+* pro-IUAPDESIGN-66:数字营销：getSimpleData方法会自动将date字符串转换为毫秒数 ([bf80d3d](https://github.com/iuap-design/kero/commit/bf80d3d))
+
+
+
 * _method error ([bb03148](https://github.com/iuap-design/kero/commit/bb03148))
 
 * IUAPDESIGN-69:营销物业管理：u-meta定义方式需要支持指定数据行 ([b40b214](https://github.com/iuap-design/kero/commit/b40b214))
-
-
 
 ### Features
 

dist/js/kero.js

@@ -3113,6 +3113,8 @@
 	    this.params = options['params'] || {};
 	    this.master = options['master'] || '';
 	    this.allSelected = ko.observable(false);
+	    //dateNoconvert：true时，时间不转化，按真实走，false是，时间转换成long型
+	    this.dateNoConvert = options['dateNoConvert'];
 	    if (options['root']) {
 	        this.root = options['root'];
 	    } else {
@@ -6283,7 +6285,7 @@
 	                    data: data,
 	                    key: key
 	                };
-	                _data[key] = rowObj.formatValueFun(obj);
+	                _data[key] = rowObj.formatValueFun(obj, rowObj.parent.dateNoConvert);
 	            }
 	        } else {
 	            _data[key] = _getSimpleData(rowObj, data[key]);
@@ -6292,11 +6294,11 @@
 	    return _data;
 	};
 
-	var formatValueFun = function formatValueFun(obj) {
+	var formatValueFun = function formatValueFun(obj, isDateNoConvert) {
 	    var meta = obj.meta,
 	        data = obj.data,
 	        key = obj.key;
-	    if (meta[key].type == 'date' || meta[key].type == 'datetime') {
+	    if (!isDateNoConvert && (meta[key].type == 'date' || meta[key].type == 'datetime')) {
 	        return (0, _rowUtil._dateToUTCString)(data[key].value);
 	    }
 	    return data[key].value;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kero",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "",
   "main": "gulpfile.js",
   "scripts": {
@@ -23,7 +23,7 @@
     "gulp-rename": "^1.2.2",
     "gulp-uglify": "^1.5.3",
     "gulp-util": "^3.0.7",
-    "tinper-sparrow": "^3.1.3"
+    "tinper-sparrow": "^3.1.4"
   },
   "devDependencies": {
     "babel-cli": "^6.11.4",