Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
我本凡人 一念云泥
uni-app
提交
7cafeead
uni-app
项目概览
我本凡人 一念云泥
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
4
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7cafeead
编写于
3月 10, 2020
作者:
fxy060608
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'alpha' of
https://github.com/dcloudio/uni-app
into alpha
上级
86364ba1
e9b585e7
变更
27
展开全部
隐藏空白更改
内联
并排
Showing
27 changed file
with
125 addition
and
99 deletion
+125
-99
lerna.json
lerna.json
+1
-1
packages/uni-app-plus-nvue/package.json
packages/uni-app-plus-nvue/package.json
+1
-1
packages/uni-app-plus/dist/index.js
packages/uni-app-plus/dist/index.js
+2
-1
packages/uni-app-plus/dist/view.umd.min.js
packages/uni-app-plus/dist/view.umd.min.js
+2
-2
packages/uni-app-plus/package.json
packages/uni-app-plus/package.json
+1
-1
packages/uni-cli-shared/package.json
packages/uni-cli-shared/package.json
+1
-1
packages/uni-h5-ui/package.json
packages/uni-h5-ui/package.json
+1
-1
packages/uni-h5/dist/index.umd.min.js
packages/uni-h5/dist/index.umd.min.js
+1
-1
packages/uni-h5/package.json
packages/uni-h5/package.json
+1
-1
packages/uni-migration/package.json
packages/uni-migration/package.json
+1
-1
packages/uni-mp-alipay/dist/index.js
packages/uni-mp-alipay/dist/index.js
+89
-68
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
+2
-1
packages/uni-mp-baidu/package.json
packages/uni-mp-baidu/package.json
+1
-1
packages/uni-mp-qq/dist/index.js
packages/uni-mp-qq/dist/index.js
+3
-2
packages/uni-mp-qq/package.json
packages/uni-mp-qq/package.json
+1
-1
packages/uni-mp-toutiao/dist/index.js
packages/uni-mp-toutiao/dist/index.js
+2
-1
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
+3
-2
packages/uni-mp-weixin/package.json
packages/uni-mp-weixin/package.json
+1
-1
packages/uni-stat/package.json
packages/uni-stat/package.json
+1
-1
packages/uni-template-compiler/package.json
packages/uni-template-compiler/package.json
+1
-1
packages/vue-cli-plugin-hbuilderx/package.json
packages/vue-cli-plugin-hbuilderx/package.json
+1
-1
packages/vue-cli-plugin-uni-optimize/package.json
packages/vue-cli-plugin-uni-optimize/package.json
+1
-1
packages/vue-cli-plugin-uni/package.json
packages/vue-cli-plugin-uni/package.json
+2
-2
packages/webpack-uni-mp-loader/package.json
packages/webpack-uni-mp-loader/package.json
+1
-1
packages/webpack-uni-pages-loader/package.json
packages/webpack-uni-pages-loader/package.json
+2
-2
未找到文件。
lerna.json
浏览文件 @
7cafeead
...
...
@@ -12,5 +12,5 @@
"message"
:
"chore(release): publish %s"
}
},
"version"
:
"2.0.0-alpha-26
320200303
002"
"version"
:
"2.0.0-alpha-26
420200309
002"
}
packages/uni-app-plus-nvue/package.json
浏览文件 @
7cafeead
{
"name"
:
"@dcloudio/uni-app-plus-nvue"
,
"version"
:
"2.0.0-alpha-26
320200303
002"
,
"version"
:
"2.0.0-alpha-26
420200309
002"
,
"description"
:
"uni-app app-plus-nvue"
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-app-plus/dist/index.js
浏览文件 @
7cafeead
...
...
@@ -1314,7 +1314,8 @@ function parseBaseComponent (vueComponentOptions, {
const
options
=
{
multipleSlots
:
true
,
addGlobalClass
:
true
addGlobalClass
:
true
,
...(
vueOptions
.
options
||
{})
};
const
componentOptions
=
{
...
...
packages/uni-app-plus/dist/view.umd.min.js
浏览文件 @
7cafeead
此差异已折叠。
点击以展开。
packages/uni-app-plus/package.json
浏览文件 @
7cafeead
{
"name"
:
"@dcloudio/uni-app-plus"
,
"version"
:
"2.0.0-alpha-26
320200303
002"
,
"version"
:
"2.0.0-alpha-26
420200309
002"
,
"description"
:
"uni-app app-plus"
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-cli-shared/package.json
浏览文件 @
7cafeead
{
"name"
:
"@dcloudio/uni-cli-shared"
,
"version"
:
"2.0.0-alpha-26
320200303
002"
,
"version"
:
"2.0.0-alpha-26
420200309
002"
,
"description"
:
"uni-cli-shared"
,
"main"
:
"lib/index.js"
,
"repository"
:
{
...
...
packages/uni-h5-ui/package.json
浏览文件 @
7cafeead
{
"name"
:
"@dcloudio/uni-h5-ui"
,
"version"
:
"2.0.0-alpha-26
320200303
002"
,
"version"
:
"2.0.0-alpha-26
420200309
002"
,
"description"
:
"uni-app h5 ui"
,
"main"
:
"dist/index.umd.min.js"
,
"repository"
:
{
...
...
packages/uni-h5/dist/index.umd.min.js
浏览文件 @
7cafeead
此差异已折叠。
点击以展开。
packages/uni-h5/package.json
浏览文件 @
7cafeead
{
"name"
:
"@dcloudio/uni-h5"
,
"version"
:
"2.0.0-alpha-26
320200303
002"
,
"version"
:
"2.0.0-alpha-26
420200309
002"
,
"description"
:
"uni-app h5"
,
"main"
:
"dist/index.umd.min.js"
,
"repository"
:
{
...
...
packages/uni-migration/package.json
浏览文件 @
7cafeead
{
"name"
:
"@dcloudio/uni-migration"
,
"version"
:
"2.0.0-alpha-26
320200303
002"
,
"version"
:
"2.0.0-alpha-26
420200309
002"
,
"description"
:
"uni-app migration"
,
"main"
:
"lib/index.js"
,
"repository"
:
{
...
...
packages/uni-mp-alipay/dist/index.js
浏览文件 @
7cafeead
...
...
@@ -442,19 +442,32 @@ const protocols = { // 需要做转换的 API 列表
if
(
!
fromArgs
.
header
)
{
// 默认增加 header 参数,方便格式化 content-type
fromArgs
.
header
=
{};
}
const
headers
=
{
'
content-type
'
:
'
application/json
'
};
Object
.
keys
(
fromArgs
.
header
).
forEach
(
key
=>
{
headers
[
key
.
toLocaleLowerCase
()]
=
fromArgs
.
header
[
key
];
});
return
{
header
(
header
=
{},
toArgs
)
{
const
headers
=
{
'
content-type
'
:
'
application/json
'
};
Object
.
keys
(
header
).
forEach
(
key
=>
{
headers
[
key
.
toLocaleLowerCase
()]
=
header
[
key
];
});
return
{
name
:
'
headers
'
,
value
:
headers
}
},
data
(
data
)
{
// 钉钉在content-type为application/json时,不会自动序列化
if
(
my
.
dd
&&
headers
[
'
content-type
'
].
indexOf
(
'
application/json
'
)
===
0
)
{
return
{
name
:
'
data
'
,
value
:
JSON
.
stringify
(
data
)
}
}
return
{
name
:
'
data
'
,
value
:
data
}
},
method
:
'
method
'
,
// TODO 支付宝小程序仅支持 get,post
responseType
:
false
}
...
...
@@ -551,12 +564,12 @@ const protocols = { // 需要做转换的 API 列表
returnValue
:
{
apFilePath
:
'
tempFilePath
'
}
},
chooseVideo
:
{
// 支付宝小程序文档中未找到(仅在getSetting处提及),但实际可用
returnValue
:
{
apFilePath
:
'
tempFilePath
'
}
},
chooseVideo
:
{
// 支付宝小程序文档中未找到(仅在getSetting处提及),但实际可用
returnValue
:
{
apFilePath
:
'
tempFilePath
'
}
},
connectSocket
:
{
args
:
{
...
...
@@ -640,22 +653,22 @@ const protocols = { // 需要做转换的 API 列表
},
scanCode
:
{
name
:
'
scan
'
,
args
(
fromArgs
)
{
if
(
fromArgs
.
scanType
===
'
qrCode
'
)
{
fromArgs
.
type
=
'
qr
'
;
args
(
fromArgs
)
{
if
(
fromArgs
.
scanType
===
'
qrCode
'
)
{
fromArgs
.
type
=
'
qr
'
;
return
{
onlyFromCamera
:
'
hideAlbum
'
}
}
else
if
(
fromArgs
.
scanType
===
'
barCode
'
)
{
fromArgs
.
type
=
'
bar
'
;
return
{
onlyFromCamera
:
'
hideAlbum
'
}
}
else
if
(
fromArgs
.
scanType
===
'
barCode
'
)
{
fromArgs
.
type
=
'
bar
'
;
onlyFromCamera
:
'
hideAlbum
'
}
}
else
{
return
{
onlyFromCamera
:
'
hideAlbum
'
}
}
else
{
return
{
scanType
:
false
,
onlyFromCamera
:
'
hideAlbum
'
}
scanType
:
false
,
onlyFromCamera
:
'
hideAlbum
'
}
}
},
returnValue
:
{
...
...
@@ -686,8 +699,16 @@ const protocols = { // 需要做转换的 API 列表
}
},
getUserInfo
:
{
name
:
'
getAuthUserInfo
'
,
name
:
my
.
canIUse
(
'
getOpenUserInfo
'
)
?
'
getOpenUserInfo
'
:
'
getAuthUserInfo
'
,
returnValue
(
result
)
{
if
(
my
.
canIUse
(
'
getOpenUserInfo
'
))
{
let
response
=
{};
try
{
response
=
JSON
.
parse
(
result
.
response
).
response
;
}
catch
(
e
)
{}
result
.
nickName
=
response
.
nickName
;
result
.
avatar
=
response
.
avatar
;
}
result
.
userInfo
=
{
nickName
:
result
.
nickName
,
avatarUrl
:
result
.
avatar
...
...
@@ -706,18 +727,18 @@ const protocols = { // 需要做转换的 API 列表
item
.
uuid
=
item
.
serviceId
;
});
}
},
createBLEConnection
:
{
name
:
'
connectBLEDevice
'
,
args
:
{
timeout
:
false
}
},
closeBLEConnection
:
{
name
:
'
disconnectBLEDevice
'
},
onBLEConnectionStateChange
:
{
name
:
'
onBLEConnectionStateChanged
'
},
createBLEConnection
:
{
name
:
'
connectBLEDevice
'
,
args
:
{
timeout
:
false
}
},
closeBLEConnection
:
{
name
:
'
disconnectBLEDevice
'
},
onBLEConnectionStateChange
:
{
name
:
'
onBLEConnectionStateChanged
'
},
makePhoneCall
:
{
args
:
{
...
...
@@ -749,35 +770,35 @@ const protocols = { // 需要做转换的 API 列表
returnValue
:
{
brightness
:
'
value
'
}
},
showShareMenu
:
{
name
:
'
showSharePanel
'
},
hideHomeButton
:
{
name
:
'
hideBackHome
'
},
saveImageToPhotosAlbum
:
{
name
:
'
saveImage
'
,
args
:
{
filePath
:
'
url
'
}
},
saveVideoToPhotosAlbum
:
{
args
:
{
filePath
:
'
src
'
}
},
chooseAddress
:
{
name
:
'
getAddress
'
,
returnValue
(
result
)
{
let
info
=
result
.
result
||
{};
result
.
userName
=
info
.
fullname
;
result
.
provinceName
=
info
.
prov
;
result
.
cityName
=
info
.
city
;
result
.
detailInfo
=
info
.
address
;
result
.
telNumber
=
info
.
mobilePhone
;
result
.
errMsg
=
result
.
resultStatus
;
}
},
showShareMenu
:
{
name
:
'
showSharePanel
'
},
hideHomeButton
:
{
name
:
'
hideBackHome
'
},
saveImageToPhotosAlbum
:
{
name
:
'
saveImage
'
,
args
:
{
filePath
:
'
url
'
}
},
saveVideoToPhotosAlbum
:
{
args
:
{
filePath
:
'
src
'
}
},
chooseAddress
:
{
name
:
'
getAddress
'
,
returnValue
(
result
)
{
let
info
=
result
.
result
||
{};
result
.
userName
=
info
.
fullname
;
result
.
provinceName
=
info
.
prov
;
result
.
cityName
=
info
.
city
;
result
.
detailInfo
=
info
.
address
;
result
.
telNumber
=
info
.
mobilePhone
;
result
.
errMsg
=
result
.
resultStatus
;
}
}
};
...
...
packages/uni-mp-alipay/package.json
浏览文件 @
7cafeead
{
"name"
:
"@dcloudio/uni-mp-alipay"
,
"version"
:
"2.0.0-alpha-26
320200303
002"
,
"version"
:
"2.0.0-alpha-26
420200309
002"
,
"description"
:
"uni-app mp-alipay"
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-mp-baidu/dist/index.js
浏览文件 @
7cafeead
...
...
@@ -1448,7 +1448,8 @@ function parseBaseComponent (vueComponentOptions, {
const
options
=
{
multipleSlots
:
true
,
addGlobalClass
:
true
addGlobalClass
:
true
,
...(
vueOptions
.
options
||
{})
};
const
componentOptions
=
{
...
...
packages/uni-mp-baidu/package.json
浏览文件 @
7cafeead
{
"name"
:
"@dcloudio/uni-mp-baidu"
,
"version"
:
"2.0.0-alpha-26
320200303
002"
,
"version"
:
"2.0.0-alpha-26
420200309
002"
,
"description"
:
"uni-app mp-baidu"
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-mp-qq/dist/index.js
浏览文件 @
7cafeead
...
...
@@ -1366,10 +1366,11 @@ function parseBaseComponent (vueComponentOptions, {
const
options
=
{
multipleSlots
:
true
,
addGlobalClass
:
true
addGlobalClass
:
true
,
...(
vueOptions
.
options
||
{})
};
{
{
// 微信 multipleSlots 部分情况有 bug,导致内容顺序错乱 如 u-list,提供覆盖选项
if
(
vueOptions
[
'
mp-weixin
'
]
&&
vueOptions
[
'
mp-weixin
'
][
'
options
'
])
{
Object
.
assign
(
options
,
vueOptions
[
'
mp-weixin
'
][
'
options
'
]);
...
...
packages/uni-mp-qq/package.json
浏览文件 @
7cafeead
{
"name"
:
"@dcloudio/uni-mp-qq"
,
"version"
:
"2.0.0-alpha-26
320200303
002"
,
"version"
:
"2.0.0-alpha-26
420200309
002"
,
"description"
:
"uni-app mp-qq"
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-mp-toutiao/dist/index.js
浏览文件 @
7cafeead
...
...
@@ -1538,7 +1538,8 @@ function parseBaseComponent (vueComponentOptions, {
const
options
=
{
multipleSlots
:
true
,
addGlobalClass
:
true
addGlobalClass
:
true
,
...(
vueOptions
.
options
||
{})
};
const
componentOptions
=
{
...
...
packages/uni-mp-toutiao/package.json
浏览文件 @
7cafeead
{
"name"
:
"@dcloudio/uni-mp-toutiao"
,
"version"
:
"2.0.0-alpha-26
320200303
002"
,
"version"
:
"2.0.0-alpha-26
420200309
002"
,
"description"
:
"uni-app mp-toutiao"
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-mp-weixin/dist/index.js
浏览文件 @
7cafeead
...
...
@@ -1319,10 +1319,11 @@ function parseBaseComponent (vueComponentOptions, {
const
options
=
{
multipleSlots
:
true
,
addGlobalClass
:
true
addGlobalClass
:
true
,
...(
vueOptions
.
options
||
{})
};
{
{
// 微信 multipleSlots 部分情况有 bug,导致内容顺序错乱 如 u-list,提供覆盖选项
if
(
vueOptions
[
'
mp-weixin
'
]
&&
vueOptions
[
'
mp-weixin
'
][
'
options
'
])
{
Object
.
assign
(
options
,
vueOptions
[
'
mp-weixin
'
][
'
options
'
]);
...
...
packages/uni-mp-weixin/package.json
浏览文件 @
7cafeead
{
"name"
:
"@dcloudio/uni-mp-weixin"
,
"version"
:
"2.0.0-alpha-26
320200303
002"
,
"version"
:
"2.0.0-alpha-26
420200309
002"
,
"description"
:
"uni-app mp-weixin"
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-stat/package.json
浏览文件 @
7cafeead
{
"name"
:
"@dcloudio/uni-stat"
,
"version"
:
"2.0.0-alpha-26
320200303
002"
,
"version"
:
"2.0.0-alpha-26
420200309
002"
,
"description"
:
""
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-template-compiler/package.json
浏览文件 @
7cafeead
{
"name"
:
"@dcloudio/uni-template-compiler"
,
"version"
:
"2.0.0-alpha-26
320200303
002"
,
"version"
:
"2.0.0-alpha-26
420200309
002"
,
"description"
:
"uni-template-compiler"
,
"main"
:
"lib/index.js"
,
"repository"
:
{
...
...
packages/vue-cli-plugin-hbuilderx/package.json
浏览文件 @
7cafeead
{
"name"
:
"@dcloudio/vue-cli-plugin-hbuilderx"
,
"version"
:
"2.0.0-alpha-26
320200303
002"
,
"version"
:
"2.0.0-alpha-26
420200309
002"
,
"description"
:
"HBuilderX plugin for vue-cli 3"
,
"main"
:
"index.js"
,
"repository"
:
{
...
...
packages/vue-cli-plugin-uni-optimize/package.json
浏览文件 @
7cafeead
{
"name"
:
"@dcloudio/vue-cli-plugin-uni-optimize"
,
"version"
:
"2.0.0-alpha-26
320200303
002"
,
"version"
:
"2.0.0-alpha-26
420200309
002"
,
"description"
:
"uni-app optimize plugin for vue-cli 3"
,
"main"
:
"index.js"
,
"repository"
:
{
...
...
packages/vue-cli-plugin-uni/package.json
浏览文件 @
7cafeead
{
"name"
:
"@dcloudio/vue-cli-plugin-uni"
,
"version"
:
"2.0.0-alpha-26
320200303
002"
,
"version"
:
"2.0.0-alpha-26
420200309
002"
,
"description"
:
"uni-app plugin for vue-cli 3"
,
"main"
:
"index.js"
,
"repository"
:
{
...
...
@@ -17,7 +17,7 @@
"author"
:
"fxy060608"
,
"license"
:
"Apache-2.0"
,
"dependencies"
:
{
"@dcloudio/uni-stat"
:
"^2.0.0-alpha-26
320200303
002"
,
"@dcloudio/uni-stat"
:
"^2.0.0-alpha-26
420200309
002"
,
"buffer-json"
:
"^2.0.0"
,
"copy-webpack-plugin"
:
"^5.1.1"
,
"cross-env"
:
"^5.2.0"
,
...
...
packages/webpack-uni-mp-loader/package.json
浏览文件 @
7cafeead
{
"name"
:
"@dcloudio/webpack-uni-mp-loader"
,
"version"
:
"2.0.0-alpha-26
320200303
002"
,
"version"
:
"2.0.0-alpha-26
420200309
002"
,
"description"
:
"webpack-uni-mp-loader"
,
"main"
:
"index.js"
,
"repository"
:
{
...
...
packages/webpack-uni-pages-loader/package.json
浏览文件 @
7cafeead
{
"name"
:
"@dcloudio/webpack-uni-pages-loader"
,
"version"
:
"2.0.0-alpha-26
320200303
002"
,
"version"
:
"2.0.0-alpha-26
420200309
002"
,
"description"
:
"uni-app pages.json loader"
,
"main"
:
"lib/index.js"
,
"repository"
:
{
...
...
@@ -21,7 +21,7 @@
"strip-json-comments"
:
"^2.0.1"
},
"uni-app"
:
{
"compilerVersion"
:
"2.6.
3
"
"compilerVersion"
:
"2.6.
4
"
},
"gitHead"
:
"84e9cb1ca1898054d161f1514efadd1ab24fd804"
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录