diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index 6f021aa153..06d6fefd59 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -137,7 +137,21 @@ export default { cannot_be_empty_de_: 'Expression cannot be empty!', copy_a_dataset: 'Copy a dataset', cannot_be_empty_de_field: 'The related field cannot be empty!', - dataset_cannot_be: 'The dataset cannot be' + dataset_cannot_be: 'The dataset cannot be empty', + save_and_return: 'Save and return', + select_data_source: 'Select data source', + invalid_data_source: 'Invalid data source', + be_reported_incorrectly: + 'You are linking tables across data sources. Please make sure to use the standard syntax and functions of calcite, otherwise the data set will be reported incorrectly', + refresh_data: 'Refresh data', + convert_to_indicator: 'Convert to indicator', + convert_to_dimension: 'Convert to dimension', + selected: 'Selected', + bar: 'Bar', + format_edit: 'Format edit', + custom_time_format: 'Custom time format', + cannot_be_empty_: 'Filter field cannot be empty', + cannot_be_empty_de_ruler: 'Rule condition cannot be empty' }, login: { welcome: 'Welcome', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index bdc3afb536..c887e48ef2 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -158,7 +158,21 @@ export default { cannot_be_empty_de_: '表达式不能为空!', copy_a_dataset: '复制数据集', cannot_be_empty_de_field: '关联字段不能为空!', - dataset_cannot_be: '数据集不能为' + dataset_cannot_be: '数据集不能为空', + save_and_return: '保存并返回', + select_data_source: '选择数据源', + invalid_data_source: '无效数据源', + be_reported_incorrectly: + '您正在进行跨数据源的表关联,请确保使用calcite的标准语法和函数,否则会导致数据集报错', + refresh_data: '刷新数据', + convert_to_indicator: '转换为指标', + convert_to_dimension: '转换为维度', + selected: '已选择', + bar: '条', + format_edit: '格式编辑', + custom_time_format: '自定义时间格式', + cannot_be_empty_: '过滤字段不能为空', + cannot_be_empty_de_ruler: '规则条件不能为空' }, dynamic_time: { set_default: '设置默认值', diff --git a/core/core-frontend/src/views/visualized/data/dataset/auth-tree/RowAuth.vue b/core/core-frontend/src/views/visualized/data/dataset/auth-tree/RowAuth.vue index 28ecb11651..e4b8cd8e94 100644 --- a/core/core-frontend/src/views/visualized/data/dataset/auth-tree/RowAuth.vue +++ b/core/core-frontend/src/views/visualized/data/dataset/auth-tree/RowAuth.vue @@ -42,12 +42,12 @@ const submit = () => { } const errorDetected = ({ enumValue, deType, filterType, term, value, name }) => { if (!name) { - errorMessage.value = '过滤字段不能为空' + errorMessage.value = t('data_set.cannot_be_empty_') return } if (filterType === 'logic') { if (!term) { - errorMessage.value = '规则条件不能为空' + errorMessage.value = t('data_set.cannot_be_empty_de_ruler') return } if (!term.includes('null') && !term.includes('empty') && value === '') { diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue b/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue index 9dcdbc82cf..5b0f920fb5 100644 --- a/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue +++ b/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue @@ -224,7 +224,7 @@ let sql = '' const save = (cb?: () => void) => { if (!sqlNode.value.tableName.trim()) { - ElMessage.error('SQL名字不能为空') + ElMessage.error(t('data_set.cannot_be_empty')) return } @@ -232,7 +232,7 @@ const save = (cb?: () => void) => { sql = codeCom.value.state.doc.toString() sqlNode.value.changeFlag = true if (!sql.trim()) { - ElMessage.error('SQL不能为空') + ElMessage.error(t('data_set.cannot_be_empty_de')) return } sqlNode.value.sql = Base64.encode(sql) @@ -264,7 +264,7 @@ const handleClose = () => { if (changeFlag || sql !== sqlNew || !sqlNew.trim()) { ElMessageBox.confirm(t('chart.tips'), { confirmButtonType: 'primary', - tip: '你填写的信息未保存,确认退出吗?', + tip: t('data_set.sure_to_exit'), type: 'warning', autofocus: false, showClose: false @@ -342,9 +342,9 @@ const dsChange = (val: string) => { const copyInfo = async (value: string) => { try { await toClipboard(value) - ElMessage.success('复制成功') + ElMessage.success(t('data_set.copied_successfully')) } catch (e) { - ElMessage.warning('您的浏览器不支持复制:', e) + ElMessage.warning(t('data_set.not_support_copying'), e) } } @@ -397,7 +397,7 @@ const saveVariable = () => { state.variables = JSON.parse(JSON.stringify(state.variablesTmp)) showVariableMgm.value = false changeFlagCode.value = true - ElMessage.success('参数设置成功') + ElMessage.success(t('data_set.parameters_set_successfully')) } const mousedownDrag = () => { document.querySelector('.sql-eidtor').addEventListener('mousemove', calculateWidth) @@ -414,7 +414,7 @@ const mousedownDrag = () => { - 运行 + {{ t('data_set.run') }} - 参数设置 + {{ t('data_set.parameter_settings') }} - 保存 @@ -454,7 +454,7 @@ const mousedownDrag = () => { >

- 当前数据源 + {{ t('data_set.current_data_source') }} @@ -500,7 +500,7 @@ const mousedownDrag = () => { class="el-empty__description" style="margin-top: 80px; color: #5e6d82; text-align: center" > - 没有找到相关内容 + {{ t('data_set.relevant_content_found') }}

@@ -580,7 +580,7 @@ const mousedownDrag = () => { header-cell-class-name="header-cell" :data="gridData" > - + @@ -655,11 +658,11 @@ const mousedownDrag = () => { @@ -852,7 +855,7 @@ const mousedownDrag = () => {