From 60ca1c9c175bbd0b7e5f3be44a18b2a4d64242a7 Mon Sep 17 00:00:00 2001
From: wangyuting <wangyuting@easycorp.ltd>
Date: Thu, 6 Jul 2023 15:52:52 +0800
Subject: [PATCH] * Adjust default block to zin page.

---
 module/block/ui/annualworkloadblock.html.php  |  6 ++---
 module/block/ui/bugstatisticblock.html.php    |  6 ++---
 module/block/ui/dynamicblock.html.php         |  4 ++--
 module/block/ui/monthlyprogressblock.html.php |  6 ++---
 module/block/ui/projectteamblock.html.php     |  4 ++--
 .../block/ui/releasestatisticblock.html.php   |  6 ++---
 module/block/ui/testtaskblock.html.php        | 24 +++++++++++++++++++
 module/block/ui/todolistblock.html.php        |  6 ++---
 module/block/zen.php                          |  4 ++--
 9 files changed, 45 insertions(+), 21 deletions(-)
 create mode 100644 module/block/ui/testtaskblock.html.php

diff --git a/module/block/ui/annualworkloadblock.html.php b/module/block/ui/annualworkloadblock.html.php
index 31863e225b..832bafced0 100644
--- a/module/block/ui/annualworkloadblock.html.php
+++ b/module/block/ui/annualworkloadblock.html.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 /**
-* The dynamic block view file of block module of ZenTaoPMS.
+* The annualworkload block view file of block module of ZenTaoPMS.
 * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
 * @license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
 * @author      Yuting Wang <wangyuting@easycorp.ltd>
@@ -13,10 +13,10 @@ namespace zin;
 
 panel
 (
-    set('class', 'dynamic-block'),
+    set('headingClass', 'border-b'),
+    set::title($block->title),
     div
     (
-        '最新动态',
         '正在开发中...'
     )
 );
diff --git a/module/block/ui/bugstatisticblock.html.php b/module/block/ui/bugstatisticblock.html.php
index 31863e225b..871fa3c41f 100644
--- a/module/block/ui/bugstatisticblock.html.php
+++ b/module/block/ui/bugstatisticblock.html.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 /**
-* The dynamic block view file of block module of ZenTaoPMS.
+* The bugstatistic block view file of block module of ZenTaoPMS.
 * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
 * @license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
 * @author      Yuting Wang <wangyuting@easycorp.ltd>
@@ -13,10 +13,10 @@ namespace zin;
 
 panel
 (
-    set('class', 'dynamic-block'),
+    set('headingClass', 'border-b'),
+    set::title($block->title),
     div
     (
-        '最新动态',
         '正在开发中...'
     )
 );
diff --git a/module/block/ui/dynamicblock.html.php b/module/block/ui/dynamicblock.html.php
index 31863e225b..6a6d856678 100644
--- a/module/block/ui/dynamicblock.html.php
+++ b/module/block/ui/dynamicblock.html.php
@@ -13,10 +13,10 @@ namespace zin;
 
 panel
 (
-    set('class', 'dynamic-block'),
+    set('headingClass', 'border-b'),
+    set::title($block->title),
     div
     (
-        '最新动态',
         '正在开发中...'
     )
 );
diff --git a/module/block/ui/monthlyprogressblock.html.php b/module/block/ui/monthlyprogressblock.html.php
index 31863e225b..429a689bd0 100644
--- a/module/block/ui/monthlyprogressblock.html.php
+++ b/module/block/ui/monthlyprogressblock.html.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 /**
-* The dynamic block view file of block module of ZenTaoPMS.
+* The monthlyprogress block view file of block module of ZenTaoPMS.
 * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
 * @license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
 * @author      Yuting Wang <wangyuting@easycorp.ltd>
@@ -13,10 +13,10 @@ namespace zin;
 
 panel
 (
-    set('class', 'dynamic-block'),
+    set('headingClass', 'border-b'),
+    set::title($block->title),
     div
     (
-        '最新动态',
         '正在开发中...'
     )
 );
diff --git a/module/block/ui/projectteamblock.html.php b/module/block/ui/projectteamblock.html.php
index 8b6bc89c37..04ce4e8062 100644
--- a/module/block/ui/projectteamblock.html.php
+++ b/module/block/ui/projectteamblock.html.php
@@ -13,10 +13,10 @@ namespace zin;
 
 panel
 (
-    set('class', 'projectteam-block'),
+    set('headingClass', 'border-b'),
+    set::title($block->title),
     div
     (
-        '项目人力投入',
         '正在开发中...'
     )
 );
diff --git a/module/block/ui/releasestatisticblock.html.php b/module/block/ui/releasestatisticblock.html.php
index 31863e225b..be43527d55 100644
--- a/module/block/ui/releasestatisticblock.html.php
+++ b/module/block/ui/releasestatisticblock.html.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 /**
-* The dynamic block view file of block module of ZenTaoPMS.
+* The releasestatistic block view file of block module of ZenTaoPMS.
 * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
 * @license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
 * @author      Yuting Wang <wangyuting@easycorp.ltd>
@@ -13,10 +13,10 @@ namespace zin;
 
 panel
 (
-    set('class', 'dynamic-block'),
+    set('headingClass', 'border-b'),
+    set::title($block->title),
     div
     (
-        '最新动态',
         '正在开发中...'
     )
 );
diff --git a/module/block/ui/testtaskblock.html.php b/module/block/ui/testtaskblock.html.php
new file mode 100644
index 0000000000..8d9a7e823e
--- /dev/null
+++ b/module/block/ui/testtaskblock.html.php
@@ -0,0 +1,24 @@
+<?php
+declare(strict_types=1);
+/**
+* The testtask block view file of block module of ZenTaoPMS.
+* @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
+* @license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+* @author      Yuting Wang <wangyuting@easycorp.ltd>
+* @package     block
+* @link        https://www.zentao.net
+*/
+
+namespace zin;
+
+panel
+(
+    set('headingClass', 'border-b'),
+    set::title($block->title),
+    div
+    (
+        '正在开发中...'
+    )
+);
+
+render();
diff --git a/module/block/ui/todolistblock.html.php b/module/block/ui/todolistblock.html.php
index 2978753db7..12bb226427 100644
--- a/module/block/ui/todolistblock.html.php
+++ b/module/block/ui/todolistblock.html.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 /**
-* The todo list block view file of block module of ZenTaoPMS.
+* The todolist block view file of block module of ZenTaoPMS.
 * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
 * @license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
 * @author      Yuting Wang <wangyuting@easycorp.ltd>
@@ -13,10 +13,10 @@ namespace zin;
 
 panel
 (
-    set('class', 'todolist-block'),
+    set('headingClass', 'border-b'),
+    set::title($block->title),
     div
     (
-        '待办列表',
         '正在开发中...'
     )
 );
diff --git a/module/block/zen.php b/module/block/zen.php
index 6c7e18d254..d2c2ac6c42 100644
--- a/module/block/zen.php
+++ b/module/block/zen.php
@@ -183,9 +183,9 @@ class blockZen extends block
         {
             if($block->width == 3)
             {
-                $block->top = max($height[0], $height[1]);
-                $height[0] += $block->height;
+                $block->top = max($height[1], $height[2]);
                 $height[1] += $block->height;
+                $height[2] += $block->height;
             }
             else
             {