From 7bf65480ac6d7d6e855b93113d9ca9f3244b79ee Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 10 Jun 2021 17:33:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E4=B8=8B=E6=8B=89=E6=A1=86?= =?UTF-8?q?=E5=A4=9A=E9=80=89=E6=A0=B7=E5=BC=8F=E9=80=82=E9=85=8D=E6=96=B0?= =?UTF-8?q?=E7=94=BB=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/widget/DeWidget/DeSelect.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/widget/DeWidget/DeSelect.vue b/frontend/src/components/widget/DeWidget/DeSelect.vue index cb9e8d8326..269f68eee1 100644 --- a/frontend/src/components/widget/DeWidget/DeSelect.vue +++ b/frontend/src/components/widget/DeWidget/DeSelect.vue @@ -83,7 +83,7 @@ export default { kids.forEach(kid => { contentWidth += kid.offsetWidth }) - this.showNumber = contentWidth > (this.$refs.deSelect.$refs.tags.clientWidth * 0.9) + this.showNumber = contentWidth > ((this.$refs.deSelect.$refs.tags.clientWidth - 30) * 0.9) }) }, From 711428705ba81e6a90259b53e6be5ab51e534db6 Mon Sep 17 00:00:00 2001 From: junjie Date: Thu, 10 Jun 2021 17:37:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(frontend):=E5=88=86=E7=BB=84=E3=80=81?= =?UTF-8?q?=E5=9C=BA=E6=99=AFpid=E4=BF=AE=E6=94=B9=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/dataset/common/DatasetGroupSelector.vue | 4 ++-- frontend/src/views/dataset/group/DsMoveSelector.vue | 2 +- frontend/src/views/dataset/group/GroupMoveSelector.vue | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/views/dataset/common/DatasetGroupSelector.vue b/frontend/src/views/dataset/common/DatasetGroupSelector.vue index 572974e556..0a82c28262 100644 --- a/frontend/src/views/dataset/common/DatasetGroupSelector.vue +++ b/frontend/src/views/dataset/common/DatasetGroupSelector.vue @@ -146,7 +146,7 @@ export default { expandedArray: [], groupForm: { name: '', - pid: null, + pid: '0', level: 0, type: '', children: [], @@ -201,7 +201,7 @@ export default { this.editGroup = false this.groupForm = { name: '', - pid: null, + pid: '0', level: 0, type: '', children: [], diff --git a/frontend/src/views/dataset/group/DsMoveSelector.vue b/frontend/src/views/dataset/group/DsMoveSelector.vue index f2516e6d58..2f5d7f5618 100644 --- a/frontend/src/views/dataset/group/DsMoveSelector.vue +++ b/frontend/src/views/dataset/group/DsMoveSelector.vue @@ -36,7 +36,7 @@ export default { currGroup: '', groupForm: { name: '', - pid: null, + pid: '0', level: 0, type: '', children: [], diff --git a/frontend/src/views/dataset/group/GroupMoveSelector.vue b/frontend/src/views/dataset/group/GroupMoveSelector.vue index d5b738df9e..0e6e281bdc 100644 --- a/frontend/src/views/dataset/group/GroupMoveSelector.vue +++ b/frontend/src/views/dataset/group/GroupMoveSelector.vue @@ -36,7 +36,7 @@ export default { currGroup: '', groupForm: { name: '', - pid: null, + pid: '0', level: 0, type: 'group', children: [],