diff --git a/frontend/src/icons/svg/no-join.svg b/frontend/src/icons/svg/no-join.svg new file mode 100644 index 0000000000..0952599954 --- /dev/null +++ b/frontend/src/icons/svg/no-join.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/views/dataset/add/AddUnion.vue b/frontend/src/views/dataset/add/AddUnion.vue index 21fe690a3d..48148cb84a 100644 --- a/frontend/src/views/dataset/add/AddUnion.vue +++ b/frontend/src/views/dataset/add/AddUnion.vue @@ -113,7 +113,11 @@ export default { }, cancel() { - + if (this.param.tableId) { + this.$emit('switchComponent', { name: 'ViewTable', param: this.param.table }) + } else { + this.$emit('switchComponent', { name: '' }) + } }, selectDs() { this.selectDsDialog = true diff --git a/frontend/src/views/dataset/add/union/UnionNode.vue b/frontend/src/views/dataset/add/union/UnionNode.vue index 378711bd9a..09a477edff 100644 --- a/frontend/src/views/dataset/add/union/UnionNode.vue +++ b/frontend/src/views/dataset/add/union/UnionNode.vue @@ -37,10 +37,10 @@ export default { }, data() { return { - path: 'm0,13 l28,0 m24,0 l28,0', - pathExt: 'm0,13 l28,0 m24,0 l28,0 M14,13 l0,27', // 向下直线 - pathMore: 'M14,0 l0,13 l14,0 m24,0 l28,0', // 向上直线 - pathMoreExt: 'M14,0 l0,13 l14,0 m24,0 l28,0 M14,13 l0,27', + path: 'm0,13 l18,0 m24,0 l18,0', + pathExt: 'm0,13 l18,0 m24,0 l18,0 M9,13 l0,27', // 向下直线 + pathMore: 'M9,0 l0,13 l9,0 m24,0 l18,0', // 向上直线 + pathMoreExt: 'M9,0 l0,13 l9,0 m24,0 l18,0 M9,13 l0,27', nodeHeight: '40px', lineLength: '', pathParam: '' @@ -132,11 +132,11 @@ export default { font-size: 24px; line-height: 26px; position: absolute; - left: 28px; + left: 18px; color:#dcdfe6; } .join-svg-container{ - width:80px; + width:60px; } .node-line{ display: flex;