From 3b5bb9b17b3d8c09ab4295165734fd5ed763e1d3 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 18 Aug 2021 14:01:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AD=97=E6=AE=B5=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/DatasetFunctionService.java      |  1 +
 frontend/src/views/dataset/data/CalcFieldEdit.vue    | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/DatasetFunctionService.java b/backend/src/main/java/io/dataease/service/dataset/DatasetFunctionService.java
index 0ce78d354e..ff6337037f 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DatasetFunctionService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DatasetFunctionService.java
@@ -33,6 +33,7 @@ public class DatasetFunctionService {
         if (StringUtils.isNotEmpty(datasetTableFunction.getDbType())) {
             criteria.andDbTypeEqualTo(datasetTableFunction.getDbType());
         }
+        datasetTableFunctionExample.setOrderByClause("name asc");
         return datasetTableFunctionMapper.selectByExampleWithBLOBs(datasetTableFunctionExample);
     }
 
diff --git a/frontend/src/views/dataset/data/CalcFieldEdit.vue b/frontend/src/views/dataset/data/CalcFieldEdit.vue
index 003ede5ea2..99b2eb0427 100644
--- a/frontend/src/views/dataset/data/CalcFieldEdit.vue
+++ b/frontend/src/views/dataset/data/CalcFieldEdit.vue
@@ -151,7 +151,7 @@
               <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" :title="item.func" @click="insertParamToCodeMirror(item.func)">{{ item.func }}</span>
+              <span slot="reference" class="function-style" @click="insertParamToCodeMirror(item.func)">{{ item.func }}</span>
             </el-popover>
           </el-row>
         </el-col>
@@ -468,9 +468,13 @@ export default {
     padding: 2px 4px;
     cursor: pointer;
     margin: 4px 0;
-    overflow-x: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
+    word-break: break-word;
+    border: solid 1px #eee;
+  }
+  .function-style:hover {
+    background: #e8f4ff;
+    border-color: #a3d3ff;
+    cursor: pointer;
   }
   .function-height{
     height: calc(100% - 50px);