pref: post publishing experience. (halo-dev/console#125)

* pref: post publishing experience. * fix: sheet tab icon.
JohnNiang · Apr 5, 2020 · 6ad3358 · 6ad3358
1 parent ffc8bf1
commit 6ad3358
Show file tree

Hide file tree

Showing 8 changed files with 158 additions and 99 deletions.
diff --git a/src/api/log.js b/src/api/log.js
@@ -71,12 +71,20 @@ logApi.logType = {
     text: '页面发布'
   },
   SHEET_EDITED: {
-    value: 50,
+    value: 55,
     text: '页面修改'
   },
   SHEET_DELETED: {
-    value: 50,
+    value: 60,
     text: '页面删除'
+  },
+  MFA_UPDATED: {
+    value: 65,
+    text: '两步验证'
+  },
+  LOGGED_PRE_CHECK: {
+    value: 70,
+    text: '登陆验证'
   }
 }
 

diff --git a/src/views/post/PostEdit.vue b/src/views/post/PostEdit.vue
@@ -46,12 +46,12 @@
       <a-button
         type="danger"
         @click="handleSaveDraft(false)"
-        :disabled="saving"
+        :loading="draftSaving"
       >保存草稿</a-button>
       <a-button
         @click="handlePreview"
         style="margin-left: 8px;"
-        :disabled="saving"
+        :loading="previewSaving"
       >预览</a-button>
       <a-button
         type="primary"
@@ -97,7 +97,8 @@ export default {
       selectedMetas: [],
       isSaved: false,
       contentChanges: 0,
-      saving: false
+      draftSaving: false,
+      previewSaving: false
     }
   },
   beforeRouteEnter(to, from, next) {
@@ -183,7 +184,7 @@ export default {
       if (!this.postToStage.title) {
         this.postToStage.title = moment(new Date()).format('YYYY-MM-DD-HH-mm-ss')
       }
-      this.saving = true
+      this.draftSaving = true
       if (this.postToStage.id) {
         // Update the post
         if (draftOnly) {
@@ -193,7 +194,7 @@ export default {
               this.$message.success('保存草稿成功！')
             })
             .finally(() => {
-              this.saving = false
+              this.draftSaving = false
             })
         } else {
           postApi
@@ -204,7 +205,7 @@ export default {
               this.postToStage = response.data.data
             })
             .finally(() => {
-              this.saving = false
+              this.draftSaving = false
             })
         }
       } else {
@@ -217,7 +218,7 @@ export default {
             this.postToStage = response.data.data
           })
           .finally(() => {
-            this.saving = false
+            this.draftSaving = false
           })
       }
     },
@@ -229,7 +230,7 @@ export default {
       if (!this.postToStage.title) {
         this.postToStage.title = moment(new Date()).format('YYYY-MM-DD-HH-mm-ss')
       }
-      this.saving = true
+      this.previewSaving = true
       if (this.postToStage.id) {
         // Update the post
         postApi.update(this.postToStage.id, this.postToStage, false).then(response => {
@@ -240,7 +241,7 @@ export default {
               window.open(response.data, '_blank')
             })
             .finally(() => {
-              this.saving = false
+              this.previewSaving = false
             })
         })
       } else {
@@ -254,7 +255,7 @@ export default {
               window.open(response.data, '_blank')
             })
             .finally(() => {
-              this.saving = false
+              this.previewSaving = false
             })
         })
       }

diff --git a/src/views/post/components/PostSettingDrawer.vue b/src/views/post/components/PostSettingDrawer.vue
@@ -293,12 +293,12 @@
         style="marginRight: 8px"
         @click="handleDraftClick"
         v-if="saveDraftButton"
-        :disabled="saving"
+        :loading="draftSaving"
       >保存草稿</a-button>
       <a-button
         @click="handlePublishClick"
         type="primary"
-        :disabled="saving"
+        :loading="saving"
       > {{ selectedPost.id?'保存':'发布' }} </a-button>
     </div>
   </a-drawer>
@@ -335,7 +335,8 @@ export default {
       categories: [],
       categoryToCreate: {},
       customTpls: [],
-      saving: false
+      saving: false,
+      draftSaving: false
     }
   },
   props: {
@@ -495,7 +496,11 @@ export default {
       this.selectedPost.tagIds = this.selectedTagIds
       // Set post metas
       this.selectedPost.metas = this.selectedMetas
-      this.saving = true
+      if (this.selectedPost.status === 'DRAFT') {
+        this.draftSaving = true
+      } else {
+        this.saving = true
+      }
       if (this.selectedPost.id) {
         // Update the post
         postApi
@@ -514,6 +519,7 @@ export default {
           })
           .finally(() => {
             this.saving = false
+            this.draftSaving = false
           })
       } else {
         // Create the post
@@ -534,6 +540,7 @@ export default {
           })
           .finally(() => {
             this.saving = false
+            this.draftSaving = false
           })
       }
     },

diff --git a/src/views/sheet/SheetEdit.vue b/src/views/sheet/SheetEdit.vue
@@ -41,12 +41,12 @@
       <a-button
         type="danger"
         @click="handleSaveDraft(false)"
-        :disabled="saving"
+        :loading="draftSaving"
       >保存草稿</a-button>
       <a-button
         @click="handlePreview"
         style="margin-left: 8px;"
-        :disabled="saving"
+        :loading="previewSaving"
       >预览</a-button>
       <a-button
         type="primary"
@@ -90,7 +90,8 @@ export default {
       selectedMetas: [],
       isSaved: false,
       contentChanges: 0,
-      saving: false
+      draftSaving: false,
+      previewSaving: false
     }
   },
   beforeRouteEnter(to, from, next) {
@@ -174,7 +175,7 @@ export default {
       if (!this.sheetToStage.title) {
         this.sheetToStage.title = moment(new Date()).format('YYYY-MM-DD-HH-mm-ss')
       }
-      this.saving = true
+      this.draftSaving = true
       if (this.sheetToStage.id) {
         if (draftOnly) {
           sheetApi
@@ -183,7 +184,7 @@ export default {
               this.$message.success('保存草稿成功！')
             })
             .finally(() => {
-              this.saving = false
+              this.draftSaving = false
             })
         } else {
           sheetApi
@@ -194,7 +195,7 @@ export default {
               this.sheetToStage = response.data.data
             })
             .finally(() => {
-              this.saving = false
+              this.draftSaving = false
             })
         }
       } else {
@@ -206,7 +207,7 @@ export default {
             this.sheetToStage = response.data.data
           })
           .finally(() => {
-            this.saving = false
+            this.draftSaving = false
           })
       }
     },
@@ -218,7 +219,7 @@ export default {
       if (!this.sheetToStage.title) {
         this.sheetToStage.title = moment(new Date()).format('YYYY-MM-DD-HH-mm-ss')
       }
-      this.saving = true
+      this.previewSaving = true
       if (this.sheetToStage.id) {
         sheetApi.update(this.sheetToStage.id, this.sheetToStage, false).then(response => {
           this.$log.debug('Updated sheet', response.data.data)
@@ -228,7 +229,7 @@ export default {
               window.open(response.data, '_blank')
             })
             .finally(() => {
-              this.saving = false
+              this.previewSaving = false
             })
         })
       } else {
@@ -241,7 +242,7 @@ export default {
               window.open(response.data, '_blank')
             })
             .finally(() => {
-              this.saving = false
+              this.previewSaving = false
             })
         })
       }

diff --git a/src/views/sheet/SheetList.vue b/src/views/sheet/SheetList.vue
@@ -3,18 +3,18 @@
     <a-row>
       <a-col :span="24">
         <div class="card-container">
-          <a-tabs type="card">
-            <a-tab-pane key="independent">
+          <a-tabs
+            v-model="activeKey"
+            type="card"
+          >
+            <a-tab-pane
+              v-for="pane in panes"
+              :key="pane.key"
+            >
               <span slot="tab">
-                <a-icon type="paper-clip" />独立页面
+                <a-icon :type="pane.icon" />{{ pane.title }}
               </span>
-              <IndependentSheetList />
-            </a-tab-pane>
-            <a-tab-pane key="custom">
-              <span slot="tab">
-                <a-icon type="fork" />自定义页面
-              </span>
-              <CustomSheetList />
+              <component :is="pane.component"></component>
             </a-tab-pane>
           </a-tabs>
         </div>
@@ -28,6 +28,35 @@ import IndependentSheetList from './components/IndependentSheetList'
 import CustomSheetList from './components/CustomSheetList'
 
 export default {
+  data() {
+    const panes = [
+      { title: '独立页面', icon: 'paper-clip', component: 'IndependentSheetList', key: 'independent' },
+      { title: '自定义页面', icon: 'fork', component: 'CustomSheetList', key: 'custom' }
+    ]
+    return {
+      activeKey: panes[0].key,
+      panes
+    }
+  },
+  beforeRouteEnter(to, from, next) {
+    // Get post id from query
+    const activeKey = to.query.activeKey
+    next(vm => {
+      if (activeKey) {
+        vm.activeKey = activeKey
+      }
+    })
+  },
+  watch: {
+    activeKey: {
+      handler: function(newVal, oldVal) {
+        if (newVal) {
+          const path = this.$router.history.current.path
+          this.$router.push({ path, query: { activeKey: newVal } }).catch(err => err)
+        }
+      }
+    }
+  },
   components: {
     IndependentSheetList,
     CustomSheetList

diff --git a/src/views/sheet/components/SheetSettingDrawer.vue b/src/views/sheet/components/SheetSettingDrawer.vue
@@ -203,12 +203,12 @@
         v-if="saveDraftButton"
         style="marginRight: 8px"
         @click="handleDraftClick"
-        :disabled="saving"
+        :loading="draftSaving"
       >保存草稿</a-button>
       <a-button
         type="primary"
         @click="handlePublishClick"
-        :disabled="saving"
+        :loading="saving"
       >{{ selectedSheet.id?'保存':'发布' }}</a-button>
     </div>
   </a-drawer>
@@ -233,7 +233,8 @@ export default {
       settingLoading: true,
       selectedSheet: this.sheet,
       customTpls: [],
-      saving: false
+      saving: false,
+      draftSaving: false
     }
   },
   props: {
@@ -346,7 +347,11 @@ export default {
         return
       }
       this.selectedSheet.metas = this.selectedMetas
-      this.saving = true
+      if (this.selectedSheet.status === 'DRAFT') {
+        this.draftSaving = true
+      } else {
+        this.saving = true
+      }
       if (this.selectedSheet.id) {
         sheetApi
           .update(this.selectedSheet.id, this.selectedSheet, false)
@@ -360,10 +365,11 @@ export default {
             }
 
             this.$emit('onSaved', true)
-            this.$router.push({ name: 'SheetList' })
+            this.$router.push({ name: 'SheetList', query: { activeKey: 'custom' } })
           })
           .finally(() => {
             this.saving = false
+            this.draftSaving = false
           })
       } else {
         sheetApi
@@ -378,11 +384,12 @@ export default {
             }
 
             this.$emit('onSaved', true)
-            this.$router.push({ name: 'SheetList' })
+            this.$router.push({ name: 'SheetList', query: { activeKey: 'custom' } })
             this.selectedSheet = response.data.data
           })
           .finally(() => {
             this.saving = false
+            this.draftSaving = false
           })
       }
     },

diff --git a/src/views/system/Installation.vue b/src/views/system/Installation.vue
@@ -231,8 +231,8 @@ export default {
     this.$set(this.installation, 'url', window.location.protocol + '//' + window.location.host)
   },
   methods: {
-    handleValidateConfirmPassword(rule,value, callback){
-      if (this.installation.confirmPassword && this.installation.password !==  this.installation.confirmPassword ) {
+    handleValidateConfirmPassword(rule, value, callback) {
+      if (this.installation.confirmPassword && this.installation.password !== this.installation.confirmPassword) {
         callback('确认密码和密码不匹配')
       }
       callback()