@ledvance/ui-biz-bundle 1.1.99 → 1.1.101

package/package.json

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

package/src/modules/flags/FlagActions.ts

@@ -72,7 +72,8 @@ export const useFlag: UseFlagType = (flagCode, extra) => {
       return setDps(extraDps)
     } else {
       const hex = obj2Dp(flagItem, extra)
-      return setDps({ [flagCode]: hex, [extra.workModeCode]: WORK_MODE.SCENE, [extra.switchLedCode]: true })
+      const newHex = extra.isSolarLight ? ('01'+hex.substring(2)) : hex
+      return setDps({ [flagCode]: newHex, [extra.workModeCode]: WORK_MODE.SCENE, [extra.switchLedCode]: true })
     }
   }
   return [flagState, setFlagFn]

package/src/modules/flags/FlagPage.tsx

@@ -36,6 +36,7 @@ export interface FlagPageProps {
   isStringLight?: boolean
   isStripLight?: boolean
   isCeilingLight?: boolean
+  isSolarLight?: boolean
   isSupportMixScene?: boolean
   isSupportSceneStatus?: boolean
   drawToolLight?: {

package/src/newModules/energyConsumption/EnergyConsumptionActions.ts

@@ -72,10 +72,6 @@ const getDpResultByYearMonth = async (devId: string, addEleDpCode: string, dateS
   const date = dayjs(dateStr)
   const startDay = date.startOf('month').format('YYYYMMDD')
   const endDay = date.endOf('month').format('YYYYMMDD')
-  if (overDays(startDay, 365)) {
-    console.log("getDpResultByYearMonth overDays true")
-    return []
-  }
   const res = await getDataWithSpecified(devId, addEleDpCode, startDay, endDay, 'sum')
   if (!isEmpty(res) && res.result) {
     const dayList = res.result

package/src/newModules/energyConsumption/EnergyConsumptionChart.tsx

@@ -82,6 +82,7 @@ const EnergyConsumptionChart = (props: { theme?: ThemeType }) => {
   useUpdateEffect(() => {
     state.over365Days = overDays(state.date, 365);
     state.over7Days = overDays(state.date, 7);
+    updateHeadlineText(dayjs(state.date));
     state.loading = true;
     getElectricity(devId, addEleDpCode, state.date, state.dateType).then((res) => {
       state.chartData = res;
@@ -99,25 +100,38 @@ const EnergyConsumptionChart = (props: { theme?: ThemeType }) => {
     return I18n.getLang('energyconsumption_emptydata')
   }, [state.dateType, state.over365Days, state.over7Days]);
 
+  const updateHeadlineText = useCallback((date: dayjs.Dayjs) => {
+    const year = date.year().toString();
+    const month = (date.month() + 1).toString().padStart(2, '0');
+    const day = date.date().toString().padStart(2, '0');
+    const dayOfWeek = date.day() % 7;
+    switch (state.dateType) {
+      case DateType.Year:
+        state.headlineText = year;
+        break
+      case DateType.Month:
+        state.headlineText = `${monthFormat(month)} ${year}`;
+        break
+      case DateType.Day:
+        state.headlineText = `${day}/${month}/${year}\n${loopsText[dayOfWeek]}`;
+        break
+    }
+  }, [state.dateType, state.headlineText]);
 
   useUpdateEffect(() => {
     const date = dayjs();
     const year = date.year().toString();
     const month = (date.month() + 1).toString().padStart(2, '0');
     const day = date.date().toString().padStart(2, '0');
-    const dayOfWeek = date.day() % 7;
     switch (state.dateType) {
       case DateType.Year:
         state.date = year;
-        state.headlineText = year;
         break
       case DateType.Month:
         state.date = `${year}${month}`
-        state.headlineText = `${monthFormat(month)} ${year}`;
         break
       case DateType.Day:
         state.date = `${year}${month}${day}`
-        state.headlineText = `${day}/${month}/${year}\n${loopsText[dayOfWeek]}`;
         break
     }
   }, [state.dateType]);
@@ -170,7 +184,7 @@ const EnergyConsumptionChart = (props: { theme?: ThemeType }) => {
                 </View>
             ) : (
                 state.chartData.length > 0 && !state.loading &&
-                <NewBarChart height={400} data={state.chartData} price={state.price}
+                <NewBarChart height={cx(400)} data={state.chartData} price={state.price}
                              unit={unit}/>
             )
           }

package/src/newModules/mood/Interface.ts

@@ -87,6 +87,7 @@ export interface LightCategory {
   isMatterLight?: boolean;
   isCeilingFan?: boolean;
   isUVCFan?: boolean;
+  isSolarLight?: boolean;
 }
 export interface DefMoodOption extends LightCategory{
   isSupportColor: boolean;

package/src/newModules/mood/MoodActions.ts

@@ -187,7 +187,7 @@ export const useMoodScene = (params: MoodPageParams): [MoodInfo, (moodInfo: Mood
       const { mainLamp, secondaryLamp } = moodInfo
       if (params.isMixLight || mainLamp?.nodes?.length) {
         const mainHex = getMoodDp(params.isCeilingLight ? {...moodInfo, id: mainLamp.id!} : moodInfo, params);
-        mainDps[params.mainDp] = mainHex
+        mainDps[params.mainDp] = params.isSolarLight ? ('01' + mainHex.substring(2)) : mainHex
         mainDps[params.mainWorkMode] = WorkMode.Scene;
         mainDps[params.mainSwitch] = true;
       }
@@ -207,7 +207,7 @@ export const useMoodScene = (params: MoodPageParams): [MoodInfo, (moodInfo: Mood
         }
         setDps(secondaryDps).then()
       }
-      mainLamp[params.switchLedDp] = true 
+      mainLamp[params.switchLedDp] = true
     }
     return setDps(mainDps)
   };