From 881e84c95bb1f10161457f1d9f3fef67e493400a Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 26 Sep 2022 15:10:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=8C=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E8=A7=86=E5=9B=BE=E5=BE=85=E9=80=89=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E8=B6=85=E5=87=BA=E6=98=BE=E7=A4=BA=E8=8C=83=E5=9B=B4=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/canvas/components/Editor/fieldsList.vue   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/canvas/components/Editor/fieldsList.vue b/frontend/src/components/canvas/components/Editor/fieldsList.vue
index 1129437514..f6dd8dda9a 100644
--- a/frontend/src/components/canvas/components/Editor/fieldsList.vue
+++ b/frontend/src/components/canvas/components/Editor/fieldsList.vue
@@ -1,6 +1,6 @@
 <template>
   <div @mousedown="fieldsAreaDown">
-    <el-button v-for="(field) in fields" :key="field.id" size="mini" class="field-area" @click="fieldSelect(field)">
+    <el-button v-for="(field) in fields" :title="field.name" :key="field.id" size="mini" class="field-area" @click="fieldSelect(field)">
       {{ field.name }}
     </el-button>
   </div>
@@ -51,6 +51,9 @@ export default {
   margin: 4px 0 0 0;
   text-align: left;
   margin-left: 0px!important;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 </style>

From 65ff44a85f7c110c1fa6b092051742d57011f685 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 26 Sep 2022 15:22:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=B8=8D=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E5=AF=BC=E8=87=B4=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/custom-component/UserView.vue      | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index dc755f8d9e..272b6beaad 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -654,20 +654,22 @@ export default {
           pre[next['dataeaseName']] = next['name']
           return pre
         }, {})
-        let yAxis = []
-        try {
-          yAxis = JSON.parse(chartDetails.yaxis)
-        } catch (err) {
-          yAxis = JSON.parse(JSON.stringify(chartDetails.yaxis))
-        }
-        let yDataeaseNames = []
-        let yDataeaseNamesCfg = []
-        yAxis.forEach(yItem => {
-          yDataeaseNames.push(yItem.dataeaseName)
-          yDataeaseNamesCfg[yItem.dataeaseName]=yItem.formatterCfg
-        })
         const rowData = chartDetails.data.tableRow[0]
-        this.rowDataFormat(rowData,yDataeaseNames,yDataeaseNamesCfg)
+        if(chartDetails.type === 'richTextView'){
+          let yAxis = []
+          try {
+            yAxis = JSON.parse(chartDetails.yaxis)
+          } catch (err) {
+            yAxis = JSON.parse(JSON.stringify(chartDetails.yaxis))
+          }
+          let yDataeaseNames = []
+          let yDataeaseNamesCfg = []
+          yAxis.forEach(yItem => {
+            yDataeaseNames.push(yItem.dataeaseName)
+            yDataeaseNamesCfg[yItem.dataeaseName]=yItem.formatterCfg
+          })
+          this.rowDataFormat(rowData,yDataeaseNames,yDataeaseNamesCfg)
+        }
         for (const key in rowData) {
           this.dataRowSelect[nameIdMap[key]] = rowData[key]
           this.dataRowNameSelect[sourceFieldNameIdMap[key]] = rowData[key]