From 37b0aed31601e137840aeaf02cba82d63a6627fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=83=A0=E8=BE=BE=E6=B5=AA?= Date: Sun, 31 Mar 2019 15:06:06 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Darticles=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=B2=A1=E6=9C=89=E5=AF=B9order=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=B8=BA=E7=A9=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/portal/taglib/Portal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/portal/taglib/Portal.php b/app/portal/taglib/Portal.php index 985a3c8..d1a13b6 100644 --- a/app/portal/taglib/Portal.php +++ b/app/portal/taglib/Portal.php @@ -83,7 +83,7 @@ class Portal extends TagLib } } - if (strpos($tag['order'], '$') === 0) { + if (!empty($tag['order']) && strpos($tag['order'], '$') === 0) { $order = $tag['order']; $this->autoBuildVar($order); } else { -- Gitee From 6eb4df6a0d17b6a14e99372ee1608642506291d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=83=A0=E8=BE=BE=E6=B5=AA?= Date: Sun, 31 Mar 2019 16:06:23 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=94=AF=E6=8C=81ids=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/portal/service/ApiService.php | 10 +++++++--- app/portal/taglib/Portal.php | 7 ++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/portal/service/ApiService.php b/app/portal/service/ApiService.php index 4e0f4b6..410a9ef 100644 --- a/app/portal/service/ApiService.php +++ b/app/portal/service/ApiService.php @@ -419,11 +419,15 @@ class ApiService 'delete_time' => 0, ]; - return $portalCategoryModel + $temp = $portalCategoryModel ->where($where) ->where($paramWhere) - ->order($order) - ->select(); + ->order($order); + + if (!empty($param['ids'])) { + $temp->whereIn('id', $param['ids']); + } + return $temp->select(); } /** diff --git a/app/portal/taglib/Portal.php b/app/portal/taglib/Portal.php index d1a13b6..1eabb85 100644 --- a/app/portal/taglib/Portal.php +++ b/app/portal/taglib/Portal.php @@ -22,7 +22,7 @@ class Portal extends TagLib 'articles' => ['attr' => 'field,where,limit,order,page,relation,returnVarName,pageVarName,categoryIds', 'close' => 1],//非必须属性item 'tagarticles' => ['attr' => 'field,where,limit,order,page,relation,returnVarName,pageVarName,tagId', 'close' => 1],//非必须属性item 'breadcrumb' => ['attr' => 'cid', 'close' => 1],//非必须属性self - 'categories' => ['attr' => 'where,order', 'close' => 1],//非必须属性item + 'categories' => ['attr' => 'ids,where,order', 'close' => 1],//非必须属性item 'subcategories' => ['attr' => 'categoryId', 'close' => 1],//非必须属性item 'allsubcategories' => ['attr' => 'categoryId', 'close' => 1],//非必须属性item ]; @@ -236,7 +236,11 @@ parse; { $item = empty($tag['item']) ? 'vo' : $tag['item'];//循环变量名 $order = empty($tag['order']) ? '' : $tag['order']; + $ids = empty($tag['ids']) ? '' : $tag['ids']; $returnVarName = 'portal_categories_data'; + if (strpos($ids, '$') === 0) { + $ids = $this->autoBuildVar($ids); + } $where = '""'; if (!empty($tag['where']) && strpos($tag['where'], '$') === 0) { $where = $tag['where']; @@ -247,6 +251,7 @@ parse; \${$returnVarName} = \app\portal\service\ApiService::categories([ 'where' => {$where}, 'order' => '{$order}', + 'ids' => {$ids} ]); ?> -- Gitee From 1ae952c3d3ebf1f554a840f936178937ac5b6363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=83=A0=E8=BE=BE=E6=B5=AA?= Date: Wed, 3 Apr 2019 15:37:15 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=96=B0=E5=A2=9Ecategory=E6=A0=87?= =?UTF-8?q?=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/portal/taglib/Portal.php | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/app/portal/taglib/Portal.php b/app/portal/taglib/Portal.php index 1eabb85..0ea3567 100644 --- a/app/portal/taglib/Portal.php +++ b/app/portal/taglib/Portal.php @@ -23,6 +23,7 @@ class Portal extends TagLib 'tagarticles' => ['attr' => 'field,where,limit,order,page,relation,returnVarName,pageVarName,tagId', 'close' => 1],//非必须属性item 'breadcrumb' => ['attr' => 'cid', 'close' => 1],//非必须属性self 'categories' => ['attr' => 'ids,where,order', 'close' => 1],//非必须属性item + 'category' => ['attr' => 'id', 'close' => 1],//非必须属性item 'subcategories' => ['attr' => 'categoryId', 'close' => 1],//非必须属性item 'allsubcategories' => ['attr' => 'categoryId', 'close' => 1],//非必须属性item ]; @@ -262,6 +263,29 @@ parse; return $parse; } + /** + * 文章分类详情标签 + * @param array $tag + * @param string $content + * @return string + */ + public function tagCategory($tag, $content) + { + $id = $tag['id'] ?: ''; + if (strpos($id, '$') === 0) { + $this->autoBuildVar($id); + } + $returnVarName = $tag['item'] ?: 'portal_category'; + + $parse = << +{$content} +parse; + return $parse; + } + /** * 文章子分类标签 */ -- Gitee From bb816c706288cd8e930d0206f00fd9251dfa04db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=83=A0=E8=BE=BE=E6=B5=AA?= Date: Sat, 6 Apr 2019 11:07:07 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dids=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E6=97=B6=E6=8A=A5=E9=94=99=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/portal/taglib/Portal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/portal/taglib/Portal.php b/app/portal/taglib/Portal.php index 0ea3567..6d0b08a 100644 --- a/app/portal/taglib/Portal.php +++ b/app/portal/taglib/Portal.php @@ -237,7 +237,7 @@ parse; { $item = empty($tag['item']) ? 'vo' : $tag['item'];//循环变量名 $order = empty($tag['order']) ? '' : $tag['order']; - $ids = empty($tag['ids']) ? '' : $tag['ids']; + $ids = empty($tag['ids']) ? '""' : $tag['ids']; $returnVarName = 'portal_categories_data'; if (strpos($ids, '$') === 0) { $ids = $this->autoBuildVar($ids); -- Gitee From 1737674b10def8fb6e43e5251c2a7887c0bd8030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=83=A0=E8=BE=BE=E6=B5=AA?= Date: Sun, 7 Apr 2019 14:09:11 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E7=BC=BA=E5=B0=91alias=E5=AD=97=E6=AE=B5=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/portal/data/portal.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/app/portal/data/portal.sql b/app/portal/data/portal.sql index ed78fd0..ba5b33a 100644 --- a/app/portal/data/portal.sql +++ b/app/portal/data/portal.sql @@ -11,6 +11,7 @@ CREATE TABLE IF NOT EXISTS `cmf_portal_category` ( `delete_time` int(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT '删除时间', `list_order` float NOT NULL DEFAULT '10000' COMMENT '排序', `name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '分类名称', + `alias` varchar(128) NOT NULL DEFAULT '' COMMENT '分类别名', `description` varchar(255) NOT NULL DEFAULT '' COMMENT '分类描述', `path` varchar(255) NOT NULL DEFAULT '' COMMENT '分类层级关系路径', `seo_title` varchar(100) NOT NULL DEFAULT '', -- Gitee From 869176a4c502f18b89732eb0042c411936e58d9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=83=A0=E8=BE=BE=E6=B5=AA?= Date: Sun, 7 Apr 2019 14:13:26 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D$tag['item']=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/portal/taglib/Portal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/portal/taglib/Portal.php b/app/portal/taglib/Portal.php index 6d0b08a..355f507 100644 --- a/app/portal/taglib/Portal.php +++ b/app/portal/taglib/Portal.php @@ -275,7 +275,7 @@ parse; if (strpos($id, '$') === 0) { $this->autoBuildVar($id); } - $returnVarName = $tag['item'] ?: 'portal_category'; + $returnVarName = empty($tag['item']) ? 'portal_category' : $tag['item']; $parse = <<