amos-apptool 1.1.0 → 1.2.1

package/lib/index.js

@@ -39,8 +39,7 @@ var _exportNames = {
   subtraction: !0,
   accMul: !0,
   accDivide: !0,
-  encodeUrl: !0,
-  restfulUrl: !0
+  encodeUrl: !0
 };
 
 Object.defineProperty(exports, "Base64", {
@@ -178,11 +177,6 @@ Object.defineProperty(exports, "Base64", {
   get: function() {
     return _randomColor.default;
   }
-}), Object.defineProperty(exports, "restfulUrl", {
-  enumerable: !0,
-  get: function() {
-    return _restfulUrl.default;
-  }
 }), Object.defineProperty(exports, "shallowCopy", {
   enumerable: !0,
   get: function() {
@@ -259,4 +253,13 @@ Object.keys(_calendarUtils).forEach(function(e) {
   }));
 });
 
-var _encodeUrl = _interopRequireDefault(require("./url/encodeUrl")), _restfulUrl = _interopRequireDefault(require("./url/restfulUrl"));
+var _encodeUrl = _interopRequireDefault(require("./url/encodeUrl")), _restfulUrl = require("./url/restfulUrl");
+
+Object.keys(_restfulUrl).forEach(function(e) {
+  "default" !== e && "__esModule" !== e && (Object.prototype.hasOwnProperty.call(_exportNames, e) || e in exports && exports[e] === _restfulUrl[e] || Object.defineProperty(exports, e, {
+    enumerable: !0,
+    get: function() {
+      return _restfulUrl[e];
+    }
+  }));
+});

package/lib/math/calendarUtils.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: !0
 }), exports.CalendarUtils = void 0;
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray")), DateHelper = {
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof")), _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray")), DateHelper = {
   isLeapYear: function(e) {
     return e % 4 == 0 && e % 100 != 0 || e % 400 == 0;
   },
@@ -51,8 +51,8 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
       var D = 864e5, c = o - u * D, i = o + (6 - u) * D;
       return [ DateHelper.date2Str(new Date(c)), DateHelper.date2Str(new Date(i)) ];
     }
-    var l = 864e5, g = o - ((u = 0 === u ? 7 : u) - 1) * l, y = o + (7 - u) * l;
-    return [ DateHelper.date2Str(new Date(g)), DateHelper.date2Str(new Date(y)) ];
+    var y = 864e5, l = o - ((u = 0 === u ? 7 : u) - 1) * y, g = o + (7 - u) * y;
+    return [ DateHelper.date2Str(new Date(l)), DateHelper.date2Str(new Date(g)) ];
   },
   formatResultDate: function(e) {
     var t = (0, _toConsumableArray2.default)(e.split("-"));
@@ -128,7 +128,19 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 }, getCurrentWeekDays = function(e, t) {
   var r = new Date(e.year, e.month - 1, e.date), a = (r.getDay() + 7 - t) % 7;
   return [ convertDateToDay(new Date(r.getTime() - 864e5 * a)), convertDateToDay(new Date(r.getTime() + 864e5 * (6 - a))) ];
-}, CalendarUtils = exports.CalendarUtils = {
+};
+
+function checkIsToday(e) {
+  if ("object" !== (0, _typeof2.default)(e)) return !1;
+  var t = e || {}, r = t.type, a = t.year, n = t.month, o = t.date;
+  if ("current" === r) {
+    var u = new Date, D = convertDateToDay(u);
+    return a === D.year && n === D.month && o === D.date;
+  }
+  return !1;
+}
+
+var CalendarUtils = exports.CalendarUtils = {
   DateHelper: DateHelper,
   getCurrMonthData: getCurrMonthData,
   getDaysStatus: getDaysStatus,
@@ -137,5 +149,6 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
   convertDayToDate: convertDayToDate,
   getPrevMonthDays: getPrevMonthDays,
   getCurrentMonthDays: getCurrentMonthDays,
-  getCurrentWeekDays: getCurrentWeekDays
+  getCurrentWeekDays: getCurrentWeekDays,
+  checkIsToday: checkIsToday
 };

package/lib/url/restfulUrl.js

@@ -4,12 +4,44 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 Object.defineProperty(exports, "__esModule", {
   value: !0
-}), exports.default = restfulUrl;
+}), exports.changeParam = changeParam, exports.completePrefix = void 0, exports.formatUrl = formatUrl, 
+exports.restfulUrl = restfulUrl;
 
-var _utils = _interopRequireDefault(require("./../utils")), _regex = /\{\s*([^\|\}]+?)\s*(?:\|([^\}]*))?\s*\}/g;
+var _utils = _interopRequireDefault(require("./../utils")), _parseText = _interopRequireDefault(require("./../parseText")), _trim2 = _interopRequireDefault(require("./../_trim")), _regex = /\{\s*([^\|\}]+?)\s*(?:\|([^\}]*))?\s*\}/g;
 
 function restfulUrl(e, r, t) {
   return t || (t = _regex), e.replace ? e.replace(t, function(e, t) {
     return _utils.default.isUndefined(r[t]) ? e : r[t];
   }) : e;
-}
+}
+
+var defaultRE = /\{((?:.|\n)+?)\}/g;
+
+function formatUrl(e) {
+  var r = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {}, t = arguments.length > 2 ? arguments[2] : void 0;
+  return t || (t = defaultRE), (0, _parseText.default)(e, r, t);
+}
+
+function changeParam(e, r) {
+  if (!e || _utils.default.isEmpty(r)) return e;
+  var t = e;
+  return Object.keys(r).forEach(function(e) {
+    var i = r[e];
+    _utils.default.isUndefined(i) ? i = "" : _utils.default.isArray(i) || _utils.default.isObject(i) && (i = JSON.stringify(i)), 
+    t = function(e, r, t) {
+      var i = r + "=([^&]*)", u = r + "=" + t;
+      if (e.match(i)) {
+        var a = new RegExp("(".concat(r, "=)([^&]*)"), "gi");
+        return e.replace(a, u);
+      }
+      return e.match("[?]") ? e + "&" + u : e + "?" + u;
+    }(t, e, i);
+  }), t;
+}
+
+var completePrefix = exports.completePrefix = function() {
+  var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "", r = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : "";
+  return e && "" !== e ? (e.endsWith("/") && (e = e.substring(0, e.length - 1)), e = (0, 
+  _trim2.default)(e), r.startsWith("/") && (r = r.substring(1)), [ e, r = (r = (0, 
+  _trim2.default)(r)).replace(/\/\/+/g, "/") ].join("/")) : r;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amos-apptool",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "amos app tool",
   "main": "./lib/index.js",
   "module": "./esm/index.js",