Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DCloud
uni-app
提交
7bab03d6
U
uni-app
项目概览
DCloud
/
uni-app
2 个月 前同步成功
通知
717
Star
38705
Fork
3642
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
7
列表
看板
标记
里程碑
合并请求
1
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
7
Issue
7
列表
看板
标记
里程碑
合并请求
1
合并请求
1
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7bab03d6
编写于
5月 28, 2021
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(mp): upx2px ignore config
上级
d3b33bbe
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
25 addition
and
15 deletion
+25
-15
packages/uni-api/src/service/base/upx2px.ts
packages/uni-api/src/service/base/upx2px.ts
+7
-5
packages/uni-h5/dist/uni-h5.es.js
packages/uni-h5/dist/uni-h5.es.js
+6
-4
packages/uni-mp-alipay/dist/uni.api.esm.js
packages/uni-mp-alipay/dist/uni.api.esm.js
+2
-1
packages/uni-mp-baidu/dist/uni.api.esm.js
packages/uni-mp-baidu/dist/uni.api.esm.js
+2
-1
packages/uni-mp-qq/dist/uni.api.esm.js
packages/uni-mp-qq/dist/uni.api.esm.js
+2
-1
packages/uni-mp-toutiao/dist/uni.api.esm.js
packages/uni-mp-toutiao/dist/uni.api.esm.js
+2
-1
packages/uni-mp-weixin/dist/uni.api.esm.js
packages/uni-mp-weixin/dist/uni.api.esm.js
+2
-1
packages/uni-quickapp-webview/dist/uni.api.esm.js
packages/uni-quickapp-webview/dist/uni.api.esm.js
+2
-1
未找到文件。
packages/uni-api/src/service/base/upx2px.ts
浏览文件 @
7bab03d6
...
...
@@ -39,12 +39,14 @@ export const upx2px = defineSyncApi<API_TYPE_UPX2PX>(
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
...
...
packages/uni-h5/dist/uni-h5.es.js
浏览文件 @
7bab03d6
...
...
@@ -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;
...
...
packages/uni-mp-alipay/dist/uni.api.esm.js
浏览文件 @
7bab03d6
...
...
@@ -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
;
}
...
...
packages/uni-mp-baidu/dist/uni.api.esm.js
浏览文件 @
7bab03d6
...
...
@@ -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
;
}
...
...
packages/uni-mp-qq/dist/uni.api.esm.js
浏览文件 @
7bab03d6
...
...
@@ -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
;
}
...
...
packages/uni-mp-toutiao/dist/uni.api.esm.js
浏览文件 @
7bab03d6
...
...
@@ -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
;
}
...
...
packages/uni-mp-weixin/dist/uni.api.esm.js
浏览文件 @
7bab03d6
...
...
@@ -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
;
}
...
...
packages/uni-quickapp-webview/dist/uni.api.esm.js
浏览文件 @
7bab03d6
...
...
@@ -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
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录