@ledvance/ui-biz-bundle 1.1.169 → 1.1.170

package/package.json

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

package/src/newModules/energyConsumption/EnergyConsumptionPage.tsx

@@ -303,6 +303,11 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
 
   const updateEnergyData = (data: EnergyData) => {
     updatePrice(devId, data).then()
+    state.network_fixed_data = {
+      unit: data.unit,
+      energyType: 'fixed',
+      [isGeneration ? 'generatePrice' : 'price']: data.price,
+    }
     state.price = data.price || '0'
     state.unit = data.unit
     state.energyType = 'fixed'
@@ -709,7 +714,7 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
             title={state.popupType === 'co2' ? I18n.getLang('consumption_data_field3_co2_topic_text') : state.popupType === 'history' ? I18n.getLang('group_energytotal') : ''}
             cancelText={['co2', 'history'].includes(state.popupType) ? '' : I18n.getLang("auto_scan_system_cancel")}
             confirmText={I18n.getLang(['co2', 'history'].includes(state.popupType) ? 'home_screen_home_dialog_yes_con' : 'auto_scan_system_wifi_confirm')}
-            energyData={{ price: state.price, unit: state.unit }}
+            energyData={{ price: state.popupType === 'money' ? (state.network_fixed_data?.price ?? '0'): state.price , unit: state.unit }}
             energyHistory={state.energyGeneration.history}
             onConfirm={(energyData) => {
               state.popupType = ''

package/src/newModules/energyConsumption/SetSegmentPricesContract.tsx

@@ -389,6 +389,7 @@ export const useSetSegmentPrice = (params: SetSegmentedPricesParams, theme?: The
                 bottom: 0,
                 left: 0,
                 width: cx(40),
+                minHeight: cx(320),
             },
             segmentItem: {
                 position: 'relative',

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

@@ -78,16 +78,25 @@ const PowerLineChart = (props: PowerLineChartProps) => {
       triggerOn: 'mousemove|click',
       trigger: 'axis',
       position: ['30%', '50%'],
-      formatter: function (params) {
-        if (!params || !params.length) return ''
-        var item = params[0]
-        var date = new Date(item.value[0])
-        function pad(num) {
-          return num < 10 ? '0' + num : num
+      axisPointer: {
+        label: {
+          backgroundColor: '#6a7985',
+          // 这个 formatter 只负责格式化时间
+          formatter: (params: { value: number }) => {
+            const date = new Date(params.value);
+
+            const month = (date.getMonth() + 1).toString().padStart(2, '0');
+            const day = date.getDate().toString().padStart(2, '0');
+            const year = date.getFullYear();
+
+            const hours = date.getHours().toString().padStart(2, '0');
+            const minutes = date.getMinutes().toString().padStart(2, '0');
+            const seconds = date.getSeconds().toString().padStart(2, '0');
+
+            // 返回你指定的 DD/MM/YYYY HH:mm:SS 格式
+            return day + '/' + month + '/' + year + ' ' + hours + ':' + minutes + ':' + seconds;
+          }
         }
-        var time = pad(date.getMonth() + 1) + '/' + pad(date.getDate()) + '/' + date.getFullYear() + ' ' +
-          pad(date.getHours()) + ':' + pad(date.getMinutes()) + ':' + pad(date.getSeconds())
-        return (time + '<br/>' + item.marker + item.seriesName + ': ' + item.value[1])
       }
     },
     grid: {