mm_expand 1.6.6 → 1.6.7

package/index.js

@@ -539,7 +539,8 @@ if (typeof($) === "undefined") {
 		// 当前系统路径使用的斜杠
 		slash: slash,
 		// 系统跟目录
-		rootPath, rootPath,
+		rootPath,
+		rootPath,
 		// 运行根目录
 		runPath: process.cwd() + slash,
 		// 延迟
@@ -684,18 +685,22 @@ if (typeof($) === "undefined") {
 	 * @return {String} 时间格式字符串
 	 */
 	Date.prototype.toStr = function(format) {
+		var t = this;
+		if (format.endsWith('Z')) {
+			t = t.addSeconds(-28800);
+		}
 		var o = {
-			"M+": this.getMonth() + 1,
-			"d+": this.getDate(),
-			"h+": this.getHours(),
-			"m+": this.getMinutes(),
-			"s+": this.getSeconds(),
-			"q+": Math.floor((this.getMonth() + 3) / 3),
-			"S": this.getMilliseconds()
+			"M+": t.getMonth() + 1,
+			"d+": t.getDate(),
+			"h+": t.getHours(),
+			"m+": t.getMinutes(),
+			"s+": t.getSeconds(),
+			"q+": Math.floor((t.getMonth() + 3) / 3),
+			"S": t.getMilliseconds()
 		};
 		if (/(y+)/.test(format)) {
 			var x = RegExp.$1;
-			format = format.replace(x, (this.getFullYear() + "").substr(4 - x.length));
+			format = format.replace(x, (t.getFullYear() + "").substr(4 - x.length));
 		}
 		for (var k in o) {
 			if (new RegExp("(" + k + ")").test(format)) {
@@ -1038,17 +1043,21 @@ if (typeof($) === "undefined") {
 		}
 	};
 	/**
-	 * @description 转为时间对象
-	 * @return {Date} 时间对象
+	 * @description  转为时间对象
+	 * @return {Date} 返回时间对象类型
 	 */
 	String.prototype.toTime = function() {
 		var str = this;
 		var time;
 		if (str.indexOf('T') !== -1) {
-			str = this.replace('T', ' ').replace('Z', '').replaceAll('-', '/');
-			time = new Date(str).addSeconds(28800);
-		}
-		else {
+			str = this.replace('T', ' ').replaceAll('-', '/');
+			if (str.indexOf('Z') !== -1) {
+				str = str.replace('Z', '');
+				time = (new Date(str)).addSeconds(28800);
+			} else {
+				time = new Date(str);
+			}
+		} else {
 			str = this.replaceAll('-', '/');
 			time = new Date(str);
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_expand",
-    "version": "1.6.6",
+    "version": "1.6.7",
     "description": "这是超级美眉原型函数拓展模块，更有利于对string、array、object的操作，避免出错，简化业务逻辑。",
     "main": "index.js",
     "scripts": {

package/test.js

@@ -1,24 +1,52 @@
 require('./index.js');
 
+
+var now = new Date();
+var str = now;
+console.log("时间", str);
+console.log("时间", str.toString());
+console.log("当前", new Date(str.toString()).toStr("yyyy-MM-dd hh:mm:ss"));
+
+var time = now.toStr('yyyy-MM-dd hh:mm:ss');
+console.log("当前", time);
+console.log("时间", time.toTime().toStr("yyyy-MM-dd hh:mm:ss"));
+console.log("当前", new Date(time).toStr("yyyy-MM-dd hh:mm:ss"));
+
+var time = now.toStr("yyyy-MM-ddThh:mm");
+console.log("当前", time);
+console.log("时间", time.toTime().toStr("yyyy-MM-dd hh:mm:ss"));
+
+
+var time = now.toStr("yyyy-MM-ddThh:mm:ss.000Z");
+console.log("当前", time);
+console.log("时间", time.toTime().addSeconds(28800).toStr("yyyy-MM-dd hh:mm:ss"));
+
+var json = {
+	now
+};
+var jtime = JSON.stringify(json);
+console.log("时间", jtime);
+console.log("时间", (jtime.toJson()).now.toTime().toStr("yyyy-MM-dd hh:mm:ss"));
+
 // console.log($.rootPath);
-console.log("./fast/log".fullname(__dirname));
-console.log("./fast/log".fullname());
-console.log("./fast/log/".fullname());
-console.log("fast/log".fullname(__dirname));
-console.log("fast/log".fullname());
-console.log("fast/log/".fullname());
-console.log("../fast/log".fullname(__dirname));
-console.log("../fast/log".fullname());
-console.log("/fast/log".fullname(__dirname));
-console.log("/fast/log".fullname());
-console.log("/fast/log/".fullname());
-console.log("/fast/log.lgo".fullname());
-console.log("/fast/log.lgo\\".fullname());
-console.log("E:\\github\\mm_modules\\mm_expand\\fast\\log\\".fullname(__dirname));
-console.log("E:\\github\\mm_modules\\mm_expand\\fast\\log\\".fullname());
-console.log("E:\\github\\mm_modules\\mm_expand\\fast\\log".fullname());
-
-console.log("/fast/log.lgo\\log".fullname());
+// console.log("./fast/log".fullname(__dirname));
+// console.log("./fast/log".fullname());
+// console.log("./fast/log/".fullname());
+// console.log("fast/log".fullname(__dirname));
+// console.log("fast/log".fullname());
+// console.log("fast/log/".fullname());
+// console.log("../fast/log".fullname(__dirname));
+// console.log("../fast/log".fullname());
+// console.log("/fast/log".fullname(__dirname));
+// console.log("/fast/log".fullname());
+// console.log("/fast/log/".fullname());
+// console.log("/fast/log.lgo".fullname());
+// console.log("/fast/log.lgo\\".fullname());
+// console.log("E:\\github\\mm_modules\\mm_expand\\fast\\log\\".fullname(__dirname));
+// console.log("E:\\github\\mm_modules\\mm_expand\\fast\\log\\".fullname());
+// console.log("E:\\github\\mm_modules\\mm_expand\\fast\\log".fullname());
+
+// console.log("/fast/log.lgo\\log".fullname());
 // var arr1 = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'];
 
 // var arr1 = [{