@pisell/date-picker 1.0.7 → 1.0.8

package/es/ActionBar/index.js

@@ -12,9 +12,9 @@ var ActionBar = function ActionBar(props) {
   var ownerState = props.ownerState,
     onCancel = props.onCancel,
     onOk = props.onOk,
+    onChange = props.onChange,
     showTime = props.showTime;
-  var onChange = ownerState.onChange,
-    value = ownerState.value,
+  var value = ownerState.value,
     slotProps = ownerState.slotProps;
   var _ref = (slotProps === null || slotProps === void 0 ? void 0 : slotProps.shortcuts) || {},
     items = _ref.items;
@@ -22,12 +22,12 @@ var ActionBar = function ActionBar(props) {
   var handleStartChange = function handleStartChange(val) {
     var newValue = _toConsumableArray(value);
     newValue[0] = newValue[0].set("hour", val.get("hour")).set("minute", val.get("minute")).set("second", val.get("second"));
-    onChange(newValue);
+    onChange(newValue, "time");
   };
   var handleEndChange = function handleEndChange(val) {
     var newValue = _toConsumableArray(value);
     newValue[1] = newValue[1].set("hour", val.get("hour")).set("minute", val.get("minute")).set("second", val.get("second"));
-    onChange(newValue);
+    onChange(newValue, "time");
   };
   return /*#__PURE__*/React.createElement("div", {
     className: classNames(props.className, "date-picker-action-bar")

package/es/PisellDateRangePicker/index.d.ts

@@ -7,7 +7,9 @@ export interface PisellDateRangePickerProps {
     defaultValue?: Dayjs[];
     presets?: PresetType[];
     className?: string;
-    showTime?: boolean;
+    showTime?: boolean | {
+        defaultValue: [Dayjs, Dayjs];
+    };
     placeholder?: string;
     disableDate?: (day: Dayjs) => boolean;
     format?: string;

package/es/PisellDateRangePicker/index.js

@@ -1,3 +1,4 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -72,11 +73,16 @@ var PisellDateRangePicker = function PisellDateRangePicker(props) {
       };
     });
   }, [presets]);
-  var handleChange = function handleChange(val) {
-    setValue(val);
+  var handleChange = function handleChange(val, type) {
+    var newVal = val;
+    if (_typeof(showTime) === "object" && showTime !== null && showTime !== void 0 && showTime.defaultValue && type !== 'time') {
+      newVal = newVal.map(function (item, index) {
+        var _showTime$defaultValu, _showTime$defaultValu2, _showTime$defaultValu3, _showTime$defaultValu4, _showTime$defaultValu5, _showTime$defaultValu6;
+        return (item === null || item === void 0 ? void 0 : item.set("hour", showTime === null || showTime === void 0 ? void 0 : (_showTime$defaultValu = showTime.defaultValue) === null || _showTime$defaultValu === void 0 ? void 0 : (_showTime$defaultValu2 = _showTime$defaultValu[index]) === null || _showTime$defaultValu2 === void 0 ? void 0 : _showTime$defaultValu2.get("hour")).set("minute", showTime === null || showTime === void 0 ? void 0 : (_showTime$defaultValu3 = showTime.defaultValue) === null || _showTime$defaultValu3 === void 0 ? void 0 : (_showTime$defaultValu4 = _showTime$defaultValu3[index]) === null || _showTime$defaultValu4 === void 0 ? void 0 : _showTime$defaultValu4.get("minute")).set("second", showTime === null || showTime === void 0 ? void 0 : (_showTime$defaultValu5 = showTime.defaultValue) === null || _showTime$defaultValu5 === void 0 ? void 0 : (_showTime$defaultValu6 = _showTime$defaultValu5[index]) === null || _showTime$defaultValu6 === void 0 ? void 0 : _showTime$defaultValu6.get("second"))) || null;
+      });
+    }
+    setValue(newVal);
   };
-
-  // console.log(_value,'_value');
   return /*#__PURE__*/React.createElement(DateRangePicker
   // defaultValue={defaultValue}
   , {
@@ -98,13 +104,14 @@ var PisellDateRangePicker = function PisellDateRangePicker(props) {
     slotProps: {
       shortcuts: {
         items: _presets,
-        changeImportance: 'set',
+        changeImportance: "set",
         onChange: handleChange
       },
       actionBar: {
         onOk: handleOk,
         onCancel: handleClose,
-        showTime: showTime
+        showTime: showTime,
+        onChange: handleChange
       },
       field: {
         size: "small"

package/lib/ActionBar/index.js

@@ -37,19 +37,19 @@ var import_classnames = __toESM(require("classnames"));
 var import_antd = require("antd");
 var import_index = require("./index.less");
 var ActionBar = (props) => {
-  const { ownerState, onCancel, onOk, showTime } = props;
-  const { onChange, value, slotProps } = ownerState;
+  const { ownerState, onCancel, onOk, onChange, showTime } = props;
+  const { value, slotProps } = ownerState;
   const { items } = (slotProps == null ? void 0 : slotProps.shortcuts) || {};
   const hasShortcuts = !!items.length;
   const handleStartChange = (val) => {
     const newValue = [...value];
     newValue[0] = newValue[0].set("hour", val.get("hour")).set("minute", val.get("minute")).set("second", val.get("second"));
-    onChange(newValue);
+    onChange(newValue, "time");
   };
   const handleEndChange = (val) => {
     const newValue = [...value];
     newValue[1] = newValue[1].set("hour", val.get("hour")).set("minute", val.get("minute")).set("second", val.get("second"));
-    onChange(newValue);
+    onChange(newValue, "time");
   };
   return /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)(props.className, "date-picker-action-bar") }, hasShortcuts && /* @__PURE__ */ import_react.default.createElement("div", { className: "date-picker-action-bar-left" }), /* @__PURE__ */ import_react.default.createElement("div", { className: "date-picker-action-bar-right" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { split: "-" }, showTime ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     import_antd.TimePicker,

package/lib/PisellDateRangePicker/index.d.ts

@@ -7,7 +7,9 @@ export interface PisellDateRangePickerProps {
     defaultValue?: Dayjs[];
     presets?: PresetType[];
     className?: string;
-    showTime?: boolean;
+    showTime?: boolean | {
+        defaultValue: [Dayjs, Dayjs];
+    };
     placeholder?: string;
     disableDate?: (day: Dayjs) => boolean;
     format?: string;

package/lib/PisellDateRangePicker/index.js

@@ -61,7 +61,9 @@ var PisellDateRangePicker = (props) => {
     defaultValue
   } = props;
   const [open, setOpen] = (0, import_react.useState)(false);
-  const [_value, setValue] = (0, import_react.useState)(() => transDayjsArr(propsValue, defaultValue));
+  const [_value, setValue] = (0, import_react.useState)(
+    () => transDayjsArr(propsValue, defaultValue)
+  );
   (0, import_react.useEffect)(() => {
     setValue(transDayjsArr(propsValue, defaultValue));
   }, [propsValue]);
@@ -90,8 +92,17 @@ var PisellDateRangePicker = (props) => {
       };
     });
   }, [presets]);
-  const handleChange = (val) => {
-    setValue(val);
+  const handleChange = (val, type) => {
+    let newVal = val;
+    if (typeof showTime === "object" && (showTime == null ? void 0 : showTime.defaultValue) && type !== "time") {
+      newVal = newVal.map(
+        (item, index) => {
+          var _a, _b, _c, _d, _e, _f;
+          return (item == null ? void 0 : item.set("hour", (_b = (_a = showTime == null ? void 0 : showTime.defaultValue) == null ? void 0 : _a[index]) == null ? void 0 : _b.get("hour")).set("minute", (_d = (_c = showTime == null ? void 0 : showTime.defaultValue) == null ? void 0 : _c[index]) == null ? void 0 : _d.get("minute")).set("second", (_f = (_e = showTime == null ? void 0 : showTime.defaultValue) == null ? void 0 : _e[index]) == null ? void 0 : _f.get("second"))) || null;
+        }
+      );
+    }
+    setValue(newVal);
   };
   return /* @__PURE__ */ React.createElement(
     import_DateRangePicker.DateRangePicker,
@@ -120,7 +131,8 @@ var PisellDateRangePicker = (props) => {
         actionBar: {
           onOk: handleOk,
           onCancel: handleClose,
-          showTime
+          showTime,
+          onChange: handleChange
         },
         field: {
           size: "small"

package/package.json

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