* zin: refactor floattoolbar.

This commit is contained in:
dingyongliang
2023-06-13 18:39:39 +08:00
parent 3fcbd0d90c
commit d6fa44d5cd
2 changed files with 6 additions and 8 deletions
+5 -4
View File
@@ -14,7 +14,6 @@ class floatToolbar extends wg
'prefix' => array(),
'main' => array(),
'suffix' => array(),
'object' => null
);
public static function getPageCSS(): string|false
@@ -22,7 +21,7 @@ class floatToolbar extends wg
return file_get_contents(__DIR__ . DS . 'css' . DS . 'v1.css');
}
private function buildDivider(wg|array|null|bool $wg): wg|null
private function buildDivider(wg|array|null $wg): wg|null
{
if(empty($wg)) return null;
@@ -59,9 +58,11 @@ class floatToolbar extends wg
private function mergeBtns(array|null $btns, array|wg|null $block): array|wg|null
{
if(empty($btns) && empty($block)) return null;
if(empty($btns)) return $block;
if(empty($block)) return $btns;
foreach($block[0]->children() as $blockBtn) $blockBtn->add(setClass('ghost', 'text-white'));
if(empty($btns)) return $block;
if(!is_array($block)) $block = array($block);
return array_merge($btns, $block);
}
@@ -86,7 +87,7 @@ class floatToolbar extends wg
$prefixBtns,
$this->buildDivider($prefixBtns),
$mainBtns,
$this->buildDivider($mainBtns && $suffixBtns),
empty($mainBtns) ? null : $this->buildDivider($suffixBtns),
$suffixBtns,
);
}
+1 -4
View File
@@ -76,10 +76,7 @@ detailBody
history(),
floatToolbar
(
set::prefix
(
array(array('icon' => 'back', 'text' => $lang->goback, 'url' => 'javascript:goBack("execution-task", "execution-task")'))
),
to::prefix(backBtn(set::icon('back'), $lang->goback)),
set::main($operateMenus),
set::suffix($commonActions),
set::object($task)