release 1.1.2 (#51)

release 1.1.2 Co-authored-by: guqing <[email protected]>
halo-dev · Oct 20, 2019 · 8071875 · 8071875
2 parents 7eb901f + e6a0b55
commit 8071875
Show file tree

Hide file tree

Showing 18 changed files with 860 additions and 95 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.1.1",
+  "version": "1.1.2",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -10,11 +10,11 @@
   },
   "dependencies": {
     "animate.css": "^3.7.0",
-    "ant-design-vue": "^1.3.16",
+    "ant-design-vue": "^1.4.1",
     "axios": "^0.18.0",
     "enquire.js": "^2.1.6",
-    "filepond": "^4.6.1",
-    "filepond-plugin-image-preview": "^4.4.0",
+    "filepond": "^4.7.2",
+    "filepond-plugin-image-preview": "^4.5.0",
     "halo-editor": "^2.7.6",
     "marked": "^0.6.3",
     "moment": "^2.24.0",
@@ -26,7 +26,7 @@
     "vue-count-to": "^1.0.13",
     "vue-filepond": "^5.1.3",
     "vue-ls": "^3.2.1",
-    "vue-router": "^3.1.2",
+    "vue-router": "^3.1.3",
     "vue-video-player": "^5.0.2",
     "vuejs-logger": "^1.5.3",
     "vuex": "^3.1.1"

diff --git a/src/core/lazy_lib/components_use.js b/src/core/lazy_lib/components_use.js
@@ -47,7 +47,8 @@ import {
   Comment,
   ConfigProvider,
   Timeline,
-  Steps
+  Steps,
+  Empty
 } from 'ant-design-vue'
 
 Vue.use(Anchor)
@@ -96,6 +97,7 @@ Vue.use(Comment)
 Vue.use(ConfigProvider)
 Vue.use(Timeline)
 Vue.use(Steps)
+Vue.use(Empty)
 
 Vue.prototype.$message = message
 Vue.prototype.$notification = notification

diff --git a/src/views/attachment/components/AttachmentDrawer.vue b/src/views/attachment/components/AttachmentDrawer.vue
@@ -30,7 +30,9 @@
           :paragraph="{ rows: 18 }"
         >
           <a-col :span="24">
+            <a-empty v-if="formattedDatas.length==0"/>
             <div
+              v-else
               class="attach-item"
               v-for="(item, index) in formattedDatas"
               :key="index"

diff --git a/src/views/attachment/components/AttachmentSelectDrawer.vue b/src/views/attachment/components/AttachmentSelectDrawer.vue
@@ -28,7 +28,9 @@
           :paragraph="{ rows: 18 }"
         >
           <a-col :span="24">
+            <a-empty v-if="attachments.length==0"/>
             <div
+              v-else
               class="attach-item"
               v-for="(item, index) in attachments"
               :key="index"

diff --git a/src/views/comment/components/CommentTab.vue b/src/views/comment/components/CommentTab.vue
@@ -54,7 +54,7 @@
       </div>
 
       <div class="table-operator">
-        <a-dropdown v-show="queryParam.status!=null && queryParam.status!=''">
+        <a-dropdown v-show="queryParam.status!=null && queryParam.status!='' && !isMobile()">
           <a-menu slot="overlay">
             <a-menu-item
               key="1"
@@ -97,7 +97,141 @@
         </a-dropdown>
       </div>
       <div style="margin-top:15px">
+        <!-- Mobile -->
+        <a-list
+          v-if="isMobile()"
+          itemLayout="vertical"
+          size="large"
+          :pagination="false"
+          :dataSource="formattedComments"
+          :loading="loading"
+        >
+          <a-list-item
+            slot="renderItem"
+            slot-scope="item, index"
+            :key="index"
+          >
+            <template slot="actions">
+              <a-dropdown
+                placement="topLeft"
+                :trigger="['click']"
+              >
+                <span>
+                  <a-icon type="bars" />
+                </span>
+                <a-menu slot="overlay">
+                  <a-menu-item v-if="item.status === 'AUDITING'">
+                    <a
+                      href="javascript:;"
+                      @click="handleEditStatusClick(item.id,'PUBLISHED')"
+                    >通过</a>
+                  </a-menu-item>
+                  <a-menu-item v-if="item.status === 'AUDITING'">
+                    <a
+                      href="javascript:;"
+                      @click="handleReplyAndPassClick(item)"
+                    >通过并回复</a>
+                  </a-menu-item>
+                  <a-menu-item v-else-if="item.status === 'PUBLISHED'">
+                    <a
+                      href="javascript:;"
+                      @click="handleReplyClick(item)"
+                    >回复</a>
+                  </a-menu-item>
+                  <a-menu-item v-else-if="item.status === 'RECYCLE'">
+                    <a-popconfirm
+                      :title="'你确定要还原该评论？'"
+                      @confirm="handleEditStatusClick(item.id,'PUBLISHED')"
+                      okText="确定"
+                      cancelText="取消"
+                    >
+                      <a href="javascript:;">还原</a>
+                    </a-popconfirm>
+                  </a-menu-item>
+                  <a-menu-item v-if="item.status === 'PUBLISHED' || item.status === 'AUDITING'">
+                    <a-popconfirm
+                      :title="'你确定要将该评论移到回收站？'"
+                      @confirm="handleEditStatusClick(item.id,'RECYCLE')"
+                      okText="确定"
+                      cancelText="取消"
+                    >
+                      <a href="javascript:;">回收站</a>
+                    </a-popconfirm>
+                  </a-menu-item>
+                  <a-menu-item v-else-if="item.status === 'RECYCLE'">
+                    <a-popconfirm
+                      :title="'你确定要永久删除该评论？'"
+                      @confirm="handleDeleteClick(item.id)"
+                      okText="确定"
+                      cancelText="取消"
+                    >
+                      <a href="javascript:;">删除</a>
+                    </a-popconfirm>
+                  </a-menu-item>
+                </a-menu>
+              </a-dropdown>
+            </template>
+            <template slot="extra">
+              <span>
+                <a-badge
+                  :status="item.statusProperty.status"
+                  :text="item.statusProperty.text"
+                />
+              </span>
+            </template>
+            <a-list-item-meta>
+              <template slot="description">
+                发表在
+                <a
+                  v-if="type==='posts'"
+                  :href="options.blog_url+'/archives/'+item.post.url"
+                  target="_blank"
+                >《{{ item.post.title }}》</a>
+                <a
+                  v-if="type === 'sheets'"
+                  :href="options.blog_url+'/s/'+item.sheet.url"
+                  target="_blank"
+                >《{{ item.sheet.title }}》</a>
+              </template>
+              <a-avatar
+                slot="avatar"
+                size="large"
+                :src="'//cn.gravatar.com/avatar/' + item.gravatarMd5 + '&d=mm'"
+              />
+              <span
+                slot="title"
+                style="max-width: 300px;display: block;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+                v-if="item.authorUrl"
+              >
+                <a-icon
+                  type="user"
+                  v-if="item.isAdmin"
+                  style="margin-right: 3px;"
+                />&nbsp;
+                <a
+                  :href="item.authorUrl"
+                  target="_blank"
+                >{{ item.author }}</a>
+                &nbsp;<small style="color:rgba(0, 0, 0, 0.45)">{{ item.createTime | timeAgo }}</small>
+              </span>
+              <span
+                slot="title"
+                style="max-width: 300px;display: block;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+                v-else
+              >
+                <a-icon
+                  type="user"
+                  v-if="item.isAdmin"
+                  style="margin-right: 3px;"
+                />&nbsp;{{ item.author }}&nbsp;<small style="color:rgba(0, 0, 0, 0.45)">{{ item.createTime | timeAgo }}</small>
+              </span>
+            </a-list-item-meta>
+            <p v-html="item.content"></p>
+          </a-list-item>
+        </a-list>
+        <!-- Desktop -->
         <a-table
+          v-else
           :rowKey="comment => comment.id"
           :rowSelection="{
             onChange: onSelectionChange,
@@ -157,7 +291,14 @@
           <span
             slot="createTime"
             slot-scope="createTime"
-          >{{ createTime | timeAgo }}</span>
+          >
+            <a-tooltip placement="top">
+              <template slot="title">
+                {{ createTime | moment }}
+              </template>
+              {{ createTime | timeAgo }}
+            </a-tooltip>
+          </span>
           <span
             slot="action"
             slot-scope="text, record"
@@ -281,6 +422,7 @@
   </div>
 </template>
 <script>
+import { mixin, mixinDevice } from '@/utils/mixin.js'
 import { mapGetters } from 'vuex'
 import CommentDetail from './CommentDetail'
 import marked from 'marked'
@@ -361,6 +503,7 @@ const sheetColumns = [
 ]
 export default {
   name: 'CommentTab',
+  mixins: [mixin, mixinDevice],
   components: {
     CommentDetail
   },

diff --git a/src/views/interface/MenuList.vue b/src/views/interface/MenuList.vue
@@ -103,7 +103,70 @@
           title="所有菜单"
           :bodyStyle="{ padding: '16px' }"
         >
+          <!-- Mobile -->
+          <a-list
+            v-if="isMobile()"
+            itemLayout="vertical"
+            size="large"
+            :pagination="false"
+            :dataSource="menus"
+            :loading="loading"
+          >
+            <a-list-item
+              slot="renderItem"
+              slot-scope="item, index"
+              :key="index"
+            >
+              <template slot="actions">
+                <a-dropdown
+                  placement="topLeft"
+                  :trigger="['click']"
+                >
+                  <span>
+                    <a-icon type="bars" />
+                  </span>
+                  <a-menu slot="overlay">
+                    <a-menu-item>
+                      <a
+                        href="javascript:;"
+                        @click="handleEditMenu(item)"
+                      >编辑</a>
+                    </a-menu-item>
+                    <a-menu-item>
+                      <a-popconfirm
+                        :title="'你确定要删除【' + item.name + '】菜单？'"
+                        @confirm="handleDeleteMenu(item.id)"
+                        okText="确定"
+                        cancelText="取消"
+                      >
+                        <a href="javascript:;">删除</a>
+                      </a-popconfirm>
+                    </a-menu-item>
+
+                  </a-menu>
+                </a-dropdown>
+              </template>
+              <template slot="extra">
+                <span>
+                  {{ item.team }}
+                </span>
+              </template>
+              <a-list-item-meta>
+                <template slot="description">
+                  {{ item.url }}
+                </template>
+                <span
+                  slot="title"
+                  style="max-width: 300px;display: block;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+                >
+                  {{ item.name }}
+                </span>
+              </a-list-item-meta>
+            </a-list-item>
+          </a-list>
+          <!-- Desktop -->
           <a-table
+            v-else
             :columns="columns"
             :dataSource="menus"
             :loading="loading"
@@ -141,6 +204,7 @@
 </template>
 
 <script>
+import { mixin, mixinDevice } from '@/utils/mixin.js'
 import MenuSelectTree from './components/MenuSelectTree'
 import menuApi from '@/api/menu'
 const columns = [
@@ -169,6 +233,7 @@ const columns = [
 ]
 export default {
   components: { MenuSelectTree },
+  mixins: [mixin, mixinDevice],
   data() {
     return {
       formType: 'create',

diff --git a/src/views/interface/components/ThemeSetting.vue b/src/views/interface/components/ThemeSetting.vue
@@ -317,7 +317,8 @@ export default {
       this.attachmentDrawerVisible = true
     },
     handleSelectAttachment(data) {
-      this.themeSettings[this.selectedField] = encodeURI(data.path)
+      this.$set(this.themeSettings, this.selectedField, encodeURI(data.path))
+      // this.themeSettings[this.selectedField] = encodeURI(data.path)
       this.attachmentDrawerVisible = false
     },
     toggleViewMode() {