Merge pull request #32 from 1962247851/dev

Dev
OrdinaryRoad-Project · Jul 27, 2023 · 89bc2e4 · 89bc2e4
2 parents f8b716e + 4d51d97
commit 89bc2e4
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 16 deletions.
diff --git a/ordinaryroad-blog-quarkus/pom.xml b/ordinaryroad-blog-quarkus/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>tech.ordinaryroad.quarkus</groupId>
         <artifactId>ordinaryroad-blog</artifactId>
-        <version>0.0.10</version>
+        <version>0.0.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ordinaryroad-blog-ui/components/or/blog/article/Detail.vue b/ordinaryroad-blog-ui/components/or/blog/article/Detail.vue
@@ -342,6 +342,9 @@
     >
       <v-card flat class="pt-1">
         <!-- 摘要 -->
+        <div v-if="blogArticle.summary" v-show="false">
+          {{ blogArticle.summary }}
+        </div>
         <div v-if="blogArticle.summary && blogArticle.summary !== ''">
           <or-md-vditor
             class="my-2"
@@ -362,7 +365,8 @@
             <v-chip
               small
               label
-              @click="onClickType(blogArticle.type)"
+              target="_blank"
+              :href="`/${blogArticle.user.uid}/type/${blogArticle.type.uuid}`"
             >
               {{ blogArticle.type.name }}
             </v-chip>
@@ -382,8 +386,8 @@
                 :key="tag.uuid"
                 small
                 :class="index!==blogArticle.tags.length-1?'me-2':null"
-                @click="onClickTag(tag)"
-                @keypress.enter="onClickTag(tag)"
+                target="_blank"
+                :href="`/search/${tag.name}`"
               >
                 {{ tag.name }}
               </v-chip>
@@ -410,6 +414,9 @@
 
         <!-- 内容 -->
         <div v-if="!articleVditorFinished" class="ma-5">
+          <div v-show="false">
+            {{ blogArticle.content }}
+          </div>
           <v-skeleton-loader
             v-for="i in skeletonLoaderCount"
             :key="i"
@@ -1055,12 +1062,6 @@ export default {
         this.$router.push('/')
       }
     },
-    onClickType (type) {
-      window.open(`/${this.blogArticle.user.uid}/type/${type.uuid}`, '_blank')
-    },
-    onClickTag (tag) {
-      window.open(`/search/${tag.name}`, '_blank')
-    },
     onClickReply ({
       originalComment,
       parentComment

diff --git a/ordinaryroad-blog-ui/components/or/blog/article/Item.vue b/ordinaryroad-blog-ui/components/or/blog/article/Item.vue
@@ -68,14 +68,14 @@
                 {{ $dayjs(item.createdTime).fromNow() }}
               </span>
               <!-- 浏览量uv -->
-              <span v-if="false" class="d-inline-flex align-center">
+              <span v-if="false" class="d-inline-flex align-center me-3">
                 <v-icon left small>
                   mdi-account-eye
                 </v-icon>
                 <span>{{ item.uv }}</span>
               </span>
               <!-- 浏览量pv -->
-              <span class="d-inline-flex align-center">
+              <span class="d-inline-flex align-center me-3">
                 <v-icon left small>
                   mdi-eye
                 </v-icon>

diff --git a/ordinaryroad-blog-ui/components/or/blog/friend/link/List.vue b/ordinaryroad-blog-ui/components/or/blog/friend/link/List.vue
@@ -100,12 +100,12 @@ export default {
     }
   },
   mounted () {
+  },
+  created () {
     this.friendLinkPageItems = this.presetItems
     this.loadMoreOptions.noMoreData = this.presetItems.current === this.presetItems.pages
     this.unshiftApplyItem()
   },
-  created () {
-  },
   methods: {
     unshiftApplyItem () {
       if (!this.friendLinkPageItems.records.length || this.friendLinkPageItems.records[0].TYPE !== 'APPLY') {

diff --git a/ordinaryroad-blog-ui/package.json b/ordinaryroad-blog-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ordinaryroad-blog-ui",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "private": true,
   "config": {
     "nuxt": {

diff --git a/pom.xml b/pom.xml
@@ -35,7 +35,7 @@
     <packaging>pom</packaging>
 
     <artifactId>ordinaryroad-blog</artifactId>
-    <version>0.0.10</version>
+    <version>0.0.11</version>
     <description>OrdinaryRoad Blog</description>
 
     <modules>