@@ -223,7 +231,7 @@ defineExpose({
- 添加级联条件
+ {{ t('v_query.add_cascade_condition') }}
@@ -234,13 +242,13 @@ defineExpose({
-
查询条件层级
-
请选择查询条件
+
{{ t('v_query.query_condition_level') }}
+
{{ t('v_query.select_query_condition') }}
-
请选择被级联字段
+
{{ t('v_query.select_cascaded_field') }}
-
第{{ indexCascade[idx + 1] }}级
+
{{ t('v_query.level_1', { msg: indexCascade[idx + 1] }) }}
visibleChange(val, index, idx)"
diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
index 5b2ef85457..c6178d58fc 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -307,11 +307,11 @@ const showDatasetError = computed(() => {
})
const typeList = [
{
- label: '重命名',
+ label: t('data_fill.rename'),
command: 'rename'
},
{
- label: '删除',
+ label: t('data_fill.delete'),
command: 'del'
}
]
@@ -831,19 +831,19 @@ const notTimeRangeType = computed(() => {
const timeList = [
{
- label: '年',
+ label: t('dynamic_time.year'),
value: 'year'
},
{
- label: '年月',
+ label: t('chart.y_M'),
value: 'month'
},
{
- label: '年月日',
+ label: t('chart.y_M_d'),
value: 'date'
},
{
- label: '年月日时分秒',
+ label: t('chart.y_M_d_H_m_s'),
value: 'datetime'
}
]
@@ -924,17 +924,14 @@ const confirmIdChange = () => {
const handleDatasetChange = () => {
if (!!newDatasetId && !!oldDatasetId) {
curComponent.value.dataset.id = oldDatasetId
- ElMessageBox.confirm(
- '数据集的修改,会导致级联配置失效,因此对应的级联关系将被清除,确定修改吗?',
- {
- confirmButtonType: 'primary',
- type: 'warning',
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- autofocus: false,
- showClose: false
- }
- ).then(() => {
+ ElMessageBox.confirm(t('v_query.to_modify_it'), {
+ confirmButtonType: 'primary',
+ type: 'warning',
+ confirmButtonText: t('commons.confirm'),
+ cancelButtonText: t('commons.cancel'),
+ autofocus: false,
+ showClose: false
+ }).then(() => {
confirmIdChange()
})
return
@@ -1115,7 +1112,14 @@ const clearCascadeArrDataset = id => {
cascadeArr = cascadeArr.filter(ele => !!ele.length)
}
-const indexCascade = ' 一二三四五'
+const indexCascade = [
+ ' ',
+ t('report.week_mon'),
+ t('report.week_tue'),
+ t('report.week_wed'),
+ t('report.week_thu'),
+ t('report.week_fri')
+]
const validateConditionType = ({
defaultConditionValueF,
@@ -1146,11 +1150,11 @@ const validate = () => {
return conditions.value.some(ele => {
if (ele.auto) return false
if (!ele.checkedFields?.length || ele.checkedFields.some(itx => !ele.checkedFieldsMap[itx])) {
- ElMessage.error('请先勾选需要联动的图表及字段')
+ ElMessage.error(t('v_query.be_linked_first'))
return true
}
let displayTypeField = null
- let errorTips = '所选字段类型不一致,无法进行查询配置'
+ let errorTips = t('v_query.cannot_be_performed')
let hasParameterTimeArrType = 0
let hasParameterNumArrType = 0
if (
@@ -1180,7 +1184,7 @@ const validate = () => {
}
if (ele.checkedFieldsMapArrNum?.[id]?.length === 1 && ele.displayType === '22') {
- errorTips = '数值参数配置必须配置最大值和最小值'
+ errorTips = t('v_query.numerical_parameter_configuration')
return true
}
@@ -1209,7 +1213,7 @@ const validate = () => {
}
if (ele.checkedFieldsMapArr?.[id]?.length === 1 && ele.displayType === '7') {
- errorTips = '时间参数配置必须配置开始时间和结束时间'
+ errorTips = t('v_query.and_end_time')
return true
}
@@ -1228,12 +1232,12 @@ const validate = () => {
return false
}
if (displayTypeField.type?.length !== field.type?.length) {
- errorTips = '时间格式不一致'
+ errorTips = t('v_query.format_is_inconsistent')
return true
}
for (let index = 0; index < displayTypeField.type.length; index++) {
if (displayTypeField.type[index] !== field.type[index]) {
- errorTips = '时间格式不一致'
+ errorTips = t('v_query.format_is_inconsistent')
return true
}
}
@@ -1250,13 +1254,13 @@ const validate = () => {
setParams(ele)
const result = validateConditionType(ele)
if (result) {
- ElMessage.error('查询条件为必填项,默认值不能为空')
+ ElMessage.error(t('v_query.cannot_be_empty_de'))
}
return result
}
if (!ele.defaultValueCheck) {
- ElMessage.error('查询条件为必填项,默认值不能为空')
+ ElMessage.error(t('v_query.cannot_be_empty_de'))
return true
}
@@ -1265,7 +1269,7 @@ const validate = () => {
(ele.defaultNumValueEnd !== 0 && !ele.defaultNumValueEnd) ||
(ele.defaultNumValueStart !== 0 && !ele.defaultNumValueStart)
) {
- ElMessage.error('查询条件为必填项,默认值不能为空')
+ ElMessage.error(t('v_query.cannot_be_empty_de'))
return true
}
return false
@@ -1275,7 +1279,7 @@ const validate = () => {
(Array.isArray(ele.defaultValue) && !ele.defaultValue.length) ||
(ele.defaultValue !== 0 && !ele.defaultValue)
) {
- ElMessage.error('查询条件为必填项,默认值不能为空')
+ ElMessage.error(t('v_query.cannot_be_empty_de'))
return true
}
}
@@ -1295,7 +1299,7 @@ const validate = () => {
if (!ele.defaultValueCheck) return false
if (ele.timeType === 'fixed') {
if (!ele.defaultValue) {
- ElMessage.error('默认时间不能为空!')
+ ElMessage.error(t('v_query.cannot_be_empty_time'))
return true
}
}
@@ -1306,7 +1310,7 @@ const validate = () => {
if (ele.timeType === 'fixed') {
const [s, e] = ele.defaultValue || []
if (!s || !e) {
- ElMessage.error('默认时间不能为空!')
+ ElMessage.error(t('v_query.cannot_be_empty_time'))
return true
}
}
@@ -1353,7 +1357,7 @@ const validate = () => {
;[startTime, endTime] = getCustomRange(relativeToCurrentRange)
}
if (+startTime > +endTime) {
- ElMessage.error('结束时间必须大于开始时间!')
+ ElMessage.error(t('v_query.the_start_time'))
return true
}
if (!ele.setTimeRange) return false
@@ -1368,7 +1372,7 @@ const validate = () => {
: +endTime
)
) {
- ElMessage.error('默认值超出日期筛选范围内,请重新设置!')
+ ElMessage.error(t('v_query.range_please_reset'))
return true
}
return false
@@ -1383,12 +1387,14 @@ const validate = () => {
ele.optionValueSource === 2 &&
!ele.valueSource?.filter(ele => !!ele).length
) {
- ElMessage.error('手工输入-选项值不能为空')
+ ElMessage.error(t('v_query.cannot_be_empty_input'))
return true
}
if (!['9', '22'].includes(ele.displayType) && ele.optionValueSource === 1 && !ele.field.id) {
- ElMessage.error(!ele.dataset?.id ? '请选择数据集及选项值字段' : '请选择数据集的选项值字段')
+ ElMessage.error(
+ !ele.dataset?.id ? t('v_query.option_value_field') : t('v_query.the_data_set')
+ )
return true
}
})
@@ -1455,7 +1461,7 @@ const confirmValueSource = () => {
return false
})
) {
- ElMessage.error('手工输入-选项值不能为空')
+ ElMessage.error(t('v_query.cannot_be_empty_input'))
return
}
@@ -1776,11 +1782,11 @@ const relativeToCurrentList = computed(() => {
case 'year':
list = [
{
- label: '今年',
+ label: t('dynamic_year.current'),
value: 'thisYear'
},
{
- label: '去年',
+ label: t('dynamic_year.last'),
value: 'lastYear'
}
]
@@ -1788,11 +1794,11 @@ const relativeToCurrentList = computed(() => {
case 'month':
list = [
{
- label: '本月',
+ label: t('cron.this_month'),
value: 'thisMonth'
},
{
- label: '上月',
+ label: t('dynamic_month.last'),
value: 'lastMonth'
}
]
@@ -1800,19 +1806,19 @@ const relativeToCurrentList = computed(() => {
case 'date':
list = [
{
- label: '今天',
+ label: t('dynamic_time.today'),
value: 'today'
},
{
- label: '昨天',
+ label: t('dynamic_time.yesterday'),
value: 'yesterday'
},
{
- label: '月初',
+ label: t('dynamic_time.firstOfMonth'),
value: 'monthBeginning'
},
{
- label: '年初',
+ label: t('dynamic_time.firstOfYear'),
value: 'yearBeginning'
}
]
@@ -1820,19 +1826,19 @@ const relativeToCurrentList = computed(() => {
case 'datetime':
list = [
{
- label: '今天',
+ label: t('dynamic_time.today'),
value: 'today'
},
{
- label: '昨天',
+ label: t('dynamic_time.yesterday'),
value: 'yesterday'
},
{
- label: '月初',
+ label: t('dynamic_time.firstOfMonth'),
value: 'monthBeginning'
},
{
- label: '年初',
+ label: t('dynamic_time.firstOfYear'),
value: 'yearBeginning'
}
]
@@ -1845,7 +1851,7 @@ const relativeToCurrentList = computed(() => {
return [
...list,
{
- label: '自定义',
+ label: t('dynamic_time.custom'),
value: 'custom'
}
]
@@ -1858,11 +1864,11 @@ const relativeToCurrentListRange = computed(() => {
case 'yearrange':
list = [
{
- label: '今年',
+ label: t('dynamic_year.current'),
value: 'thisYear'
},
{
- label: '去年',
+ label: t('dynamic_year.last'),
value: 'lastYear'
}
]
@@ -1870,23 +1876,23 @@ const relativeToCurrentListRange = computed(() => {
case 'monthrange':
list = [
{
- label: '本月',
+ label: t('cron.this_month'),
value: 'thisMonth'
},
{
- label: '上月',
+ label: t('dynamic_month.dynamic_month'),
value: 'lastMonth'
},
{
- label: '最近 3 个 月',
+ label: t('v_query.last_3_months'),
value: 'LastThreeMonths'
},
{
- label: '最近 6 个 月',
+ label: t('v_query.last_6_months'),
value: 'LastSixMonths'
},
{
- label: '最近 12 个 月',
+ label: t('v_query.last_12_months'),
value: 'LastTwelveMonths'
}
]
@@ -1895,23 +1901,23 @@ const relativeToCurrentListRange = computed(() => {
case 'datetimerange':
list = [
{
- label: '今天',
+ label: t('dynamic_time.today'),
value: 'today'
},
{
- label: '昨天',
+ label: t('dynamic_time.yesterday'),
value: 'yesterday'
},
{
- label: '最近 3 天',
+ label: t('v_query.last_3_days'),
value: 'LastThreeDays'
},
{
- label: '月初至今',
+ label: t('v_query.month_to_date'),
value: 'monthBeginning'
},
{
- label: '年初至今',
+ label: t('v_query.year_to_date'),
value: 'yearBeginning'
}
]
@@ -1924,7 +1930,7 @@ const relativeToCurrentListRange = computed(() => {
return [
...list,
{
- label: '自定义',
+ label: t('dynamic_time.custom'),
value: 'custom'
}
]
@@ -2018,7 +2024,7 @@ const dfs = arr => {
const renameInputBlur = () => {
if (activeConditionForRename.name.trim() === '') {
- ElMessage.error('字段名称不能为空')
+ ElMessage.error(t('v_query.cannot_be_empty_name'))
renameInput.value[0]?.focus()
return
}
@@ -2058,7 +2064,7 @@ defineExpose({
class="query-condition-configuration"
v-model="dialogVisible"
width="1200px"
- title="查询条件设置"
+ :title="t('v_query.query_condition_setting')"
@click.stop
:before-close="handleBeforeClose"
@mousedown.stop
@@ -2067,7 +2073,7 @@ defineExpose({
- 查询条件
+ {{ t('v_query.query_condition') }}
@@ -2127,17 +2133,17 @@ defineExpose({
- 选择关联图表及字段
+ {{ t('v_query.chart_and_field') }}
- 自动
+ {{ t('chart.margin_model_auto') }}
- 注意:自动模式支持同数据集自动关联字段,可切换到
+ {{ t('v_query.be_switched_to') }}
- 自定义模式。切换到自定义模式后无法再切换为自动!
+ {{ t('v_query.to_automatic_again') }}
@@ -2225,9 +2231,13 @@ defineExpose({
{{
curComponent.checkedFieldsMapStart[field.componentId] === ele.id
- ? '开始时间'
+ ? t('dataset.start_time')
: curComponent.checkedFieldsMapEnd[field.componentId] === ele.id
- ? '结束时间'
+ ? t('dataset.end_time')
: ''
}}
@@ -2322,9 +2332,13 @@ defineExpose({
{{
curComponent.checkedFieldsMapStartNum[field.componentId] === ele.id
- ? '最小值'
+ ? t('chart.min')
: curComponent.checkedFieldsMapEndNum[field.componentId] === ele.id
- ? '最大值'
+ ? t('chart.max')
: ''
}}
@@ -2408,15 +2422,15 @@ defineExpose({