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

Merge pull request #10180 from dataease/pr@dev-v2_st

Browse Source 
fix(数据集): 数据集数据预览列表希望支持调整宽度 #10145   #9769
This commit is contained in:
dataeaseShu 2024-06-11 13:49:22 +08:00 committed by GitHub
commit 3e707c5d9c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 70 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
core/core-frontend/src/views/visualized/data/dataset/form/index.vue
View File

@ -1461,21 +1461,39 @@ const getDsIconName = data => {
</div>
</div>
<div class="preview-data">
<el-auto-resizer>
<template #default="{ height, width }">
<el-table-v2
:columns="columns"
header-class="header-cell"
:data="tableData"
:width="width"
:height="height"
fixed
><template #empty>
<empty-background description="暂无数据" img-type="noneWhite" />
</template>
</el-table-v2>
<el-table
v-loading="dataPreviewLoading"
header-class="header-cell"
:data="tableData"
border
style="width: 100%; height: 100%"
>
<el-table-column
:key="column.dataKey"
v-for="(column, index) in columns"
:prop="column.dataKey"
:label="column.title"
:width="columns.length - 1 === index ? 150 : auto"
:fixed="columns.length - 1 === index ? 'right' : false"
>
<template #header>
<div class="flex-align-center">
<ElIcon style="margin-right: 6px">
<Icon
:name="`field_${fieldType[column.deType]}`"
:className="`field-icon-${fieldType[column.deType]}`"
></Icon>
</ElIcon>
<span class="ellipsis" :title="column.title" style="width: 120px">
{{ column.title }}
</span>
</div>
</template>
</el-table-column>
<template #empty>
<empty-background description="暂无数据" img-type="noneWhite" />
</template>
</el-auto-resizer>
</el-table>
</div>
</div>
<div v-show="tabActive !== 'preview' && !!allfields.length" class="batch-area">

39
core/core-frontend/src/views/visualized/data/dataset/index.vue
View File

@ -760,9 +760,10 @@ const getMenuList = (val: boolean) => {
</div>
<template v-if="['dataPreview', 'structPreview'].includes(activeName)">
<div class="info-table" :class="[{ 'struct-preview': activeName === 'structPreview' }]">
<el-auto-resizer>
<el-auto-resizer v-if="activeName === 'structPreview'">
<template #default="{ height, width }">
<el-table-v2
key="structPreview"
:columns="columns"
v-loading="dataPreviewLoading"
header-class="header-cell"
@ -775,6 +776,42 @@ const getMenuList = (val: boolean) => {
></el-table-v2>
</template>
</el-auto-resizer>
<template v-if="activeName === 'dataPreview'">
<el-table
v-loading="dataPreviewLoading"
header-class="header-cell"
:data="tableData"
key="dataPreview"
border
style="width: 100%; height: 100%"
>
<el-table-column
:key="column.dataKey"
v-for="(column, index) in columns"
:prop="column.dataKey"
:label="column.title"
:width="columns.length - 1 === index ? 150 : auto"
:fixed="columns.length - 1 === index ? 'right' : false"
>
<template #header>
<div class="flex-align-center">
<ElIcon style="margin-right: 6px">
<Icon
:name="`field_${fieldType[column.deType]}`"
:className="`field-icon-${fieldType[column.deType]}`"
></Icon>
</ElIcon>
<span class="ellipsis" :title="column.title" style="width: 120px">
{{ column.title }}
</span>
</div>
</template>
</el-table-column>
<template #empty>
<empty-background description="暂无数据" img-type="noneWhite" />
</template>
</el-table>
</template>
</div>
</template>
<template v-if="['row', 'column'].includes(activeName)">