@gm-pc/react 1.24.9-beta.7 → 1.25.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-pc/react",
-  "version": "1.24.9-beta.7",
+  "version": "1.25.0-beta.0",
   "description": "观麦前端基础组件库",
   "author": "liyatang <liyatang@qq.com>",
   "homepage": "https://github.com/gmfe/gm-pc#readme",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@gm-common/hooks": "^2.10.0",
     "@gm-common/tool": "^2.10.0",
-    "@gm-pc/locales": "^1.24.9-beta.7",
+    "@gm-pc/locales": "^1.25.0-beta.0",
     "big.js": "^6.0.1",
     "classnames": "^2.2.5",
     "lodash": "^4.17.19",
@@ -48,5 +48,5 @@
     "react-router-dom": "^5.2.0",
     "react-window": "^1.8.5"
   },
-  "gitHead": "0fbb1757088b94b142b675faa35142c6d78acbe2"
+  "gitHead": "e89cf336258d6b3ae239a7f2f82070d274df4884"
 }

package/src/component/calendar/types.ts

@@ -49,6 +49,8 @@ interface CalendarProps {
   style?: CSSProperties
   /* 全键盘 */
   onKeyDown?(event: KeyboardEvent<HTMLDivElement>): void
+  /** 选择日期之后是否保留时间 */
+  preserveTime?: boolean
 }
 
 export type { DisabledYearAndMonth, RangeCalendarProps, CalendarProps }

package/src/component/date_picker/date_picker.tsx

@@ -45,6 +45,8 @@ export interface DatePickerProps {
   timeLimit?: TimeLimit
   /* 目前内部用，触发方式 */
   popoverType?: PopoverTrigger
+  /** 选择日期之后是否保留时间 */
+  preserveTime?: boolean
 }
 
 class DatePicker extends Component<DatePickerProps, DatePickerState> {
@@ -138,6 +140,7 @@ class DatePicker extends Component<DatePickerProps, DatePickerState> {
       enabledTimeSelect,
       popoverType,
       children,
+      preserveTime,
       ...rest
     } = this.props
     const { willActiveSelected } = this.state
@@ -151,6 +154,7 @@ class DatePicker extends Component<DatePickerProps, DatePickerState> {
         min={min}
         timeLimit={timeLimit!}
         enabledTimeSelect={enabledTimeSelect}
+        preserveTime={preserveTime}
       />
     )
     return (

package/src/component/date_picker/overlay.tsx

@@ -19,6 +19,7 @@ interface OverlayProps {
   disabledDate?(date: Date): boolean
   timeLimit: TimeLimit
   enabledTimeSelect?: boolean
+  preserveTime?: boolean
 }
 
 const Overlay: FC<OverlayProps> = ({
@@ -30,6 +31,7 @@ const Overlay: FC<OverlayProps> = ({
   timeLimit,
   disabledDate,
   enabledTimeSelect,
+  preserveTime,
 }) => {
   const [selectedDate, setSelectedDate] = useState(date)
 
@@ -62,6 +64,13 @@ const Overlay: FC<OverlayProps> = ({
     if (type === 'date') {
       date = value
       time = getTime(value)
+      if (preserveTime && selectedDate) {
+        // 不修改时分秒，否则会导致时间变化
+        time = moment(date)
+          .set('hour', selectedDate.getHours())
+          .set('minute', selectedDate.getMinutes())
+          .toDate()
+      }
     } else {
       date = selectedDate!
       time = value

package/src/component/date_picker/stories.tsx

@@ -93,6 +93,7 @@ export const ComDatePickerWithTimeSelect = () => (
   <>
     <div className='gm-margin-tb-10'>增加时间选择</div>
     <DatePicker
+      preserveTime
       date={addTimeStore.date}
       placeholder='请选择日期'
       onChange={(date) => {