@blueking/date-picker 2.0.0-beta.26 → 2.0.0-beta.27

package/package.json

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

package/typings/components/baseline-select.vue.d.ts

@@ -15,13 +15,10 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
 }, {}>;
 export default _default;
 type __VLS_WithDefaults<P, D> = {
-    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_Prettify<P[K] & {
+    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_PrettifyLocal<P[K] & {
         default: D[K];
     }> : P[K];
 };
-type __VLS_Prettify<T> = {
-    [K in keyof T]: T[K];
-} & {};
 type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
 type __VLS_TypePropsToOption<T> = {
     [K in keyof T]-?: {} extends Pick<T, K> ? {
@@ -31,3 +28,6 @@ type __VLS_TypePropsToOption<T> = {
         required: true;
     };
 };
+type __VLS_PrettifyLocal<T> = {
+    [K in keyof T]: T[K];
+} & {};

package/typings/components/date-panel.vue.d.ts

@@ -35,13 +35,10 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
 }, {}>;
 export default _default;
 type __VLS_WithDefaults<P, D> = {
-    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_Prettify<P[K] & {
+    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_PrettifyLocal<P[K] & {
         default: D[K];
     }> : P[K];
 };
-type __VLS_Prettify<T> = {
-    [K in keyof T]: T[K];
-} & {};
 type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
 type __VLS_TypePropsToOption<T> = {
     [K in keyof T]-?: {} extends Pick<T, K> ? {
@@ -51,3 +48,6 @@ type __VLS_TypePropsToOption<T> = {
         required: true;
     };
 };
+type __VLS_PrettifyLocal<T> = {
+    [K in keyof T]: T[K];
+} & {};

package/typings/components/recent-picker.vue.d.ts

@@ -18,13 +18,10 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
 }, {}>;
 export default _default;
 type __VLS_WithDefaults<P, D> = {
-    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_Prettify<P[K] & {
+    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_PrettifyLocal<P[K] & {
         default: D[K];
     }> : P[K];
 };
-type __VLS_Prettify<T> = {
-    [K in keyof T]: T[K];
-} & {};
 type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
 type __VLS_TypePropsToOption<T> = {
     [K in keyof T]-?: {} extends Pick<T, K> ? {
@@ -34,3 +31,6 @@ type __VLS_TypePropsToOption<T> = {
         required: true;
     };
 };
+type __VLS_PrettifyLocal<T> = {
+    [K in keyof T]: T[K];
+} & {};

package/typings/date-picker.vue.d.ts

@@ -30,24 +30,17 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
     "onUpdate:timezone"?: ((value: string, timezoneInfo: ITimezoneItem) => any) | undefined;
 }, {
     format: string;
-    commonUseList: {
-        id: DateValue;
-        name: string;
-    }[] | DateValue[];
     version: number | string;
     behavior: "normal" | "simplicity";
+    commonUseList: DateValue[];
     needTimezone: boolean;
 }, {}>;
 export default _default;
-
 type __VLS_WithDefaults<P, D> = {
-    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_Prettify<P[K] & {
+    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_PrettifyLocal<P[K] & {
         default: D[K];
     }> : P[K];
 };
-type __VLS_Prettify<T> = {
-    [K in keyof T]: T[K];
-} & {};
 type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
 type __VLS_TypePropsToOption<T> = {
     [K in keyof T]-?: {} extends Pick<T, K> ? {
@@ -57,3 +50,6 @@ type __VLS_TypePropsToOption<T> = {
         required: true;
     };
 };
+type __VLS_PrettifyLocal<T> = {
+    [K in keyof T]: T[K];
+} & {};

package/typings/utils/date.d.ts

@@ -22,7 +22,6 @@ export declare class DateRange {
     startDate: Dayjs | null;
     startNum: number | undefined;
     startUnit: DateUnit | undefined;
-    userDisplayName: string | undefined;
     constructor(dateValue?: DateValue, format?: string, timezome?: string);
     get dateMode(): DateMode;
     get endDisplayText(): string;
@@ -32,7 +31,6 @@ export declare class DateRange {
     get startDisplayText(): string;
     dateDuration(): number | undefined;
     isInValidDateRange(date: DateRange): boolean;
-    setUserDisplayName(v: string): void;
     toDisplayString(): string;
     toEmitValue(): [
         DateValue,

package/typings/utils/store.d.ts

@@ -5,7 +5,7 @@ export type StoreType = 'local' | 'session';
  * @param storeKey store key
  * @returns store value list
  */
-export declare const getStoreDateList: (storeKey: string, type?: StoreType) => any[];
+export declare const getStoreDateList: (storeKey: string, type?: StoreType) => never[];
 /**
  *
  * @param val store value

package/typings/utils/types.d.ts

@@ -20,10 +20,7 @@ export type CommonDateValue = [string, string];
 export type DateValue = [Dayjs | number | string, Dayjs | number | string];
 export interface IDatePickerProps {
     behavior?: 'normal' | 'simplicity';
-    commonUseList?: {
-        id: DateValue;
-        name: string;
-    }[] | DateValue[];
+    commonUseList?: DateValue[];
     disabled?: boolean;
     format?: string;
     modelValue: DateValue | undefined;

package/typings/utils/utils.d.ts

@@ -1,15 +1,15 @@
 import { type ComputedRef, type InjectionKey } from 'vue';
 import { type LangKey } from '../lang/lang';
 import { type ITimezoneItem } from './timezone';
-import { type IDatePickerProps, type DateValue } from './types';
+import { type DateValue } from './types';
 export interface IDatePickerProvider {
-    commonUseList: ComputedRef<IDatePickerProps['commonUseList']>;
+    commonUseList: ComputedRef<DateValue[]>;
     format: ComputedRef<string>;
     storeKey: ComputedRef<string>;
     t: (key: LangKey) => string;
     timezoneInfo: ComputedRef<ITimezoneItem>;
     version: ComputedRef<number | string>;
-    validateTimeRange: ComputedRef<DateValue | undefined>;
+    vildateTimeRange: ComputedRef<DateValue | undefined>;
 }
 export declare const DATE_PICKER_PROVIDER_KEY: InjectionKey<IDatePickerProvider>;
 export declare const useDatePickerProvider: (data: IDatePickerProvider) => void;

package/vue2/index.es.min.js

@@ -23253,7 +23253,6 @@ class DateRange {
     __publicField(this, "startDate");
     __publicField(this, "startNum");
     __publicField(this, "startUnit");
-    __publicField(this, "userDisplayName");
     this.dateValue = dateValue;
     this.format = format;
     this.timezome = timezome;
@@ -23352,9 +23351,6 @@ class DateRange {
     if (!this.startDate || !this.endDate) return false;
     return (this.startDate.isSame(date.startDate, "ms") || this.startDate.isBefore(date.startDate)) && (this.endDate.isSame(date.endDate, "ms") || this.endDate.isAfter(date.endDate));
   }
-  setUserDisplayName(v2) {
-    this.userDisplayName = v2;
-  }
   toDisplayString() {
     var _a, _b;
     const {
@@ -23369,7 +23365,6 @@ class DateRange {
       startNum,
       startUnit
     } = this;
-    if (this.userDisplayName) return this.userDisplayName;
     if (!startDate || !endDate || !isValidate) {
       return ((_a = this.dateValue) == null ? void 0 : _a.join(" ~ ")) || "";
     }
@@ -24969,16 +24964,16 @@ const useDatePickerProvider = (data2) => {
 };
 const useDatePickerInject = () => inject(DATE_PICKER_PROVIDER_KEY);
 const useValidate = () => {
-  const { format, timezoneInfo, validateTimeRange } = useDatePickerInject();
+  const { format, timezoneInfo, vildateTimeRange } = useDatePickerInject();
   const validDateRange = customRef((track) => {
-    let date = new DateRange(validateTimeRange.value, format.value, timezoneInfo.value.label);
+    let date = new DateRange(vildateTimeRange.value, format.value, timezoneInfo.value.label);
     return {
       get() {
         var _a;
         track();
-        if (((_a = validateTimeRange.value) == null ? void 0 : _a.length) !== 2) return void 0;
-        if (validateTimeRange.value.some((v2) => typeof v2 === "string" && v2.includes("now")))
-          return new DateRange(validateTimeRange.value, format.value, timezoneInfo.value.label);
+        if (((_a = vildateTimeRange.value) == null ? void 0 : _a.length) !== 2) return void 0;
+        if (vildateTimeRange.value.some((v2) => typeof v2 === "string" && v2.includes("now")))
+          return new DateRange(vildateTimeRange.value, format.value, timezoneInfo.value.label);
         return date;
       },
       set() {
@@ -25615,7 +25610,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
                     "model-value": startDate.value,
                     title: unref(t)("开始时间"),
                     "onUpdate:isNow": _cache[2] || (_cache[2] = () => handleIsNowChange("start")),
-                    "onUpdate:modelValue": handleStartTimeChange
+                    "onUpdate:modelValue": _cache[3] || (_cache[3] = (date) => handleStartTimeChange(date.startOf("d")))
                   }, null, 8, ["disable-now", "format", "is-now", "model-value", "title"])
                 ]),
                 default: withCtx(() => {
@@ -25657,8 +25652,8 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
                     "is-now": isEndNow.value,
                     "model-value": endDate.value,
                     title: unref(t)("结束时间"),
-                    "onUpdate:isNow": _cache[5] || (_cache[5] = () => handleIsNowChange("end")),
-                    "onUpdate:modelValue": _cache[6] || (_cache[6] = (date) => handleEndTimeChange(date.endOf("d")))
+                    "onUpdate:isNow": _cache[6] || (_cache[6] = () => handleIsNowChange("end")),
+                    "onUpdate:modelValue": _cache[7] || (_cache[7] = (date) => handleEndTimeChange(date.endOf("d")))
                   }, null, 8, ["disable-now", "format", "is-now", "model-value", "title"])
                 ]),
                 default: withCtx(() => {
@@ -25670,9 +25665,9 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
                       class: "date-picker-end",
                       placeholder: unref(t)("结束时间"),
                       value: isEndNow.value ? unref(NowConstant) : (_a2 = endDate.value) == null ? void 0 : _a2.format(unref(format)),
-                      onBlur: _cache[3] || (_cache[3] = (e) => handleInputEnter(e, "end")),
+                      onBlur: _cache[4] || (_cache[4] = (e) => handleInputEnter(e, "end")),
                       onClick: handleFocusEnd,
-                      onKeypress: _cache[4] || (_cache[4] = withKeys((e) => handleInputEnter(e, "end"), ["enter"]))
+                      onKeypress: _cache[5] || (_cache[5] = withKeys((e) => handleInputEnter(e, "end"), ["enter"]))
                     }, null, 40, _hoisted_6$2), [
                       [unref(__webpack_exports__clickoutside), handleClickoutsideEnd]
                     ])
@@ -26223,7 +26218,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
         return;
       }
       let date = inputVal2Dayjs(val, format.value, specificDate == null ? void 0 : specificDate.value);
-      if (date.isValid()) {
+      if (date == null ? void 0 : date.isValid()) {
         canEditNautralId.value = "";
         const formatValue = date.format(format.value);
         const item = baselineOptions.value.find((item2) => item2.id === formatValue);
@@ -26721,14 +26716,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     const browserTimezone = dayjs.tz.guess();
     const recentUseList = shallowRef(getStoreDateList(storeKey2.value));
     const dateList = computed(
-      () => (activePanel.value === "common" ? commonUseList.value || commonDateList : recentUseList.value).map((date) => {
-        if ((date == null ? void 0 : date.id) && date.name) {
-          const dateRange = new DateRange(date.id, format.value, props2.timezone);
-          dateRange.setUserDisplayName(date.name);
-          return dateRange;
-        }
-        return new DateRange(date, format.value, props2.timezone);
-      })
+      () => (activePanel.value === "common" ? commonUseList.value || commonDateList : recentUseList.value).map(
+        (date) => new DateRange(date, format.value, props2.timezone)
+      )
     );
     const handleChange = (date) => {
       emits("change", date);
@@ -26999,17 +26989,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       var _a;
       return ((_a = props2.commonUseList) == null ? void 0 : _a.length) ? props2.commonUseList : commonDateList;
     });
-    const dateDetailDisplayString = computed(() => {
-      var _a;
-      const commonDate = commonDateUseList.value.find((item) => {
-        var _a2, _b, _c, _d;
-        return Array.isArray(item.id) && ((_b = (_a2 = item.id).join) == null ? void 0 : _b.call(_a2, "_")) === ((_d = (_c = dateDetail.value) == null ? void 0 : _c.dateValue) == null ? void 0 : _d.join("_"));
-      });
-      if (commonDate) {
-        return commonDate.name;
-      }
-      return (_a = dateDetail.value) == null ? void 0 : _a.toDisplayString();
-    });
     useDatePickerProvider({
       commonUseList: commonDateUseList,
       format,
@@ -27017,7 +26996,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       t,
       timezoneInfo,
       version: computed(() => props2.version),
-      validateTimeRange: computed(() => props2.validDateRange)
+      vildateTimeRange: computed(() => props2.validDateRange)
     });
     onBeforeUnmount(() => {
       tooltipsShow.value = false;
@@ -27048,11 +27027,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       dateDetail.value = new DateRange(val, format.value, props2.timezone);
       const emitValue = dateDetail.value.toEmitValue();
       emits("update:modelValue", ...emitValue);
-      const canStore = commonDateUseList.value.some((item) => {
-        const startDate = Array.isArray(item == null ? void 0 : item.id) ? item.id[0] : item[0];
-        const endDate = Array.isArray(item == null ? void 0 : item.id) ? item.id[1] : item[1];
-        return startDate === start2 && endDate === end2;
-      });
+      const canStore = commonDateUseList.value.some((item) => item[0] === start2 && item[1] === end2);
       !canStore && dateDetail.value.isValidate && setStoreDateList(val, storeKey2.value);
     };
     const handleTimezoneChange = (val, info) => {
@@ -27158,7 +27133,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     createElementVNode(
                       "span",
                       null,
-                      toDisplayString(dateDetailDisplayString.value),
+                      toDisplayString(dateDetail.value.toDisplayString()),
                       1
                       /* TEXT */
                     ),