Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release #76

Merged
merged 7 commits into from
Aug 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/layout/components/header/components/tagBar/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -105,22 +105,22 @@ const setScrollLeft = (left: number, isAdd = false) => {
}
$(scrollbarRef.value!.$el).find('.el-scrollbar__wrap').animate({ scrollLeft: left }, 300);
};
const max = ref(0);
const tagsRef = ref([] as HTMLElement[]);
const currentTag = ref<RouteLocationNormalized>({
fullPath: '/',
meta: { title: '' },
} as RouteLocationNormalized);
const route = useRoute();
onMounted(() => {
const max = ref(0);
const setMax = () => {
max.value = listRef.value!.offsetWidth - scrollbarRef.value?.$el.clientWidth;
mitter.on(
event.RESIZE,
() => {
max.value = listRef.value!.offsetWidth - scrollbarRef.value?.$el.clientWidth;
},
true,
);
};
onMounted(() => {
mitter.on(event.RESIZE, setMax, true);
watch(tags, setMax, {
flush: 'post',
immediate: true,
});
});
const back = () => {
setScrollLeft(0 - scrollbarRef.value!.$el.clientWidth / 2, true);
Expand All @@ -137,7 +137,7 @@ const jump = (index: number) => {
return;
}
if (index === tagsRef.value.length - 1) {
setScrollLeft(tagsRef.value[tagsRef.value.length - 1].offsetLeft);
max.value > 0 && setScrollLeft(max.value);
return;
}
const parentWidth = scrollbarRef.value!.$el.clientWidth;
Expand Down
1 change: 1 addition & 0 deletions src/views/rolePermissions/components/group/group.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
:loading="group.loading.value"
:row-config="{ isCurrent: true, useKey: true }"
:tree-config="{ expandAll: true, line: true }"
:column-config="{ useKey: true }"
:custom-column="false"
:print="false"
:export-menu="[]"
Expand Down
1 change: 1 addition & 0 deletions src/views/rolePermissions/components/menu/menu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
:tree-config="{ expandAll: true, line: true, reserve: true }"
:checkbox-config="{ labelField: 'id' }"
:row-config="{ keyField: 'rule', useKey: true }"
:column-config="{ useKey: true }"
align="center"
border
me-class="table-menu"
Expand Down