From 2cb2a57012731869f4eb1becbe94665c0b381764 Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Wed, 9 Dec 2020 18:12:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/markdown/EditElement.vue            | 42 ++++++++++---------
 src/views/markdown/index.vue                  | 25 +++++++----
 src/views/setting/articles/articleManager.vue |  6 ++-
 3 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/src/views/markdown/EditElement.vue b/src/views/markdown/EditElement.vue
index 14c712e..59c4770 100644
--- a/src/views/markdown/EditElement.vue
+++ b/src/views/markdown/EditElement.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="edit-div"
+  <div id="edit-div"
        v-html="innerText"
        :contenteditable="canEdit"
        @focus="isLocked = true"
@@ -22,39 +22,41 @@ export default{
   },
   data(){
     return {
-      innerText: this.value,
-      isLocked: false
+      innerText: '',
+      isLocked: false,
     }
   },
   watch: {
-    'value'(){
+    value(value){
       if (!this.isLocked || !this.innerText) {
-        this.innerText = this.value;
+        console.log('value', value)
+        this.innerText = value
+        document.getElementById('edit-div').innerHTML = value
       }
     }
   },
   methods: {
     changeText(){
-      this.$emit('input', this.$el.innerHTML);
+      this.$emit('input', this.$el.innerHTML)
     }
   }
 }
 </script>
 <style lang="scss" rel="stylesheet/scss">
 .edit-div {
-  //overflow: auto;
-  //word-break: break-all;
-  //outline: none;
-  //user-select: text;
-  //white-space: pre-wrap;
-  //text-align: left;
-  //&[contenteditable=true]{
-  //  user-modify: read-write-plaintext-only;
-  //  &:empty:before {
-  //    content: attr(placeholder);
-  //    display: block;
-  //    color: #ccc;
-  //  }
-  //}
+  overflow: auto;
+  word-break: break-all;
+  outline: none;
+  user-select: text;
+  white-space: pre-wrap;
+  text-align: left;
+  &[contenteditable=true]{
+    user-modify: read-write-plaintext-only;
+    &:empty:before {
+      content: attr(placeholder);
+      display: block;
+      color: #ccc;
+    }
+  }
 }
 </style>
diff --git a/src/views/markdown/index.vue b/src/views/markdown/index.vue
index b007ee9..7a7fa4a 100644
--- a/src/views/markdown/index.vue
+++ b/src/views/markdown/index.vue
@@ -10,6 +10,7 @@
           <div class="url-slug">
             <div>{{ articleLink }}</div>
             <edit-element
+              ref="editElement"
               class="mark-setting-input"
               v-model="file.slug"
               placeholder="缩略名"
@@ -31,9 +32,9 @@
           <el-date-picker
             v-model="file.uploadDate"
             type="datetime"
+            size="small"
             value-format="yyyy-MM-dd HH:mm:ss"
-            format="yyyy-MM-dd HH:mm:ss"
-            placeholder="____-__-__ __:__">
+            format="yyyy-MM-dd HH:mm:ss">
           </el-date-picker>
           <p class="mark-setting-label">分类：</p>
           <el-tree
@@ -156,6 +157,7 @@
     }]
 
   export default {
+    inject: ['appReload'],
     name: 'MarkdownEditor',
     components: {
       EditElement,
@@ -195,7 +197,7 @@
         treeProps: {
           label: 'name',
         },
-        releaseTime: undefined
+        releaseTime: undefined,
       }
     },
     mounted() {
@@ -240,6 +242,7 @@
         this.$emit('update:hasChange', true)
       },
       getMarkdown(isReload){
+        this.draft = false
         if(this.$route.query.id){
           this.editStatus = true
           markdownApi.getMarkdown({
@@ -251,6 +254,7 @@
                 this.currentDarft = true
               }
             } else {
+              this.currentDarft = false
               this.file = res.data
             }
             // 初始化编辑器
@@ -414,7 +418,6 @@
       saveDraft() {
         this.draft = true
         this.update('保存草稿成功')
-        this.getMarkdown(true)
       },
       release() {
         this.draft = false
@@ -433,12 +436,12 @@
             fileId: this.$route.query.id,
             username: this.$store.state.user.name
           }).then(() => {
-            this.reload()
             this.$message({
               message: "草稿已被删除",
               type: 'success',
               duration : 1000
             })
+            this.reload()
           })
         })
       },
@@ -464,14 +467,21 @@
             currentDirectory: this.storageLocation,
             contentText: this.contentEditor.getValue(),
             uploadDate: this.file.uploadDate,
-          }).then(() => {
+          }).then((res) => {
             this.$emit('update:hasChange', false)
             this.updating = false
             this.$message({
               message: message ? message : "发布成功",
               type: 'success',
               duration : 1000
-            });
+            })
+            if(this.draft){
+              this.$router.push({path: this.$route.path, query: {operation: 'editor', id: res.data}})
+              this.$emit('onTitle', this.filename)
+              this.reload()
+            } else {
+              this.$emit('onRelease')
+            }
           }).catch(()=> {
             this.updating = false
           })
@@ -639,6 +649,7 @@
     border-radius: 2px;
     color: #666;
     width: fit-content;
+    min-width: 35px;
     background-color: #ecf5ff;
     &:focus {
       outline: none;
diff --git a/src/views/setting/articles/articleManager.vue b/src/views/setting/articles/articleManager.vue
index 3fddb47..619ed7b 100644
--- a/src/views/setting/articles/articleManager.vue
+++ b/src/views/setting/articles/articleManager.vue
@@ -9,7 +9,7 @@
       @open="openDialog"
       @close="closeDialog"
     >
-      <markdown-editor ref="editor" :has-change.sync="hasChange" @onTitle="onTitle"></markdown-editor>
+      <markdown-editor ref="editor" :has-change.sync="hasChange" @onTitle="onTitle" @onRelease="onRelease"></markdown-editor>
     </el-dialog>
     <el-card class="box-card">
       <div slot="header">
@@ -368,6 +368,10 @@ export default {
     openDialog() {
       this.pageTitle = '撰写新文章'
     },
+    onRelease() {
+      this.newArticleDialogVisible = false
+      this.closeDialog()
+    },
     closeDialog(){
       this.$router.replace({path: this.$route.path})
       window.onbeforeunload = null