From 2ff1dafb2a60ad5335216c97e34d35f405e06b5d Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 18 Sep 2020 16:25:21 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/PostItem.vue        | 13 ++++++-
 pages/admin/article-edit.vue   | 17 ++++++++++
 pages/admin/article-manage.vue | 23 +++++++++++++
 server/models/post.ts          |  3 ++
 server/proxy/admin.ts          |  5 +++
 server/proxy/index.ts          | 62 ++++++++++++++++++++++++++--------
 types/schema.d.ts              |  5 +++
 7 files changed, 112 insertions(+), 16 deletions(-)

diff --git a/components/PostItem.vue b/components/PostItem.vue
index 16c96310..26b13655 100644
--- a/components/PostItem.vue
+++ b/components/PostItem.vue
@@ -5,6 +5,9 @@
     </div>
     <template v-if="!post.isLocal">
       <h4>
+        <a-tag v-if="post.isTop" color="red">
+          置顶
+        </a-tag>
         <a :title="post.title" :href="post.url" target="_blank">
           <web-font icon="external-link" style="margin-right: 5px;" />
           <span>{{ post.title }}</span>
@@ -31,6 +34,9 @@
         @click="() => (drawer = true)"
       />
       <h4>
+        <a-tag v-if="post.isTop" color="red">
+          置顶
+        </a-tag>
         <nuxt-link :to="`/blog/${post.category.alias}/${post.alias}`" :title="post.title">
           {{ post.title }}
         </nuxt-link>
@@ -145,7 +151,7 @@ export default Vue.extend({
 .blog-item h4 a {
   color: #444;
   position: relative;
-  display: -webkit-inline-box;
+  /* display: -webkit-inline-box; */
   overflow: hidden;
   text-overflow: ellipsis;
   box-orient: vertical;
@@ -242,6 +248,11 @@ export default Vue.extend({
   line-height: 36px;
 }
 
+.center-title{
+  display: flex;
+  align-items: center;
+}
+
 @media (max-width: 576px) {
   /* 隐藏预览 */
   .preview-link {
diff --git a/pages/admin/article-edit.vue b/pages/admin/article-edit.vue
index 94098b05..7271600f 100644
--- a/pages/admin/article-edit.vue
+++ b/pages/admin/article-edit.vue
@@ -60,6 +60,19 @@
             </a-radio>
           </a-radio-group>
         </a-form-item>
+        <a-form-item label="置顶" :colon="false">
+          <a-radio-group
+            v-decorator="['isTop', isTopOpts]"
+            name="isTopGroup"
+          >
+            <a-radio :value="1">
+              置顶
+            </a-radio>
+            <a-radio :value="0">
+              非置顶
+            </a-radio>
+          </a-radio-group>
+        </a-form-item>
         <div v-show="!initialData.isLocal">
           <a-form-item label="URL" :colon="false">
             <a-input
@@ -284,6 +297,9 @@ export default Vue.extend({
       isLocalOpts: {
         initialValue: true
       },
+      isTopOpts: {
+        initialValue: 1
+      },
       labelsOpts: {
         initialValue: []
       },
@@ -460,6 +476,7 @@ export default Vue.extend({
         alias: this.initialData.alias,
         category: this.initialData.category,
         isLocal: this.initialData.isLocal,
+        isTop: this.initialData.isTop,
         url: this.initialData.url || '',
         labels: this.initialData.labels,
         commentsFlag: this.initialData.commentsFlag
diff --git a/pages/admin/article-manage.vue b/pages/admin/article-manage.vue
index 9038d89f..e4f8e6d5 100644
--- a/pages/admin/article-manage.vue
+++ b/pages/admin/article-manage.vue
@@ -182,6 +182,22 @@
                 </a-select>
               </a-form-item>
             </a-col>
+            <a-col :sm="24" :md="11" :xxl="5">
+              <a-form-item label="是否置顶" :colon="false">
+                <a-select
+                  v-decorator="['isTop']"
+                  placeholder="不限"
+                  allow-clear
+                >
+                  <a-select-option value="1">
+                    是
+                  </a-select-option>
+                  <a-select-option value="-1">
+                    否
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
           </a-row>
           <a-row type="flex" justify="center">
             <a-col>
@@ -251,6 +267,13 @@
             >
               已删除
             </a-tag>
+            <a-tag
+              v-else-if="row.isTop &&!row.isDraft"
+              color="red"
+              title="已发布，所有人可见"
+            >
+              置顶
+            </a-tag>
             <a-tag
               v-else-if="!row.isDraft"
               color="green"
diff --git a/server/models/post.ts b/server/models/post.ts
index 81c3da4f..796264b4 100644
--- a/server/models/post.ts
+++ b/server/models/post.ts
@@ -35,6 +35,9 @@ export class Post {
           // 是否本地文档，否则是外链
           isLocal: { type: Boolean, default: true },
 
+          // 是否置顶
+          isTop: { type: Number, default: 0 },
+
           // 是否草稿
           isDraft: { type: Boolean, default: false },
 
diff --git a/server/proxy/admin.ts b/server/proxy/admin.ts
index c45297e2..b0fd0245 100644
--- a/server/proxy/admin.ts
+++ b/server/proxy/admin.ts
@@ -27,6 +27,7 @@ export async function getPosts (params: any) {
     publishTime,
     isLink,
     isDraft,
+    isTop,
     hasComments,
     isDeleted
   } = params;
@@ -90,6 +91,10 @@ export async function getPosts (params: any) {
     };
   }
 
+  if (isTop === '1' || isTop === '-1') {
+    matchObj.isTop = parseInt(isTop);
+  }
+
   // 排序
   let sortObj: any = {
     createTime: -1
diff --git a/server/proxy/index.ts b/server/proxy/index.ts
index 2b6dee6b..ee65e8e3 100644
--- a/server/proxy/index.ts
+++ b/server/proxy/index.ts
@@ -69,21 +69,53 @@ export async function getPosts (params) {
         ];
     }
   }
-  const data = await Promise.all([
-    Post.find(
-      conditions,
-      {},
-      {
-        skip: (page - 1) * pageSize,
-        limit: pageSize,
-        sort: '-publishTime'
-      }
-    )
-      .populate('category')
-      .populate('comments', '_id')
-      .exec(),
-    Post.countDocuments(conditions).exec()
-  ]);
+  /**
+   * 因为没找到按照多个排序的指令
+   * 先获取置顶的帖子，如果没有达到分页限制 就获取剩余个数的正常帖子
+   * 比较拙劣的解决办法
+   */
+  async function getPost () {
+    conditions.isTop = 1;
+    const data = await Promise.all([
+      Post.find(
+        conditions,
+        {},
+        {
+          skip: (page - 1) * pageSize,
+          limit: pageSize,
+          sort: '-publishTime'
+        }
+      )
+        .populate('category')
+        .populate('comments', '_id')
+        .exec(),
+      Post.countDocuments(conditions).exec()
+    ]);
+    if (data[0].length < pageSize) {
+      conditions.isTop = { $ne: 1 };
+      let skip:number = (page - 1) * pageSize - data[1];
+      skip = skip < 0 ? 0 : skip;
+      const data2:[Array<any>, number] = await Promise.all([
+        Post.find(
+          conditions,
+          {},
+          {
+            skip,
+            limit: pageSize - data[0].length,
+            sort: '-publishTime'
+          }
+        )
+          .populate('category')
+          .populate('comments', '_id')
+          .exec(),
+        Post.countDocuments(conditions).exec()
+      ]);
+      data[0].push(...data2[0]);
+      data[1] = data[1] + data2[1];
+      return data;
+    }
+  }
+  const data = await getPost() || [[], 0];
   const postList = data[0];
   const count = data[1];
   const pageCount = Math.ceil(count / pageSize);
diff --git a/types/schema.d.ts b/types/schema.d.ts
index 092d4319..297e65eb 100644
--- a/types/schema.d.ts
+++ b/types/schema.d.ts
@@ -101,6 +101,11 @@ export interface IPost extends Document {
    */
     isLocal: boolean;
 
+    /**
+   * 是否是置顶文章
+   */
+    isTop: number;
+
     /**
    * 是否草稿
    */

From 3ddeba59dc0e87fd747b9feb00ba40f3e3425221 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 18 Sep 2020 16:59:34 +0800
Subject: [PATCH 2/3] Update index.ts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加了data的类型
---
 server/proxy/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/proxy/index.ts b/server/proxy/index.ts
index ee65e8e3..01eb4428 100644
--- a/server/proxy/index.ts
+++ b/server/proxy/index.ts
@@ -76,7 +76,7 @@ export async function getPosts (params) {
    */
   async function getPost () {
     conditions.isTop = 1;
-    const data = await Promise.all([
+    const data:[Array<any>, number] = await Promise.all([
       Post.find(
         conditions,
         {},

From 4fb07098c7541d19e8d020074b011454c6783e9e Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Sat, 19 Sep 2020 10:04:50 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B6=E9=80=89=E9=A1=B9=E4=B8=BA=E9=9D=9E=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/admin/article-edit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/admin/article-edit.vue b/pages/admin/article-edit.vue
index 7271600f..a1aa0c6c 100644
--- a/pages/admin/article-edit.vue
+++ b/pages/admin/article-edit.vue
@@ -298,7 +298,7 @@ export default Vue.extend({
         initialValue: true
       },
       isTopOpts: {
-        initialValue: 1
+        initialValue: 0
       },
       labelsOpts: {
         initialValue: []