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

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

Browse Source
This commit is contained in:
taojinlong 2021-06-16 19:28:19 +08:00
commit a01c7f74ff
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/canvas/components/Editor/ContextMenu.vue
View File

@ -4,7 +4,7 @@
<template v-if="curComponent"> <template v-if="curComponent">
<template v-if="!curComponent.isLock"> <template v-if="!curComponent.isLock">
<li @click="edit"> {{ $t('panel.edit') }}</li> <li @click="edit"> {{ $t('panel.edit') }}</li>
<li @click="copy"> {{ $t('panel.copy') }}</li> <!-- <li @click="copy"> {{ $t('panel.copy') }}</li>-->
<li @click="paste"> {{ $t('panel.paste') }}</li> <li @click="paste"> {{ $t('panel.paste') }}</li>
<li @click="cut"> {{ $t('panel.cut') }}</li> <li @click="cut"> {{ $t('panel.cut') }}</li>
<li @click="deleteComponent"> {{ $t('panel.delete') }}</li> <li @click="deleteComponent"> {{ $t('panel.delete') }}</li>

7
frontend/src/views/dataset/common/DatasetGroupSelector.vue
View File

@ -132,6 +132,11 @@ export default {
type: Object, type: Object,
required: false, required: false,
default: null default: null
},
showMode: {
type: String,
required: false,
default: null
} }
}, },
data() { data() {
@ -283,7 +288,7 @@ export default {
return return
} }
// check mode=1的数据集是否创建doris表 // check mode=1的数据集是否创建doris表
if (data.mode === 1) { if (data.mode === 1 && !this.showMode) {
post('/dataset/table/checkDorisTableIsExists/' + data.id, {}, false).then(response => { post('/dataset/table/checkDorisTableIsExists/' + data.id, {}, false).then(response => {
if (response.data) { if (response.data) {
this.$nextTick(function() { this.$nextTick(function() {

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

@ -92,7 +92,7 @@
width="500" width="500"
trigger="click" trigger="click"
> >
<dataset-group-selector :custom-type="customType" :mode="1" @getTable="getTable" /> <dataset-group-selector show-mode="union" :custom-type="customType" :mode="1" @getTable="getTable" />
<el-button slot="reference" size="mini" style="width: 100%;"> <el-button slot="reference" size="mini" style="width: 100%;">
<p class="table-name-css" :title="targetTable.name || $t('dataset.pls_slc_union_table')">{{ targetTable.name || $t('dataset.pls_slc_union_table') }}</p> <p class="table-name-css" :title="targetTable.name || $t('dataset.pls_slc_union_table')">{{ targetTable.name || $t('dataset.pls_slc_union_table') }}</p>
</el-button> </el-button>
@ -193,21 +193,21 @@ export default {
showUnionEdit() { showUnionEdit() {
// 校验同步状态 // 校验同步状态
post('/dataset/table/checkDorisTableIsExists/' + this.table.id, {}, true).then(response => { // post('/dataset/table/checkDorisTableIsExists/' + this.table.id, {}, true).then(response => {
if (response.data) { // if (response.data) {
this.union.sourceTableId = this.table.id this.union.sourceTableId = this.table.id
fieldList(this.table.id).then(response => { fieldList(this.table.id).then(response => {
this.sourceFieldOption = response.data this.sourceFieldOption = response.data
}) })
this.editUnion = true this.editUnion = true
} else { // } else {
this.$message({ // this.$message({
type: 'error', // type: 'error',
message: this.$t('dataset.invalid_table_check'), // message: this.$t('dataset.invalid_table_check'),
showClose: true // showClose: true
}) // })
} // }
}) // })
}, },
saveUnion() { saveUnion() {
// console.log(this.union) // console.log(this.union)