From d0561e8699345e8c2bace4c72973351452796c1c Mon Sep 17 00:00:00 2001 From: junjie Date: Tue, 23 Nov 2021 14:31:24 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E5=85=B3?= =?UTF-8?q?=E8=81=94=E6=95=B0=E6=8D=AE=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/dataset/add/AddUnion.vue | 34 ++++++-- .../src/views/dataset/add/union/NodeItem.vue | 12 ++- .../src/views/dataset/add/union/UnionNode.vue | 84 +++++++++++++++++-- 3 files changed, 112 insertions(+), 18 deletions(-) diff --git a/frontend/src/views/dataset/add/AddUnion.vue b/frontend/src/views/dataset/add/AddUnion.vue index ac6a55328c..21fe690a3d 100644 --- a/frontend/src/views/dataset/add/AddUnion.vue +++ b/frontend/src/views/dataset/add/AddUnion.vue @@ -28,15 +28,15 @@
- +
- +
- +
{{ $t('dataset.cancel') }} @@ -72,17 +72,19 @@ export default { currentDsField: [], childrenDs: [], unionToParent: { - unionType: '', + unionType: '', // left join,right join,inner join unionFields: [ { parentField: {}, currentField: {} } ] - } + }, + allChildCount: 0 } ], - unionToParent: {} + unionToParent: {}, + allChildCount: 0 }], // union data dataset: [], @@ -94,7 +96,8 @@ export default { unionToParent: { unionType: '', unionFields: [] - } + }, + allChildCount: 0 }, name: '', customType: ['db', 'sql', 'excel'], @@ -127,9 +130,26 @@ export default { ds.currentDs = this.tempDs this.dataset.push(ds) this.closeSelectDs() + this.calc('union') }, deleteNode(index) { this.dataset.splice(index, 1) + this.calc('delete') + }, + calc(param) { + if (param.type === 'union') { + if (param.grandParentAdd) { + this.dataset[0] && this.dataset[0].allChildCount++ + } + } else if (param.type === 'delete') { + if (param.grandParentSub) { + if (param.subCount > 1) { + this.dataset[0] && (this.dataset[0].allChildCount -= param.subCount) + } else { + this.dataset[0] && this.dataset[0].allChildCount-- + } + } + } } } } diff --git a/frontend/src/views/dataset/add/union/NodeItem.vue b/frontend/src/views/dataset/add/union/NodeItem.vue index d82eab7ae9..ecc4d80ba4 100644 --- a/frontend/src/views/dataset/add/union/NodeItem.vue +++ b/frontend/src/views/dataset/add/union/NodeItem.vue @@ -28,7 +28,7 @@
- +
{{ $t('dataset.cancel') }} @@ -62,7 +62,8 @@ export default { unionToParent: { unionType: '', unionFields: [] - } + }, + allChildCount: 0 }, customType: ['db', 'sql', 'excel'], selectDsDialog: false, @@ -77,7 +78,6 @@ export default { console.log('node click to edit') }, nodeMenuClick(param) { - console.log(param) switch (param.type) { case 'union': this.unionNode(param) @@ -105,11 +105,13 @@ export default { }, deleteNode(param) { this.$emit('deleteNode', this.nodeIndex) + this.notifyFirstParent('delete') }, selectDs() { this.selectDsDialog = true }, + // 弹框中选择数据集 firstDs(val) { this.tempDs = val }, @@ -122,6 +124,10 @@ export default { ds.currentDs = this.tempDs this.tempParentDs.childrenDs.push(ds) this.closeSelectDs() + this.notifyFirstParent('union') + }, + notifyFirstParent(type) { + this.$emit('notifyParent', { type: type, grandParentAdd: true, grandParentSub: true, subCount: this.currentNode.allChildCount }) } } } diff --git a/frontend/src/views/dataset/add/union/UnionNode.vue b/frontend/src/views/dataset/add/union/UnionNode.vue index 62a93eff54..378711bd9a 100644 --- a/frontend/src/views/dataset/add/union/UnionNode.vue +++ b/frontend/src/views/dataset/add/union/UnionNode.vue @@ -1,15 +1,15 @@ @@ -38,17 +38,85 @@ 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' + 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', + nodeHeight: '40px', + lineLength: '', + pathParam: '' } }, + watch: { + 'childrenNode.allChildCount': function() { + this.calcNodeHeight() + this.nodeLineHeight() + }, + nodeIndex: function() { + this.calcNodeHeight() + this.nodeLineHeight() + }, + childrenList: function() { + this.calcNodeHeight() + this.nodeLineHeight() + } + }, + mounted() { + this.calcNodeHeight() + this.nodeLineHeight() + }, methods: { unionConfig() { console.log('union config') }, deleteNode(index) { this.childrenList.splice(index, 1) + }, + nodeLineHeight() { + if (this.childrenList.length === 1 && this.nodeIndex === 0) { + this.pathParam = this.path + this.lineLength = '' + } else { + if (this.nodeIndex === 0) { + this.pathParam = this.pathExt + this.lineLength = this.childrenNode.allChildCount < 2 ? '' : ('l0,' + ((this.childrenNode.allChildCount - 1) * 40)) + } else if (this.nodeIndex === (this.childrenList.length - 1)) { + this.pathParam = this.pathMore + this.lineLength = '' + } else { + this.pathParam = this.pathMoreExt + this.lineLength = this.childrenNode.allChildCount < 2 ? '' : ('l0,' + ((this.childrenNode.allChildCount - 1) * 40)) + } + } + }, + calcNodeHeight() { + this.nodeHeight = this.childrenNode.allChildCount < 1 ? '40px' : (this.childrenNode.allChildCount * 40 + 'px') + }, + calc(param) { + this.notifyFirstParent(param) + }, + notifyFirstParent(param) { + if (param.type === 'union') { + if (param.grandParentAdd) { + this.childrenNode.allChildCount++ + } + } else if (param.type === 'delete') { + if (param.grandParentSub) { + if (param.subCount > 1) { + this.childrenNode.allChildCount -= param.subCount + } else { + this.childrenNode.allChildCount-- + } + } + } + const p = JSON.parse(JSON.stringify(param)) + // 传递到父级 + p.grandParentAdd = this.childrenNode.allChildCount > 1 + if (param.subCount > 1) { + p.grandParentSub = true + } else { + p.grandParentSub = this.childrenNode.allChildCount !== 0 + } + this.$emit('notifyParent', p) } } }