Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
erosXXX
uni-app
提交
26b46352
U
uni-app
项目概览
erosXXX
/
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,发现更多精彩内容 >>
提交
26b46352
编写于
11月 09, 2021
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
chore: build
上级
952982cc
变更
10
展开全部
显示空白变更内容
内联
并排
Showing
10 changed file
with
21161 addition
and
11158 deletion
+21161
-11158
packages/uni-app-plus/dist/index.v3.js
packages/uni-app-plus/dist/index.v3.js
+118
-29
packages/uni-app-plus/dist/view.umd.js
packages/uni-app-plus/dist/view.umd.js
+21028
-11114
packages/uni-h5/dist/index.umd.min.js
packages/uni-h5/dist/index.umd.min.js
+1
-1
packages/uni-mp-alipay/dist/index.js
packages/uni-mp-alipay/dist/index.js
+2
-2
packages/uni-mp-baidu/dist/index.js
packages/uni-mp-baidu/dist/index.js
+2
-2
packages/uni-mp-kuaishou/dist/index.js
packages/uni-mp-kuaishou/dist/index.js
+2
-2
packages/uni-mp-lark/dist/index.js
packages/uni-mp-lark/dist/index.js
+2
-2
packages/uni-mp-qq/dist/index.js
packages/uni-mp-qq/dist/index.js
+2
-2
packages/uni-mp-toutiao/dist/index.js
packages/uni-mp-toutiao/dist/index.js
+2
-2
packages/uni-mp-weixin/dist/index.js
packages/uni-mp-weixin/dist/index.js
+2
-2
未找到文件。
packages/uni-app-plus/dist/index.v3.js
浏览文件 @
26b46352
...
...
@@ -234,6 +234,7 @@ var serviceContext = (function () {
'preLogin',
'closeAuthView',
'getCheckBoxState',
'getUniverifyManager',
'share',
'shareWithSystem',
'showShareMenu',
...
...
@@ -1534,7 +1535,7 @@ var serviceContext = (function () {
"uni.chooseVideo.cancel": "Cancel",
"uni.chooseVideo.sourceType.album": "Album",
"uni.chooseVideo.sourceType.camera": "Camera",
"uni.
previewImage.cancel": "Cancel
",
"uni.
chooseFile.notUserActivation": "File chooser dialog can only be shown with a user activation
",
"uni.previewImage.button.save": "Save Image",
"uni.previewImage.save.success": "Saved successfully",
"uni.previewImage.save.fail": "Save failed",
...
...
@@ -1569,6 +1570,7 @@ var serviceContext = (function () {
"uni.chooseVideo.cancel": "Cancelar",
"uni.chooseVideo.sourceType.album": "Álbum",
"uni.chooseVideo.sourceType.camera": "Cámara",
"uni.chooseFile.notUserActivation": "El cuadro de diálogo del selector de archivos solo se puede mostrar con la activación del usuario",
"uni.previewImage.cancel": "Cancelar",
"uni.previewImage.button.save": "Guardar imagen",
"uni.previewImage.save.success": "Guardado exitosamente",
...
...
@@ -1604,6 +1606,7 @@ var serviceContext = (function () {
"uni.chooseVideo.cancel": "Annuler",
"uni.chooseVideo.sourceType.album": "Album",
"uni.chooseVideo.sourceType.camera": "Caméra",
"uni.chooseFile.notUserActivation": "La boîte de dialogue du sélecteur de fichier ne peut être affichée qu'avec une activation par l'utilisateur",
"uni.previewImage.cancel": "Annuler",
"uni.previewImage.button.save": "Guardar imagen",
"uni.previewImage.save.success": "Enregistré avec succès",
...
...
@@ -1639,6 +1642,7 @@ var serviceContext = (function () {
"uni.chooseVideo.cancel": "取消",
"uni.chooseVideo.sourceType.album": "从相册选择",
"uni.chooseVideo.sourceType.camera": "拍摄",
"uni.chooseFile.notUserActivation": "文件选择器对话框只能在用户激活时显示",
"uni.previewImage.cancel": "取消",
"uni.previewImage.button.save": "保存图像",
"uni.previewImage.save.success": "保存图像到相册成功",
...
...
@@ -1674,6 +1678,7 @@ var serviceContext = (function () {
"uni.chooseVideo.cancel": "取消",
"uni.chooseVideo.sourceType.album": "從相冊選擇",
"uni.chooseVideo.sourceType.camera": "拍攝",
"uni.chooseFile.notUserActivation": "文件選擇器對話框只能在用戶激活時顯示",
"uni.previewImage.cancel": "取消",
"uni.previewImage.button.save": "保存圖像",
"uni.previewImage.save.success": "保存圖像到相冊成功",
...
...
@@ -1830,11 +1835,20 @@ var serviceContext = (function () {
}
const setClipboardData = {
beforeSuccess () {
data: {
type: String,
required: true
},
showToast: {
type: Boolean,
default: true
},
beforeSuccess (res, params) {
if (!params.showToast) return
const title = t('uni.setClipboardData.success');
if (title) {
uni.showToast({
title
: t('uni.setClipboardData.success')
,
title,
icon: 'success',
mask: false,
style: {
...
...
@@ -3604,7 +3618,7 @@ var serviceContext = (function () {
const errMsg = res.errMsg;
if (errMsg.indexOf(apiName + ':ok') === 0) {
isFn(beforeSuccess) && beforeSuccess(res);
isFn(beforeSuccess) && beforeSuccess(res
, params
);
hasSuccess && success(res);
...
...
@@ -6293,7 +6307,7 @@ var serviceContext = (function () {
let deviceId;
function deviceId$1 () {
deviceId = deviceId || plus.
runtime.getDCloudId()
;
deviceId = deviceId || plus.
device.uuid
;
return deviceId
}
...
...
@@ -6710,7 +6724,8 @@ var serviceContext = (function () {
function getLocation$1 ({
type = 'wgs84',
geocode = false,
altitude = false
altitude = false,
highAccuracyExpireTime
} = {}, callbackId) {
const errorCallback = warpPlusErrorCallback(callbackId, 'getLocation');
plus.geolocation.getCurrentPosition(
...
...
@@ -6726,7 +6741,8 @@ var serviceContext = (function () {
errorCallback(e);
}, {
geocode: geocode,
enableHighAccuracy: altitude
enableHighAccuracy: altitude,
timeout: highAccuracyExpireTime
}
);
}
...
...
@@ -7876,6 +7892,8 @@ var serviceContext = (function () {
}
}
let univerifyManager;
function getService (provider) {
return new Promise((resolve, reject) => {
plus.oauth.getServices(services => {
...
...
@@ -7888,20 +7906,21 @@ var serviceContext = (function () {
/**
* 微信登录
*/
function login (params, callbackId) {
function login (params, callbackId
, plus = true
) {
const provider = params.provider || 'weixin';
const errorCallback = warp
PlusErrorCallback(callbackId, 'login'
);
const errorCallback = warp
ErrorCallback(callbackId, 'login', plus
);
const authOptions = provider === 'apple'
? { scope: 'email' }
: params.univerifyStyle
? { univerifyStyle: univerifyButtonsClickHandling(params.univerifyStyle, errorCallback) }
: {};
const _invoke = plus ? invoke$1 : callback.invoke;
getService(provider).then(service => {
function login () {
if (params.onlyAuthorize && provider === 'weixin') {
service.authorize(({ code }) => {
invoke$1
(callbackId, {
_invoke
(callbackId, {
code,
authResult: '',
errMsg: 'login:ok'
...
...
@@ -7911,7 +7930,7 @@ var serviceContext = (function () {
}
service.login(res => {
const authResult = res.target.authResult;
invoke$1
(callbackId, {
_invoke
(callbackId, {
code: authResult.code,
authResult: authResult,
errMsg: 'login:ok'
...
...
@@ -8006,9 +8025,9 @@ var serviceContext = (function () {
}
}
function preLogin$1 (params, callbackId) {
const successCallback = warp
PlusSuccessCallback(callbackId, 'preLogin'
);
const errorCallback = warp
PlusErrorCallback(callbackId, 'preLogin'
);
function preLogin$1 (params, callbackId
, plus
) {
const successCallback = warp
SuccessCallback(callbackId, 'preLogin', plus
);
const errorCallback = warp
ErrorCallback(callbackId, 'preLogin', plus
);
getService(params.provider).then(service => service.preLogin(successCallback, errorCallback)).catch(errorCallback);
}
...
...
@@ -8016,9 +8035,9 @@ var serviceContext = (function () {
return getService('univerify').then(service => service.closeAuthView())
}
function getCheckBoxState (params, callbackId) {
const successCallback = warp
PlusSuccessCallback(callbackId, 'getCheckBoxState'
);
const errorCallback = warp
PlusErrorCallback(callbackId, 'getCheckBoxState'
);
function getCheckBoxState (params, callbackId
, plus
) {
const successCallback = warp
SuccessCallback(callbackId, 'getCheckBoxState', plus
);
const errorCallback = warp
ErrorCallback(callbackId, 'getCheckBoxState', plus
);
try {
getService('univerify').then(service => {
const state = service.getCheckBoxState();
...
...
@@ -8033,19 +8052,19 @@ var serviceContext = (function () {
* 一键登录自定义登陆按钮点击处理
*/
function univerifyButtonsClickHandling (univerifyStyle, errorCallback) {
if (univerifyStyle && isPlainObject(univerifyStyle) && univerifyStyle.buttons &&
Object.prototype.toString.call(univerifyStyle.buttons.list) === '[object Array]' &&
univerifyStyle.buttons.list.length > 0
) {
if (isPlainObject(univerifyStyle) && isPlainObject(univerifyStyle.buttons) && toRawType(univerifyStyle.buttons.list) === 'Array') {
univerifyStyle.buttons.list.forEach((button, index) => {
univerifyStyle.buttons.list[index].onclick = function () {
closeAuthView().then(() => {
errorCallback({
const res = {
code: '30008',
message: '用户点击了自定义按钮',
index,
provider: button.provider
});
};
isPlainObject(univerifyManager)
? univerifyManager._triggerUniverifyButtonsClick(res)
: closeAuthView().then(() => {
errorCallback(res);
});
};
});
...
...
@@ -8053,6 +8072,76 @@ var serviceContext = (function () {
return univerifyStyle
}
class UniverifyManager {
constructor () {
this.provider = 'univerify';
this.eventName = 'api.univerifyButtonsClick';
}
close () {
closeAuthView();
}
login (options) {
this._warp((data, callbackId) => login(data, callbackId, false), this._getOptions(options));
}
getCheckBoxState (options) {
this._warp((_, callbackId) => getCheckBoxState(_, callbackId, false), options);
}
preLogin (options) {
this._warp((data, callbackId) => preLogin$1(data, callbackId, false), this._getOptions(options));
}
onButtonsClick (callback) {
UniServiceJSBridge.on(this.eventName, callback);
}
offButtonsClick (callback) {
UniServiceJSBridge.off(this.eventName, callback);
}
_triggerUniverifyButtonsClick (res) {
UniServiceJSBridge.emit(this.eventName, res);
}
_warp (fn, options) {
return callback.warp(fn)(this._getOptions(options))
}
_getOptions (options = {}) {
return Object.assign({}, options, { provider: this.provider })
}
}
function getUniverifyManager () {
return univerifyManager || (univerifyManager = new UniverifyManager())
}
function warpSuccessCallback (callbackId, name, plus = true) {
return plus
? warpPlusSuccessCallback(callbackId, name)
: (options) => {
callback.invoke(callbackId, Object.assign({}, options, {
errMsg: `${name}:ok`
}));
}
}
function warpErrorCallback (callbackId, name, plus = true) {
return plus
? warpPlusErrorCallback(callbackId, name)
: (error) => {
const { code = 0, message: errorMessage } = error;
callback.invoke(callbackId, {
errMsg: `${name}:fail ${errorMessage || ''}`,
errCode: code,
code
});
}
}
function requestPayment (params, callbackId) {
const provider = params.provider;
const errorCallback = warpPlusErrorCallback(callbackId, 'requestPayment');
...
...
@@ -10630,7 +10719,6 @@ var serviceContext = (function () {
editable = false,
placeholderText = ''
} = {}, callbackId) {
// TODO 在 editable 为 true 时,content 应该是输入框中可修改内容。后续找客户端商量。
const buttons = showCancel ? [cancelText, confirmText] : [confirmText];
const tip = editable ? placeholderText : buttons;
...
...
@@ -11675,6 +11763,7 @@ var serviceContext = (function () {
preLogin: preLogin$1,
closeAuthView: closeAuthView,
getCheckBoxState: getCheckBoxState,
getUniverifyManager: getUniverifyManager,
requestPayment: requestPayment,
subscribePush: subscribePush,
unsubscribePush: unsubscribePush,
...
...
packages/uni-app-plus/dist/view.umd.js
浏览文件 @
26b46352
此差异已折叠。
点击以展开。
packages/uni-h5/dist/index.umd.min.js
浏览文件 @
26b46352
此差异已折叠。
点击以展开。
packages/uni-mp-alipay/dist/index.js
浏览文件 @
26b46352
...
...
@@ -2137,7 +2137,7 @@ function initScopedSlotsParams () {
const
has
=
center
[
vueId
];
if
(
!
has
)
{
parents
[
vueId
]
=
this
;
this
.
$on
(
'
hook:dest
ory
'
,
()
=>
{
this
.
$on
(
'
hook:dest
royed
'
,
()
=>
{
delete
parents
[
vueId
];
});
}
...
...
@@ -2151,7 +2151,7 @@ function initScopedSlotsParams () {
return
key
?
object
[
key
]
:
object
}
else
{
parents
[
vueId
]
=
this
;
this
.
$on
(
'
hook:dest
ory
'
,
()
=>
{
this
.
$on
(
'
hook:dest
royed
'
,
()
=>
{
delete
parents
[
vueId
];
});
}
...
...
packages/uni-mp-baidu/dist/index.js
浏览文件 @
26b46352
...
...
@@ -1811,7 +1811,7 @@ function initScopedSlotsParams () {
const
has
=
center
[
vueId
];
if
(
!
has
)
{
parents
[
vueId
]
=
this
;
this
.
$on
(
'
hook:dest
ory
'
,
()
=>
{
this
.
$on
(
'
hook:dest
royed
'
,
()
=>
{
delete
parents
[
vueId
];
});
}
...
...
@@ -1825,7 +1825,7 @@ function initScopedSlotsParams () {
return
key
?
object
[
key
]
:
object
}
else
{
parents
[
vueId
]
=
this
;
this
.
$on
(
'
hook:dest
ory
'
,
()
=>
{
this
.
$on
(
'
hook:dest
royed
'
,
()
=>
{
delete
parents
[
vueId
];
});
}
...
...
packages/uni-mp-kuaishou/dist/index.js
浏览文件 @
26b46352
...
...
@@ -1560,7 +1560,7 @@ function initScopedSlotsParams () {
const
has
=
center
[
vueId
];
if
(
!
has
)
{
parents
[
vueId
]
=
this
;
this
.
$on
(
'
hook:dest
ory
'
,
()
=>
{
this
.
$on
(
'
hook:dest
royed
'
,
()
=>
{
delete
parents
[
vueId
];
});
}
...
...
@@ -1574,7 +1574,7 @@ function initScopedSlotsParams () {
return
key
?
object
[
key
]
:
object
}
else
{
parents
[
vueId
]
=
this
;
this
.
$on
(
'
hook:dest
ory
'
,
()
=>
{
this
.
$on
(
'
hook:dest
royed
'
,
()
=>
{
delete
parents
[
vueId
];
});
}
...
...
packages/uni-mp-lark/dist/index.js
浏览文件 @
26b46352
...
...
@@ -1610,7 +1610,7 @@ function initScopedSlotsParams () {
const
has
=
center
[
vueId
];
if
(
!
has
)
{
parents
[
vueId
]
=
this
;
this
.
$on
(
'
hook:dest
ory
'
,
()
=>
{
this
.
$on
(
'
hook:dest
royed
'
,
()
=>
{
delete
parents
[
vueId
];
});
}
...
...
@@ -1624,7 +1624,7 @@ function initScopedSlotsParams () {
return
key
?
object
[
key
]
:
object
}
else
{
parents
[
vueId
]
=
this
;
this
.
$on
(
'
hook:dest
ory
'
,
()
=>
{
this
.
$on
(
'
hook:dest
royed
'
,
()
=>
{
delete
parents
[
vueId
];
});
}
...
...
packages/uni-mp-qq/dist/index.js
浏览文件 @
26b46352
...
...
@@ -1721,7 +1721,7 @@ function initScopedSlotsParams () {
const
has
=
center
[
vueId
];
if
(
!
has
)
{
parents
[
vueId
]
=
this
;
this
.
$on
(
'
hook:dest
ory
'
,
()
=>
{
this
.
$on
(
'
hook:dest
royed
'
,
()
=>
{
delete
parents
[
vueId
];
});
}
...
...
@@ -1735,7 +1735,7 @@ function initScopedSlotsParams () {
return
key
?
object
[
key
]
:
object
}
else
{
parents
[
vueId
]
=
this
;
this
.
$on
(
'
hook:dest
ory
'
,
()
=>
{
this
.
$on
(
'
hook:dest
royed
'
,
()
=>
{
delete
parents
[
vueId
];
});
}
...
...
packages/uni-mp-toutiao/dist/index.js
浏览文件 @
26b46352
...
...
@@ -1817,7 +1817,7 @@ function initScopedSlotsParams () {
const
has
=
center
[
vueId
];
if
(
!
has
)
{
parents
[
vueId
]
=
this
;
this
.
$on
(
'
hook:dest
ory
'
,
()
=>
{
this
.
$on
(
'
hook:dest
royed
'
,
()
=>
{
delete
parents
[
vueId
];
});
}
...
...
@@ -1831,7 +1831,7 @@ function initScopedSlotsParams () {
return
key
?
object
[
key
]
:
object
}
else
{
parents
[
vueId
]
=
this
;
this
.
$on
(
'
hook:dest
ory
'
,
()
=>
{
this
.
$on
(
'
hook:dest
royed
'
,
()
=>
{
delete
parents
[
vueId
];
});
}
...
...
packages/uni-mp-weixin/dist/index.js
浏览文件 @
26b46352
...
...
@@ -1465,7 +1465,7 @@ function initScopedSlotsParams () {
const
has
=
center
[
vueId
];
if
(
!
has
)
{
parents
[
vueId
]
=
this
;
this
.
$on
(
'
hook:dest
ory
'
,
()
=>
{
this
.
$on
(
'
hook:dest
royed
'
,
()
=>
{
delete
parents
[
vueId
];
});
}
...
...
@@ -1479,7 +1479,7 @@ function initScopedSlotsParams () {
return
key
?
object
[
key
]
:
object
}
else
{
parents
[
vueId
]
=
this
;
this
.
$on
(
'
hook:dest
ory
'
,
()
=>
{
this
.
$on
(
'
hook:dest
royed
'
,
()
=>
{
delete
parents
[
vueId
];
});
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录