Skip to content

Commit 25005d6

Browse files
committed
更新 ExpressionEditor 组件和语言文件:
1. 修改提示信息的键,确保使用统一的 messages 命名空间。 2. 在英文和中文语言文件中添加新的消息提示,增强用户体验。
1 parent 5846638 commit 25005d6

File tree

3 files changed

+26
-10
lines changed

3 files changed

+26
-10
lines changed

src/components/ExpressionEditor.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@
117117
</div>
118118
<div class="preview-result">
119119
<template v-if="!displayExpression">
120-
<div class="empty-tip">{{ t('editor.emptyTip') }}</div>
120+
<div class="empty-tip">{{ t('editor.messages.emptyTip') }}</div>
121121
</template>
122122
<template v-else-if="!isFormulaComplete">
123-
<div class="incomplete-tip">{{ t('editor.incompleteTip') }}</div>
123+
<div class="incomplete-tip">{{ t('editor.messages.incompleteTip') }}</div>
124124
</template>
125125
<template v-else>
126-
{{ t('editor.calculationResult') }}: <span class="result-value">{{ calculationResult }}</span>
126+
{{ t('editor.messages.calculationResult') }}: <span class="result-value">{{ calculationResult }}</span>
127127
</template>
128128
</div>
129129
</div>
@@ -983,7 +983,7 @@ const validateExpression = () => {
983983
if (!displayExpression.value.trim()) {
984984
showValidationError.value = true;
985985
showValidationSuccess.value = false;
986-
validationMessage.value = t('messages.emptyFormula');
986+
validationMessage.value = t('editor.messages.emptyFormula');
987987
validationStatus.value = 'error';
988988
989989
if (validationTimer) {
@@ -1005,17 +1005,17 @@ const validateExpression = () => {
10051005
if (!result) {
10061006
showValidationError.value = true;
10071007
showValidationSuccess.value = false;
1008-
validationMessage.value = t('messages.validError');
1008+
validationMessage.value = t('editor.messages.validError');
10091009
validationStatus.value = 'error';
10101010
} else if (!isFormulaComplete.value) {
10111011
showValidationError.value = true;
10121012
showValidationSuccess.value = false;
1013-
validationMessage.value = t('editor.incompleteTip');
1013+
validationMessage.value = t('editor.messages.incompleteTip');
10141014
validationStatus.value = 'error';
10151015
} else {
10161016
showValidationSuccess.value = true;
10171017
showValidationError.value = false;
1018-
validationMessage.value = t('messages.validSuccess');
1018+
validationMessage.value = t('editor.messages.validSuccess');
10191019
validationStatus.value = 'success';
10201020
}
10211021
@@ -1032,7 +1032,7 @@ const validateExpression = () => {
10321032
} catch (error) {
10331033
showValidationError.value = true;
10341034
showValidationSuccess.value = false;
1035-
validationMessage.value = t('messages.validError');
1035+
validationMessage.value = t('editor.messages.validError');
10361036
validationStatus.value = 'error';
10371037
}
10381038
};

src/locales/en.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,15 @@ export default {
3636
pasteSuccess: 'Pasted successfully',
3737
pasteFailed: 'Paste failed',
3838
autoConvertVariables: 'Variables have been automatically converted',
39-
invalidFormula: 'Invalid formula'
39+
invalidFormula: 'Invalid formula',
40+
messages: {
41+
emptyFormula: 'Formula is empty',
42+
validError: 'Expression validation failed',
43+
validSuccess: 'Expression validation passed',
44+
incompleteTip: 'Formula is incomplete',
45+
emptyTip: 'Please enter an expression',
46+
calculationResult: 'Result'
47+
}
4048
},
4149
settings: {
4250
title: 'Editor Settings',

src/locales/zh.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,15 @@ export default {
3636
pasteSuccess: '粘贴成功',
3737
pasteFailed: '粘贴失败',
3838
autoConvertVariables: '变量已自动转换',
39-
invalidFormula: '无效的公式'
39+
invalidFormula: '无效的公式',
40+
messages: {
41+
emptyFormula: '公式为空',
42+
validError: '公式验证失败',
43+
validSuccess: '公式验证通过',
44+
incompleteTip: '公式不完整',
45+
emptyTip: '请输入公式',
46+
calculationResult: '计算结果'
47+
}
4048
},
4149
settings: {
4250
title: '编辑器设置',

0 commit comments

Comments
 (0)