From cb6c7965e651ddff80264f49fd0babbc728d20de Mon Sep 17 00:00:00 2001 From: wangyuting Date: Wed, 5 Jul 2023 17:14:17 +0800 Subject: [PATCH] * Adjust block default size on create block. --- module/block/control.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/module/block/control.php b/module/block/control.php index 879321885d..fae9676fdc 100755 --- a/module/block/control.php +++ b/module/block/control.php @@ -44,9 +44,12 @@ class block extends control $formData->vision = $this->config->vision; $formData->params = json_encode($formData->params); - if(empty($formData->width)) $formData->width = 1; + $defaultSize = array(1 => 3); + if(!empty($this->config->block->size[$formData->module][$formData->code])) $defaultSize = $this->config->block->size[$formData->module][$formData->code]; if(!empty($this->config->block->size[$formData->module][$formData->code][$formData->width])) $formData->height = $this->config->block->size[$formData->module][$formData->code][$formData->width]; - if(empty($formData->height)) $formData->height = 3; + + if(empty($formData->width)) $formData->width = reset(array_keys($defaultSize)); + if(empty($formData->height)) $formData->height = reset($defaultSize); $formData->left = $formData->width == 2 ? 0 : 2; $formData->top = $this->block->computeBlockTop($formData);