Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
genary
uni-app
提交
03348881
U
uni-app
项目概览
genary
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
03348881
编写于
5月 19, 2021
作者:
D
DCloud_LXH
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: canvas drawImage error
上级
df70b7cd
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
41 addition
and
26 deletion
+41
-26
packages/uni-components/src/components/canvas/index.vue
packages/uni-components/src/components/canvas/index.vue
+14
-5
packages/uni-h5/dist/uni-h5.cjs.js
packages/uni-h5/dist/uni-h5.cjs.js
+5
-2
packages/uni-h5/dist/uni-h5.es.js
packages/uni-h5/dist/uni-h5.es.js
+22
-19
未找到文件。
packages/uni-components/src/components/canvas/index.vue
浏览文件 @
03348881
...
...
@@ -23,15 +23,24 @@
</
template
>
<
script
lang=
"ts"
>
import
{
ref
}
from
"
vue
"
;
import
{
useAttrs
,
useContextInfo
,
useSubscribe
,
withWebEvent
}
from
"
@dcloudio/uni-components
"
;
import
{
useAttrs
,
useContextInfo
,
useSubscribe
,
withWebEvent
,
}
from
"
@dcloudio/uni-components
"
;
import
{
getCurrentPageVm
,
getCurrentPageId
,
onEventPrevent
}
from
"
@dcloudio/uni-core
"
;
import
{
saveImage
,
getSameOriginUrl
}
from
"
@dcloudio/uni-platform
"
;
import
{
saveImage
,
getSameOriginUrl
,
getRealPath
}
from
"
@dcloudio/uni-platform
"
;
import
ResizeSensor
from
"
../resize-sensor
"
;
import
{
useNativeEvent
}
from
"
../../helpers/useEvent
"
;
import
{
pixelRatio
,
wrapper
,
initHidpi
}
from
"
../../helpers/hidpi
"
;
!
__NODE_JS__
&&
initHidpi
();
function
$getRealPath
(
src
){
return
src
?
getRealPath
(
src
)
:
src
}
function
resolveColor
(
color
)
{
color
=
color
.
slice
(
0
);
color
[
3
]
=
color
[
3
]
/
255
;
...
...
@@ -63,7 +72,7 @@ export default {
name
:
"
Canvas
"
,
inheritAttrs
:
false
,
compatConfig
:
{
MODE
:
3
MODE
:
3
,
},
components
:
{
ResizeSensor
,
...
...
@@ -336,11 +345,11 @@ export default {
var
src
=
""
;
if
(
method
===
"
drawImage
"
)
{
src
=
data
[
0
];
src
=
self
.
$getRealPath
(
src
);
src
=
$getRealPath
(
src
);
data
[
0
]
=
src
;
}
else
if
(
method
===
"
setFillStyle
"
&&
data
[
0
]
===
"
pattern
"
)
{
src
=
data
[
1
];
src
=
self
.
$getRealPath
(
src
);
src
=
$getRealPath
(
src
);
data
[
1
]
=
src
;
}
if
(
src
&&
!
self
.
_images
[
src
])
{
...
...
packages/uni-h5/dist/uni-h5.cjs.js
浏览文件 @
03348881
...
...
@@ -1322,6 +1322,9 @@ function wrapper(canvas) {
canvas
.
height
=
canvas
.
offsetHeight
*
pixelRatio
;
canvas
.
getContext
(
"
2d
"
).
__hidpi__
=
true
;
}
function
$getRealPath
(
src
)
{
return
src
?
getRealPath
(
src
)
:
src
;
}
function
resolveColor
(
color
)
{
color
=
color
.
slice
(
0
);
color
[
3
]
=
color
[
3
]
/
255
;
...
...
@@ -1583,11 +1586,11 @@ var _sfc_main$7 = {
var
src
=
""
;
if
(
method
===
"
drawImage
"
)
{
src
=
data
[
0
];
src
=
self
.
$getRealPath
(
src
);
src
=
$getRealPath
(
src
);
data
[
0
]
=
src
;
}
else
if
(
method
===
"
setFillStyle
"
&&
data
[
0
]
===
"
pattern
"
)
{
src
=
data
[
1
];
src
=
self
.
$getRealPath
(
src
);
src
=
$getRealPath
(
src
);
data
[
1
]
=
src
;
}
if
(
src
&&
!
self
.
_images
[
src
])
{
...
...
packages/uni-h5/dist/uni-h5.es.js
浏览文件 @
03348881
...
...
@@ -594,7 +594,7 @@ var safeAreaInsets = {
onChange,
offChange
};
var out = safeAreaInsets;
var
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out = safeAreaInsets;
const onEventPrevent = /* @__PURE__ */ withModifiers(() => {
}, ["prevent"]);
const onEventStop = /* @__PURE__ */ withModifiers(() => {
...
...
@@ -606,10 +606,10 @@ function getWindowOffset() {
const left = parseInt(style.getPropertyValue("--window-left"));
const right = parseInt(style.getPropertyValue("--window-right"));
return {
top: top ? top + out.top : 0,
bottom: bottom ? bottom + out.bottom : 0,
left: left ? left + out.left : 0,
right: right ? right + out.right : 0
top: top ? top +
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out.top : 0,
bottom: bottom ? bottom +
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out.bottom : 0,
left: left ? left +
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out.left : 0,
right: right ? right +
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out.right : 0
};
}
function updateCssVar(cssVars) {
...
...
@@ -1292,7 +1292,7 @@ function normalizePageMeta(pageMeta) {
let offset = rpx2px(refreshOptions.offset);
const {type} = navigationBar;
if (type !== "transparent" && type !== "none") {
offset += NAVBAR_HEIGHT + out.top;
offset += NAVBAR_HEIGHT +
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out.top;
}
refreshOptions.offset = offset;
refreshOptions.height = rpx2px(refreshOptions.height);
...
...
@@ -2519,6 +2519,9 @@ function initHidpi() {
}
}
initHidpi();
function $getRealPath(src) {
return src ? getRealPath(src) : src;
}
function resolveColor(color) {
color = color.slice(0);
color[3] = color[3] / 255;
...
...
@@ -2780,11 +2783,11 @@ var _sfc_main$7 = {
var src = "";
if (method === "drawImage") {
src = data[0];
src =
self.
$getRealPath(src);
src = $getRealPath(src);
data[0] = src;
} else if (method === "setFillStyle" && data[0] === "pattern") {
src = data[1];
src =
self.
$getRealPath(src);
src = $getRealPath(src);
data[1] = src;
}
if (src && !self._images[src]) {
...
...
@@ -14870,7 +14873,7 @@ const getSystemInfoSync = /* @__PURE__ */ defineSyncApi("getSystemInfoSync", ()
const windowWidth = getWindowWidth(screenWidth);
let windowHeight = window.innerHeight;
const language = navigator.language;
const statusBarHeight = out.top;
const statusBarHeight =
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out.top;
let osname;
let osversion;
let model;
...
...
@@ -14983,12 +14986,12 @@ const getSystemInfoSync = /* @__PURE__ */ defineSyncApi("getSystemInfoSync", ()
const system = `${osname} ${osversion}`;
const platform = osname.toLocaleLowerCase();
const safeArea = {
left: out.left,
right: windowWidth - out.right,
top: out.top,
bottom: windowHeight - out.bottom,
width: windowWidth -
out.left -
out.right,
height: windowHeight -
out.top -
out.bottom
left:
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out.left,
right: windowWidth -
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out.right,
top:
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out.top,
bottom: windowHeight -
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out.bottom,
width: windowWidth -
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.left - D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out.right,
height: windowHeight -
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.top - D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out.bottom
};
const {top: windowTop, bottom: windowBottom} = getWindowOffset();
windowHeight -= windowTop;
...
...
@@ -15008,10 +15011,10 @@ const getSystemInfoSync = /* @__PURE__ */ defineSyncApi("getSystemInfoSync", ()
model,
safeArea,
safeAreaInsets: {
top: out.top,
right: out.right,
bottom: out.bottom,
left: out.left
top:
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out.top,
right:
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out.right,
bottom:
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out.bottom,
left:
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out.left
}
};
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录