From 64c7346603ac6952e26c6c3ced34dc8a7555ddcb Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 28 Jun 2018 20:46:39 +0800
Subject: [PATCH] no message

Former-commit-id: c7dc167009c58183dfdb325e0ce4fde690e0daa7 [formerly c7dc167009c58183dfdb325e0ce4fde690e0daa7 [formerly c7dc167009c58183dfdb325e0ce4fde690e0daa7 [formerly c7dc167009c58183dfdb325e0ce4fde690e0daa7 [formerly 1fae0e34da1cb4b2a6fe0492e0ea1eeeaeead4d2 [formerly b024e0873cfbf09063238cedbe5e5e3ee904673b]]]]]
Former-commit-id: 43da131f0ef3a91d54e8d72f4488a91b5b30658d
Former-commit-id: fca886adb6bdb7e61314c716c0b12001409cc2fa
Former-commit-id: 8b0b40064df45b1b5cf2bf87a908f913dff2c4e0 [formerly e55e8b77cbce48f9a97837d7b5c8e55ff007a1bd]
Former-commit-id: 0e670837449c2f64ba5d26a5f76464032da2c047
Former-commit-id: 1bc5c979b1880f31ef5233375f16b85a0a114fda
Former-commit-id: 18ef863434c273958b9de6d32d14cd563175e347
Former-commit-id: 8eeab13ebc8b216b94b957de9ead4ca156e6dedc
Former-commit-id: 31264327150c3bbcde467c8477e4bf594030cc46
---
 src/assets/style/theme/d2/setting.scss             | 6 +++---
 src/assets/style/theme/line/setting.scss           | 6 +++---
 src/assets/style/theme/star/setting.scss           | 6 +++---
 src/assets/style/theme/violet/setting.scss         | 6 +++---
 src/pages/demo/components/bigdata-table/select.vue | 8 --------
 5 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/assets/style/theme/d2/setting.scss b/src/assets/style/theme/d2/setting.scss
index 02ad7570..7c654fd6 100644
--- a/src/assets/style/theme/d2/setting.scss
+++ b/src/assets/style/theme/d2/setting.scss
@@ -7,15 +7,15 @@ $theme-bg-mask: rgba(#000, 0);
 
 // container组件
 $theme-container-background-color: rgba(#FFF, 1);
-$theme-container-header-footer-background-color: #F7FAFC;
+$theme-container-header-footer-background-color: #FFF;
 $theme-container-border-inner: 1px solid #cfd7e5;
 $theme-container-border-outer: 1px solid #cfd7e5;
 $theme-multiple-page-control-color: $color-text-normal;
 $theme-multiple-page-control-color-active: #2f74ff;
 $theme-multiple-page-control-border-color: #cfd7e5;
-$theme-multiple-page-control-border-color-active: #F7FAFC;
+$theme-multiple-page-control-border-color-active: #FFF;
 $theme-multiple-page-control-background-color: #cfd7e5;
-$theme-multiple-page-control-background-color-active: #F7FAFC;
+$theme-multiple-page-control-background-color-active: #FFF;
 
 // 顶栏和侧边栏中展开的菜单 hover 状态下
 $theme-menu-item-color-hover: #293849;
diff --git a/src/assets/style/theme/line/setting.scss b/src/assets/style/theme/line/setting.scss
index b8bf8a74..257d25fc 100644
--- a/src/assets/style/theme/line/setting.scss
+++ b/src/assets/style/theme/line/setting.scss
@@ -7,15 +7,15 @@ $theme-bg-mask: rgba(#000, 0);
 
 // container组件
 $theme-container-background-color: rgba(#FFF, .8);
-$theme-container-header-footer-background-color: #F7FAFC;
+$theme-container-header-footer-background-color: #FFF;
 $theme-container-border-inner: 1px solid $color-border-2;
 $theme-container-border-outer: 1px solid $color-border-1;
 $theme-multiple-page-control-color: #FFF;
 $theme-multiple-page-control-color-active: $color-text-normal;
 $theme-multiple-page-control-border-color: #cfd7e5;
-$theme-multiple-page-control-border-color-active: #F7FAFC;
+$theme-multiple-page-control-border-color-active: #FFF;
 $theme-multiple-page-control-background-color: #cfd7e5;
-$theme-multiple-page-control-background-color-active: #F7FAFC;
+$theme-multiple-page-control-background-color-active: #FFF;
 
 // 顶栏和侧边栏中展开的菜单 hover 状态下
 $theme-menu-item-color-hover: #293849;
diff --git a/src/assets/style/theme/star/setting.scss b/src/assets/style/theme/star/setting.scss
index ee55c2b9..59e4ef67 100644
--- a/src/assets/style/theme/star/setting.scss
+++ b/src/assets/style/theme/star/setting.scss
@@ -7,15 +7,15 @@ $theme-bg-mask: rgba(#000, .3);
 
 // container组件
 $theme-container-background-color: rgba(#FFF, .9);
-$theme-container-header-footer-background-color: #F7FAFC;
+$theme-container-header-footer-background-color: #FFF;
 $theme-container-border-inner: 1px solid #114450;
 $theme-container-border-outer: 1px solid #114450;
 $theme-multiple-page-control-color: #FFF;
 $theme-multiple-page-control-color-active: $color-text-normal;
 $theme-multiple-page-control-border-color: #114450;
-$theme-multiple-page-control-border-color-active: #F7FAFC;
+$theme-multiple-page-control-border-color-active: #FFF;
 $theme-multiple-page-control-background-color: rgba(#FFF, .5);
-$theme-multiple-page-control-background-color-active: #F7FAFC;
+$theme-multiple-page-control-background-color-active: #FFF;
 
 // 顶栏和侧边栏中展开的菜单 hover 状态下
 $theme-menu-item-color-hover: #293849;
diff --git a/src/assets/style/theme/violet/setting.scss b/src/assets/style/theme/violet/setting.scss
index 99b79a95..26634b96 100644
--- a/src/assets/style/theme/violet/setting.scss
+++ b/src/assets/style/theme/violet/setting.scss
@@ -7,15 +7,15 @@ $theme-bg-mask: rgba(#000, 0);
 
 // container组件
 $theme-container-background-color: #FFF;
-$theme-container-header-footer-background-color: #F7FAFC;
+$theme-container-header-footer-background-color: #FFF;
 $theme-container-border-inner: 1px solid $color-border-2;
 $theme-container-border-outer: 1px solid #8C40E2;
 $theme-multiple-page-control-color: #FFF;
 $theme-multiple-page-control-color-active: $color-text-normal;
 $theme-multiple-page-control-border-color: #8C40E2;
-$theme-multiple-page-control-border-color-active: #F7FAFC;
+$theme-multiple-page-control-border-color-active: #FFF;
 $theme-multiple-page-control-background-color: rgba(#FFF, .3);
-$theme-multiple-page-control-background-color-active: #F7FAFC;
+$theme-multiple-page-control-background-color-active: #FFF;
 
 // 顶栏和侧边栏中展开的菜单 hover 状态下
 $theme-menu-item-color-hover: #293849;
diff --git a/src/pages/demo/components/bigdata-table/select.vue b/src/pages/demo/components/bigdata-table/select.vue
index 5b4fab85..aeba4a30 100644
--- a/src/pages/demo/components/bigdata-table/select.vue
+++ b/src/pages/demo/components/bigdata-table/select.vue
@@ -37,11 +37,6 @@ export default {
       defaultSort: {1: 'down'}
     }
   },
-  watch: {
-    tableDataHandled (res) {
-      // res
-    }
-  },
   methods: {
     indexRender (h, index) {
       return h('input', {
@@ -70,9 +65,6 @@ export default {
       }
       this.tableDataHandled = dataArr
       this.tableDataSelected = dataArr.map(e => false)
-    },
-    changeDefaultSort () {
-      this.defaultSort = {2: 'up'}
     }
   },
   mounted () {