优化：模板界面增加page、pageSize等参数

modstart · modstart · commit bb285f49b9cb · 2023-11-14T15:28:41.000+08:00
diff --git a/app/Console/Commands/MigrateJob.php b/app/Console/Commands/MigrateJob.php
@@ -5,7 +5,9 @@
 
 
 use Illuminate\Console\Command;
+use Illuminate\Support\Str;
 use ModStart\Core\Dao\ModelUtil;
+use ModStart\Core\Util\FileUtil;
 use ModStart\Core\Util\HtmlUtil;
 use ModStart\Data\DataManager;
 
@@ -15,12 +17,6 @@ class MigrateJob extends Command
 
     public function handle()
     {
-        print_r(ModelUtil::paginate('cms_content', 1, 10, [
-            'whereOperate'=>['id','>',0],
-            'where' => [
-                'id' => 2
-            ]
-        ]));
     }
 
     private function storageTest()
diff --git a/module/Cms/Api/Controller/DetailController.php b/module/Cms/Api/Controller/DetailController.php
@@ -68,6 +68,11 @@ public function index()
                 BizException::throws('记录未审核');
             }
         }
+
+        $viewData['pageTitle'] = ($record['seoTitle'] ? $record['seoTitle'] : $record['title']) . ' | ' . modstart_config('siteName');
+        $viewData['pageKeywords'] = $record['seoKeywords'] ? $record['seoKeywords'] : $record['title'];
+        $viewData['pageDescription'] = $record['seoDescription'] ? $record['seoDescription'] : $record['title'];
+
         return Response::generateSuccessData($viewData);
     }
 }
diff --git a/module/Cms/Util/CmsContentUtil.php b/module/Cms/Util/CmsContentUtil.php
@@ -215,6 +215,12 @@ public static function get($id)
         $table = "cms_m_$model[name]";
         $recordData = ModelUtil::get($table, $record['id']);
         $record['_tags'] = TagUtil::string2Array($record['tags']);
+        $record['_tagList'] = array_map(function ($o) {
+            return [
+                'name' => $o,
+                'url' => UrlUtil::tag($o),
+            ];
+        }, $record['_tags']);
         foreach ($model['_customFields'] as $v) {
             $f = CmsField::getByName($v['fieldType']);
             $recordData[$v['name']] = $f->unserializeValue($recordData[$v['name']], $recordData);
diff --git a/module/Cms/Util/UrlUtil.php b/module/Cms/Util/UrlUtil.php
@@ -0,0 +1,13 @@
+<?php
+
+
+namespace Module\Cms\Util;
+
+
+class UrlUtil
+{
+    public static function tag($name)
+    {
+        return modstart_web_url('tag/' . htmlspecialchars($name));
+    }
+}
diff --git a/module/Cms/Web/Controller/IndexController.php b/module/Cms/Web/Controller/IndexController.php
@@ -9,6 +9,10 @@ class IndexController extends ModuleBaseController
 {
     public function index()
     {
-        return $this->view('cms.index');
+        return $this->view('cms.index', [
+            'pageTitle' => modstart_config('siteName') . ' | ' . modstart_config('siteSlogan'),
+            'pageKeywords' => modstart_config('siteKeywords'),
+            'pageDescription' => modstart_config('siteDescription'),
+        ]);
     }
 }
diff --git a/module/Cms/Web/Controller/ListController.php b/module/Cms/Web/Controller/ListController.php
@@ -37,13 +37,20 @@ public function index($id = 0)
         $viewData['page'] = $page;
         $viewData['pageSize'] = $pageSize;
         $viewData['records'] = $paginateData['records'];
+        $viewData['total'] = $paginateData['total'];
         $pageTemplate = '?page={page}';
         if (!empty($cat['pageFullUrl'])) {
             $pageTemplate = modstart_web_url($cat['pageFullUrl']);
         }
+        $viewData['pageTemplate'] = $pageTemplate;
         $viewData['pageNextUrl'] = PageHtmlUtil::nextPageUrl($paginateData['total'], $pageSize, $page, $pageTemplate);
         $viewData['pagePrevUrl'] = PageHtmlUtil::prevPageUrl($paginateData['total'], $pageSize, $page, $pageTemplate);
         $viewData['pageHtml'] = PageHtmlUtil::render($paginateData['total'], $pageSize, $page, $pageTemplate);
+
+        $viewData['pageTitle'] = ($cat['seoTitle'] ? $cat['seoTitle'] : $cat['title']) . ' | ' . modstart_config('siteName');
+        $viewData['pageKeywords'] = $cat['seoKeywords'] ? $cat['seoKeywords'] : $cat['title'];
+        $viewData['pageDescription'] = $cat['seoDescription'] ? $cat['seoDescription'] : $cat['title'];
+
         return $this->view('cms.list.' . CmsTemplateUtil::toBladeView($view), $viewData);
     }
 }
diff --git a/module/Cms/Web/Controller/SearchController.php b/module/Cms/Web/Controller/SearchController.php
@@ -30,9 +30,16 @@ public function index()
         $paginateData = CmsContentUtil::paginate($page, $pageSize, $option);
         $viewData = [];
         $viewData['keywords'] = $keywords;
+        $viewData['page'] = $page;
+        $viewData['pageSize'] = $pageSize;
         $viewData['records'] = $paginateData['records'];
         $viewData['total'] = $paginateData['total'];
+        $viewData['pageTemplate'] = '?' . Request::mergeQueries(['page' => ['{page}']]);
         $viewData['pageHtml'] = PageHtmlUtil::render($paginateData['total'], $pageSize, $page, '?' . Request::mergeQueries(['page' => ['{page}']]));
+        $viewData['pageTitle'] = '搜索：' . $keywords . ' | ' . modstart_config('siteName');
+        $viewData['pageKeywords'] = '搜索：' . $keywords;
+        $viewData['pageDescription'] = '搜索：' . $keywords;
+
         return $this->view('cms.search.index', $viewData);
     }
 }
diff --git a/module/Cms/Web/Controller/TagController.php b/module/Cms/Web/Controller/TagController.php
@@ -25,8 +25,14 @@ public function index($tag)
         $viewData = [];
         $viewData['tag'] = $tag;
         $viewData['records'] = $paginateData['records'];
+        $viewData['page'] = $page;
+        $viewData['pageSize'] = $pageSize;
         $viewData['total'] = $paginateData['total'];
+        $viewData['pageTemplate'] = '?page={page}';
         $viewData['pageHtml'] = PageHtmlUtil::render($paginateData['total'], $pageSize, $page, '?page={page}');
+        $viewData['pageTitle'] = $tag . ' | ' . modstart_config('siteName');
+        $viewData['pageKeywords'] = $tag;
+        $viewData['pageDescription'] = $tag;
         return $this->view('cms.tag.index', $viewData);
     }
 }
diff --git a/vendor/modstart/modstart/src/Core/Util/PageHtmlUtil.php b/vendor/modstart/modstart/src/Core/Util/PageHtmlUtil.php
@@ -12,9 +12,14 @@ private static function itemRender($start, $end, $currentPage, $url, $template)
         $html = [];
         for ($i = $start; $i <= $end; $i++) {
             if ($i == $currentPage) {
-                $html[] = sprintf($template['current'], $i);
+                $html[] = self::replace($template['current'], [
+                    '%p%' => $i
+                ]);
             } else {
-                $html[] = sprintf($template['item'], str_replace('{page}', $i, $url), $i);
+                $html[] = self::replace($template['item'], [
+                    '%p%' => $i,
+                    '%s%' => self::buildPage($url, $i)
+                ]);
             }
         }
         return join('', $html);
@@ -31,7 +36,7 @@ public static function nextPageUrl($total, $pageSize, $currentPage, $url = '/url
     {
         $totalPage = ceil($total / $pageSize);
         if ($currentPage < $totalPage) {
-            return str_replace('{page}', ($currentPage + 1), $url);
+            return self::buildPage($url, $currentPage + 1);
         }
         return null;
     }
@@ -46,7 +51,7 @@ public static function nextPageUrl($total, $pageSize, $currentPage, $url = '/url
     public static function prevPageUrl($total, $pageSize, $currentPage, $url = '/url/for/path?page={page}')
     {
         if ($currentPage > 1) {
-            return str_replace('{page}', ($currentPage - 1), $url);
+            return self::buildPage($url, $currentPage - 1);
         }
         return null;
     }
@@ -73,14 +78,14 @@ public static function render($total, $pageSize, $currentPage, $url = '/url/for/
     {
         if (is_null($template)) {
             $template = [
-                'warp' => '<div class="pages">%s</div>',
+                'warp' => '<div class="pages">%s%</div>',
                 'more' => '<span class="more">...</span>',
-                'prev' => '<a class="page" href="%s">' . L('PrevPage') . '</a>',
+                'prev' => '<a class="page" href="%s%">' . L('PrevPage') . '</a>',
                 'prevDisabled' => null,
-                'next' => '<a class="page" href="%s">' . L('NextPage') . '</a>',
+                'next' => '<a class="page" href="%s%">' . L('NextPage') . '</a>',
                 'nextDisabled' => null,
-                'current' => '<span class="current">%d</span>',
-                'item' => '<a class="page" href="%s">%d</a>',
+                'current' => '<span class="current">%p%</span>',
+                'item' => '<a class="page" href="%s%">%p%</a>',
             ];
         }
 
@@ -96,13 +101,14 @@ public static function render($total, $pageSize, $currentPage, $url = '/url/for/
 
         if (!empty($template['first'])) {
             $html[] = self::replace($template['first'], [
-                '%s' => self::buildPage($url, 1),
+                '%s%' => self::buildPage($url, 1),
             ]);
         }
 
         if ($currentPage > 1) {
             $html[] = self::replace($template['prev'], [
-                '%s' => self::buildPage($url, $currentPage - 1),
+                '%s%' => self::buildPage($url, $currentPage - 1),
+                '%p%' => $currentPage - 1,
             ]);
         } else {
             if (!empty($template['prevDisabled'])) {
@@ -140,7 +146,9 @@ public static function render($total, $pageSize, $currentPage, $url = '/url/for/
         }
 
         if ($currentPage < $totalPage) {
-            $html[] = sprintf($template['next'], str_replace('{page}', ($currentPage + 1), $url));
+            $html[] = self::replace($template['next'], [
+                '%s%' => self::buildPage($url, $currentPage + 1),
+            ]);
         } else {
             if (!empty($template['nextDisabled'])) {
                 $html[] = $template['nextDisabled'];
@@ -149,10 +157,12 @@ public static function render($total, $pageSize, $currentPage, $url = '/url/for/
 
         if (!empty($template['last'])) {
             $html[] = self::replace($template['last'], [
-                '%s' => self::buildPage($url, $totalPage),
+                '%s%' => self::buildPage($url, $totalPage),
             ]);
         }
 
-        return sprintf($template['warp'], join('', $html));
+        return self::replace($template['warp'], [
+            '%s%' => join('', $html),
+        ]);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,11 @@ public function index()`
`68`	`68`	`BizException::throws('记录未审核');`
`69`	`69`	`}`
`70`	`70`	`}`
	`71`	`+`
	`72`	`+ $viewData['pageTitle'] = ($record['seoTitle'] ? $record['seoTitle'] : $record['title']) . ' \| ' . modstart_config('siteName');`
	`73`	`+ $viewData['pageKeywords'] = $record['seoKeywords'] ? $record['seoKeywords'] : $record['title'];`
	`74`	`+ $viewData['pageDescription'] = $record['seoDescription'] ? $record['seoDescription'] : $record['title'];`
	`75`	`+`
`71`	`76`	`return Response::generateSuccessData($viewData);`
`72`	`77`	`}`
`73`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,10 @@ class IndexController extends ModuleBaseController`
`9`	`9`	`{`
`10`	`10`	`public function index()`
`11`	`11`	`{`
`12`		`- return $this->view('cms.index');`
	`12`	`+ return $this->view('cms.index', [`
	`13`	`+ 'pageTitle' => modstart_config('siteName') . ' \| ' . modstart_config('siteSlogan'),`
	`14`	`+ 'pageKeywords' => modstart_config('siteKeywords'),`
	`15`	`+ 'pageDescription' => modstart_config('siteDescription'),`
	`16`	`+ ]);`
`13`	`17`	`}`
`14`	`18`	`}`