chore: upgrade dependencies. (halo-dev#237)

JohnNiang · Aug 30, 2020 · 121776d · 121776d
1 parent eeed76a
commit 121776d
Show file tree

Hide file tree

Showing 21 changed files with 435 additions and 371 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "test:unit": "vue-cli-service test:unit"
   },
   "dependencies": {
-    "ant-design-vue": "^1.6.4",
+    "ant-design-vue": "^1.6.5",
     "axios": "^0.19.2",
     "enquire.js": "^2.1.6",
     "filepond": "^4.19.2",

diff --git a/src/components/Attachment/AttachmentSelectDrawer.vue b/src/components/Attachment/AttachmentSelectDrawer.vue
@@ -57,16 +57,17 @@
       </div>
       <a-divider class="divider-transparent" />
       <div class="bottom-control">
-        <a-button
-          type="dashed"
-          class="mr-2"
-          v-if="isChooseAvatar"
-          @click="handleSelectGravatar"
-        >使用 Gravatar</a-button>
-        <a-button
-          @click="handleShowUploadModal"
-          type="primary"
-        >上传附件</a-button>
+        <a-space>
+          <a-button
+            type="dashed"
+            v-if="isChooseAvatar"
+            @click="handleSelectGravatar"
+          >使用 Gravatar</a-button>
+          <a-button
+            @click="handleShowUploadModal"
+            type="primary"
+          >上传附件</a-button>
+        </a-space>
       </div>
     </a-drawer>
 

diff --git a/src/core/lazy_lib/components_use.js b/src/core/lazy_lib/components_use.js
@@ -49,7 +49,8 @@ import {
   Timeline,
   Steps,
   Empty,
-  Result
+  Result,
+  Space
 } from 'ant-design-vue'
 
 Vue.use(Anchor)
@@ -100,6 +101,7 @@ Vue.use(Timeline)
 Vue.use(Steps)
 Vue.use(Empty)
 Vue.use(Result)
+Vue.use(Space)
 
 Vue.prototype.$message = message
 Vue.prototype.$notification = notification

diff --git a/src/views/attachment/AttachmentList.vue b/src/views/attachment/AttachmentList.vue
@@ -74,12 +74,13 @@
                   :sm="24"
                 >
                   <span class="table-page-search-submitButtons">
-                    <a-button
-                      type="primary"
-                      class="mr-2"
-                      @click="handleQuery()"
-                    >查询</a-button>
-                    <a-button @click="handleResetParam()">重置</a-button>
+                    <a-space>
+                      <a-button
+                        type="primary"
+                        @click="handleQuery()"
+                      >查询</a-button>
+                      <a-button @click="handleResetParam()">重置</a-button>
+                    </a-space>
                   </span>
                 </a-col>
               </a-row>

diff --git a/src/views/attachment/components/AttachmentDetailDrawer.vue b/src/views/attachment/components/AttachmentDetailDrawer.vue
@@ -126,34 +126,35 @@
     </a-row>
     <a-divider class="divider-transparent" />
     <div class="bottom-control">
-      <a-popconfirm
-        title="你确定要添加到图库？"
-        @confirm="handleAddToPhoto"
-        okText="确定"
-        cancelText="取消"
-        v-if="addToPhoto"
-      >
-        <a-button
-          type="dashed"
-          class="mr-2"
-        >添加到图库</a-button>
-      </a-popconfirm>
-      <a-popconfirm
-        title="你确定要删除该附件？"
-        @confirm="handleDeleteAttachment"
-        okText="确定"
-        cancelText="取消"
-      >
-        <ReactiveButton
-          type="danger"
-          @callback="handleDeletedCallback"
-          :loading="deleting"
-          :errored="deleteErrored"
-          text="删除"
-          loadedText="删除成功"
-          erroredText="删除失败"
-        ></ReactiveButton>
-      </a-popconfirm>
+      <a-space>
+        <a-popconfirm
+          title="你确定要添加到图库？"
+          @confirm="handleAddToPhoto"
+          okText="确定"
+          cancelText="取消"
+          v-if="addToPhoto"
+        >
+          <a-button
+            type="dashed"
+          >添加到图库</a-button>
+        </a-popconfirm>
+        <a-popconfirm
+          title="你确定要删除该附件？"
+          @confirm="handleDeleteAttachment"
+          okText="确定"
+          cancelText="取消"
+        >
+          <ReactiveButton
+            type="danger"
+            @callback="handleDeletedCallback"
+            :loading="deleting"
+            :errored="deleteErrored"
+            text="删除"
+            loadedText="删除成功"
+            erroredText="删除失败"
+          ></ReactiveButton>
+        </a-popconfirm>
+      </a-space>
     </div>
   </a-drawer>
 </template>

diff --git a/src/views/comment/components/CommentDetail.vue b/src/views/comment/components/CommentDetail.vue
@@ -98,25 +98,25 @@
     </a-row>
     <a-divider class="divider-transparent" />
     <div class="bottom-control">
-      <a-button
-        type="dashed"
-        class="mr-2"
-        @click="handleEditComment"
-        v-if="!editable"
-      >编辑</a-button>
-      <a-button
-        type="primary"
-        class="mr-2"
-        @click="handleUpdateComment"
-        v-if="editable"
-      >保存</a-button>
-      <a-popconfirm
-        title="你确定要将此评论者加入黑名单？"
-        okText="确定"
-        cancelText="取消"
-      >
-        <a-button type="danger">加入黑名单</a-button>
-      </a-popconfirm>
+      <a-space>
+        <a-button
+          type="dashed"
+          @click="handleEditComment"
+          v-if="!editable"
+        >编辑</a-button>
+        <a-button
+          type="primary"
+          @click="handleUpdateComment"
+          v-if="editable"
+        >保存</a-button>
+        <a-popconfirm
+          title="你确定要将此评论者加入黑名单？"
+          okText="确定"
+          cancelText="取消"
+        >
+          <a-button type="danger">加入黑名单</a-button>
+        </a-popconfirm>
+      </a-space>
     </div>
   </a-drawer>
 </template>

diff --git a/src/views/comment/components/CommentTab.vue b/src/views/comment/components/CommentTab.vue
@@ -43,12 +43,13 @@
               :sm="24"
             >
               <span class="table-page-search-submitButtons">
-                <a-button
-                  type="primary"
-                  class="mr-2"
-                  @click="handleQuery()"
-                >查询</a-button>
-                <a-button @click="handleResetParam()">重置</a-button>
+                <a-space>
+                  <a-button
+                    type="primary"
+                    @click="handleQuery()"
+                  >查询</a-button>
+                  <a-button @click="handleResetParam()">重置</a-button>
+                </a-space>
               </span>
             </a-col>
           </a-row>

diff --git a/src/views/interface/components/ThemeSettingDrawer.vue b/src/views/interface/components/ThemeSettingDrawer.vue
@@ -207,29 +207,29 @@
       v-if="themeConfigurations.length>0"
       class="w-full"
     >
-      <a-button
-        v-if="!this.isMobile() && theme.activated && viewMode"
-        type="primary"
-        @click="toggleViewMode"
-        class="mr-2"
-        ghost
-      >普通模式</a-button>
-      <a-button
-        v-else-if="!this.isMobile() && theme.activated && !viewMode"
-        type="dashed"
-        @click="toggleViewMode"
-        class="mr-2"
-      >预览模式</a-button>
-      <ReactiveButton
-        type="primary"
-        @click="handleSaveSettings"
-        @callback="saveErrored=false"
-        :loading="saving"
-        :errored="saveErrored"
-        text="保存"
-        loadedText="保存成功"
-        erroredText="保存失败"
-      ></ReactiveButton>
+      <a-space>
+        <a-button
+          v-if="!this.isMobile() && theme.activated && viewMode"
+          type="primary"
+          @click="toggleViewMode"
+          ghost
+        >普通模式</a-button>
+        <a-button
+          v-else-if="!this.isMobile() && theme.activated && !viewMode"
+          type="dashed"
+          @click="toggleViewMode"
+        >预览模式</a-button>
+        <ReactiveButton
+          type="primary"
+          @click="handleSaveSettings"
+          @callback="saveErrored=false"
+          :loading="saving"
+          :errored="saveErrored"
+          text="保存"
+          loadedText="保存成功"
+          erroredText="保存失败"
+        ></ReactiveButton>
+      </a-space>
     </footer-tool-bar>
   </a-drawer>
 </template>