diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 79908875a0..c4ac764152 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -1405,6 +1405,7 @@ export default { pls_input_filename: '请输入文件名称', calc_tips: { tip1: '表达式语法请遵循calcite语法。', + tip1_1: '表达式语法请遵循该数据源对应的数据库语法。', tip2: '聚合运算仅能在图表中生效。', tip3: '引用字段以 "[" 开始, "]" 结束', tip4: '请勿修改引用内容,否则将引用失败', diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/CalcFieldEdit.vue b/core/core-frontend/src/views/visualized/data/dataset/form/CalcFieldEdit.vue index 145293f211..25826938a7 100644 --- a/core/core-frontend/src/views/visualized/data/dataset/form/CalcFieldEdit.vue +++ b/core/core-frontend/src/views/visualized/data/dataset/form/CalcFieldEdit.vue @@ -29,6 +29,13 @@ const searchFunction = ref('') const mirror = ref() +const props = defineProps({ + crossDs: { + type: Boolean, + default: () => false + } +}) + const fields = [ { label: t('dataset.text'), value: 0 }, { label: t('dataset.time'), value: 1 }, @@ -287,9 +294,9 @@ initFunction() * diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue index 76cdaba7bd..ab7d0da59e 100644 --- a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue +++ b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue @@ -1894,7 +1894,7 @@ const getDsIconName = data => { width="1000px" :title="calcTitle" > - +