diff --git a/ui/src/components/folder-tree/index.vue b/ui/src/components/folder-tree/index.vue index cfab32578..68a950b3a 100644 --- a/ui/src/components/folder-tree/index.vue +++ b/ui/src/components/folder-tree/index.vue @@ -7,116 +7,121 @@ clearable class="p-8" /> -
-
-
- - {{ shareTitle }} -
+ +
+
+ + {{ shareTitle }}
- - - - - -
+ + + + + + + - + { } const MoveToDialogRef = ref() -function openMoveToDialog(data:any) { +function openMoveToDialog(data: any) { const obj = { id: data.id, folder_type: props.source, @@ -211,14 +216,14 @@ function openMoveToDialog(data:any) { } const allowDrag = (node: any) => { - return permissionPrecise.value.folderEdit(node.data.id) + return permissionPrecise.value.folderEdit(node.data.id) } const allowDrop = (draggingNode: any, dropNode: any, type: string) => { const dropData = dropNode.data if (type === 'inner') { return permissionPrecise.value.folderEdit(dropData.id) - } + } return false } @@ -234,9 +239,10 @@ const handleDrop = (draggingNode: any, dropNode: any, dropType: string, ev: Drag } const obj = { ...dragData, - parent_id: newParentId + parent_id: newParentId, } - folderApi.putFolder(dragData.id, props.source, obj, loading) + folderApi + .putFolder(dragData.id, props.source, obj, loading) .then(() => { MsgSuccess(t('common.saveSuccess')) emit('refreshTree') @@ -253,8 +259,8 @@ onBeforeRouteLeave((to, from) => { onMounted(() => { bus.on('select_node', (id: string) => { treeRef.value?.setCurrentKey(id) - hoverNodeId.value=id - }) + hoverNodeId.value = id + }) }) interface Tree { name: string @@ -385,12 +391,15 @@ onUnmounted(() => { } } } + .tree-height-shared { + padding-top: 4px; + height: calc(100vh - 220px); + } .tree-height { padding-top: 4px; - height: calc(100vh - 210px); + height: calc(100vh - 180px); } -} -:deep(.el-tree) { + :deep(.el-tree) { .el-tree-node.is-dragging { opacity: 0.5; } @@ -403,9 +412,10 @@ onUnmounted(() => { position: relative; } } -:deep(.overflow-inherit_node__children) { - .el-tree-node__children { - overflow: inherit !important; + :deep(.overflow-inherit_node__children) { + .el-tree-node__children { + overflow: inherit !important; + } } } diff --git a/ui/src/views/application-workflow/component/DropdownMenu.vue b/ui/src/views/application-workflow/component/DropdownMenu.vue index a0503ae3c..7d331690b 100644 --- a/ui/src/views/application-workflow/component/DropdownMenu.vue +++ b/ui/src/views/application-workflow/component/DropdownMenu.vue @@ -1,5 +1,9 @@ @@ -103,6 +108,7 @@ :currentNodeKey="folder.currentFolder?.id" @handleNodeClick="folderClickHandle" :canOperation="false" + :treeStyle="{ height: '400px' }" />
@@ -342,9 +348,5 @@ onMounted(() => {}) :deep(.el-tabs__header) { margin-bottom: 0; } - - :deep(.tree-height) { - height: 400px; - } } diff --git a/ui/src/views/system/resource-authorization/component/PermissionTable.vue b/ui/src/views/system/resource-authorization/component/PermissionTable.vue index 290da776f..b9138972d 100644 --- a/ui/src/views/system/resource-authorization/component/PermissionTable.vue +++ b/ui/src/views/system/resource-authorization/component/PermissionTable.vue @@ -60,7 +60,7 @@ :maxTableHeight="260" :row-key="(row: any) => row.id" style="min-width: 600px" - :expand-row-keys="defaultExpandKeys" + show-overflow-tooltip >