From b2e6114644d30e97d66e265b88f141b141b07968 Mon Sep 17 00:00:00 2001
From: wangyuting <wangyuting@easycorp.ltd>
Date: Tue, 18 Jul 2023 13:50:31 +0800
Subject: [PATCH] * Finish html block zin page.

---
 module/block/ui/create.html.php               | 10 +++++++-
 ...rviewblock.html.php => htmlblock.html.php} | 10 ++++----
 module/block/ui/todolistblock.html.php        | 24 -------------------
 3 files changed, 13 insertions(+), 31 deletions(-)
 rename module/block/ui/{qaoverviewblock.html.php => htmlblock.html.php} (73%)
 delete mode 100644 module/block/ui/todolistblock.html.php

diff --git a/module/block/ui/create.html.php b/module/block/ui/create.html.php
index 537fd90b24..dd8d125c79 100644
--- a/module/block/ui/create.html.php
+++ b/module/block/ui/create.html.php
@@ -152,7 +152,15 @@ div
                             set::required(true),
                         ),
                     )
-                )
+                ),
+                $module == 'html' ? formRow
+                (
+                    formGroup
+                    (
+                        set::label($lang->block->lblHtml),
+                        editor(set::name('params[html]')),
+                    )
+                ) : null
             )
         )
     )
diff --git a/module/block/ui/qaoverviewblock.html.php b/module/block/ui/htmlblock.html.php
similarity index 73%
rename from module/block/ui/qaoverviewblock.html.php
rename to module/block/ui/htmlblock.html.php
index 4ca389903f..e1da2cb1d6 100644
--- a/module/block/ui/qaoverviewblock.html.php
+++ b/module/block/ui/htmlblock.html.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 /**
-* The qaoverview block view file of block module of ZenTaoPMS.
+* The html 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,12 +13,10 @@ namespace zin;
 
 panel
 (
-    set('headingClass', 'border-b'),
     set::title($block->title),
-    div
-    (
-        '正在开发中...'
-    )
+    set('class', 'html-block list-block ' . ($longBlock ? 'block-long' : 'block-sm')),
+    set('headingClass', 'border-b'),
+    html($block->params->html)
 );
 
 render();
diff --git a/module/block/ui/todolistblock.html.php b/module/block/ui/todolistblock.html.php
deleted file mode 100644
index 12bb226427..0000000000
--- a/module/block/ui/todolistblock.html.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-declare(strict_types=1);
-/**
-* 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>
-* @package     block
-* @link        https://www.zentao.net
-*/
-
-namespace zin;
-
-panel
-(
-    set('headingClass', 'border-b'),
-    set::title($block->title),
-    div
-    (
-        '正在开发中...'
-    )
-);
-
-render();