From 133e88378647025088631c71299cf8b5080f31c1 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Fri, 4 Jun 2021 17:16:50 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat(frontend):=E6=96=87=E6=9C=AC=E8=BF=87?=
 =?UTF-8?q?=E9=95=BF=EF=BC=8C=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8Atooltip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/group/Group.vue      | 20 ++++++++++---
 frontend/src/views/chart/view/ChartEdit.vue   | 13 +++++++--
 .../dataset/common/DatasetCustomField.vue     | 10 ++++++-
 .../dataset/common/DatasetGroupSelector.vue   | 20 ++++++++++---
 frontend/src/views/dataset/group/Group.vue    | 28 +++++++++++++------
 5 files changed, 71 insertions(+), 20 deletions(-)

diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue
index 06d17d430f..d88ab7fb66 100644
--- a/frontend/src/views/chart/group/Group.vue
+++ b/frontend/src/views/chart/group/Group.vue
@@ -51,7 +51,7 @@
                   <!--                  />-->
                   <svg-icon icon-class="scene" class="ds-icon-scene" />
                 </span>
-                <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">{{ data.name }}</span>
+                <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" :title="data.name">{{ data.name }}</span>
               </span>
               <span v-if="hasDataPermission('manage',data.privileges)">
                 <span v-if="data.type ==='group'" @click.stop>
@@ -114,8 +114,8 @@
 
     <!--scene-->
     <el-col v-if="sceneMode">
-      <el-row class="title-css">
-        <span class="title-text">
+      <el-row class="title-css scene-title">
+        <span class="title-text scene-title-name" :title="currGroup.name">
           {{ currGroup.name }}
         </span>
         <el-button icon="el-icon-back" size="mini" style="float: right" circle @click="back">
@@ -153,7 +153,7 @@
         <span slot-scope="{ node, data }" class="custom-tree-node-list">
           <span style="display: flex;flex: 1;width: 0;">
             <span><svg-icon :icon-class="data.type" /></span>
-            <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">{{ data.name }}</span>
+            <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" :title="data.name">{{ data.name }}</span>
           </span>
           <span v-if="hasDataPermission('manage',data.privileges)">
             <span style="margin-left: 12px;" @click.stop>
@@ -680,4 +680,16 @@ export default {
   .form-item>>>.el-form-item__label{
     font-size: 12px;
   }
+
+  .scene-title{
+    width: 100%;
+    display: flex;
+  }
+  .scene-title-name{
+    width: 100%;
+    overflow: hidden;
+    display: inline-block;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
 </style>
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 6b49d78479..bb32a871f1 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -38,7 +38,7 @@
             @start="start1"
           >
             <transition-group>
-              <span v-for="item in dimension" :key="item.id" class="item">
+              <span v-for="item in dimension" :key="item.id" class="item" :title="item.name">
                 <svg-icon v-if="item.deType === 0" icon-class="field_text" class="field-icon-text" />
                 <svg-icon v-if="item.deType === 1" icon-class="field_time" class="field-icon-time" />
                 <svg-icon v-if="item.deType === 2 || item.deType === 3" icon-class="field_value" class="field-icon-value" />
@@ -59,7 +59,7 @@
             @start="start1"
           >
             <transition-group>
-              <span v-for="item in quota" :key="item.id" class="item">
+              <span v-for="item in quota" :key="item.id" class="item" :title="item.name">
                 <svg-icon v-if="item.deType === 0" icon-class="field_text" class="field-icon-text" />
                 <svg-icon v-if="item.deType === 1" icon-class="field_time" class="field-icon-time" />
                 <svg-icon v-if="item.deType === 2 || item.deType === 3" icon-class="field_value" class="field-icon-value" />
@@ -941,7 +941,10 @@ export default {
     background-color: white;
     display: block;
     word-break: break-all;
-    white-space: normal;
+
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
   }
 
   .item-on-move {
@@ -952,6 +955,10 @@ export default {
     color: #606266;
     /*background-color: rgba(35,46,64,.05);*/
     background-color: white;
+
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
   }
 
   .item + .item {
diff --git a/frontend/src/views/dataset/common/DatasetCustomField.vue b/frontend/src/views/dataset/common/DatasetCustomField.vue
index ce009078e9..1d5b174fa5 100644
--- a/frontend/src/views/dataset/common/DatasetCustomField.vue
+++ b/frontend/src/views/dataset/common/DatasetCustomField.vue
@@ -1,7 +1,7 @@
 <template>
   <el-col>
     <el-row style="height: 25px;">
-      <span>{{ table.name }}</span>
+      <span class="table-name">{{ table.name }}</span>
     </el-row>
     <el-divider />
     <el-checkbox v-model="checkAll" :disabled="!(fields.length > 0)" :indeterminate="isIndeterminate" @change="handleCheckAllChange">{{ $t('dataset.check_all') }}</el-checkbox>
@@ -105,4 +105,12 @@ export default {
   .el-divider--horizontal {
     margin: 12px 0
   }
+
+  .table-name{
+    display: inline-block;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    width: 100%;
+    overflow: hidden;
+  }
 </style>
diff --git a/frontend/src/views/dataset/common/DatasetGroupSelector.vue b/frontend/src/views/dataset/common/DatasetGroupSelector.vue
index 33d758a6bd..e44c6f0792 100644
--- a/frontend/src/views/dataset/common/DatasetGroupSelector.vue
+++ b/frontend/src/views/dataset/common/DatasetGroupSelector.vue
@@ -42,7 +42,7 @@
                   <!--                  />-->
                   <svg-icon icon-class="scene" class="ds-icon-scene" />
                 </span>
-                <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">{{ data.name }}</span>
+                <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" :title="data.name">{{ data.name }}</span>
               </span>
             </span>
           </el-tree>
@@ -52,8 +52,8 @@
 
     <!--scene-->
     <el-col v-if="sceneMode" v-loading="dsLoading">
-      <el-row class="title-css">
-        <span class="title-text">
+      <el-row class="title-css scene-title">
+        <span class="title-text scene-title-name" :title="currGroup.name">
           {{ currGroup.name }}
         </span>
         <el-button icon="el-icon-back" size="mini" style="float: right" circle @click="back">
@@ -94,7 +94,7 @@
               <span v-if="data.mode === 0" style="margin-left: 6px"><i class="el-icon-s-operation" /></span>
               <span v-if="data.mode === 1" style="margin-left: 6px"><i class="el-icon-alarm-clock" /></span>
             </span>
-            <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">{{ data.name }}</span>
+            <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" :title="data.name">{{ data.name }}</span>
           </span>
         </span>
       </el-tree>
@@ -383,4 +383,16 @@ export default {
   .title-text {
     line-height: 26px;
   }
+
+  .scene-title{
+    width: 100%;
+    display: flex;
+  }
+  .scene-title-name{
+    width: 100%;
+    overflow: hidden;
+    display: inline-block;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
 </style>
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index 6aaac29707..d6a232d744 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -51,7 +51,7 @@
                   <!--                  />-->
                   <svg-icon icon-class="scene" class="ds-icon-scene" />
                 </span>
-                <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">{{ data.name }}</span>
+                <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" :title="data.name">{{ data.name }}</span>
               </span>
               <span v-if="hasDataPermission('manage',data.privileges)">
                 <span v-if="data.type ==='group'" @click.stop>
@@ -73,7 +73,7 @@
                     </el-dropdown-menu>
                   </el-dropdown>
                 </span>
-                <span style="margin-left: 12px;" @click.stop >
+                <span style="margin-left: 12px;" @click.stop>
                   <el-dropdown trigger="click" size="small" @command="clickMore">
                     <span class="el-dropdown-link">
                       <el-button
@@ -82,7 +82,7 @@
                         size="small"
                       />
                     </span>
-                    <el-dropdown-menu  slot="dropdown">
+                    <el-dropdown-menu slot="dropdown">
                       <el-dropdown-item icon="el-icon-edit-outline" :command="beforeClickMore('rename',data,node)">
                         {{ $t('dataset.rename') }}
                       </el-dropdown-item>
@@ -117,8 +117,8 @@
 
     <!--scene-->
     <el-col v-if="sceneMode">
-      <el-row class="title-css">
-        <span class="title-text">
+      <el-row class="title-css scene-title">
+        <span class="title-text scene-title-name" :title="currGroup.name">
           {{ currGroup.name }}
         </span>
         <el-button icon="el-icon-back" size="mini" style="float: right" circle @click="back">
@@ -191,10 +191,10 @@
               <span v-if="data.mode === 0" style="margin-left: 6px"><i class="el-icon-s-operation" /></span>
               <span v-if="data.mode === 1" style="margin-left: 6px"><i class="el-icon-alarm-clock" /></span>
             </span>
-            <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">{{ data.name }}</span>
+            <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" :title="data.name">{{ data.name }}</span>
           </span>
           <span v-if="hasDataPermission('manage',data.privileges)">
-            <span style="margin-left: 12px;" @click.stop >
+            <span style="margin-left: 12px;" @click.stop>
               <el-dropdown trigger="click" size="small" @command="clickMore">
                 <span class="el-dropdown-link">
                   <el-button
@@ -203,7 +203,7 @@
                     size="small"
                   />
                 </span>
-                <el-dropdown-menu  slot="dropdown">
+                <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item icon="el-icon-edit-outline" :command="beforeClickMore('editTable',data,node)">
                     {{ $t('dataset.rename') }}
                   </el-dropdown-item>
@@ -621,4 +621,16 @@ export default {
   .title-text {
     line-height: 26px;
   }
+
+  .scene-title{
+    width: 100%;
+    display: flex;
+  }
+  .scene-title-name{
+    width: 100%;
+    overflow: hidden;
+    display: inline-block;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
 </style>

From 88e8cf1cd7a02d5745d58ead0ff0631e4c228c89 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Fri, 4 Jun 2021 17:27:14 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E9=A3=8E=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/view/ChartEdit.vue | 104 ++++++++++++--------
 1 file changed, 65 insertions(+), 39 deletions(-)

diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index bb32a871f1..a75f698825 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -101,49 +101,75 @@
                 @change="save(true,'chart')"
               >
                 <div style="width: 100%;display: flex;display: -webkit-flex;justify-content: space-between;flex-direction: row;flex-wrap: wrap;">
-                  <el-tooltip effect="dark" :content="$t('chart.chart_table_normal')" placement="bottom">
-                    <el-radio value="table-normal" label="table-normal"><svg-icon icon-class="table-normal" class="chart-icon" /></el-radio>
-                  </el-tooltip>
-                  <el-tooltip effect="dark" :content="$t('chart.chart_card')" placement="bottom">
-                    <el-radio value="text" label="text"><svg-icon icon-class="text" class="chart-icon" /></el-radio>
-                  </el-tooltip>
-                  <el-tooltip effect="dark" :content="$t('chart.chart_bar')" placement="bottom">
-                    <el-radio value="bar" label="bar"><svg-icon icon-class="bar" class="chart-icon" /></el-radio>
-                  </el-tooltip>
-                  <el-tooltip effect="dark" :content="$t('chart.chart_bar_stack')" placement="bottom">
-                    <el-radio value="bar-stack" label="bar-stack"><svg-icon icon-class="bar-stack" class="chart-icon" /></el-radio>
-                  </el-tooltip>
-                  <el-tooltip effect="dark" :content="$t('chart.chart_bar_horizontal')" placement="bottom">
-                    <el-radio value="bar-horizontal" label="bar-horizontal"><svg-icon icon-class="bar-horizontal" class="chart-icon" /></el-radio>
-                  </el-tooltip>
+                  <el-radio value="table-normal" label="table-normal">
+                    <span :title="$t('chart.chart_table_normal')">
+                      <svg-icon icon-class="table-normal" class="chart-icon" />
+                    </span>
+                  </el-radio>
+                  <el-radio value="text" label="text">
+                    <span :title="$t('chart.chart_card')">
+                      <svg-icon icon-class="text" class="chart-icon" />
+                    </span>
+                  </el-radio>
+                  <el-radio value="bar" label="bar">
+                    <span :title="$t('chart.chart_bar')">
+                      <svg-icon icon-class="bar" class="chart-icon" />
+                    </span>
+                  </el-radio>
+                  <el-radio value="bar-stack" label="bar-stack">
+                    <span :title="$t('chart.chart_bar_stack')">
+                      <svg-icon icon-class="bar-stack" class="chart-icon" />
+                    </span>
+                  </el-radio>
+                  <el-radio value="bar-horizontal" label="bar-horizontal">
+                    <span :title="$t('chart.chart_bar_horizontal')">
+                      <svg-icon icon-class="bar-horizontal" class="chart-icon" />
+                    </span>
+                  </el-radio>
                 </div>
                 <div style="width: 100%;display: flex;display: -webkit-flex;justify-content: space-between;flex-direction: row;flex-wrap: wrap;">
-                  <el-tooltip effect="dark" :content="$t('chart.chart_bar_stack_horizontal')" placement="bottom">
-                    <el-radio value="bar-stack-horizontal" label="bar-stack-horizontal"><svg-icon icon-class="bar-stack-horizontal" class="chart-icon" /></el-radio>
-                  </el-tooltip>
-                  <el-tooltip effect="dark" :content="$t('chart.chart_line')" placement="bottom">
-                    <el-radio value="line" label="line"><svg-icon icon-class="line" class="chart-icon" /></el-radio>
-                  </el-tooltip>
-                  <el-tooltip effect="dark" :content="$t('chart.chart_line_stack')" placement="bottom">
-                    <el-radio value="line-stack" label="line-stack"><svg-icon icon-class="line-stack" class="chart-icon" /></el-radio>
-                  </el-tooltip>
-                  <el-tooltip effect="dark" :content="$t('chart.chart_pie')" placement="bottom">
-                    <el-radio value="pie" label="pie"><svg-icon icon-class="pie" class="chart-icon" /></el-radio>
-                  </el-tooltip>
-                  <el-tooltip effect="dark" :content="$t('chart.chart_pie_rose')" placement="bottom">
-                    <el-radio value="pie-rose" label="pie-rose"><svg-icon icon-class="pie-rose" class="chart-icon" /></el-radio>
-                  </el-tooltip>
+                  <el-radio value="bar-stack-horizontal" label="bar-stack-horizontal">
+                    <span :title="$t('chart.chart_bar_stack_horizontal')">
+                      <svg-icon icon-class="bar-stack-horizontal" class="chart-icon" />
+                    </span>
+                  </el-radio>
+                  <el-radio value="line" label="line">
+                    <span :title="$t('chart.chart_line')">
+                      <svg-icon icon-class="line" class="chart-icon" />
+                    </span>
+                  </el-radio>
+                  <el-radio value="line-stack" label="line-stack">
+                    <span :title="$t('chart.chart_line_stack')">
+                      <svg-icon icon-class="line-stack" class="chart-icon" />
+                    </span>
+                  </el-radio>
+                  <el-radio value="pie" label="pie">
+                    <span :title="$t('chart.chart_pie')">
+                      <svg-icon icon-class="pie" class="chart-icon" />
+                    </span>
+                  </el-radio>
+                  <el-radio value="pie-rose" label="pie-rose">
+                    <span :title="$t('chart.chart_pie_rose')">
+                      <svg-icon icon-class="pie-rose" class="chart-icon" />
+                    </span>
+                  </el-radio>
                 </div>
                 <div style="width: 100%;display: flex;display: -webkit-flex;justify-content: space-between;flex-direction: row;flex-wrap: wrap;">
-                  <el-tooltip effect="dark" :content="$t('chart.chart_funnel')" placement="bottom">
-                    <el-radio value="funnel" label="funnel"><svg-icon icon-class="funnel" class="chart-icon" /></el-radio>
-                  </el-tooltip>
-                  <el-tooltip effect="dark" :content="$t('chart.chart_radar')" placement="bottom">
-                    <el-radio value="radar" label="radar"><svg-icon icon-class="radar" class="chart-icon" /></el-radio>
-                  </el-tooltip>
-                  <el-tooltip effect="dark" :content="$t('chart.chart_gauge')" placement="bottom">
-                    <el-radio value="gauge" label="gauge"><svg-icon icon-class="gauge" class="chart-icon" /></el-radio>
-                  </el-tooltip>
+                  <el-radio value="funnel" label="funnel">
+                    <span :title="$t('chart.chart_funnel')">
+                      <svg-icon icon-class="funnel" class="chart-icon" />
+                    </span>
+                  </el-radio>
+                  <el-radio value="radar" label="radar">
+                    <span :title="$t('chart.chart_radar')">
+                      <svg-icon icon-class="radar" class="chart-icon" />
+                    </span>
+                  </el-radio>
+                  <el-radio value="gauge" label="gauge">
+                    <span :title="$t('chart.chart_gauge')">
+                      <svg-icon icon-class="gauge" class="chart-icon" />
+                    </span>
+                  </el-radio>
                   <el-radio value="" label="" disabled class="disabled-none-cursor"><svg-icon icon-class="" class="chart-icon" /></el-radio>
                   <el-radio value="" label="" disabled class="disabled-none-cursor"><svg-icon icon-class="" class="chart-icon" /></el-radio>
                 </div>

From 14bf48137d5c087c7d88cf0b988d894b53aee99f Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 4 Jun 2021 18:01:51 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E3=80=90ID1003939=E3=80=91=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E7=AE=A1=E7=90=86-=E4=BF=AE=E6=94=B9=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=A1=A8=E6=A0=BC=E5=AD=97=E6=AE=B5-?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2/=E6=B7=BB=E5=8A=A0/?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=A7=92=E8=89=B2=E5=90=8E=E5=8F=88=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=81=A2=E5=A4=8D=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/user/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index 9c8ceae97f..a5c4664a67 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -3,7 +3,7 @@
     <complex-table
       :data="data"
       :columns="columns"
-
+      local-key="userGrid"
       :search-config="searchConfig"
       :pagination-config="paginationConfig"
       @select="select"

From 5cdfd728077ed5362e205a8447745260088f3fe6 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Fri, 4 Jun 2021 18:50:49 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E9=94=99=E8=AF=AF=E6=A0=B7=E5=BC=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/view/ChartEdit.vue | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index a75f698825..144bcb4c12 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -262,8 +262,8 @@
             <chart-component v-if="httpRequest.status && chart.type && !chart.type.includes('table') && !chart.type.includes('text')" :chart-id="chart.id" :chart="chart" class="chart-class" />
             <table-normal v-if="httpRequest.status && chart.type && chart.type.includes('table')" :chart="chart" class="table-class" />
             <label-normal v-if="httpRequest.status && chart.type && chart.type.includes('text')" :chart="chart" class="table-class" />
-            <div v-if="!httpRequest.status" style=";width: 100%;height: 100%;background-color: #ece7e7; text-align: center">
-              <div style="font-size: 12px; color: #9ea6b2;">
+            <div v-if="!httpRequest.status" class="chart-error-class">
+              <div style="font-size: 12px; color: #9ea6b2;height: 100%;display: flex;align-items: center;justify-content: center;">
                 {{ $t('panel.error_data') }}<br>
                 {{ httpRequest.msg }}
               </div>
@@ -1103,4 +1103,12 @@ export default {
     justify-content: space-between;
     align-items: center;
   }
+  .chart-error-class{
+    text-align: center;
+    height: calc(100% - 84px);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: #ece7e7;
+  }
 </style>