Skip to content

Commit 4143d1f

Browse files
fix: style
1 parent 1c364c2 commit 4143d1f

File tree

5 files changed

+31
-21
lines changed

5 files changed

+31
-21
lines changed

ui/src/components/app-table/index.vue

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,12 @@
1515
clearable
1616
/>
1717

18-
<el-button type="primary" @click="submitHandle" :disabled="loading">{{$t('common.create')}}</el-button>
19-
<el-button @click="showInput = false" :disabled="loading">{{$t('common.cancel')}}</el-button>
18+
<el-button type="primary" @click="submitHandle" :disabled="loading">{{
19+
$t('common.create')
20+
}}</el-button>
21+
<el-button @click="showInput = false" :disabled="loading">{{
22+
$t('common.cancel')
23+
}}</el-button>
2024
</div>
2125
<div v-else @click="quickCreateHandle" class="w-full">
2226
<el-button type="primary" link class="quich-button">
@@ -54,25 +58,29 @@ const { common } = useStore()
5458
const props = defineProps({
5559
paginationConfig: {
5660
type: Object,
57-
default: () => {}
61+
default: () => {},
5862
},
5963
quickCreate: {
6064
type: Boolean,
61-
default: false
65+
default: false,
6266
},
6367
quickCreateName: {
6468
type: String,
65-
default: t('components.quickCreateName')
69+
default: t('components.quickCreateName'),
6670
},
6771
quickCreatePlaceholder: {
6872
type: String,
69-
default: t('components.quickCreatePlaceholder')
73+
default: t('components.quickCreatePlaceholder'),
7074
},
7175
quickCreateMaxlength: {
7276
type: Number,
73-
default: () => 0
77+
default: () => 0,
78+
},
79+
storeKey: String,
80+
maxTableHeight: {
81+
type: Number,
82+
default: 300,
7483
},
75-
storeKey: String
7684
})
7785
const emit = defineEmits(['changePage', 'sizeChange', 'creatQuick'])
7886
@@ -131,15 +139,14 @@ function clearSelection() {
131139
appTableRef.value?.clearSelection()
132140
}
133141
defineExpose({
134-
clearSelection
142+
clearSelection,
135143
})
136144
137145
onMounted(() => {
138-
139-
tableHeight.value = window.innerHeight - 300
146+
tableHeight.value = window.innerHeight - props.maxTableHeight
140147
window.onresize = () => {
141148
return (() => {
142-
tableHeight.value = window.innerHeight - 300
149+
tableHeight.value = window.innerHeight - props.maxTableHeight
143150
})()
144151
}
145152
})

ui/src/layout/components/sidebar/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ const activeMenu = computed(() => {
4949
height: 100%;
5050
border: none;
5151
background: none;
52+
max-height: calc(100vh - 100px);
5253
}
5354
}
5455
</style>

ui/src/views/system-shared/AuthorizedWorkspaceDialog.vue

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
>
5050
<div class="flex">
5151
<AppIcon iconName="app-workspace"></AppIcon>
52-
<span class="ml-4"> {{ space.name }}</span>
52+
<span class="ml-4 ellipsis" :title="space.name"> {{ space.name }}</span>
5353
</div>
5454
</el-checkbox>
5555
</el-checkbox-group>
@@ -69,11 +69,11 @@
6969
<div class="flex-between">
7070
<div class="flex align-center">
7171
<AppIcon iconName="app-workspace"></AppIcon>
72-
<span class="ml-4 lighter">{{ ele.name }}</span>
72+
<span class="ml-4 lighter ellipsis" :title="ele.name">{{ ele.name }}</span>
7373
</div>
7474
<el-button link>
7575
<el-icon @click="clearWorkspace(ele)" :size="18">
76-
<Close/>
76+
<Close />
7777
</el-icon>
7878
</el-button>
7979
</div>
@@ -89,11 +89,11 @@
8989
</template>
9090

9191
<script lang="ts" setup>
92-
import {ref, computed} from 'vue'
93-
import type {CheckboxValueType} from 'element-plus'
92+
import { ref, computed } from 'vue'
93+
import type { CheckboxValueType } from 'element-plus'
9494
import authorizationApi from '@/api/system-shared/authorization'
9595
import workspaceApi from '@/api/workspace/workspace'
96-
import {loadPermissionApi} from "@/utils/dynamics-api/permission-api.ts";
96+
import { loadPermissionApi } from '@/utils/dynamics-api/permission-api.ts'
9797
9898
const checkAll = ref(false)
9999
const isIndeterminate = ref(true)
@@ -122,7 +122,7 @@ const handleCheckedWorkspaceChange = (value: CheckboxValueType[]) => {
122122
isIndeterminate.value = checkedCount > 0 && checkedCount < workspace.value.length
123123
}
124124
125-
const open = async ({id}: any, type = 'Knowledge') => {
125+
const open = async ({ id }: any, type = 'Knowledge') => {
126126
knowledge_id = id
127127
loading.value = true
128128
currentType = type
@@ -161,5 +161,4 @@ defineExpose({
161161
open,
162162
})
163163
</script>
164-
<style lang="scss">
165-
</style>
164+
<style lang="scss"></style>

ui/src/views/system/resource-authorization/index.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,8 @@ function getMember(id?: string) {
273273
currentUser.value = member ? member.id : memberList.value?.[0]?.id
274274
currentType.value = member ? member.type : memberList.value?.[0]?.type
275275
getWholeTree(currentUser.value)
276+
} else {
277+
activeData.value.data = []
276278
}
277279
})
278280
}

ui/src/views/system/workspace/component/Member.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
v-loading="loading"
3535
class="member-table"
3636
:span-method="objectSpanMethod"
37+
:maxTableHeight="320"
3738
>
3839
<el-table-column prop="nick_name" :label="$t('views.userManage.userForm.nick_name.label')" />
3940
<el-table-column prop="username" :label="$t('views.login.loginForm.username.label')" />

0 commit comments

Comments
 (0)