diff --git a/core/core-frontend/src/custom-component/v-query/Component.vue b/core/core-frontend/src/custom-component/v-query/Component.vue
index 507d98ae1a..bf9fe3bb08 100644
--- a/core/core-frontend/src/custom-component/v-query/Component.vue
+++ b/core/core-frontend/src/custom-component/v-query/Component.vue
@@ -577,7 +577,13 @@ const autoStyle = computed(() => {
             <div class="label" :style="marginRight">
               <div class="label-wrapper" v-show="customStyle.labelShow">
                 <div class="label-wrapper-text" :style="labelStyle">
-                  <el-tooltip effect="dark" :content="ele.name" placement="top">
+                  <el-tooltip
+                    popper-class="label-wrapper-text_tooltip"
+                    effect="dark"
+                    :content="ele.name"
+                    :show-arrow="false"
+                    placement="top-start"
+                  >
                     {{ ele.name }}
                   </el-tooltip>
                 </div>
@@ -857,6 +863,10 @@ const autoStyle = computed(() => {
 }
 </style>
 <style lang="less">
+.label-wrapper-text_tooltip {
+  max-width: 200px;
+  white-space: wrap;
+}
 .load-select {
   .ed-select-dropdown__list {
     & > div {
diff --git a/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue b/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue
index c305601fc6..d594293d2a 100644
--- a/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue
+++ b/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue
@@ -319,6 +319,7 @@ onMounted(() => {
                 <template #default="{ node, data }">
                   <div
                     class="tree-row-item"
+                    :title="node.label"
                     :class="{ dark: themes === 'dark', active: _modelValue === data.id }"
                   >
                     <div class="m-icon">
@@ -329,15 +330,7 @@ onMounted(() => {
                         <Icon name="icon_dataset" />
                       </el-icon>
                     </div>
-                    <el-tooltip
-                      :effect="toolTip"
-                      :show-after="1000"
-                      :content="node.label"
-                      placement="top"
-                      :enterable="false"
-                    >
-                      {{ node.label }}
-                    </el-tooltip>
+                    {{ node.label }}
 
                     <el-icon class="checked-item" v-if="_modelValue === data.id">
                       <Icon name="icon_done_outlined" />
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue b/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
index 145f87149f..aea7f7766b 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
@@ -114,6 +114,9 @@ const dfsForDsId = (arr, datasourceId) => {
     if (ele.children?.length) {
       return dfsForDsId(ele.children, datasourceId)
     }
+    if (!ele.datasourceId) {
+      return true
+    }
     return ele.datasourceId === datasourceId
   })
 }