Merge branch 'dev' of github.com:dataease/dataease into dev

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>

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]