From 4615b782f63a24ba83b96e43b98aca97e7d1a17e Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Sun, 13 Dec 2020 23:34:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E7=8B=AC=E7=AB=8B?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/markdown-api.js                       |  8 ++++
 src/styles/setting.scss                       |  2 +-
 src/views/markdown/EditElement.vue            |  1 -
 src/views/markdown/index.vue                  |  2 +-
 .../setting/articles/alonePageManager.vue     |  1 +
 src/views/setting/articles/articleManager.vue | 42 ++++++++++++-------
 .../setting/articles/articlePageManager.vue   |  3 +-
 src/views/setting/articles/blogManager.vue    |  8 +++-
 8 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/src/api/markdown-api.js b/src/api/markdown-api.js
index 1368153..5b09527 100644
--- a/src/api/markdown-api.js
+++ b/src/api/markdown-api.js
@@ -18,6 +18,14 @@ export default {
       data
     })
   },
+  // 修改文档排序 /markdown/sort
+  sortMarkdown: function(data) {
+    return request({
+      url: '/markdown/sort',
+      method: 'post',
+      data
+    })
+  },
   // 删除草稿 /markdown/deleteDraft
   deleteDraft: function(params) {
     return request({
diff --git a/src/styles/setting.scss b/src/styles/setting.scss
index 7822023..459628c 100644
--- a/src/styles/setting.scss
+++ b/src/styles/setting.scss
@@ -16,7 +16,7 @@ a:hover {
 }
 /deep/.box-card {
   margin: 0 auto;
-  max-width: 1080px;
+  max-width: 1140px;
   min-width: 640px;
   .clearfix {
     font-size: 16px;
diff --git a/src/views/markdown/EditElement.vue b/src/views/markdown/EditElement.vue
index 59c4770..6447c97 100644
--- a/src/views/markdown/EditElement.vue
+++ b/src/views/markdown/EditElement.vue
@@ -29,7 +29,6 @@ export default{
   watch: {
     value(value){
       if (!this.isLocked || !this.innerText) {
-        console.log('value', value)
         this.innerText = value
         document.getElementById('edit-div').innerHTML = value
       }
diff --git a/src/views/markdown/index.vue b/src/views/markdown/index.vue
index 02806bd..02abe4a 100644
--- a/src/views/markdown/index.vue
+++ b/src/views/markdown/index.vue
@@ -274,7 +274,7 @@
             this.filename = this.file.name.split('.md')[0]
             this.storageLocation = this.file.path
             // 加载标签
-            if(this.tags && this.tags.length > 0) {
+            if(this.file.tagIds && this.file.tagIds.length > 0 && this.tags && this.tags.length > 0) {
               this.loadDynamicTags()
             }
           }).then(() => {
diff --git a/src/views/setting/articles/alonePageManager.vue b/src/views/setting/articles/alonePageManager.vue
index 6f18e60..3eee284 100644
--- a/src/views/setting/articles/alonePageManager.vue
+++ b/src/views/setting/articles/alonePageManager.vue
@@ -28,4 +28,5 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+@import "src/styles/setting";
 </style>
diff --git a/src/views/setting/articles/articleManager.vue b/src/views/setting/articles/articleManager.vue
index 4814a37..5cdf26a 100644
--- a/src/views/setting/articles/articleManager.vue
+++ b/src/views/setting/articles/articleManager.vue
@@ -71,15 +71,16 @@
           <el-table-column
             prop="name"
             :show-overflow-tooltip="true"
+            min-width="200"
             label="标题">
             <template slot-scope="scope">
                 <a :title="'编辑 '+scope.row.name" @click="editArticle(scope.row.id)">{{scope.row.name}}<svg-icon icon-class="bianji-"></svg-icon></a>
-                <router-link :title="'浏览 '+scope.row.name" :to="'/articles/article?mark='+scope.row.id" target="_blank"><svg-icon class="wailian" icon-class="wailian"></svg-icon></router-link>
+                <router-link :title="'浏览 '+scope.row.name" :to="'/articles/'+scope.row.slug" target="_blank"><svg-icon class="wailian" icon-class="wailian"></svg-icon></router-link>
             </template>
           </el-table-column>
           <el-table-column
             v-if="!alonePage"
-            width="150"
+            min-width="100"
             label="状态">
             <template slot-scope="scope">
               <el-tag v-if="scope.row.draft" size="medium" type="warning">草稿</el-tag>
@@ -94,7 +95,6 @@
           </el-table-column>
           <el-table-column
             prop="username"
-            width="100"
             label="作者">
             <template slot-scope="scope">
               <router-link :to="$route.path+'?uid='+scope.row.userId">{{scope.row.username}}</router-link>
@@ -113,7 +113,8 @@
           </el-table-column>
           <el-table-column
             prop="updateDate"
-            label="日期">
+            label="日期"
+            width="160">
             <template slot-scope="scope">
               <span>{{scope.row.updateDate.substring(0, 16)}}</span>
             </template>
@@ -201,12 +202,14 @@ export default {
     }
     window.addEventListener('beforeunload', e => this.beforeunloadFn(e))
 
-    // 阻止默认行为
-    document.body.ondrop = function (event) {
-      event.preventDefault();
-      event.stopPropagation();
-    };
-    this.rowDrop()
+    if(this.alonePage){
+      // 阻止默认行为
+      document.body.ondrop = function (event) {
+        event.preventDefault();
+        event.stopPropagation();
+      };
+      this.rowDrop()
+    }
   },
   watch: {
     hasChange(val){
@@ -228,6 +231,18 @@ export default {
         onEnd({ newIndex, oldIndex }) {
           const currRow = _this.articleList.splice(oldIndex, 1)[0]
           _this.articleList.splice(newIndex, 0, currRow)
+
+          let fileIdList = []
+          _this.articleList.forEach(article => {
+            fileIdList.push(article.id)
+          })
+          // 修改排序
+          console.log(fileIdList)
+          markdownApi.sortMarkdown(fileIdList).then(()=>{
+
+          }).catch(() => {
+
+          })
         }
       })
     },
@@ -266,11 +281,7 @@ export default {
     },
     goBack() {
       const operation = this.$route.query.operation
-      if(operation){
-        this.newArticleDialogVisible = true
-      } else {
-        this.newArticleDialogVisible = false
-      }
+      this.newArticleDialogVisible = !!operation;
     },
     cancelFilter() {
       this.$router.push({query: {}})
@@ -303,7 +314,6 @@ export default {
         keyword: this.query.keyword,
         categoryIds: this.query.categoryIds
       }).then((res) => {
-        console.log(res.data)
         this.articleList = res.data
         this.pagination.total = res.count
         this.$nextTick(() => {
diff --git a/src/views/setting/articles/articlePageManager.vue b/src/views/setting/articles/articlePageManager.vue
index e7de608..83742cc 100644
--- a/src/views/setting/articles/articlePageManager.vue
+++ b/src/views/setting/articles/articlePageManager.vue
@@ -1,5 +1,5 @@
 <template>
-  <div className="container">
+  <div class="container">
     <article-manager :page-title="pageTitle"></article-manager>
   </div>
 </template>
@@ -27,4 +27,5 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+@import "src/styles/setting";
 </style>
diff --git a/src/views/setting/articles/blogManager.vue b/src/views/setting/articles/blogManager.vue
index 7943caf..5946b38 100644
--- a/src/views/setting/articles/blogManager.vue
+++ b/src/views/setting/articles/blogManager.vue
@@ -82,7 +82,7 @@ export default {
   },
   data() {
     return {
-      activeNames: ['2'],
+      activeNames: [],
       example: '<i class="fab fa-github">github</i>',
       form: {
         backgroundSite: '',
@@ -98,6 +98,12 @@ export default {
   computed: {},
   mounted() {
     this.getSetting()
+    this.$nextTick(() => {
+      const that = this
+      setTimeout(function (){
+        that.activeNames = ['2']
+      },50)
+    })
   },
   methods: {
     preview(){