Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DCloud
uni-app
提交
13a00b70
U
uni-app
项目概览
DCloud
/
uni-app
大约 2 个月 前同步成功
通知
707
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,发现更多精彩内容 >>
提交
13a00b70
编写于
5月 08, 2019
作者:
M
mehaotian
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev'
上级
7ded4e42
8516fa70
变更
18
隐藏空白更改
内联
并排
Showing
18 changed file
with
191 addition
and
34 deletion
+191
-34
packages/uni-mp-alipay/dist/index.js
packages/uni-mp-alipay/dist/index.js
+8
-3
packages/uni-mp-alipay/package.json
packages/uni-mp-alipay/package.json
+1
-1
packages/uni-mp-baidu/dist/index.js
packages/uni-mp-baidu/dist/index.js
+34
-3
packages/uni-mp-baidu/package.json
packages/uni-mp-baidu/package.json
+1
-1
packages/uni-mp-toutiao/dist/index.js
packages/uni-mp-toutiao/dist/index.js
+34
-3
packages/uni-mp-toutiao/package.json
packages/uni-mp-toutiao/package.json
+1
-1
packages/uni-mp-weixin/dist/index.js
packages/uni-mp-weixin/dist/index.js
+34
-2
packages/uni-mp-weixin/package.json
packages/uni-mp-weixin/package.json
+1
-1
src/core/helpers/protocol/media/preview-image.js
src/core/helpers/protocol/media/preview-image.js
+4
-2
src/core/service/api/context/canvas.js
src/core/service/api/context/canvas.js
+11
-4
src/core/view/components/canvas/index.vue
src/core/view/components/canvas/index.vue
+2
-0
src/platforms/h5/components/system-routes/preview-image/index.vue
...forms/h5/components/system-routes/preview-image/index.vue
+1
-1
src/platforms/h5/view/components/map/index.vue
src/platforms/h5/view/components/map/index.vue
+2
-1
src/platforms/mp-alipay/service/api/protocols.js
src/platforms/mp-alipay/service/api/protocols.js
+8
-3
src/platforms/mp-baidu/service/api/protocols.js
src/platforms/mp-baidu/service/api/protocols.js
+7
-3
src/platforms/mp-toutiao/service/api/protocols.js
src/platforms/mp-toutiao/service/api/protocols.js
+8
-3
src/platforms/mp-weixin/helpers/normalize-preview-image-args.js
...atforms/mp-weixin/helpers/normalize-preview-image-args.js
+27
-0
src/platforms/mp-weixin/service/api/protocols.js
src/platforms/mp-weixin/service/api/protocols.js
+7
-2
未找到文件。
packages/uni-mp-alipay/dist/index.js
浏览文件 @
13a00b70
...
...
@@ -361,9 +361,14 @@ const protocols = { // 需要做转换的 API 列表
previewImage
:
{
args
(
fromArgs
)
{
// 支付宝小程序的 current 是索引值,而非图片地址。
if
(
fromArgs
.
current
&&
Array
.
isArray
(
fromArgs
.
urls
))
{
const
index
=
fromArgs
.
urls
.
indexOf
(
fromArgs
.
current
);
fromArgs
.
current
=
~
index
?
index
:
0
;
const
currentIndex
=
Number
(
fromArgs
.
current
);
if
(
isNaN
(
currentIndex
))
{
if
(
fromArgs
.
current
&&
Array
.
isArray
(
fromArgs
.
urls
))
{
const
index
=
fromArgs
.
urls
.
indexOf
(
fromArgs
.
current
);
fromArgs
.
current
=
~
index
?
index
:
0
;
}
}
else
{
fromArgs
.
current
=
currentIndex
;
}
return
{
indicator
:
false
,
...
...
packages/uni-mp-alipay/package.json
浏览文件 @
13a00b70
{
"name"
:
"@dcloudio/uni-mp-alipay"
,
"version"
:
"0.0.80
2
"
,
"version"
:
"0.0.80
3
"
,
"description"
:
"uni-app mp-alipay"
,
"main"
:
"dist/index.js"
,
"scripts"
:
{
...
...
packages/uni-mp-baidu/dist/index.js
浏览文件 @
13a00b70
...
...
@@ -144,6 +144,34 @@ function upx2px (number, newDeviceWidth) {
return
number
<
0
?
-
result
:
result
}
function
normalize
(
fromArgs
)
{
let
currentIndex
=
parseInt
(
fromArgs
.
current
);
if
(
isNaN
(
currentIndex
))
{
return
}
const
urls
=
fromArgs
.
urls
;
if
(
!
Array
.
isArray
(
urls
))
{
return
}
const
len
=
urls
.
length
;
if
(
!
len
)
{
return
}
if
(
currentIndex
<
0
)
{
currentIndex
=
0
;
}
else
if
(
currentIndex
>=
len
)
{
currentIndex
=
len
-
1
;
}
if
(
currentIndex
>
0
)
{
fromArgs
.
current
=
urls
[
currentIndex
];
fromArgs
.
urls
=
urls
.
filter
(
(
item
,
index
)
=>
index
<
currentIndex
?
item
!==
urls
[
currentIndex
]
:
true
);
}
else
{
fromArgs
.
current
=
urls
[
0
];
}
}
// 不支持的 API 列表
const
todos
=
[
'
hideKeyboard
'
,
...
...
@@ -205,9 +233,12 @@ const protocols = {
}
},
previewImage
:
{
args
:
{
indicator
:
false
,
loop
:
false
args
(
fromArgs
)
{
normalize
(
fromArgs
);
return
{
indicator
:
false
,
loop
:
false
}
}
},
getRecorderManager
:
{
...
...
packages/uni-mp-baidu/package.json
浏览文件 @
13a00b70
{
"name"
:
"@dcloudio/uni-mp-baidu"
,
"version"
:
"0.0.82
8
"
,
"version"
:
"0.0.82
9
"
,
"description"
:
"uni-app mp-baidu"
,
"main"
:
"dist/index.js"
,
"scripts"
:
{
...
...
packages/uni-mp-toutiao/dist/index.js
浏览文件 @
13a00b70
...
...
@@ -144,6 +144,34 @@ function upx2px (number, newDeviceWidth) {
return
number
<
0
?
-
result
:
result
}
function
normalize
(
fromArgs
)
{
let
currentIndex
=
parseInt
(
fromArgs
.
current
);
if
(
isNaN
(
currentIndex
))
{
return
}
const
urls
=
fromArgs
.
urls
;
if
(
!
Array
.
isArray
(
urls
))
{
return
}
const
len
=
urls
.
length
;
if
(
!
len
)
{
return
}
if
(
currentIndex
<
0
)
{
currentIndex
=
0
;
}
else
if
(
currentIndex
>=
len
)
{
currentIndex
=
len
-
1
;
}
if
(
currentIndex
>
0
)
{
fromArgs
.
current
=
urls
[
currentIndex
];
fromArgs
.
urls
=
urls
.
filter
(
(
item
,
index
)
=>
index
<
currentIndex
?
item
!==
urls
[
currentIndex
]
:
true
);
}
else
{
fromArgs
.
current
=
urls
[
0
];
}
}
// 不支持的 API 列表
const
todos
=
[
'
hideKeyboard
'
,
...
...
@@ -238,9 +266,12 @@ const protocols = {
}
},
previewImage
:
{
args
:
{
indicator
:
false
,
loop
:
false
args
(
fromArgs
)
{
normalize
(
fromArgs
);
return
{
indicator
:
false
,
loop
:
false
}
}
},
connectSocket
:
{
...
...
packages/uni-mp-toutiao/package.json
浏览文件 @
13a00b70
{
"name"
:
"@dcloudio/uni-mp-toutiao"
,
"version"
:
"0.0.32
6
"
,
"version"
:
"0.0.32
7
"
,
"description"
:
"uni-app mp-toutiao"
,
"main"
:
"dist/index.js"
,
"scripts"
:
{
...
...
packages/uni-mp-weixin/dist/index.js
浏览文件 @
13a00b70
...
...
@@ -144,8 +144,40 @@ function upx2px (number, newDeviceWidth) {
return
number
<
0
?
-
result
:
result
}
const
protocols
=
{};
const
todos
=
[];
function
normalize
(
fromArgs
)
{
let
currentIndex
=
parseInt
(
fromArgs
.
current
);
if
(
isNaN
(
currentIndex
))
{
return
}
const
urls
=
fromArgs
.
urls
;
if
(
!
Array
.
isArray
(
urls
))
{
return
}
const
len
=
urls
.
length
;
if
(
!
len
)
{
return
}
if
(
currentIndex
<
0
)
{
currentIndex
=
0
;
}
else
if
(
currentIndex
>=
len
)
{
currentIndex
=
len
-
1
;
}
if
(
currentIndex
>
0
)
{
fromArgs
.
current
=
urls
[
currentIndex
];
fromArgs
.
urls
=
urls
.
filter
(
(
item
,
index
)
=>
index
<
currentIndex
?
item
!==
urls
[
currentIndex
]
:
true
);
}
else
{
fromArgs
.
current
=
urls
[
0
];
}
}
const
protocols
=
{
previewImage
:
{
args
:
normalize
}
};
const
todos
=
[];
const
canIUses
=
[];
const
CALLBACKS
=
[
'
success
'
,
'
fail
'
,
'
cancel
'
,
'
complete
'
];
...
...
packages/uni-mp-weixin/package.json
浏览文件 @
13a00b70
{
"name"
:
"@dcloudio/uni-mp-weixin"
,
"version"
:
"0.0.95
0
"
,
"version"
:
"0.0.95
1
"
,
"description"
:
"uni-app mp-weixin"
,
"main"
:
"dist/index.js"
,
"scripts"
:
{
...
...
src/core/helpers/protocol/media/preview-image.js
浏览文件 @
13a00b70
...
...
@@ -19,9 +19,11 @@ export const previewImage = {
}
},
current
:
{
type
:
String
,
type
:
[
String
,
Number
]
,
validator
(
value
,
params
)
{
params
.
type
=
value
?
getRealPath
(
value
)
:
''
// 假值都会被转换为数字 0 无需再做判定
const
index
=
Number
(
value
)
params
.
current
=
isNaN
(
index
)
?
getRealPath
(
value
)
:
index
}
}
}
src/core/service/api/context/canvas.js
浏览文件 @
13a00b70
...
...
@@ -671,10 +671,17 @@ methods3.forEach(function (method) {
case
'
setFillStyle
'
:
case
'
setStrokeStyle
'
:
return
function
(
color
)
{
this
.
actions
.
push
({
method
,
data
:
[
'
normal
'
,
checkColor
(
color
)]
})
if
(
typeof
color
!==
'
object
'
)
{
this
.
actions
.
push
({
method
,
data
:
[
'
normal
'
,
checkColor
(
color
)]
})
}
else
{
this
.
actions
.
push
({
method
,
data
:
[
color
.
type
,
color
.
data
,
color
.
colorStop
]
})
}
}
case
'
setGlobalAlpha
'
:
return
function
(
alpha
)
{
...
...
src/core/view/components/canvas/index.vue
浏览文件 @
13a00b70
...
...
@@ -163,6 +163,7 @@ export default {
let
color
=
resolveColor
(
data2
[
1
])
LinearGradient
.
addColorStop
(
offset
,
color
)
})
color
=
LinearGradient
}
else
if
(
data
[
0
]
===
'
radial
'
)
{
let
x
=
data
[
1
][
0
]
let
y
=
data
[
1
][
1
]
...
...
@@ -173,6 +174,7 @@ export default {
let
color
=
resolveColor
(
data2
[
1
])
LinearGradient
.
addColorStop
(
offset
,
color
)
})
color
=
LinearGradient
}
else
if
(
data
[
0
]
===
'
pattern
'
)
{
let
loaded
=
this
.
checkImageLoaded
(
data
[
1
],
actions
.
slice
(
index
+
1
),
callbackId
,
function
(
image
)
{
...
...
src/platforms/h5/components/system-routes/preview-image/index.vue
浏览文件 @
13a00b70
...
...
@@ -33,7 +33,7 @@ export default {
}
},
created
()
{
var
index
=
this
.
urls
.
indexOf
(
this
.
current
)
const
index
=
typeof
this
.
current
===
'
number
'
?
this
.
current
:
this
.
urls
.
indexOf
(
this
.
current
)
this
.
index
=
index
<
0
?
0
:
index
},
methods
:
{
...
...
src/platforms/h5/view/components/map/index.vue
浏览文件 @
13a00b70
...
...
@@ -346,7 +346,8 @@ export default {
this
.
$emit
(
'
boundsready
'
)
})
maps
.
event
.
addListener
(
map
,
'
click
'
,
()
=>
{
this
.
$trigger
(
'
tap
'
,
{},
{})
// TODO 编译器将 tap 转换为click
this
.
$trigger
(
'
click
'
,
{},
{})
})
maps
.
event
.
addListener
(
map
,
'
dragstart
'
,
()
=>
{
this
.
$trigger
(
'
regionchange
'
,
{},
{
...
...
src/platforms/mp-alipay/service/api/protocols.js
浏览文件 @
13a00b70
...
...
@@ -215,9 +215,14 @@ const protocols = { // 需要做转换的 API 列表
previewImage
:
{
args
(
fromArgs
)
{
// 支付宝小程序的 current 是索引值,而非图片地址。
if
(
fromArgs
.
current
&&
Array
.
isArray
(
fromArgs
.
urls
))
{
const
index
=
fromArgs
.
urls
.
indexOf
(
fromArgs
.
current
)
fromArgs
.
current
=
~
index
?
index
:
0
const
currentIndex
=
Number
(
fromArgs
.
current
)
if
(
isNaN
(
currentIndex
))
{
if
(
fromArgs
.
current
&&
Array
.
isArray
(
fromArgs
.
urls
))
{
const
index
=
fromArgs
.
urls
.
indexOf
(
fromArgs
.
current
)
fromArgs
.
current
=
~
index
?
index
:
0
}
}
else
{
fromArgs
.
current
=
currentIndex
}
return
{
indicator
:
false
,
...
...
src/platforms/mp-baidu/service/api/protocols.js
浏览文件 @
13a00b70
import
normalizePreviewImageArgs
from
'
../../../mp-weixin/helpers/normalize-preview-image-args
'
// 不支持的 API 列表
const
todos
=
[
'
hideKeyboard
'
,
...
...
@@ -59,9 +60,12 @@ const protocols = {
}
},
previewImage
:
{
args
:
{
indicator
:
false
,
loop
:
false
args
(
fromArgs
)
{
normalizePreviewImageArgs
(
fromArgs
)
return
{
indicator
:
false
,
loop
:
false
}
}
},
getRecorderManager
:
{
...
...
src/platforms/mp-toutiao/service/api/protocols.js
浏览文件 @
13a00b70
import
normalizePreviewImageArgs
from
'
../../../mp-weixin/helpers/normalize-preview-image-args
'
// 不支持的 API 列表
const
todos
=
[
'
hideKeyboard
'
,
...
...
@@ -92,9 +94,12 @@ const protocols = {
}
},
previewImage
:
{
args
:
{
indicator
:
false
,
loop
:
false
args
(
fromArgs
)
{
normalizePreviewImageArgs
(
fromArgs
)
return
{
indicator
:
false
,
loop
:
false
}
}
},
connectSocket
:
{
...
...
src/platforms/mp-weixin/helpers/normalize-preview-image-args.js
0 → 100644
浏览文件 @
13a00b70
export
default
function
normalize
(
fromArgs
)
{
let
currentIndex
=
parseInt
(
fromArgs
.
current
)
if
(
isNaN
(
currentIndex
))
{
return
}
const
urls
=
fromArgs
.
urls
if
(
!
Array
.
isArray
(
urls
))
{
return
}
const
len
=
urls
.
length
if
(
!
len
)
{
return
}
if
(
currentIndex
<
0
)
{
currentIndex
=
0
}
else
if
(
currentIndex
>=
len
)
{
currentIndex
=
len
-
1
}
if
(
currentIndex
>
0
)
{
fromArgs
.
current
=
urls
[
currentIndex
]
fromArgs
.
urls
=
urls
.
filter
(
(
item
,
index
)
=>
index
<
currentIndex
?
item
!==
urls
[
currentIndex
]
:
true
)
}
else
{
fromArgs
.
current
=
urls
[
0
]
}
}
src/platforms/mp-weixin/service/api/protocols.js
浏览文件 @
13a00b70
export
const
protocols
=
{}
export
const
todos
=
[]
import
normalizePreviewImageArgs
from
'
../../helpers/normalize-preview-image-args
'
export
const
protocols
=
{
previewImage
:
{
args
:
normalizePreviewImageArgs
}
}
export
const
todos
=
[]
export
const
canIUses
=
[]
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录