zartui 3.0.4 → 3.0.5

package/lib/zartui.cjs.js

@@ -2,6 +2,7 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const use = require("@zartui/use");
 const vue = require("vue");
+const dateUtils = require("@zartui/date-utils");
 const popperjs = require("@zartui/popperjs");
 const isDef = (val) => val !== void 0 && val !== null;
 const isFunction = (val) => typeof val === "function";
@@ -10624,73 +10625,6 @@ const parseDecimal = (obj, defaultValue) => {
   }
   return result;
 };
-var __formatNumber__ = function(number) {
-  if (number < 10) {
-    return "0" + number;
-  }
-  return number + "";
-};
-var DATE_FORMAT = {
-  FORMAT_HM: "HH:mm",
-  FORMAT_MDHM: "MM-dd HH:mm",
-  FORMAT_MD_CN: "MM\u6708dd\u65E5",
-  FORMAT_MD: "MM-dd",
-  FORMAT_YMD: "yyyy-MM-dd",
-  FORMAT_YMD_SLASH: "yyyy/MM/dd",
-  FORMAT_YM: "yyyy-MM",
-  FORMAT_YMDHM: "yyyy-MM-dd HH:mm",
-  FORMAT_YMDHMS: "yyyy-MM-dd HH:mm:ss",
-  FORMAT_YMDHMSMS: "yyyy-MM-dd HH:mm:ss msms",
-  FORMAT_YM_CN: "yyyy\u5E74MM\u6708",
-  FORMAT_YMD_CN: "yyyy\u5E74MM\u6708dd\u65E5",
-  FORMAT_YMDH_CN: "yyyy\u5E74MM\u6708dd\u65E5 HH\u65F6",
-  FORMAT_MDH_CN: "MM\u6708dd\u65E5 HH\u65F6",
-  FORMAT_YMDHM_CN: "yyyy\u5E74MM\u6708dd\u65E5 HH\u65F6mm\u5206",
-  FORMAT_YMDHMS_CN: "yyyy\u5E74MM\u6708dd\u65E5  HH\u65F6mm\u5206ss\u79D2"
-};
-function createDate(dateObj) {
-  if (typeof dateObj === "number") {
-    return new Date(dateObj);
-  }
-  if (typeof dateObj === "string") {
-    dateObj = dateObj.replace(/-/g, "/");
-    if (dateObj.length === 7) {
-      dateObj += "/01";
-    }
-    return new Date(dateObj);
-  }
-  return dateObj;
-}
-function formatDate(dateObj, formatType = DATE_FORMAT.FORMAT_YMDHMS) {
-  const date = createDate(dateObj);
-  let formatResult = formatType.replace(
-    "yyyy",
-    __formatNumber__(date.getFullYear())
-  );
-  formatResult = formatResult.replace(
-    "yy",
-    String(date.getFullYear()).substring(2)
-  );
-  formatResult = formatResult.replace(
-    "MM",
-    __formatNumber__(date.getMonth() + 1)
-  );
-  formatResult = formatResult.replace("dd", __formatNumber__(date.getDate()));
-  formatResult = formatResult.replace("HH", __formatNumber__(date.getHours()));
-  formatResult = formatResult.replace(
-    "mm",
-    __formatNumber__(date.getMinutes())
-  );
-  formatResult = formatResult.replace(
-    "ss",
-    __formatNumber__(date.getSeconds())
-  );
-  formatResult = formatResult.replace(
-    "msms",
-    __formatNumber__(date.getMilliseconds())
-  );
-  return formatResult;
-}
 const clamp = (value, min, max) => Math.min(Math.max(value, min), max);
 const subString = (str, startIndex, length) => {
   if (!isDef(length)) {
@@ -10915,22 +10849,22 @@ function buildContent(contentConfigString, watermarkContext) {
       const regexResult = scanner.next(dateRegex);
       if (regexResult) {
         const matchResults = regexResult;
-        let format = DATE_FORMAT.FORMAT_YMD;
+        let format = dateUtils.DATE_FORMAT.FORMAT_YMD;
         if (matchResults && matchResults.length >= 2) {
           if (isValidString(matchResults[1])) {
             format = matchResults[1];
           }
         }
         if (watermarkContext) {
-          content += formatDate(watermarkContext.watermarkTime, format);
+          content += dateUtils.formatDate(watermarkContext.watermarkTime, format);
         }
         scanner.skip(matchResults.input);
       }
     } else if (scanner.hasNext("time")) {
       if (watermarkContext) {
-        const value = formatDate(
+        const value = dateUtils.formatDate(
           watermarkContext.watermarkTime,
-          DATE_FORMAT.FORMAT_HM
+          dateUtils.DATE_FORMAT.FORMAT_HM
         );
         content += value;
       }
@@ -16240,7 +16174,7 @@ const Lazyload = {
     });
   }
 };
-const version = "3.0.4";
+const version = "3.0.5";
 function install(app) {
   const components = [
     ActionSheet,

package/lib/zartui.es.js

@@ -1,5 +1,6 @@
 import { useWindowSize, useRect, onMountedOrActivated, getScrollParent, useEventListener, useToggle, raf, useScrollParent, useChildren, usePageVisibility, doubleRaf, useParent, useCustomFieldValue, useClickAway, CUSTOM_FIELD_INJECTION_KEY, inBrowser as inBrowser$1 } from "@zartui/use";
 import { unref, ref, reactive, defineComponent, computed, createVNode, watch, onActivated, onDeactivated, onBeforeUnmount, provide, inject, mergeProps, getCurrentInstance, Transition, withDirectives, vShow, nextTick, onMounted, Teleport, Fragment, resolveDirective, onBeforeUpdate, onUnmounted, createApp, createTextVNode, watchEffect, withKeys, onUpdated, h } from "vue";
+import { DATE_FORMAT, formatDate } from "@zartui/date-utils";
 import { offsetModifier, createPopper } from "@zartui/popperjs";
 const isDef = (val) => val !== void 0 && val !== null;
 const isFunction = (val) => typeof val === "function";
@@ -10622,73 +10623,6 @@ const parseDecimal = (obj, defaultValue) => {
   }
   return result;
 };
-var __formatNumber__ = function(number) {
-  if (number < 10) {
-    return "0" + number;
-  }
-  return number + "";
-};
-var DATE_FORMAT = {
-  FORMAT_HM: "HH:mm",
-  FORMAT_MDHM: "MM-dd HH:mm",
-  FORMAT_MD_CN: "MM\u6708dd\u65E5",
-  FORMAT_MD: "MM-dd",
-  FORMAT_YMD: "yyyy-MM-dd",
-  FORMAT_YMD_SLASH: "yyyy/MM/dd",
-  FORMAT_YM: "yyyy-MM",
-  FORMAT_YMDHM: "yyyy-MM-dd HH:mm",
-  FORMAT_YMDHMS: "yyyy-MM-dd HH:mm:ss",
-  FORMAT_YMDHMSMS: "yyyy-MM-dd HH:mm:ss msms",
-  FORMAT_YM_CN: "yyyy\u5E74MM\u6708",
-  FORMAT_YMD_CN: "yyyy\u5E74MM\u6708dd\u65E5",
-  FORMAT_YMDH_CN: "yyyy\u5E74MM\u6708dd\u65E5 HH\u65F6",
-  FORMAT_MDH_CN: "MM\u6708dd\u65E5 HH\u65F6",
-  FORMAT_YMDHM_CN: "yyyy\u5E74MM\u6708dd\u65E5 HH\u65F6mm\u5206",
-  FORMAT_YMDHMS_CN: "yyyy\u5E74MM\u6708dd\u65E5  HH\u65F6mm\u5206ss\u79D2"
-};
-function createDate(dateObj) {
-  if (typeof dateObj === "number") {
-    return new Date(dateObj);
-  }
-  if (typeof dateObj === "string") {
-    dateObj = dateObj.replace(/-/g, "/");
-    if (dateObj.length === 7) {
-      dateObj += "/01";
-    }
-    return new Date(dateObj);
-  }
-  return dateObj;
-}
-function formatDate(dateObj, formatType = DATE_FORMAT.FORMAT_YMDHMS) {
-  const date = createDate(dateObj);
-  let formatResult = formatType.replace(
-    "yyyy",
-    __formatNumber__(date.getFullYear())
-  );
-  formatResult = formatResult.replace(
-    "yy",
-    String(date.getFullYear()).substring(2)
-  );
-  formatResult = formatResult.replace(
-    "MM",
-    __formatNumber__(date.getMonth() + 1)
-  );
-  formatResult = formatResult.replace("dd", __formatNumber__(date.getDate()));
-  formatResult = formatResult.replace("HH", __formatNumber__(date.getHours()));
-  formatResult = formatResult.replace(
-    "mm",
-    __formatNumber__(date.getMinutes())
-  );
-  formatResult = formatResult.replace(
-    "ss",
-    __formatNumber__(date.getSeconds())
-  );
-  formatResult = formatResult.replace(
-    "msms",
-    __formatNumber__(date.getMilliseconds())
-  );
-  return formatResult;
-}
 const clamp = (value, min, max) => Math.min(Math.max(value, min), max);
 const subString = (str, startIndex, length) => {
   if (!isDef(length)) {
@@ -16238,7 +16172,7 @@ const Lazyload = {
     });
   }
 };
-const version = "3.0.4";
+const version = "3.0.5";
 function install(app) {
   const components = [
     ActionSheet,

package/lib/zartui.js

@@ -17353,7 +17353,7 @@
       });
     }
   };
-  const version = "3.0.4";
+  const version = "3.0.5";
   function install(app) {
     const components = [
       ActionSheet,