@pisell/date-picker 1.0.77 → 1.0.79

package/es/index.d.ts

@@ -19,5 +19,5 @@ export type { DateRange, RangePosition } from "./internals/models/range";
 export type { UseDateRangeFieldProps } from "./internals/models/dateRange";
 export { PisellDateRangePicker as RangePicker };
 export { LocaleContext, LocaleProvider };
-export { getDatePickerValueByShortcut, formatPresets, getShortcutValue, getPresetLabel, } from "./utils/index";
+export { getDatePickerValueByShortcut, formatPresets, getShortcutValue, getPresetLabel, getDatePickerValue, } from "./utils/index";
 export * from "./models";

package/es/index.js

@@ -24,5 +24,5 @@ export * from "./StaticDateRangePicker";
 export * from "./dateRangeViewRenderers";
 export { PisellDateRangePicker as RangePicker };
 export { LocaleContext, LocaleProvider };
-export { getDatePickerValueByShortcut, formatPresets, getShortcutValue, getPresetLabel } from "./utils/index";
+export { getDatePickerValueByShortcut, formatPresets, getShortcutValue, getPresetLabel, getDatePickerValue } from "./utils/index";
 export * from "./models";

package/es/utils/index.d.ts

@@ -1,4 +1,5 @@
 import { PresetType } from "../Shortcuts";
+import { Dayjs } from "dayjs";
 export declare const getCurrentLocale: () => string;
 export declare const isBrowser: boolean;
 export declare const isMobile: () => boolean;
@@ -8,12 +9,12 @@ export declare const isMobile: () => boolean;
  */
 export declare const formatPresets: (presets: PresetType[]) => ({
     label: any;
-    getValue: (() => import("dayjs").Dayjs[]) | (() => [import("dayjs").Dayjs, import("dayjs").Dayjs] | "today" | "yesterday" | "last_3_days" | "last_7_days" | "last_30_days" | "last_90_days" | "last_180_days" | "tomorrow" | "next_3_days" | "next_7_days" | "next_30_days" | "next_90_days" | "next_180_days");
-    value: [import("dayjs").Dayjs, import("dayjs").Dayjs] | "today" | "yesterday" | "last_3_days" | "last_7_days" | "last_30_days" | "last_90_days" | "last_180_days" | "tomorrow" | "next_3_days" | "next_7_days" | "next_30_days" | "next_90_days" | "next_180_days";
+    getValue: (() => Dayjs[]) | (() => [Dayjs, Dayjs] | "today" | "yesterday" | "last_3_days" | "last_7_days" | "last_30_days" | "last_90_days" | "last_180_days" | "tomorrow" | "next_3_days" | "next_7_days" | "next_30_days" | "next_90_days" | "next_180_days");
+    value: [Dayjs, Dayjs] | "today" | "yesterday" | "last_3_days" | "last_7_days" | "last_30_days" | "last_90_days" | "last_180_days" | "tomorrow" | "next_3_days" | "next_7_days" | "next_30_days" | "next_90_days" | "next_180_days";
     key?: string | undefined;
 } | {
     label: string | undefined;
-    getValue: () => [import("dayjs").Dayjs, import("dayjs").Dayjs] | "today" | "yesterday" | "last_3_days" | "last_7_days" | "last_30_days" | "last_90_days" | "last_180_days" | "tomorrow" | "next_3_days" | "next_7_days" | "next_30_days" | "next_90_days" | "next_180_days";
+    getValue: () => [Dayjs, Dayjs] | "today" | "yesterday" | "last_3_days" | "last_7_days" | "last_30_days" | "last_90_days" | "last_180_days" | "tomorrow" | "next_3_days" | "next_7_days" | "next_30_days" | "next_90_days" | "next_180_days";
 })[];
 /**
  * 获取预设的label
@@ -32,4 +33,10 @@ export declare const getShortcutValue: (value: string, preset: any[]) => any;
  * @param value
  * @param preset
  */
-export declare const getDatePickerValueByShortcut: (value: string, preset: any[]) => any;
+export declare const getDatePickerValueByShortcut: (value: string, preset?: any[]) => any;
+/**
+ * 获取datePicker 时间值 [dayjs,dayjs]
+ * @param value
+ * @param preset
+ */
+export declare const getDatePickerValue: (value: string | Dayjs[], preset?: any[]) => any;

package/es/utils/index.js

@@ -5,7 +5,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { isFunction, isMobile as isMobileUtils, isString } from "@pisell/utils";
-import { presetDetailMap, presetValueArr } from "../constants";
+import { defaultPresets, presetDetailMap, presetValueArr } from "../constants";
 export var getCurrentLocale = function getCurrentLocale() {
   var locale = localStorage.getItem("umi_locale") || "en-US";
   //@ts-ignore
@@ -80,9 +80,9 @@ export var getPresetLabel = function getPresetLabel(currentShortcut, presets) {
  */
 export var getShortcutValue = function getShortcutValue(value, preset) {
   var _preset$find;
-  return (_preset$find = preset.find(function (item) {
+  return ((_preset$find = preset.find(function (item) {
     return item.value === value || item.label === value;
-  })) === null || _preset$find === void 0 ? void 0 : _preset$find.getValue();
+  })) === null || _preset$find === void 0 ? void 0 : _preset$find.getValue()) || [];
 };
 
 /**
@@ -91,6 +91,18 @@ export var getShortcutValue = function getShortcutValue(value, preset) {
  * @param preset
  */
 export var getDatePickerValueByShortcut = function getDatePickerValueByShortcut(value, preset) {
-  var p = formatPresets(preset);
+  var p = formatPresets(preset || defaultPresets);
   return getShortcutValue(value, p);
+};
+
+/**
+ * 获取datePicker 时间值 [dayjs,dayjs]
+ * @param value
+ * @param preset
+ */
+export var getDatePickerValue = function getDatePickerValue(value, preset) {
+  if (isString(value)) {
+    return getDatePickerValueByShortcut(value, preset);
+  }
+  return value;
 };

package/lib/index.d.ts

@@ -19,5 +19,5 @@ export type { DateRange, RangePosition } from "./internals/models/range";
 export type { UseDateRangeFieldProps } from "./internals/models/dateRange";
 export { PisellDateRangePicker as RangePicker };
 export { LocaleContext, LocaleProvider };
-export { getDatePickerValueByShortcut, formatPresets, getShortcutValue, getPresetLabel, } from "./utils/index";
+export { getDatePickerValueByShortcut, formatPresets, getShortcutValue, getPresetLabel, getDatePickerValue, } from "./utils/index";
 export * from "./models";

package/lib/index.js

@@ -34,6 +34,7 @@ __export(src_exports, {
   LocaleProvider: () => import_LocaleContext.LocaleProvider,
   RangePicker: () => import_PisellDateRangePicker.default,
   formatPresets: () => import_utils.formatPresets,
+  getDatePickerValue: () => import_utils.getDatePickerValue,
   getDatePickerValueByShortcut: () => import_utils.getDatePickerValueByShortcut,
   getPresetLabel: () => import_utils.getPresetLabel,
   getShortcutValue: () => import_utils.getShortcutValue
@@ -63,6 +64,7 @@ __reExport(src_exports, require("./models"), module.exports);
   LocaleProvider,
   RangePicker,
   formatPresets,
+  getDatePickerValue,
   getDatePickerValueByShortcut,
   getPresetLabel,
   getShortcutValue,

package/lib/utils/index.d.ts

@@ -1,4 +1,5 @@
 import { PresetType } from "../Shortcuts";
+import { Dayjs } from "dayjs";
 export declare const getCurrentLocale: () => string;
 export declare const isBrowser: boolean;
 export declare const isMobile: () => boolean;
@@ -8,12 +9,12 @@ export declare const isMobile: () => boolean;
  */
 export declare const formatPresets: (presets: PresetType[]) => ({
     label: any;
-    getValue: (() => import("dayjs").Dayjs[]) | (() => [import("dayjs").Dayjs, import("dayjs").Dayjs] | "today" | "yesterday" | "last_3_days" | "last_7_days" | "last_30_days" | "last_90_days" | "last_180_days" | "tomorrow" | "next_3_days" | "next_7_days" | "next_30_days" | "next_90_days" | "next_180_days");
-    value: [import("dayjs").Dayjs, import("dayjs").Dayjs] | "today" | "yesterday" | "last_3_days" | "last_7_days" | "last_30_days" | "last_90_days" | "last_180_days" | "tomorrow" | "next_3_days" | "next_7_days" | "next_30_days" | "next_90_days" | "next_180_days";
+    getValue: (() => Dayjs[]) | (() => [Dayjs, Dayjs] | "today" | "yesterday" | "last_3_days" | "last_7_days" | "last_30_days" | "last_90_days" | "last_180_days" | "tomorrow" | "next_3_days" | "next_7_days" | "next_30_days" | "next_90_days" | "next_180_days");
+    value: [Dayjs, Dayjs] | "today" | "yesterday" | "last_3_days" | "last_7_days" | "last_30_days" | "last_90_days" | "last_180_days" | "tomorrow" | "next_3_days" | "next_7_days" | "next_30_days" | "next_90_days" | "next_180_days";
     key?: string | undefined;
 } | {
     label: string | undefined;
-    getValue: () => [import("dayjs").Dayjs, import("dayjs").Dayjs] | "today" | "yesterday" | "last_3_days" | "last_7_days" | "last_30_days" | "last_90_days" | "last_180_days" | "tomorrow" | "next_3_days" | "next_7_days" | "next_30_days" | "next_90_days" | "next_180_days";
+    getValue: () => [Dayjs, Dayjs] | "today" | "yesterday" | "last_3_days" | "last_7_days" | "last_30_days" | "last_90_days" | "last_180_days" | "tomorrow" | "next_3_days" | "next_7_days" | "next_30_days" | "next_90_days" | "next_180_days";
 })[];
 /**
  * 获取预设的label
@@ -32,4 +33,10 @@ export declare const getShortcutValue: (value: string, preset: any[]) => any;
  * @param value
  * @param preset
  */
-export declare const getDatePickerValueByShortcut: (value: string, preset: any[]) => any;
+export declare const getDatePickerValueByShortcut: (value: string, preset?: any[]) => any;
+/**
+ * 获取datePicker 时间值 [dayjs,dayjs]
+ * @param value
+ * @param preset
+ */
+export declare const getDatePickerValue: (value: string | Dayjs[], preset?: any[]) => any;

package/lib/utils/index.js

@@ -21,6 +21,7 @@ var utils_exports = {};
 __export(utils_exports, {
   formatPresets: () => formatPresets,
   getCurrentLocale: () => getCurrentLocale,
+  getDatePickerValue: () => getDatePickerValue,
   getDatePickerValueByShortcut: () => getDatePickerValueByShortcut,
   getPresetLabel: () => getPresetLabel,
   getShortcutValue: () => getShortcutValue,
@@ -84,16 +85,23 @@ var getPresetLabel = (currentShortcut, presets) => {
 };
 var getShortcutValue = (value, preset) => {
   var _a;
-  return (_a = preset.find((item) => item.value === value || item.label === value)) == null ? void 0 : _a.getValue();
+  return ((_a = preset.find((item) => item.value === value || item.label === value)) == null ? void 0 : _a.getValue()) || [];
 };
 var getDatePickerValueByShortcut = (value, preset) => {
-  const p = formatPresets(preset);
+  const p = formatPresets(preset || import_constants.defaultPresets);
   return getShortcutValue(value, p);
 };
+var getDatePickerValue = (value, preset) => {
+  if ((0, import_utils.isString)(value)) {
+    return getDatePickerValueByShortcut(value, preset);
+  }
+  return value;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   formatPresets,
   getCurrentLocale,
+  getDatePickerValue,
   getDatePickerValueByShortcut,
   getPresetLabel,
   getShortcutValue,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/date-picker",
-  "version": "1.0.77",
+  "version": "1.0.79",
   "sideEffects": [
     "*.less"
   ],