dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(数据集): 数据集把表的comment信息也携带过来 #9301

Browse Source
This commit is contained in:
dataeaseShu 2024-05-22 15:00:59 +08:00
parent c0e9aa198b
commit a672d3c2bb
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/core-frontend/src/views/chart/components/editor/index.vue
View File

@ -2173,7 +2173,7 @@ const drop = (ev: MouseEvent, type = 'xAxis') => {
</div>
<div
class="tree-btn"
:class="isFilterActive && 'active'"
:class="{ 'tree-btn--dark': themes === 'dark', active: isFilterActive }"
@click="openTreeFilter"
>
<el-icon>
@ -3489,6 +3489,10 @@ span {
cursor: pointer;
justify-content: center;
font-size: 12px;
&.tree-btn--dark {
background: rgba(235, 235, 235, 0.05);
border-color: #5f5f5f;
}
&.active {
color: #3370ff;

32
core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
View File

@ -708,12 +708,13 @@ const dragenter_handler = ev => {
const drop_handler = ev => {
ev.preventDefault()
let data = ev.dataTransfer.getData('text')
const { tableName, type, datasourceId } = JSON.parse(data) as Table
const { tableName, type, datasourceId, name: noteName } = JSON.parse(data) as Table
const extraData = {
info: JSON.stringify({
table: tableName,
sql: ''
}),
noteName,
unionType: 'left',
unionFields: [],
currentDsFields: [],
@ -1029,10 +1030,19 @@ const emits = defineEmits(['addComplete', 'joinEditor', 'updateAllfields', 'chan
direction="rtl"
>
<template #header v-if="currentNode">
<div class="info">
<span :title="currentNode.tableName" class="name ellipsis">{{
currentNode.tableName
}}</span>
<div class="info-content">
<div class="info">
<span class="label">表名</span>
<span :title="currentNode.tableName" class="name ellipsis">{{
currentNode.tableName
}}</span>
</div>
<div class="info">
<span class="label">表备注</span>
<span :title="currentNode.noteName" class="name ellipsis">{{
currentNode.noteName || '-'
}}</span>
</div>
<span :title="getDsName(currentNode.datasourceId)" class="ds ellipsis"
>{{ t('auth.datasource') }}:{{ getDsName(currentNode.datasourceId) }}</span
>
@ -1082,15 +1092,25 @@ const emits = defineEmits(['addComplete', 'joinEditor', 'updateAllfields', 'chan
top: 26px;
}
.info-content {
display: flex;
flex-wrap: wrap;
}
.info {
display: flex;
flex-direction: column;
.name {
width: 50%;
.label {
font-weight: 500;
font-size: 16px;
color: #1f2329;
max-width: 500px;
}
.name {
font-weight: 400;
font-size: 14px;
}
.ds {
font-weight: 400;
font-size: 14px;