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.

Sign up for GitHub

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

fix: improve the layout of tables offline on the mobile #4573

Merged
merged 1 commit into from
Oct 5, 2024
Merged

fix: improve the layout of tables offline on the mobile #4573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions packages/@core/ui-kit/form-ui/src/components/form-actions.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ const submitButtonOptions = computed(() => {
};
});

const isQueryForm = computed(() => {
return !!unref(rootProps).showCollapseButton;
});
// const isQueryForm = computed(() => {
// return !!unref(rootProps).showCollapseButton;
// });

const queryFormStyle = computed(() => {
if (isQueryForm.value) {
if (!unref(rootProps).actionWrapperClass) {
return {
'grid-column': `-2 / -1`,
marginLeft: 'auto',
Expand Down
4 changes: 4 additions & 0 deletions packages/effects/plugins/src/vxe-table/theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,7 @@
}
}
}

.vxe-pager--wrapper {
@apply justify-center md:justify-end;
}
42 changes: 27 additions & 15 deletions packages/effects/plugins/src/vxe-table/use-vxe-grid.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
import { usePriorityValues } from '@vben/hooks';
import { EmptyIcon } from '@vben/icons';
import { $t } from '@vben/locales';
import { usePreferences } from '@vben/preferences';
import { cloneDeep, cn, mergeWithArrayOverride } from '@vben/utils';
import { VbenLoading } from '@vben-core/shadcn-ui';

Expand Down Expand Up @@ -48,6 +49,8 @@ const {
formOptions,
} = usePriorityValues(props, state);

const { isMobile } = usePreferences();

const slots = useSlots();

const [Form, formApi] = useTableForm({});
Expand Down Expand Up @@ -91,6 +94,20 @@ const options = computed(() => {
}

if (mergedOptions.pagerConfig) {
const mobileLayouts = [
'PrevJump',
'PrevPage',
'Number',
'NextPage',
'NextJump',
] as any;
const layouts = [
'Total',
'Sizes',
'Home',
...mobileLayouts,
'End',
] as readonly string[];
anncwb marked this conversation as resolved.
Show resolved Hide resolved
mergedOptions.pagerConfig = mergeWithArrayOverride(
{},
mergedOptions.pagerConfig,
Expand All @@ -99,18 +116,7 @@ const options = computed(() => {
background: true,
pageSizes: [10, 20, 30, 50, 100, 200],
className: 'mt-2 w-full',
layouts: [
'Total',
'Sizes',
'Home',
'PrevJump',
'PrevPage',
'Number',
'NextPage',
'NextJump',
'End',
// 'FullJump',
] as any[],
layouts: isMobile.value ? mobileLayouts : layouts,
size: 'mini' as const,
},
);
Expand Down Expand Up @@ -138,7 +144,6 @@ const vbenFormOptions = computed(() => {
const formValues = formApi.form.values;
props.api.reload(formValues);
},
collapseTriggerResize: true,
commonConfig: {
componentProps: {
class: 'w-full',
Expand All @@ -150,8 +155,15 @@ const vbenFormOptions = computed(() => {
},
wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3',
};
const finalFormOptions: VbenFormProps = mergeWithArrayOverride(
{},
formOptions.value,
defaultFormProps,
);

return {
...mergeWithArrayOverride({}, formOptions.value, defaultFormProps),
...finalFormOptions,
collapseTriggerResize: !!finalFormOptions.showCollapseButton,
};
});

Expand Down Expand Up @@ -244,7 +256,7 @@ onMounted(() => {
</Form>
</slot>
<div
class="bg-background-deep z-100 absolute -left-2 bottom-2 h-4 w-[calc(100%+1rem)] overflow-hidden"
class="bg-background-deep z-100 absolute -left-2 bottom-1 h-2 w-[calc(100%+1rem)] overflow-hidden md:bottom-2 md:h-3"
></div>
</div>
</template>
Expand Down
2 changes: 1 addition & 1 deletion playground/src/locales/langs/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"editCell": "单元格编辑",
"editRow": "行编辑",
"custom-cell": "自定义单元格",
"form": "开启搜索表单"
"form": "搜索表单"
},
"captcha": {
"title": "验证码",
Expand Down