Browse Source

Merge branch 'fork/HaroldZhangCode91/fix/layout-footer-position'

pull/8286/head
金毛88 2 weeks ago
parent
commit
6e448fda92
  1. 5
      .changeset/quick-planes-register-graphic.md
  2. 5
      .changeset/tall-otters-fix-footer.md
  3. 3
      packages/@core/ui-kit/layout-ui/src/components/layout-content.vue
  4. 2
      packages/effects/plugins/src/echarts/echarts.ts

5
.changeset/quick-planes-register-graphic.md

@ -0,0 +1,5 @@
---
'@vben/plugins': patch
---
fix(@vben/plugins): register echarts GraphicComponent for empty-state text

5
.changeset/tall-otters-fix-footer.md

@ -0,0 +1,5 @@
---
'@vben-core/layout-ui': patch
---
fix(@vben-core/layout-ui): keep in-flow footer below page content

3
packages/@core/ui-kit/layout-ui/src/components/layout-content.vue

@ -45,7 +45,6 @@ const style = computed((): CSSProperties => {
return {
...compactStyle,
flex: 1,
minHeight: 0,
minWidth: 0,
padding: `${padding}px`,
paddingBottom: `${paddingBottom}px`,
@ -57,7 +56,7 @@ const style = computed((): CSSProperties => {
</script>
<template>
<main :style="style" class="relative min-h-0 min-w-0">
<main :style="style" class="relative min-w-0">
<div
v-if="$slots.overlay"
data-layout-region="content-overlay"

2
packages/effects/plugins/src/echarts/echarts.ts

@ -1,6 +1,7 @@
import { BarChart, LineChart, PieChart, RadarChart } from 'echarts/charts';
import {
DatasetComponent,
GraphicComponent,
GridComponent,
LegendComponent,
TitleComponent,
@ -32,6 +33,7 @@ echarts.use([
CanvasRenderer,
LegendComponent,
ToolboxComponent,
GraphicComponent,
]);
export type { ECOption } from './types';

Loading…
Cancel
Save