amos-apptool 1.0.5 → 1.2.0

package/esm/index.js

@@ -68,6 +68,8 @@ export { default as accMul } from "./math/mul";
 
 export { default as accDivide } from "./math/divide";
 
+export * from "./math/calendarUtils";
+
 export { default as encodeUrl } from "./url/encodeUrl";
 
-export { default as restfulUrl } from "./url/restfulUrl";
+export * from "./url/restfulUrl";

package/esm/math/calendarUtils.js

@@ -0,0 +1,118 @@
+const DateHelper = {
+  isLeapYear: e => e % 4 == 0 && e % 100 != 0 || e % 400 == 0,
+  getWhatDay: (e, t, a) => [ "星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六" ][new Date(`${e}/${t}/${a}`).getDay()],
+  getMonthPreDay(e, t) {
+    let a = new Date(`${e}/${t}/01`).getDay();
+    return 0 === a && (a = 7), a;
+  },
+  getMonthDays: (e, t) => (/^0/.test(t) && (t = t.split("")[1]), [ 0, 31, DateHelper.isLeapYear(Number(e)) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 ][t]),
+  getNumTwoBit: e => ((e = Number(e)) > 9 ? "" : "0") + e,
+  date2Str(e, t) {
+    t = t || "-";
+    return [ e.getFullYear(), DateHelper.getNumTwoBit(e.getMonth() + 1), DateHelper.getNumTwoBit(e.getDate()) ].join(t);
+  },
+  getDay(e) {
+    e = e || 0;
+    let t = new Date;
+    const a = 864e5 * e;
+    return t = new Date(t.getTime() + a), DateHelper.date2Str(t);
+  },
+  compareDate: (e, t) => !(new Date(e.replace("-", "/").replace("-", "/")) >= new Date(t.replace("-", "/").replace("-", "/"))),
+  isEqual: (e, t) => new Date((e || "").replace(/-/g, "/")).getTime() === new Date(t.replace(/-/g, "/")).getTime(),
+  getMonthWeek(e, t, a, r = 0) {
+    const n = new Date(Number(e), parseInt(t) - 1, Number(a));
+    let D = n.getDay();
+    const o = n.getDate();
+    let g = 6 - D;
+    return 0 !== r && (D = 0 === D ? 7 : D, g = 7 - D), Math.ceil((o + g) / 7);
+  },
+  getYearWeek(e, t, a, r = 0) {
+    const n = new Date(Number(e), parseInt(t) - 1, Number(a)), D = new Date(Number(e), 0, 1), o = Math.round((n.valueOf() - D.valueOf()) / 864e5);
+    return Math.ceil((o + (D.getDay() + 1 - 1)) / 7);
+  },
+  getWeekDate(e, t, a, r = 0) {
+    const n = new Date(Number(e), parseInt(t) - 1, Number(a)), D = n.getTime();
+    let o = n.getDay();
+    if (0 === r) {
+      const e = 864e5, t = D - o * e, a = D + (6 - o) * e;
+      return [ DateHelper.date2Str(new Date(t)), DateHelper.date2Str(new Date(a)) ];
+    }
+    o = 0 === o ? 7 : o;
+    const g = 864e5, l = D - (o - 1) * g, y = D + (7 - o) * g;
+    return [ DateHelper.date2Str(new Date(l)), DateHelper.date2Str(new Date(y)) ];
+  },
+  formatResultDate(e) {
+    const t = [ ...e.split("-") ];
+    return t[2] = DateHelper.getNumTwoBit(Number(t[2])), t[3] = `${t[0]}-${t[1]}-${t[2]}`, 
+    t[4] = DateHelper.getWhatDay(+t[0], +t[1], +t[2]), t;
+  }
+}, getCurrMonthData = (e, t, a) => {
+  switch (e) {
+   case "prev":
+    1 === a && (t -= 1), a = 1 === a ? 12 : --a;
+    break;
+
+   case "next":
+    12 === a && (t += 1), a = 12 === a ? 1 : ++a;
+  }
+  return [ t, DateHelper.getNumTwoBit(a), DateHelper.getMonthDays(String(t), String(a)) ];
+}, getDaysStatus = (e, t, a) => {
+  let r = DateHelper.getMonthDays(`${t}`, `${a}`);
+  return "prev" === e && r >= 7 && (r -= 7), Array.from(Array(r), (r, n) => ({
+    day: n + 1,
+    type: e,
+    year: t,
+    month: a
+  }));
+}, getPreMonthDates = (e, t, a, r) => {
+  let n = +a - 1, D = t;
+  n <= 0 && (n = 12, D += 1);
+  let o = DateHelper.getMonthPreDay(+t, +a);
+  o -= r, "prev" === e && o >= 7 && (o -= 7);
+  const g = DateHelper.getMonthDays(`${D}`, `${n}`);
+  return Array.from(Array(g), (t, a) => ({
+    day: a + 1,
+    type: e,
+    year: D,
+    month: n
+  })).slice(g - o);
+}, convertDateToDay = e => e ? {
+  year: e.getFullYear(),
+  month: e.getMonth() + 1,
+  date: e.getDate()
+} : null, convertDayToDate = e => e ? new Date(e.year, e.month - 1, e.date) : null, getPrevMonthDays = (e, t, a) => {
+  let r = t - 1, n = e;
+  r <= 0 && (r = 12, n -= 1);
+  let D = DateHelper.getMonthPreDay(e, t);
+  D -= a, D >= 7 && (D -= 7);
+  const o = DateHelper.getMonthDays(`${n}`, `${r}`);
+  return Array.from(Array(o), (e, t) => ({
+    type: "prev",
+    year: n,
+    month: r,
+    date: t + 1
+  })).slice(o - D);
+}, getCurrentMonthDays = (e, t) => {
+  const a = DateHelper.getMonthDays(`${e}`, `${t}`);
+  return Array.from(Array(a), (a, r) => ({
+    type: "current",
+    year: e,
+    month: t,
+    date: r + 1
+  }));
+}, getCurrentWeekDays = (e, t) => {
+  const a = new Date(e.year, e.month - 1, e.date), r = (a.getDay() + 7 - t) % 7;
+  return [ convertDateToDay(new Date(a.getTime() - 864e5 * r)), convertDateToDay(new Date(a.getTime() + 864e5 * (6 - r))) ];
+}, CalendarUtils = {
+  DateHelper: DateHelper,
+  getCurrMonthData: getCurrMonthData,
+  getDaysStatus: getDaysStatus,
+  getPreMonthDates: getPreMonthDates,
+  convertDateToDay: convertDateToDay,
+  convertDayToDate: convertDayToDate,
+  getPrevMonthDays: getPrevMonthDays,
+  getCurrentMonthDays: getCurrentMonthDays,
+  getCurrentWeekDays: getCurrentWeekDays
+};
+
+export { CalendarUtils };

package/esm/url/restfulUrl.js

@@ -1,7 +1,40 @@
 import utils from "./../utils";
 
+import parseText from "./../parseText";
+
+import _trim from "./../_trim";
+
 const _regex = /\{\s*([^\|\}]+?)\s*(?:\|([^\}]*))?\s*\}/g;
 
-export default function restfulUrl(e, r, t) {
-  return t || (t = _regex), e.replace ? e.replace(t, (e, t) => utils.isUndefined(r[t]) ? e : r[t]) : e;
-}
+export function restfulUrl(t, r, e) {
+  return e || (e = _regex), t.replace ? t.replace(e, (t, e) => utils.isUndefined(r[e]) ? t : r[e]) : t;
+}
+
+const defaultRE = /\{((?:.|\n)+?)\}/g;
+
+export function formatUrl(t, r = {}, e) {
+  return e || (e = defaultRE), parseText(t, r, e);
+}
+
+export function changeParam(t, r) {
+  if (!t || utils.isEmpty(r)) return t;
+  let e = t;
+  return Object.keys(r).forEach(function(t) {
+    let i = r[t];
+    utils.isUndefined(i) ? i = "" : utils.isArray(i) || utils.isObject(i) && (i = JSON.stringify(i)), 
+    e = function(t, r, e) {
+      const i = r + "=([^&]*)", n = r + "=" + e;
+      if (t.match(i)) {
+        const e = new RegExp(`(${r}=)([^&]*)`, "gi");
+        return t.replace(e, n);
+      }
+      return t.match("[?]") ? t + "&" + n : t + "?" + n;
+    }(e, t, i);
+  }), e;
+}
+
+export const completePrefix = (t = "", r = "") => {
+  if (!t || "" === t) return r;
+  return t.endsWith("/") && (t = t.substring(0, t.length - 1)), t = _trim(t), r.startsWith("/") && (r = r.substring(1)), 
+  [ t, r = (r = _trim(r)).replace(/\/\/+/g, "/") ].join("/");
+};

package/index.d.ts

@@ -291,6 +291,58 @@ export function encodeUrl(url: string): string;
  */
 export function restfulUrl(url: string, options: {}, regexps: RegExp): string;
 
+/**
+ * 替换 url 参数。如果url中无指定的参数，则自动追加。
+ *
+ * 自动将对象中的 undefined 值，转化为 ''。null 值则直接返回 null 字符串。
+ *
+ * params 参数中的数据格式，建议调用处统一处理为 string 格式。内部仅统一处理 undefined 和 {} 格式。
+ * @param href 需要替换参数的 url。为空字符串则直接返回 href
+ * @param params 参数对象。为空对象，则直接返回 href。
+ * @example
+ *  // 无参数，自动追加
+ * changeParam('a/b/d/g', { a: 1, b: 2, c: 3 }); // 'a/b/d/g?a=1&b=2&c=3'
+ *  // 更新已有参数的值
+ *  changeParam('a/b/d/g?a=aa&b=bb&c=cc', { a: 1, b: 2, c: 3 }); // 'a/b/d/g?a=1&b=2&c=3'
+ *  // url 中无参数 d，自动追加参数
+ *  changeParam('a/b/d/g?a=aa&b=bb&c=cc', { a: 1, b: 2, c: 3, d: 5 }); // 'a/b/d/g?a=1&b=2&c=3&d=5'
+ *  // undefined 值转化为 ''
+ *  changeParam('a/b/d/g', { a: 1, b: 2, c: undefined }); // 'a/b/d/g?a=1&b=2&c='
+ *  // null 值转化为 'null'
+ *  changeParam('a/b/d/g', { a: 1, b: null, c: undefined }); // 'a/b/d/g?a=1&b=null&c='
+ *  // [] 和 {} 值。最好不要给参数中传入 {} 值
+ *  changeParam('a/b/d/g', { a: { m: 3 }, b: [1,2] }); // a/b/d/g?a={"m":3}&b=1,2
+ *  // 更换 token={token} 值，注意 原理并不是替换 {token} 值，而是更新 `token=xxx` 值，也就是目标是 `=` 左边的 `key` 与 params 中的 key 匹配
+ *  changeParam('a/b/d/g?token={token}', { a: 'file', b: [1,2], token: 'mytoken' }); // a/b/d/g?token=mytoken&a=file&b=1,2
+ */
+export function changeParam(href: String, params: Object): String;
+
+ /**
+  * 格式化url
+  * @param {string} targetStr
+  * @param {object} dataObj
+  * @param {string|RegExp} regexps 可选, default: /\{(.*)\}/g);
+  * @example
+  *  formatUrl('a/{b}/{c}/d',{a: 1, b:2}) // 返回: 'a/1/2/d'
+  *  formatUrl('a/{{b}}/{{c}}/d',{a: 1, b:2}, /\{\{(.*)\}\}/g) // 返回: 'a/1/2/d'
+  */
+export function formatUrl(targetStr: string, dataObj: {}, regexps: string|RegExp): string;
+
+/**
+ * 补全 url
+ * @param left 左边通用前缀
+ * @param right 右边具体的 url
+ * @return
+ * @example
+ *  completePrefix('/aa/', 'b/c/d'); // '/aa/b/c/d'
+ *  completePrefix('/aa /', ' b/c/d'); // '/aa/b/c/d'
+ *  completePrefix('aa ', ' b c/d'); // 'aa/b c/d'
+ *  completePrefix(' aa ', ' b c/d '); // 'aa/b c/d'
+ *  // 注意，不会自动去除 url 内部的空格，会自动将 url 内部多余的 `/` 去掉
+ *  completePrefix('// aa /', '/ b c///d /'); // '/ aa/b c/d /'
+ */
+export function completePrefix(left = '', right = ''): string;
+
 /**
  *
  * @param str
@@ -473,6 +525,233 @@ export function accDivide(arg1: Number, arg2: Number, fix?: Number): number;
  */
 export function coinFormat(num: number, precision: number, separator: string, sign: string, unit: string): string | '';
 
+// --- 日历工具类
+/**
+ * 日期辅助工具类
+ */
+interface DateHelper {
+  /**
+   * 是否为闰年
+   * @param y 年份
+   * @return {Boolean} true|false
+   */
+  isLeapYear(y: number): boolean;
+
+  /**
+   * 返回星期数
+   * @param year 年
+   * @param month 月
+   * @param day 日
+   * @return {String} 星期名称（如：星期一）
+   */
+  getWhatDay(year: number | string, month: number | string, day: number | string): string;
+
+  /**
+   * 返回上一个月在当前面板中的天数
+   * @param year 年
+   * @param month 月
+   * @return {Number} 天数
+   */
+  getMonthPreDay(year: number | string, month: number | string): number;
+
+  /**
+   * 返回月份天数
+   * @param year 年
+   * @param month 月
+   * @return {Number} 该月份的总天数
+   */
+  getMonthDays(year: number | string, month: number | string): number;
+
+  /**
+   * 补齐数字位数（小于10的数字前面补0）
+   * @param n 需要补齐的数字
+   * @return {string} 补齐后的两位数字符串
+   */
+  getNumTwoBit(n: number | string): string;
+
+  /**
+   * 日期对象转成字符串
+   * @param date 日期对象
+   * @param split 分隔符，默认为 '-'
+   * @return {string} 格式化后的日期字符串
+   */
+  date2Str(date: Date, split?: string): string;
+
+  /**
+   * 返回日期格式字符串
+   * @param i 0返回今天的日期、1返回明天的日期，2返回后天的日期，依次类推，默认0
+   * @return {string} '2014-12-31' 格式的日期字符串
+   */
+  getDay(i?: number): string;
+
+  /**
+   * 时间比较（date1 是否早于 date2）
+   * @param date1 第一个日期字符串
+   * @param date2 第二个日期字符串
+   * @return {Boolean} date1 < date2 时返回 true，否则返回 false
+   */
+  compareDate(date1: string, date2: string): boolean;
+
+  /**
+   * 时间是否相等
+   * @param date1 第一个日期字符串（可选）
+   * @param date2 第二个日期字符串
+   * @return {Boolean} 两个日期时间戳相等时返回 true，否则返回 false
+   */
+  isEqual(date1?: string, date2: string): boolean;
+
+  /**
+   * 获取指定日期在当月的周数
+   * @param year 年
+   * @param month 月
+   * @param date 日
+   * @param firstDayOfWeek 一周的第一天（0表示周日，默认0）
+   * @return {number} 周数
+   */
+  getMonthWeek(year: number | string, month: number | string, date: number | string, firstDayOfWeek?: number): number;
+
+  /**
+   * 获取指定日期在当年的周数
+   * @param year 年
+   * @param month 月
+   * @param date 日
+   * @param firstDayOfWeek 一周的第一天（0表示周日，默认0）
+   * @return {number} 周数
+   */
+  getYearWeek(year: number | string, month: number | string, date: number | string, firstDayOfWeek?: number): number;
+
+  /**
+   * 获取指定日期所在周的起止日期
+   * @param year 年
+   * @param month 月
+   * @param date 日
+   * @param firstDayOfWeek 一周的第一天（0表示周日，默认0）
+   * @return {[string, string]} 周起始日期和结束日期组成的数组
+   */
+  getWeekDate(year: number | string, month: number | string, date: number | string, firstDayOfWeek?: number): [string, string];
+
+  /**
+   * 格式化日期结果
+   * @param date 日期字符串（格式：yyyy-mm-dd）
+   * @return {string[]} 格式化后的日期数组 [年, 月, 日, 完整日期字符串, 星期名称]
+   */
+  formatResultDate(date: string): string[];
+}
+
+/**
+ * 日期对象转换后的结构
+ */
+interface DayObject {
+  year: number;
+  month: number;
+  date: number;
+}
+
+/**
+ * 日期状态对象
+ */
+interface DayStatus {
+  day: number;
+  type: string;
+  year: number;
+  month: number;
+}
+
+/**
+ * 面板日期对象
+ */
+interface PanelDate {
+  type: string;
+  year: number;
+  month: number;
+  date: number;
+}
+
+/**
+ * 获取当前月数据
+ * @param type 类型：prev（上月）、next（下月）、默认（当月）
+ * @param year 年
+ * @param month 月
+ * @returns [年, 两位数字的月, 该月天数]
+ */
+declare function getCurrMonthData(type: string, year: number, month: number): [number, string, number];
+
+/**
+ * 获取日期状态
+ * @param type 类型：prev（上月）、next（下月）、current（当月）
+ * @param year 年
+ * @param month 月
+ * @returns 日期状态数组
+ */
+declare function getDaysStatus(type: string, year: number, month: number): DayStatus[];
+
+/**
+ * 获取上一个月的最后一周天数，填充当月空白
+ * @param type 类型：prev
+ * @param year 年
+ * @param month 月
+ * @param firstDayOfWeek 一周的第一天（0表示周日）
+ * @returns 上月填充日期数组
+ */
+declare function getPreMonthDates(type: string, year: number, month: number, firstDayOfWeek: number): DayStatus[];
+
+/**
+ * 将日期对象转换为年、月、日结构
+ * @param date 日期对象
+ * @returns 年、月、日结构对象，date为null时返回null
+ */
+declare function convertDateToDay(date: Date | null): DayObject | null;
+
+/**
+ * 将年、月、日结构转换为日期对象
+ * @param day 年、月、日结构对象
+ * @returns 日期对象，day为null时返回null
+ */
+declare function convertDayToDate(day: DayObject | null): Date | null;
+
+/**
+ * 获取当月面板中前一个月的日期数据
+ * @param year 年
+ * @param month 月
+ * @param firstDayOfWeek 一周的第一天（0表示周日）
+ * @returns 上月面板日期数组
+ */
+declare function getPrevMonthDays(year: number, month: number, firstDayOfWeek: number): PanelDate[];
+
+/**
+ * 获取当前月的日期数据
+ * @param year 年
+ * @param month 月
+ * @returns 当月面板日期数组
+ */
+declare function getCurrentMonthDays(year: number, month: number): PanelDate[];
+
+/**
+ * 根据日期获取当前周的起始日期
+ * @param day 年、月、日结构对象
+ * @param firstDayOfWeek 一周的第一天（0表示周日）
+ * @returns [周起始日期, 周结束日期]
+ */
+declare function getCurrentWeekDays(day: DayObject, firstDayOfWeek: number): [DayObject, DayObject];
+
+/**
+ * 日历工具类
+ */
+declare const CalendarUtils: {
+  DateHelper: DateHelper;
+  getCurrMonthData: typeof getCurrMonthData;
+  getDaysStatus: typeof getDaysStatus;
+  getPreMonthDates: typeof getPreMonthDates;
+  convertDateToDay: typeof convertDateToDay;
+  convertDayToDate: typeof convertDayToDate;
+  getPrevMonthDays: typeof getPrevMonthDays;
+  getCurrentMonthDays: typeof getCurrentMonthDays;
+  getCurrentWeekDays: typeof getCurrentWeekDays;
+};
+
+export { CalendarUtils };
+export type { DayObject, DayStatus, PanelDate, DateHelper };
+
 /**
  * dateTime
  */

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() {
@@ -248,4 +242,24 @@ Object.keys(_shallowEqual).forEach(function(e) {
   }));
 });
 
-var _strUtils = _interopRequireDefault(require("./strUtils")), _utils = _interopRequireDefault(require("./utils")), _addition = _interopRequireDefault(require("./math/addition")), _amountCase = _interopRequireDefault(require("./math/amountCase")), _coinFormat = _interopRequireDefault(require("./math/coinFormat")), _colorUtil = _interopRequireDefault(require("./math/colorUtil")), _dateTime = _interopRequireDefault(require("./math/dateTime")), _pwdStrength = _interopRequireDefault(require("./math/pwdStrength")), _randomColor = _interopRequireDefault(require("./math/randomColor")), _subtraction = _interopRequireDefault(require("./math/subtraction")), _mul = _interopRequireDefault(require("./math/mul")), _divide = _interopRequireDefault(require("./math/divide")), _encodeUrl = _interopRequireDefault(require("./url/encodeUrl")), _restfulUrl = _interopRequireDefault(require("./url/restfulUrl"));
+var _strUtils = _interopRequireDefault(require("./strUtils")), _utils = _interopRequireDefault(require("./utils")), _addition = _interopRequireDefault(require("./math/addition")), _amountCase = _interopRequireDefault(require("./math/amountCase")), _coinFormat = _interopRequireDefault(require("./math/coinFormat")), _colorUtil = _interopRequireDefault(require("./math/colorUtil")), _dateTime = _interopRequireDefault(require("./math/dateTime")), _pwdStrength = _interopRequireDefault(require("./math/pwdStrength")), _randomColor = _interopRequireDefault(require("./math/randomColor")), _subtraction = _interopRequireDefault(require("./math/subtraction")), _mul = _interopRequireDefault(require("./math/mul")), _divide = _interopRequireDefault(require("./math/divide")), _calendarUtils = require("./math/calendarUtils");
+
+Object.keys(_calendarUtils).forEach(function(e) {
+  "default" !== e && "__esModule" !== e && (Object.prototype.hasOwnProperty.call(_exportNames, e) || e in exports && exports[e] === _calendarUtils[e] || Object.defineProperty(exports, e, {
+    enumerable: !0,
+    get: function() {
+      return _calendarUtils[e];
+    }
+  }));
+});
+
+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

@@ -0,0 +1,141 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: !0
+}), exports.CalendarUtils = void 0;
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray")), DateHelper = {
+  isLeapYear: function(e) {
+    return e % 4 == 0 && e % 100 != 0 || e % 400 == 0;
+  },
+  getWhatDay: function(e, t, r) {
+    return [ "星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六" ][new Date("".concat(e, "/").concat(t, "/").concat(r)).getDay()];
+  },
+  getMonthPreDay: function(e, t) {
+    var r = new Date("".concat(e, "/").concat(t, "/01")).getDay();
+    return 0 === r && (r = 7), r;
+  },
+  getMonthDays: function(e, t) {
+    return /^0/.test(t) && (t = t.split("")[1]), [ 0, 31, DateHelper.isLeapYear(Number(e)) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 ][t];
+  },
+  getNumTwoBit: function(e) {
+    return ((e = Number(e)) > 9 ? "" : "0") + e;
+  },
+  date2Str: function(e, t) {
+    return t = t || "-", [ e.getFullYear(), DateHelper.getNumTwoBit(e.getMonth() + 1), DateHelper.getNumTwoBit(e.getDate()) ].join(t);
+  },
+  getDay: function(e) {
+    e = e || 0;
+    var t = new Date, r = 864e5 * e;
+    return t = new Date(t.getTime() + r), DateHelper.date2Str(t);
+  },
+  compareDate: function(e, t) {
+    return !(new Date(e.replace("-", "/").replace("-", "/")) >= new Date(t.replace("-", "/").replace("-", "/")));
+  },
+  isEqual: function(e, t) {
+    return new Date((e || "").replace(/-/g, "/")).getTime() === new Date(t.replace(/-/g, "/")).getTime();
+  },
+  getMonthWeek: function(e, t, r) {
+    var a = arguments.length > 3 && void 0 !== arguments[3] ? arguments[3] : 0, n = new Date(Number(e), parseInt(t) - 1, Number(r)), o = n.getDay(), u = n.getDate(), D = 6 - o;
+    return 0 !== a && (D = 7 - (o = 0 === o ? 7 : o)), Math.ceil((u + D) / 7);
+  },
+  getYearWeek: function(e, t, r) {
+    var a = new Date(Number(e), parseInt(t) - 1, Number(r)), n = new Date(Number(e), 0, 1), o = Math.round((a.valueOf() - n.valueOf()) / 864e5);
+    return Math.ceil((o + (n.getDay() + 1 - 1)) / 7);
+  },
+  getWeekDate: function(e, t, r) {
+    var a = arguments.length > 3 && void 0 !== arguments[3] ? arguments[3] : 0, n = new Date(Number(e), parseInt(t) - 1, Number(r)), o = n.getTime(), u = n.getDay();
+    if (0 === a) {
+      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)) ];
+  },
+  formatResultDate: function(e) {
+    var t = (0, _toConsumableArray2.default)(e.split("-"));
+    return t[2] = DateHelper.getNumTwoBit(Number(t[2])), t[3] = "".concat(t[0], "-").concat(t[1], "-").concat(t[2]), 
+    t[4] = DateHelper.getWhatDay(+t[0], +t[1], +t[2]), t;
+  }
+}, getCurrMonthData = function(e, t, r) {
+  switch (e) {
+   case "prev":
+    1 === r && (t -= 1), r = 1 === r ? 12 : --r;
+    break;
+
+   case "next":
+    12 === r && (t += 1), r = 12 === r ? 1 : ++r;
+  }
+  return [ t, DateHelper.getNumTwoBit(r), DateHelper.getMonthDays(String(t), String(r)) ];
+}, getDaysStatus = function(e, t, r) {
+  var a = DateHelper.getMonthDays("".concat(t), "".concat(r));
+  return "prev" === e && a >= 7 && (a -= 7), Array.from(Array(a), function(a, n) {
+    return {
+      day: n + 1,
+      type: e,
+      year: t,
+      month: r
+    };
+  });
+}, getPreMonthDates = function(e, t, r, a) {
+  var n = +r - 1, o = t;
+  n <= 0 && (n = 12, o += 1);
+  var u = DateHelper.getMonthPreDay(+t, +r);
+  u -= a, "prev" === e && u >= 7 && (u -= 7);
+  var D = DateHelper.getMonthDays("".concat(o), "".concat(n));
+  return Array.from(Array(D), function(t, r) {
+    return {
+      day: r + 1,
+      type: e,
+      year: o,
+      month: n
+    };
+  }).slice(D - u);
+}, convertDateToDay = function(e) {
+  return e ? {
+    year: e.getFullYear(),
+    month: e.getMonth() + 1,
+    date: e.getDate()
+  } : null;
+}, convertDayToDate = function(e) {
+  return e ? new Date(e.year, e.month - 1, e.date) : null;
+}, getPrevMonthDays = function(e, t, r) {
+  var a = t - 1, n = e;
+  a <= 0 && (a = 12, n -= 1);
+  var o = DateHelper.getMonthPreDay(e, t);
+  (o -= r) >= 7 && (o -= 7);
+  var u = DateHelper.getMonthDays("".concat(n), "".concat(a));
+  return Array.from(Array(u), function(e, t) {
+    return {
+      type: "prev",
+      year: n,
+      month: a,
+      date: t + 1
+    };
+  }).slice(u - o);
+}, getCurrentMonthDays = function(e, t) {
+  var r = DateHelper.getMonthDays("".concat(e), "".concat(t));
+  return Array.from(Array(r), function(r, a) {
+    return {
+      type: "current",
+      year: e,
+      month: t,
+      date: a + 1
+    };
+  });
+}, 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 = {
+  DateHelper: DateHelper,
+  getCurrMonthData: getCurrMonthData,
+  getDaysStatus: getDaysStatus,
+  getPreMonthDates: getPreMonthDates,
+  convertDateToDay: convertDateToDay,
+  convertDayToDate: convertDayToDate,
+  getPrevMonthDays: getPrevMonthDays,
+  getCurrentMonthDays: getCurrentMonthDays,
+  getCurrentWeekDays: getCurrentWeekDays
+};

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.0.5",
+  "version": "1.2.0",
   "description": "amos app tool",
   "main": "./lib/index.js",
   "module": "./esm/index.js",