@blueking/date-picker 3.0.6 → 3.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blueking/date-picker",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "蓝鲸监控平台日期时间选择",
   "license": "MIT",
   "author": "Tencent BlueKing",

package/typings/utils/date.d.ts

@@ -57,6 +57,6 @@ export declare class DateRange {
 }
 export declare const transformValue2Dayjs: (val: DateValue[number], type?: "end" | "start", timezone?: string) => dayjs.Dayjs | undefined;
 export declare const transformDateRange2Dayjs: (dateValue: DateValue, timezone?: string) => (dayjs.Dayjs | undefined)[];
-export declare const inputVal2Dayjs: (val: string, format: string, defaultDate?: Dayjs) => dayjs.Dayjs;
+export declare const inputVal2Dayjs: (val: string, format: string, defaultDate?: Dayjs, timezone?: string) => dayjs.Dayjs;
 export declare function getTimezoneOffset(timezone: string): number;
 export declare const isValidTimeZone: (timeZone: string) => boolean;

package/vue2/index.es.min.js

@@ -26232,7 +26232,7 @@ class DateRange {
       const [, endNum, endUnit, endDiffUnit] = end2.match(commonDateRegexp) || [];
       if (startDiffUnit) {
         if (end2 === NowConstant) return DateMode.NATURAL;
-        if (startNum && +endNum == -1) {
+        if (startNum && +endNum === -1) {
           if (startUnit === startDiffUnit && endUnit === endDiffUnit && startUnit === endUnit) return DateMode.NATURAL;
         }
       }
@@ -26395,7 +26395,7 @@ class DateRange {
     }
     remainingFormat = format.slice(lastEndIndex).trim().replace(/^[:\-\\/]/, "");
     const commonPrefix = startDate.format(commonFormat.trim());
-    if (!remainingFormat || remainingFormat == format) {
+    if (!remainingFormat || remainingFormat === format) {
       return `${startDate.format(format)} ~ ${endDate.format(format)}`;
     }
     const formattedStart = startDate.format(remainingFormat);
@@ -26505,7 +26505,7 @@ const transformDateRange2Dayjs = (dateValue, timezone) => {
   const endDate = transformValue2Dayjs(end2, "end", timezone);
   return [startDate, endDate];
 };
-const inputVal2Dayjs = (val, format, defaultDate) => {
+const inputVal2Dayjs = (val, format, defaultDate, timezone) => {
   let date;
   if (commonDateRegexp.test(val)) {
     date = transformValue2Dayjs(val);
@@ -26527,11 +26527,11 @@ const inputVal2Dayjs = (val, format, defaultDate) => {
       validate = validate && M2 < 12;
       const y2 = d2[1];
       validate = validate && y2.length < 5;
-      date = validate ? dayjs(new Date(+y2, M2, +day, +h2, +m2, +s2, +ms)) : defaultDate;
+      date = validate ? dayjs(new Date(+y2, M2, +day, +h2, +m2, +s2, +ms)).tz(timezone || dayjs.tz.guess(), true) : defaultDate;
     }
   }
   if (!date) {
-    date = dayjs(val);
+    date = dayjs(dayjs(val).valueOf()).tz(timezone || dayjs.tz.guess(), true);
   }
   return date;
 };
@@ -26544,7 +26544,7 @@ const isValidTimeZone = (timeZone) => {
   try {
     new Intl.DateTimeFormat("en-US", { timeZone });
     return true;
-  } catch (e) {
+  } catch {
     return false;
   }
 };
@@ -27173,7 +27173,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
         handleIsNowChange(type);
         return;
       }
-      let date = inputVal2Dayjs(val, format.value, editDate);
+      let date = inputVal2Dayjs(val, format.value, editDate, timezoneInfo.value.label);
       if (date.isValid()) {
         if (!(editDate == null ? void 0 : editDate.isSame(date))) {
           curNow.value = val === NowConstant;

package/vue2/index.iife.min.js

@@ -33835,7 +33835,7 @@ ${$(r2)}`), n2;
         const [, endNum, endUnit, endDiffUnit] = end2.match(commonDateRegexp) || [];
         if (startDiffUnit) {
           if (end2 === NowConstant) return DateMode.NATURAL;
-          if (startNum && +endNum == -1) {
+          if (startNum && +endNum === -1) {
             if (startUnit === startDiffUnit && endUnit === endDiffUnit && startUnit === endUnit) return DateMode.NATURAL;
           }
         }
@@ -33998,7 +33998,7 @@ ${$(r2)}`), n2;
       }
       remainingFormat = format.slice(lastEndIndex).trim().replace(/^[:\-\\/]/, "");
       const commonPrefix = startDate.format(commonFormat.trim());
-      if (!remainingFormat || remainingFormat == format) {
+      if (!remainingFormat || remainingFormat === format) {
         return `${startDate.format(format)} ~ ${endDate.format(format)}`;
       }
       const formattedStart = startDate.format(remainingFormat);
@@ -34108,7 +34108,7 @@ ${$(r2)}`), n2;
     const endDate = transformValue2Dayjs(end2, "end", timezone2);
     return [startDate, endDate];
   };
-  const inputVal2Dayjs = (val, format, defaultDate) => {
+  const inputVal2Dayjs = (val, format, defaultDate, timezone2) => {
     let date;
     if (commonDateRegexp.test(val)) {
       date = transformValue2Dayjs(val);
@@ -34130,11 +34130,11 @@ ${$(r2)}`), n2;
         validate = validate && M2 < 12;
         const y2 = d2[1];
         validate = validate && y2.length < 5;
-        date = validate ? dayjs(new Date(+y2, M2, +day, +h2, +m2, +s2, +ms)) : defaultDate;
+        date = validate ? dayjs(new Date(+y2, M2, +day, +h2, +m2, +s2, +ms)).tz(timezone2 || dayjs.tz.guess(), true) : defaultDate;
       }
     }
     if (!date) {
-      date = dayjs(val);
+      date = dayjs(dayjs(val).valueOf()).tz(timezone2 || dayjs.tz.guess(), true);
     }
     return date;
   };
@@ -34147,7 +34147,7 @@ ${$(r2)}`), n2;
     try {
       new Intl.DateTimeFormat("en-US", { timeZone });
       return true;
-    } catch (e) {
+    } catch {
       return false;
     }
   };
@@ -34776,7 +34776,7 @@ ${$(r2)}`), n2;
           handleIsNowChange(type);
           return;
         }
-        let date = inputVal2Dayjs(val, format.value, editDate);
+        let date = inputVal2Dayjs(val, format.value, editDate, timezoneInfo.value.label);
         if (date.isValid()) {
           if (!(editDate == null ? void 0 : editDate.isSame(date))) {
             curNow.value = val === NowConstant;

package/vue2/index.umd.min.js

@@ -26247,7 +26247,7 @@ ${$(r2)}`), n2;
         const [, endNum, endUnit, endDiffUnit] = end2.match(commonDateRegexp) || [];
         if (startDiffUnit) {
           if (end2 === NowConstant) return DateMode.NATURAL;
-          if (startNum && +endNum == -1) {
+          if (startNum && +endNum === -1) {
             if (startUnit === startDiffUnit && endUnit === endDiffUnit && startUnit === endUnit) return DateMode.NATURAL;
           }
         }
@@ -26410,7 +26410,7 @@ ${$(r2)}`), n2;
       }
       remainingFormat = format.slice(lastEndIndex).trim().replace(/^[:\-\\/]/, "");
       const commonPrefix = startDate.format(commonFormat.trim());
-      if (!remainingFormat || remainingFormat == format) {
+      if (!remainingFormat || remainingFormat === format) {
         return `${startDate.format(format)} ~ ${endDate.format(format)}`;
       }
       const formattedStart = startDate.format(remainingFormat);
@@ -26520,7 +26520,7 @@ ${$(r2)}`), n2;
     const endDate = transformValue2Dayjs(end2, "end", timezone);
     return [startDate, endDate];
   };
-  const inputVal2Dayjs = (val, format, defaultDate) => {
+  const inputVal2Dayjs = (val, format, defaultDate, timezone) => {
     let date;
     if (commonDateRegexp.test(val)) {
       date = transformValue2Dayjs(val);
@@ -26542,11 +26542,11 @@ ${$(r2)}`), n2;
         validate = validate && M2 < 12;
         const y2 = d2[1];
         validate = validate && y2.length < 5;
-        date = validate ? dayjs(new Date(+y2, M2, +day, +h2, +m2, +s2, +ms)) : defaultDate;
+        date = validate ? dayjs(new Date(+y2, M2, +day, +h2, +m2, +s2, +ms)).tz(timezone || dayjs.tz.guess(), true) : defaultDate;
       }
     }
     if (!date) {
-      date = dayjs(val);
+      date = dayjs(dayjs(val).valueOf()).tz(timezone || dayjs.tz.guess(), true);
     }
     return date;
   };
@@ -26559,7 +26559,7 @@ ${$(r2)}`), n2;
     try {
       new Intl.DateTimeFormat("en-US", { timeZone });
       return true;
-    } catch (e) {
+    } catch {
       return false;
     }
   };
@@ -27188,7 +27188,7 @@ ${$(r2)}`), n2;
           handleIsNowChange(type);
           return;
         }
-        let date = inputVal2Dayjs(val, format.value, editDate);
+        let date = inputVal2Dayjs(val, format.value, editDate, timezoneInfo.value.label);
         if (date.isValid()) {
           if (!(editDate == null ? void 0 : editDate.isSame(date))) {
             curNow.value = val === NowConstant;

package/vue3/index.es.min.js

@@ -1946,7 +1946,7 @@ class DateRange {
       const [, endNum, endUnit, endDiffUnit] = end.match(commonDateRegexp) || [];
       if (startDiffUnit) {
         if (end === NowConstant) return DateMode.NATURAL;
-        if (startNum && +endNum == -1) {
+        if (startNum && +endNum === -1) {
           if (startUnit === startDiffUnit && endUnit === endDiffUnit && startUnit === endUnit) return DateMode.NATURAL;
         }
       }
@@ -2109,7 +2109,7 @@ class DateRange {
     }
     remainingFormat = format.slice(lastEndIndex).trim().replace(/^[:\-\\/]/, "");
     const commonPrefix = startDate.format(commonFormat.trim());
-    if (!remainingFormat || remainingFormat == format) {
+    if (!remainingFormat || remainingFormat === format) {
       return `${startDate.format(format)} ~ ${endDate.format(format)}`;
     }
     const formattedStart = startDate.format(remainingFormat);
@@ -2219,7 +2219,7 @@ const transformDateRange2Dayjs = (dateValue, timezone) => {
   const endDate = transformValue2Dayjs(end, "end", timezone);
   return [startDate, endDate];
 };
-const inputVal2Dayjs = (val, format, defaultDate) => {
+const inputVal2Dayjs = (val, format, defaultDate, timezone) => {
   let date;
   if (commonDateRegexp.test(val)) {
     date = transformValue2Dayjs(val);
@@ -2241,11 +2241,11 @@ const inputVal2Dayjs = (val, format, defaultDate) => {
       validate = validate && M < 12;
       const y = d[1];
       validate = validate && y.length < 5;
-      date = validate ? dayjs(new Date(+y, M, +day, +h2, +m, +s, +ms)) : defaultDate;
+      date = validate ? dayjs(new Date(+y, M, +day, +h2, +m, +s, +ms)).tz(timezone || dayjs.tz.guess(), true) : defaultDate;
     }
   }
   if (!date) {
-    date = dayjs(val);
+    date = dayjs(dayjs(val).valueOf()).tz(timezone || dayjs.tz.guess(), true);
   }
   return date;
 };
@@ -2258,7 +2258,7 @@ const isValidTimeZone = (timeZone) => {
   try {
     new Intl.DateTimeFormat("en-US", { timeZone });
     return true;
-  } catch (e) {
+  } catch {
     return false;
   }
 };
@@ -2887,7 +2887,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
         handleIsNowChange(type);
         return;
       }
-      let date = inputVal2Dayjs(val, format.value, editDate);
+      let date = inputVal2Dayjs(val, format.value, editDate, timezoneInfo.value.label);
       if (date.isValid()) {
         if (!(editDate == null ? void 0 : editDate.isSame(date))) {
           curNow.value = val === NowConstant;

package/vue3/index.iife.min.js

@@ -26853,7 +26853,7 @@ ${$(r2)}`), n2;
         const [, endNum, endUnit, endDiffUnit] = end2.match(commonDateRegexp) || [];
         if (startDiffUnit) {
           if (end2 === NowConstant) return DateMode.NATURAL;
-          if (startNum && +endNum == -1) {
+          if (startNum && +endNum === -1) {
             if (startUnit === startDiffUnit && endUnit === endDiffUnit && startUnit === endUnit) return DateMode.NATURAL;
           }
         }
@@ -27016,7 +27016,7 @@ ${$(r2)}`), n2;
       }
       remainingFormat = format.slice(lastEndIndex).trim().replace(/^[:\-\\/]/, "");
       const commonPrefix = startDate.format(commonFormat.trim());
-      if (!remainingFormat || remainingFormat == format) {
+      if (!remainingFormat || remainingFormat === format) {
         return `${startDate.format(format)} ~ ${endDate.format(format)}`;
       }
       const formattedStart = startDate.format(remainingFormat);
@@ -27126,7 +27126,7 @@ ${$(r2)}`), n2;
     const endDate = transformValue2Dayjs(end2, "end", timezone2);
     return [startDate, endDate];
   };
-  const inputVal2Dayjs = (val, format, defaultDate) => {
+  const inputVal2Dayjs = (val, format, defaultDate, timezone2) => {
     let date;
     if (commonDateRegexp.test(val)) {
       date = transformValue2Dayjs(val);
@@ -27148,11 +27148,11 @@ ${$(r2)}`), n2;
         validate = validate && M2 < 12;
         const y2 = d2[1];
         validate = validate && y2.length < 5;
-        date = validate ? dayjs(new Date(+y2, M2, +day, +h2, +m2, +s2, +ms)) : defaultDate;
+        date = validate ? dayjs(new Date(+y2, M2, +day, +h2, +m2, +s2, +ms)).tz(timezone2 || dayjs.tz.guess(), true) : defaultDate;
       }
     }
     if (!date) {
-      date = dayjs(val);
+      date = dayjs(dayjs(val).valueOf()).tz(timezone2 || dayjs.tz.guess(), true);
     }
     return date;
   };
@@ -27165,7 +27165,7 @@ ${$(r2)}`), n2;
     try {
       new Intl.DateTimeFormat("en-US", { timeZone });
       return true;
-    } catch (e) {
+    } catch {
       return false;
     }
   };
@@ -27794,7 +27794,7 @@ ${$(r2)}`), n2;
           handleIsNowChange(type);
           return;
         }
-        let date = inputVal2Dayjs(val, format.value, editDate);
+        let date = inputVal2Dayjs(val, format.value, editDate, timezoneInfo.value.label);
         if (date.isValid()) {
           if (!(editDate == null ? void 0 : editDate.isSame(date))) {
             curNow.value = val === NowConstant;

package/vue3/index.umd.min.js

@@ -1942,7 +1942,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         const [, endNum, endUnit, endDiffUnit] = end.match(commonDateRegexp) || [];
         if (startDiffUnit) {
           if (end === NowConstant) return DateMode.NATURAL;
-          if (startNum && +endNum == -1) {
+          if (startNum && +endNum === -1) {
             if (startUnit === startDiffUnit && endUnit === endDiffUnit && startUnit === endUnit) return DateMode.NATURAL;
           }
         }
@@ -2105,7 +2105,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       }
       remainingFormat = format.slice(lastEndIndex).trim().replace(/^[:\-\\/]/, "");
       const commonPrefix = startDate.format(commonFormat.trim());
-      if (!remainingFormat || remainingFormat == format) {
+      if (!remainingFormat || remainingFormat === format) {
         return `${startDate.format(format)} ~ ${endDate.format(format)}`;
       }
       const formattedStart = startDate.format(remainingFormat);
@@ -2215,7 +2215,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     const endDate = transformValue2Dayjs(end, "end", timezone);
     return [startDate, endDate];
   };
-  const inputVal2Dayjs = (val, format, defaultDate) => {
+  const inputVal2Dayjs = (val, format, defaultDate, timezone) => {
     let date;
     if (commonDateRegexp.test(val)) {
       date = transformValue2Dayjs(val);
@@ -2237,11 +2237,11 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         validate = validate && M < 12;
         const y = d[1];
         validate = validate && y.length < 5;
-        date = validate ? dayjs(new Date(+y, M, +day, +h, +m, +s, +ms)) : defaultDate;
+        date = validate ? dayjs(new Date(+y, M, +day, +h, +m, +s, +ms)).tz(timezone || dayjs.tz.guess(), true) : defaultDate;
       }
     }
     if (!date) {
-      date = dayjs(val);
+      date = dayjs(dayjs(val).valueOf()).tz(timezone || dayjs.tz.guess(), true);
     }
     return date;
   };
@@ -2254,7 +2254,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     try {
       new Intl.DateTimeFormat("en-US", { timeZone });
       return true;
-    } catch (e) {
+    } catch {
       return false;
     }
   };
@@ -2883,7 +2883,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
           handleIsNowChange(type);
           return;
         }
-        let date = inputVal2Dayjs(val, format.value, editDate);
+        let date = inputVal2Dayjs(val, format.value, editDate, timezoneInfo.value.label);
         if (date.isValid()) {
           if (!(editDate == null ? void 0 : editDate.isSame(date))) {
             curNow.value = val === NowConstant;