From 76af6ed35e951d6cacdcef627b925d7621e524f0 Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Sat, 20 Apr 2019 12:09:20 +0800
Subject: [PATCH] Update global.less.

---
 src/components/global.less                    | 29 +++++++
 src/views/attachment/AttachmentList.vue       | 80 +++++--------------
 .../components/AttachmentDetailDrawer.vue     |  2 +-
 .../components/AttachmentDrawer.vue           |  4 +-
 src/views/interface/ThemeList.vue             | 26 ------
 src/views/page/PageList.vue                   | 30 +------
 src/views/system/BackupList.vue               | 29 +------
 src/views/system/OptionForm.vue               | 27 -------
 src/views/user/Profile.vue                    | 31 +------
 9 files changed, 54 insertions(+), 204 deletions(-)

diff --git a/src/components/global.less b/src/components/global.less
index eff95689..1b9e2de0 100644
--- a/src/components/global.less
+++ b/src/components/global.less
@@ -515,4 +515,33 @@ body {
     padding-bottom: 0!important;
     margin-bottom: 20px;
   }
+}
+
+.ant-list-item{
+  word-break: break-all;
+}
+
+.card-container {
+  background: #f5f5f5;
+  & > .ant-tabs-card {
+    & > .ant-tabs-content {
+      margin-top: -16px;
+      & > .ant-tabs-tabpane {
+        background: #fff;
+        padding: 16px;
+      }
+    }
+    & > .ant-tabs-bar {
+      border-color: #fff;
+      .ant-tabs-tab {
+        border: none!important;
+        margin-right: 0!important;
+        background: transparent;
+      }
+      .ant-tabs-tab-active {
+        border-color: #fff;
+        background: #fff;
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/views/attachment/AttachmentList.vue b/src/views/attachment/AttachmentList.vue
index 957b334a..61b3a8ac 100644
--- a/src/views/attachment/AttachmentList.vue
+++ b/src/views/attachment/AttachmentList.vue
@@ -1,30 +1,17 @@
 <template>
   <page-view>
-    <a-row
-      :gutter="12"
-      type="flex"
-      align="middle"
-    >
-      <a-col
-        :span="24"
-        class="search-box"
-      >
+    <a-row :gutter="12" type="flex" align="middle">
+      <a-col :span="24" class="search-box">
         <a-card :bordered="false">
           <div class="table-page-search-wrapper">
             <a-form layout="inline">
               <a-row :gutter="48">
-                <a-col
-                  :md="6"
-                  :sm="24"
-                >
+                <a-col :md="6" :sm="24">
                   <a-form-item label="关键词">
-                    <a-input v-model="queryParam.keyword" />
+                    <a-input v-model="queryParam.keyword"/>
                   </a-form-item>
                 </a-col>
-                <a-col
-                  :md="6"
-                  :sm="24"
-                >
+                <a-col :md="6" :sm="24">
                   <a-form-item label="年月份">
                     <a-select placeholder="请选择年月">
                       <a-select-option value="2019-01">2019-01</a-select-option>
@@ -33,40 +20,24 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
-                <a-col
-                  :md="6"
-                  :sm="24"
-                >
+                <a-col :md="6" :sm="24">
                   <a-form-item label="类型">
                     <a-select placeholder="请选择类型">
                       <a-select-option value="image/png">image/png</a-select-option>
                     </a-select>
                   </a-form-item>
                 </a-col>
-                <a-col
-                  :md="6"
-                  :sm="24"
-                >
+                <a-col :md="6" :sm="24">
                   <span class="table-page-search-submitButtons">
-                    <a-button
-                      type="primary"
-                      @click="loadAttachments"
-                    >查询</a-button>
-                    <a-button
-                      style="margin-left: 8px;"
-                      @click="resetParam"
-                    >重置</a-button>
+                    <a-button type="primary" @click="loadAttachments(true)">查询</a-button>
+                    <a-button style="margin-left: 8px;" @click="resetParam">重置</a-button>
                   </span>
                 </a-col>
               </a-row>
             </a-form>
           </div>
           <div class="table-operator">
-            <a-button
-              type="primary"
-              icon="plus"
-              @click="showUploadModal"
-            >上传</a-button>
+            <a-button type="primary" icon="plus" @click="showUploadModal">上传</a-button>
           </div>
         </a-card>
       </a-col>
@@ -80,11 +51,7 @@
         :sm="12"
         :xs="24"
       >
-        <a-card
-          :bodyStyle="{ padding: 0 }"
-          hoverable
-          @click="showDetailDrawer(attachment)"
-        >
+        <a-card :bodyStyle="{ padding: 0 }" hoverable @click="showDetailDrawer(attachment)">
           <div class="attach-thumb">
             <img :src="attachment.thumbPath">
           </div>
@@ -94,10 +61,7 @@
         </a-card>
       </a-col>
     </a-row>
-    <a-row
-      type="flex"
-      justify="end"
-    >
+    <a-row type="flex" justify="end">
       <a-pagination
         :total="pagination.total"
         :defaultPageSize="pagination.size"
@@ -107,19 +71,10 @@
         @showSizeChange="handlePaginationChange"
       />
     </a-row>
-    <a-modal
-      title="上传附件"
-      v-model="uploadVisible"
-      :footer="null"
-    >
-      <upload
-        name="file"
-        multiple
-        :uploadHandler="uploadHandler"
-        @success="handleUploadSuccess"
-      >
+    <a-modal title="上传附件" v-model="uploadVisible" :footer="null">
+      <upload name="file" multiple :uploadHandler="uploadHandler" @success="handleUploadSuccess">
         <p class="ant-upload-drag-icon">
-          <a-icon type="inbox" />
+          <a-icon type="inbox"/>
         </p>
         <p class="ant-upload-text">点击选择文件或将文件拖拽到此处</p>
         <p class="ant-upload-hint">支持单个或批量上传</p>
@@ -171,10 +126,13 @@ export default {
     this.loadAttachments()
   },
   methods: {
-    loadAttachments() {
+    loadAttachments(isSearch) {
       this.queryParam.page = this.pagination.page - 1
       this.queryParam.size = this.pagination.size
       this.queryParam.sort = this.pagination.sort
+      if(isSearch){
+        this.queryParam.page = 0
+      }
       attachmentApi.query(this.queryParam).then(response => {
         this.attachments = response.data.data.content
         this.pagination.total = response.data.data.total
diff --git a/src/views/attachment/components/AttachmentDetailDrawer.vue b/src/views/attachment/components/AttachmentDetailDrawer.vue
index 4f8c6c4b..ed511fd0 100644
--- a/src/views/attachment/components/AttachmentDetailDrawer.vue
+++ b/src/views/attachment/components/AttachmentDetailDrawer.vue
@@ -206,7 +206,7 @@ export default {
 }
 </script>
 
-<style>
+<style scope>
 .attach-detail-img img {
   width: 100%;
 }
diff --git a/src/views/attachment/components/AttachmentDrawer.vue b/src/views/attachment/components/AttachmentDrawer.vue
index 9bf8f2d3..3aa28dda 100644
--- a/src/views/attachment/components/AttachmentDrawer.vue
+++ b/src/views/attachment/components/AttachmentDrawer.vue
@@ -117,7 +117,7 @@ export default {
       skeletonLoading: true,
       pagination: {
         page: 1,
-        size: 14,
+        size: 20,
         sort: ''
       },
       attachments: [],
@@ -178,7 +178,7 @@ export default {
 }
 </script>
 
-<style>
+<style scope>
 .attachment-control {
   position: absolute;
   bottom: 0px;
diff --git a/src/views/interface/ThemeList.vue b/src/views/interface/ThemeList.vue
index d36f4d67..90b9ac21 100644
--- a/src/views/interface/ThemeList.vue
+++ b/src/views/interface/ThemeList.vue
@@ -394,30 +394,4 @@ export default {
   bottom: 80px;
   right: 20px;
 }
-
-.card-container {
-  background: #f5f5f5;
-}
-.card-container > .ant-tabs-card > .ant-tabs-content {
-  margin-top: -16px;
-}
-
-.card-container > .ant-tabs-card > .ant-tabs-content > .ant-tabs-tabpane {
-  background: #fff;
-  padding: 16px;
-}
-
-.card-container > .ant-tabs-card > .ant-tabs-bar {
-  border-color: #fff;
-}
-
-.card-container > .ant-tabs-card > .ant-tabs-bar .ant-tabs-tab {
-  border-color: transparent;
-  background: transparent;
-}
-
-.card-container > .ant-tabs-card > .ant-tabs-bar .ant-tabs-tab-active {
-  border-color: #fff;
-  background: #fff;
-}
 </style>
diff --git a/src/views/page/PageList.vue b/src/views/page/PageList.vue
index 644c31c0..c8d8fb44 100644
--- a/src/views/page/PageList.vue
+++ b/src/views/page/PageList.vue
@@ -107,32 +107,4 @@ export default {
     }
   }
 }
-</script>
-
-<style>
-.card-container {
-  background: #f5f5f5;
-}
-.card-container > .ant-tabs-card > .ant-tabs-content {
-  margin-top: -16px;
-}
-
-.card-container > .ant-tabs-card > .ant-tabs-content > .ant-tabs-tabpane {
-  background: #fff;
-  padding: 16px;
-}
-
-.card-container > .ant-tabs-card > .ant-tabs-bar {
-  border-color: #fff;
-}
-
-.card-container > .ant-tabs-card > .ant-tabs-bar .ant-tabs-tab {
-  border-color: transparent;
-  background: transparent;
-}
-
-.card-container > .ant-tabs-card > .ant-tabs-bar .ant-tabs-tab-active {
-  border-color: #fff;
-  background: #fff;
-}
-</style>
+</script>
\ No newline at end of file
diff --git a/src/views/system/BackupList.vue b/src/views/system/BackupList.vue
index 90388eb0..3034e706 100644
--- a/src/views/system/BackupList.vue
+++ b/src/views/system/BackupList.vue
@@ -129,31 +129,4 @@ export default {
     }
   }
 }
-</script>
-<style>
-.card-container {
-  background: #f5f5f5;
-}
-.card-container > .ant-tabs-card > .ant-tabs-content {
-  margin-top: -16px;
-}
-
-.card-container > .ant-tabs-card > .ant-tabs-content > .ant-tabs-tabpane {
-  background: #fff;
-  padding: 16px;
-}
-
-.card-container > .ant-tabs-card > .ant-tabs-bar {
-  border-color: #fff;
-}
-
-.card-container > .ant-tabs-card > .ant-tabs-bar .ant-tabs-tab {
-  border-color: transparent;
-  background: transparent;
-}
-
-.card-container > .ant-tabs-card > .ant-tabs-bar .ant-tabs-tab-active {
-  border-color: #fff;
-  background: #fff;
-}
-</style>
+</script>
\ No newline at end of file
diff --git a/src/views/system/OptionForm.vue b/src/views/system/OptionForm.vue
index f030625c..8592c42f 100644
--- a/src/views/system/OptionForm.vue
+++ b/src/views/system/OptionForm.vue
@@ -427,30 +427,3 @@ export default {
   }
 }
 </script>
-<style>
-.card-container {
-  background: #f5f5f5;
-}
-.card-container > .ant-tabs-card > .ant-tabs-content {
-  margin-top: -16px;
-}
-
-.card-container > .ant-tabs-card > .ant-tabs-content > .ant-tabs-tabpane {
-  background: #fff;
-  padding: 16px;
-}
-
-.card-container > .ant-tabs-card > .ant-tabs-bar {
-  border-color: #fff;
-}
-
-.card-container > .ant-tabs-card > .ant-tabs-bar .ant-tabs-tab {
-  border-color: transparent;
-  background: transparent;
-}
-
-.card-container > .ant-tabs-card > .ant-tabs-bar .ant-tabs-tab-active {
-  border-color: #fff;
-  background: #fff;
-}
-</style>
diff --git a/src/views/user/Profile.vue b/src/views/user/Profile.vue
index a650d72a..c4a7f572 100644
--- a/src/views/user/Profile.vue
+++ b/src/views/user/Profile.vue
@@ -209,33 +209,4 @@ export default {
     }
   }
 }
-</style>
-
-<style>
-.card-container {
-  background: #f5f5f5;
-}
-
-.card-container > .ant-tabs-card > .ant-tabs-content {
-  margin-top: -16px;
-}
-
-.card-container > .ant-tabs-card > .ant-tabs-content > .ant-tabs-tabpane {
-  background: #fff;
-  padding: 16px;
-}
-
-.card-container > .ant-tabs-card > .ant-tabs-bar {
-  border-color: #fff;
-}
-
-.card-container > .ant-tabs-card > .ant-tabs-bar .ant-tabs-tab {
-  border-color: transparent;
-  background: transparent;
-}
-
-.card-container > .ant-tabs-card > .ant-tabs-bar .ant-tabs-tab-active {
-  border-color: #fff;
-  background: #fff;
-}
-</style>
+</style>
\ No newline at end of file