Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wychl
uni-app
提交
b7f0c34f
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,发现更多精彩内容 >>
提交
b7f0c34f
编写于
8月 25, 2021
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
chore: build app
上级
eebae8b5
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
161 addition
and
71 deletion
+161
-71
packages/uni-app-plus/dist/index.v3.js
packages/uni-app-plus/dist/index.v3.js
+159
-69
packages/uni-app-plus/dist/view.umd.min.js
packages/uni-app-plus/dist/view.umd.min.js
+2
-2
未找到文件。
packages/uni-app-plus/dist/index.v3.js
浏览文件 @
b7f0c34f
...
@@ -193,7 +193,9 @@ var serviceContext = (function () {
...
@@ -193,7 +193,9 @@ var serviceContext = (function () {
'getRightWindowStyle',
'getRightWindowStyle',
'setTopWindowStyle',
'setTopWindowStyle',
'setLeftWindowStyle',
'setLeftWindowStyle',
'setRightWindowStyle'
'setRightWindowStyle',
'getLanguage',
'setLanguage'
];
];
const event = [
const event = [
...
@@ -229,6 +231,7 @@ var serviceContext = (function () {
...
@@ -229,6 +231,7 @@ var serviceContext = (function () {
'getUserProfile',
'getUserProfile',
'preLogin',
'preLogin',
'closeAuthView',
'closeAuthView',
'getCheckBoxState',
'share',
'share',
'shareWithSystem',
'shareWithSystem',
'showShareMenu',
'showShareMenu',
...
@@ -787,7 +790,7 @@ var serviceContext = (function () {
...
@@ -787,7 +790,7 @@ var serviceContext = (function () {
};
};
const SYNC_API_RE =
const SYNC_API_RE =
/^\$|Window$|WindowStyle$|sendNativeEvent|restoreGlobal|getCurrentSubNVue|getMenuButtonBoundingClientRect|^report|interceptors|Interceptor$|getSubNVueById|requireNativePlugin|upx2px|hideKeyboard|canIUse|^create|Sync$|Manager$|base64ToArrayBuffer|arrayBufferToBase64/;
/^\$|Window$|WindowStyle$|sendNativeEvent|restoreGlobal|getCurrentSubNVue|getMenuButtonBoundingClientRect|^report|interceptors|Interceptor$|getSubNVueById|requireNativePlugin|upx2px|hideKeyboard|canIUse|^create|Sync$|Manager$|base64ToArrayBuffer|arrayBufferToBase64
|getLanguage|setLanguage
/;
const CONTEXT_API_RE = /^create|Manager$/;
const CONTEXT_API_RE = /^create|Manager$/;
...
@@ -1249,6 +1252,11 @@ var serviceContext = (function () {
...
@@ -1249,6 +1252,11 @@ var serviceContext = (function () {
return compiled;
return compiled;
}
}
const LOCALE_ZH_HANS = 'zh-Hans';
const LOCALE_ZH_HANT = 'zh-Hant';
const LOCALE_EN = 'en';
const LOCALE_FR = 'fr';
const LOCALE_ES = 'es';
const hasOwnProperty$1 = Object.prototype.hasOwnProperty;
const hasOwnProperty$1 = Object.prototype.hasOwnProperty;
const hasOwn$1 = (val, key) => hasOwnProperty$1.call(val, key);
const hasOwn$1 = (val, key) => hasOwnProperty$1.call(val, key);
const defaultFormatter = new BaseFormatter();
const defaultFormatter = new BaseFormatter();
...
@@ -1269,25 +1277,25 @@ var serviceContext = (function () {
...
@@ -1269,25 +1277,25 @@ var serviceContext = (function () {
locale = locale.toLowerCase();
locale = locale.toLowerCase();
if (locale.indexOf('zh') === 0) {
if (locale.indexOf('zh') === 0) {
if (locale.indexOf('-hans') !== -1) {
if (locale.indexOf('-hans') !== -1) {
return
'zh-Hans'
;
return
LOCALE_ZH_HANS
;
}
}
if (locale.indexOf('-hant') !== -1) {
if (locale.indexOf('-hant') !== -1) {
return
'zh-Hant'
;
return
LOCALE_ZH_HANT
;
}
}
if (include(locale, ['-tw', '-hk', '-mo', '-cht'])) {
if (include(locale, ['-tw', '-hk', '-mo', '-cht'])) {
return
'zh-Hant'
;
return
LOCALE_ZH_HANT
;
}
}
return
'zh-Hans'
;
return
LOCALE_ZH_HANS
;
}
}
const lang = startsWith(locale, [
'en', 'fr', 'es'
]);
const lang = startsWith(locale, [
LOCALE_EN, LOCALE_FR, LOCALE_ES
]);
if (lang) {
if (lang) {
return lang;
return lang;
}
}
}
}
class I18n {
class I18n {
constructor({ locale, fallbackLocale, messages, watcher, formater, }) {
constructor({ locale, fallbackLocale, messages, watcher, formater, }) {
this.locale =
'en'
;
this.locale =
LOCALE_EN
;
this.fallbackLocale =
'en'
;
this.fallbackLocale =
LOCALE_EN
;
this.message = {};
this.message = {};
this.messages = {};
this.messages = {};
this.watchers = [];
this.watchers = [];
...
@@ -1295,7 +1303,7 @@ var serviceContext = (function () {
...
@@ -1295,7 +1303,7 @@ var serviceContext = (function () {
this.fallbackLocale = fallbackLocale;
this.fallbackLocale = fallbackLocale;
}
}
this.formater = formater || defaultFormatter;
this.formater = formater || defaultFormatter;
this.messages = messages;
this.messages = messages
|| {}
;
this.setLocale(locale);
this.setLocale(locale);
if (watcher) {
if (watcher) {
this.watchLocale(watcher);
this.watchLocale(watcher);
...
@@ -1304,6 +1312,10 @@ var serviceContext = (function () {
...
@@ -1304,6 +1312,10 @@ var serviceContext = (function () {
setLocale(locale) {
setLocale(locale) {
const oldLocale = this.locale;
const oldLocale = this.locale;
this.locale = normalizeLocale(locale, this.messages) || this.fallbackLocale;
this.locale = normalizeLocale(locale, this.messages) || this.fallbackLocale;
if (!this.messages[this.locale]) {
// 可能初始化时不存在
this.messages[this.locale] = {};
}
this.message = this.messages[this.locale];
this.message = this.messages[this.locale];
this.watchers.forEach((watcher) => {
this.watchers.forEach((watcher) => {
watcher(this.locale, oldLocale);
watcher(this.locale, oldLocale);
...
@@ -1318,6 +1330,14 @@ var serviceContext = (function () {
...
@@ -1318,6 +1330,14 @@ var serviceContext = (function () {
this.watchers.splice(index, 1);
this.watchers.splice(index, 1);
};
};
}
}
add(locale, message) {
if (this.messages[locale]) {
Object.assign(this.messages[locale], message);
}
else {
this.messages[locale] = message;
}
}
t(key, locale, values) {
t(key, locale, values) {
let message = this.message;
let message = this.message;
if (typeof locale === 'string') {
if (typeof locale === 'string') {
...
@@ -1335,33 +1355,44 @@ var serviceContext = (function () {
...
@@ -1335,33 +1355,44 @@ var serviceContext = (function () {
}
}
}
}
const ignoreVueI18n = true;
function initLocaleWatcher(appVm, i18n) {
function initLocaleWatcher(appVm, i18n) {
appVm.$i18n &&
if (appVm.$i18n) {
appVm.$i18n.vm.$watch('locale', (newLocale) => {
const vm = appVm.$i18n.vm ? appVm.$i18n.vm : appVm;
vm.$watch(appVm.$i18n.vm ? 'locale' : () => appVm.$i18n.locale, (newLocale) => {
i18n.setLocale(newLocale);
i18n.setLocale(newLocale);
}, {
}, {
immediate: true,
immediate: true,
});
});
}
function getDefaultLocale() {
if (typeof navigator !== 'undefined') {
return navigator.userLanguage || navigator.language;
}
}
if (typeof plus !== 'undefined') {
// TODO 待调整为最新的获取语言代码
return plus.os.language;
}
return uni.getSystemInfoSync().language;
}
}
function initVueI18n(messages, fallbackLocale = 'en', locale) {
// function getDefaultLocale() {
// if (typeof navigator !== 'undefined') {
// return (navigator as any).userLanguage || navigator.language
// }
// if (typeof plus !== 'undefined') {
// // TODO 待调整为最新的获取语言代码
// return plus.os.language
// }
// return uni.getSystemInfoSync().language
// }
function initVueI18n(locale = LOCALE_EN, messages = {}, fallbackLocale = LOCALE_EN, watcher) {
// 兼容旧版本入参
if (typeof locale !== 'string') {
[locale, messages] = [messages, locale];
}
if (typeof locale !== 'string') {
locale = fallbackLocale;
}
const i18n = new I18n({
const i18n = new I18n({
locale: locale || fallbackLocale,
locale: locale || fallbackLocale,
fallbackLocale,
fallbackLocale,
messages,
messages,
watcher,
});
});
let t = (key, values) => {
let t = (key, values) => {
if (typeof getApp !== 'function') {
if (typeof getApp !== 'function') {
// app
-plus
view
// app view
/* eslint-disable no-func-assign */
/* eslint-disable no-func-assign */
t = function (key, values) {
t = function (key, values) {
return i18n.t(key, values);
return i18n.t(key, values);
...
@@ -1369,10 +1400,10 @@ var serviceContext = (function () {
...
@@ -1369,10 +1400,10 @@ var serviceContext = (function () {
}
}
else {
else {
const appVm = getApp().$vm;
const appVm = getApp().$vm;
if (!appVm.$t || !appVm.$i18n) {
if (!appVm.$t || !appVm.$i18n
|| ignoreVueI18n
) {
if (!locale) {
//
if (!locale) {
i18n.setLocale(getDefaultLocale());
// i18n.setLocale(getDefaultLocale())
}
//
}
/* eslint-disable no-func-assign */
/* eslint-disable no-func-assign */
t = function (key, values) {
t = function (key, values) {
return i18n.t(key, values);
return i18n.t(key, values);
...
@@ -1397,30 +1428,19 @@ var serviceContext = (function () {
...
@@ -1397,30 +1428,19 @@ var serviceContext = (function () {
return t(key, values);
return t(key, values);
};
};
return {
return {
i18n,
t(key, values) {
t(key, values) {
return t(key, values);
return t(key, values);
},
},
add(locale, message) {
return i18n.add(locale, message);
},
getLocale() {
getLocale() {
return i18n.getLocale();
return i18n.getLocale();
},
},
setLocale(newLocale) {
setLocale(newLocale) {
return i18n.setLocale(newLocale);
return i18n.setLocale(newLocale);
},
},
mixin: {
beforeCreate() {
const unwatch = i18n.watchLocale(() => {
this.$forceUpdate();
});
this.$once('hook:beforeDestroy', function () {
unwatch();
});
},
methods: {
$$t(key, values) {
return t(key, values);
},
},
},
};
};
}
}
...
@@ -1597,10 +1617,32 @@ var serviceContext = (function () {
...
@@ -1597,10 +1617,32 @@ var serviceContext = (function () {
'zh-Hant': zhHant
'zh-Hant': zhHant
};
};
const fallbackLocale = 'en'
;
let language
;
const i18n = initVueI18n( messages , fallbackLocale);
{
if (typeof weex === 'object') {
language = weex.requireModule('plus').getLanguage();
}
}
const i18n = initVueI18n(language, messages );
const t = i18n.t;
const t = i18n.t;
const i18nMixin = i18n.mixin = {
beforeCreate () {
const unwatch = i18n.i18n.watchLocale(() => {
this.$forceUpdate();
});
this.$once('hook:beforeDestroy', function () {
unwatch();
});
},
methods: {
$$t (key, values) {
return t(key, values)
}
}
};
const setLocale = i18n.setLocale;
const getLocale = i18n.getLocale;
const getLocale = i18n.getLocale;
const setClipboardData = {
const setClipboardData = {
...
@@ -6254,16 +6296,10 @@ var serviceContext = (function () {
...
@@ -6254,16 +6296,10 @@ var serviceContext = (function () {
filePath,
filePath,
fileType
fileType
} = {}, callbackId) {
} = {}, callbackId) {
plus.io.resolveLocalFileSystemURL(getRealPath$1(filePath), entry => {
const successCallback = warpPlusSuccessCallback(callbackId, 'saveFile');
plus.runtime.openFile(getRealPath$1(filePath));
const errorCallback = warpPlusErrorCallback(callbackId, 'saveFile');
invoke$1(callbackId, {
errMsg: 'openDocument:ok'
plus.runtime.openDocument(getRealPath$1(filePath), undefined, successCallback, errorCallback);
});
}, err => {
invoke$1(callbackId, {
errMsg: 'openDocument:fail ' + err.message
});
});
}
}
const CHOOSE_LOCATION_PATH = '_www/__uniappchooselocation.html';
const CHOOSE_LOCATION_PATH = '_www/__uniappchooselocation.html';
...
@@ -7644,9 +7680,24 @@ var serviceContext = (function () {
...
@@ -7644,9 +7680,24 @@ var serviceContext = (function () {
function login (params, callbackId) {
function login (params, callbackId) {
const provider = params.provider || 'weixin';
const provider = params.provider || 'weixin';
const errorCallback = warpPlusErrorCallback(callbackId, 'login');
const errorCallback = warpPlusErrorCallback(callbackId, 'login');
const authOptions = provider === 'apple'
? { scope: 'email' }
: params.univerifyStyle
? { univerifyStyle: univerifyButtonsClickHandling(params.univerifyStyle, errorCallback) }
: {};
getService(provider).then(service => {
getService(provider).then(service => {
function login () {
function login () {
if (params.onlyAuthorize && provider === 'weixin') {
service.authorize(({ code }) => {
invoke$1(callbackId, {
code,
authResult: '',
errMsg: 'login:ok'
});
}, errorCallback);
return
}
service.login(res => {
service.login(res => {
const authResult = res.target.authResult;
const authResult = res.target.authResult;
invoke$1(callbackId, {
invoke$1(callbackId, {
...
@@ -7654,7 +7705,7 @@ var serviceContext = (function () {
...
@@ -7654,7 +7705,7 @@ var serviceContext = (function () {
authResult: authResult,
authResult: authResult,
errMsg: 'login:ok'
errMsg: 'login:ok'
});
});
}, errorCallback,
provider === 'apple' ? { scope: 'email' } : { univerifyStyle: univerifyButtonsClickHandling(params.univerifyStyle, errorCallback) } || {}
);
}, errorCallback,
authOptions
);
}
}
// 先注销再登录
// 先注销再登录
// apple登录logout之后无法重新触发获取email,fullname;一键登录无logout
// apple登录logout之后无法重新触发获取email,fullname;一键登录无logout
...
@@ -7754,6 +7805,19 @@ var serviceContext = (function () {
...
@@ -7754,6 +7805,19 @@ var serviceContext = (function () {
return getService('univerify').then(service => service.closeAuthView())
return getService('univerify').then(service => service.closeAuthView())
}
}
function getCheckBoxState (params, callbackId) {
const successCallback = warpPlusSuccessCallback(callbackId, 'getCheckBoxState');
const errorCallback = warpPlusErrorCallback(callbackId, 'getCheckBoxState');
try {
getService('univerify').then(service => {
const state = service.getCheckBoxState();
successCallback({ state });
});
} catch (error) {
errorCallback(error);
}
}
/**
/**
* 一键登录自定义登陆按钮点击处理
* 一键登录自定义登陆按钮点击处理
*/
*/
...
@@ -8321,7 +8385,8 @@ var serviceContext = (function () {
...
@@ -8321,7 +8385,8 @@ var serviceContext = (function () {
const WEB_INVOKE_APPSERVICE$1 = 'WEB_INVOKE_APPSERVICE';
const WEB_INVOKE_APPSERVICE$1 = 'WEB_INVOKE_APPSERVICE';
const WEBVIEW_INSERTED = 'webviewInserted';
const WEBVIEW_INSERTED = 'webviewInserted';
const WEBVIEW_REMOVED = 'webviewRemoved';
const WEBVIEW_REMOVED = 'webviewRemoved';
const WEBVIEW_ID_PREFIX = 'webviewId';
const WEBVIEW_ID_PREFIX = 'webviewId';
const SET_LOCALE = 'i18n.setLocale';
function createButtonOnClick (index) {
function createButtonOnClick (index) {
return function onClick (btn) {
return function onClick (btn) {
...
@@ -11336,6 +11401,7 @@ var serviceContext = (function () {
...
@@ -11336,6 +11401,7 @@ var serviceContext = (function () {
operateWXData: operateWXData,
operateWXData: operateWXData,
preLogin: preLogin$1,
preLogin: preLogin$1,
closeAuthView: closeAuthView,
closeAuthView: closeAuthView,
getCheckBoxState: getCheckBoxState,
requestPayment: requestPayment,
requestPayment: requestPayment,
subscribePush: subscribePush,
subscribePush: subscribePush,
unsubscribePush: unsubscribePush,
unsubscribePush: unsubscribePush,
...
@@ -18599,8 +18665,9 @@ var serviceContext = (function () {
...
@@ -18599,8 +18665,9 @@ var serviceContext = (function () {
}
}
function Pattern (image, repetition) {
function Pattern (image, repetition) {
this.image = image;
this.type = 'pattern';
this.repetition = repetition;
this.data = image;
this.colorStop = repetition;
}
}
class CanvasGradient {
class CanvasGradient {
...
@@ -20746,6 +20813,20 @@ var serviceContext = (function () {
...
@@ -20746,6 +20813,20 @@ var serviceContext = (function () {
createSelectorQuery: createSelectorQuery
createSelectorQuery: createSelectorQuery
});
});
function getLanguage () {
return getLocale()
}
function setLanguage (locale) {
return setLocale(locale)
}
var require_context_module_1_26 = /*#__PURE__*/Object.freeze({
__proto__: null,
getLanguage: getLanguage,
setLanguage: setLanguage
});
UniServiceJSBridge.subscribe('onLoadFontFaceCallback', ({
UniServiceJSBridge.subscribe('onLoadFontFaceCallback', ({
callbackId,
callbackId,
data
data
...
@@ -20766,7 +20847,7 @@ var serviceContext = (function () {
...
@@ -20766,7 +20847,7 @@ var serviceContext = (function () {
}, pageId);
}, pageId);
}
}
var require_context_module_1_2
6
= /*#__PURE__*/Object.freeze({
var require_context_module_1_2
7
= /*#__PURE__*/Object.freeze({
__proto__: null,
__proto__: null,
loadFontFace: loadFontFace$1
loadFontFace: loadFontFace$1
});
});
...
@@ -20779,7 +20860,7 @@ var serviceContext = (function () {
...
@@ -20779,7 +20860,7 @@ var serviceContext = (function () {
return {}
return {}
}
}
var require_context_module_1_2
7
= /*#__PURE__*/Object.freeze({
var require_context_module_1_2
8
= /*#__PURE__*/Object.freeze({
__proto__: null,
__proto__: null,
pageScrollTo: pageScrollTo$1
pageScrollTo: pageScrollTo$1
});
});
...
@@ -20792,7 +20873,7 @@ var serviceContext = (function () {
...
@@ -20792,7 +20873,7 @@ var serviceContext = (function () {
return {}
return {}
}
}
var require_context_module_1_2
8
= /*#__PURE__*/Object.freeze({
var require_context_module_1_2
9
= /*#__PURE__*/Object.freeze({
__proto__: null,
__proto__: null,
setPageMeta: setPageMeta$1
setPageMeta: setPageMeta$1
});
});
...
@@ -20829,7 +20910,7 @@ var serviceContext = (function () {
...
@@ -20829,7 +20910,7 @@ var serviceContext = (function () {
callbacks$a.push(callbackId);
callbacks$a.push(callbackId);
}
}
var require_context_module_1_
29
= /*#__PURE__*/Object.freeze({
var require_context_module_1_
30
= /*#__PURE__*/Object.freeze({
__proto__: null,
__proto__: null,
removeTabBarBadge: removeTabBarBadge$1,
removeTabBarBadge: removeTabBarBadge$1,
showTabBarRedDot: showTabBarRedDot$1,
showTabBarRedDot: showTabBarRedDot$1,
...
@@ -20853,7 +20934,7 @@ var serviceContext = (function () {
...
@@ -20853,7 +20934,7 @@ var serviceContext = (function () {
callbacks$b.splice(callbacks$b.indexOf(callbackId), 1);
callbacks$b.splice(callbacks$b.indexOf(callbackId), 1);
}
}
var require_context_module_1_3
0
= /*#__PURE__*/Object.freeze({
var require_context_module_1_3
1
= /*#__PURE__*/Object.freeze({
__proto__: null,
__proto__: null,
onWindowResize: onWindowResize,
onWindowResize: onWindowResize,
offWindowResize: offWindowResize
offWindowResize: offWindowResize
...
@@ -20890,11 +20971,12 @@ var serviceContext = (function () {
...
@@ -20890,11 +20971,12 @@ var serviceContext = (function () {
'./ui/create-intersection-observer.js': require_context_module_1_23,
'./ui/create-intersection-observer.js': require_context_module_1_23,
'./ui/create-media-query-observer.js': require_context_module_1_24,
'./ui/create-media-query-observer.js': require_context_module_1_24,
'./ui/create-selector-query.js': require_context_module_1_25,
'./ui/create-selector-query.js': require_context_module_1_25,
'./ui/load-font-face.js': require_context_module_1_26,
'./ui/language.js': require_context_module_1_26,
'./ui/page-scroll-to.js': require_context_module_1_27,
'./ui/load-font-face.js': require_context_module_1_27,
'./ui/set-page-meta.js': require_context_module_1_28,
'./ui/page-scroll-to.js': require_context_module_1_28,
'./ui/tab-bar.js': require_context_module_1_29,
'./ui/set-page-meta.js': require_context_module_1_29,
'./ui/window.js': require_context_module_1_30,
'./ui/tab-bar.js': require_context_module_1_30,
'./ui/window.js': require_context_module_1_31,
};
};
var req = function req(key) {
var req = function req(key) {
...
@@ -21336,6 +21418,14 @@ var serviceContext = (function () {
...
@@ -21336,6 +21418,14 @@ var serviceContext = (function () {
subscribe(WEBVIEW_INSERTED, onWebviewInserted);
subscribe(WEBVIEW_INSERTED, onWebviewInserted);
subscribe(WEBVIEW_REMOVED, onWebviewRemoved);
subscribe(WEBVIEW_REMOVED, onWebviewRemoved);
i18n.i18n.watchLocale(locale => {
const pages = getCurrentPages();
pages.forEach(page => {
publishHandler(SET_LOCALE, locale, page.$page.id);
});
weex.requireModule('plus').setLanguage(locale);
});
}
}
let appCtx;
let appCtx;
...
@@ -22336,7 +22426,7 @@ var serviceContext = (function () {
...
@@ -22336,7 +22426,7 @@ var serviceContext = (function () {
return {
return {
version: VD_SYNC_VERSION,
version: VD_SYNC_VERSION,
locale:
plus.os.language, // TODO
locale:
weex.requireModule('plus').getLanguage(),
disableScroll,
disableScroll,
onPageScroll,
onPageScroll,
onPageReachBottom,
onPageReachBottom,
...
...
packages/uni-app-plus/dist/view.umd.min.js
浏览文件 @
b7f0c34f
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录