Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
B
basic-vue-admin
概览
概览
详情
活动
周期分析
版本库
存储库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
Basic
basic-vue-admin
Commits
d677729a
提交
d677729a
authored
6月 06, 2021
作者:
Vben
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
perf(i18n): improve circular dependencies
上级
d81481c5
隐藏空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
30 行增加
和
57 行删除
+30
-57
AppDarkModeToggle.vue
src/components/Application/src/AppDarkModeToggle.vue
+2
-18
AppSearch.vue
src/components/Application/src/search/AppSearch.vue
+0
-9
AppSearchFooter.vue
src/components/Application/src/search/AppSearchFooter.vue
+0
-4
AppSearchModal.vue
src/components/Application/src/search/AppSearchModal.vue
+8
-10
index.vue
src/layouts/default/header/index.vue
+3
-1
helper.ts
src/locales/helper.ts
+12
-0
setupI18n.ts
src/locales/setupI18n.ts
+3
-4
useLocale.ts
src/locales/useLocale.ts
+2
-11
没有找到文件。
src/components/Application/src/AppDarkModeToggle.vue
浏览文件 @
d677729a
...
...
@@ -29,17 +29,12 @@
export
default
defineComponent
({
name
:
'DarkModeToggle'
,
components
:
{
SvgIcon
},
// props: {
// size: {
// type: String,
// default: 'default',
// validate: (val) => ['default', 'large'].includes(val),
// },
// },
setup
()
{
const
{
prefixCls
}
=
useDesign
(
'dark-mode-toggle'
);
const
{
getDarkMode
,
setDarkMode
,
getShowDarkModeToggle
}
=
useRootSetting
();
const
isDark
=
computed
(()
=>
getDarkMode
.
value
===
ThemeEnum
.
DARK
);
function
toggleDarkMode
()
{
const
darkMode
=
getDarkMode
.
value
===
ThemeEnum
.
DARK
?
ThemeEnum
.
LIGHT
:
ThemeEnum
.
DARK
;
setDarkMode
(
darkMode
);
...
...
@@ -95,16 +90,5 @@
transform
:
translateX
(
calc
(
100%
+
2px
));
}
}
//
&
--large
{
//
width
:
70px
;
//
height
:
34px
;
//
padding
:
0
10px
;
//
.@{prefix-cls
}
-inner
{
//
width
:
26px
;
//
height
:
26px
;
//
}
//
}
}
</
style
>
src/components/Application/src/search/AppSearch.vue
浏览文件 @
d677729a
<
script
lang=
"tsx"
>
import
{
defineComponent
,
ref
,
unref
}
from
'vue'
;
import
{
Tooltip
}
from
'ant-design-vue'
;
import
{
SearchOutlined
}
from
'@ant-design/icons-vue'
;
import
AppSearchModal
from
'./AppSearchModal.vue'
;
import
{
useHeaderSetting
}
from
'/@/hooks/setting/useHeaderSetting'
;
import
{
useI18n
}
from
'/@/hooks/web/useI18n'
;
export
default
defineComponent
({
name
:
'AppSearch'
,
components
:
{
AppSearchModal
,
Tooltip
},
setup
()
{
const
showModal
=
ref
(
false
);
const
{
getShowSearch
}
=
useHeaderSetting
();
const
{
t
}
=
useI18n
();
function
changeModal
(
show
:
boolean
)
{
...
...
@@ -22,9 +16,6 @@
}
return
()
=>
{
if
(
!
unref
(
getShowSearch
))
{
return
null
;
}
return
(
<
div
class
=
"p-1"
onClick
=
{
changeModal
.
bind
(
null
,
true
)}
>
<
Tooltip
>
...
...
src/components/Application/src/search/AppSearchFooter.vue
浏览文件 @
d677729a
...
...
@@ -2,21 +2,17 @@
<div
:class=
"`$
{prefixCls}`">
<AppSearchKeyItem
:class=
"`$
{prefixCls}__item`" icon="ant-design:enter-outlined" />
<span>
{{
t
(
'component.app.toSearch'
)
}}
</span>
<AppSearchKeyItem
:class=
"`$
{prefixCls}__item`" icon="ion:arrow-up-outline" />
<AppSearchKeyItem
:class=
"`$
{prefixCls}__item`" icon="ion:arrow-down-outline" />
<span>
{{
t
(
'component.app.toNavigate'
)
}}
</span>
<AppSearchKeyItem
:class=
"`$
{prefixCls}__item`" icon="mdi:keyboard-esc" />
<span>
{{
t
(
'common.closeText'
)
}}
</span>
</div>
</
template
>
<
script
lang=
"ts"
>
import
{
defineComponent
}
from
'vue'
;
import
AppSearchKeyItem
from
'./AppSearchKeyItem.vue'
;
import
{
useDesign
}
from
'/@/hooks/web/useDesign'
;
import
{
useI18n
}
from
'/@/hooks/web/useI18n'
;
export
default
defineComponent
({
...
...
src/components/Application/src/search/AppSearchModal.vue
浏览文件 @
d677729a
...
...
@@ -85,7 +85,7 @@
visible
:
propTypes
.
bool
,
},
emits
:
[
'close'
],
setup
(
_
,
{
emit
})
{
setup
(
props
,
{
emit
})
{
const
scrollWrap
=
ref
<
ElRef
>
(
null
);
const
{
prefixCls
}
=
useDesign
(
'app-search-modal'
);
const
{
t
}
=
useI18n
();
...
...
@@ -96,9 +96,7 @@
const
{
handleSearch
,
searchResult
,
keyword
,
activeIndex
,
handleEnter
,
handleMouseenter
}
=
useMenuSearch
(
refs
,
scrollWrap
,
emit
);
const
getIsNotData
=
computed
(()
=>
{
return
!
keyword
||
unref
(
searchResult
).
length
===
0
;
});
const
getIsNotData
=
computed
(()
=>
!
keyword
||
unref
(
searchResult
).
length
===
0
);
const
getClass
=
computed
(()
=>
{
return
[
...
...
@@ -109,13 +107,8 @@
];
});
function
handleClose
()
{
searchResult
.
value
=
[];
emit
(
'close'
);
}
watch
(
()
=>
_
.
visible
,
()
=>
props
.
visible
,
(
v
:
boolean
)
=>
{
v
&&
nextTick
(()
=>
{
...
...
@@ -124,6 +117,11 @@
}
);
function
handleClose
()
{
searchResult
.
value
=
[];
emit
(
'close'
);
}
return
{
t
,
prefixCls
,
...
...
src/layouts/default/header/index.vue
浏览文件 @
d677729a
...
...
@@ -33,7 +33,7 @@
<!-- action -->
<div
:class=
"`$
{prefixCls}-action`">
<AppSearch
:class=
"`$
{prefixCls}-action__item `" />
<AppSearch
:class=
"`$
{prefixCls}-action__item `"
v-if="getShowSearch"
/>
<ErrorAction
v-if=
"getUseErrorHandle"
:class=
"`$
{prefixCls}-action__item error-action`" />
...
...
@@ -123,6 +123,7 @@
getShowBread
,
getShowHeaderLogo
,
getShowHeader
,
getShowSearch
,
}
=
useHeaderSetting
();
const
{
getShowLocalePicker
}
=
useLocale
();
...
...
@@ -190,6 +191,7 @@
getIsMixSidebar
,
getShowSettingButton
,
getShowSetting
,
getShowSearch
,
};
},
});
...
...
src/locales/helper.ts
浏览文件 @
d677729a
import
type
{
LocaleType
}
from
'/#/config'
;
import
{
set
}
from
'lodash-es'
;
export
const
loadLocalePool
:
LocaleType
[]
=
[];
export
function
setHtmlPageLang
(
locale
:
LocaleType
)
{
document
.
querySelector
(
'html'
)?.
setAttribute
(
'lang'
,
locale
);
}
export
function
setLoadLocalePool
(
cb
:
(
loadLocalePool
:
LocaleType
[])
=>
void
)
{
cb
(
loadLocalePool
);
}
export
function
genMessage
(
langs
:
Record
<
string
,
Record
<
string
,
any
>>
,
prefix
=
'lang'
)
{
const
obj
:
Recordable
=
{};
...
...
src/locales/setupI18n.ts
浏览文件 @
d677729a
...
...
@@ -2,8 +2,7 @@ import type { App } from 'vue';
import
type
{
I18n
,
I18nOptions
}
from
'vue-i18n'
;
import
{
createI18n
}
from
'vue-i18n'
;
import
{
setLoadLocalePool
,
setHtmlPageLang
}
from
'./useLocale'
;
import
{
setHtmlPageLang
,
setLoadLocalePool
}
from
'./helper'
;
import
{
localeSetting
}
from
'/@/settings/localeSetting'
;
import
{
useLocaleStoreWithOut
}
from
'/@/store/modules/locale'
;
...
...
@@ -16,8 +15,8 @@ async function createI18nOptions(): Promise<I18nOptions> {
const
locale
=
localeStore
.
getLocale
;
const
defaultLocal
=
await
import
(
`./lang/
${
locale
}
.ts`
);
const
message
=
defaultLocal
.
default
?.
message
??
{};
setHtmlPageLang
(
locale
)
setHtmlPageLang
(
locale
)
;
setLoadLocalePool
((
loadLocalePool
)
=>
{
loadLocalePool
.
push
(
locale
);
});
...
...
src/locales/useLocale.ts
浏览文件 @
d677729a
...
...
@@ -8,6 +8,7 @@ import moment from 'moment';
import
{
i18n
}
from
'./setupI18n'
;
import
{
useLocaleStoreWithOut
}
from
'/@/store/modules/locale'
;
import
{
unref
,
computed
}
from
'vue'
;
import
{
loadLocalePool
,
setHtmlPageLang
}
from
'./helper'
;
interface
LangModule
{
message
:
Recordable
;
...
...
@@ -15,16 +16,6 @@ interface LangModule {
momentLocaleName
:
string
;
}
const
loadLocalePool
:
LocaleType
[]
=
[];
export
function
setHtmlPageLang
(
locale
:
LocaleType
)
{
document
.
querySelector
(
'html'
)?.
setAttribute
(
'lang'
,
locale
);
}
export
function
setLoadLocalePool
(
cb
:
(
loadLocalePool
:
LocaleType
[])
=>
void
)
{
cb
(
loadLocalePool
);
}
function
setI18nLanguage
(
locale
:
LocaleType
)
{
const
localeStore
=
useLocaleStoreWithOut
();
...
...
@@ -34,7 +25,7 @@ function setI18nLanguage(locale: LocaleType) {
(
i18n
.
global
.
locale
as
any
).
value
=
locale
;
}
localeStore
.
setLocaleInfo
({
locale
});
setHtmlPageLang
(
locale
)
setHtmlPageLang
(
locale
)
;
}
export
function
useLocale
()
{
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论