diff --git a/ui/src/components/app-table/index.vue b/ui/src/components/app-table/index.vue
index 720eeeaff..a92a352a5 100644
--- a/ui/src/components/app-table/index.vue
+++ b/ui/src/components/app-table/index.vue
@@ -15,8 +15,12 @@
clearable
/>
- {{$t('common.create')}}
- {{$t('common.cancel')}}
+ {{
+ $t('common.create')
+ }}
+ {{
+ $t('common.cancel')
+ }}
@@ -54,25 +58,29 @@ const { common } = useStore()
const props = defineProps({
paginationConfig: {
type: Object,
- default: () => {}
+ default: () => {},
},
quickCreate: {
type: Boolean,
- default: false
+ default: false,
},
quickCreateName: {
type: String,
- default: t('components.quickCreateName')
+ default: t('components.quickCreateName'),
},
quickCreatePlaceholder: {
type: String,
- default: t('components.quickCreatePlaceholder')
+ default: t('components.quickCreatePlaceholder'),
},
quickCreateMaxlength: {
type: Number,
- default: () => 0
+ default: () => 0,
+ },
+ storeKey: String,
+ maxTableHeight: {
+ type: Number,
+ default: 300,
},
- storeKey: String
})
const emit = defineEmits(['changePage', 'sizeChange', 'creatQuick'])
@@ -131,15 +139,14 @@ function clearSelection() {
appTableRef.value?.clearSelection()
}
defineExpose({
- clearSelection
+ clearSelection,
})
onMounted(() => {
-
- tableHeight.value = window.innerHeight - 300
+ tableHeight.value = window.innerHeight - props.maxTableHeight
window.onresize = () => {
return (() => {
- tableHeight.value = window.innerHeight - 300
+ tableHeight.value = window.innerHeight - props.maxTableHeight
})()
}
})
diff --git a/ui/src/layout/components/sidebar/index.vue b/ui/src/layout/components/sidebar/index.vue
index 0b61995ea..315078195 100644
--- a/ui/src/layout/components/sidebar/index.vue
+++ b/ui/src/layout/components/sidebar/index.vue
@@ -49,6 +49,7 @@ const activeMenu = computed(() => {
height: 100%;
border: none;
background: none;
+ max-height: calc(100vh - 100px);
}
}
diff --git a/ui/src/views/system-shared/AuthorizedWorkspaceDialog.vue b/ui/src/views/system-shared/AuthorizedWorkspaceDialog.vue
index 99d44d2d5..c9022f61f 100644
--- a/ui/src/views/system-shared/AuthorizedWorkspaceDialog.vue
+++ b/ui/src/views/system-shared/AuthorizedWorkspaceDialog.vue
@@ -49,7 +49,7 @@
>
-
{{ space.name }}
+
{{ space.name }}
@@ -69,11 +69,11 @@
-
{{ ele.name }}
+
{{ ele.name }}
-
+
@@ -89,11 +89,11 @@
-
+
diff --git a/ui/src/views/system/resource-authorization/index.vue b/ui/src/views/system/resource-authorization/index.vue
index 54976154f..10b758132 100644
--- a/ui/src/views/system/resource-authorization/index.vue
+++ b/ui/src/views/system/resource-authorization/index.vue
@@ -273,6 +273,8 @@ function getMember(id?: string) {
currentUser.value = member ? member.id : memberList.value?.[0]?.id
currentType.value = member ? member.type : memberList.value?.[0]?.type
getWholeTree(currentUser.value)
+ } else {
+ activeData.value.data = []
}
})
}
diff --git a/ui/src/views/system/workspace/component/Member.vue b/ui/src/views/system/workspace/component/Member.vue
index 54ceef8eb..8cab205b5 100644
--- a/ui/src/views/system/workspace/component/Member.vue
+++ b/ui/src/views/system/workspace/component/Member.vue
@@ -34,6 +34,7 @@
v-loading="loading"
class="member-table"
:span-method="objectSpanMethod"
+ :maxTableHeight="320"
>