From 11551bd77deafdab8a6fd6ecaac76584341f57f3 Mon Sep 17 00:00:00 2001
From: enilu <zhangtao54@gmail.com>
Date: Tue, 28 Apr 2020 22:25:39 +0800
Subject: [PATCH] =?UTF-8?q?Issue=20echarts=E9=9A=8F=E7=9D=80=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=E7=BC=A9=E6=94=BE=E8=87=AA=E9=80=82=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/other/changeLog.md                          |  7 ++++++-
 flash-vue-admin/package.json                     |  1 +
 flash-vue-admin/src/views/dashboard/dashboard.js | 14 +++++++++++++-
 flash-vue-admin/src/views/dashboard/index.vue    |  8 ++++----
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/docs/other/changeLog.md b/docs/other/changeLog.md
index 4531d2b8..2a244a6a 100644
--- a/docs/other/changeLog.md
+++ b/docs/other/changeLog.md
@@ -1,6 +1,9 @@
 # change log
 
-## latest
+
+## 1.5
+[gitee](https://gitee.com/enilu/web-flash/releases/1.5)
+[github](https://github.com/enilu/web-flash/releases/tag/1.5)
 ### Issues 
 - Issue 压缩svg图标文件
 - Issue 完善权限管理
@@ -12,11 +15,13 @@
 - Issue BaseRepository封装根据sql查询数据返回Map或List方法
 - Issue BaseRepository封装根据sql查询返回指定对象（列表）方法
 - Change BaseRepository 去掉根据sql查询返回Object数组的方法 
+- Issue echarts随着窗口缩放自适应
 
 ### Fixes
 - Fix 业务日志中如果获取不到字段值对应的中文名称则返回字段名本身，代替之前的null
 - Fix 超级管理员判断错误
 - Fix SearchFilter构建查询条件中的问题 bug
+- Fix 更新缓存的时候连带更新常量工具类中使用的本地(TimeCacheMap)缓存
 
 ## 1.4
 [gitee](https://gitee.com/enilu/web-flash/releases/1.4)
diff --git a/flash-vue-admin/package.json b/flash-vue-admin/package.json
index 8ca72b25..d975ce3c 100644
--- a/flash-vue-admin/package.json
+++ b/flash-vue-admin/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "axios": "0.18.0",
     "element-ui": "2.11.0",
+    "element-resize-detector": "^1.2.1",
     "js-cookie": "2.2.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/flash-vue-admin/src/views/dashboard/dashboard.js b/flash-vue-admin/src/views/dashboard/dashboard.js
index 31577ad6..84c4ed66 100644
--- a/flash-vue-admin/src/views/dashboard/dashboard.js
+++ b/flash-vue-admin/src/views/dashboard/dashboard.js
@@ -17,7 +17,7 @@ import 'echarts/lib/component/visualMap'
 import 'echarts/lib/component/dataset'
 import 'echarts/map/js/world'
 import 'zrender/lib/svg/svg'
-
+import elementResizeDetectorMaker from "element-resize-detector"
 export default {
 
   name: 'dashboard',
@@ -174,6 +174,18 @@ export default {
   created() {
     this.fetchData()
   },
+  mounted(){
+    //绑定echart图表跟随窗口大小自动缩放
+    let that = this
+    let erd = elementResizeDetectorMaker()
+    erd.listenTo(document.getElementById("dashboard"),(element)=>{
+      that.$nextTick(()=>{
+        that.$refs.lineChart.resize()
+        that.$refs.barChart.resize()
+        that.$refs.pieChart.resize()
+      })
+    })
+  },
   methods: {
     fetchData() {
       this.listLoading = true
diff --git a/flash-vue-admin/src/views/dashboard/index.vue b/flash-vue-admin/src/views/dashboard/index.vue
index 8558b889..d0dd826e 100644
--- a/flash-vue-admin/src/views/dashboard/index.vue
+++ b/flash-vue-admin/src/views/dashboard/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="dashboard-container">
+  <div class="dashboard-container" id="dashboard">
     <div class="dashboard-text">欢迎光临:{{name}} </div>
 
     <el-row :gutter="20">
@@ -54,7 +54,7 @@
     <el-row>
       <el-col :span="24">
         <div class="chart section">
-        <v-chart :options="lineData"/>
+        <v-chart :options="lineData" ref="lineChart"/>
         </div>
       </el-col>
     </el-row>
@@ -87,13 +87,13 @@
       </el-col>
 
       <el-col :span="12">
-        <v-chart :options="barData" class="chart section"/>
+        <v-chart :options="barData" class="chart section" ref="barChart"/>
       </el-col>
     </el-row>
 
     <el-row :gutter="20" >
       <el-col :span="12">
-        <v-chart :options="pieData" class="chart section"/>
+        <v-chart :options="pieData" class="chart section" ref="pieChart"/>
       </el-col>
       <el-col :span="12">
         <el-table :data="tableData" class="section">