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

package/package.json

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

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/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)} />