From e6849ef1725d5bf3290cbedbdf656a1540eb2e9c Mon Sep 17 00:00:00 2001
From: Wangyuting <851424971@qq.com>
Date: Fri, 5 May 2023 09:38:59 +0800
Subject: [PATCH] * Optimize block control.

---
 db/update20.0.sql                     |  3 +++
 module/block/control.php              | 13 +++++++------
 module/block/ui/projectblock.html.php |  5 +----
 module/block/zen.php                  |  6 ++----
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/db/update20.0.sql b/db/update20.0.sql
index ebdf019abe..334b6ef21a 100644
--- a/db/update20.0.sql
+++ b/db/update20.0.sql
@@ -7,3 +7,6 @@ ALTER TABLE `zt_todo`  CHANGE `idvalue` `objectID` mediumint(8) unsigned default
 UPDATE `zt_block` SET `dashboard` = `module`;
 UPDATE `zt_block` SET `module` = IF(`source` != '', `source`, `code`);
 DROP INDEX account_vision_module_type_order ON `zt_block`;
+
+ALTER TABLE `zt_block` DROP COLUMN `source`;
+ALTER TABLE `zt_block` DROP COLUMN `type`;
diff --git a/module/block/control.php b/module/block/control.php
index 870aa6eba6..1c975d73cc 100755
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -259,13 +259,14 @@ class block extends control
      * Print block.
      * 输出区块
      *
-     * @param  int        $id
+     * @param  int     $blockID
      * @access public
      * @return void|false
      */
-    public function printBlock($id)
+    public function printBlock($blockID)
     {
-        $block = $this->block->getByID((int)$id);
+        $blockID = (int)$blockID;
+        $block   = $this->block->getByID($blockID);
 
         if(empty($block)) return false;
 
@@ -280,7 +281,7 @@ class block extends control
             break;
 
             case 'guide':
-                $html = $this->fetch('block', 'guide', "blockID=$block->id");
+                $html = $this->fetch('block', 'guide', "blockID=$blockID");
             break;
 
             case 'assigntome':
@@ -288,7 +289,7 @@ class block extends control
             break;
 
             case 'welcome':
-                $html = $this->fetch('block', 'welcome', "blockID=$block->id");
+                $html = $this->fetch('block', 'welcome', "blockID=$blockID");
             break;
 
             case 'contribute':
@@ -296,7 +297,7 @@ class block extends control
             break;
 
             default:
-                $html = $this->blockZen->generateDefaultBlockBySource($id, $block);
+                $html = $this->blockZen->generateDefaultBlockBySource($block);
             break;
         }
         echo $html;
diff --git a/module/block/ui/projectblock.html.php b/module/block/ui/projectblock.html.php
index 1637ec1c44..a951db0dee 100644
--- a/module/block/ui/projectblock.html.php
+++ b/module/block/ui/projectblock.html.php
@@ -28,10 +28,7 @@ dtable
     set::width('100%'),
     set::height('auto'),
     set::cols(array_values($config->block->dtable->project->fieldList)),
-    set::data(array_values($projects)),
-    set::footPager(usePager()),
-    set::footer(array('flex', 'pager'))
+    set::data(array_values($projects))
 );
 
-
 render();
diff --git a/module/block/zen.php b/module/block/zen.php
index 71966046db..9e506df62b 100644
--- a/module/block/zen.php
+++ b/module/block/zen.php
@@ -265,20 +265,18 @@ class blockZen extends block
      * 根据来源生成默认区块
      * Generate default block by source.
      *
-     * @param  int    $id
      * @param  object $block
      * @return string
      */
-    protected function generateDefaultBlockBySource(int $id, object $block): string
+    protected function generateDefaultBlockBySource(object $block): string
     {
         $this->get->set('mode', 'getblockdata');
         $this->get->set('blockTitle', $block->title);
         $this->get->set('module', $block->module);
-        $this->get->set('source', $block->source);
         $this->get->set('blockid', $block->code);
         $this->get->set('param', base64_encode(json_encode($block->params)));
 
-        return $this->fetch('block', 'main', "module={$block->source}&id=$id");
+        return $this->fetch('block', 'main', "module={$block->module}&id={$block->id}");
     }
 
     /**