@ledvance/group-ui-biz-bundle 1.0.158 → 1.0.160

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/group-ui-biz-bundle",
   "pid": [],
   "uiid": "",
-  "version": "1.0.158",
+  "version": "1.0.160",
   "scripts": {},
   "dependencies": {
     "@ledvance/base": "^1.x",

package/src/modules/energyConsumption/component/DateSelectedItem.tsx

@@ -14,6 +14,7 @@ interface DateSelectedItemProps extends PropsWithChildren<ViewProps> {
     theme?: ThemeType
     date: string,
     dateType: DateType,
+    minDate?: Date
     onDateChange: (string) => void
 }
 
@@ -43,7 +44,7 @@ const getDateForDateType = (year, month, day, dateType: DateType) => {
 }
 
 export default withTheme(function DateSelectedItem(props: DateSelectedItemProps) {
-    const {dateType, date, onDateChange, theme} = props;
+    const {dateType, date, minDate, onDateChange, theme} = props;
     const state = useReactive({
         showDateModal: false,
         date: date,
@@ -129,6 +130,7 @@ export default withTheme(function DateSelectedItem(props: DateSelectedItemProps)
                     mode={state.modalMode}
                     dateSortKeys={['day', 'month', 'year']}
                     maxDate={new Date()}
+                    minDate={minDate}
                     style={{backgroundColor: theme?.popup.cellBg}}
                     pickerFontColor={theme?.global.fontColor}
                     onDateChange={date => {

package/src/modules/energyConsumption/component/DateSwitch.tsx

@@ -1,5 +1,5 @@
 import ThemeType from "@ledvance/base/src/config/themeType";
-import React, {PropsWithChildren, useCallback, useEffect} from "react";
+import React, {PropsWithChildren, useCallback, useEffect, useMemo} from "react";
 import {Image, TouchableOpacity, View, ViewProps} from "react-native";
 import {Utils} from "tuya-panel-kit";
 import {useReactive} from "ahooks";
@@ -16,11 +16,12 @@ interface DateSwitchProps extends PropsWithChildren<ViewProps> {
     headlineText: string,
     date: string,
     dateType: DateType,
+    minDate?: string,
     onDateChange: (string) => void
 }
 
 export default withTheme(function DateSwitch(props: DateSwitchProps) {
-    const {dateType, date, onDateChange, theme, headlineText} = props;
+    const {dateType, date, minDate, onDateChange, theme, headlineText} = props;
     const state = useReactive({
         date: date,
         dateType: dateType,
@@ -38,8 +39,12 @@ export default withTheme(function DateSwitch(props: DateSwitchProps) {
         state.disableArrowLeft = !canPreChangeDate;
     }, [date, headlineText, dateType]);
 
+    const minDateObj = useMemo(
+      () => (minDate ? new Date(minDate) : undefined),
+      [minDate]);
+
     const canPreOrNextChangeDate = useCallback((datejs: dayjs.Dayjs) => {
-        const minDatejs = dayjs('2000-1-1');
+        const minDatejs = dayjs(minDateObj || '2000-1-1');
         const nowDatejs = dayjs();
         const year = datejs.year();
         const month = (datejs.month() + 1).toString().padStart(2, '0');
@@ -94,6 +99,7 @@ export default withTheme(function DateSwitch(props: DateSwitchProps) {
           style={{flex: 1}}
           dateType={state.dateType}
           date={state.date}
+          minDate={minDateObj}
           onDateChange={date => {
               props.onDateChange(date)
           }}

package/src/modules/timer/TimerPage.tsx

@@ -180,7 +180,7 @@ const TimerPage = (props: { theme?: ThemeType }) => {
                   <LdvPickerView
                       hour={state.hour}
                       minute={state.min}
-                      unit={['h', 'min']}
+                      unit={[I18n.getLang('time_unit_h'), I18n.getLang('socket_settings_switch_off_min')]}
                       setHour={hour => {
                         state.hour = hour
                       }}