Merge remote-tracking branch 'origin/main' into practical-training

This commit is contained in:
TsMask
2024-07-27 15:03:16 +08:00
2 changed files with 41 additions and 36 deletions

View File

@@ -118,21 +118,6 @@ onMounted(() => {
<a-form layout="vertical">
<template v-if="state.edite">
<a-form-item>
<a-select
v-model:value="state.language"
:disabled="!appStore.i18nOpen"
style="width: 100px"
size="small"
v-perms:has="['system:setting:i18n']"
>
<a-select-option
v-for="opt in optionsLocale"
:key="opt.value"
:value="opt.value"
>
{{ opt.label }}
</a-select-option>
</a-select>
<a-upload
name="file"
list-type="text"
@@ -146,6 +131,24 @@ onMounted(() => {
{{ t('views.system.setting.uploadFile') }}
</a-button>
</a-upload>
<span
v-perms:has="['system:setting:i18n']"
v-show="appStore.i18nOpen"
>
<a-select
v-model:value="state.language"
style="width: 100px"
size="small"
>
<a-select-option
v-for="opt in optionsLocale"
:key="opt.value"
:value="opt.value"
>
{{ opt.label }}
</a-select-option>
</a-select>
</span>
</a-form-item>
<a-form-item>
@@ -165,27 +168,30 @@ onMounted(() => {
<template v-else>
<a-form-item>
<a-space direction="horizontal" :size="16">
<a-select
v-model:value="state.language"
style="width: 100px"
size="small"
:disabled="!appStore.i18nOpen"
v-perms:has="['system:setting:i18n']"
>
<a-select-option
v-for="opt in optionsLocale"
:key="opt.value"
:value="opt.value"
>
{{ opt.label }}
</a-select-option>
</a-select>
<a-button type="link" @click="fnClickHelpDoc(state.language)">
<template #icon>
<QuestionCircleOutlined />
</template>
{{ t('views.system.setting.sysHelpDocOpen') }}
</a-button>
<span
v-perms:has="['system:setting:i18n']"
v-show="appStore.i18nOpen"
>
<a-select
v-model:value="state.language"
style="width: 100px"
size="small"
>
<a-select-option
v-for="opt in optionsLocale"
:key="opt.value"
:value="opt.value"
>
{{ opt.label }}
</a-select-option>
</a-select>
</span>
</a-space>
</a-form-item>
<a-button type="default" @click="fnEdit(true)">

View File

@@ -242,12 +242,11 @@ onMounted(() => {
</div>
</div>
</a-form-item>
<a-form-item v-perms:has="['system:setting:i18n']">
<a-select
v-model:value="state.language"
:disabled="!appStore.i18nOpen"
style="width: 100px"
>
<a-form-item
v-perms:has="['system:setting:i18n']"
v-show="appStore.i18nOpen"
>
<a-select v-model:value="state.language" style="width: 100px">
<a-select-option
v-for="opt in optionsLocale"
:key="opt.value"