From 3820a14229ce80a07ffeef3659bea0d5aaa0bcd3 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Tue, 6 Jun 2023 15:59:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E6=9D=BF=E7=94=A8=E6=88=B7=E5=90=8D=E7=A7=B0=E8=BF=87=E9=95=BF?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=BB=AA=E8=A1=A8=E6=9D=BF=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?ui=E5=A4=B1=E5=B8=B8=20#5398?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/panel/list/PanelViewShow.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue
index ec83885964..f24fb47920 100644
--- a/frontend/src/views/panel/list/PanelViewShow.vue
+++ b/frontend/src/views/panel/list/PanelViewShow.vue
@@ -44,7 +44,7 @@
                 style="color: green;font-size: 12px"
               >&nbsp;({{ $t('panel.source_panel_name') }}:{{ panelInfo.sourcePanelName }})</span>
             </div>
-            <div style="width: 200px">
+            <div class="panel-create-cont">
               <span
                 v-if="!hasStar && panelInfo && showType !== 1&&panelInfo.status==='publish'"
                 style="margin-left: 9px"
@@ -72,7 +72,7 @@
                   style="margin: 0 16px;"
                   direction="vertical"
                 />
-                <span class="panel-create">
+                <span :title="panelInfo.creatorName" class="panel-create">
                 {{ $t('panel.create_by') + ':' + panelInfo.creatorName }}
               </span>
               </template>
@@ -863,12 +863,21 @@ export default {
 
   }
 
+  .panel-create-cont {
+    display: flex;
+    align-items: center;
+  }
+
   .panel-create {
     font-family: PingFang SC;
     font-size: 14px;
     font-weight: 400;
     line-height: 22px;
     color: var(--deTextSecondary, #646A73);
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    max-width: 200px;
   }
 }
 

From f12ef0ce16873a3fad7270bcc04cebd1b4143f92 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Tue, 6 Jun 2023 15:59:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E7=BC=96=E8=BE=91=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=88=A0=E9=99=A4=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A8=E4=BF=9D=E5=AD=98=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/dataset/Form.vue         | 2 +-
 frontend/src/views/dataset/add/AddUnion.vue | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/dataset/Form.vue b/frontend/src/views/dataset/Form.vue
index 9098a38b9e..c2732e9f32 100644
--- a/frontend/src/views/dataset/Form.vue
+++ b/frontend/src/views/dataset/Form.vue
@@ -41,7 +41,7 @@
         >{{ $t('deDataset.selected') }} {{ tableNum }}
           {{ ['excel'].includes(datasetType) ? $t('deDataset.table') : $t('deDataset.item') }}</span>
         <deBtn
-          :disabled="['db', 'excel', 'api'].includes(datasetType) && !tableNum"
+          :disabled="['db', 'excel', 'api', 'union'].includes(datasetType) && !tableNum"
           type="primary"
           @click="datasetSave"
         >{{
diff --git a/frontend/src/views/dataset/add/AddUnion.vue b/frontend/src/views/dataset/add/AddUnion.vue
index 71aa9bfe81..afd8e8b94f 100644
--- a/frontend/src/views/dataset/add/AddUnion.vue
+++ b/frontend/src/views/dataset/add/AddUnion.vue
@@ -305,12 +305,14 @@ export default {
       const ds = JSON.parse(JSON.stringify(this.unionItem))
       ds.currentDs = this.tempDs
       this.dataset.push(ds)
+      this.$emit('setTableNum', this.dataset.length)
       this.closeSelectDs()
       this.calc('union')
     },
     deleteNode(index) {
       this.dataset.splice(index, 1)
       this.calc('delete')
+      this.$emit('setTableNum', this.dataset.length)
     },
     calc(param) {
       if (param.type === 'union') {
@@ -385,6 +387,7 @@ export default {
           (response) => {
             const table = JSON.parse(JSON.stringify(response.data))
             this.dataset = JSON.parse(table.info).union
+            this.$emit('setTableNum', this.dataset.length)
             this.previewData()
           }
         )