github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 12:03:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #13484 from dataease/pr@dev-v2_st

Browse Source 
fix(仪表板): 过滤组件时间过滤规则-时间筛选范围-动态时间下拉框存在未翻译字段
This commit is contained in:
fit2cloud-chenyw 2024-11-22 10:38:02 +08:00 committed by GitHub
commit edd8593e1b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue
View File

@ -197,7 +197,7 @@ const relativeToCurrentListRange = computed(() => {
value: 'thisMonth' value: 'thisMonth'
}, },
{ {
label: t('dynamic_month.dynamic_month'), label: t('dynamic_month.last'),
value: 'lastMonth' value: 'lastMonth'
}, },
{ {

18
core/core-frontend/src/custom-component/v-query/FilterTime.vue
View File

@ -198,7 +198,7 @@ const relativeToCurrentListRange = computed(() => {
value: 'thisMonth' value: 'thisMonth'
}, },
{ {
label: t('dynamic_month.dynamic_month'), label: t('dynamic_month.last'),
value: 'lastMonth' value: 'lastMonth'
}, },
{ {
@ -283,7 +283,7 @@ const relativeToCurrentListRange = computed(() => {
<div class="setting" v-if="timeRange.intervalType !== 'timeInterval'"> <div class="setting" v-if="timeRange.intervalType !== 'timeInterval'">
<div class="setting-label">{{ t('dynamic_time.relative') }}</div> <div class="setting-label">{{ t('dynamic_time.relative') }}</div>
<div class="setting-value select"> <div class="setting-value select">
<el-select v-model="timeRange.relativeToCurrent"> <el-select :teleported="false" v-model="timeRange.relativeToCurrent">
<el-option <el-option
v-for="item in relativeToCurrentList" v-for="item in relativeToCurrentList"
:key="item.value" :key="item.value"
@ -296,7 +296,7 @@ const relativeToCurrentListRange = computed(() => {
<div class="setting" v-if="timeRange.relativeToCurrent === 'custom'"> <div class="setting" v-if="timeRange.relativeToCurrent === 'custom'">
<div class="setting-input"> <div class="setting-input">
<el-input-number v-model="timeRange.timeNum" :min="0" controls-position="right" /> <el-input-number v-model="timeRange.timeNum" :min="0" controls-position="right" />
<el-select v-model="timeRange.relativeToCurrentType"> <el-select :teleported="false" v-model="timeRange.relativeToCurrentType">
<el-option <el-option
v-for="item in relativeToCurrentTypeList" v-for="item in relativeToCurrentTypeList"
:key="item.value" :key="item.value"
@ -304,7 +304,7 @@ const relativeToCurrentListRange = computed(() => {
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
<el-select v-model="timeRange.around"> <el-select :teleported="false" v-model="timeRange.around">
<el-option <el-option
v-for="item in aroundList" v-for="item in aroundList"
:key="item.value" :key="item.value"
@ -319,7 +319,7 @@ const relativeToCurrentListRange = computed(() => {
<div class="setting"> <div class="setting">
<div class="setting-label">{{ t('dynamic_time.relative') }}</div> <div class="setting-label">{{ t('dynamic_time.relative') }}</div>
<div class="setting-value select"> <div class="setting-value select">
<el-select v-model="timeRange.relativeToCurrentRange"> <el-select :teleported="false" v-model="timeRange.relativeToCurrentRange">
<el-option <el-option
v-for="item in relativeToCurrentListRange" v-for="item in relativeToCurrentListRange"
:key="item.value" :key="item.value"
@ -342,7 +342,7 @@ const relativeToCurrentListRange = computed(() => {
:min="0" :min="0"
controls-position="right" controls-position="right"
/> />
<el-select v-model="timeRange.relativeToCurrentType"> <el-select :teleported="false" v-model="timeRange.relativeToCurrentType">
<el-option <el-option
v-for="item in relativeToCurrentTypeList" v-for="item in relativeToCurrentTypeList"
:key="item.value" :key="item.value"
@ -350,7 +350,7 @@ const relativeToCurrentListRange = computed(() => {
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
<el-select v-model="timeRange.around"> <el-select :teleported="false" v-model="timeRange.around">
<el-option <el-option
v-for="item in aroundList" v-for="item in aroundList"
:key="item.value" :key="item.value"
@ -372,7 +372,7 @@ const relativeToCurrentListRange = computed(() => {
step-strictly step-strictly
controls-position="right" controls-position="right"
/> />
<el-select v-model="timeRange.relativeToCurrentTypeRange"> <el-select :teleported="false" v-model="timeRange.relativeToCurrentTypeRange">
<el-option <el-option
v-for="item in relativeToCurrentTypeList" v-for="item in relativeToCurrentTypeList"
:key="item.value" :key="item.value"
@ -380,7 +380,7 @@ const relativeToCurrentListRange = computed(() => {
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
<el-select v-model="timeRange.aroundRange"> <el-select :teleported="false" v-model="timeRange.aroundRange">
<el-option <el-option
v-for="item in aroundList" v-for="item in aroundList"
:key="item.value" :key="item.value"

2
core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
View File

@ -1948,7 +1948,7 @@ const relativeToCurrentListRange = computed(() => {
value: 'thisMonth' value: 'thisMonth'
}, },
{ {
label: t('dynamic_month.dynamic_month'), label: t('dynamic_month.last'),
value: 'lastMonth' value: 'lastMonth'
}, },
{ {

18
core/core-frontend/src/custom-component/v-query/RangeFilterTime.vue
View File

@ -209,7 +209,7 @@ const relativeToCurrentListRange = computed(() => {
value: 'thisMonth' value: 'thisMonth'
}, },
{ {
label: t('dynamic_month.dynamic_month'), label: t('dynamic_month.last'),
value: 'lastMonth' value: 'lastMonth'
}, },
{ {
@ -294,7 +294,7 @@ const relativeToCurrentListRange = computed(() => {
<div class="setting" v-if="timeRange.intervalType !== 'timeInterval'"> <div class="setting" v-if="timeRange.intervalType !== 'timeInterval'">
<div class="setting-label">{{ t('dynamic_time.relative') }}</div> <div class="setting-label">{{ t('dynamic_time.relative') }}</div>
<div class="setting-value select"> <div class="setting-value select">
<el-select v-model="timeRange.relativeToCurrent"> <el-select :teleported="false" v-model="timeRange.relativeToCurrent">
<el-option <el-option
v-for="item in relativeToCurrentList" v-for="item in relativeToCurrentList"
:key="item.value" :key="item.value"
@ -307,7 +307,7 @@ const relativeToCurrentListRange = computed(() => {
<div class="setting" v-if="timeRange.relativeToCurrent === 'custom'"> <div class="setting" v-if="timeRange.relativeToCurrent === 'custom'">
<div class="setting-input"> <div class="setting-input">
<el-input-number v-model="timeRange.timeNum" :min="0" controls-position="right" /> <el-input-number v-model="timeRange.timeNum" :min="0" controls-position="right" />
<el-select v-model="timeRange.relativeToCurrentType"> <el-select :teleported="false" v-model="timeRange.relativeToCurrentType">
<el-option <el-option
v-for="item in relativeToCurrentTypeList" v-for="item in relativeToCurrentTypeList"
:key="item.value" :key="item.value"
@ -315,7 +315,7 @@ const relativeToCurrentListRange = computed(() => {
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
<el-select v-model="timeRange.around"> <el-select :teleported="false" v-model="timeRange.around">
<el-option <el-option
v-for="item in aroundList" v-for="item in aroundList"
:key="item.value" :key="item.value"
@ -330,7 +330,7 @@ const relativeToCurrentListRange = computed(() => {
<div class="setting"> <div class="setting">
<div class="setting-label">{{ t('dynamic_time.relative') }}</div> <div class="setting-label">{{ t('dynamic_time.relative') }}</div>
<div class="setting-value select"> <div class="setting-value select">
<el-select v-model="timeRange.relativeToCurrentRange"> <el-select :teleported="false" v-model="timeRange.relativeToCurrentRange">
<el-option <el-option
v-for="item in relativeToCurrentListRange" v-for="item in relativeToCurrentListRange"
:key="item.value" :key="item.value"
@ -356,7 +356,7 @@ const relativeToCurrentListRange = computed(() => {
:min="0" :min="0"
controls-position="right" controls-position="right"
/> />
<el-select v-model="timeRange.relativeToCurrentType"> <el-select :teleported="false" v-model="timeRange.relativeToCurrentType">
<el-option <el-option
v-for="item in relativeToCurrentTypeList" v-for="item in relativeToCurrentTypeList"
:key="item.value" :key="item.value"
@ -364,7 +364,7 @@ const relativeToCurrentListRange = computed(() => {
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
<el-select v-model="timeRange.around"> <el-select :teleported="false" v-model="timeRange.around">
<el-option <el-option
v-for="item in aroundList" v-for="item in aroundList"
:key="item.value" :key="item.value"
@ -389,7 +389,7 @@ const relativeToCurrentListRange = computed(() => {
step-strictly step-strictly
controls-position="right" controls-position="right"
/> />
<el-select v-model="timeRange.relativeToCurrentTypeRange"> <el-select :teleported="false" v-model="timeRange.relativeToCurrentTypeRange">
<el-option <el-option
v-for="item in relativeToCurrentTypeList" v-for="item in relativeToCurrentTypeList"
:key="item.value" :key="item.value"
@ -397,7 +397,7 @@ const relativeToCurrentListRange = computed(() => {
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
<el-select v-model="timeRange.aroundRange"> <el-select :teleported="false" v-model="timeRange.aroundRange">
<el-option <el-option
v-for="item in aroundList" v-for="item in aroundList"
:key="item.value" :key="item.value"