From 31dcdc8e86d711de0fe8911486c71ed4ee274458 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 14 Mar 2023 12:52:27 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=AE=A1=E7=AE=97=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=87=BD=E6=95=B0=E4=B8=BA=E7=A9=BA=E6=97=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/en.js                       |  3 +-
 frontend/src/lang/tw.js                       |  3 +-
 frontend/src/lang/zh.js                       |  5 +-
 .../views/chart/view/CalcChartFieldEdit.vue   | 46 +++++++++++--------
 .../src/views/dataset/data/CalcFieldEdit.vue  | 42 +++++++++--------
 5 files changed, 57 insertions(+), 42 deletions(-)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index a3dfda0eb1..108c81202c 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1519,7 +1519,8 @@ export default {
     p_center: 'Center',
     table_auto_break_line: 'Auto Line Feed',
     table_break_line_tip: 'If open this option,the table item height will disabled.',
-    step: 'Step(px)'
+    step: 'Step(px)',
+    no_function: 'Function not enter，please input.'
   },
   dataset: {
     scope_edit: 'Effective only when editing',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 2bd08998ea..409c7e91c3 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1513,7 +1513,8 @@ export default {
     p_center: '居中',
     table_auto_break_line: '自動換行',
     table_break_line_tip: '開啟自動換行，表格行高設置將失效',
-    step: '步長(px)'
+    step: '步長(px)',
+    no_function: '函數尚未支持直接引用，請在字段表達式中手動輸入。'
   },
   dataset: {
     scope_edit: '僅編輯時生效',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 0cba79a323..42caffc1c0 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1,4 +1,4 @@
-import {$confirm} from "@/utils/message";
+import { $confirm } from '@/utils/message'
 
 export default {
   fu: {
@@ -1514,7 +1514,8 @@ export default {
     p_center: '居中',
     table_auto_break_line: '自动换行',
     table_break_line_tip: '开启自动换行，表格行高设置将失效',
-    step: '步长(px)'
+    step: '步长(px)',
+    no_function: '函数尚未支持直接引用，请在字段表达式中手动输入。'
   },
   dataset: {
     scope_edit: '仅编辑时生效',
diff --git a/frontend/src/views/chart/view/CalcChartFieldEdit.vue b/frontend/src/views/chart/view/CalcChartFieldEdit.vue
index 4ed42a2e45..d0ea61a4b3 100644
--- a/frontend/src/views/chart/view/CalcChartFieldEdit.vue
+++ b/frontend/src/views/chart/view/CalcChartFieldEdit.vue
@@ -260,26 +260,32 @@
           clearable
         />
         <el-row class="function-height">
-          <el-popover
-            v-for="(item,index) in functionData"
-            :key="index"
-            class="function-pop"
-            placement="right"
-            width="200"
-            trigger="hover"
-            :open-delay="500"
-          >
-            <p class="pop-title">{{ item.name }}</p>
-            <p class="pop-info">{{ item.func }}</p>
-            <p class="pop-info">{{ item.desc }}</p>
-            <span
-              slot="reference"
-              class="function-style"
-              @click="insertParamToCodeMirror(item.func)"
-            >{{
-              item.func
-            }}</span>
-          </el-popover>
+          <div v-if="functionData && functionData.length > 0">
+            <el-popover
+              v-for="(item,index) in functionData"
+              :key="index"
+              class="function-pop"
+              placement="right"
+              width="200"
+              trigger="hover"
+              :open-delay="500"
+            >
+              <p class="pop-title">{{ item.name }}</p>
+              <p class="pop-info">{{ item.func }}</p>
+              <p class="pop-info">{{ item.desc }}</p>
+              <span
+                slot="reference"
+                class="function-style"
+                @click="insertParamToCodeMirror(item.func)"
+              >{{
+                item.func
+              }}</span>
+            </el-popover>
+          </div>
+          <div
+            v-else
+            class="class-na"
+          >{{ $t('chart.no_function') }}</div>
         </el-row>
       </div>
     </div>
diff --git a/frontend/src/views/dataset/data/CalcFieldEdit.vue b/frontend/src/views/dataset/data/CalcFieldEdit.vue
index 022b6a0c4d..404b0f50a6 100644
--- a/frontend/src/views/dataset/data/CalcFieldEdit.vue
+++ b/frontend/src/views/dataset/data/CalcFieldEdit.vue
@@ -236,24 +236,30 @@
           clearable
         />
         <el-row class="function-height">
-          <el-popover
-            v-for="(item, index) in functionData"
-            :key="index"
-            class="function-pop"
-            placement="right"
-            width="200"
-            trigger="hover"
-            :open-delay="500"
-          >
-            <p class="pop-title">{{ item.name }}</p>
-            <p class="pop-info">{{ item.func }}</p>
-            <p class="pop-info">{{ item.desc }}</p>
-            <span
-              slot="reference"
-              class="function-style"
-              @click="insertParamToCodeMirror(item.func)"
-            >{{ item.func }}</span>
-          </el-popover>
+          <div v-if="functionData && functionData.length > 0">
+            <el-popover
+              v-for="(item, index) in functionData"
+              :key="index"
+              class="function-pop"
+              placement="right"
+              width="200"
+              trigger="hover"
+              :open-delay="500"
+            >
+              <p class="pop-title">{{ item.name }}</p>
+              <p class="pop-info">{{ item.func }}</p>
+              <p class="pop-info">{{ item.desc }}</p>
+              <span
+                slot="reference"
+                class="function-style"
+                @click="insertParamToCodeMirror(item.func)"
+              >{{ item.func }}</span>
+            </el-popover>
+          </div>
+          <div
+            v-else
+            class="class-na"
+          >{{ $t('chart.no_function') }}</div>
         </el-row>
       </div>
     </div>