Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wychl
uni-app
提交
9dc28abb
U
uni-app
项目概览
wychl
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9dc28abb
编写于
3月 17, 2020
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: 修复 app-v3 uni.canvasToTempFilePath fileType 参数不生效的问题
上级
549d450b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
20 deletion
+22
-20
src/core/helpers/protocol/context/canvas.js
src/core/helpers/protocol/context/canvas.js
+4
-3
src/core/view/components/canvas/index.vue
src/core/view/components/canvas/index.vue
+18
-17
未找到文件。
src/core/helpers/protocol/context/canvas.js
浏览文件 @
9dc28abb
...
@@ -63,9 +63,10 @@ export const canvasPutImageData = {
...
@@ -63,9 +63,10 @@ export const canvasPutImageData = {
}
}
}
}
const
fileType
=
{
const
fileType
s
=
{
PNG
:
'
png
'
,
PNG
:
'
png
'
,
JPG
:
'
jpeg
'
JPG
:
'
jpg
'
,
JPEG
:
'
jpg
'
}
}
export
const
canvasToTempFilePath
=
{
export
const
canvasToTempFilePath
=
{
...
@@ -103,7 +104,7 @@ export const canvasToTempFilePath = {
...
@@ -103,7 +104,7 @@ export const canvasToTempFilePath = {
type
:
String
,
type
:
String
,
validator
(
value
,
params
)
{
validator
(
value
,
params
)
{
value
=
(
value
||
''
).
toUpperCase
()
value
=
(
value
||
''
).
toUpperCase
()
params
.
fileType
=
value
in
fileType
?
fileType
[
value
]
:
fileType
.
PNG
params
.
fileType
=
value
in
fileType
s
?
fileTypes
[
value
]
:
fileTypes
.
PNG
}
}
},
},
quality
:
{
quality
:
{
...
...
src/core/view/components/canvas/index.vue
浏览文件 @
9dc28abb
<
template
>
<
template
>
<uni-canvas
<uni-canvas
:canvas-id=
"canvasId"
:canvas-id=
"canvasId"
:disable-scroll=
"disableScroll"
:disable-scroll=
"disableScroll"
v-on=
"_listeners"
>
v-on=
"_listeners"
>
<canvas
<canvas
ref=
"canvas"
ref=
"canvas"
width=
"300"
width=
"300"
height=
"150"
/>
height=
"150"
/>
<div
style=
"position: absolute; top: 0; left: 0; width: 100%; height: 100%; overflow: hidden;"
>
<div
style=
"position: absolute; top: 0; left: 0; width: 100%; height: 100%; overflow: hidden;"
>
<slot
/>
<slot
/>
</div>
</div>
<v-uni-resize-sensor
<v-uni-resize-sensor
ref=
"sensor"
ref=
"sensor"
@
resize=
"_resize"
/>
@
resize=
"_resize"
/>
</uni-canvas>
</uni-canvas>
</
template
>
</
template
>
...
@@ -121,15 +121,15 @@ export default {
...
@@ -121,15 +121,15 @@ export default {
method
(
data
)
method
(
data
)
}
}
},
},
_resize
()
{
_resize
()
{
var
canvas
=
this
.
$refs
.
canvas
var
canvas
=
this
.
$refs
.
canvas
if
(
canvas
.
width
>
0
&&
canvas
.
height
>
0
)
{
if
(
canvas
.
width
>
0
&&
canvas
.
height
>
0
)
{
var
context
=
canvas
.
getContext
(
'
2d
'
)
var
context
=
canvas
.
getContext
(
'
2d
'
)
var
imageData
=
context
.
getImageData
(
0
,
0
,
canvas
.
width
,
canvas
.
height
)
var
imageData
=
context
.
getImageData
(
0
,
0
,
canvas
.
width
,
canvas
.
height
)
wrapper
(
this
.
$refs
.
canvas
)
wrapper
(
this
.
$refs
.
canvas
)
context
.
putImageData
(
imageData
,
0
,
0
)
context
.
putImageData
(
imageData
,
0
,
0
)
}
else
{
}
else
{
wrapper
(
this
.
$refs
.
canvas
)
wrapper
(
this
.
$refs
.
canvas
)
}
}
},
},
_touchmove
(
event
)
{
_touchmove
(
event
)
{
...
@@ -549,7 +549,8 @@ export default {
...
@@ -549,7 +549,8 @@ export default {
const
img
=
new
Image
()
const
img
=
new
Image
()
img
.
onload
=
()
=>
{
img
.
onload
=
()
=>
{
const
canvas
=
getTempCanvas
(
destWidth
,
destHeight
)
const
canvas
=
getTempCanvas
(
destWidth
,
destHeight
)
if
(
fileType
===
'
jpeg
'
)
{
if
(
fileType
===
'
jpeg
'
||
fileType
===
'
jpg
'
)
{
fileType
=
'
jpeg
'
c2d
.
fillStyle
=
'
#fff
'
c2d
.
fillStyle
=
'
#fff
'
c2d
.
fillRect
(
0
,
0
,
destWidth
,
destHeight
)
c2d
.
fillRect
(
0
,
0
,
destWidth
,
destHeight
)
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录