From 7bab03d643f9fad57f571c23dbc0d895f913c3ca Mon Sep 17 00:00:00 2001 From: qiang Date: Fri, 28 May 2021 15:49:28 +0800 Subject: [PATCH] fix(mp): upx2px ignore config --- packages/uni-api/src/service/base/upx2px.ts | 12 +++++++----- packages/uni-h5/dist/uni-h5.es.js | 10 ++++++---- packages/uni-mp-alipay/dist/uni.api.esm.js | 3 ++- packages/uni-mp-baidu/dist/uni.api.esm.js | 3 ++- packages/uni-mp-qq/dist/uni.api.esm.js | 3 ++- packages/uni-mp-toutiao/dist/uni.api.esm.js | 3 ++- packages/uni-mp-weixin/dist/uni.api.esm.js | 3 ++- packages/uni-quickapp-webview/dist/uni.api.esm.js | 3 ++- 8 files changed, 25 insertions(+), 15 deletions(-) diff --git a/packages/uni-api/src/service/base/upx2px.ts b/packages/uni-api/src/service/base/upx2px.ts index a79e08e8f..25b4ce88a 100644 --- a/packages/uni-api/src/service/base/upx2px.ts +++ b/packages/uni-api/src/service/base/upx2px.ts @@ -39,12 +39,14 @@ export const upx2px = defineSyncApi( if (number === 0) { return 0 } - const config = __uniConfig.globalStyle || {} - // ignore rpxCalcIncludeWidth - const maxWidth = checkValue(config.rpxCalcMaxDeviceWidth, 960) - const baseWidth = checkValue(config.rpxCalcBaseDeviceWidth, 375) let width = newDeviceWidth || deviceWidth - width = width <= maxWidth ? width : baseWidth + 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 if (result < 0) { result = -result diff --git a/packages/uni-h5/dist/uni-h5.es.js b/packages/uni-h5/dist/uni-h5.es.js index 4a5af42d3..0907c625b 100644 --- a/packages/uni-h5/dist/uni-h5.es.js +++ b/packages/uni-h5/dist/uni-h5.es.js @@ -9919,11 +9919,13 @@ const upx2px = /* @__PURE__ */ defineSyncApi(API_UPX2PX, (number, newDeviceWidth if (number === 0) { return 0; } - const config = __uniConfig.globalStyle || {}; - const maxWidth = checkValue(config.rpxCalcMaxDeviceWidth, 960); - const baseWidth = checkValue(config.rpxCalcBaseDeviceWidth, 375); let width = newDeviceWidth || deviceWidth; - width = width <= maxWidth ? width : baseWidth; + { + 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; if (result < 0) { result = -result; diff --git a/packages/uni-mp-alipay/dist/uni.api.esm.js b/packages/uni-mp-alipay/dist/uni.api.esm.js index f6689d4e4..998a9d070 100644 --- a/packages/uni-mp-alipay/dist/uni.api.esm.js +++ b/packages/uni-mp-alipay/dist/uni.api.esm.js @@ -232,7 +232,8 @@ const upx2px = defineSyncApi(API_UPX2PX, (number, newDeviceWidth) => { if (number === 0) { return 0; } - let result = (number / BASE_DEVICE_WIDTH) * (newDeviceWidth || deviceWidth); + let width = newDeviceWidth || deviceWidth; + let result = (number / BASE_DEVICE_WIDTH) * width; if (result < 0) { result = -result; } diff --git a/packages/uni-mp-baidu/dist/uni.api.esm.js b/packages/uni-mp-baidu/dist/uni.api.esm.js index 1483956c7..5aa2de859 100644 --- a/packages/uni-mp-baidu/dist/uni.api.esm.js +++ b/packages/uni-mp-baidu/dist/uni.api.esm.js @@ -232,7 +232,8 @@ const upx2px = defineSyncApi(API_UPX2PX, (number, newDeviceWidth) => { if (number === 0) { return 0; } - let result = (number / BASE_DEVICE_WIDTH) * (newDeviceWidth || deviceWidth); + let width = newDeviceWidth || deviceWidth; + let result = (number / BASE_DEVICE_WIDTH) * width; if (result < 0) { result = -result; } diff --git a/packages/uni-mp-qq/dist/uni.api.esm.js b/packages/uni-mp-qq/dist/uni.api.esm.js index aba065d2f..54ee8a224 100644 --- a/packages/uni-mp-qq/dist/uni.api.esm.js +++ b/packages/uni-mp-qq/dist/uni.api.esm.js @@ -232,7 +232,8 @@ const upx2px = defineSyncApi(API_UPX2PX, (number, newDeviceWidth) => { if (number === 0) { return 0; } - let result = (number / BASE_DEVICE_WIDTH) * (newDeviceWidth || deviceWidth); + let width = newDeviceWidth || deviceWidth; + let result = (number / BASE_DEVICE_WIDTH) * width; if (result < 0) { result = -result; } diff --git a/packages/uni-mp-toutiao/dist/uni.api.esm.js b/packages/uni-mp-toutiao/dist/uni.api.esm.js index afbc9a949..5266f86b4 100644 --- a/packages/uni-mp-toutiao/dist/uni.api.esm.js +++ b/packages/uni-mp-toutiao/dist/uni.api.esm.js @@ -232,7 +232,8 @@ const upx2px = defineSyncApi(API_UPX2PX, (number, newDeviceWidth) => { if (number === 0) { return 0; } - let result = (number / BASE_DEVICE_WIDTH) * (newDeviceWidth || deviceWidth); + let width = newDeviceWidth || deviceWidth; + let result = (number / BASE_DEVICE_WIDTH) * width; if (result < 0) { result = -result; } diff --git a/packages/uni-mp-weixin/dist/uni.api.esm.js b/packages/uni-mp-weixin/dist/uni.api.esm.js index 3597aafe4..5c7f3ff56 100644 --- a/packages/uni-mp-weixin/dist/uni.api.esm.js +++ b/packages/uni-mp-weixin/dist/uni.api.esm.js @@ -232,7 +232,8 @@ const upx2px = defineSyncApi(API_UPX2PX, (number, newDeviceWidth) => { if (number === 0) { return 0; } - let result = (number / BASE_DEVICE_WIDTH) * (newDeviceWidth || deviceWidth); + let width = newDeviceWidth || deviceWidth; + let result = (number / BASE_DEVICE_WIDTH) * width; if (result < 0) { result = -result; } diff --git a/packages/uni-quickapp-webview/dist/uni.api.esm.js b/packages/uni-quickapp-webview/dist/uni.api.esm.js index cd9bba97b..bd6e7e8a6 100644 --- a/packages/uni-quickapp-webview/dist/uni.api.esm.js +++ b/packages/uni-quickapp-webview/dist/uni.api.esm.js @@ -232,7 +232,8 @@ const upx2px = defineSyncApi(API_UPX2PX, (number, newDeviceWidth) => { if (number === 0) { return 0; } - let result = (number / BASE_DEVICE_WIDTH) * (newDeviceWidth || deviceWidth); + let width = newDeviceWidth || deviceWidth; + let result = (number / BASE_DEVICE_WIDTH) * width; if (result < 0) { result = -result; } -- GitLab