@ledvance/ui-biz-bundle 1.1.103 → 1.1.104

package/package.json

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

package/src/newModules/energyConsumption/EnergyConsumptionChart.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback } from "react";
-import {Image, Platform, StyleSheet, View} from "react-native";
+import {Image, Platform, StyleSheet, View, Text} from "react-native";
 import {useRoute} from '@react-navigation/core'
 import Page from "@ledvance/base/src/components/Page";
 import res from "@ledvance/base/src/res";
@@ -139,7 +139,6 @@ const EnergyConsumptionChart = (props: { theme?: ThemeType }) => {
   return (
       <Page
           backText={I18n.getLang('consumption_data_annual_bar_chart_system_back_text')}
-          headlineText={state.headlineText}
           headlineIcon={state.chartData?.length ? res.download_icon : undefined}
           onHeadlineIconClick={() => {
             exportFile(state.chartData,params.price,params.unit)
@@ -147,6 +146,11 @@ const EnergyConsumptionChart = (props: { theme?: ThemeType }) => {
           showGreenery={false}
           loading={state.loading}
           greeneryIcon={res.energy_consumption_greenery}
+          headlineContent={
+            <View style={{alignItems: 'center', justifyContent: 'center', flex: 1, marginStart: cx(24)}}>
+              <Text style={{fontSize: cx(24), color: props.theme?.global.brand}}>{state.headlineText}</Text>
+            </View>
+          }
       >
         <View style={{marginHorizontal: cx(24)}}>
 

package/src/newModules/energyConsumption/component/DateTypeItem.tsx

@@ -15,14 +15,27 @@ interface DateTypeItemProps extends PropsWithChildren<ViewProps> {
     onDateTypeChange: (dateType: DateType) => void
 }
 
+const getDateTypeTitle = (dateType: DateType) => {
+    switch (dateType) {
+        case DateType.Year:
+            return I18n.getLang('year');
+        case DateType.Month:
+            return I18n.getLang('month');
+        case DateType.Day:
+            return I18n.getLang('day');
+    }
+}
+
 export default withTheme(function DateTypeItem(props: DateTypeItemProps) {
     const {dateType} = props;
     const state = useReactive({
         showDateTypeModal: false,
         dateType: dateType,
+        dateTypeTitle: getDateTypeTitle(dateType)
     });
     useUpdateEffect(() => {
         state.dateType = dateType;
+        state.dateTypeTitle = getDateTypeTitle(dateType);
     }, [dateType])
     return (<View style={props.style}>
         <TouchableOpacity
@@ -49,7 +62,7 @@ export default withTheme(function DateTypeItem(props: DateTypeItemProps) {
                     flex: 1,
                     color: props.theme?.textInput.fontColor,
                     fontFamily: 'helvetica_neue_lt_std_roman',
-                }}>{state.dateType}</Text>
+                }}>{state.dateTypeTitle}</Text>
             </View>
         </TouchableOpacity>
 
@@ -59,17 +72,17 @@ export default withTheme(function DateTypeItem(props: DateTypeItemProps) {
             value={state.dateType}
             dataSource={[
                 {
-                    title: I18n.getLang('day'),
+                    title: getDateTypeTitle(DateType.Day),
                     key: DateType.Day,
                     value: DateType.Day,
                 },
                 {
-                    title: I18n.getLang('month'),
+                    title: getDateTypeTitle(DateType.Month),
                     key: DateType.Month,
                     value: DateType.Month,
                 },
                 {
-                    title: I18n.getLang('year'),
+                    title: getDateTypeTitle(DateType.Year),
                     key: DateType.Year,
                     value: DateType.Year,
                 }

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

@@ -7,7 +7,7 @@ import {Utils} from "tuya-panel-kit";
 import {OverviewItem} from "../EnergyConsumptionPage";
 
 const {withTheme} = Utils.ThemeUtils
-
+const cx = Utils.RatioUtils.convertX;
 interface BarChartProps {
     theme?: ThemeType
     data: OverviewItem[],
@@ -61,12 +61,21 @@ const BarChartWithTouch = (props: BarChartProps) => {
             position: 'left',
             axisLabel: {
                 formatter: function (value) {
-                    return parseFloat(value).toFixed(2);
+                    const kwh=parseFloat(value);
+                    let toFixed = 2;
+                    if (kwh >= 100) {
+                        toFixed = 0;
+                    } else if (kwh >= 10) {
+                        toFixed = 1;
+                    }
+                    return kwh.toFixed(toFixed);
                 },
                 color:props.theme?.global.secondFontColor,
             },
             nameTextStyle: {
                 fontSize: 14,
+                align:'left',
+                padding: [0, 0, 0, cx(-30)],
                 color: props.theme?.global.secondFontColor,
             },
         }, {
@@ -79,12 +88,21 @@ const BarChartWithTouch = (props: BarChartProps) => {
             minInterval: 1,
             axisLabel: {
                 formatter: function (value) {
-                    return parseFloat(value).toFixed(1);
+                    const price=parseFloat(value);
+                    let toFixed = 2;
+                    if (price >= 100) {
+                        toFixed = 0;
+                    } else if (price >= 10) {
+                        toFixed = 1;
+                    }
+                    return price.toFixed(toFixed);
                 },
                 color:props.theme?.global.secondFontColor,
             },
             nameTextStyle: {
                 fontSize: 14,
+                align:'right',
+                padding: [0, cx(-30), 0, 0],
                 color: props.theme?.global.secondFontColor,
             },
         }],