* Fix preview layout in chart and pivot.

This commit is contained in:
qixinzhi
2024-03-29 05:23:13 +00:00
parent fa541e9626
commit 3492957613
3 changed files with 56 additions and 60 deletions
+3 -1
View File
@@ -65,8 +65,10 @@ $generateCharts = function() use($charts, $lang)
echarts
(
set($chartOptions),
set::width('100%'),
set::height(400),
$chart->type == 'waterpolo' ? set::exts('liquidfill') : null,
)->size('100%', 400)
)
)
);
}
+30 -36
View File
@@ -45,42 +45,36 @@ if($config->edition != 'open')
$chart = zget($charts, 0, null);
sidebar
(
set::width(240),
moduleMenu
(
set::title($groups[$groupID]),
set::modules($treeMenu),
$charts ? set::activeKey($charts[0]->currentGroup . '_' . $charts[0]->id) : null,
set::closeLink(''),
set::showDisplay(false),
set::titleShow(false),
set::checkbox(true),
set::checkOnClick('any'),
to::footer
([
$treeMenu ? div
(
setClass('bg-canvas px-4 py-2 module-menu'),
btn($lang->chart->preview, setClass('primary'), on::click('previewCharts'))
) : null,
$config->edition == 'open' ? div
(
setClass('bg-canvas px-4 py-2 module-menu'),
html(empty($config->isINT) ? $lang->bizVersion : $lang->bizVersionINT)
) : null
])
),
);
div
(
setClass('flex gap-4'),
sidebar
(
set::width(240),
moduleMenu
(
set::title($groups[$groupID]),
set::modules($treeMenu),
$charts ? set::activeKey($charts[0]->currentGroup . '_' . $charts[0]->id) : null,
set::closeLink(''),
set::showDisplay(false),
set::checkbox(true),
set::checkOnClick('any'),
to::footer
([
$treeMenu ? div
(
setClass('bg-canvas px-4 py-2 module-menu'),
btn($lang->chart->preview, setClass('primary'), on::click('previewCharts'))
) : null,
$config->edition == 'open' ? div
(
setClass('bg-canvas px-4 py-2 module-menu'),
html(empty($config->isINT) ? $lang->bizVersion : $lang->bizVersionINT)
) : null
])
),
),
div
(
setID('chartPanel'),
setClass('w-full'),
$generateCharts()
)
setID('chartPanel'),
$generateCharts()
);
render();
+23 -23
View File
@@ -55,31 +55,31 @@ if($config->edition != 'open')
);
}
div
sidebar
(
setClass('flex gap-4'),
sidebar
set::width(240),
moduleMenu
(
set::width(240),
moduleMenu
set::title($groups[$groupID]),
set::activeKey($currentMenu),
set::modules($menus),
set::closeLink(''),
set::showDisplay(false),
set::titleShow(false),
to::footer
(
set::title($groups[$groupID]),
set::activeKey($currentMenu),
set::modules($menus),
set::closeLink(''),
set::showDisplay(false)
),
$config->edition == 'open' ? div
(
set::width(240),
setClass('bg-canvas px-4 py-2 module-menu shadow'),
html(empty($config->isINT) ? $lang->bizVersion : $lang->bizVersionINT)
) : null
),
div
(
setID('pivotContent'),
setClass('flex col gap-4 w-full'),
$generateData()
$config->edition == 'open' ? div
(
set::width(240),
setClass('bg-canvas px-4 py-2 module-menu shadow'),
html(empty($config->isINT) ? $lang->bizVersion : $lang->bizVersionINT)
) : null
)
)
);
div
(
setID('pivotContent'),
setClass('flex col gap-4 w-full'),
$generateData()
);