chore: merge

packages/uni-api/src/service/base/upx2px.ts

@@ -11,6 +11,8 @@ const BASE_DEVICE_WIDTH = 750
 let isIOS = false
 let deviceWidth = 0
 let deviceDPR = 0
+let maxWidth = 960
+let baseWidth = 375
 
 function checkDeviceWidth() {
   const { platform, pixelRatio, windowWidth } = getBaseSystemInfo()
@@ -24,6 +26,13 @@ function checkValue(value: unknown, defaultValue: number) {
   return isNaN(newValue) ? defaultValue : newValue
 }
 
+function checkMaxWidth() {
+  const config = __uniConfig.globalStyle || {}
+  // ignore rpxCalcIncludeWidth
+  maxWidth = checkValue(config.rpxCalcMaxDeviceWidth, 960)
+  baseWidth = checkValue(config.rpxCalcBaseDeviceWidth, 375)
+}
+
 export const upx2px = defineSyncApi<API_TYPE_UPX2PX>(
   API_UPX2PX,
   (number, newDeviceWidth?: number) => {
@@ -33,6 +42,9 @@ export const upx2px = defineSyncApi<API_TYPE_UPX2PX>(
     }
     if (deviceWidth === 0) {
       checkDeviceWidth()
+      if (__PLATFORM__ === 'app' || __PLATFORM__ === 'h5') {
+        checkMaxWidth()
+      }
     }
 
     number = Number(number)
@@ -41,10 +53,6 @@ export const upx2px = defineSyncApi<API_TYPE_UPX2PX>(
     }
     let width = newDeviceWidth || deviceWidth
     if (__PLATFORM__ === 'app' || __PLATFORM__ === 'h5') {
-      const config = __uniConfig.globalStyle || {}
-      // ignore rpxCalcIncludeWidth
-      const maxWidth = checkValue(config.rpxCalcMaxDeviceWidth, 960)
-      const baseWidth = checkValue(config.rpxCalcBaseDeviceWidth, 375)
       width = width <= maxWidth ? width : baseWidth
     }
     let result = (number / BASE_DEVICE_WIDTH) * width

packages/uni-app-plus/dist/uni.runtime.esm.js

@@ -9071,6 +9071,8 @@ const BASE_DEVICE_WIDTH = 750;
 let isIOS$1 = false;
 let deviceWidth = 0;
 let deviceDPR = 0;
+let maxWidth = 960;
+let baseWidth = 375;
 function checkDeviceWidth() {
     const { platform, pixelRatio, windowWidth } = getBaseSystemInfo();
     deviceWidth = windowWidth;
@@ -9081,9 +9083,18 @@ function checkValue(value, defaultValue) {
     const newValue = Number(value);
     return isNaN(newValue) ? defaultValue : newValue;
 }
+function checkMaxWidth() {
+    const config = __uniConfig.globalStyle || {};
+    // ignore rpxCalcIncludeWidth
+    maxWidth = checkValue(config.rpxCalcMaxDeviceWidth, 960);
+    baseWidth = checkValue(config.rpxCalcBaseDeviceWidth, 375);
+}
 const upx2px = defineSyncApi(API_UPX2PX, (number, newDeviceWidth) => {
     if (deviceWidth === 0) {
         checkDeviceWidth();
+        {
+            checkMaxWidth();
+        }
     }
     number = Number(number);
     if (number === 0) {
@@ -9091,10 +9102,6 @@ const upx2px = defineSyncApi(API_UPX2PX, (number, newDeviceWidth) => {
     }
     let width = newDeviceWidth || deviceWidth;
     {
-        const config = __uniConfig.globalStyle || {};
-        // ignore rpxCalcIncludeWidth
-        const maxWidth = checkValue(config.rpxCalcMaxDeviceWidth, 960);
-        const baseWidth = checkValue(config.rpxCalcBaseDeviceWidth, 375);
         width = width <= maxWidth ? width : baseWidth;
     }
     let result = (number / BASE_DEVICE_WIDTH) * width;

packages/uni-core/src/view/init/rem.ts

@@ -20,15 +20,14 @@ function getWindowWidth() {
 }
 
 export function useRem() {
+  const config = __uniConfig.globalStyle || {}
+  // ignore: rpxCalcIncludeWidth
+  const maxWidth = checkValue(config.rpxCalcMaxDeviceWidth, 960)
+  const baseWidth = checkValue(config.rpxCalcBaseDeviceWidth, 375)
   // TODO 与 upx2px 合并抽离逻辑到 shared，区分 service、view
   function updateRem() {
-    const config = __uniConfig.globalStyle || {}
-    // ignore: rpxCalcIncludeWidth
-    const maxWidth = checkValue(config.rpxCalcMaxDeviceWidth, 960)
-    const baseWidth = checkValue(config.rpxCalcBaseDeviceWidth, 375)
     let width = getWindowWidth()
     width = width <= maxWidth ? width : baseWidth
-
     document.documentElement.style.fontSize = width / 23.4375 + 'px'
   }
   updateRem()

packages/uni-h5/dist/uni-h5.es.js

@@ -484,12 +484,12 @@ function getWindowWidth$1() {
   return windowWidth;
 }
 function useRem() {
+  const config = __uniConfig.globalStyle || {};
+  const maxWidth2 = checkValue$1(config.rpxCalcMaxDeviceWidth, 960);
+  const baseWidth2 = checkValue$1(config.rpxCalcBaseDeviceWidth, 375);
   function updateRem() {
-    const config = __uniConfig.globalStyle || {};
-    const maxWidth = checkValue$1(config.rpxCalcMaxDeviceWidth, 960);
-    const baseWidth = checkValue$1(config.rpxCalcBaseDeviceWidth, 375);
     let width = getWindowWidth$1();
-    width = width <= maxWidth ? width : baseWidth;
+    width = width <= maxWidth2 ? width : baseWidth2;
     document.documentElement.style.fontSize = width / 23.4375 + "px";
   }
   updateRem();
@@ -2792,6 +2792,8 @@ const BASE_DEVICE_WIDTH = 750;
 let isIOS = false;
 let deviceWidth = 0;
 let deviceDPR = 0;
+let maxWidth = 960;
+let baseWidth = 375;
 function checkDeviceWidth() {
   const { platform, pixelRatio: pixelRatio2, windowWidth } = getBaseSystemInfo();
   deviceWidth = windowWidth;
@@ -2802,9 +2804,17 @@ function checkValue(value, defaultValue) {
   const newValue = Number(value);
   return isNaN(newValue) ? defaultValue : newValue;
 }
+function checkMaxWidth() {
+  const config = __uniConfig.globalStyle || {};
+  maxWidth = checkValue(config.rpxCalcMaxDeviceWidth, 960);
+  baseWidth = checkValue(config.rpxCalcBaseDeviceWidth, 375);
+}
 const upx2px = /* @__PURE__ */ defineSyncApi(API_UPX2PX, (number, newDeviceWidth) => {
   if (deviceWidth === 0) {
     checkDeviceWidth();
+    {
+      checkMaxWidth();
+    }
   }
   number = Number(number);
   if (number === 0) {
@@ -2812,9 +2822,6 @@ const upx2px = /* @__PURE__ */ defineSyncApi(API_UPX2PX, (number, newDeviceWidth
   }
   let width = newDeviceWidth || deviceWidth;
   {
-    const config = __uniConfig.globalStyle || {};
-    const maxWidth = checkValue(config.rpxCalcMaxDeviceWidth, 960);
-    const baseWidth = checkValue(config.rpxCalcBaseDeviceWidth, 375);
     width = width <= maxWidth ? width : baseWidth;
   }
   let result = number / BASE_DEVICE_WIDTH * width;
@@ -3797,10 +3804,10 @@ const initCanvasContextProperty = /* @__PURE__ */ once(() => {
           };
         case "fillText":
         case "strokeText":
-          return function(text2, x, y, maxWidth) {
+          return function(text2, x, y, maxWidth2) {
             var data = [text2.toString(), x, y];
-            if (typeof maxWidth === "number") {
-              data.push(maxWidth);
+            if (typeof maxWidth2 === "number") {
+              data.push(maxWidth2);
             }
             this.actions.push({
               method: method2,
@@ -6800,8 +6807,8 @@ function useMethods(props2, canvasRef, actionsWaiting) {
   }, resolve) {
     const canvas = canvasRef.value;
     let data;
-    const maxWidth = canvas.offsetWidth - x;
-    width = width ? Math.min(width, maxWidth) : maxWidth;
+    const maxWidth2 = canvas.offsetWidth - x;
+    width = width ? Math.min(width, maxWidth2) : maxWidth2;
     const maxHeight = canvas.offsetHeight - y;
     height = height ? Math.min(height, maxHeight) : maxHeight;
     if (!hidpi) {
@@ -19467,21 +19474,21 @@ function initMediaQuery(minWidth, callback) {
 }
 function useMaxWidth(layoutState, rootRef) {
   const route = usePageRoute();
-  function checkMaxWidth() {
+  function checkMaxWidth2() {
     const windowWidth = document.body.clientWidth;
-    const maxWidth = parseInt(String(__uniConfig.globalStyle.maxWidth || Number.MAX_SAFE_INTEGER));
+    const maxWidth2 = parseInt(String(__uniConfig.globalStyle.maxWidth || Number.MAX_SAFE_INTEGER));
     let showMaxWidth = false;
-    if (windowWidth > maxWidth) {
+    if (windowWidth > maxWidth2) {
       showMaxWidth = true;
     } else {
       showMaxWidth = false;
     }
-    if (showMaxWidth && maxWidth) {
-      layoutState.marginWidth = (windowWidth - maxWidth) / 2;
+    if (showMaxWidth && maxWidth2) {
+      layoutState.marginWidth = (windowWidth - maxWidth2) / 2;
       nextTick(() => {
         const rootEl = rootRef.value;
         if (rootEl) {
-          rootEl.setAttribute("style", "max-width:" + maxWidth + "px;margin:0 auto;");
+          rootEl.setAttribute("style", "max-width:" + maxWidth2 + "px;margin:0 auto;");
         }
       });
     } else {
@@ -19494,10 +19501,10 @@ function useMaxWidth(layoutState, rootRef) {
       });
     }
   }
-  watch([() => route.path], checkMaxWidth);
+  watch([() => route.path], checkMaxWidth2);
   onMounted(() => {
-    checkMaxWidth();
-    window.addEventListener("resize", checkMaxWidth);
+    checkMaxWidth2();
+    window.addEventListener("resize", checkMaxWidth2);
   });
 }
 function useState() {

packages/uni-mp-alipay/dist/uni.api.esm.js

@@ -920,6 +920,22 @@ function addSafeAreaInsets(fromRes, toRes) {
     }
 }
 
+const UUID_KEY = '__DC_STAT_UUID';
+let deviceId;
+function useDeviceId(global = my) {
+    return function addDeviceId(_, toRes) {
+        deviceId = deviceId || global.getStorageSync(UUID_KEY);
+        if (!deviceId) {
+            deviceId = Date.now() + '' + Math.floor(Math.random() * 1e7);
+            my.setStorage({
+                key: UUID_KEY,
+                data: deviceId,
+            });
+        }
+        toRes.deviceId = deviceId;
+    };
+}
+
 const redirectTo = {};
 
 const getProvider = initGetProvider({
@@ -1052,6 +1068,9 @@ function handleNetworkInfo(fromRes, toRes) {
 }
 function handleSystemInfo(fromRes, toRes) {
     addSafeAreaInsets(fromRes, toRes);
+    useDeviceId({
+        getStorageSync,
+    })(fromRes, toRes);
     let platform = fromRes.platform ? fromRes.platform.toLowerCase() : 'devtools';
     if (!~['android', 'ios'].indexOf(platform)) {
         platform = 'devtools';

packages/uni-mp-alipay/src/api/protocols.ts

 import { isPlainObject, isArray, hasOwn } from '@vue/shared'
 
-import { addSafeAreaInsets } from '@dcloudio/uni-mp-core'
+import { addSafeAreaInsets, useDeviceId } from '@dcloudio/uni-mp-core'
+
+import { getStorageSync } from './shims'
 
 export { redirectTo, navigateTo } from '@dcloudio/uni-mp-core'
 
@@ -28,6 +30,9 @@ function handleSystemInfo(
   toRes: UniApp.GetSystemInfoResult
 ) {
   addSafeAreaInsets(fromRes, toRes)
+  useDeviceId({
+    getStorageSync,
+  })(fromRes, toRes)
 
   let platform = fromRes.platform ? fromRes.platform.toLowerCase() : 'devtools'
   if (!~['android', 'ios'].indexOf(platform)) {

packages/uni-mp-baidu/dist/uni.api.esm.js

@@ -920,8 +920,27 @@ function addSafeAreaInsets(fromRes, toRes) {
     }
 }
 
+const UUID_KEY = '__DC_STAT_UUID';
+let deviceId;
+function useDeviceId(global = swan) {
+    return function addDeviceId(_, toRes) {
+        deviceId = deviceId || global.getStorageSync(UUID_KEY);
+        if (!deviceId) {
+            deviceId = Date.now() + '' + Math.floor(Math.random() * 1e7);
+            swan.setStorage({
+                key: UUID_KEY,
+                data: deviceId,
+            });
+        }
+        toRes.deviceId = deviceId;
+    };
+}
+
 const getSystemInfo = {
-    returnValue: addSafeAreaInsets,
+    returnValue: (fromRes, toRes) => {
+        addSafeAreaInsets(fromRes, toRes);
+        useDeviceId()(fromRes, toRes);
+    },
 };
 
 const getSystemInfoSync = getSystemInfo;

packages/uni-mp-core/src/api/protocols/getSystemInfo.ts

 import { addSafeAreaInsets } from './addSafeAreaInsets'
+import { useDeviceId } from './useDeviceId'
 import { MPProtocol } from './types'
 
 export const getSystemInfo: MPProtocol = {
-  returnValue: addSafeAreaInsets,
+  returnValue: (fromRes, toRes) => {
+    addSafeAreaInsets(fromRes, toRes)
+    useDeviceId()(fromRes, toRes)
+  },
 }

packages/uni-mp-core/src/api/protocols/index.ts

 export { addSafeAreaInsets } from './addSafeAreaInsets'
+export { useDeviceId } from './useDeviceId'
 export { getSystemInfo } from './getSystemInfo'
 export { getSystemInfoSync } from './getSystemInfoSync'
 export { redirectTo } from './redirectTo'

packages/uni-mp-core/src/api/protocols/useDeviceId.ts

+const UUID_KEY = '__DC_STAT_UUID'
+let deviceId: string
+interface Global {
+  getStorageSync: UniApp.Uni['getStorageSync']
+}
+export function useDeviceId(global: Global = __GLOBAL__ as Global) {
+  return function addDeviceId(_: any, toRes: UniApp.GetSystemInfoResult) {
+    deviceId = deviceId || global.getStorageSync(UUID_KEY)
+    if (!deviceId) {
+      deviceId = Date.now() + '' + Math.floor(Math.random() * 1e7)
+      __GLOBAL__.setStorage({
+        key: UUID_KEY,
+        data: deviceId,
+      })
+    }
+    toRes.deviceId = deviceId
+  }
+}

packages/uni-mp-core/src/index.ts

@@ -50,6 +50,7 @@ export {
   getSystemInfo,
   getSystemInfoSync,
   addSafeAreaInsets,
+  useDeviceId,
 } from './api/protocols'
 // types
 export { MiniProgramAppOptions, MiniProgramAppInstance } from './runtime/app'

packages/uni-mp-kuaishou/dist/uni.api.esm.js

@@ -920,8 +920,27 @@ function addSafeAreaInsets(fromRes, toRes) {
     }
 }
 
+const UUID_KEY = '__DC_STAT_UUID';
+let deviceId;
+function useDeviceId(global = ks) {
+    return function addDeviceId(_, toRes) {
+        deviceId = deviceId || global.getStorageSync(UUID_KEY);
+        if (!deviceId) {
+            deviceId = Date.now() + '' + Math.floor(Math.random() * 1e7);
+            ks.setStorage({
+                key: UUID_KEY,
+                data: deviceId,
+            });
+        }
+        toRes.deviceId = deviceId;
+    };
+}
+
 const getSystemInfo = {
-    returnValue: addSafeAreaInsets,
+    returnValue: (fromRes, toRes) => {
+        addSafeAreaInsets(fromRes, toRes);
+        useDeviceId()(fromRes, toRes);
+    },
 };
 
 const getSystemInfoSync = getSystemInfo;

packages/uni-mp-qq/dist/uni.api.esm.js

@@ -920,8 +920,27 @@ function addSafeAreaInsets(fromRes, toRes) {
     }
 }
 
+const UUID_KEY = '__DC_STAT_UUID';
+let deviceId;
+function useDeviceId(global = qq) {
+    return function addDeviceId(_, toRes) {
+        deviceId = deviceId || global.getStorageSync(UUID_KEY);
+        if (!deviceId) {
+            deviceId = Date.now() + '' + Math.floor(Math.random() * 1e7);
+            qq.setStorage({
+                key: UUID_KEY,
+                data: deviceId,
+            });
+        }
+        toRes.deviceId = deviceId;
+    };
+}
+
 const getSystemInfo = {
-    returnValue: addSafeAreaInsets,
+    returnValue: (fromRes, toRes) => {
+        addSafeAreaInsets(fromRes, toRes);
+        useDeviceId()(fromRes, toRes);
+    },
 };
 
 const getSystemInfoSync = getSystemInfo;

packages/uni-mp-weixin/dist/uni.api.esm.js

@@ -884,8 +884,27 @@ function addSafeAreaInsets(fromRes, toRes) {
     }
 }
 
+const UUID_KEY = '__DC_STAT_UUID';
+let deviceId;
+function useDeviceId(global = wx) {
+    return function addDeviceId(_, toRes) {
+        deviceId = deviceId || global.getStorageSync(UUID_KEY);
+        if (!deviceId) {
+            deviceId = Date.now() + '' + Math.floor(Math.random() * 1e7);
+            wx.setStorage({
+                key: UUID_KEY,
+                data: deviceId,
+            });
+        }
+        toRes.deviceId = deviceId;
+    };
+}
+
 const getSystemInfo = {
-    returnValue: addSafeAreaInsets,
+    returnValue: (fromRes, toRes) => {
+        addSafeAreaInsets(fromRes, toRes);
+        useDeviceId()(fromRes, toRes);
+    },
 };
 
 const getSystemInfoSync = getSystemInfo;

packages/uni-quickapp-webview/dist/uni.api.esm.js

@@ -920,8 +920,27 @@ function addSafeAreaInsets(fromRes, toRes) {
     }
 }
 
+const UUID_KEY = '__DC_STAT_UUID';
+let deviceId;
+function useDeviceId(global = qa) {
+    return function addDeviceId(_, toRes) {
+        deviceId = deviceId || global.getStorageSync(UUID_KEY);
+        if (!deviceId) {
+            deviceId = Date.now() + '' + Math.floor(Math.random() * 1e7);
+            qa.setStorage({
+                key: UUID_KEY,
+                data: deviceId,
+            });
+        }
+        toRes.deviceId = deviceId;
+    };
+}
+
 const getSystemInfo = {
-    returnValue: addSafeAreaInsets,
+    returnValue: (fromRes, toRes) => {
+        addSafeAreaInsets(fromRes, toRes);
+        useDeviceId()(fromRes, toRes);
+    },
 };
 
 const getSystemInfoSync = getSystemInfo;