center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #3174 from dataease/pr@dev_dataset_source

Browse Source 
Pr@dev dataset source
This commit is contained in:
xuwei-fit2cloud 2022-09-26 10:24:30 +08:00 committed by GitHub
commit bbcd9635b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
frontend/src/views/dataset/data/TabDataPreview.vue
View File

@ -1,26 +1,6 @@
<template> <template>
<el-col> <el-col>
<div class="table-count"> <div class="table-count">
<span v-if="['excel', 'custom', 'union'].includes(table.type)">
<span v-if="page.total <= currentPage.show">
{{ $t('dataset.preview_total') }}
<span class="span-number">{{ page.total }}</span>
{{ $t('dataset.preview_item') }}
</span>
<span v-if="page.total > currentPage.show">
{{ $t('dataset.preview_show') }}
<span class="span-number">{{ currentPage.show }}</span>
{{ $t('dataset.preview_item') }}
，{{ $t('dataset.preview_total') }}
<span class="span-number">{{ page.total }}</span>
{{ $t('dataset.preview_item') }}
</span>
</span>
<span v-if="['db', 'sql'].includes(table.type)">
{{ $t('dataset.preview_show') }}
<span class="span-number">{{ page.total }}</span>
{{ $t('dataset.preview_item') }}
</span>
<span class="title-text" style="width: 100px" <span class="title-text" style="width: 100px"
>{{ $t('deDataset.display') }} {{ form.row }} >{{ $t('deDataset.display') }} {{ form.row }}
{{ $t('deDataset.row') }}</span {{ $t('deDataset.row') }}</span
@ -197,7 +177,7 @@ export default {
line-height: 22px; line-height: 22px;
margin: 4px 0; margin: 4px 0;
.title-text { .title-text {
margin: 0 5px 0 16px; margin: 0 5px 0 0;
} }
} }
</style> </style>

17
frontend/src/views/dataset/group/Group.vue
View File

@ -69,7 +69,7 @@
</el-row> </el-row>
<el-col class="custom-tree-container de-tree"> <el-col class="custom-tree-container de-tree">
<div class="block"> <div class="block">
<div v-if="!tData.length" class="no-tdata"> <div v-if="!tData.length && !treeLoading" class="no-tdata">
{{ $t('deDataset.no_dataset_click') }} {{ $t('deDataset.no_dataset_click') }}
<span @click="() => clickAdd()" class="no-tdata-new">{{ <span @click="() => clickAdd()" class="no-tdata-new">{{
$t('deDataset.create') $t('deDataset.create')
@ -424,6 +424,7 @@ export default {
data() { data() {
return { return {
sceneMode: false, sceneMode: false,
treeLoading: false,
dialogTitle: '', dialogTitle: '',
search: '', search: '',
editGroup: false, editGroup: false,
@ -537,7 +538,9 @@ export default {
}, },
mounted() { mounted() {
const { id, name } = this.$route.params const { id, name } = this.$route.params
queryAuthModel({ modelType: 'dataset' }, true).then((res) => { this.treeLoading = true
queryAuthModel({ modelType: 'dataset' }, true)
.then((res) => {
localStorage.setItem('dataset-tree', JSON.stringify(res.data)) localStorage.setItem('dataset-tree', JSON.stringify(res.data))
this.tData = res.data this.tData = res.data
this.$nextTick(() => { this.$nextTick(() => {
@ -547,6 +550,9 @@ export default {
} }
}) })
}) })
.finally(() => {
this.treeLoading = false
})
this.refresh() this.refresh()
}, },
methods: { methods: {
@ -765,7 +771,9 @@ export default {
if (userCache) { if (userCache) {
this.tData = JSON.parse(modelInfo) this.tData = JSON.parse(modelInfo)
} }
queryAuthModel({ modelType: 'dataset' }, !userCache).then((res) => { this.treeLoading = true
queryAuthModel({ modelType: 'dataset' }, !userCache)
.then((res) => {
localStorage.setItem('dataset-tree', JSON.stringify(res.data)) localStorage.setItem('dataset-tree', JSON.stringify(res.data))
if (!userCache) { if (!userCache) {
this.tData = res.data this.tData = res.data
@ -774,6 +782,9 @@ export default {
this.$refs.datasetTreeRef?.filter(this.filterText) this.$refs.datasetTreeRef?.filter(this.filterText)
}) })
}) })
.finally(() => {
this.treeLoading = false
})
}, },
tableTree() { tableTree() {