@ledvance/group-ui-biz-bundle 1.0.115 → 1.0.117

package/package.json

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

package/src/modules/biorhythm/BiorhythmDetailPage.tsx

@@ -146,9 +146,10 @@ const BiorhythmEditPage = (props: { theme?: ThemeType }) => {
           <View style={{ height: cx(20) }} />
           <TextField
             value={state.planData.name}
-            showError={state.planData.name?.length > 32}
+            showError={state.planData.name?.length > 32 || nameRepeatFlag}
             maxLength={33}
-            errorText={I18n.getLang('add_new_dynamic_mood_alert_text')}
+            tipColor={nameRepeatFlag ? props.theme?.global.error : undefined}
+            errorText={I18n.getLang(nameRepeatFlag ? 'string_light_pp_field_sm_add_error1' : 'add_new_dynamic_mood_alert_text')}
             placeholder={I18n.getLang('add_new_trigger_time_inputfield_value_text')}
             onChangeText={text => {
               state.planData.name = text

package/src/modules/energyConsumption/EnergyConsumptionPage.tsx

@@ -136,9 +136,9 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
     const solarEnergy: number = sum(solarEnergyGenerationRes.map(item => item?.totalElectricity || 0))
     const wifiEnergy: number = sum(wifiEnergyGenerationRes.map(item => item?.totalElectricity || 0))
     // @ts-ignore
-    const solarGroup: DpResultByMonthResData[] = solarRes.filter(v => !v.error);
+    const solarGroup: DpResultByMonthResData[] = solarRes.filter(v => v && !v.error);
     // @ts-ignore
-    const wifiGroup: DpResultByMonthResData[] = wifiRes.filter(v => !v.error);
+    const wifiGroup: DpResultByMonthResData[] = wifiRes.filter(v => v && !v.error);
     // 初始化合并后的对象
     const solarData = getMergeData(solarGroup)
     const wifiData = getMergeData(wifiGroup)

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

@@ -43,6 +43,10 @@ const BarChartWithTouch = (props: BarChartProps) => {
         }
         return max
     }, [dataKwhY]);
+    const gridRight = useMemo(() => {
+        const max = Math.max(...dataPriceY.map(it => Number(it)))
+        return max > 999 ? '12%' : '10%'
+    }, [dataPriceY])
     const option = {
         tooltip: {
             show: true,
@@ -56,6 +60,9 @@ const BarChartWithTouch = (props: BarChartProps) => {
                 color: theme?.global.fontColor,
             }
         },
+        grid: {
+            right: gridRight,
+        },
         xAxis: {
             data: dataX,
             axisTick: {
@@ -160,13 +167,13 @@ const BarChartWithTouch = (props: BarChartProps) => {
         customMapData: {}
     };
     return (
-        <View style={{flex: 1}}>
-            <ECharts
-                option={option}
-                ref={echarts}
-                height={height}
-            />
-        </View>
+      <View style={{flex: 1}}>
+          <ECharts
+            option={option}
+            ref={echarts}
+            height={height}
+          />
+      </View>
     );
 };
 

package/src/modules/fixedTimingForLight/FixedTimingForLightAction.ts

@@ -18,7 +18,7 @@ export interface FixedTimingItem {
   endTime: number
   openTime: number
   closeTime: number
-  settingTime: number 
+  settingTime: number
   color: {
     hue: number
     saturation: number
@@ -26,6 +26,7 @@ export interface FixedTimingItem {
     brightness: number
     temperature: number
   }
+  isColorMode?: boolean
   index?: number
   name?: string
 }

package/src/modules/fixedTimingForLight/FixedTimingForLightDetailPage.tsx

@@ -61,23 +61,25 @@ const FixedTimingForLightDetailPage = (props: { theme?: ThemeType }) => {
   const initItem = newFixedTimingItem();
   const state = useReactive({
     item: params.mode === 'add' ? cloneDeep(initItem) : cloneDeep(params.item),
+    compareItem: params.mode === 'add' ? cloneDeep(initItem) : cloneDeep(params.item),
     onHour: '00',
     onMinute: '01',
     offHour: '00',
     offMinute: '01',
     loading: false,
-    isColorMode: false
   })
 
   useEffect(() => {
     const { brightness, temperature, hue, saturation, value } = state.item.color
-    state.isColorMode = brightness === 0 && temperature === 0 && (hue !== 0 || saturation !== 0 || value !== 0)
-    if (state.isColorMode) {
+    const isColorMode = brightness === 0 && temperature === 0 && (hue !== 0 || saturation !== 0 || value !== 0)
+    if (isColorMode) {
       state.item.color.brightness = 100
     } else {
       state.item.color.saturation = 100
       state.item.color.value = 100
     }
+    state.item.isColorMode = isColorMode
+    state.compareItem = cloneDeep(state.item)
   }, [])
 
   useEffect(() => {
@@ -113,7 +115,7 @@ const FixedTimingForLightDetailPage = (props: { theme?: ThemeType }) => {
   }, [state.item.startTime, state.item.endTime, state.onHour, state.onMinute, state.offHour, state.offMinute])
 
   const showConfirm = useMemo(() => {
-    return !isEqual(state.item, params.mode === 'edit' ? params.item : initItem)
+    return !isEqual(state.item, state.compareItem)
   }, [JSON.stringify(state.item), JSON.stringify(params.item)])
 
   const canSave = useMemo(() => {
@@ -129,11 +131,11 @@ const FixedTimingForLightDetailPage = (props: { theme?: ThemeType }) => {
       ...state.item,
       power: true,
       color: {
-        hue: state.isColorMode ? state.item.color.hue : 0,
-        saturation: state.isColorMode ? state.item.color.saturation : 0,
-        value: state.isColorMode ? state.item.color.value : 0,
-        temperature: state.isColorMode ? 0 : state.item.color.temperature,
-        brightness: state.isColorMode ? 0 : state.item.color.brightness
+        hue: state.item.isColorMode ? state.item.color.hue : 0,
+        saturation: state.item.isColorMode ? state.item.color.saturation : 0,
+        value: state.item.isColorMode ? state.item.color.value : 0,
+        temperature: state.item.isColorMode ? 0 : state.item.color.temperature,
+        brightness: state.item.isColorMode ? 0 : state.item.color.brightness
       },
       settingTime: new Date().getTime()
     };
@@ -317,9 +319,9 @@ const FixedTimingForLightDetailPage = (props: { theme?: ThemeType }) => {
               isSupportColor={params.isSupportColor}
               isSupportBrightness={params.isSupportBrightness}
               isSupportTemperature={params.isSupportTemperature}
-              isColorMode={state.isColorMode}
+              isColorMode={state.item.isColorMode || false}
               reserveSV={true}
-              setIsColorMode={(v) => state.isColorMode = v}
+              setIsColorMode={(v) => state.item.isColorMode = v}
               h={state.item.color.hue}
               s={state.item.color.saturation}
               v={state.item.color.value}

package/src/modules/flags/FlagEditPage.tsx

@@ -215,7 +215,7 @@ const FlagEditPage = (props: { theme?: ThemeType }) => {
             maxLength={33}
             showError={state.mood.name.length > 32 || nameRepeat}
             tipColor={nameRepeat ? props.theme?.global.error : undefined}
-            tipIcon={nameRepeat ? res.ic_text_field_input_error : undefined}
+            tipIcon={nameRepeat ? { uri: res.ic_text_field_input_error } : undefined}
             errorText={I18n.getLang(nameRepeat ? 'string_light_pp_field_sm_add_error1' : 'add_new_dynamic_mood_alert_text')} />
           {(params.moduleParams.isMixLight || params.moduleParams.isCeilingLight) && <><Card style={styles.adjustCard}>
               <Spacer height={cx(16)} />
@@ -391,11 +391,10 @@ const FlagEditPage = (props: { theme?: ThemeType }) => {
                   state.mood.colors = state.mood.colors.map(() => (
                     { h, s, v }
                   ))
-                } else {
-                  state.currentNode.h = h
-                  state.currentNode.s = s
-                  state.currentNode.v = v
                 }
+                state.currentNode.h = h
+                state.currentNode.s = s
+                state.currentNode.v = v
               }}
               onHSVChangeComplete={(h, s, v) => {
                 if (state.colorPaintBucketSelected) {
@@ -403,9 +402,6 @@ const FlagEditPage = (props: { theme?: ThemeType }) => {
                     { h, s, v }
                   ))
                 } else {
-                  state.currentNode.h = h
-                  state.currentNode.s = s
-                  state.currentNode.v = v
                   state.mood.colors = state.mood.colors.map((item, idx) => {
                     if (idx === state.colorPaintBucketIdx) {
                       return { h, s, v }
@@ -413,6 +409,9 @@ const FlagEditPage = (props: { theme?: ThemeType }) => {
                     return item
                   })
                 }
+                state.currentNode.h = h
+                state.currentNode.s = s
+                state.currentNode.v = v
               }}
             />
             <Spacer height={cx(16)} />

package/src/modules/randomTimingForLight/RandomTimingForLightAction.ts

@@ -16,7 +16,7 @@ export interface RandomTimingItem {
   weeks: number[]
   startTime: number
   endTime: number
-  settingTime: number 
+  settingTime: number
   color: {
     hue: number
     saturation: number
@@ -24,6 +24,7 @@ export interface RandomTimingItem {
     brightness: number
     temperature: number
   }
+  isColorMode?: boolean
   index?: number
   name?: string
 }

package/src/modules/randomTimingForLight/RandomTimingForLightDetailPage.tsx

@@ -48,7 +48,8 @@ const newRandomTimingItem = (): RandomTimingItem => {
       value: 100,
       brightness: 100,
       temperature: 0,
-    }
+    },
+    isColorMode: false
   }
 }
 
@@ -58,23 +59,25 @@ const RandomTimingForLightDetailPage = (props: { theme?: ThemeType }) => {
   const initItem = newRandomTimingItem();
   const state = useReactive({
     item: params.mode === 'add' ? cloneDeep(initItem) : cloneDeep(params.item),
+    compareItem: params.mode === 'add' ? cloneDeep(initItem) : cloneDeep(params.item),
     loading: false,
-    isColorMode: false
   })
 
   useEffect(() => {
     const { brightness, temperature, hue, saturation, value } = state.item.color
-    state.isColorMode = brightness === 0 && temperature === 0 && (hue !== 0 || saturation !== 0 || value !== 0)
-    if (state.isColorMode) {
+    const isColorMode = brightness === 0 && temperature === 0 && (hue !== 0 || saturation !== 0 || value !== 0)
+    if (isColorMode) {
       state.item.color.brightness = 100
     } else {
       state.item.color.saturation = 100
       state.item.color.value = 100
     }
+    state.item.isColorMode = isColorMode
+    state.compareItem = cloneDeep(state.item)
   }, [])
 
   const showConfirm = useMemo(() => {
-    return !isEqual(state.item, params.mode === 'edit' ? params.item : initItem)
+    return !isEqual(state.item, state.compareItem)
   }, [JSON.stringify(state.item), JSON.stringify(params.item)])
 
   const canSave = useMemo(() => {
@@ -110,11 +113,11 @@ const RandomTimingForLightDetailPage = (props: { theme?: ThemeType }) => {
           ...state.item,
           power: true,
           color: {
-            hue: state.isColorMode ? state.item.color.hue : 0,
-            saturation: state.isColorMode ? state.item.color.saturation : 0,
-            value: state.isColorMode ? state.item.color.value : 0,
-            temperature: state.isColorMode ? 0 : state.item.color.temperature,
-            brightness: state.isColorMode ? 0 : state.item.color.brightness
+            hue: state.item.isColorMode ? state.item.color.hue : 0,
+            saturation: state.item.isColorMode ? state.item.color.saturation : 0,
+            value: state.item.isColorMode ? state.item.color.value : 0,
+            temperature: state.item.isColorMode ? 0 : state.item.color.temperature,
+            brightness: state.item.isColorMode ? 0 : state.item.color.brightness
           },
           settingTime: new Date().getTime()
         }, true);
@@ -272,9 +275,9 @@ const RandomTimingForLightDetailPage = (props: { theme?: ThemeType }) => {
               isSupportColor={params.isSupportColor}
               isSupportBrightness={params.isSupportBrightness}
               isSupportTemperature={params.isSupportTemperature}
-              isColorMode={state.isColorMode}
+              isColorMode={state.item.isColorMode || false}
               reserveSV={true}
-              setIsColorMode={(v) => state.isColorMode = v}
+              setIsColorMode={(v) => state.item.isColorMode = v}
               h={state.item.color.hue}
               s={state.item.color.saturation}
               v={state.item.color.value}