Merge pull request #5418 from dataease/pr@dev_st_fix

Pr@dev st fix

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"
         >{{

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()
           }
         )

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;
   }
 }