diff --git a/src/components/common/icon-tooltip.vue b/src/components/common/icon-tooltip.vue new file mode 100644 index 00000000..d98db322 --- /dev/null +++ b/src/components/common/icon-tooltip.vue @@ -0,0 +1,42 @@ + + + diff --git a/src/hooks/common/table.ts b/src/hooks/common/table.ts index 31bd3d16..4aea61f2 100644 --- a/src/hooks/common/table.ts +++ b/src/hooks/common/table.ts @@ -38,6 +38,13 @@ export function useNaiveTable(options: UseNaiveTableOptio getColumns }); + // calculate the total width of the table this is used for horizontal scrolling + const scrollX = computed(() => { + return result.columns.value.reduce((acc, column) => { + return acc + Number(column.width ?? column.minWidth ?? 120); + }, 0); + }); + scope.run(() => { watch( () => appStore.locale, @@ -51,7 +58,10 @@ export function useNaiveTable(options: UseNaiveTableOptio scope.stop(); }); - return result; + return { + ...result, + scrollX + }; } type PaginationParams = Pick; diff --git a/src/layouts/modules/global-menu/modules/top-hybrid-sidebar-first.vue b/src/layouts/modules/global-menu/modules/top-hybrid-sidebar-first.vue index 3bb0b2ce..ff037723 100644 --- a/src/layouts/modules/global-menu/modules/top-hybrid-sidebar-first.vue +++ b/src/layouts/modules/global-menu/modules/top-hybrid-sidebar-first.vue @@ -30,15 +30,17 @@ const { selectedKey } = useMenu(); /> - +
+ +
diff --git a/src/layouts/modules/theme-drawer/components/layout-mode-card.vue b/src/layouts/modules/theme-drawer/components/layout-mode-card.vue index 351bb942..e0563508 100644 --- a/src/layouts/modules/theme-drawer/components/layout-mode-card.vue +++ b/src/layouts/modules/theme-drawer/components/layout-mode-card.vue @@ -80,7 +80,7 @@ function handleChangeMode(mode: UnionKey.ThemeLayoutMode) { class="flex-col-center cursor-pointer" @click="handleChangeMode(key)" > - + {{ $t(`theme.layout.layoutMode.${key}_detail`) }} - +

{{ $t(themeLayoutModeRecord[key]) }}

diff --git a/src/layouts/modules/theme-drawer/components/setting-item.vue b/src/layouts/modules/theme-drawer/components/setting-item.vue index ccd29bd2..07316a6d 100644 --- a/src/layouts/modules/theme-drawer/components/setting-item.vue +++ b/src/layouts/modules/theme-drawer/components/setting-item.vue @@ -13,7 +13,7 @@ defineProps();