release 1.0.3 (#34)

release 1.0.3 Co-authored-by: guqing <[email protected]> Co-authored-by: John Niang <[email protected]>
halo-dev · Jul 9, 2019 · 5adb443 · 5adb443
2 parents 7cbf49e + 1f48b8f
commit 5adb443
Show file tree

Hide file tree

Showing 15 changed files with 359 additions and 45 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "halo-admin",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

diff --git a/src/components/global.less b/src/components/global.less
@@ -697,4 +697,15 @@ body {
   p{
     margin-bottom: 0;
   }
+}
+
+.post-thum {
+  .img {
+    width: 100%;
+    cursor: pointer;
+    border-radius: 4px;
+  }
+  .post-thum-remove {
+    margin-top: 16px;
+  }
 }
diff --git a/src/views/attachment/components/AttachmentDetailDrawer.vue b/src/views/attachment/components/AttachmentDetailDrawer.vue
@@ -260,7 +260,7 @@ export default {
       this.editable = false
     },
     handleCopyNormalLink() {
-      const text = `${this.attachment.path}`
+      const text = `${encodeURI(this.attachment.path)}`
       this.$copyText(text)
         .then(message => {
           console.log('copy', message)
@@ -272,7 +272,7 @@ export default {
         })
     },
     handleCopyMarkdownLink() {
-      const text = `![${this.attachment.name}](${this.attachment.path})`
+      const text = `![${this.attachment.name}](${encodeURI(this.attachment.path)})`
       this.$copyText(text)
         .then(message => {
           console.log('copy', message)

diff --git a/src/views/attachment/components/AttachmentSelectDrawer.vue b/src/views/attachment/components/AttachmentSelectDrawer.vue
@@ -47,8 +47,14 @@
           @change="handlePaginationChange"
         ></a-pagination>
       </div>
-      <a-divider class="divider-transparent"/>
+      <a-divider class="divider-transparent" />
       <div class="bottom-control">
+        <a-button
+          type="dashed"
+          style="marginRight: 8px"
+          v-if="isChooseAvatar"
+          @click="handleSelectGravatar"
+        >使用 Gravatar</a-button>
         <a-button
           @click="handleShowUploadModal"
           type="primary"
@@ -103,6 +109,11 @@ export default {
       type: String,
       required: false,
       default: '选择附件'
+    },
+    isChooseAvatar: {
+      type: Boolean,
+      required: false,
+      default: false
     }
   },
   data() {
@@ -150,6 +161,9 @@ export default {
     handleSelectAttachment(item) {
       this.$emit('listenToSelect', item)
     },
+    handleSelectGravatar() {
+      this.$emit('listenToSelectGravatar')
+    },
     handlePaginationChange(page, pageSize) {
       this.pagination.page = page
       this.pagination.size = pageSize

diff --git a/src/views/comment/components/CommentTab.vue b/src/views/comment/components/CommentTab.vue
@@ -127,7 +127,7 @@
             target="_blank"
           >{{ post.title }}</a>
           <a
-            v-else
+            v-if="type === 'sheets'"
             slot="sheet"
             slot-scope="sheet"
             :href="options.blog_url+'/s/'+sheet.url"
@@ -408,7 +408,11 @@ export default {
       this.selectComment = comment
       this.replyCommentVisible = true
       this.replyComment.parentId = comment.id
-      this.replyComment.postId = comment.post.id
+      if (this.type === 'posts') {
+        this.replyComment.postId = comment.post.id
+      } else {
+        this.replyComment.postId = comment.sheet.id
+      }
     },
     handleCreateClick() {
       commentApi.create(this.type, this.replyComment).then(response => {

diff --git a/src/views/dashboard/Dashboard.vue b/src/views/dashboard/Dashboard.vue
@@ -202,24 +202,24 @@
             </a-form-item>
 
             <!-- 日志图片上传 -->
-            <a-form-item v-show="showMoreOptions">
+            <!-- <a-form-item v-show="showMoreOptions">
               <UploadPhoto
                 @success="handlerPhotoUploadSuccess"
                 :photoList="photoList"
               ></UploadPhoto>
-            </a-form-item>
+            </a-form-item> -->
 
             <a-form-item>
               <a-button
                 type="primary"
                 @click="handleCreateJournalClick"
               >保存</a-button>
-              <a
+              <!-- <a
                 href="javascript:;"
                 class="more-options-btn"
                 type="default"
                 @click="handleUploadPhotoWallClick"
-              >更多选项<a-icon type="down" /></a>
+              >更多选项<a-icon type="down" /></a> -->
             </a-form-item>
           </a-form>
         </a-card>
@@ -508,4 +508,7 @@ export default {
 		margin-left: 15px;
 		text-decoration: none;
 	}
+  a {
+    text-decoration: none;
+  }
 </style>
diff --git a/src/views/interface/ThemeList.vue b/src/views/interface/ThemeList.vue
@@ -427,9 +427,7 @@ export default {
         this.themeConfiguration = response.data.data
         themeApi.fetchSettings(theme.id).then(response => {
           this.themeSettings = response.data.data
-
           setTimeout(() => {
-            this.visible = true
             this.optionLoading = false
           }, 300)
         })

diff --git a/src/views/post/PostEdit.vue b/src/views/post/PostEdit.vue
@@ -199,7 +199,6 @@ import FooterToolBar from '@/components/FooterToolbar'
 import { mixin, mixinDevice } from '@/utils/mixin.js'
 import { toolbars } from '@/core/const'
 import 'mavon-editor/dist/css/index.css'
-import tagApi from '@/api/tag'
 import categoryApi from '@/api/category'
 import postApi from '@/api/post'
 import optionApi from '@/api/option'
@@ -226,7 +225,6 @@ export default {
       postSettingVisible: false,
       thumDrawerVisible: false,
       categoryForm: false,
-      tags: [],
       categories: [],
       selectedCategoryIds: [],
       selectedTagIds: [],
@@ -238,7 +236,6 @@ export default {
     }
   },
   created() {
-    this.loadTags()
     this.loadCategories()
     this.loadOptions()
     clearInterval(this.timer)
@@ -273,11 +270,6 @@ export default {
     })
   },
   methods: {
-    loadTags() {
-      tagApi.listAll(true).then(response => {
-        this.tags = response.data.data
-      })
-    },
     loadCategories() {
       categoryApi.listAll().then(response => {
         this.categories = response.data.data
@@ -365,15 +357,4 @@ export default {
   z-index: 1000;
   min-height: 580px;
 }
-
-.post-thum {
-  .img {
-    width: 100%;
-    cursor: pointer;
-    border-radius: 4px;
-  }
-  .post-thum-remove {
-    margin-top: 16px;
-  }
-}
 </style>