Merge remote-tracking branch 'origin/main' into main

2021-06-10 17:46:30 +08:00 · 2021-06-10 17:46:30 +08:00 · a12a670383
commit a12a670383
parent 5dd942348a a8c3d11451
4 changed files with 5 additions and 5 deletions
--- 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)
      })
    },

--- 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: [],
--- 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: [],
--- 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: [],