@ledvance/group-ui-biz-bundle 1.0.110 → 1.0.112

package/package.json

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

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

@@ -10,7 +10,7 @@ import { useReactive, useUpdateEffect } from "ahooks";
 import { cloneDeep } from "lodash";
 import ThemeType from '@ledvance/base/src/config/themeType'
 
-const { convertX: cx, height } = Utils.RatioUtils
+const { convertX: cx, height, statusBarHeight } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
 
 export const UnitList = [
@@ -57,23 +57,44 @@ const EnergyModal = (props: EnergyModalProps) => {
   };
 
   const getDescription = (string: string) => {
-    const separators = /[.:]/;
-    const text = string.split(separators)
-    const length = text.length - 1
-    return <View>
-      <Text style={{ color: props.theme?.global.fontColor }}>{text[length - 6] + '.'}</Text>
-      <Spacer />
-      <Text style={{ color: props.theme?.global.fontColor }}>{text[length - 5] + '.'}</Text>
-      <Spacer />
-      <Text style={{ color: props.theme?.global.fontColor }}>{text[length - 4] + text[length - 3] + ':'}</Text>
-      <Spacer />
-      <Text
-        style={{ textDecorationLine: 'underline', color: props.theme?.button.primary }}
-        onPress={() => openLink(`${text[length - 2]}:${text[length - 1]}${text[length]}`)}
-      >
-        {`${text[length - 2]}:${text[length - 1]}${text[length]}`}
-      </Text>
-    </View>
+    // 首先提取URL
+    const urlRegex = /(https?:\/\/[^\s]+)$/;
+    const urlMatch = string.match(urlRegex);
+    const url = urlMatch ? urlMatch[0] : '';
+
+    // 移除URL部分以处理正文文本
+    const textWithoutUrl = urlMatch
+      ? string.slice(0, string.lastIndexOf(url)).trim()
+      : string;
+
+    // 分割文本但保留分隔符
+    const sentences:string[] = [];
+    const parts = textWithoutUrl.split(/([.:])/);
+
+    for (let i = 0; i < parts.length - 1; i += 2) {
+      if (i + 1 < parts.length) {
+        sentences.push(parts[i] + parts[i + 1]);
+      }
+    }
+
+    return (
+      <View>
+        {sentences.map((sentence, index) => (
+          <View key={index}>
+            <Text style={{ color: props.theme?.global.fontColor }}>{sentence.trim()}</Text>
+            <Spacer />
+          </View>
+        ))}
+        {url && (
+          <Text
+            style={{ textDecorationLine: 'underline', color: props.theme?.button.primary }}
+            onPress={() => openLink(url)}
+          >
+            {url}
+          </Text>
+        )}
+      </View>
+    );
   }
 
   useUpdateEffect(() =>{
@@ -224,7 +245,7 @@ const EnergyModal = (props: EnergyModalProps) => {
           </View>
         ),
         wrapperStyle: {
-          height: height - cx(40),
+          height: height - statusBarHeight - cx(40),
           backgroundColor: props.theme?.global.background
         },
         footer: (<View style={{ backgroundColor: props.theme?.global.background}}></View>),
@@ -286,7 +307,7 @@ const EnergyModal = (props: EnergyModalProps) => {
             <Text style={{ color: props.theme?.button.primary, fontSize: cx(16) }}>{props.confirmText}</Text>
           </TouchableOpacity>
         </View>
-        <View style={{ height: height - cx(100), paddingHorizontal: cx(16), backgroundColor: props.theme?.global.background }}>
+        <View style={{ height: height - statusBarHeight - cx(100), paddingHorizontal: cx(16), backgroundColor: props.theme?.global.background }}>
           {getContent()}
         </View>
       </ScrollView>