@jhqn/utils-core 0.0.1-beta.20 → 0.0.1-beta.21

package/dist/index.cjs

@@ -1,6 +1,23 @@
 'use strict';
 
 const detectBrowser = require('detect-browser');
+const dayjs = require('dayjs/esm');
+const localeData = require('dayjs/esm/plugin/localeData');
+const duration = require('dayjs/esm/plugin/duration');
+const relativeTime = require('dayjs/esm/plugin/relativeTime');
+const customParseFormat = require('dayjs/esm/plugin/customParseFormat');
+const objectSupport = require('dayjs/esm/plugin/objectSupport');
+const zhCN = require('dayjs/esm/locale/zh-cn');
+
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
+
+const dayjs__default = /*#__PURE__*/_interopDefaultCompat(dayjs);
+const localeData__default = /*#__PURE__*/_interopDefaultCompat(localeData);
+const duration__default = /*#__PURE__*/_interopDefaultCompat(duration);
+const relativeTime__default = /*#__PURE__*/_interopDefaultCompat(relativeTime);
+const customParseFormat__default = /*#__PURE__*/_interopDefaultCompat(customParseFormat);
+const objectSupport__default = /*#__PURE__*/_interopDefaultCompat(objectSupport);
+const zhCN__default = /*#__PURE__*/_interopDefaultCompat(zhCN);
 
 const snake2Kebab = (str) => str.replace(/_([a-z])/g, (_, letter) => `-${letter.toLowerCase()}`);
 const snake2Pascal = (str) => str.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()).replace(/^[a-z]/, (letter) => letter.toUpperCase());
@@ -232,11 +249,47 @@ const reviver = (_, value) => {
 };
 const filterObj = (obj, keys, reverse = false) => Object.fromEntries(Object.entries(obj).filter(([key]) => reverse ? !keys.includes(key) : keys.includes(key)));
 
+dayjs__default.extend(localeData__default).locale("zh-cn", zhCN__default);
+dayjs__default.extend(duration__default);
+dayjs__default.extend(relativeTime__default);
+dayjs__default.extend(customParseFormat__default);
+dayjs__default.extend(objectSupport__default);
+const dateFmt = (date, format = "YYYY-MM-DD HH:mm:ss") => {
+  const dd = dayjs__default(date);
+  let fmt = format;
+  if (!isDef(date) || !dd.isValid())
+    return "";
+  if (format === "date")
+    fmt = "YYYY-MM-DD";
+  if (format === "datetime")
+    fmt = "YYYY-MM-DD HH:mm:ss";
+  return dd.format(fmt);
+};
+const dateDuration = (start, end) => {
+  const startDay = dayjs__default(start);
+  const endDay = dayjs__default(end);
+  if (!isDef(start) || !startDay.isValid() || !isDef(end) || !endDay.isValid())
+    return "";
+  const dd = dayjs__default.duration(endDay.diff(startDay));
+  const year = dd.years();
+  const month = dd.months();
+  const day = dd.days();
+  const format = [
+    year === 0 ? "" : "Y\u5E74",
+    month === 0 ? "" : "M\u4E2A\u6708",
+    day === 0 ? "" : `${day < 10 && (year !== 0 || month !== 0) ? "\u96F6" : ""}D\u5929`
+  ].join("");
+  return dd.format(format);
+};
+
+exports.dayjs = dayjs__default;
 exports.camel2Kebab = camel2Kebab;
 exports.camel2Pascal = camel2Pascal;
 exports.camel2Snake = camel2Snake;
 exports.camel2Title = camel2Title;
 exports.checkImg = checkImg;
+exports.dateDuration = dateDuration;
+exports.dateFmt = dateFmt;
 exports.filterObj = filterObj;
 exports.fixiOSInputAutoZoomIn = fixiOSInputAutoZoomIn;
 exports.getHostEnv = getHostEnv;

package/dist/index.d.ts

@@ -1,4 +1,6 @@
 import * as detect_browser from 'detect-browser';
+import { ConfigType } from 'dayjs/esm';
+export { Dayjs, default as dayjs } from 'dayjs/esm';
 
 /**
  * snake2Kebab
@@ -477,6 +479,20 @@ declare const filterObj: (obj: Record<string, any>, keys: string[], reverse?: bo
     [k: string]: any;
 };
 
+/**
+ * 格式化时间
+ * @param {import('dayjs/esm').ConfigType} date 时间
+ * @param {string} format 格式
+ * @returns {string} 格式化后的时间
+ */
+declare const dateFmt: (date: ConfigType, format?: string | 'date' | 'datetime') => string;
+/**
+ * 格式化时间间隔
+ * @param {import('dayjs/esm').ConfigType} start 开始时间
+ * @param {import('dayjs/esm').ConfigType} end 结束时间
+ */
+declare const dateDuration: (start: ConfigType, end: ConfigType) => string;
+
 /**
  * 是否有意义的值
  * @param val
@@ -556,4 +572,4 @@ declare const isValidArrRes: (res: Res<any[]>) => boolean;
  */
 declare const isValidPageRes: (res: PageRes) => boolean;
 
-export { NullOrUndefinable, Nullable, Numeric, PageRes, PageResData, Res, Undefinable, camel2Kebab, camel2Pascal, camel2Snake, camel2Title, checkImg, filterObj, fixiOSInputAutoZoomIn, getHostEnv, hideCardNo, hideMiddle, hideName, hidePhone, hideThird, inBrowser, isArrStr, isDef, isEmail, isIdCard, isJSONStr, isNumeric, isPhone, isTel, isValidArrRes, isValidKey, isValidPageRes, isValidRes, jClear, jDebug, jError, jGroup, jGroupC, jGroupE, jInfo, jLog, jTime, jTimeEnd, jWarn, kebab2Camel, kebab2Pascal, kebab2Snake, kebab2Title, nonASCII, parseToJSON, pascal2Camel, pascal2Kebab, pascal2Snake, pascal2Title, replacer, reviver, snake2Camel, snake2Kebab, snake2Pascal, snake2Title, title2Camel, title2Kebab, title2Pascal, title2Snake, userAgent, waitTime };
+export { NullOrUndefinable, Nullable, Numeric, PageRes, PageResData, Res, Undefinable, camel2Kebab, camel2Pascal, camel2Snake, camel2Title, checkImg, dateDuration, dateFmt, filterObj, fixiOSInputAutoZoomIn, getHostEnv, hideCardNo, hideMiddle, hideName, hidePhone, hideThird, inBrowser, isArrStr, isDef, isEmail, isIdCard, isJSONStr, isNumeric, isPhone, isTel, isValidArrRes, isValidKey, isValidPageRes, isValidRes, jClear, jDebug, jError, jGroup, jGroupC, jGroupE, jInfo, jLog, jTime, jTimeEnd, jWarn, kebab2Camel, kebab2Pascal, kebab2Snake, kebab2Title, nonASCII, parseToJSON, pascal2Camel, pascal2Kebab, pascal2Snake, pascal2Title, replacer, reviver, snake2Camel, snake2Kebab, snake2Pascal, snake2Title, title2Camel, title2Kebab, title2Pascal, title2Snake, userAgent, waitTime };

package/dist/index.mjs

@@ -1,4 +1,12 @@
 import { detect } from 'detect-browser';
+import dayjs from 'dayjs/esm';
+export { default as dayjs } from 'dayjs/esm';
+import localeData from 'dayjs/esm/plugin/localeData';
+import duration from 'dayjs/esm/plugin/duration';
+import relativeTime from 'dayjs/esm/plugin/relativeTime';
+import customParseFormat from 'dayjs/esm/plugin/customParseFormat';
+import objectSupport from 'dayjs/esm/plugin/objectSupport';
+import zhCN from 'dayjs/esm/locale/zh-cn';
 
 const snake2Kebab = (str) => str.replace(/_([a-z])/g, (_, letter) => `-${letter.toLowerCase()}`);
 const snake2Pascal = (str) => str.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()).replace(/^[a-z]/, (letter) => letter.toUpperCase());
@@ -230,4 +238,37 @@ const reviver = (_, value) => {
 };
 const filterObj = (obj, keys, reverse = false) => Object.fromEntries(Object.entries(obj).filter(([key]) => reverse ? !keys.includes(key) : keys.includes(key)));
 
-export { camel2Kebab, camel2Pascal, camel2Snake, camel2Title, checkImg, filterObj, fixiOSInputAutoZoomIn, getHostEnv, hideCardNo, hideMiddle, hideName, hidePhone, hideThird, inBrowser, isArrStr, isDef, isEmail, isIdCard, isJSONStr, isNumeric, isPhone, isTel, isValidArrRes, isValidKey, isValidPageRes, isValidRes, jClear, jDebug, jError, jGroup, jGroupC, jGroupE, jInfo, jLog, jTime, jTimeEnd, jWarn, kebab2Camel, kebab2Pascal, kebab2Snake, kebab2Title, nonASCII, parseToJSON, pascal2Camel, pascal2Kebab, pascal2Snake, pascal2Title, replacer, reviver, snake2Camel, snake2Kebab, snake2Pascal, snake2Title, title2Camel, title2Kebab, title2Pascal, title2Snake, userAgent, waitTime };
+dayjs.extend(localeData).locale("zh-cn", zhCN);
+dayjs.extend(duration);
+dayjs.extend(relativeTime);
+dayjs.extend(customParseFormat);
+dayjs.extend(objectSupport);
+const dateFmt = (date, format = "YYYY-MM-DD HH:mm:ss") => {
+  const dd = dayjs(date);
+  let fmt = format;
+  if (!isDef(date) || !dd.isValid())
+    return "";
+  if (format === "date")
+    fmt = "YYYY-MM-DD";
+  if (format === "datetime")
+    fmt = "YYYY-MM-DD HH:mm:ss";
+  return dd.format(fmt);
+};
+const dateDuration = (start, end) => {
+  const startDay = dayjs(start);
+  const endDay = dayjs(end);
+  if (!isDef(start) || !startDay.isValid() || !isDef(end) || !endDay.isValid())
+    return "";
+  const dd = dayjs.duration(endDay.diff(startDay));
+  const year = dd.years();
+  const month = dd.months();
+  const day = dd.days();
+  const format = [
+    year === 0 ? "" : "Y\u5E74",
+    month === 0 ? "" : "M\u4E2A\u6708",
+    day === 0 ? "" : `${day < 10 && (year !== 0 || month !== 0) ? "\u96F6" : ""}D\u5929`
+  ].join("");
+  return dd.format(format);
+};
+
+export { camel2Kebab, camel2Pascal, camel2Snake, camel2Title, checkImg, dateDuration, dateFmt, filterObj, fixiOSInputAutoZoomIn, getHostEnv, hideCardNo, hideMiddle, hideName, hidePhone, hideThird, inBrowser, isArrStr, isDef, isEmail, isIdCard, isJSONStr, isNumeric, isPhone, isTel, isValidArrRes, isValidKey, isValidPageRes, isValidRes, jClear, jDebug, jError, jGroup, jGroupC, jGroupE, jInfo, jLog, jTime, jTimeEnd, jWarn, kebab2Camel, kebab2Pascal, kebab2Snake, kebab2Title, nonASCII, parseToJSON, pascal2Camel, pascal2Kebab, pascal2Snake, pascal2Title, replacer, reviver, snake2Camel, snake2Kebab, snake2Pascal, snake2Title, title2Camel, title2Kebab, title2Pascal, title2Snake, userAgent, waitTime };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jhqn/utils-core",
   "type": "module",
-  "version": "0.0.1-beta.20",
+  "version": "0.0.1-beta.21",
   "author": "jade-gjz <jiangang.zhang@jaderd.com>",
   "license": "MIT",
   "homepage": "https://github.com/jaderd-jh/utils/tree/main/packages/core#readme",
@@ -32,6 +32,7 @@
     "dist"
   ],
   "dependencies": {
+    "dayjs": "^1.11.9",
     "detect-browser": "^5.3.0"
   },
   "scripts": {