From d923bba4c5f8cd026a4356aa3307d0454dd918b1 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 27 Oct 2018 22:47:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E6=95=B4?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 1e98ad5197b1baa7e4eb268dccd1a6276a603e41 [formerly 1e98ad5197b1baa7e4eb268dccd1a6276a603e41 [formerly 1e98ad5197b1baa7e4eb268dccd1a6276a603e41 [formerly 1e98ad5197b1baa7e4eb268dccd1a6276a603e41 [formerly 68ea7ce423969c3238e8a558cf3d2433d3ea8e30 [formerly 2cba54ba481e2677b53a3270378b15d14c9a098e]]]]]
Former-commit-id: 59dcc46a2ab5d4ead29bfe4adab074dfd04601f6
Former-commit-id: 4a8b26437302f85729935871fcf232f669e2cec8
Former-commit-id: c5f45af5da2e877de7018e0c3cabb0d96bfc609c [formerly 73bacac1ad42a3c388d285a8ddb553d92d5712d9]
Former-commit-id: 41149bc0e3e9e9dbffc2925f5dfb171e3076aa80
Former-commit-id: 876d20819cca960c232b46a778b5bf46ff51f8fe
Former-commit-id: a5c11df824443e85e11fed6a8a66f8b8168200c5
Former-commit-id: 7d7e44630259a0760bf1f7f55337be4b55fc0221
Former-commit-id: 598b2cfe65d175362d9465ff671399bea4cd3c06
---
 .../components/d2-theme-list/index.vue        | 36 +++++++++++++++----
 .../components/header-theme/index.vue         | 20 ++++++++---
 2 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/src/layout/header-aside/components/header-theme/components/d2-theme-list/index.vue b/src/layout/header-aside/components/header-theme/components/d2-theme-list/index.vue
index e3d3e503..035b45bd 100644
--- a/src/layout/header-aside/components/header-theme/components/d2-theme-list/index.vue
+++ b/src/layout/header-aside/components/header-theme/components/d2-theme-list/index.vue
@@ -1,17 +1,39 @@
 <template>
-  <el-table :data="list" v-bind="table">
-    <el-table-column prop="title" align="center" width="160"/>
-    <el-table-column label="预览" width="120">
+  <el-table
+    :data="list"
+    v-bind="table">
+    <el-table-column
+      prop="title"
+      align="center"
+      width="160"/>
+    <el-table-column
+      label="预览"
+      width="120">
       <div
         slot-scope="scope"
         class="theme-preview"
-        :style="{'backgroundImage': `url(${$baseUrl}${scope.row.preview})`}">
+        :style="{
+          backgroundImage: `url(${$baseUrl}${scope.row.preview})`
+        }">
       </div>
     </el-table-column>
-    <el-table-column prop="address" align="center">
+    <el-table-column
+      prop="address"
+      align="center">
       <template slot-scope="scope">
-        <el-button v-if="activeName === scope.row.name" type="success" icon="el-icon-check" round>已激活</el-button>
-        <el-button v-else round @click="handleSelectTheme(scope.row.name)">使用</el-button>
+        <el-button
+          v-if="activeName === scope.row.name"
+          type="success"
+          icon="el-icon-check"
+          round>
+          已激活
+        </el-button>
+        <el-button
+          v-else
+          round
+          @click="handleSelectTheme(scope.row.name)">
+          使用
+        </el-button>
       </template>
     </el-table-column>
   </el-table>
diff --git a/src/layout/header-aside/components/header-theme/index.vue b/src/layout/header-aside/components/header-theme/index.vue
index 7b344188..1b54686a 100644
--- a/src/layout/header-aside/components/header-theme/index.vue
+++ b/src/layout/header-aside/components/header-theme/index.vue
@@ -1,11 +1,23 @@
 <template>
   <div>
-    <el-tooltip effect="dark" content="主题" placement="bottom">
-      <el-button class="d2-ml-0 d2-mr btn-text can-hover" type="text" @click="dialogVisible = true">
-        <d2-icon name="diamond" style="font-size: 16px"/>
+    <el-tooltip
+      effect="dark"
+      content="主题"
+      placement="bottom">
+      <el-button
+        class="d2-ml-0 d2-mr btn-text can-hover"
+        type="text"
+        @click="dialogVisible = true">
+        <d2-icon
+          name="diamond"
+          style="font-size: 16px"/>
       </el-button>
     </el-tooltip>
-    <el-dialog title="主题" width="600px" :visible.sync="dialogVisible" :append-to-body="true">
+    <el-dialog
+      title="主题"
+      width="600px"
+      :visible.sync="dialogVisible"
+      :append-to-body="true">
       <d2-theme-list style="margin-top: -25px;"/>
     </el-dialog>
   </div>