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

frontend/src/views/chart/group/Group.vue

@@ -42,7 +42,7 @@
             @node-click="nodeClick"
           >
             <span slot-scope="{ node, data }" class="custom-tree-node">
-              <span>
+              <span style="display: flex;flex: 1;width: 0;">
                 <span v-if="data.type === 'scene'">
                   <!--                  <el-button-->
                   <!--                    icon="el-icon-folder-opened"-->
@@ -51,7 +51,7 @@
                   <!--                  />-->
                   <svg-icon icon-class="scene" class="ds-icon-scene" />
                 </span>
-                <span style="margin-left: 6px">{{ data.name }}</span>
+                <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">{{ data.name }}</span>
               </span>
               <span>
                 <span v-if="data.type ==='group'" @click.stop>
@@ -151,9 +151,9 @@
         @node-click="sceneClick"
       >
         <span slot-scope="{ node, data }" class="custom-tree-node-list">
-          <span>
+          <span style="display: flex;flex: 1;width: 0;">
             <span><svg-icon :icon-class="data.type" /></span>
-            <span style="margin-left: 6px">{{ data.name }}</span>
+            <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">{{ data.name }}</span>
           </span>
           <span>
             <span style="margin-left: 12px;" @click.stop>

frontend/src/views/dataset/common/DatasetChartDetail.vue

@@ -5,7 +5,7 @@
     </el-row>
     <el-col>
       <el-tabs v-if="tabStatus" v-model="tabActive" class="info-tab">
-        <el-tab-pane v-if="type === 'chart'" :label="$t('chart.datalist')" name="chart">
+        <el-tab-pane v-if="type === 'chart' && detail.chart" :label="$t('chart.datalist')" name="chart">
           <el-col class="info-item">
             <p class="info-title">{{ $t('commons.name') }}</p>
             <p class="info-content">{{ detail.chart.name }}</p>
@@ -28,7 +28,7 @@
           </el-col>
         </el-tab-pane>
 
-        <el-tab-pane :label="$t('dataset.datalist')" name="table">
+        <el-tab-pane v-if="detail.table" :label="$t('dataset.datalist')" name="table">
           <el-col class="info-item">
             <p class="info-title">{{ $t('commons.name') }}</p>
             <p class="info-content">{{ detail.table.name }}</p>
@@ -40,7 +40,7 @@
             <p v-if="detail.table.type === 'excel'" class="info-content">{{ $t('dataset.excel_data') }}</p>
             <p v-if="detail.table.type === 'custom'" class="info-content">{{ $t('dataset.custom_data') }}</p>
           </el-col>
-          <el-col class="info-item">
+          <el-col v-if="detail.table.type === 'db' || detail.table.type === 'sql'" class="info-item">
             <p class="info-title">{{ $t('dataset.mode') }}</p>
             <p v-if="detail.table.mode === 0" class="info-content">{{ $t('dataset.direct_connect') }}</p>
             <p v-if="detail.table.mode === 1" class="info-content">{{ $t('dataset.sync_data') }}</p>
@@ -55,7 +55,7 @@
           </el-col>
         </el-tab-pane>
 
-        <el-tab-pane :label="$t('datasource.datasource')" name="datasource">
+        <el-tab-pane v-if="detail.datasource" :label="$t('datasource.datasource')" name="datasource">
           <el-col class="info-item">
             <p class="info-title">{{ $t('commons.name') }}</p>
             <p class="info-content">{{ detail.datasource.name }}</p>

frontend/src/views/dataset/common/DatasetGroupSelector.vue

@@ -33,7 +33,7 @@
             @node-click="nodeClick"
           >
             <span slot-scope="{ node, data }" class="custom-tree-node">
-              <span>
+              <span style="display: flex;flex: 1;width: 0;">
                 <span v-if="data.type === 'scene'">
                   <!--                  <el-button-->
                   <!--                    icon="el-icon-folder-opened"-->
@@ -42,7 +42,7 @@
                   <!--                  />-->
                   <svg-icon icon-class="scene" class="ds-icon-scene" />
                 </span>
-                <span style="margin-left: 6px">{{ data.name }}</span>
+                <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">{{ data.name }}</span>
               </span>
             </span>
           </el-tree>
@@ -83,7 +83,7 @@
         @node-click="sceneClick"
       >
         <span slot-scope="{ node, data }" class="custom-tree-node-list">
-          <span>
+          <span style="display: flex;flex: 1;width: 0;">
             <span>
               <svg-icon v-if="data.type === 'db'" icon-class="ds-db" class="ds-icon-db" />
               <svg-icon v-if="data.type === 'sql'" icon-class="ds-sql" class="ds-icon-sql" />
@@ -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">{{ data.name }}</span>
+            <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">{{ data.name }}</span>
           </span>
         </span>
       </el-tree>

frontend/src/views/dataset/data/UnionView.vue

@@ -78,8 +78,8 @@
         <el-col :span="6">
           <el-radio-group v-model="union.sourceUnionRelation" size="mini" style="display: block;width: 100%;text-align: center;">
             <el-radio class="union-relation-css" label="1:1">1 : 1</el-radio>
-            <el-radio class="union-relation-css" label="1:N">1 : N</el-radio>
             <el-radio class="union-relation-css" label="N:1">N : 1</el-radio>
+            <el-radio class="union-relation-css" label="1:N">1 : N</el-radio>
           </el-radio-group>
         </el-col>
 

frontend/src/views/dataset/group/Group.vue

@@ -42,7 +42,7 @@
             @node-click="nodeClick"
           >
             <span slot-scope="{ node, data }" class="custom-tree-node">
-              <span>
+              <span style="display: flex;flex: 1;width: 0;">
                 <span v-if="data.type === 'scene'">
                   <!--                  <el-button-->
                   <!--                    icon="el-icon-folder-opened"-->
@@ -51,7 +51,7 @@
                   <!--                  />-->
                   <svg-icon icon-class="scene" class="ds-icon-scene" />
                 </span>
-                <span style="margin-left: 6px">{{ data.name }}</span>
+                <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">{{ data.name }}</span>
               </span>
               <span>
                 <span v-if="data.type ==='group'" @click.stop>
@@ -180,7 +180,7 @@
         @node-click="sceneClick"
       >
         <span slot-scope="{ node, data }" class="custom-tree-node-list">
-          <span>
+          <span style="display: flex;flex: 1;width: 0;">
             <span>
               <svg-icon v-if="data.type === 'db'" icon-class="ds-db" class="ds-icon-db" />
               <svg-icon v-if="data.type === 'sql'" icon-class="ds-sql" class="ds-icon-sql" />
@@ -191,7 +191,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">{{ data.name }}</span>
+            <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">{{ data.name }}</span>
           </span>
           <span>
             <span style="margin-left: 12px;" @click.stop>