Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qianlong66
uni-app
提交
856d6033
U
uni-app
项目概览
qianlong66
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
1
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,发现更多精彩内容 >>
提交
856d6033
编写于
9月 02, 2021
作者:
fxy060608
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
wip(i18n): remove pullToRefresh
上级
470a06e1
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
81 addition
and
53 deletion
+81
-53
packages/uni-api/src/service/ui/locale.ts
packages/uni-api/src/service/ui/locale.ts
+6
-2
packages/uni-app-plus/dist/uni-app-service.es.js
packages/uni-app-plus/dist/uni-app-service.es.js
+20
-7
packages/uni-app-plus/dist/uni-app-view.umd.js
packages/uni-app-plus/dist/uni-app-view.umd.js
+1
-1
packages/uni-h5/dist/uni-h5.cjs.js
packages/uni-h5/dist/uni-h5.cjs.js
+0
-11
packages/uni-h5/dist/uni-h5.es.js
packages/uni-h5/dist/uni-h5.es.js
+6
-13
packages/uni-h5/src/framework/setup/provide/page.ts
packages/uni-h5/src/framework/setup/provide/page.ts
+0
-3
packages/uni-mp-alipay/dist/uni.api.esm.js
packages/uni-mp-alipay/dist/uni.api.esm.js
+6
-2
packages/uni-mp-baidu/dist/uni.api.esm.js
packages/uni-mp-baidu/dist/uni.api.esm.js
+6
-2
packages/uni-mp-core/src/api/locale.ts
packages/uni-mp-core/src/api/locale.ts
+6
-2
packages/uni-mp-kuaishou/dist/uni.api.esm.js
packages/uni-mp-kuaishou/dist/uni.api.esm.js
+6
-2
packages/uni-mp-qq/dist/uni.api.esm.js
packages/uni-mp-qq/dist/uni.api.esm.js
+6
-2
packages/uni-mp-toutiao/dist/uni.api.esm.js
packages/uni-mp-toutiao/dist/uni.api.esm.js
+6
-2
packages/uni-mp-weixin/dist/uni.api.esm.js
packages/uni-mp-weixin/dist/uni.api.esm.js
+6
-2
packages/uni-quickapp-webview/dist/uni.api.esm.js
packages/uni-quickapp-webview/dist/uni.api.esm.js
+6
-2
未找到文件。
packages/uni-api/src/service/ui/locale.ts
浏览文件 @
856d6033
...
...
@@ -22,9 +22,13 @@ export const onLocaleChange = defineOnApi(API_ON_LOCALE_CHANGE, () => {})
export
const
setLocale
=
defineSyncApi
<
typeof
uni
.
setLocale
>
(
API_SET_LOCALE
,
(
locale
)
=>
{
const
oldLocale
=
getApp
().
$vm
.
$locale
const
app
=
getApp
()
if
(
!
app
)
{
return
false
}
const
oldLocale
=
app
.
$vm
.
$locale
if
(
oldLocale
!==
locale
)
{
getApp
()
.
$vm
.
$locale
=
locale
app
.
$vm
.
$locale
=
locale
if
(
__PLATFORM__
===
'
app
'
)
{
const
pages
=
getCurrentPages
()
pages
.
forEach
((
page
)
=>
{
...
...
packages/uni-app-plus/dist/uni-app-service.es.js
浏览文件 @
856d6033
...
...
@@ -1484,9 +1484,18 @@ var serviceContext = (function (vue) {
const ignoreVueI18n = true;
function watchAppLocale(appVm, i18n) {
appVm.$watch(() => appVm.$locale, (newLocale) => {
i18n.setLocale(newLocale);
});
// 需要保证 watch 的触发在组件渲染之前
if (appVm.$watchLocale) {
// vue2
appVm.$watchLocale((newLocale) => {
i18n.setLocale(newLocale);
});
}
else {
appVm.$watch(() => appVm.$locale, (newLocale) => {
i18n.setLocale(newLocale);
});
}
}
function initVueI18n(locale, messages = {}, fallbackLocale, watcher) {
// 兼容旧版本入参
...
...
@@ -4402,11 +4411,13 @@ var serviceContext = (function (vue) {
});
const onLocaleChange = defineOnApi(API_ON_LOCALE_CHANGE, () => { });
const setLocale = defineSyncApi(API_SET_LOCALE, (locale) => {
const oldLocale = getApp().$vm.$locale;
const app = getApp();
if (!app) {
return false;
}
const oldLocale = app.$vm.$locale;
if (oldLocale !== locale) {
getApp().$vm.$locale = locale;
// 执行 uni.onLocaleChange
UniServiceJSBridge.invokeOnCallback(API_ON_LOCALE_CHANGE, { locale });
app.$vm.$locale = locale;
{
const pages = getCurrentPages();
pages.forEach((page) => {
...
...
@@ -4414,6 +4425,8 @@ var serviceContext = (function (vue) {
});
weex.requireModule('plus').setLanguage(locale);
}
// 执行 uni.onLocaleChange
UniServiceJSBridge.invokeOnCallback(API_ON_LOCALE_CHANGE, { locale });
return true;
}
return false;
...
...
packages/uni-app-plus/dist/uni-app-view.umd.js
浏览文件 @
856d6033
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
packages/uni-h5/dist/uni-h5.cjs.js
浏览文件 @
856d6033
...
...
@@ -141,16 +141,6 @@ function initNavigationBarI18n(navigationBar) {
]);
}
}
function
initPullToRefreshI18n
(
pullToRefresh
)
{
if
(
isEnableLocale
())
{
const
CAPTION
=
"
caption
"
;
return
defineI18nProperties
(
pullToRefresh
,
[
[
"
contentdown
"
,
CAPTION
],
[
"
contentover
"
,
CAPTION
],
[
"
contentrefresh
"
,
CAPTION
]
]);
}
}
const
E
=
function
()
{
};
E
.
prototype
=
{
...
...
@@ -6684,7 +6674,6 @@ function normalizePageMeta(pageMeta) {
pullToRefresh
.
offset
+=
uniShared
.
NAVBAR_HEIGHT
+
0
;
}
pageMeta
.
pullToRefresh
=
pullToRefresh
;
__UNI_FEATURE_I18N_LOCALE__
&&
initPullToRefreshI18n
(
pullToRefresh
);
}
}
if
(
__UNI_FEATURE_NAVIGATIONBAR__
)
{
...
...
packages/uni-h5/dist/uni-h5.es.js
浏览文件 @
856d6033
...
...
@@ -234,16 +234,6 @@ function initNavigationBarI18n(navigationBar) {
]);
}
}
function initPullToRefreshI18n(pullToRefresh) {
if (isEnableLocale()) {
const CAPTION = "caption";
return defineI18nProperties(pullToRefresh, [
["contentdown", CAPTION],
["contentover", CAPTION],
["contentrefresh", CAPTION]
]);
}
}
const E = function() {
};
E.prototype = {
...
...
@@ -4349,9 +4339,13 @@ const getLocale = /* @__PURE__ */ defineSyncApi(API_GET_LOCALE, () => {
const onLocaleChange = /* @__PURE__ */ defineOnApi(API_ON_LOCALE_CHANGE, () => {
});
const setLocale = /* @__PURE__ */ defineSyncApi(API_SET_LOCALE, (locale) => {
const oldLocale = getApp().$vm.$locale;
const app = getApp();
if (!app) {
return false;
}
const oldLocale = app.$vm.$locale;
if (oldLocale !== locale) {
getApp()
.$vm.$locale = locale;
app
.$vm.$locale = locale;
UniServiceJSBridge.invokeOnCallback(API_ON_LOCALE_CHANGE, { locale });
return true;
}
...
...
@@ -13379,7 +13373,6 @@ function normalizePageMeta(pageMeta) {
pullToRefresh.offset += NAVBAR_HEIGHT + out.top;
}
pageMeta.pullToRefresh = pullToRefresh;
__UNI_FEATURE_I18N_LOCALE__ && initPullToRefreshI18n(pullToRefresh);
}
}
if (__UNI_FEATURE_NAVIGATIONBAR__) {
...
...
packages/uni-h5/src/framework/setup/provide/page.ts
浏览文件 @
856d6033
...
...
@@ -5,7 +5,6 @@ import { useRoute } from 'vue-router'
import
{
NAVBAR_HEIGHT
,
parseQuery
}
from
'
@dcloudio/uni-shared
'
import
{
initNavigationBarI18n
,
initPullToRefreshI18n
,
initRouteMeta
,
normalizePullToRefreshRpx
,
PolySymbol
,
...
...
@@ -89,8 +88,6 @@ function normalizePageMeta(pageMeta: UniApp.PageRouteMeta) {
NAVBAR_HEIGHT
+
(
__NODE_JS__
?
0
:
safeAreaInsets
.
top
)
}
pageMeta
.
pullToRefresh
=
pullToRefresh
__UNI_FEATURE_I18N_LOCALE__
&&
initPullToRefreshI18n
(
pullToRefresh
)
}
}
if
(
__UNI_FEATURE_NAVIGATIONBAR__
)
{
...
...
packages/uni-mp-alipay/dist/uni.api.esm.js
浏览文件 @
856d6033
...
...
@@ -736,9 +736,13 @@ const getLocale = () => {
return
uni
.
getSystemInfoSync
().
language
||
'
zh-Hans
'
;
};
const
setLocale
=
(
locale
)
=>
{
const
oldLocale
=
getApp
().
$vm
.
$locale
;
const
app
=
getApp
();
if
(
!
app
)
{
return
false
;
}
const
oldLocale
=
app
.
$vm
.
$locale
;
if
(
oldLocale
!==
locale
)
{
getApp
()
.
$vm
.
$locale
=
locale
;
app
.
$vm
.
$locale
=
locale
;
onLocaleChangeCallbacks
.
forEach
((
fn
)
=>
fn
({
locale
}));
return
true
;
}
...
...
packages/uni-mp-baidu/dist/uni.api.esm.js
浏览文件 @
856d6033
...
...
@@ -736,9 +736,13 @@ const getLocale = () => {
return
uni
.
getSystemInfoSync
().
language
||
'
zh-Hans
'
;
};
const
setLocale
=
(
locale
)
=>
{
const
oldLocale
=
getApp
().
$vm
.
$locale
;
const
app
=
getApp
();
if
(
!
app
)
{
return
false
;
}
const
oldLocale
=
app
.
$vm
.
$locale
;
if
(
oldLocale
!==
locale
)
{
getApp
()
.
$vm
.
$locale
=
locale
;
app
.
$vm
.
$locale
=
locale
;
onLocaleChangeCallbacks
.
forEach
((
fn
)
=>
fn
({
locale
}));
return
true
;
}
...
...
packages/uni-mp-core/src/api/locale.ts
浏览文件 @
856d6033
...
...
@@ -8,9 +8,13 @@ export const getLocale: typeof uni.getLocale = () => {
}
export
const
setLocale
:
typeof
uni
.
setLocale
=
(
locale
)
=>
{
const
oldLocale
=
getApp
().
$vm
.
$locale
const
app
=
getApp
()
if
(
!
app
)
{
return
false
}
const
oldLocale
=
app
.
$vm
.
$locale
if
(
oldLocale
!==
locale
)
{
getApp
()
.
$vm
.
$locale
=
locale
app
.
$vm
.
$locale
=
locale
onLocaleChangeCallbacks
.
forEach
((
fn
)
=>
fn
({
locale
}))
return
true
}
...
...
packages/uni-mp-kuaishou/dist/uni.api.esm.js
浏览文件 @
856d6033
...
...
@@ -736,9 +736,13 @@ const getLocale = () => {
return
uni
.
getSystemInfoSync
().
language
||
'
zh-Hans
'
;
};
const
setLocale
=
(
locale
)
=>
{
const
oldLocale
=
getApp
().
$vm
.
$locale
;
const
app
=
getApp
();
if
(
!
app
)
{
return
false
;
}
const
oldLocale
=
app
.
$vm
.
$locale
;
if
(
oldLocale
!==
locale
)
{
getApp
()
.
$vm
.
$locale
=
locale
;
app
.
$vm
.
$locale
=
locale
;
onLocaleChangeCallbacks
.
forEach
((
fn
)
=>
fn
({
locale
}));
return
true
;
}
...
...
packages/uni-mp-qq/dist/uni.api.esm.js
浏览文件 @
856d6033
...
...
@@ -736,9 +736,13 @@ const getLocale = () => {
return
uni
.
getSystemInfoSync
().
language
||
'
zh-Hans
'
;
};
const
setLocale
=
(
locale
)
=>
{
const
oldLocale
=
getApp
().
$vm
.
$locale
;
const
app
=
getApp
();
if
(
!
app
)
{
return
false
;
}
const
oldLocale
=
app
.
$vm
.
$locale
;
if
(
oldLocale
!==
locale
)
{
getApp
()
.
$vm
.
$locale
=
locale
;
app
.
$vm
.
$locale
=
locale
;
onLocaleChangeCallbacks
.
forEach
((
fn
)
=>
fn
({
locale
}));
return
true
;
}
...
...
packages/uni-mp-toutiao/dist/uni.api.esm.js
浏览文件 @
856d6033
...
...
@@ -736,9 +736,13 @@ const getLocale = () => {
return
uni
.
getSystemInfoSync
().
language
||
'
zh-Hans
'
;
};
const
setLocale
=
(
locale
)
=>
{
const
oldLocale
=
getApp
().
$vm
.
$locale
;
const
app
=
getApp
();
if
(
!
app
)
{
return
false
;
}
const
oldLocale
=
app
.
$vm
.
$locale
;
if
(
oldLocale
!==
locale
)
{
getApp
()
.
$vm
.
$locale
=
locale
;
app
.
$vm
.
$locale
=
locale
;
onLocaleChangeCallbacks
.
forEach
((
fn
)
=>
fn
({
locale
}));
return
true
;
}
...
...
packages/uni-mp-weixin/dist/uni.api.esm.js
浏览文件 @
856d6033
...
...
@@ -700,9 +700,13 @@ const getLocale = () => {
return
uni
.
getSystemInfoSync
().
language
||
'
zh-Hans
'
;
};
const
setLocale
=
(
locale
)
=>
{
const
oldLocale
=
getApp
().
$vm
.
$locale
;
const
app
=
getApp
();
if
(
!
app
)
{
return
false
;
}
const
oldLocale
=
app
.
$vm
.
$locale
;
if
(
oldLocale
!==
locale
)
{
getApp
()
.
$vm
.
$locale
=
locale
;
app
.
$vm
.
$locale
=
locale
;
onLocaleChangeCallbacks
.
forEach
((
fn
)
=>
fn
({
locale
}));
return
true
;
}
...
...
packages/uni-quickapp-webview/dist/uni.api.esm.js
浏览文件 @
856d6033
...
...
@@ -736,9 +736,13 @@ const getLocale = () => {
return
uni
.
getSystemInfoSync
().
language
||
'
zh-Hans
'
;
};
const
setLocale
=
(
locale
)
=>
{
const
oldLocale
=
getApp
().
$vm
.
$locale
;
const
app
=
getApp
();
if
(
!
app
)
{
return
false
;
}
const
oldLocale
=
app
.
$vm
.
$locale
;
if
(
oldLocale
!==
locale
)
{
getApp
()
.
$vm
.
$locale
=
locale
;
app
.
$vm
.
$locale
=
locale
;
onLocaleChangeCallbacks
.
forEach
((
fn
)
=>
fn
({
locale
}));
return
true
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录