Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
菜鸟程序猿_c
uni-app
提交
470a06e1
U
uni-app
项目概览
菜鸟程序猿_c
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
470a06e1
编写于
9月 02, 2021
作者:
fxy060608
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
wip(i18n): Compatible with vue2
上级
2cbc7d02
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
45 addition
and
27 deletion
+45
-27
packages/uni-api/src/service/ui/locale.ts
packages/uni-api/src/service/ui/locale.ts
+2
-2
packages/uni-h5/dist/uni-h5.cjs.js
packages/uni-h5/dist/uni-h5.cjs.js
+2
-6
packages/uni-h5/dist/uni-h5.es.js
packages/uni-h5/dist/uni-h5.es.js
+2
-6
packages/uni-h5/src/framework/components/page/pageHead.tsx
packages/uni-h5/src/framework/components/page/pageHead.tsx
+2
-2
packages/uni-i18n/dist/uni-i18n.cjs.js
packages/uni-i18n/dist/uni-i18n.cjs.js
+12
-3
packages/uni-i18n/dist/uni-i18n.es.js
packages/uni-i18n/dist/uni-i18n.es.js
+12
-3
packages/uni-i18n/src/vue-i18n.ts
packages/uni-i18n/src/vue-i18n.ts
+13
-5
未找到文件。
packages/uni-api/src/service/ui/locale.ts
浏览文件 @
470a06e1
...
...
@@ -25,8 +25,6 @@ export const setLocale = defineSyncApi<typeof uni.setLocale>(
const
oldLocale
=
getApp
().
$vm
.
$locale
if
(
oldLocale
!==
locale
)
{
getApp
().
$vm
.
$locale
=
locale
// 执行 uni.onLocaleChange
UniServiceJSBridge
.
invokeOnCallback
(
API_ON_LOCALE_CHANGE
,
{
locale
})
if
(
__PLATFORM__
===
'
app
'
)
{
const
pages
=
getCurrentPages
()
pages
.
forEach
((
page
)
=>
{
...
...
@@ -38,6 +36,8 @@ export const setLocale = defineSyncApi<typeof uni.setLocale>(
})
weex
.
requireModule
(
'
plus
'
).
setLanguage
(
locale
)
}
// 执行 uni.onLocaleChange
UniServiceJSBridge
.
invokeOnCallback
(
API_ON_LOCALE_CHANGE
,
{
locale
})
return
true
}
return
false
...
...
packages/uni-h5/dist/uni-h5.cjs.js
浏览文件 @
470a06e1
...
...
@@ -10470,9 +10470,7 @@ function createPageHeadSearchInputTsx(navigationBar, {
"
style
"
:
{
color
},
"
placeholder-style
"
:
{
color
:
placeholderColor
},
"
placeholder-style
"
:
"
color:
"
+
placeholderColor
,
"
class
"
:
"
uni-page-head-search-input
"
,
"
confirm-type
"
:
"
search
"
,
"
onClick
"
:
onClick
...
...
@@ -10481,9 +10479,7 @@ function createPageHeadSearchInputTsx(navigationBar, {
"
style
"
:
{
color
},
"
placeholder-style
"
:
{
color
:
placeholderColor
},
"
placeholder-style
"
:
"
color:
"
+
placeholderColor
,
"
class
"
:
"
uni-page-head-search-input
"
,
"
confirm-type
"
:
"
search
"
,
"
onFocus
"
:
onFocus
,
...
...
packages/uni-h5/dist/uni-h5.es.js
浏览文件 @
470a06e1
...
...
@@ -20828,9 +20828,7 @@ function createPageHeadSearchInputTsx(navigationBar, {
"style": {
color
},
"placeholder-style": {
color: placeholderColor
},
"placeholder-style": "color: " + placeholderColor,
"class": "uni-page-head-search-input",
"confirm-type": "search",
"onClick": onClick
...
...
@@ -20839,9 +20837,7 @@ function createPageHeadSearchInputTsx(navigationBar, {
"style": {
color
},
"placeholder-style": {
color: placeholderColor
},
"placeholder-style": "color: " + placeholderColor,
"class": "uni-page-head-search-input",
"confirm-type": "search",
"onFocus": onFocus,
...
...
packages/uni-h5/src/framework/components/page/pageHead.tsx
浏览文件 @
470a06e1
...
...
@@ -220,7 +220,7 @@ function createPageHeadSearchInputTsx(
<
Input
disabled
=
{
true
}
style
=
{
{
color
}
}
placeholder
-
style
=
{
{
color
:
placeholderColor
}
}
placeholder
-
style
=
{
'
color:
'
+
placeholderColor
}
class
=
"uni-page-head-search-input"
confirm
-
type
=
"search"
onClick
=
{
onClick
}
...
...
@@ -229,7 +229,7 @@ function createPageHeadSearchInputTsx(
<
Input
focus
=
{
autoFocus
}
style
=
{
{
color
}
}
placeholder
-
style
=
{
{
color
:
placeholderColor
}
}
placeholder
-
style
=
{
'
color:
'
+
placeholderColor
}
class
=
"uni-page-head-search-input"
confirm
-
type
=
"search"
onFocus
=
{
onFocus
}
...
...
packages/uni-i18n/dist/uni-i18n.cjs.js
浏览文件 @
470a06e1
...
...
@@ -223,9 +223,18 @@ class I18n {
const
ignoreVueI18n
=
true
;
function
watchAppLocale
(
appVm
,
i18n
)
{
// 需要保证 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
)
{
// 兼容旧版本入参
...
...
packages/uni-i18n/dist/uni-i18n.es.js
浏览文件 @
470a06e1
...
...
@@ -219,9 +219,18 @@ class I18n {
const
ignoreVueI18n
=
true
;
function
watchAppLocale
(
appVm
,
i18n
)
{
// 需要保证 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
)
{
// 兼容旧版本入参
...
...
packages/uni-i18n/src/vue-i18n.ts
浏览文件 @
470a06e1
...
...
@@ -14,12 +14,20 @@ type Interpolate = (
)
=>
string
function
watchAppLocale
(
appVm
:
any
,
i18n
:
I18n
)
{
// 需要保证 watch 的触发在组件渲染之前
if
(
appVm
.
$watchLocale
)
{
// vue2
appVm
.
$watchLocale
((
newLocale
:
string
)
=>
{
i18n
.
setLocale
(
newLocale
)
})
}
else
{
appVm
.
$watch
(
()
=>
appVm
.
$locale
,
(
newLocale
:
string
)
=>
{
i18n
.
setLocale
(
newLocale
)
}
)
}
}
// function getDefaultLocale() {
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录