From 656feb2d4a9dba12e373c4dcbc3ffe34176c5cb1 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Mon, 27 May 2024 13:37:23 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E8=AE=A1=E7=AE=97=E5=AD=97=E6=AE=B5=E8=A1=A8=E8=BE=BE?=
 =?UTF-8?q?=E5=BC=8F=E8=AF=AD=E6=B3=95=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/locales/zh-CN.ts             |  1 +
 .../visualized/data/dataset/form/CalcFieldEdit.vue  | 13 ++++++++++---
 .../views/visualized/data/dataset/form/index.vue    |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

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()
             <span>*</span>
             <el-tooltip class="item" effect="dark" placement="top">
               <template #content>
-                {{ t('dataset.calc_tips.tip1') }}
-                <br />
-                {{ t('dataset.calc_tips.tip2') }}
+                <div v-if="props.crossDs">{{ t('dataset.calc_tips.tip1') }}</div>
+                <div v-else>{{ t('dataset.calc_tips.tip1_1') }}</div>
+                <div>{{ t('dataset.calc_tips.tip2') }}</div>
               </template>
               <el-icon size="16px">
                 <Icon name="icon_info_outlined"></Icon>
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"
   >
-    <calc-field-edit ref="calcEdit" />
+    <calc-field-edit ref="calcEdit" :crossDs="crossDatasources" />
     <template #footer>
       <el-button secondary @click="closeEditCalc()">{{ t('dataset.cancel') }} </el-button>
       <el-button type="primary" @click="confirmEditCalc()">{{ t('dataset.confirm') }} </el-button>