mm_expand 1.5.4 → 1.5.6

package/index.js

@@ -653,7 +653,7 @@ if (typeof($) === "undefined") {
 	Number.prototype.rand = function(min = 1) {
 		return Math.floor(Math.random() * (this - min + 1) + min);
 	};
-	
+
 	/**
 	 * @description 随机数
 	 * @param {Number} margin 上下幅度
@@ -664,7 +664,7 @@ if (typeof($) === "undefined") {
 		var max = this + margin;
 		return Math.floor(Math.random() * (max - min + 1) + min);
 	};
-	
+
 })();
 
 /* == 时间原型函数 == */
@@ -696,6 +696,7 @@ if (typeof($) === "undefined") {
 		}
 		return format;
 	};
+
 	/**
 	 * @description 获取当前时间戳
 	 * @return {Number} 返回时间戳
@@ -704,6 +705,7 @@ if (typeof($) === "undefined") {
 		var timestamp = Date.parse(this);
 		return timestamp / 1000;
 	};
+
 	/**
 	 * @description 计算时间差(时间间隔)
 	 * @param {String} endTime 结束时间
@@ -716,31 +718,33 @@ if (typeof($) === "undefined") {
 		var etime = Date.parse(new Date(endTime));
 		var usedTime = etime - stime; // 两个时间戳相差的毫秒数
 		if (time_unit === "day") {
-			return Math.floor(usedTime / (1000 * 60 * 60 * 24));
+			return Math.floor(usedTime / 86400000);
 		} else if (time_unit === "hours") {
-			return Math.floor(usedTime / (1000 * 60 * 60));
+			return Math.floor(usedTime / 3600000);
 		} else if (time_unit === "minutes") {
-			return Math.floor(usedTime / (1000 * 60));
+			return Math.floor(usedTime / 60000);
 		} else {
 			return Math.floor(usedTime / 1000);
 		}
 	};
+
 	/**
 	 * @description 时间添加天数
 	 * @param {Number} days 天数
 	 * @return {Date} 时间对象
 	 */
 	Date.prototype.addDays = function(days) {
-		this.setDate(this.getDate() + days);
-		return this;
+		var stemp = Date.parse(this);
+		return new Date(stemp + days * 86400000);
 	};
+
 	/**
 	 * @description 时间添加秒数
 	 * @param {Date} seconds 时间对象
 	 */
 	Date.prototype.addSeconds = function(seconds) {
-		this.setSeconds(this.getSeconds() + seconds);
-		return this;
+		var stemp = Date.parse(this);
+		return new Date(stemp + seconds * 1000);
 	};
 })();
 
@@ -1041,6 +1045,37 @@ if (typeof($) === "undefined") {
 		var str = this.replace('T', ' ').replace('Z', '').replaceAll('-', '/');
 		return str.toTime().toStr(format);
 	};
+
+	/**
+	 * @description 时间增加秒数
+	 * @param {Number} seconds 增加秒数
+	 * @param {String} format 转换的格式
+	 * @return {String|Date} 时间格式字符串
+	 */
+	String.prototype.addSeconds = function(seconds, format) {
+		var str = this;
+		var time = str.toTime().addSeconds(seconds);
+		if (format) {
+			return time.toStr(format);
+		}
+		return time;
+	};
+
+	/**
+	 * @description 时间增加天数
+	 * @param {Number} days 增加天数
+	 * @param {String} format 转换的格式
+	 * @return {String|Date} 时间格式字符串
+	 */
+	String.prototype.addDays = function(days, format) {
+		var str = this;
+		var time = str.toTime().addDays(days);
+		if (format) {
+			return time.toStr(format);
+		}
+		return time;
+	};
+
 	/**
 	 * @description 转为数组
 	 * @param {String|Regex} separator 分隔符或正则
@@ -2265,10 +2300,7 @@ if (typeof($) === "undefined") {
 		 */
 		File.prototype.load = function(file, encode) {
 			if (isFile(file)) {
-				if (!encode) {
-					encode = "utf-8"
-				}
-				return readFileSync(file, type);
+				return readFileSync(file, encode);
 			}
 		};
 		/**
@@ -2690,4 +2722,4 @@ if (typeof($) === "undefined") {
 module.exports = {
 	Lang,
 	Base
-};
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_expand",
-    "version": "1.5.4",
+    "version": "1.5.6",
     "description": "这是超级美眉原型函数拓展模块，更有利于对string、array、object的操作，避免出错，简化业务逻辑。",
     "main": "index.js",
     "scripts": {
@@ -29,8 +29,8 @@
     },
     "homepage": "https://github.com/qiuwenwu/mm_expand#readme",
     "dependencies": {
-        "fast-xml-parser": "^3.15.1",
-        "json5": "^2.1.1",
+        "fast-xml-parser": "^3.21.1",
+        "json5": "^2.2.3",
         "pinyinlite": "^1.2.1"
     }
-}
+}

package/test.js

@@ -1,7 +1,25 @@
 require('./index.js');
 
+var timeStr = "1970-01-01 00:00:00";
 
-var num = 5;
+var time = timeStr.toTime();
+console.log(time);
+
+var time2 = timeStr.addDays(367);
+console.log(time2);
+
+var time3 = timeStr.addSeconds(60);
+console.log(time3.toStr("yyyy-MM-dd hh:mm:ss"));
+
+var time4 = timeStr.addSeconds(60, "yyyy-MM-dd hh:mm:ss");
+console.log(time4);
+
+// "./中文/的".addDir(__dirname);
+// "./中文/test.json".saveJson({ name: "123" });
+// "./中文/test.json".delFile();
+// "./中文".delDir(__dirname);
+
+// var num = 5;
 // 随机一个1-5数值
 // console.log(num.rand(1));
 // console.log(num.rand(1));
@@ -10,20 +28,15 @@ var num = 5;
 // console.log(num.rand(1));
 // console.log(num.rand(1));
 // console.log(num.rand(1));
-"./中文/的".addDir();
-"./中文/test.json".saveJson({ name: "123" });
-"./中文/test.json".delFile();
-"./中文".delDir();
-console.log()
 
 // 随机一个上下浮动10的数值
-console.log(num.range(10));
-console.log(num.range(10));
-console.log(num.range(10));
-console.log(num.range(10));
-console.log(num.range(10));
-console.log(num.range(10));
-console.log(num.range(10));
+// console.log(num.range(10));
+// console.log(num.range(10));
+// console.log(num.range(10));
+// console.log(num.range(10));
+// console.log(num.range(10));
+// console.log(num.range(10));
+// console.log(num.range(10));
 
 // /**
 //  * 测试重载模块