feat(uni-app-x web): 补充getDeviceInfo缺失的属性

dcloudio · May 18, 2024 · 7ea7d03 · 7ea7d03
1 parent 25dba6f
commit 7ea7d03
Showing 1 changed file with 24 additions and 14 deletions.
diff --git a/packages/uni-h5/src/service/api/device/getSystemInfoSync.ts b/packages/uni-h5/src/service/api/device/getSystemInfoSync.ts
@@ -31,22 +31,32 @@ export const getDeviceInfo = defineSyncApi<typeof uni.getDeviceInfo>(
       system,
       deviceOrientation,
       deviceType,
+      osname,
+      osversion,
     } = browserInfo
 
-    return {
-      brand,
-      deviceBrand,
-      deviceModel,
-      devicePixelRatio: __NODE_JS__ ? 1 : window.devicePixelRatio,
-      deviceId: __NODE_JS__
-        ? Date.now() + '' + Math.floor(Math.random() * 1e7)
-        : deviceId(),
-      deviceOrientation,
-      deviceType,
-      model,
-      platform,
-      system,
-    }
+    return extend(
+      {
+        brand,
+        deviceBrand,
+        deviceModel,
+        devicePixelRatio: __NODE_JS__ ? 1 : window.devicePixelRatio,
+        deviceId: __NODE_JS__
+          ? Date.now() + '' + Math.floor(Math.random() * 1e7)
+          : deviceId(),
+        deviceOrientation,
+        deviceType,
+        model,
+        platform,
+        system,
+      },
+      __X__
+        ? {
+            osName: osname ? osname.toLocaleLowerCase() : undefined,
+            osVersion: osversion,
+          }
+        : {}
+    )
   }
 )
 export const getAppBaseInfo = defineSyncApi<typeof uni.getAppBaseInfo>(