From 086901563c92d92961189b252d84d9748eddb2ca Mon Sep 17 00:00:00 2001
From: "yadong.zhang" <yadong.zhang0415@gmail.com>
Date: Mon, 8 Jul 2019 09:14:49 +0800
Subject: [PATCH] =?UTF-8?q?:alien:=20=E5=90=8E=E5=8F=B0=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=88=B6=E7=BA=A7=E5=88=86=E7=B1=BB=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/article/types.ftl  | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/blog-admin/src/main/resources/templates/article/types.ftl b/blog-admin/src/main/resources/templates/article/types.ftl
index d08fbb7..a9112d5 100644
--- a/blog-admin/src/main/resources/templates/article/types.ftl
+++ b/blog-admin/src/main/resources/templates/article/types.ftl
@@ -115,11 +115,22 @@
                 }, {
                     field: 'name',
                     title: '名称',
-                    width: '100px',
+                    width: '180px',
                     formatter: function (code, row, index) {
                         var id = row.id;
                         return '<a href="' + appConfig.wwwPath + '/type/' + id + '" target="_blank">' + row.name + '</a>';
                     }
+                }, {
+                    field: 'parent.name',
+                    title: '父级分类',
+                    width: '180px',
+                    formatter: function (code, row, index) {
+                        var parent = row.parent;
+                        if(!parent) {
+                            return "-";
+                        }
+                        return '<a href="' + appConfig.wwwPath + '/type/' + parent.id + '" target="_blank">' + parent.name + '</a>';
+                    }
                 }, {
                     field: 'description',
                     title: '描述',
-- 
GitLab