|
|
@@ -1,5 +1,5 @@
|
|
|
<template>
|
|
|
- <vxe-grid class="wrapper" v-bind="gridOptions" ref="gridRef" v-fullscreen :style="{ height: isShowPager && isFixed ? `calc(100vh - 101px)` : '100%' }">
|
|
|
+ <vxe-grid class="wrapper" v-bind="gridOptions" ref="gridRef" v-fullscreen :style="{ height: isEnablePager && isFixed ? `calc(100vh - 101px)` : '100%' }">
|
|
|
<template #form>
|
|
|
<Search
|
|
|
v-if="searchConfig && searchConfig.enable && searchConfig?.fields && searchConfig?.data"
|
|
|
@@ -87,7 +87,7 @@
|
|
|
</template>
|
|
|
|
|
|
<template #pager>
|
|
|
- <div :class="`pager ${!has(pagerConfig, 'isFixed') || pagerConfig.isFixed ? 'page_fixed' : ''}`" v-if="pagerConfig && pagerConfig.enable">
|
|
|
+ <div :class="`pager ${!has(pagerConfig, 'isFixed') || pagerConfig.isFixed ? 'page_fixed' : ''}`" v-if="pagerConfig && isEnablePager">
|
|
|
<Pagination :pagerConfig="pagerConfig" />
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -120,7 +120,7 @@
|
|
|
const props = defineProps(['gridOptions', 'searchConfig', 'pagerConfig', 'toolbarConfig', 'getGridRef', 'mounted', 'toolbarTopConfig', 'url']);
|
|
|
|
|
|
const isFixed = get(props.pagerConfig, 'isFixed', true);
|
|
|
- const isShowPager = get(props.pagerConfig, 'enable', false);
|
|
|
+ const isEnablePager = get(props.pagerConfig, 'enable', false) || get(props.pagerConfig, 'enabled', false);
|
|
|
|
|
|
const $slots = useSlots();
|
|
|
|
|
|
@@ -130,6 +130,7 @@
|
|
|
|
|
|
const slotCols = ref([]);
|
|
|
|
|
|
+
|
|
|
const handleSetting = () => {
|
|
|
gridRef.value.openCustom();
|
|
|
};
|