From a6ac1c6c6d5b694198f2e9a3660a5261d63cd02a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=B1=7E=E6=B5=B7=7E=E7=88=B1=E6=B5=B7=E7=88=B1?=
 =?UTF-8?q?=E6=B5=B7=7E=E5=8F=B3?= <1828712314@qq.com>
Date: Mon, 10 Mar 2025 14:28:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/cs-dict-tag/index.vue              |     4 +-
 components/cs-text-more/index.vue             |    19 +-
 config.js                                     |     4 +-
 pages.json                                    |    15 +-
 pages/enterprise.vue                          |   174 +-
 pages/index.vue                               |   207 +-
 pages/owner.vue                               |    51 +-
 pages/task.vue                                |   136 +-
 static/favicon.png                            |   Bin 21949 -> 21936 bytes
 static/images/owner/bill.png                  |   Bin 0 -> 762 bytes
 static/images/owner/message-grey.png          |   Bin 0 -> 1049 bytes
 static/images/owner/policy.png                |   Bin 0 -> 990 bytes
 static/images/tabbers/home-select.png         |   Bin 496 -> 792 bytes
 static/images/tabbers/home.png                |   Bin 701 -> 1130 bytes
 static/images/tabbers/logo.png                |   Bin 0 -> 3315 bytes
 static/images/tabbers/position-select.png     |   Bin 600 -> 1046 bytes
 static/images/tabbers/position.png            |   Bin 873 -> 1567 bytes
 static/images/tabbers/task-select.png         |   Bin 553 -> 1028 bytes
 static/images/tabbers/task.png                |   Bin 774 -> 1451 bytes
 static/images/tabbers/user-select.png         |   Bin 464 -> 777 bytes
 static/images/tabbers/user.png                |   Bin 671 -> 1234 bytes
 static/scss/global.scss                       |    24 +
 static/scss/index.scss                        |     4 +
 sub/enterprise/detail.vue                     |    72 +-
 sub/inspection/detail.vue                     |    59 +-
 sub/inspection/record.vue                     |     3 +-
 sub/owner/notic.vue                           |   242 +
 sub/owner/notice-detail.vue                   |     0
 sub/owner/policy-detail.vue                   |    38 +-
 sub/owner/policy.vue                          |   118 +-
 sub/task/detail.vue                           |   206 +-
 sub/task/enforce.vue                          |    33 +-
 sub/task/locate.vue                           |     2 +-
 sub/task/record.vue                           |   166 +-
 .../qiun-data-charts/qiun-data-charts.vue     |  1125 +-
 .../js_sdk/u-charts/config-echarts.js         |     4 +-
 .../js_sdk/u-charts/config-ucharts.js         |   595 +-
 .../js_sdk/u-charts/u-charts.js               | 14675 ++++++++--------
 .../js_sdk/u-charts/u-charts.min.js           |  7542 +++++++-
 uni_modules/s-components/s-header/index.vue   |    51 +-
 uni_modules/s-components/s-tabber/index.vue   |    17 +-
 .../components/u-count-to/u-count-to.vue      |   330 +-
 .../uview-ui/components/u-upload/u-upload.vue |  1079 +-
 utils/request.js                              |     1 -
 wxcomponents/vant/dropdown-item/index.wxss    |    33 +-
 wxcomponents/vant/dropdown-menu/index.wxml    |     1 +
 wxcomponents/vant/dropdown-menu/index.wxs     |     7 +-
 wxcomponents/vant/dropdown-menu/index.wxss    |     8 +-
 48 files changed, 17665 insertions(+), 9380 deletions(-)
 create mode 100644 static/images/owner/bill.png
 create mode 100644 static/images/owner/message-grey.png
 create mode 100644 static/images/owner/policy.png
 create mode 100644 static/images/tabbers/logo.png
 create mode 100644 sub/owner/notic.vue
 create mode 100644 sub/owner/notice-detail.vue

diff --git a/components/cs-dict-tag/index.vue b/components/cs-dict-tag/index.vue
index be22cb7..a2395dc 100644
--- a/components/cs-dict-tag/index.vue
+++ b/components/cs-dict-tag/index.vue
@@ -97,9 +97,9 @@ export default {
   color: #99a1b7;
 }
 .dict-tag {
-  min-width: 200rpx;
+  min-width: 212rpx;
   text-align: center;
   font-size: 24rpx;
-  padding: 16rpx 40rpx;
+  padding: 4rpx 40rpx;
 }
 </style>
diff --git a/components/cs-text-more/index.vue b/components/cs-text-more/index.vue
index dd3c272..123414c 100644
--- a/components/cs-text-more/index.vue
+++ b/components/cs-text-more/index.vue
@@ -1,11 +1,10 @@
 <template>
-  <view :style="{ color }">
+  <view :style="{ color: color }">
     <view
       style="
-        font-size: 26rpx;
+        font-size: 28rpx;
         line-height: 160%;
         position: relative;
-        transform: 0.2s all;
         color: inherit;
         white-space: normal;
       "
@@ -16,17 +15,16 @@
     <view
       v-else
       style="
-        font-size: 26rpx;
+        font-size: 28rpx;
         line-height: 160%;
         position: relative;
-        transform: 0.2s all;
         color: inherit;
         white-space: normal;
       "
-      @tap="isShowAllText = !isShowAllText"
+      @tap.native.stop="isShowAllText = !isShowAllText"
     >
-      {{ isShowAllText ? value : `${value.slice(1, splitLength)}...` }}
-      <text style="color: #17c653; padding-left: 4px">
+      {{ isShowAllText ? value : `${value.slice(0, splitLength)}...` }}
+      <text style="color: #17c653; padding-left: 8rpx">
         {{ isShowAllText ? '收起' : '展开' }}
       </text>
     </view>
@@ -47,11 +45,12 @@ export default {
       default: '文本简介'.repeat(20)
     },
     color: {
-      type: String
+      type: String,
+      default: '#4b5675'
     },
     splitLength: {
       type: Number,
-      default: 100
+      default: 62
     }
   }
 }
diff --git a/config.js b/config.js
index 34dae4f..d098f7a 100644
--- a/config.js
+++ b/config.js
@@ -1,8 +1,8 @@
 // 应用全局配置
 module.exports = {
 	// baseUrl: 'http://188.188.5.188:48080',
-	baseUrl: 'https://hb.jzce.com',
-	// baseUrl: 'http://188.188.3.232:48080',
+	// baseUrl: 'https://hb.jzce.com',
+	baseUrl: 'http://188.188.3.232:48080',
 	// baseUrl: 'http://localhost:48080',
 	baseApi: '/admin-api',
 	imgUrl: 'https://hb.jzce.com',
diff --git a/pages.json b/pages.json
index 1782f90..829e7d8 100644
--- a/pages.json
+++ b/pages.json
@@ -3,13 +3,15 @@
 			"path": "pages/login",
 			"style": {
 				"navigationBarTitleText": "登录",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"disableScroll": true
 			}
 		}, {
 			"path": "pages/index",
 			"style": {
 				"navigationBarTitleText": "首页",
 				"navigationStyle": "custom",
+				"disableScroll": true,
 				"usingComponents": {
 					"van-dropdown-menu": "/wxcomponents/vant/dropdown-menu/index",
 					"van-dropdown-item": "/wxcomponents/vant/dropdown-item/index"
@@ -21,6 +23,7 @@
 			"style": {
 				"navigationBarTitleText": "企业",
 				"navigationStyle": "custom",
+				"disableScroll": true,
 				"usingComponents": {
 					"van-dropdown-menu": "/wxcomponents/vant/dropdown-menu/index",
 					"van-dropdown-item": "/wxcomponents/vant/dropdown-item/index",
@@ -40,6 +43,7 @@
 			"style": {
 				"navigationBarTitleText": "任务",
 				"navigationStyle": "custom",
+				"disableScroll": true,
 				"usingComponents": {
 					"van-dropdown-menu": "/wxcomponents/vant/dropdown-menu/index",
 					"van-dropdown-item": "/wxcomponents/vant/dropdown-item/index",
@@ -117,7 +121,7 @@
 					"componentPlaceholder": {}
 				}
 			},
-		
+
 			{
 				"path": "enterprise/edit",
 				"style": {
@@ -250,6 +254,13 @@
 				"style": {
 					"navigationBarTitleText": ""
 				}
+			},
+			{
+				"path": "owner/notic",
+				"style": {
+					"navigationBarTitleText": "消息通知",
+					"disableScroll": true
+				}
 			}
 		]
 	}],
diff --git a/pages/enterprise.vue b/pages/enterprise.vue
index 17d9761..2372504 100644
--- a/pages/enterprise.vue
+++ b/pages/enterprise.vue
@@ -9,44 +9,47 @@
         id="sreach"
         @change="handleSearch"
       />
-      <van-dropdown-menu safe-area-tab-bar active-color="#17C653">
-        <van-dropdown-item
-          :value="queryParams.region"
-          :options="getDropdownOption('enterprises_area')"
-          @change="
-            v => {
-              querySelect(v, 'region')
-            }
-          "
-        />
-        <van-dropdown-item
-          :value="queryParams.hy"
-          :options="getDropdownOption('hy')"
-          @change="
-            v => {
-              querySelect(v, 'hy')
-            }
-          "
-        />
-        <van-dropdown-item
-          :value="queryParams.st"
-          :options="getDropdownOption('st')"
-          @change="
-            v => {
-              querySelect(v, 'st')
-            }
-          "
-        />
-        <van-dropdown-item
-          :value="queryParams.wr"
-          :options="getDropdownOption('wr')"
-          @change="
-            v => {
-              querySelect(v, 'wr')
-            }
-          "
-        />
-      </van-dropdown-menu>
+      <view class="drop-box">
+        <van-dropdown-menu active-color="#17C653">
+          <van-dropdown-item
+            :value="queryParams.region"
+            :options="getDropdownOption('enterprises_area')"
+            @change="
+              v => {
+                querySelect(v, 'region')
+              }
+            "
+          />
+          <van-dropdown-item
+            :value="queryParams.hy"
+            :options="getDropdownOption('hy')"
+            @change="
+              v => {
+                querySelect(v, 'hy')
+              }
+            "
+          />
+          <van-dropdown-item
+            :value="queryParams.st"
+            :options="getDropdownOption('st')"
+            @change="
+              v => {
+                querySelect(v, 'st')
+              }
+            "
+          />
+          <van-dropdown-item
+            :value="queryParams.wr"
+            :options="getDropdownOption('wr')"
+            @change="
+              v => {
+                querySelect(v, 'wr')
+              }
+            "
+          />
+        </van-dropdown-menu>
+      </view>
+
       <scroll-view
         scroll-y="true"
         :refresher-enabled="true"
@@ -68,11 +71,24 @@
             shape="square"
             size="64"
           ></u-avatar>
-          <view class="wd-flex wd-flex-col" style="gap: 4px">
-            <text class="wd-font-800 wd-text-15">
+          <view class="wd-flex wd-flex-col">
+            <text
+              class="wd-font-800 wd-text-15"
+              style="
+                padding-right: 3rem;
+                margin-bottom: 4rpx;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+                width: 432rpx;
+                overflow: hidden;
+              "
+            >
               {{ enterprise.enterprisesName }}
             </text>
-            <view class="wd-flex wd-pb-8px">
+            <view
+              class="wd-flex"
+              style="margin-bottom: 16rpx; margin-top: 4rpx"
+            >
               <u-icon name="map" size="14" color="#17C653"></u-icon>
               <text class="address wd-text-12" style="margin-left: 4px">
                 {{ enterprise.address }}
@@ -206,35 +222,37 @@ export default {
     getDropdownOption(key) {
       if (!this.dictMap[key]) return []
       const keyMap = {
-        enterprises_area: '区域',
-        hy: '行业',
-        st: '生态',
-        wr: '污染'
+        enterprises_area: '按区域',
+        hy: '按行业',
+        st: '按生态',
+        wr: '按污染'
       }
       if (['enterprises_area'].includes(key)) {
         return [
+          {
+            value: '',
+            text: keyMap[key]
+          },
           ...this.dictMap[key].map(i => {
             return {
               value: i.value,
               text: i.label
             }
-          }),
-          {
-            value: '',
-            text: keyMap[key]
-          }
+          })
         ]
       }
-      const data = this.dictMap[key].map(d => {
-        return {
-          value: d.id,
-          text: d.tagName
-        }
-      })
-      data.push({
-        value: '',
-        text: keyMap[key]
-      })
+      const data = [
+        {
+          value: '',
+          text: keyMap[key]
+        },
+        ...this.dictMap[key].map(d => {
+          return {
+            value: d.id,
+            text: d.tagName
+          }
+        })
+      ]
       return data
     },
     querySelect(v, key) {
@@ -328,26 +346,14 @@ export default {
   font-size: 24rpx;
   .address {
     color: $uni-text-color-grey;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    width: 448rpx;
+    overflow: hidden;
   }
   &:active {
     background-color: $cs-color-touch;
   }
-  .tagList {
-    margin-top: 16rpx;
-    display: flex;
-    gap: 8rpx;
-    color: $uni-text-color-grey;
-    flex-flow: row wrap;
-    .tag {
-      font-size: 24rpx;
-      display: flex;
-      padding: 4rpx 12rpx;
-      justify-content: center;
-      align-items: center;
-      border-radius: 4rpx;
-      background: #f9f9f9;
-    }
-  }
   .audit {
     position: absolute;
     right: -38rpx;
@@ -359,13 +365,17 @@ export default {
     text-align: center;
   }
 }
-::v-deep .van-dropdown-menu {
-  box-shadow: none;
-  height: 70rpx;
-  font-size: 26rpx;
-  border-bottom: 1px solid #f1f1f4;
+.drop-box {
+  padding: 24rpx;
+  border-bottom: 2rpx solid #f1f1f4;
+  background-color: #fff;
+  ::v-deep .van-dropdown-menu {
+    box-shadow: none;
+    height: fit-content !important;
+    font-size: 26rpx;
+    padding: 12rpx 24rpx;
+  }
 }
-
 ::v-deep .u-list {
   padding: 24rpx;
 }
diff --git a/pages/index.vue b/pages/index.vue
index 7106d9a..d918329 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,33 +1,35 @@
 <template>
-  <cs-page :selected="0" title="智慧生态" isTab>
+  <cs-page :selected="0" isTab title="智慧环保">
     <view class="view-container">
-      <van-dropdown-menu safe-area-tab-bar active-color="#17C653">
-        <van-dropdown-item
-          :value="queryParams.deptId"
-          :options="dropOption.dept"
-          use-before-toggle
-          @before-toggle="dorpToggle"
-          @change="
-            v => {
-              querySelect(v, 'deptId')
-            }
-          "
-        />
-        <van-dropdown-item
-          :value="queryParams.selectWeek"
-          :options="dropOption.select_week"
-          @change="
-            v => {
-              querySelect(v, 'selectWeek')
-            }
-          "
-        />
-      </van-dropdown-menu>
+      <view class="drop-box">
+        <van-dropdown-menu active-color="#17C653">
+          <van-dropdown-item
+            :value="queryParams.deptId"
+            :options="dropOption.dept"
+            title="按部门"
+            @change="
+              v => {
+                querySelect(v, 'deptId')
+              }
+            "
+          ></van-dropdown-item>
+          <van-dropdown-item
+            :value="queryParams.selectWeek"
+            :options="dropOption.select_week"
+            title="按周期"
+            @change="
+              v => {
+                querySelect(v, 'selectWeek')
+              }
+            "
+          />
+        </van-dropdown-menu>
+      </view>
       <scroll-view
         :scroll-y="true"
         :style="{ maxHeight: `${viewHeigth}px` }"
-        class="view"
         :refresher-enabled="true"
+        class="view"
         @refresherrefresh="refresherrefresh"
         :refresher-triggered="refresherTriggered"
         @refresherpulling="refresherpulling"
@@ -39,43 +41,43 @@
           >
             <view
               class="wd-flex wd-flex-col wd-flex-center"
-              style="gap: 4px"
+              style="gap: 8rpx"
             >
               <u-count-to
                 :start-val="0"
                 :end-val="detail.taskCount"
-                bold
                 font-size="24"
+                blod="500"
                 color="#071437"
                 class="number"
               ></u-count-to>
-              <view class="">任务数量</view>
+              <view style="color: #4b5675">任务数量</view>
             </view>
             <view
               class="wd-flex wd-flex-col wd-flex-center"
-              style="gap: 4px"
+              style="gap: 8rpx"
             >
               <u-count-to
                 :start-val="0"
                 :end-val="detail.inspectionsCount"
-                bold
                 font-size="24"
+                blod="500"
                 color="#071437"
               ></u-count-to>
-              <view class="">执法记录</view>
+              <view style="color: #4b5675">执法记录</view>
             </view>
             <view
               class="wd-flex wd-flex-col wd-flex-center"
-              style="gap: 4px"
+              style="gap: 8rpx"
             >
               <u-count-to
                 :start-val="0"
                 :end-val="detail.enterpriseCount"
-                bold
                 font-size="24"
+                blod="500"
                 color="#071437"
               ></u-count-to>
-              <view class="">企业数量</view>
+              <view style="color: #4b5675">企业数量</view>
             </view>
           </view>
           <qiun-data-charts
@@ -117,7 +119,6 @@
                   <u-count-to
                     :start-val="0"
                     :end-val="Number(item.value)"
-                    bold
                     font-size="16"
                     color="#071437"
                   ></u-count-to>
@@ -130,13 +131,13 @@
         <view class="box row-1">
           <view
             class="wd-flex"
-            style="margin-top: 12px; justify-content: center"
+            style="margin-top: 24rpx; justify-content: center"
           >
             <view
               style="
                 background-color: #f9f9f9;
                 display: inline-flex;
-                padding: 4px;
+                padding: 8rpx;
               "
             >
               <view
@@ -158,7 +159,7 @@
                         ? '#071437'
                         : '#78829d',
                     fontWeight:
-                      queryParams.type == item.type ? '800' : 'normal'
+                      queryParams.type == item.type ? 'bold' : '400'
                   }"
                 >
                   {{ item.name }}
@@ -166,15 +167,15 @@
               </view>
             </view>
           </view>
-          <view style="min-height: 220px">
+          <view style="min-height: 440rpx">
             <view
               v-for="(item, index) in list"
               :key="index"
               class="wd-flex"
-              style="justify-content: space-between; padding: 12px"
+              style="justify-content: space-between; padding: 24rpx"
             >
-              <view class="wd-font-800">{{ item.name }}</view>
-              <view class="wd-font-800" style="color: #17c653">
+              <view class="wd-font-500">{{ item.name }}</view>
+              <view class="wd-font-500" style="color: #17c653">
                 <view>
                   <u-count-to
                     :start-val="0"
@@ -202,7 +203,7 @@ export default {
     return {
       dictMap: {},
       queryParams: {
-        selectWeek: '',
+        selectWeek: '3',
         deptId: '',
         type: 1
       },
@@ -212,7 +213,7 @@ export default {
       viewHeigth: 0,
       tabs: [
         {
-          name: '资质逾期',
+          name: '资质临期',
           type: 1
         },
         {
@@ -223,7 +224,7 @@ export default {
       refresherTriggered: false,
       list: [],
       dropOption: {},
-      color: ['#1B84FF', '#7239EA', '#F6B100', '#F8285A', '#17C653']
+      color: []
     }
   },
   onLoad: async function () {
@@ -231,11 +232,11 @@ export default {
     uni.hideTabBar({
       animation: false
     })
-    this.getDict()
+    await this.getDict()
     if (!this.$roles.checkRole(['director'])) {
       this.queryParams.deptId = this.$store.getters.deptId
     }
-    this.init()
+    await this.init()
   },
   onReady() {
     this.$nextTick(() => {
@@ -250,39 +251,55 @@ export default {
       const query = uni.createSelectorQuery().in(this)
       query
         .select('.view-container')
-        .boundingClientRect(data => {
-          this.viewHeigth = data.height - 35 - 25
+        .boundingClientRect()
+        .select('.drop-box')
+        .boundingClientRect()
+        .select('.cs-tabber-container')
+        .boundingClientRect()
+        .exec(res => {
+          this.viewHeigth = res[0].height - res[1].height
         })
-        .exec()
     },
     async getDict() {
       const dict = await getDictBatchByType({
         type: ['select_week'].join(',')
       })
       const dept = await getDeptTree()
-      this.dropOption.dept = [
-        ...dept.data.map(i => {
-          return {
-            value: i.id,
-            text: i.name
+      if (!this.$roles.checkRole(['director'])) {
+        this.dropOption.dept = [
+          ...dept.data
+            .filter(i => {
+              return i.id == this.$store.getters.deptId
+            })
+            .map(i => {
+              return {
+                value: i.id,
+                text: i.name
+              }
+            })
+        ]
+      } else {
+        this.dropOption.dept = [
+          ...dept.data.map(i => {
+            return {
+              value: i.id,
+              text: i.name
+            }
+          }),
+          {
+            value: '',
+            text: '全部'
           }
-        }),
-        {
-          value: '',
-          text: '全部'
-        }
-      ]
+        ]
+      }
+
       this.dropOption.select_week = [
         ...dict.data.select_week.map(i => {
           return {
             value: i.value,
             text: i.label
           }
-        }),
-        {
-          value: '',
-          text: '全部'
-        }
+        })
       ]
     },
     async init() {
@@ -305,6 +322,7 @@ export default {
         colorMap.push(color)
         return res
       })
+      colorMap.push('#F9F9F9')
       this.color = colorMap
       this.detail.legendData = data
       this.setPieData(data, this.detail.taskCompletionRate)
@@ -322,10 +340,9 @@ export default {
         }
       })
       if (Number(max) < 100) {
-        pieData.push({
+        pieData.splice(pieData.length, 0, {
           name: '',
-          value: 100 - Number(max),
-          color: '#F9F9F9'
+          value: 100 - Number(max)
         })
       }
       this.opts = {
@@ -341,9 +358,7 @@ export default {
         title: {
           name: `${max}%`,
           fontSize: 24,
-          color: '#071437',
-          fontWeight: 'bold',
-          fontFamily: 'Tahoma'
+          color: '#071437'
         },
         subtitle: {
           name: '完成率',
@@ -366,7 +381,7 @@ export default {
       this.chartData = {
         series: [
           {
-            data: pieData
+            data: [...pieData]
           }
         ]
       }
@@ -394,13 +409,7 @@ export default {
     refresherrefresh() {
       this.init()
     },
-    dorpToggle(e) {
-      if (!this.$roles.checkRole(['director'])) {
-        e.detail.callback(false)
-      } else {
-        e.detail.callback(true)
-      }
-    },
+
     numFilter(value) {
       // 先保留三位小数
       let tempVal = parseFloat(value).toFixed(3)
@@ -420,33 +429,24 @@ export default {
 .view-container {
   height: 100%;
 }
-.number {
-  font-family: 'Tahoma';
-}
 
-::v-deep .u-count-num {
-  font-family: 'Tahoma';
-}
 .view {
-  padding: 0 24rpx;
-  padding-bottom: 24rpx;
-  display: flex;
-  gap: 24rpx;
-  flex-flow: column nowrap;
+  padding: 0 24rpx 48rpx;
+
   .box {
     padding: 24rpx;
     background-color: #fff;
     border: 2rpx solid #f9f9f9;
     border-radius: 24rpx;
-    margin-top: 24rpx;
-    &:last-child {
-      margin-bottom: 24rpx;
-    }
   }
   .row-1 {
     display: flex;
     flex-flow: column nowrap;
     gap: 24rpx;
+    margin-top: 24rpx;
+    &:last-child {
+      margin-bottom: 84rpx;
+    }
   }
   .people-name {
     max-width: 4rem;
@@ -454,10 +454,11 @@ export default {
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;
+    color: #4b5675;
   }
   .tab {
     position: relative;
-    padding: 16rpx 32rpx;
+    padding: 8rpx 32rpx;
     .name {
       z-index: 2;
       position: inherit;
@@ -474,10 +475,18 @@ export default {
     }
   }
 }
-::v-deep .van-dropdown-menu {
-  box-shadow: none;
-  height: 70rpx !important;
-  font-size: 26rpx;
+.drop-box {
+  padding: 24rpx;
   border-bottom: 2rpx solid #f1f1f4;
+  background-color: #fff;
+  ::v-deep .van-dropdown-menu {
+    box-shadow: none;
+    height: fit-content !important;
+    font-size: 26rpx;
+    padding: 8rpx 24rpx;
+  }
+  ::v-deep .van-dropdown-item {
+    margin-bottom: 64rpx;
+  }
 }
 </style>
diff --git a/pages/owner.vue b/pages/owner.vue
index ae6b02a..d3d9189 100644
--- a/pages/owner.vue
+++ b/pages/owner.vue
@@ -26,13 +26,16 @@
           <u-icon name="arrow-right"></u-icon>
         </view>
       </view>
-      <view class="section wd-flex wd-flex-row wd-justify-between">
-        <view class="wd-flex wd-flex-row" style="gap: 8px">
+      <view
+        class="section wd-flex wd-flex-row wd-justify-between"
+        @click="openSubMessage"
+      >
+        <view class="wd-flex wd-flex-row" style="gap: 16rpx">
           <u--image
             src="/static/images/owner/message.png"
-            width="20px"
-            height="20px"
-            mode="aspectFit"
+            width="40rpx"
+            height="40rpx"
+            mode="aspectFill"
           ></u--image>
           <text class="wd-font-800">消息通知</text>
         </view>
@@ -48,7 +51,6 @@
         <view
           class="wd-flex wd-flex-row wd-items-center"
           style="gap: 16rpx"
-          @click="openSubMessage"
         >
           <text></text>
           <u-icon name="arrow-right"></u-icon>
@@ -81,9 +83,9 @@
         <view class="wd-flex wd-flex-row" style="gap: 16rpx">
           <u--image
             src="/static/images/owner/list.png"
-            width="20px"
-            height="20px"
-            mode="aspectFit"
+            width="40rpx"
+            height="40rpx"
+            mode="aspectFill"
           ></u--image>
           <text class="wd-font-800">政策法规</text>
         </view>
@@ -108,9 +110,9 @@
         <view class="wd-flex wd-flex-row" style="gap: 16rpx">
           <u--image
             src="/static/images/owner/edit.png"
-            width="20px"
-            height="20px"
-            mode="aspectFit"
+            width="40rpx"
+            height="40rpx"
+            mode="aspectFill"
           ></u--image>
           <text class="wd-font-800">企业入驻</text>
         </view>
@@ -128,9 +130,9 @@
         <view class="wd-flex wd-flex-row" style="gap: 16rpx">
           <u--image
             src="/static/images/owner/phone.png"
-            width="20px"
-            height="20px"
-            mode="aspectFit"
+            width="40rpx"
+            height="40rpx"
+            mode="aspectFill"
           ></u--image>
           <text class="wd-font-800">内部专线</text>
         </view>
@@ -148,10 +150,10 @@
       >
         <view class="wd-flex wd-flex-row" style="gap: 16rpx">
           <u--image
-            src="/static/images/owner/edit.png"
-            width="20px"
-            height="20px"
-            mode="aspectFit"
+            src="/static/images/owner/bill.png"
+            width="40rpx"
+            height="40rpx"
+            mode="aspectFill"
           ></u--image>
           <text class="wd-font-800">工作汇报</text>
         </view>
@@ -215,8 +217,10 @@ export default {
       uni.requestSubscribeMessage({
         //此处填写刚才申请模板的模板ID
         tmplIds: ['E8RK91cPLMios6ZHoKx6FJOV4H2kodx6yPWYp7jpLJY'],
-        success(res) {
-          console.log('requestSubscribeMessage', res)
+        complete(res) {
+          uni.navigateTo({
+            url: '/sub/owner/notic'
+          })
         }
       })
     },
@@ -225,13 +229,12 @@ export default {
         url: '/sub/owner/edit'
       })
     },
-  
+
     invite() {
       this.share = {
         title: '邀请企业入驻', // 标题
         path: `/pages/login?inviteId=${this.$store.getters.userId}`,
-        imageUrl:
-          'https://hb.jzce.com/fx_qyrz.png'
+        imageUrl: 'https://hb.jzce.com/fx_qyrz.png'
       }
     },
     callPhone() {
diff --git a/pages/task.vue b/pages/task.vue
index c8adccf..4fa77a1 100644
--- a/pages/task.vue
+++ b/pages/task.vue
@@ -1,44 +1,38 @@
 <template>
   <cs-page :selected="1" title="执法任务" isTab>
     <view class="page-container page">
-      <van-dropdown-menu safe-area-tab-bar active-color="#17C653">
-        <van-dropdown-item
-          :value="queryParams.status"
-          :options="getDropdownOption('task_state')"
-          @change="
-            v => {
-              querySelect(v, 'status')
-            }
-          "
-        />
-        <van-dropdown-item
-          :value="queryParams.priority"
-          :options="getDropdownOption('task_priority')"
-          @change="
-            v => {
-              querySelect(v, 'priority')
-            }
-          "
-        />
-        <van-dropdown-item
-          :value="queryParams.zf_lx"
-          :options="getDropdownOption('zf_lx')"
-          @change="
-            v => {
-              querySelect(v, 'zf_lx')
-            }
-          "
-        />
-        <van-dropdown-item
-          :value="queryParams.select_week"
-          :options="getDropdownOption('select_week')"
-          @change="
-            v => {
-              querySelect(v, 'select_week')
-            }
-          "
-        />
-      </van-dropdown-menu>
+      <view class="drop-box">
+        <van-dropdown-menu active-color="#17C653">
+          <van-dropdown-item
+            :value="queryParams.status"
+            :options="getDropdownOption('task_state')"
+            @change="
+              v => {
+                querySelect(v, 'status')
+              }
+            "
+          />
+          <van-dropdown-item
+            :value="queryParams.zf_lx"
+            :options="getDropdownOption('zf_lx')"
+            @change="
+              v => {
+                querySelect(v, 'zf_lx')
+              }
+            "
+          />
+          <van-dropdown-item
+            :value="queryParams.select_week"
+            :options="getDropdownOption('select_week')"
+            @change="
+              v => {
+                querySelect(v, 'select_week')
+              }
+            "
+          />
+        </van-dropdown-menu>
+      </view>
+
       <scroll-view
         scroll-y="true"
         :refresher-enabled="true"
@@ -72,19 +66,27 @@
                   fontSize="16"
                   bold
                   duration="1000"
+                  color="#071437"
                 ></u-count-to>
-                %
+                <text style="color: #071437; font-size: 24rpx">%</text>
               </template>
             </van-circle>
           </view>
-          <view class="wd-flex wd-flex-col" style="gap: 8rpx">
+          <view class="wd-flex wd-flex-col">
             <text
-              class="wd-font-800 wd-text-15 wd-pb-2px"
-              style="padding-right: 3rem"
+              class="wd-font-800 wd-text-15"
+              style="
+                padding-right: 3rem;
+                margin-bottom: 4rpx;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+                width: 432rpx;
+                overflow: hidden;
+              "
             >
               {{ task.title }}
             </text>
-            <view class="wd-flex wd-pb-8px">
+            <view class="wd-flex" style="margin-top: 4rpx">
               <u-icon
                 name="calendar"
                 size="18"
@@ -92,7 +94,7 @@
               ></u-icon>
               <text
                 class="address wd-text-12"
-                style="margin-left: 8rpx"
+                style="margin-left: 4rpx"
                 :style="{
                   color: task.status == '2' ? '#17C653' : '#78829D'
                 }"
@@ -102,7 +104,7 @@
                 }}结束
               </text>
             </view>
-            <view class="tagList">
+            <view class="tagList" style="margin-top: 16rpx">
               <view class="tag" v-if="task.deptName">
                 {{ task.deptName }}
               </view>
@@ -223,28 +225,28 @@ export default {
       const keyMap = {
         task_priority: '按等级',
         zf_lx: '按类型',
-        task_state: '按状态',
+        task_state: '按发布',
         select_week: '按周期'
       }
       if (['zf_lx'].includes(key)) {
         return [
+          { value: '', text: keyMap[key] },
           ...this.dictMap[key].map(d => {
             return {
               value: d.id,
               text: d.tagName
             }
-          }),
-          { value: '', text: keyMap[key] }
+          })
         ]
       } else {
         return [
+          { value: '', text: keyMap[key] },
           ...this.dictMap[key].map(d => {
             return {
               value: d.value,
               text: d.label
             }
-          }),
-          { value: '', text: keyMap[key] }
+          })
         ]
       }
     },
@@ -322,44 +324,34 @@ export default {
   position: relative;
   overflow: hidden;
   font-size: 24rpx;
+  border: 1px solid var(--LightMode-Grey-Grey-100, #f9f9f9);
   &:active {
     background-color: $cs-color-touch;
   }
   .address {
     color: $uni-text-color-grey;
   }
-  .tagList {
-    margin-top: 16rpx;
-    display: flex;
-    gap: 8rpx;
-    color: $uni-text-color-grey;
-    display: flex;
-    .tag {
-      font-size: 24rpx;
-      display: flex;
-      padding: 4rpx 12rpx;
-      justify-content: center;
-      align-items: center;
-      border-radius: 4rpx;
-      background: #f9f9f9;
-    }
-  }
   .audit {
     position: absolute;
     right: 0;
     top: 0;
     transform-origin: 50% 50%;
-    transform: translateX(28px) translateY(9px) rotateZ(45deg);
+    transform: translateX(33px) translateY(9px) rotateZ(45deg);
   }
   .rate {
     position: relative;
   }
 }
-::v-deep .van-dropdown-menu {
-  box-shadow: none;
-  height: 70rpx !important;
-  font-size: 26rpx;
-  border-bottom: 1px solid #f1f1f4;
+.drop-box {
+  padding: 24rpx;
+  border-bottom: 2rpx solid #f1f1f4;
+  background-color: #fff;
+  ::v-deep .van-dropdown-menu {
+    box-shadow: none;
+    height: fit-content !important;
+    font-size: 26rpx;
+    padding: 12rpx 24rpx;
+  }
 }
 
 ::v-deep .u-list {
diff --git a/static/favicon.png b/static/favicon.png
index b770ec6cad47895cf3542c204d1ad158a0dd5606..fdfa7cd5d0dca0cb9eea532fef8b1943fdca834c 100644
GIT binary patch
delta 20233
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
UZmhbpa{vGU07*qoM6N<$g0=S@wg3PC

delta 20140
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

diff --git a/static/images/owner/bill.png b/static/images/owner/bill.png
new file mode 100644
index 0000000000000000000000000000000000000000..678dc9d225edfd65eeb778c8fe75f7b82a25baa2
GIT binary patch
literal 762
zcmV<W0tNkvP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0*^^VK~#7F?U+q&
z+CUV?-y2A&x}s7;kh-XI1G-F5Rp$f+qDb8pPSA3KzzLuy0M^Y1Jpn`&VHs}FY%0-o
z<8A7AUf&o@QtAee4H1$2lfW}DAAiq(W<1XTG10)gne?z=z#3rfbT7U1OyJgeslnM#
zupV@O?j9FaLfrm_CaeiWV0h`Imq6Sog8Xd~iZmB#xCN2gLc$rW5Q%8AjUT2esz}m8
zA^S63^A)l@4~Y`r-O5CjU-^?ZtdPw?sVop%t{8N-$9LwRLcp363yexEFe*vS@{k#p
z4w0}7At0jmRsN)|Q%74MO04ka^a?_O1^!yGK!IgRP8mY50m&w4qAhT|bJXWcA0CK!
z6-Ol&7!~bB^0If3v!6O2Aq3(^bjEMoMHU!sfj24H;*B~7A)tgb`LeB3M}HqA{7OL2
zAp|Hz2Q<;&2lGcYzSQ7>czmnaJ#rIRD$Vi0TUaqXWz4_&p2L3x1&rLvh~>?}L8t{0
zglzA<fnpLcsQ?XprTCDPqB<*p&Z!D)V9C7rRxs&_eQ_&9)&mRtk^eGMA>bs3hKjl}
zgVG@^3H6d7kx2A-4yD~59IX4<>;89NLs=d<0&I8<u@RSeE%(NI{*5g{SxPBeg_!1~
zIj|6@I=&~g#f6OyxlyuvoHRU<lAx{|FK5p83rNuNZk7N>JbjA)8@a#&J+=n>O)foq
z#PRXH7WDZ3&wC$&&)3hKn)SMCEvg$>phDMjWvNWrr`$<yDr}*pkp#M(2DCh^rI7`C
z%v;X%+4eJ3o4mkx;4OrSy1<q$O`yWH98qmQhHn8DO9+*#-QzBVB$7advRsl~n?4o|
sPnbm6Ngy?KEnO+;i$Yp`AZCsD14^X`NPYfLK>z>%07*qoM6N<$f?=~vH2?qr

literal 0
HcmV?d00001

diff --git a/static/images/owner/message-grey.png b/static/images/owner/message-grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..08fa42a93294062fe0b6229bfc62b2da55ab38b5
GIT binary patch
literal 1049
zcmV+!1m^pRP)<h;3K|Lk000e1NJLTq001Ze001cn1^@s6N1|)U00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1FlI#K~#7F?O0t>
z8bJ{5p53)bVyegq#0NFzCGZfH@+WeF=n2FVh$j$FpgDnf0=)tFSExx9q$*WLO_g|p
zkSddyEIX6#g<bhoR#)VK&xaY7neAq}`|EE6=%I%mZUx@8Af3wv_3J=bX%GS*fff`>
zf$MxM5-HxguGJTN*^^n+v=y4p!s8+%Eo*ZoI+|+sWrKtEiT&%}KvZ+kS)@$k*K+-d
z>h-G(^LZLjh0C9?sFeJuG%atKS{{5vNiT&^$~YpvS74`4oNTk*NcFm!6FfLNT~UZh
zo=c@RU-tb@MDECuha#Ij2}z-^sY=9@QmfPBBgqB_)3nggv<v&8g2LqZ@E~*$`^RT#
zDCc{TLOtk&S~v?d?WP!{z(wdVlx3|}ra|NHv$*rzbx<f_A2FZa^t+)9bQsgo(G2Ij
z?Sl|+q25729N>Y9;tM<#l-#k0Dr$2bq~v_XBYFR$)&7HnuVKzrxF?vxm|t&M(om4D
zgN|bo<j-b1caKlv%IM1(LZt8GWcuJNOf-@s@=xz(PvY(FyD5@VX<h;>_8WhaO&3Z%
zXipHi+H+ovWRFf4bOWeLF=X4KKhF+EqoakHvEfuJ-kX{jT4#=`d<+Ur+hE>=JFtIr
zwq_xwh|kJDP|D@W=x_?!ga8j<0wp?#k+A}QW>P07x0;2V^UdZqghcrXbtS~u)Wqv`
z@Bke=g6V+RKPD-cxJ8lCIm*j0g?!ZtTyF=i13^=$urReXD7P@~26<tX<~d5>5w3%L
z3e{xoLaE}+_?zwOM{FpayNKwfnIz*&oR=JOVZPX~wA!$^EpzOCEz@<75`T+^aKj4n
zVDIR(rav-bkwG??*grfkpioPdhF`t02+~@e@fgyU4$@D(1cBjZi-g2Ns~2$b(6GMu
z>3o(%sJ)-WZN6W>%KITS^czDXbJ^@gsD42pP%O3+o=SVnfX}EYl4x|W09^)8H1ibb
zdI#MQ?;n0kfDj+r-Dq0YV(cEg<`u4kM7RlJl!3N4YRDZT0sbOb8Qr3E9Te2ING!ym
z4Iq)XF4cqht@(?gEL5euym{0msNBQ(Uc#69MMqF{O_87`Hk`QtE91;Piv_>Is)vN^
znxhq2(p8HJPa)=)v04Eiz={V^%+h%+I9ica&*a!}&BeX#6J*Ix63SL9exN?LP~rCT
zzN?1oZrcu`5~0T^DN;c@B-fHtW6iI+o=on3{ys+(;7f?<e=-HX6i*L5JSP4F2<2v2
T105YD00000NkvXXu0mjf(d6t1

literal 0
HcmV?d00001

diff --git a/static/images/owner/policy.png b/static/images/owner/policy.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdc74bd6f80642bbaabdba89c0b46ee48ac6ba69
GIT binary patch
literal 990
zcmV<410np0P)<h;3K|Lk000e1NJLTq001Ze001cn1^@s6N1|)U00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH19M44K~#7F?U+qY
z+dve@-y1_w+YO8Iu_K&-WJw}~a{}C?i|$BoP)-0j0nG^ryGkvQIYErtkR{;;?gA-<
zN@Q6Qd0yW*u^T%MNeCaR<iCW7$IN>_kKd5_KY&=VURD?$c=yB5#hlnh!i2h(BrgS_
zEm2xG8M6V8prx9T6eM)gV8hEp0Bz|wrQchoH4<>Sp4;aM2O}dBv<b)rl&7t<X~KkB
ztQw2+uY`e!J4m2&*2R%2hz?qrN^uBqsg^4U#3K&`kS=?laU(KdA69f^v6(gPsATGG
zpg==_*u4*mgPk$Twh!fCwz>7)3IMLu^Hoq!2V^74Y;*Hp($)IM1jvpq5p|xR0wsd1
zV2V3u&jVFpnx^gZM;*cs#jDRHV-cdkBReYJb-J>ya**s^^dH2!PM>6hfVI5MS8GIY
z+RB_5aF3SH^Xk6AlXnC8iORg<h$1-dCL;Ru=Z!SmDYM;=QSQy}0gf6IL)iu0!WgyE
zCno<C5a-u<^^ScA#DWi}%7j<epCpCt!A&CpGpM=w)%HLGFkDk8oRou3DLhAQ7??sc
z0eVuPgD~ibgTWeB;@V5{E4)}(&~BG&xg&m+Ym>yDgXfaKL$BafDNH;Ko?E;Lr}^_I
z1w=XTZwlT_jX4sjYyJ<Rb~F#!?l@ul#Q<+I-x>;rznzM_nNnALt;U;~N|`rSR)Q=E
zfqVDGc=8%lFp=ZDvG~_#7^CN}!6_93&Z-!2R>gp`Dh8ZYG2pEF{{THB{Sso&?An3B
zBiI0-^gM;W@-sK~l=0YdbE2}Lii-RWhJV~bvG9d`Y0qHu@qFbxf2a<be9J~jXAa3m
zxGnKexxN`ik_2wE4M;-3XOk^J7KZ@U`HanTil|%lCiEvK8Q9Q3Q{I`4H(2a{PrDuV
zxY@~Uq~H1wu#J)pd%w#t)EHv8Inv%=r7N~Kf>8loV@{MrKnA1)yPS>TSiRPVl=4`u
z?7KRz3Tah0XuoygH=+ihLNR`^+q2m6*+K}bx!G%X3@Q>ZEY+5f)K#l#M72KDlY{Gv
z(XCxVD)%>=9)2k9k{u%mtMl5iCNc680S*Iy&?QkJ-1>-AA4)^bj9Q^_dJv!|uc^fC
z7}Y3B1n=^yN+{jEmF0)DJRSvbP^;X&;|)~c_uEFU%~574R;-Zz0^9hF#R^!CBLDyZ
M07*qoM6N<$f^u=l5&!@I

literal 0
HcmV?d00001

diff --git a/static/images/tabbers/home-select.png b/static/images/tabbers/home-select.png
index 17f1424106ae4500c36e50e26e89b170f1bc264d..670686daff2435fde29596438281fbf49320788e 100644
GIT binary patch
delta 775
zcmV+i1Ni*#1DFOjiBL{Q4GJ0x0000DNk~Le0000m0000m2nGNE09OL}hX4Qo32;bR
za{vGqB>(^xB>_oNB=C_oAAbU^Nkl<ZcmeI1!E(|-7{|YFfpFy_cE*Ew1M!F*4|xI^
zI-T(*eS-E4N}t4fb4IQB1k?k1EPaFYhV>v<D9Pu3w4*fH#7%aQb>w#<OGx&g{eS=6
z4FFrV{NEs0=FxD!HTM=hf#QWc^tp`y#y~U{^Y~;E3_`GoRRPVf-G5^w?B|_BME&dC
zvlFm{6#<Q5r&0GRujSP`I_Jv~8O&$V!8905!4P8sJHwYg)o+GyXBT}a#917eT1tQc
z%`bZ$@@_7maOWBHW3O_-*8l@b3t0Lc;G-PF29yNlZ}}R{QTG^1QrJR8{jN*dx+o-|
zyx(;xUKiRHGV{AG#eeHUOMnf(>r%8XaxJtjzw4q?7nuUq?{{7D>q04j*E0(*9{vr>
z=s*Nh0ug-QeK$^imlEL4lTSk7Y!*LF+9_4URG%M$bDd|<_p0J3*{Vn(+(^M{A@DHO
zw0iJhwBG_JpZ+Zzv3Gs^g}8r0?1S?}*#iCrFp9H_SYR{;$A6(pEnGcL#puJ)-Vayu
zU&Xg)AMW)zZ6SmZ97RrODTk!z0f0+zm#bt$N&v>>a2=4w2nY<p*6ol^<%qrkTSRe6
zKsDLGNkmiuQ@Hcj?Xv^^EH@~e7O%jNWCAg%5ty{)vQ@7Bz?68!uS6kOK(!iGPh<`z
zkt%^0r2t2h=zmJps1)F45>bH>u$V;FP$Uqe6yV~TNR>d0Qh=o-di?wD=z}4u1Y)Y0
zzqn1J7L)`Ld-B~5cOFrg%>h{n#AFKKBtioL42!Vx4}{1LmCOx|Ks*IU5DSsH9LW?g
zX}>?0PwyNyjI__E$#dD4405-W2sK{Igs?Fv6e2pxJ4ho}z@+^)M63m{5fSuRzGMiN
ziI{_SiS3NKJwoWoRC%(tEhk4e(xr^8{?fu*wru$$KLOQ%5rB{2z2yJ^002ovPDHLk
FV1hG4TK50|

delta 477
zcmV<30V4jG2JizmiBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_y7O^32;bR
za{vGf6951U69E94oEVWdAAbRbNkl<Zcmds$Pfh|c6vp3sFtank8#JB(mxgHI1mMm@
zV(<od0^<qL6F4!%xPu!E{vj?MFJO8DXAR7&?J)A64usk0FPXGy`@XOJ+5!0M;3kWN
ze<sjz?h&x4D+&P0<H7JoR-WX}2I93|CZx_-c!~m$iuqC=w|lmFvVV%doi~ZdUldPv
zCd{1Z*RO3FD^DQ&T7lfXmY#0F2C!1MFwE)5yfD=u&f9f6dZGwh5Jxr`R2J`LE}}SZ
z$Nkt=JlUz)m~S)|#uM?EdW~}WGBbc9K9wi!uIW!spv7B|5jdk28;JLYFb!mci7U~x
zKhuoN#vJr7zI9W8Y<~#9N)P*{GdY2IW{?rc@cG-HMx>^L7VeVI3L}I|1_&xhD<q~a
zGk4S0X|3Lp0ke{j5u|d#k^wmR)DvvVh*m@-k36ZH&{~L56>?YwJE1Ijlg;L5XB4Uc
z6_(dk5@ORlHyg7rD6W|^P|+3aMi}L(vDQGA9s`Eaq5k`xVIE6N4Fgq@sQ(c^G&Fud
TBgLUc00000NkvXXu0mjf;_S;&

diff --git a/static/images/tabbers/home.png b/static/images/tabbers/home.png
index f52eda8e1d0d83c96c6c535daac0ca5d8789984e..3a2ff80cd665cd20e83f2f32d515a6b3adf8c052 100644
GIT binary patch
delta 1116
zcmV-i1f%=C1?mVkiBL{Q4GJ0x0000DNk~Le0000m0000m2nGNE09OL}hX4Qo32;bR
za{vGqB>(^xB>_oNB=C_oAAbY?Nkl<ZcmeHMO>)yr5PdyLx%hVB1fMto;RKi+37g~s
z#9Eoa0ysgE695ZHg^g@3kgxz!Y%nJvIRWAXctKHy!qZGUmNc>@BTF*Uf>$Mbex+_r
z_ft;~@DKHZup;>W$@&Obm-3#s6JSNCT!AD1U55y}=4#vR%os51{(qi#r-uqrnF2;|
z*9h&;3O@HhqsW-y?RlF4DnKO)Jon#ktf}#dDZ0rX{xW^c|1(npt#PXgB@{~Hh5z=^
zn$jO&3D26Jwe;v}cX!K`%LseTG#^^iT&4Jv%tc9*T7l!<*%M<EmJl@5ns>~b9i)!;
z-)=+E6C_vapu4+yh<}18q(Fwf=Q0bKs}vF|M&R?Yrkx@twX_L|y^8=d!uO5I+{hz<
zjA`jBH;ke6!!`y@?kUP)Ni4MjVzZ7?`{t4BQKQCT*V{Zm0UY<=9hkp;yKSub@qKUW
zY0g{ZS72Ft&wbyLe(^^I%Gi5el<|v&K2X-)^P-GjWUfHf_J5ui%lbvC0%`URt-Y?d
zb&9`$W&C1JfqCJpwfDS8^9wLN?RIWIw#TWNNu7l7M5k5TdtRjZg~(=PY}@13?24o4
zAshD*Frjzv?rje>!t-to&0oj(g;aOt$DxUT48k$d3cU2+Y#8A;!a9#pI6kQwW+fg?
z{1B5D+dlG7+<&kyQs5V;9hMpTbsc7t1z8CqK95^k?XVOnKo(uH#yJ{>@mPPfs%}__
z6yWI+323^PZ4w9+zhFz&NCC&tCE`{WO@l+%ty&NkA_X)kG8=-rj)sAlVuAq&QM*0p
zxPSIF3>{=k=y^LsGyuN;Vg08XeGTj8iyX<F_>hscG=JaGa?ucs@GW}#&}=(%Qh~A7
z7gomx8UltBn~&mzRjA}ZSbk7m0SQfx{5KtxgtBN;YZ}b-#i){rM0gX7`AR9jv=SBr
zkwrFwgaXwvk#?<$ixRLINJD3v&}H}#eI#5-(4uAt1I3#v9zO8yWUqk0W}*?U)b7Yh
z2ExT`|9_kUHWS&=X<b;vKms*CA!Z^4c2P4HG0?O>37d%&H6Wx|z(9gI1#Bi_Dq}(_
zuqpuxVi5yP`qL&=6%$SN*ygcCPi2xZ5D!hN{_5<QwX})CL_GZxPnl?d0x-1PLkS22
zsZhie1`?!Z=CqD?KXTrMnxNox!ZJJbIeknD%zuvOG%OnhBrEXOm6)8~D2kq&m1M|F
zEgru*J26L#+tCdeJ#!tddb2NI|DW{VzMY@COz~`{rg$j(MiU46g!wooz-r;n)B{Pb
zWf953^tz<?90$I6^KH}u{@Bt#wimHrt^<zC(3m@B_)V-F5=`m~^VL1bb9l1!AzzVm
itQ}?0q=ec(<iT&+1?92>Lgono0000<MNUMnLSTZ%yakH@

delta 683
zcmV;c0#yC#2)zY1iBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_y7O^32;bR
za{vGf6951U69E94oEVWdAAbT;Nkl<ZcmcIlPfrt35TBVXhDJ#+F{u!Zdl5@T^Y9DU
zegewT8y^8~-q3I0%_Hy$Dxbh|H{}IMX`+Ya)`N%jR1&*yoY`epQp;{>VUl+Dz4`N-
z_nX-_0Cy}nsbO`^)ETHL4k3VR_fBnl62C$K-#3fp1=^F>CL)B)uz#rg46uLUxt+k;
zFwdXzl+~*7%L{m{!6lWQ?n&q2+4l|#&_~H^s~q96+DrwovTB+%C&48eGd0dmI-gRV
z0DWL~4b|ZseqDKGnl}Qdt(je~L@h=Nm|UZG`mH@`qcu>Sf_OkJsnPDZSl-oz^1b}@
z@n;FV4af%ra_@dx+kb~^<X68RK3S?9IEQ5cdjF`h<Ud%h9EJV<MQW23S-I5X%9gKu
zU!`Ocsl9$9w1J$01OCH}Ue5*@KpI@Cx9A*gj-zBEkeV?p)JoA{;PJY4SX=`t(UxZJ
z$gNKsT&3H!7Kd(AW6ckRX1FXe1HYBNKI+-zShGkB!fX-QWPboc)NkSH8Qg&+0E~hB
z`*2Ibh=v($2EYjMqUfufM4n5b^(hVW4<L$Mya1wlp7ZKUv;9JTc{U|4VPY6XK?ZRD
z9s~(M0ZoV-NYu<Tk!vMB!4D~R24M9@WH^^%&s^xZdoJn801}O~7C;?l6l6(~-Fdn$
zWg6`ygpFKp!feB$0g`kO9R3HOoutk>xvra5MfcNa2gNz1FY})JqT^7Md(*V5-a{o1
zTf#yx@S=9QkE2G(Wi{PLry~_)Mo0tMu>dMnBiTn(zbOb3gfc(&i)Qq#%U_)H=%m$e
RpOgRq002ovPDHLkV1ko%H7Ni9

diff --git a/static/images/tabbers/logo.png b/static/images/tabbers/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf643315bf1fc7cd9a6b4a016f05c3db9fbebaf4
GIT binary patch
literal 3315
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

literal 0
HcmV?d00001

diff --git a/static/images/tabbers/position-select.png b/static/images/tabbers/position-select.png
index f7305df2e4dcc92d469ca0b5149ba2723fd1ffd2..fd60b244c5c15eee17653e9f088bb447645dbef8 100644
GIT binary patch
delta 1031
zcmV+i1o->d1eORkiBL{Q4GJ0x0000DNk~Le0000m0000m2nGNE09OL}hX4Qo32;bR
za{vGqB>(^xB>_oNB=C_oAAbX@Nkl<ZcmeI1!A=`75I|?Vfk<4MN-ad{W%&a*QmC4K
zK_j42Z@?E2zJTNlO22?`t5iVY3lh|(Il>>XJyc5Il3PoX^>n;R4^;84y}L;+d6z^Q
zuRY_jJu^1IoH>a=NSR!#=q^Z65Cl0w$OVHCbV*2$2)u{Q+AX9=Vt)g2^<r)@3k3jY
zj}<MzNNFv~7=#89T|I1GRv{s=4G0up6o&{{id0$)d6J-##E@79y!ciuIF575e_cog
z^3WFt?KkHQutb0*%dPEWR=y6YDX&169I7ujw~xURD-SF;cTN#uA0~;Ulg`%Vk!f>d
z52%@+xbg~tB^yr|d4FK#`*w*t{shxR(h+;&B&u1Y0r~nzmlpds@lTp~aLnlTdj4wn
zU9B6|E^-OUg?@S3$}4!es$)9R>!BV9W<T4%gBkMp=syqhLMH5EHT&@*9bF@d2KV3v
z{qT{Ch<gy@=v~Z+691HS@=ya%z+13^*DVlMI$IaxHeY$=$A4~#7x%Hvl0*lT;bpB{
zCwSTXuqII6fCU*6>%TU?h9+zI)^36GpgLH9=&!anYTh_m$R_sJz-AC1D^bcT+8gI8
zk*k0OK4-T&na~T!$^gg=s-{hsdNT5Se~Mn05Dy3!jQgi+or}le4Nn#0x&Q?})5-J(
z2+)3%3J6`}rhgJvbu#O0bQ}aYSz|*;#Q?@t1&-Ah672Sv2CV^{i~Iybg0MdfI7Yl|
zZtvT~0urFj2J{{v^1udxhxvNZjcTUS6M<+~xJdnE>J31&x;;={psc8e88OPO?5jCn
zYIV`35=)PM<9F5pJGeB=I(J-<RHc+>gA91VAOp^Y1b-F@`-c#No(~P}h!Da`Yo`wC
zs$`aMjOlD%7Ifm!Q-~y8!;Ik>u7=4&4X_XS6F|sDs5neG3i($sBM7M)m7+ujGA=}B
z<^=(=65S?(ApHe6gDGP&`wF8}Lf}F<sJ5mCc_y>3FfyRM@x|k{WL1PDfp57hrs=s=
z%|4B|pnsOm{l?{iX?v?|6k$Pi?7_q^UpoJ=zBPHp#s0vu*f+)GQs95A>j5<Y5*fSL
z7>P%=$}3_OG;MxSK}v5^s~e5Z)_JUWljw~s-`p+prn7#Oc%lF+&o47&h)Lo{z9dE@
zRX*qgQXtPIA`Po7*XV=cOXb1+>x&vBB(-<qd`OF{E!kHumhVAl2rJI7nxFqH4Nki2
zwNxT|>JQxtb^i%cx^iR)pA?=0&TX7iX3m@m^B1O@UXB~yrv3l`002ovPDHLkV1ldX
B%S-?O

delta 582
zcmV-M0=fN`2-pNRiBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_y7O^32;bR
za{vGf6951U69E94oEVWdAAbSuNkl<Zcmd5-OKuZE5PencSc27X0-A6Edr6`IJ^^MI
zi3H3E$PMf{fyoINk_fRQoWLVQ@X|R!=pz`36~SHf42m?L?qO^RDR0y2`n*@w-8BRJ
zXHeTfJ>S>(-O>4m?b7UixNMWxD4=Kin!BAN2)}ZXQPC%WAxLU}U4O@B@X@R-pufI2
zVyJPI*ar(cF}r7RYXLn!7_;RG)<8(4Ch+jf;Ybv{!v?S`d2Jq_CPf=pgB<x78-f*0
z^=uRc1+wbhq67KI3fy-`HxR-5Kuo06YFIRMN^XUrH_alx+B=yPEa~>Q!%GNFtD&O!
ziCYr*I<TPo9{Od4Jb%a4&gt9CR}+Briu;lPiQI!n03nF{sG8iX3Ex2gx_WWB(G4M}
z-mz2)DtAEejz4X!J{3juY#4EOYwC+-i&9smOLng#bv-_-2@pL+*Dkg%4nF@4be|6R
zCtOI*g928mbGFu78RgHH-`s3M$T*7o(h-?QiE$OA*cg;#9DhN946>3K8^SWxa%%!+
z?<{r8G1g{BT&+Gs@H8J>yj(bE4=o_>^?lzt>HB=aIS}UOPTt_(<nG>FYyi!FwE0N0
z*qNIi-9SF@9nB3ICpk;B6#9BnB6qmoM4m^XCG=txb$+5pjOF!R7}HOdxDEINLFKKk
U@1e^f00000Ne4wvM6N<$g09{H$p8QV

diff --git a/static/images/tabbers/position.png b/static/images/tabbers/position.png
index 455be4f9d4b71846bbddc0c9c6f8e7ee474fef3e..5d42dab6883981f3a7c7a66b101a134f87f7c053 100644
GIT binary patch
delta 1556
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
GLSTX){@wEc

delta 857
zcmV-f1E&0+4Cw|oiBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_y7O^32;bR
za{vGf6951U69E94oEVWdAAbV=Nkl<Zcmc&#u}&L75S`gGD2V2WAebW3xkz$05EiPG
z<_mDXAf`))>C(kiDFa^sd_kNqu<24n_JI*TrNMMopfD8@;dU~+=Fpw(vr(joDSYSI
znRzp_^X35lv*0)b$C38bG!zNM3LrUJM}S>a>N_Z?`M%fwCji%#4u7O@9})BSmKPkk
zZC(*ph`{cF!2$eHJ4rx80bXZiA;rOUB$hpOJ9*&yKVkt~DIK9ii2*hk#STDi{%U%a
zu>iT8lw^qp2lq$>?|pA{3wl8KjR+-?TK7-AS|WgM3r=8FXMQ8pYTNU=@CcDo+P4a;
zx@|WW#r#q+Gz$v+>wl0?nf~DJlFS2$eD9yCMKkr-me02lMfKSomRMCDT0wSs^_(Ba
zt!AST)#sMwK2K2*;<DRn*0=los~l3YekRn3@Z}Zv-eeCLyC^p&izYb2-i@VZ*qH|l
zcKE3DW>J=+w(NVz58F&&KS0WYo{~g6>VyJ6@T45IPU@wwZGUGc^)egQ_-rF;8wAQT
zJ`<K40N^amT*KX641mou{BsV2a*bSZRAEhmNq_>f2LKWU$>WPEI6Nt#>b?al9O^h~
z8r=5ChZYV_kuEP~iLku(L;QfsWMN|}z(#ga?va2l5^kCMvebGMAZ#;pqB~H*^dz)7
z(=MOpqfTdMo`0taWLPc4R|K&S0&OC(-cLflWHWvK>Cf6jf>DET%y?Qd!${`3?;I1L
zZ*4^U2gW=`G$PvJ8Dz4E7+FF|3T(i6oK4$EY)17sB#V(%3=Mw2Vz@;YezTsBo()V9
zU#e!OJr!`TA1f1B*4cxliv34czvA+;)0s;zT=Q#b_J74ZT>b7G!3fDM$<NHj5;42|
z<3<G@E8MDs?D879I>3nF+9vyUZ8yorN;=@oD|7Sd3~xwN$?Ws=#nn~E+=>2-F1$>C
z;mkiV5f57@jgLuj#(tA?OKZDa{+52{DXX!A&6Lnf(bfx4@2FA!V*#}2uNLajMbH~p
jld;Xas~Qp|)RW0y2#r9C9i_Ms00000NkvXXu0mjfW}%48

diff --git a/static/images/tabbers/task-select.png b/static/images/tabbers/task-select.png
index 1c6979e798e8a50cadf3dea34e7053bdf314a281..51f0139157324a84d22d9f8f60a031b35df71b78 100644
GIT binary patch
delta 1013
zcmV<R0}A}91cV4SiBL{Q4GJ0x0000DNk~Le0000m0000m2nGNE09OL}hX4Qo32;bR
za{vGqB>(^xB>_oNB=C_oAAbXxNkl<ZcmeI1O;Q>`6oB7r0+epTLQ8fICkR<0NjaV%
zL`;=C;RKo!1Wph=fx1go#Bc+!3}G2_f{Z(esgkUsnCX{p5Q@z7$ozp+g>TjMrl+Uh
z&vd_j4KQcU{|!P&ES=}{2(mOWTo;3;fgmA9PxKxVbO^x^Edz+YaevP1KVMes5CVY|
zNYrwPSd8r=;NEbut|5a6>a5Glt&OSyKJlf1oOnFW-hrHW2oTYcUqw7Cu-we=Fb@0P
zEj|u1I6?U;dwS&MEl&!peA#>-men2MwBLSl`qpiCR|@n)Ch|!%b(jJKQ0?BD#m+{x
zGp;WK7sO+cLzvR!C4a)IxqE|+Wvl|dutCVd^wC#7%aDDT2SaGNu~}e<hwz9XLZOwZ
z96LUDdXTJbYZSk$iKYg=pfdtAkl<C26-(?Doo?4mIsFfgA;hD1CGbCaqrG;j|5&RO
zIFRcVMTPJ{A|91{jvA!`()!3?2mC^CIczd+Ku{R&$(2y~NPi`~xBg5Kd%~3ak5U0)
z{dJf%815>?R>4v;r-Sd<pB(aENS<%$R=G_9#+eQ?3L#HhWi|ywYMh1{g%EYC%>EA`
ztip_fNYAV?y8<+O@jrkFZA+=j1A+5=u>(IH4#%ToGfKChVs5UoQ6Ff7##Q#?g)mAT
zCWI=40$a?w<bNSViz3HAhJcV_ZYmG_f)JnxKOAiTt;`2Q=0!+U1n5;K{9;%IDg`be
z6i|!BBei5Lrwt@6ao%mORZ>V;27g>y1&R=&I)sF*4^f=e<hf#0-pZbo5ThyYVMR9M
z+BdQY3&{h+5jA-z5+}Rw|9E2<R_?tavV^*AbXCWdMt}Y~{IW?OYYk|*@g~iXe|7Pu
zJY%G+QspvAKnE}(5V0@_t3)#=ykojLcaXzUtn`2;R*&ED$TiFmh-Rvlu~+Vt9x&wj
zlVD<A@CqRvsU|OR+=&;uW+{wKEjVN_;Eq4KqXN<k81O(I2BNA_cCx<Y!CXjgJdYYm
z;@hn;#eZH`wb7Mkz9t6KVY*bsuKjvkCs*0%!i^~hs>0Nuv)cu;=%%N)@_HjL?*(>Y
zl8CTrXDhBt_@2%Ka^Mg$N;P7|lVf|Cyu{ZPQ?j|Oak?vsm;G1oMiExOT{KIb=T*<k
zcA!hX5k+JnO!M+?&*FdwH;aGv{Y-p7XxFUC<~Eitu21!TS%x$*^y=s}EA$Ua7cyO!
j8E-3dQinNn<^<+1qK;C{blvG200000NkvXXu0mjf5Ff@c

delta 534
zcmV+x0_pvP2&n`%iBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_y7O^32;bR
za{vGf6951U69E94oEVWdAAbS9Nkl<ZcmdUw%}v8V5QX24C2mOR00#;nTnR#=0?a)@
zp#wSysUT26LO@(G6(A6XYiNKh9pnu04zuK6cGf23lJDZbnSHan<F~-Nqg)^T$DrVO
zn*n<`me7)YW#2Q<RbXvmJm|xl_EG}=b0r|6mP8cbK*Ti1+*l+;segmNR-5F}eb(Tk
z3Vrfa%a1DcTmt@ErB1BQ@ka=B;lEUyDFsZ~d9K!2s#!P+<6Sa#;lRY^L?7OUQ{mZs
zPt_f{{f~oAi5b_97|7DL{Kr}$Az-V=s7n?JARp3sagY#zhX5<WkV*;|s4c7rHM36>
z0om;mR)?Pu$dhC@kAKzRQmWB;lcoa9pP9iMaZ{J?x<=8FtDCHqBm`vLy2wP;iqUBg
z--A-`pi?tM#njm_J`)0n5h4deYoPn>sM>=0DzGt6iSZSOGx0<0`qGB!$!(_pxL}!4
zZ@*I<KTl?$kJ^3t&Cl>pn7J|gJl91d54pm!7&LTw-nLWEgIDe7^g=E!UrOWZqufcj
z@WKOUClY5>Vt(xOCrjTbbEfxiQ=3F(B>xJ@&IN4$&ankZ8!FrDhQfFgq26ofHNrLI
Y2b>_8Wggl;sQ>@~07*qoM6N<$f?4|VUjP6A

diff --git a/static/images/tabbers/task.png b/static/images/tabbers/task.png
index 4122cfc96329b842488e28e3d87450f777bde4dc..24cd777fb583c6d5c32091d9b405f5982e7c2561 100644
GIT binary patch
delta 1439
zcmV;Q1z`Gy2CEA;iBL{Q4GJ0x0000DNk~Le0000m0000m2nGNE09OL}hX4Qo32;bR
za{vGqB>(^xB>_oNB=C_oAAbcvNkl<ZcmeHNO?Ki&5Uy_7MB`1kL6j2&pJ4DNZ#=UI
zzQBMs@te#do)aKW;K?F!oQ*_s0GO8-lb4O*1mOmeZ@?nS7!T@Bl|W4k1PDpQEarR9
zk5>PG-PP4q)du*8#|47|;kupjzfiI`Kt%#8GmvG<$Mnd6i7)Wign!A<w$DaT5ONc^
zayu61W?f3CG6vN&ZLn@%NcoNd>%Ov2eaL~#1g_j)al!}9w3A*1A|s_}zp`I=kO5m0
z_}=}aVzA(H^~B|!5YR{Q8A*WAY>+Z=ZsD(mpI;=l3W<Qd?T&0k;0O2S!r<(3xkL_x
zV4ey0-A(dM=i~uCseek&8aVh@300i)`e_SNA{7A|bj-|7!m77Q;{I*cLwV))@cc*z
zr%{g;Fxf2yV>?a18wt=L2A3VwB$at?xZ;hx2T&h_bGU`6h(+*G6i+sdv6eu%-Q4^$
z*0F%rxqa%u4shM>Ir!5AH90vv6yuY1JHgj=_+UJ7L7zO6Z+~_*c>>D5146!uzG>G#
zpy;k^vy#B|FTEzJhMLNt$-jL57Iutt8^_Q|;JG8^v8sNe2+d^jFO{)Fu~~&haheEm
z{MvpoT&$P41Iz$d`}DI+o-R6CIXXv>0VGbS_4?8GA>)@x_4x9@y#|wWbxE24w#0M?
z4{qts81s?`8GjK3U`J^ZCG5AlSZ9d<u6|u><YiNp6HE0cSf(8y(AWZmy3`Cd7pVv_
z0<?1a>dOF9--x?{DUOulnC?Qy(#vB6B+Rvr1o5t@iz*Ln`(&h_1%OgRFOL!622-{P
z**35zz_ZYf(gx#C^)f}kb#KeM_&kAeANB+$nB6E%Vt=G-Hbvkb{?=?AR;bsM7bHex
zrbpl8^+jnuPZ)}ogy0VL4CG@(X>wV$^b|qdVDn+mz-G=7f&A?#&F2-QwgZq$d<@|8
z_MCqT1pqaq>QkR9haKP$j(lzCO41El6chmpeMITdhs}XS-HnE!d*%MtfE-|&*ywZB
zL};D~EPwyDPwg1hC)!5b{n5MW&}|QyAT8~~j}nT20YaIoc|#=xy2U4gpXh@z#%g4y
zUwgk_ZcBu7<1^Jy(hkJs7Obphu#VUEmqW5<@z8x2D`4`1eBiWVMVBldVx>AU`k@wE
z5m=PldnnbQ0MJf+U4MRoL_Wur(;bpftbY2r=YMYM;{o1R)rXJ+{gRDop+Jg3lt!DQ
z4h3RL<k>M2AsgS1@}<<H9m&AeZ$xRluey3!T#X9usYVMnM^Qi`UP+k8m~4gS0Tb<Y
z^+OY%b7f>wJXJ4W@`-UvZ{^IW6GF5wX6e8q;@Z9OfX@P7C_d=)SM~Cxi!9Kb7?jaw
zc7L^(AK}=19<>u7y~R391aOP{`e8;lZsQ@_6=u=8DRA|ZBG`$h#D~C$#bq$W(S-jQ
zVO&ZxF!6DukyI~{0O@Z%xP)-l1(%9OIF<lMWnf%tm3zB3HmV<JLV%>cv3DDtTMFSb
z);)ju>}*y2wbtliV4mrh4|TjtaU!u<cz=KJOTl}4U7J+l^{k=qv<P)QDhu5PqsVk1
z*jcXddIYjX9*nUY3-&_zEac%|D=U#%`2Jf=I`I-YD2Z{ckOvMOivd?PoRnQAC+!jh
z{WMQZWM?rnRT8b<Eu-LDKl06<g*<HfG`WTx;;#6}>Mr)khd#z^!q$p*gNZn}2w*kf
z7Rd3;+G`+@#%dyI5k6Nrbb&$!6!6g9vnV8KaHypxBhl(*eN+VAqdjydVJhEdg=5r!
t!ZiB78ju$yz!)CEKmI-i%|0S8{sW%8QPPVq&)@(6002ovPDHLkV1k>supa;b

delta 757
zcmV<R0t)@B3x)<ZiBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_y7O^32;bR
za{vGf6951U69E94oEVWdAAbUyNkl<Zcmc&#L2nXK5T1EUo0^!2iPH99+#Z?$DeaR#
z;QoaEg!&6gZ{DCMkH9ae-aPi`t#I?8utH-udgyY}R1fr`#<*{sSr!^7uuIkWCBVLA
z-h6N7&3ps!kAZOp*{rtFf?Wc&14y>KBf!2Q)1&~7J<s)TM3CLm4uAh$MnosF?6GG*
z+LR`Mosf*E5g0o7_}+CB6XXiI3ZP1e(C20Sn=&=ub^Bun(AtJTIc!sAVw=cRyi@lO
z;*c-sqg<g#x$R=j);bLdkl!v=WKX_OJeqH~rORTN<qfbPh9vx{PB+MF9p`+LZD8&J
zi?z^4cz*+^;R7kG@_&u^UZ+)=wpnw!QkH6G^ToYc1j{K?;Y;lUVtI@}N|9eWL@@J`
zesJYL3|uJ$f;s{^q0b=!T5316uuKE~5FABKekt-fNRc9kBXB);e$ymD6h#l!pic$_
z1b4V$F5$0%&iQNOiXZ_bI=Mhh(f%;MNe~hc%K&eF7-ww29DlH}#w9$-=JnnzJCPCu
z>W>J}py-Gl*STKTeNL8<(BE-kaK}G7pNvM<gs6?d##IDM=2(7LeyI|~KvH$qZL_+<
z6E4R~SW?cIfr4<2k<XFX@o7$YslW3HCxvYhNK`E6J+Iqx27D2?iloWXw*pm$8$z^<
z4`~O1HOhoFe1G_Q@!8L0*6(smrF)rGSvO$;h;u?!;et8*aQgP;H3Gqxi%+laudZz%
zs>CE*8R_*0YtI1HQ=WJ)yiR-U9;Xf*kzUp%4wrliICTaZlcP}_uiS=xg;?U8r`c2e
ztkb$yBr`|mCd+3kP@*f3!xuy@K{(-9Rlt^9N2X08#WvIIO=Fs$_@U3E5e*9$$!w;u
nPx!<>A`|{x=Ar-EhyRJ+2iyfnyT)Z500000NkvXXu0mjfkF;9+

diff --git a/static/images/tabbers/user-select.png b/static/images/tabbers/user-select.png
index f313a9bf0a624f50cbffb0da631c8205c5380bae..76a3f403ab17786fcf972ee9b662500c5ec50086 100644
GIT binary patch
delta 760
zcmV<U0tfxj1BnJUiBL{Q4GJ0x0000DNk~Le0000m0000m2nGNE09OL}hX4Qo32;bR
za{vGqB>(^xB>_oNB=C_oAAbU#Nkl<ZcmeI1O>)yf5QSgMp%RLX7vOjo-2k)2MMb`W
zVpy;=Cx9CepCE98m;(gF3G4!#Y@Hj3ogpl|v~e-bjDIM8ELoaq92e-@xJpu~`i;7K
zdY*xTg8v(WAmwgY-o4?q*rP-J;+nqXo9he=^iRypZ?EdFI}k)nK!4@@VMvTq{l;?o
zlN>8XTS|xr0rt<ECwe8`tPkEmzDIOg={KK40A~S}3lj)ELr#e3c>hE51dceR(4Bs>
zWmXdo==wPNeE%$hB~D*J2k)K+x^7JI!xC!&X7#b?GA@v=8`HU9iM0R^6ha6l3SfzS
z3K0$<1QFkbB`!5kgMS$0!xE8w;5xAv!1xF;IEE!IUtj<snCTLhID7%_K?o1L`Hk%6
zRCRP3jo=K&Lx;i6T0q>0Mof4DNAv{Sh67GrXg0$zUcwUkM(v^FSS@lMsP-QnGjYDT
zNDKc|Kg&JE{*KszrmANno)33^>Vvv&OzOEzpg$veq%_Qg%zx*k+K+K#zGn<f=bGG7
zozcBWp!f?43jPU1x{x{3?(CpO9)(2S!OYZRZLutEmU-)p_4Scrb*T?9y{{AWMh*9F
z<Rsws`!Fb#N>6owK{ik5SF}^tQA)k~@*wKL5-S0Vz|E!=Km_B~siUiUlzT+aC1B=#
z?s`^6Rwfj`n14)FJ5Oq57EtXz_IY>Og@Bck4#zZ6jbS5-vpk(iz~+Kql3m1F0h<qg
zNj4E{&jUJm<9+(rIHVV@wAOb`6|k@m16&`$B8Eg#1&Elpju0r-f=?76W!}1C%-_np
zFwuwgl5fbFx6YJGt)yFNDRhYKAu*Pf0(|p_gT-v~w>dCrRJ{oORrgj381HRQ@atG9
qU~fEg++u7E9FNBmE?_~yAAAQdsosFoe&Z$p0000<MNUMnLSTZq*iz;I

delta 444
zcmV;t0Ym<Y2G9dGiBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_y7O^32;bR
za{vGf6951U69E94oEVWdAAbR5Nkl<Zcmds%K~BOz6o&uzimY7p2%}!0dxF3XaAyo?
zZvZ!-oW!EUxbp}_2yu&hW9A5~37uz)#Mq>?O>0c_+fC=a`I?#c9`M(pB0*}=YZK9k
zKu(lli^xn2Ci?u|uPjh6y%8Js()J9DryJ8T$_mcreOD~H&5AL`bboYnIy<z_naMTW
zAcy$svi36tB-BQ}z(H9-#2We7C@T<>6>=bhXOtF%l35`!A&ZZ)f_-%ymKcn6BfA$0
zHQL#-??$1n0Ig`bj*?y}>W#OiKf}ML*eqIJIaX*nLZo&{B040|Ssk1!P(jy5{dmB_
z!+5}@#YAtS1;)o_JAKieM_pJDPfuo!XOKbxK1JIL-FR5#3e>#UWs9Fsg0#Vx5UAi%
zalIa(;Gd_kHXA<C9sg^@BpQv5YF>rIV{ERO;r9<o0dWgeVGNSXJt}bHN>Qkey+3P5
m;tft0*B*X=_vW34-{J$i_I9kI81iZW0000<MNUMnLSTYkRl$b<

diff --git a/static/images/tabbers/user.png b/static/images/tabbers/user.png
index a0ad8c65e9427ce44eb4faa0e0239277e8eac998..4cb6b5954a260671a09c17bd70d233a0bf91d20d 100644
GIT binary patch
delta 1221
zcmV;$1Umbl1=0yNiBL{Q4GJ0x0000DNk~Le0000m0000m2nGNE09OL}hX4Qo32;bR
za{vGqB>(^xB>_oNB=C_oAAbaANkl<ZcmeHMOHvz082<himgQ`s8+d#IloJGY23M-g
z1&n4Bg=7&p0mBK9H*xT0q{;!JR4T?h%O{99LB=PDvPpn2-Tr%C8o>-q_lyk-zABZv
zNB#Py|F?j9+%5>80I&St*8t&gQ-7d9b3!=Vale_OVKheIm4ECI<bN)S);1rxTQV$A
z3RC_Z?6?~N8bBiie)8Y!wuIQf=HNx}2HP74sEJwxeE-+(|E<m;ztR5kFY1GonDTcJ
zZ6ZXEH(Es^Qj6Wyq#d5QuDdmdC00-a=dDLRlzP5+qTWkM-j2IDEgH{awk8C8q(l@w
z=NF(4@4^z+H*oaJ@qa!fyzGI*!NA?{D$N}q>v8*OKa^_kdv|jP3s@1*3d?Wuuk3-r
z;ZrP=P;<VyuWS@szybow%XI_O!)vetdqi4KG^ndB7%X5#0D`_wo2;zX@*9T8tPly>
zh6RiX#7-)+CIMgj6qbnRst<9Gx?0I$2x9^Yt=^(7Pf!!Fxqr=i4h&&TfO5`CNz70i
zv9Czrzz}viaED+)Km=)vNIXVOupQ5dBpG{Tn;QtS%?WF$2@W$>vo^?BB&{6T(fIA(
zY2e06xNd8Sv_%tQ<z3PZ*f%_ZA*^&jNjXm2En0*G#+!>3KU<UX*2rKDSb$}f<Ca)n
zdE+$>3yeubv42#~>ZqJkGl3O>C}xo|zoBPBq9_owO>k=E1AOQaf8|4fK*|fZEOpc}
zPqebXr2Isa!HcI`utcqVpe;MQ=dH6Zb2)*dm6C~Z>ZoS?If>6G9w&!(E-f)`hyPgx
zaVZ)}DKE$O6}Fv&<iX&DT@J9c5*k9BBj_+Yid3EAQGYa7G8`+2;hjqAFGEL_3aYn=
zn<DRBD{{TZT}7iJq{}S-qV2GA>8U79j73NXX)Rm?lD|8+nAItxTt;mINj$@ft4%5O
zs?A~(E7kiD82#WrtCdq&6DV{_R!}o3)yp0C*$5UeCQ#wvCw!n8i_csE^JJ4QM{Zm@
zjm+z6$$z{ciEINHz=*(=7$#mKwe6D*PH&WNttY4G^w?+gd2Uf9!l-6ii9m4;R7a!g
zWm}#OZIv=9ko9@3AM=G_zTMG-@N}=rx|In0JUV{2EHY6IwBM9Bjfk}9FkfdSF2jG@
z-&ntC?u`VFMsE*!wMD>XQAVtaD>0R#;h_I??|-^E*An12(@(0&F+SnpQ(Pe-)z-k>
zoRp0(C7|X0Ty*|K`Zp1qy6@c0TA^=MydJ+9sz@)Qo#$<N_M}W7N;5LH6j~mgq#HcM
znTOAW2lA1JtolK0wc4dGu9N_aPIirw)5j*=|4ne+buPCra%3UW+qjBC0<Zl)bV%SN
z-G9K=OV&XLoe8o+S9#&LkiZ2f8*E$dsEha(<Zo$T=NCoeM9D)ZZOc&Au0Y#@Ly;`d
z6GVj}h$xx3@QQ2&a7&;HwbEiG7WtC52ylA{vX+wn6b&dO(2-vZ^<PJI>YhzN@2$_F
j|HXWWa}W2pgZK!36x<%XHKP9j0000<MFvhpu0mjfSi>>P

delta 653
zcmV;80&@M*37-WviBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_y7O^32;bR
za{vGf6951U69E94oEVWdAAbTgNkl<Zcmc&!!EVz)5S`hCNQeU#Dot}hxCf9ECC%1f
z;7{Pjl|LZdxWzqjB>97WLiz<bca&~vRg5^)+$xlVxquMy4zqTG0?2V}3HmO!?0NHM
zcis%ZKL&0S<aDJ+AfE8+Lj<x2@C+Av6ox7);?{}+I$b#g6vsk<BY#Xmh~E+6Db{eX
zv)hFE=j-Vvz9>pgD11&k{wnnT<@rp$Kc9J2)B8v;M*ioR0;<4qq}}eh)IM-W`31Nm
z6JxFr%ANr0Vql&mbgn?7u6=G|j9Gum32^E@0Zc=c-$<oY3`7wi+2sWgz98aVC;%4`
zv#YG~0)!D)XWLTdl7CH~*i{}kT$L6e&=Y=Gw-b@;61)Y^)7W}`pK|Ab{T=P@wag&C
zyx(kDJNKF&=JV^={NrO;tp|IrxV`})9EE46liVVp0G$KZCxY}8L=-T=;z6^`y{F0F
z&HPRL?N)`9HZIt<2$CtOb9i-3!i%>7+%yVLV5XE^BDv!J%75>CJ+UA?T@VBxFO{k!
zkc~eMc^157<R{J?ElIplp`U&yQUvrOyimc`0&7doBpiPe`ZzLEyIuhI1rp(L!-p(v
z6KS7Cj-Uu8`D)2+8nWLw?6j2Ab6;-^bUN}`x*eGSC9x8D+>^PB58A!ME3W(sDuVfM
z+TFv`^>4pc#ZIG+G#=->gyMV5gT@oyO)}k4e+txVkbX=Ot)L<nq=PK0@ct6O#5e{|
nel#*GR>7S{mIE3~q5pxOTjSA&3N8Cm00000NkvXXu0mjfET<$1

diff --git a/static/scss/global.scss b/static/scss/global.scss
index 155f587..742c698 100644
--- a/static/scss/global.scss
+++ b/static/scss/global.scss
@@ -9,6 +9,10 @@ page {
   color: #071437;
 }
 
+view {
+  box-sizing: border-box;
+}
+
 button {
   padding-left: 0;
   padding-right: 0;
@@ -23,3 +27,23 @@ button {
 ::v-deep .uni-calendar__box {
   padding-bottom: 32px;
 }
+
+.tagList {
+  display: flex;
+  align-items: center;
+  gap: 16rpx;
+  .tag {
+    display: flex;
+    padding: 4rpx 12rpx;
+    justify-content: center;
+    align-items: center;
+    border-radius: 4rpx;
+    background: var(--LightMode-Grey-Grey-100, #f9f9f9);
+    color: var(--LightMode-Grey-Grey-600, #78829d);
+    text-align: center;
+    font-size: 24rpx;
+    font-style: normal;
+    font-weight: 400;
+    line-height: normal;
+  }
+}
diff --git a/static/scss/index.scss b/static/scss/index.scss
index 0063035..5001857 100644
--- a/static/scss/index.scss
+++ b/static/scss/index.scss
@@ -10,3 +10,7 @@
   border-radius: 50%;
   box-shadow: 0 0 4px 2px $cs-shadow-color;
 }
+
+* {
+  box-sizing: border-box;
+}
diff --git a/sub/enterprise/detail.vue b/sub/enterprise/detail.vue
index e14f072..022f74e 100644
--- a/sub/enterprise/detail.vue
+++ b/sub/enterprise/detail.vue
@@ -7,8 +7,19 @@
         </text>
       </view>
       <view class="address" @click="goView(detail)">
-        <u-icon name="map" size="14" color="#17C653"></u-icon>
-        <text style="text-decoration: underline">
+        <u-icon name="map" size="28rpx" color="#17C653"></u-icon>
+        <text
+          style="
+            text-decoration: underline;
+            color: #071437;
+            font-size: 26rpx;
+            padding-right: 3rem;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            width: 528rpx;
+            overflow: hidden;
+          "
+        >
           {{ detail.address }}
         </text>
       </view>
@@ -25,28 +36,31 @@
         </view>
       </view>
       <view class="wd-flex" style="align-items: center">
-        <text class="address" style="margin-right: 12rpx">环保负责人</text>
-        <text style="margin-right: 12rpx">
+        <text class="address" style="margin-right: 24rpx">环保负责人</text>
+        <text style="margin-right: 24rpx; color: #071437">
           {{ detail.contactName }}
         </text>
-        <text class="address" style="margin-right: 12rpx">联系方式</text>
-        <text style="text-decoration: underline" @click="callPhone(detail.environmentalContactPhone)">
+        <text class="address" style="margin-right: 24rpx">联系方式</text>
+        <text
+          style="text-decoration: underline; color: #071437"
+          @click="callPhone(detail.environmentalContactPhone)"
+        >
           {{ detail.environmentalContactPhone }}
         </text>
       </view>
-      <view class="images-box">
+      <view
+        class="images-box"
+        @click="$util.perviewImage(detail.files.map(i => i.url))"
+      >
         <image
           v-for="(src, index) in detail.files"
           :key="index"
           :src="src.url"
-          mode="aspectFit"
+          mode="aspectFill"
           class="image"
         ></image>
       </view>
-      <cs-text-more
-        color="#4B5675"
-        :value="detail.introduction"
-      ></cs-text-more>
+      <cs-text-more :value="detail.introduction"></cs-text-more>
       <!--    <view class="status">
         <cs-dict-tag
           :dict="dictMap.enterprises_status"
@@ -62,17 +76,18 @@
     >
       <view class="wd-flex" style="gap: 18rpx; position: relative">
         <image
-          src="@/static/images/enterprise/zz.png"
-          style="width: 90px; height: 70px"
-          mode="aspectFit"
+          :src="prove.files[0].url"
+          style="width: 180rpx; height: 140rpx"
+          mode="aspectFill"
+          @click="$util.perviewImage([prove.files[0].url])"
         ></image>
         <view
           style="flex: 1; justify-content: space-between"
           class="wd-flex wd-flex-col"
         >
           <view class="wd-flex" style="gap: 18rpx; align-items: center">
-            <text class="label">资质名称</text>
-            <view>
+            <text class="label" style="color: #78829d">资质名称</text>
+            <view style="color: #071437">
               {{
                 $dict.echoDicValue(
                   dictMap.enterprise_qua,
@@ -83,13 +98,13 @@
           </view>
           <view class="wd-flex" style="gap: 18rpx; align-items: center">
             <text class="label">资质编号</text>
-            <view>
+            <view style="color: #071437">
               {{ prove.enterpriseAuth }}
             </view>
           </view>
           <view class="wd-flex" style="gap: 18rpx; align-items: center">
             <text class="label">资质时限</text>
-            <view>
+            <view style="color: #071437">
               {{ $util.formatDate(prove.expiryDate, 'YYYY年M月D日') }}
             </view>
           </view>
@@ -203,11 +218,11 @@ export default {
         ...dict.data
       }
     },
-	callPhone(number) {
-	  uni.makePhoneCall({
-	    phoneNumber: number
-	  })
-	},
+    callPhone(number) {
+      uni.makePhoneCall({
+        phoneNumber: number
+      })
+    },
     async init() {
       const res = await getEnterPrise(this.detail.id)
       this.detail = res.data
@@ -316,13 +331,10 @@ export default {
     overflow: hidden;
     .status {
       position: absolute;
-      right: -38rpx;
-      top: 12rpx;
-      transform: rotateZ(45deg) translateX(40rpx) translateY(-40rpx);
+      right: 0;
+      top: 0;
+      transform: rotateZ(45deg) translateX(60rpx) translateY(-41rpx);
       transform-origin: 50% 50%;
-      padding: 8rpx 40rpx;
-      font-size: 24rpx;
-      text-align: center;
     }
   }
   .images-box {
diff --git a/sub/inspection/detail.vue b/sub/inspection/detail.vue
index 11e7e63..dc79209 100644
--- a/sub/inspection/detail.vue
+++ b/sub/inspection/detail.vue
@@ -1,13 +1,21 @@
 <template>
-  <scroll-view scroll-y flex-enable class="view-container" st>
+  <scroll-view scroll-y flex-enable class="view-container">
     <view
       class="box"
       @tap="goDetail(task)"
       v-for="task in list"
       :key="task.id"
     >
-      <view class="wd-font-800">{{ task.title }}</view>
+      <view class="wd-font-bold" style="color: #071437">
+        {{ task.title }}
+      </view>
       <view class="tagList">
+        <view class="tag" v-if="task.deptName">
+          {{ task.deptName }}
+        </view>
+        <view class="tag" v-if="task.priority">
+          {{ $dict.echoDicValue(dictMap.task_priority, task.priority) }}
+        </view>
         <view
           v-for="(tag, index) in task.tagList"
           :key="index"
@@ -20,9 +28,9 @@
         class="wd-flex wd-text-13"
         style="justify-content: space-between"
       >
-        <view class="wd-flex" style="align-items: center; gap: 4px">
+        <view class="wd-flex" style="align-items: center; gap: 8rpx">
           <u-icon name="calendar" color="#17C653" />
-          <text class="wd-text-13 wd-ml-4px">
+          <text class="wd-text-13 wd-ml-4px" style="color: #252f4a">
             {{
               `${$util.formatDate(
                 task.startDate,
@@ -36,11 +44,16 @@
       <view class="status">
         <cs-dict-tag
           :dict="dictMap.task_state"
-          :value="task.taskType"
+          :value="task.status"
         ></cs-dict-tag>
       </view>
     </view>
-    <u-loadmore :status="load" marginTop="12" marginBottom="12" />
+    <u-loadmore
+      :status="load"
+      marginTop="12"
+      marginBottom="12"
+      v-if="load != 'nomore'"
+    />
   </scroll-view>
 </template>
 
@@ -80,7 +93,7 @@ export default {
      */
     async getDict() {
       const dict = await getDictBatchByType({
-        type: ['task_state'].join(',')
+        type: ['task_state', 'task_priority'].join(',')
       })
       this.dictMap = {
         ...dict.data
@@ -128,39 +141,19 @@ export default {
 
 <style lang="scss" scoped>
 .view-container {
-  padding: 12px;
+  padding: 24rpx;
   flex-direction: column;
   white-space: nowrap;
   .box {
-    border-radius: 12px;
-    padding: 12px;
+    border-radius: 24rpx;
+    padding: 24rpx;
     display: flex;
     flex-direction: column;
-    gap: 12px;
+    gap: 24rpx;
     background-color: #fff;
     position: relative;
-    margin-bottom: 12px;
+    margin-bottom: 24rpx;
     overflow: hidden;
-    .tagList {
-      display: flex;
-      align-items: center;
-      gap: var(--Number-4px, 4px);
-      .tag {
-        display: flex;
-        padding: var(--Number-2px, 2px) var(--Number-6px, 6px);
-        justify-content: center;
-        align-items: center;
-        gap: var(--Number-4px, 4px);
-        border-radius: var(--Number-2px, 2px);
-        background: var(--LightMode-Grey-Grey-100, #f9f9f9);
-        color: var(--LightMode-Grey-Grey-600, #78829d);
-        text-align: center;
-        font-size: 12px;
-        font-style: normal;
-        font-weight: 400;
-        line-height: normal;
-      }
-    }
     .status {
       position: absolute;
       right: -19px;
@@ -168,7 +161,7 @@ export default {
       transform: rotateZ(45deg) translateX(20px) translateY(-20px);
       transform-origin: 50% 50%;
       padding: 4px 20px;
-      font-size: 12px;
+      font-size: 24rpx;
       text-align: center;
     }
   }
diff --git a/sub/inspection/record.vue b/sub/inspection/record.vue
index ac14754..628169f 100644
--- a/sub/inspection/record.vue
+++ b/sub/inspection/record.vue
@@ -138,7 +138,8 @@ export default {
       .image {
         width: 192rpx;
         height: 192rpx;
-        border-radius: 8px;
+        border-radius: 16rpx;
+        flex-shrink: 0;
       }
     }
   }
diff --git a/sub/owner/notic.vue b/sub/owner/notic.vue
new file mode 100644
index 0000000..7b79554
--- /dev/null
+++ b/sub/owner/notic.vue
@@ -0,0 +1,242 @@
+<template>
+  <view class="container">
+    <!-- Tab 切换 -->
+    <view class="tab-container">
+      <view
+        v-for="(tab, index) in tabs"
+        :key="index"
+        class="tab-item"
+        :class="{ active: currentTab === index }"
+        @tap="switchTab(index)"
+      >
+        <text>{{ tab.name }}</text>
+        <text v-if="tab.count > 0" class="badge">{{ tab.count }}</text>
+      </view>
+    </view>
+
+    <!-- 列表内容 -->
+    <scroll-view
+      class="scroll-container"
+      scroll-y
+      @scrolltolower="loadMore"
+      @refresherrefresh="onRefresh"
+      refresher-enabled
+      :refresher-triggered="isRefreshing"
+    >
+      <view
+        v-for="(item, index) in list"
+        :key="index"
+        :class="['notice-item', !item.type ? 'is-read' : '']"
+        @tap="goDetail(item)"
+      >
+        <view :class="['notice-icon', !item.type ? 'green' : '']">
+          <image
+            :src="
+              !item.type
+                ? '/static/images/owner/message.png'
+                : '/static/images/owner/message-grey.png'
+            "
+            mode="aspectFill"
+          ></image>
+        </view>
+        <view class="notice-content">
+          <view class="notice-title">{{ item.title }}</view>
+          <view class="notice-time">{{ item.time }}</view>
+        </view>
+        <view class="notice-arrow">
+          <text class="iconfont icon-right"></text>
+        </view>
+      </view>
+      <cs-emty v-if="list.length == 0"></cs-emty>
+    </scroll-view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      tabs: [
+        { name: '任务通知', count: 4 },
+        { name: '整改到期', count: 0 },
+        { name: '资质逾期', count: 0 }
+      ],
+      currentTab: 0,
+      list: [],
+      mock: [
+        {
+          id: 1,
+          title: '全区餐饮环保检查全区餐饮环保检查全区餐饮环保检查...',
+          time: '2025年3月18日 - 2025年3月18日',
+          icon: '/static/images/notice-icon.png',
+          type: 0
+        },
+        {
+          id: 2,
+          title: '餐饮店卫生检查通知',
+          time: '2025年3月15日 - 2025年3月20日',
+          icon: '/static/images/notice-icon.png',
+          type: 0
+        },
+        {
+          id: 3,
+          title: '消防安全整改通知',
+          time: '2025年3月10日 - 2025年3月25日',
+          icon: '/static/images/notice-icon.png',
+          type: 1
+        },
+        {
+          id: 4,
+          title: '营业执照即将到期提醒',
+          time: '2025年4月1日到期',
+          icon: '/static/images/notice-icon.png',
+          type: 1
+        }
+      ],
+      page: 1,
+      isRefreshing: false,
+      hasMore: true // 添加是否有更多数据的标志
+    }
+  },
+
+  onLoad() {
+    this.getList()
+  },
+
+  methods: {
+    switchTab(index) {
+      if (this.currentTab === index) return
+      this.currentTab = index
+      this.page = 1
+      this.list = []
+      this.getList()
+    },
+    async getList() {
+      if (this.currentTab == 0) {
+        this.list = [...this.mock, ...this.mock]
+      }
+    },
+    async loadMore() {
+      if (!this.hasMore) return // 没有更多数据时不再加载
+      this.page++
+      await this.getList()
+    },
+    async onRefresh() {
+      try {
+        this.isRefreshing = true
+        this.page = 1
+        await this.getList()
+      } finally {
+        this.isRefreshing = false
+      }
+    },
+    goDetail(item) {
+      //   // 跳转到详情页
+      //   uni.navigateTo({
+      //     url: `/pages/notice-detail/notice-detail?id=${item.id}`,
+      //   });
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+}
+
+.tab-container {
+  display: flex;
+  background: #fff;
+  padding: 24rpx 32rpx;
+  gap: 24rpx;
+  border-bottom: 2rpx solid var(--LightMode-Grey-Grey-100, #f9f9f9);
+  .tab-item {
+    flex: 1;
+    text-align: center;
+    position: relative;
+    height: 64rpx;
+    line-height: 64rpx;
+    font-size: 28rpx;
+    color: #4b5675;
+    background: #f9f9f9;
+    border-radius: 240rpx;
+
+    &.active {
+      color: #07c160;
+      background: rgba(7, 193, 96, 0.1);
+      font-weight: bold;
+    }
+
+    .badge {
+      margin-left: 8rpx;
+      color: #07c160;
+    }
+  }
+}
+
+.scroll-container {
+  flex: 1;
+  box-sizing: border-box;
+  max-height: calc(100vh - 124rpx);
+  padding: 0 24rpx;
+}
+
+.notice-item {
+  display: flex;
+  align-items: center;
+  padding: 32rpx 24rpx;
+  border-radius: 16rpx;
+  border: 2rpx solid #f9f9f9;
+  background: #fff;
+  color: #4b5675;
+  margin-top: 24rpx;
+  &:last-child {
+    margin-bottom: 48rpx;
+  }
+  .notice-icon {
+    padding: 16rpx;
+    border-radius: 50%;
+    background-color: #f9f9f9;
+    box-sizing: border-box;
+    margin-right: 24rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    image {
+      width: 40rpx;
+      height: 40rpx;
+      flex-shrink: 0;
+      z-index: 1;
+    }
+  }
+  .green {
+    background-color: #eafff1;
+  }
+  .notice-content {
+    flex: 1;
+
+    .notice-title {
+      margin-bottom: 10rpx;
+      font-weight: bold;
+      max-width: 486rpx;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+
+    .notice-time {
+    }
+  }
+
+  .notice-arrow {
+    color: #c4cada;
+    font-size: 24rpx;
+  }
+}
+.is-read {
+  color: #071437;
+}
+</style>
diff --git a/sub/owner/notice-detail.vue b/sub/owner/notice-detail.vue
new file mode 100644
index 0000000..e69de29
diff --git a/sub/owner/policy-detail.vue b/sub/owner/policy-detail.vue
index 4cc77c5..0776f04 100644
--- a/sub/owner/policy-detail.vue
+++ b/sub/owner/policy-detail.vue
@@ -1,12 +1,12 @@
 <template>
   <view class="policy-detail">
-
-    
     <!-- 详情内容区 -->
     <view class="content-wrap">
       <view class="policy-title">{{ policyDetail.name }}</view>
-      <view class="policy-time">生效时间：{{ policyDetail.effectiveDate }}</view>
-      
+      <view class="policy-time">
+        生效时间：{{ policyDetail.effectiveDate }}
+      </view>
+
       <!-- 富文本内容 -->
       <view class="policy-content">
         <rich-text :nodes="policyDetail.context"></rich-text>
@@ -59,13 +59,19 @@ export default {
     formatTime(time) {
       if (!time) return ''
       const date = new Date(time)
-      return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`
+      return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(
+        2,
+        '0'
+      )}-${String(date.getDate()).padStart(2, '0')}`
     },
     // 处理富文本内容
     formatRichText(html) {
       if (!html) return ''
       // 添加样式以确保图片自适应
-      return html.replace(/<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+      return html.replace(
+        /<img/gi,
+        '<img style="max-width:100%;height:auto;display:block;"'
+      )
     },
     // 返回上一页
     handleBack() {
@@ -93,12 +99,12 @@ export default {
     padding: 0 30rpx;
     border-bottom: 1rpx solid #eee;
     z-index: 100;
-    
+
     .back-btn {
       font-size: 28rpx;
       color: #333;
     }
-    
+
     .title {
       flex: 1;
       text-align: center;
@@ -107,37 +113,37 @@ export default {
       padding-right: 60rpx;
     }
   }
-  
+
   .content-wrap {
     padding: 30rpx 30rpx 30rpx;
-    
+
     .policy-title {
       font-size: 36rpx;
       font-weight: bold;
       color: #333;
       margin-bottom: 20rpx;
     }
-    
+
     .policy-time {
       font-size: 24rpx;
       color: #999;
       margin-bottom: 40rpx;
     }
-    
+
     .policy-content {
       font-size: 28rpx;
       line-height: 1.8;
-      color: #333;
-      
+      color: #071437;
+
       :deep(img) {
         max-width: 100%;
         height: auto;
       }
-      
+
       :deep(p) {
         margin-bottom: 20rpx;
       }
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/sub/owner/policy.vue b/sub/owner/policy.vue
index 215a2cf..99e0ef1 100644
--- a/sub/owner/policy.vue
+++ b/sub/owner/policy.vue
@@ -3,19 +3,19 @@
   <view class="policy-container">
     <!-- 搜索框区域 -->
     <view class="search-box">
-	  <van-search
-	    :value="abc"
-	    placeholder="输入关键字查询"
+      <van-search
+        :value="abc"
+        placeholder="输入关键字查询"
         id="sreach"
         @clear="handleClear"
         @change="handleSearch"
-	  />
+      />
     </view>
 
     <!-- 政策法规列表区域 -->
     <!-- 修改列表项部分 -->
     <view class="policy-list">
-      <scroll-view 
+      <scroll-view
         class="policy-scroll"
         scroll-y
         @scrolltolower="loadNextPage"
@@ -23,25 +23,31 @@
         refresher-enabled
         :refresher-triggered="isRefreshing"
       >
-        <view 
+        <view
           class="policy-item"
           v-for="item in policyList"
           :key="item.id"
           @click="handlePolicyClick(item)"
         >
           <view class="item-left">
-            <image :src="itemImgUrl" class="policy-icon"></image>
+            <image
+              src="@/static/images/owner/policy.png"
+              class="policy-icon"
+              mode="aspectFit"
+            ></image>
           </view>
           <view class="item-right">
-            <view class="policy-title">{{ item.title }}</view>
-            <view class="policy-time">生效时间: {{ item.effectiveDate }}</view>
+            <view class="policy-title">
+              {{ item.title }}
+            </view>
+            <view class="policy-time">
+              生效时间: {{ item.effectiveDate }}
+            </view>
           </view>
         </view>
       </scroll-view>
     </view>
 
-    
-
     <!-- 加载更多状态组件 -->
     <uni-load-more :status="loadMoreStatus" />
   </view>
@@ -52,30 +58,29 @@ import { PolicyApi, formatPolicyContext } from '@/api/policy/index.js'
 import { formatDate } from '@/utils/ruoyi.js'
 import config from '@/config'
 
-
 export default {
   data() {
     return {
       isRefreshing: false, // 是否正在刷新
       searchValue: '', // 搜索关键字
-	    abc: '',
+      abc: '',
       policyList: [], // 政策法规列表数据
       pageNum: 1, // 当前页码
       pageSize: 10, // 每页显示条数
       total: 0, // 总数据条数
-      loadMoreStatus: 'more' ,// 加载更多状态：more-加载前 loading-加载中 noMore-没有更多
-	  itemImgUrl: config.imgUrl + '/miniohb/c103c92335bdd30d33ff8a062c219ead0626bf0a1898536bd7590285ca11c9db.png'
+      loadMoreStatus: 'more', // 加载更多状态：more-加载前 loading-加载中 noMore-没有更多
+      itemImgUrl:
+        config.imgUrl +
+        '/miniohb/c103c92335bdd30d33ff8a062c219ead0626bf0a1898536bd7590285ca11c9db.png'
     }
   },
   // 页面加载时获取列表数据
   onShow() {
-	  console.log(this.itemImgUrl)
+    console.log(this.itemImgUrl)
     this.getPolicyList()
   },
 
-
   methods: {
-
     // 下拉刷新
     onRefresh() {
       this.isRefreshing = true
@@ -83,42 +88,45 @@ export default {
       this.getPolicyList()
     },
     loadNextPage() {
-    console.log('列表值',this.policyList.length)
-    if (this.policyList.length < this.total) {
-      this.pageNum++
-      this.getPolicyList()
-
-    }
-  },
+      console.log('列表值', this.policyList.length)
+      if (this.policyList.length < this.total) {
+        this.pageNum++
+        this.getPolicyList()
+      }
+    },
     // 获取政策法规列表数据
     async getPolicyList() {
       try {
-        console.log('PolicyApi',this.searchValue)
+        console.log('PolicyApi', this.searchValue)
         this.loadMoreStatus = 'loading'
         const res = await PolicyApi.getPolicyPage({
           pageNum: this.pageNum,
           pageSize: this.pageSize,
           name: this.searchValue // 搜索关键字
         })
-        
+
         if (res.code === 0 && res.data.total > 0) {
           // 限制标题长度，超出显示省略号
           const formattedData = res.data.list.map(item => ({
             ...item,
-            title: item.name.length > 15 ? item.name.slice(0, 15) + '...' : item.name,
-            effectiveDate: formatDate(item.effectiveDate,'YYYY年MM月DD日')
-        }))
-          
+            title:
+              item.name.length > 15
+                ? item.name.slice(0, 15) + '...'
+                : item.name,
+            effectiveDate: formatDate(item.effectiveDate, 'YYYY年MM月DD日')
+          }))
+
           // 判断是首次加载还是加载更多
           if (this.pageNum === 1) {
             this.policyList = formattedData
           } else {
             this.policyList = [...this.policyList, ...formattedData]
           }
-          console.log('列表信息',res)
+          console.log('列表信息', res)
           this.total = res.data.total
           // 更新加载状态
-          this.loadMoreStatus = this.policyList.length >= this.total ? 'noMore' : 'more'
+          this.loadMoreStatus =
+            this.policyList.length >= this.total ? 'noMore' : 'more'
         }
       } catch (error) {
         console.error(error)
@@ -127,24 +135,23 @@ export default {
           title: '获取列表失败',
           icon: 'none'
         })
-      }
-      finally {
-        this.loadMoreStatus = this.policyList.length >= this.total? 'noMore' :'more'
-            // 无论成功失败都关闭刷新状态
-       // 确保在数据加载完成后关闭刷新状态
-       setTimeout(() => {
+      } finally {
+        this.loadMoreStatus =
+          this.policyList.length >= this.total ? 'noMore' : 'more'
+        // 无论成功失败都关闭刷新状态
+        // 确保在数据加载完成后关闭刷新状态
+        setTimeout(() => {
           this.isRefreshing = false
-        }, 300)  // 添加短暂延时，确保动画效果完整
+        }, 300) // 添加短暂延时，确保动画效果完整
       }
     },
     // 搜索事件处理
     handleSearch(e) {
-      if(e.detail && e.detail.length > 1){
+      if (e.detail && e.detail.length > 1) {
         this.pageNum = 1 // 重置页码
         this.searchValue = e.detail // 更新搜索关键字
         this.getPolicyList()
       }
-
     },
     // 清除搜索事件处理
     handleClear() {
@@ -164,11 +171,11 @@ export default {
 
 <style lang="scss">
 .policy-container {
-  background: var(--LightMode-Secondary-Secondary, #F9F9F9);
+  background: var(--LightMode-Secondary-Secondary, #f9f9f9);
   min-height: 100vh;
   display: flex;
   flex-direction: column;
-  
+
   .search-box {
     padding: 20rpx;
     background: #fff;
@@ -178,16 +185,17 @@ export default {
     right: 0;
     z-index: 1;
   }
-  
+
   .policy-list {
     margin-top: 120rpx; // 为搜索框留出空间
     flex: 1;
-    
+
     .policy-scroll {
       height: calc(100vh - 120rpx);
       box-sizing: border-box;
+      padding-top: 24rpx;
     }
-    
+
     .policy-item {
       display: flex;
       padding: 24rpx;
@@ -197,33 +205,33 @@ export default {
       margin: 24rpx;
       margin-bottom: 0;
       border-radius: 16rpx;
-      
+      border-bottom: 2rpx solid var(--LightMode-Grey-Grey-100, #f9f9f9);
       .item-left {
         border-radius: 100rpx;
-        background: var(--LightMode-Grey-Grey-100, #F9F9F9);
+        background: var(--LightMode-Grey-Grey-100, #f9f9f9);
         padding: 16rpx;
         display: flex;
         justify-content: center;
         align-items: center;
-        
         .policy-icon {
           width: 40rpx;
           height: 40rpx;
           flex-shrink: 0;
         }
       }
-      
+
       .item-right {
         flex: 1;
         overflow: hidden;
-        
+
         .policy-title {
+          font-weight: bold;
+          margin-bottom: 8rpx;
           font-size: 28rpx;
           color: #333;
-          margin-bottom: 12rpx;
           line-height: 1.4;
         }
-        
+
         .policy-time {
           font-size: 24rpx;
           color: #999;
@@ -238,4 +246,4 @@ export default {
 ::v-deep .uni-load-more {
   padding: 24rpx 0;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/sub/task/detail.vue b/sub/task/detail.vue
index 52e425b..737a6fc 100644
--- a/sub/task/detail.vue
+++ b/sub/task/detail.vue
@@ -3,14 +3,22 @@
     <view
       class="detail-container"
       :style="{
-        paddingBottom: isSelect.length > 0 ? '70px' : '20px'
+        paddingBottom: isSelect.length > 0 ? '140rpx' : '40rpx'
       }"
     >
       <view class="box detail">
-        <text class="wd-font-800 wd-text-16" style="margin-bottom: 4px">
+        <text class="wd-font-800 wd-text-16" style="color: #071437">
           {{ detail.title }}
         </text>
         <view class="tagList">
+          <view class="tag" v-if="detail.deptName">
+            {{ detail.deptName }}
+          </view>
+          <view class="tag">
+            {{
+              $dict.echoDicValue(dictMap.task_priority, detail.priority)
+            }}
+          </view>
           <view
             v-for="(tag, index) in detail.tagList"
             :key="index"
@@ -23,48 +31,22 @@
           class="wd-flex wd-text-13"
           style="justify-content: space-between"
         >
-          <view class="wd-flex" style="align-items: center; gap: 4px">
-            <u-icon name="calendar" color="#17C653" />
-            <text class="wd-text-13 wd-ml-4px">
+          <view class="wd-flex" style="align-items: center; gap: 8rpx">
+            <u-icon name="calendar" color="#17C653" size="16" />
+            <text
+              class="wd-text-13"
+              style="font-weight: bold; margin-right: 8rpx"
+            >
               {{
                 `${$util.formatDate(
                   detail.startDate,
-                  'YYYY/M/D'
-                )}~${$util.formatDate(detail.endDate, 'YYYY/M/D')}`
+                  'YYYY年M月D日'
+                )} 至 ${$util.formatDate(detail.endDate, 'YYYY年M月D日')}`
               }}
             </text>
           </view>
         </view>
-        <view
-          style="
-            font-size: 13px;
-            line-height: 160%;
-            position: relative;
-            transform: 0.2s all;
-          "
-          v-if="detail.description.length < 20"
-        >
-          {{ detail.description }}
-        </view>
-        <view
-          v-else
-          style="
-            font-size: 13px;
-            line-height: 160%;
-            position: relative;
-            transform: 0.2s all;
-          "
-          @tap="isShowAllText = !isShowAllText"
-        >
-          {{
-            isShowAllText
-              ? detail.description
-              : `${detail.description.slice(1, 100)}...`
-          }}
-          <text style="color: #17c653; padding-left: 4px">
-            {{ isShowAllText ? '收起' : '展开' }}
-          </text>
-        </view>
+        <cs-text-more :value="detail.description" />
         <view class="audit">
           <cs-dict-tag
             :dict="dictMap.task_state"
@@ -89,7 +71,7 @@
             <van-dropdown-item
               v-if="showItem(['director'])"
               :value="queryParams.departmentId"
-              :options="getDropdownOption('dept')"
+              :options="dropOption.dept"
               @change="
                 v => {
                   querySelect(v, 'departmentId')
@@ -110,7 +92,7 @@
             />
             <van-dropdown-item
               :value="queryParams.Inspections_status"
-              :options="getDropdownOption('Inspections_status')"
+              :options="dropOption.status"
               @change="
                 v => {
                   querySelect(v, 'inspectionsStatus')
@@ -118,7 +100,7 @@
               "
             />
           </van-dropdown-menu>
-          <view class="wd-font-600">
+          <view class="wd-font-600" style="flex: 0 0 200rpx">
             (当前
             <text style="color: #17c653">{{ list.length }}</text>
             条记录)
@@ -139,15 +121,27 @@
           @tap.native.stop="select(record.id)"
           v-if="['3', null].includes(record.inspectionStatus)"
         >
-          <u-icon name="checkbox-mark" size="16px" color="#fff"></u-icon>
+          <u-icon name="checkbox-mark" size="16" color="#fff"></u-icon>
         </view>
         <view class="disable" v-else></view>
         <view class="info">
-          <view class="name">{{ record.enterpriseName }}</view>
-          <view style="font-size: 1 3px">
+          <view class="name">
+            {{ record.enterpriseName }}
+          </view>
+          <view
+            style="
+              font-size: 26rpx;
+              padding-right: 3rem;
+              margin-bottom: 4rpx;
+              white-space: nowrap;
+              text-overflow: ellipsis;
+              width: 528rpx;
+              overflow: hidden;
+            "
+          >
             {{ record.enterpriseAddress }}
           </view>
-          <view class="tagList" style="margin-top: 8px">
+          <view class="tagList" style="margin-top: 16rpx">
             <view
               v-for="(item, index) in record.tagList"
               :key="index"
@@ -164,7 +158,12 @@
           ></cs-dict-tag>
         </view>
       </view>
-      <u-loadmore :status="load" marginTop="12" marginBottom="12" />
+      <u-loadmore
+        :status="load"
+        marginTop="12"
+        marginBottom="12"
+        v-if="load != 'nomore'"
+      />
       <view class="btn-box" v-if="isSelect.length > 0">
         <view class="confirm-btn" @tap="replay">
           已选择({{ isSelect.length }})
@@ -263,12 +262,18 @@ export default {
           value: '',
           text: '按人员'
         }
-      ]
+      ],
+      // 下拉选项
+      dropOption: {
+        dept: [],
+        userList: [],
+        status: []
+      }
     }
   },
-  onLoad(res) {
+  async onLoad(res) {
     this.detail.id = res.id
-    this.getDict()
+    await this.getDict()
   },
   onPageScroll(e) {
     this.OptionsOffset.isTop = e.scrollTop + 10 > this.OptionsOffset.top
@@ -304,13 +309,42 @@ export default {
      */
     async getDict() {
       const dict = await getDictBatchByType({
-        type: ['task_state', 'Inspections_status'].join(',')
+        type: ['task_state', 'Inspections_status', 'task_priority'].join(
+          ','
+        )
       })
       const dept = await getDeptTree()
       this.dictMap = {
         ...dict.data,
         dept: dept.data
       }
+      this.dropOption = {
+        dept: [
+          {
+            value: '',
+            text: '按部门'
+          },
+          ...dept.data.map(d => {
+            return {
+              value: d.id,
+              text: d.name
+            }
+          })
+        ],
+        status: [
+          {
+            value: '',
+            text: '按状态'
+          },
+          ...dict.data.task_state.map(d => {
+            return {
+              ...d,
+              value: d.value,
+              text: d.label
+            }
+          })
+        ]
+      }
     },
     getDropdownOption(key) {
       const keyMap = {
@@ -385,17 +419,17 @@ export default {
     getUserOption({ detail }) {
       this.getUser().then(res => {
         this.userList = [
+          {
+            value: '',
+            text: '按人员'
+          },
           ...res.map(i => {
             return {
               ...i,
               value: i.userId,
               text: i.realName
             }
-          }),
-          {
-            value: '',
-            text: '按人员'
-          }
+          })
         ]
         detail.callback(true)
       })
@@ -501,38 +535,18 @@ export default {
       position: absolute;
       right: 0;
       top: 0;
-      transform: translateX(23px) translateY(16px) rotateZ(45deg);
+      transform: translateX(58rpx) translateY(24rpx) rotateZ(45deg);
       transform-origin: 50% 50%;
     }
   }
-  .tagList {
-    display: flex;
-    align-items: center;
-    gap: var(--Number-4px, 4px);
-    .tag {
-      display: flex;
-      padding: var(--Number-2px, 2px) var(--Number-6px, 6px);
-      justify-content: center;
-      align-items: center;
-      gap: var(--Number-4px, 4px);
-      border-radius: var(--Number-2px, 2px);
-      background: var(--LightMode-Grey-Grey-100, #f9f9f9);
-      color: var(--LightMode-Grey-Grey-600, #78829d);
-      text-align: center;
-      font-size: 12px;
-      font-style: normal;
-      font-weight: 400;
-      line-height: normal;
-    }
-  }
   .record {
     background-color: #fff;
     display: flex;
-    padding: 12px 16px;
+    padding: 24rpx 32rpx;
     align-items: center;
     border-radius: var(--Number-8px, 8px);
-    border: 1px solid var(--LightMode-Grey-Grey-100, #f9f9f9);
-    margin: 12px;
+    border: 2rpx solid var(--LightMode-Grey-Grey-100, #f9f9f9);
+    margin: 24rpx;
     margin-top: 0;
     position: relative;
     overflow: hidden;
@@ -541,45 +555,49 @@ export default {
       right: 0;
       top: 0;
       transform-origin: 50% 50%;
-      transform: translateX(30px) translateY(10px) rotateZ(45deg);
+      transform: translateX(64rpx) translateY(18rpx) rotateZ(45deg);
     }
     .select {
-      width: 24px;
-      height: 24px;
-      border: 2px solid $cs-color-main;
-      border-radius: 6px;
+      width: 44rpx;
+      height: 44rpx;
+      border: 4rpx solid $cs-color-main;
+      border-radius: 12rpx;
       display: flex;
       align-items: center;
       justify-content: center;
       transition: 0.2s all;
-      margin-right: 16px;
+      margin-right: 32rpx;
     }
     .disable {
-      width: 24px;
-      height: 24px;
-      border: 2px solid #dbdfe9;
-      margin-right: 16px;
+      width: 44rpx;
+      height: 44rpx;
+      border: 4rpx solid #dbdfe9;
+      margin-right: 32rpx;
       border-radius: 100%;
       position: relative;
       &::after {
         content: '';
         position: absolute;
         inset: 0;
-        border-left: 2px solid #dbdfe9;
+        border-left: 4rpx solid #dbdfe9;
         transform-origin: 0 50%;
-        transform: translateX(calc(50% - 1px)) rotateZ(45deg);
+        transform: translateX(calc(50% - 2rpx)) rotateZ(45deg);
       }
     }
     .isSelect {
       background-color: $cs-color-main;
     }
     .info {
-      font-size: 13px;
+      font-size: 26rpx;
       .name {
-        font-size: 16px;
+        font-size: 32rpx;
         font-weight: 600;
         color: #071437;
-        margin-bottom: 4px;
+        margin-bottom: 8rpx;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        width: 480rpx;
+        overflow: hidden;
       }
     }
     &:active {
@@ -641,7 +659,7 @@ export default {
       display: flex;
       .info {
         .name {
-          font-size: 16px;
+          font-size: 30rpx;
           font-weight: bold;
         }
         .dept {
diff --git a/sub/task/enforce.vue b/sub/task/enforce.vue
index d87db29..d3b55a5 100644
--- a/sub/task/enforce.vue
+++ b/sub/task/enforce.vue
@@ -46,7 +46,7 @@
       >
         <view style="font-weight: bold">
           <text style="color: #f8285a; margin-right: 4px">*</text>
-          上传证明
+          上传照片
         </view>
       </view>
       <u-upload
@@ -54,9 +54,9 @@
         @afterRead="addPhoto"
         @delete="delPhoto"
         multiple
-        :maxCount="3"
-        width="96px"
-        height="96px"
+        width="96"
+        height="96"
+        :maxCount="6"
       ></u-upload>
     </view>
 
@@ -272,29 +272,4 @@ export default {
 ::v-deep .uni-easyinput__content-textarea {
   min-height: 400rpx;
 }
-::v-deep .u-upload__button {
-  border-radius: 16rpx !important;
-  border: 1px solid #f1f1f4;
-  background-color: #f9f9f9 !important;
-}
-
-::v-deep .u-upload__wrap {
-  .u-upload__wrap__preview {
-    width: 192rpx;
-    height: 192rpx;
-    border-radius: 16rpx !important;
-    overflow: visible !important;
-    .u-upload__wrap__preview__image {
-      border-radius: 16rpx !important;
-    }
-    .u-upload__deletable {
-      border-radius: 100% !important;
-      background-color: #f8285a !important;
-      transform: translateX(50%) translateY(-50%);
-      .u-upload__deletable__icon {
-        position: relative;
-      }
-    }
-  }
-}
 </style>
diff --git a/sub/task/locate.vue b/sub/task/locate.vue
index fe6ecfe..b934103 100644
--- a/sub/task/locate.vue
+++ b/sub/task/locate.vue
@@ -230,7 +230,7 @@ export default {
         scene: `aId=${this.inspectionsId}&bId=${this.enterpriseId}`,
         path: 'sub/task/locate',
         checkPath: false,
-        envVersion: 'trial',
+        envVersion: 'develop',
         isHyaline: true
       })
       this.miniCode = `data:image/jpeg;base64,${res.data}`
diff --git a/sub/task/record.vue b/sub/task/record.vue
index 114c599..26410c4 100644
--- a/sub/task/record.vue
+++ b/sub/task/record.vue
@@ -1,7 +1,7 @@
 <template>
   <scroll-view class="view-container" scroll-y>
     <view class="box detail" style="margin-bottom: 12px">
-      <text class="wd-font-800 wd-text-16" style="margin-bottom: 4px">
+      <text class="wd-font-800 wd-text-16">
         {{ detail.title }}
       </text>
       <view class="tagList">
@@ -20,7 +20,7 @@
         class="wd-flex wd-text-13"
         style="justify-content: space-between"
       >
-        <view class="wd-flex" style="align-items: center; gap: 4px">
+        <view class="wd-flex" style="align-items: center; gap: 8rpx">
           <u-icon name="calendar" color="#17C653" />
           <text class="wd-text-13 wd-ml-4px wd-font-800">
             {{
@@ -32,37 +32,7 @@
           </text>
         </view>
       </view>
-      <view
-        style="
-          font-size: 26rpx;
-          line-height: 160%;
-          position: relative;
-          transform: 0.2s all;
-        "
-        v-if="detail.description.length < 20"
-      >
-        {{ detail.description }}
-      </view>
-      <view
-        v-else
-        style="
-          font-size: 26rpx;
-          line-height: 160%;
-          position: relative;
-          transform: 0.2s all;
-        "
-        @tap="isShowAllText = !isShowAllText"
-      >
-        {{
-          isShowAllText
-            ? detail.description
-            : `${detail.description.slice(1, 100)}...`
-        }}
-        <text style="color: #17c653; padding-left: 8rpx">
-          {{ isShowAllText ? '收起' : '展开' }}
-        </text>
-      </view>
-
+      <cs-text-more :value="detail.description"></cs-text-more>
       <view
         class="wd-flex wd-items-center enterprise"
         @tap="goEnterprise(detail.enterprise)"
@@ -72,20 +42,17 @@
           shape="square"
           size="64"
         ></u-avatar>
-        <view class="wd-flex wd-flex-col" style="gap: 4px">
+        <view class="wd-flex wd-flex-col">
           <text class="wd-font-800 wd-text-15">
             {{ detail.enterprise.enterprisesName }}
           </text>
-		  <!-- @tap.native.stop="viewPosition(detail.enterprise)" -->
-          <view
-            class="wd-flex wd-pb-8px"
-          >
-            <u-icon name="map" size="14" color="#17C653"></u-icon>
-            <text class="address wd-text-12" style="margin-left: 4px">
+          <view class="wd-flex" style="margin-top: 4rpx">
+            <u-icon name="map" size="28rpx" color="#17C653"></u-icon>
+            <text class="address wd-text-12" style="margin-left: 8rpx">
               {{ detail.enterprise.address }}
             </text>
           </view>
-          <view class="tagList">
+          <view class="tagList" style="margin-top: 16rpx">
             <view class="tag" v-if="detail.enterprise.region">
               {{
                 $dict.echoDicValue(
@@ -128,18 +95,20 @@
         :key="item.id"
         @tap="goLog(item)"
       >
-        <view style="margin-bottom: 12px">
+        <view style="margin-bottom: 24rpx">
           <text
             :style="{
-              marginRight: '10px',
+              marginRight: '20rpx',
               fontWeight: 'bold',
               color: $dict.echoDictOption(
-                dictMap.inspections_mark,
+                dictMap.Inspections_status,
                 item.status
               ).remark
             }"
           >
-            {{ $dict.echoDicValue(dictMap.inspections_mark, item.status) }}
+            {{
+              $dict.echoDicValue(dictMap.Inspections_status, item.status)
+            }}
           </text>
           <text>
             {{ $util.formatDate(item.createTime, 'YYYY/M/D h:m') }}
@@ -153,14 +122,14 @@
             class="row"
             v-for="people in item.userList"
             :key="people.userId"
-            style="display: inline-flex; gap: 12px; margin-right: 12px"
+            style="display: inline-flex; gap: 24rpx; margin-right: 24rpx"
           >
             <u-avatar
               :src="people.avtar"
-              size="40px"
+              size="80rpx"
               shape="circle"
             ></u-avatar>
-            <view class="wd-flex wd-flex-col" style="gap: 2px">
+            <view class="wd-flex wd-flex-col" style="gap: 4rpx">
               <text>{{ people.realName }}</text>
               <text>{{ people.deptName }}</text>
             </view>
@@ -177,7 +146,7 @@
       </view>
       <view class="audit">
         <cs-dict-tag
-          :dict="dictMap.Inspections_status"
+          :dict="dictMap.inspections_mark"
           :value="inspectionsState"
           color="#fff"
           :bgColor="setColor(inspectionsState)"
@@ -326,94 +295,47 @@ export default {
 
 <style lang="scss" scoped>
 .view-container {
-  padding: 0 12px;
+  padding: 0 24rpx;
   position: relative;
-  padding-bottom: 100px;
+  padding-bottom: 200rpx;
   .box {
     background-color: #fff;
     border-radius: $cs-border-radius;
-    padding: 16px;
-    margin-top: 12px;
+    padding: 32rpx;
+    margin-top: 24rpx;
   }
   .row {
     border-radius: $cs-border-radius;
-    padding: 12px;
-    border: 1px solid #f9f9f9;
+    padding: 24rpx;
+    border: 2rpx solid #f9f9f9;
   }
   .detail {
     display: flex;
     flex-flow: column nowrap;
-    gap: 12px;
+    gap: 24rpx;
     position: relative;
     overflow: hidden;
-    .tagList {
-      display: flex;
-      align-items: center;
-      gap: var(--Number-4px, 4px);
-      .tag {
-        display: flex;
-        padding: var(--Number-2px, 2px) var(--Number-6px, 6px);
-        justify-content: center;
-        align-items: center;
-        gap: var(--Number-4px, 4px);
-        border-radius: var(--Number-2px, 2px);
-        background: var(--LightMode-Grey-Grey-100, #f9f9f9);
-        color: var(--LightMode-Grey-Grey-600, #78829d);
-        text-align: center;
-        font-size: 12px;
-        font-style: normal;
-        font-weight: 400;
-        line-height: normal;
-      }
-    }
+
     .enterprise {
-      border: 1px solid #f9f9f9;
-      padding: 12px;
+      border: 2rpx solid #f9f9f9;
+      padding: 24rpx;
       border-radius: $cs-border-radius;
-      gap: 12px;
+      gap: 24rpx;
       position: relative;
       overflow: hidden;
-      font-size: 12px;
+      font-size: 24rpx;
       .address {
         color: $uni-text-color-grey;
-        text-decoration: underline;
       }
       &:active {
         background-color: $cs-color-touch;
       }
-      .tagList {
-        margin-top: 8px;
-        display: flex;
-        gap: 4px;
-        color: $uni-text-color-grey;
-        display: flex;
-        flex-flow: row wrap;
-        .tag {
-          font-size: 12px;
-          display: flex;
-          padding: 2px 6px;
-          justify-content: center;
-          align-items: center;
-          border-radius: 2px;
-          background: #f9f9f9;
-        }
-      }
-      .audit {
-        position: absolute;
-        right: -19px;
-        top: 6px;
-        transform: rotateZ(45deg);
-        transform-origin: 50% 50%;
-        padding: 4px 20px;
-        font-size: 12px;
-        text-align: center;
-      }
     }
     .audit {
       position: absolute;
       right: 0;
       top: 0;
-      transform: translateX(23px) translateY(16px) rotateZ(45deg);
+      transform: translateX(36rpx) translateY(32rpx) rotateZ(45deg);
       transform-origin: 50% 50%;
     }
   }
@@ -423,26 +345,26 @@ export default {
     overflow: hidden;
     display: flex;
     flex-flow: column nowrap;
-    gap: 12px;
+    gap: 24rpx;
     .emty {
       display: flex;
       flex-direction: column;
       align-items: center;
-      gap: 12px;
-      border-radius: var(--Number-8px, 8px);
-      border: 1px solid var(--LightMode-Grey-Grey-100, #f9f9f9);
-      padding: 24px 12px;
-      border-radius: 8px;
+      gap: 24rpx;
+      border-radius: 16rpx;
+      border: 2rpx solid var(--LightMode-Grey-Grey-100, #f9f9f9);
+      padding: 48rpx 24rpx;
+      border-radius: 16rpx;
       .image {
-        width: 64px;
-        height: 64px;
+        width: 128rpx;
+        height: 128rpx;
       }
     }
     .audit {
       position: absolute;
       right: 0;
       top: 0;
-      transform: translateX(30px) translateY(8px) rotateZ(45deg);
+      transform: translateX(60rpx) translateY(16rpx) rotateZ(45deg);
       transform-origin: 50% 50%;
     }
   }
@@ -452,16 +374,16 @@ export default {
     }
   }
   .operation {
-    padding: 12px;
+    padding: 24rpx;
     display: flex;
     align-items: center;
     justify-content: center;
-    gap: 12px;
+    gap: 24rpx;
     .btn {
       flex: 1;
-      border-radius: 8px;
+      border-radius: 16rpx;
       display: flex;
-      padding: 12px 0;
+      padding: 24rpx 0;
       align-items: center;
       justify-content: center;
     }
diff --git a/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue b/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue
index 5678f7d..63805a8 100644
--- a/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue
+++ b/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue
@@ -16,7 +16,7 @@
  * 
  -->
 <template>
-  <view class="chartsview" :id="'ChartBoxId'+cid">
+  <view class="chartsview" :id="'ChartBoxId' + cid">
     <view v-if="mixinDatacomLoading">
       <!-- 自定义加载状态，请改这里 -->
       <qiun-loading :loadingType="loadingType" />
@@ -30,11 +30,11 @@
     <block v-if="echarts">
       <view
         :style="{ background: background }"
-        style="width: 100%;height: 100%;"
+        style="width: 100%; height: 100%"
         :data-directory="directory"
-        :id="'EC'+cid" 
-        :prop="echartsOpts" 
-        :change:prop="rdcharts.ecinit" 
+        :id="'EC' + cid"
+        :prop="echartsOpts"
+        :change:prop="rdcharts.ecinit"
         :resize="echartsResize"
         :change:resize="rdcharts.ecresize"
         v-show="showchart"
@@ -49,14 +49,18 @@
         v-on:touchstart="rdcharts.touchStart"
         v-on:touchmove="rdcharts.touchMove"
         v-on:touchend="rdcharts.touchEnd"
-        :id="'UC'+cid"
+        :id="'UC' + cid"
         :prop="uchartsOpts"
         :change:prop="rdcharts.ucinit"
       >
         <canvas
           :id="cid"
           :canvasId="cid"
-          :style="{ width: cWidth + 'px', height: cHeight + 'px', background: background }"
+          :style="{
+            width: cWidth + 'px',
+            height: cHeight + 'px',
+            background: background
+          }"
           :disable-scroll="disableScroll"
           @error="_error"
           v-show="showchart"
@@ -72,7 +76,11 @@
         :canvasId="cid"
         :width="cWidth * pixel"
         :height="cHeight * pixel"
-        :style="{ width: cWidth + 'px', height: cHeight + 'px', background: background }"
+        :style="{
+          width: cWidth + 'px',
+          height: cHeight + 'px',
+          background: background
+        }"
         :disable-scroll="disScroll"
         @tap="_tap"
         @touchstart="_touchStart"
@@ -88,7 +96,11 @@
         :canvasId="cid"
         :width="cWidth * pixel"
         :height="cHeight * pixel"
-        :style="{ width: cWidth + 'px', height: cHeight + 'px', background: background }"
+        :style="{
+          width: cWidth + 'px',
+          height: cHeight + 'px',
+          background: background
+        }"
         :disable-scroll="disScroll"
         @tap="_tap"
         @error="_error"
@@ -103,7 +115,11 @@
         <canvas
           :id="cid"
           :canvasId="cid"
-          :style="{ width: cWidth + 'px', height: cHeight + 'px', background: background }"
+          :style="{
+            width: cWidth + 'px',
+            height: cHeight + 'px',
+            background: background
+          }"
           type="2d"
           :disable-scroll="disScroll"
           @touchstart="_touchStart"
@@ -117,7 +133,11 @@
         <canvas
           :id="cid"
           :canvasId="cid"
-          :style="{ width: cWidth + 'px', height: cHeight + 'px', background: background }"
+          :style="{
+            width: cWidth + 'px',
+            height: cHeight + 'px',
+            background: background
+          }"
           type="2d"
           :disable-scroll="disScroll"
           @error="_error"
@@ -130,7 +150,11 @@
         <canvas
           :id="cid"
           :canvasId="cid"
-          :style="{ width: cWidth + 'px', height: cHeight + 'px', background: background }"
+          :style="{
+            width: cWidth + 'px',
+            height: cHeight + 'px',
+            background: background
+          }"
           @touchstart="_touchStart"
           @touchmove="_touchMove"
           @touchend="_touchEnd"
@@ -139,11 +163,15 @@
           v-if="showchart"
         />
       </view>
-      <view v-if="!ontouch" >
+      <view v-if="!ontouch">
         <canvas
           :id="cid"
           :canvasId="cid"
-          :style="{ width: cWidth + 'px', height: cHeight + 'px', background: background }"
+          :style="{
+            width: cWidth + 'px',
+            height: cHeight + 'px',
+            background: background
+          }"
           :disable-scroll="disScroll"
           @tap="_tap"
           @error="_error"
@@ -156,51 +184,64 @@
 </template>
 
 <script>
-import uCharts from '../../js_sdk/u-charts/u-charts.js';
-import cfu from '../../js_sdk/u-charts/config-ucharts.js';
+import uCharts from '../../js_sdk/u-charts/u-charts.js'
+import cfu from '../../js_sdk/u-charts/config-ucharts.js'
 // #ifdef APP-VUE || H5
-import cfe from '../../js_sdk/u-charts/config-echarts.js';
+import cfe from '../../js_sdk/u-charts/config-echarts.js'
 // #endif
 
 function deepCloneAssign(origin = {}, ...args) {
   for (let i in args) {
     for (let key in args[i]) {
       if (args[i].hasOwnProperty(key)) {
-        origin[key] = args[i][key] && typeof args[i][key] === 'object' ? deepCloneAssign(Array.isArray(args[i][key]) ? [] : {}, origin[key], args[i][key]) : args[i][key];
+        origin[key] =
+          args[i][key] && typeof args[i][key] === 'object'
+            ? deepCloneAssign(
+                Array.isArray(args[i][key]) ? [] : {},
+                origin[key],
+                args[i][key]
+              )
+            : args[i][key]
       }
     }
   }
-  return origin;
+  return origin
 }
 
-function formatterAssign(args,formatter) {
+function formatterAssign(args, formatter) {
   for (let key in args) {
-    if(args.hasOwnProperty(key) && args[key] !== null && typeof args[key] === 'object'){
-      formatterAssign(args[key],formatter)
-    }else if(key === 'format' && typeof args[key] === 'string'){
-      args['formatter'] = formatter[args[key]] ? formatter[args[key]] : undefined;
+    if (
+      args.hasOwnProperty(key) &&
+      args[key] !== null &&
+      typeof args[key] === 'object'
+    ) {
+      formatterAssign(args[key], formatter)
+    } else if (key === 'format' && typeof args[key] === 'string') {
+      args['formatter'] = formatter[args[key]]
+        ? formatter[args[key]]
+        : undefined
     }
   }
-  return args;
+  return args
 }
 
 // 时间转换函数，为了匹配uniClinetDB读取出的时间与categories不同
 function getFormatDate(date) {
-	var seperator = "-";
-	var year = date.getFullYear();
-	var month = date.getMonth() + 1;
-	var strDate = date.getDate();
-	if (month >= 1 && month <= 9) {
-			month = "0" + month;
-	}
-	if (strDate >= 0 && strDate <= 9) {
-			strDate = "0" + strDate;
-	}
-	var currentdate = year + seperator + month + seperator + strDate;
-	return currentdate;
+  var seperator = '-'
+  var year = date.getFullYear()
+  var month = date.getMonth() + 1
+  var strDate = date.getDate()
+  if (month >= 1 && month <= 9) {
+    month = '0' + month
+  }
+  if (strDate >= 0 && strDate <= 9) {
+    strDate = '0' + strDate
+  }
+  var currentdate = year + seperator + month + seperator + strDate
+  return currentdate
 }
 
-var lastMoveTime = null;
+var lastMoveTime = null
 /**
  * 防抖
  *
@@ -218,15 +259,15 @@ var lastMoveTime = null;
  * }, 1000)
  */
 function debounce(fn, wait) {
-  let timer = false;
-  return function() {
-    clearTimeout(timer);
-    timer && clearTimeout(timer);
+  let timer = false
+  return function () {
+    clearTimeout(timer)
+    timer && clearTimeout(timer)
     timer = setTimeout(() => {
-      timer = false;
-      fn.apply(this, arguments); // 把参数传进去
-    }, wait);
-  };
+      timer = false
+      fn.apply(this, arguments) // 把参数传进去
+    }, wait)
+  }
 }
 
 export default {
@@ -259,19 +300,19 @@ export default {
         return {
           categories: [],
           series: []
-        };
+        }
       }
     },
     opts: {
       type: Object,
       default() {
-        return {};
+        return {}
       }
     },
     eopts: {
       type: Object,
       default() {
-        return {};
+        return {}
       }
     },
     loadingType: {
@@ -360,13 +401,13 @@ export default {
     },
     textEnum: {
       type: Array,
-      default () {
+      default() {
         return []
       }
     },
     groupEnum: {
       type: Array,
-      default () {
+      default() {
         return []
       }
     },
@@ -384,7 +425,7 @@ export default {
     },
     menus: {
       type: Array,
-      default () {
+      default() {
         return []
       }
     }
@@ -407,16 +448,16 @@ export default {
       cHeight: 250,
       showchart: false,
       echarts: false,
-      echartsResize:{
-        state:false
+      echartsResize: {
+        state: false
       },
       uchartsOpts: {},
       echartsOpts: {},
-      drawData:{},
-      lastDrawTime:null,
-    };
+      drawData: {},
+      lastDrawTime: null
+    }
   },
-  created(){
+  created() {
     this.cid = this.canvasId
     if (this.canvasId == 'uchartsid' || this.canvasId == '') {
       let t = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
@@ -428,93 +469,100 @@ export default {
       this.cid = id
     }
     const systemInfo = uni.getSystemInfoSync()
-    if(systemInfo.platform === 'windows' || systemInfo.platform === 'mac'){
-      this.inWin = true;
+    if (
+      systemInfo.platform === 'windows' ||
+      systemInfo.platform === 'mac'
+    ) {
+      this.inWin = true
     }
     // #ifdef MP-WEIXIN
-    this.inWx = true;
-    if (this.canvas2d === false || systemInfo.platform === 'windows' || systemInfo.platform === 'mac') {
-      this.type2d = false;
-    }else{
-      this.type2d = true;
-      this.pixel = systemInfo.pixelRatio;
+    this.inWx = true
+    if (
+      this.canvas2d === false ||
+      systemInfo.platform === 'windows' ||
+      systemInfo.platform === 'mac'
+    ) {
+      this.type2d = false
+    } else {
+      this.type2d = true
+      this.pixel = systemInfo.pixelRatio
     }
     // #endif
     //非微信小程序端强制关闭canvas2d模式
     // #ifndef MP-WEIXIN
-    this.type2d = false;
+    this.type2d = false
     // #endif
     // #ifdef  MP-TOUTIAO || MP-LARK || MP-ALIPAY
-    this.type2d = this.canvas2d;
+    this.type2d = this.canvas2d
     // #endif
     // #ifdef MP-ALIPAY
-    this.inAli = true;
-    this.pixel = systemInfo.pixelRatio;
+    this.inAli = true
+    this.pixel = systemInfo.pixelRatio
     // #endif
     // #ifdef MP-BAIDU
-    this.inBd = true;
+    this.inBd = true
     // #endif
     // #ifdef MP-TOUTIAO
-    this.inTt = true;
+    this.inTt = true
     // #endif
-    this.disScroll = this.disableScroll;
+    this.disScroll = this.disableScroll
   },
   mounted() {
     // #ifdef APP-VUE
-    this.inApp = true;
+    this.inApp = true
     if (this.echartsApp === true) {
-      this.echarts = true;
-      this.openmouse = false;
+      this.echarts = true
+      this.openmouse = false
     }
     // #endif
     // #ifdef APP-NVUE
-    this.inApp = true;
+    this.inApp = true
     this.mixinDatacomLoading = false
-    this.mixinDatacomErrorMessage = "暂不支持NVUE"
+    this.mixinDatacomErrorMessage = '暂不支持NVUE'
     // #endif
     // #ifdef H5
-    this.inH5 = true;
-    if(this.inWin === true){
-      this.openmouse = this.onmouse;
+    this.inH5 = true
+    if (this.inWin === true) {
+      this.openmouse = this.onmouse
     }
     if (this.echartsH5 === true) {
-      this.echarts = true;
+      this.echarts = true
     }
     // #endif
-    this.$nextTick(()=>{
-      this.beforeInit();
+    this.$nextTick(() => {
+      this.beforeInit()
     })
     // #ifndef MP-ALIPAY || MP-BAIDU || MP-TOUTIAO || APP-VUE
-    const time = this.inH5 ? 500 : 200;
-    const _this = this;
+    const time = this.inH5 ? 500 : 200
+    const _this = this
     uni.onWindowResize(
-      debounce(function(res) {
+      debounce(function (res) {
         if (_this.mixinDatacomLoading == true) {
-          return;
+          return
         }
-        let errmsg = _this.mixinDatacomErrorMessage;
+        let errmsg = _this.mixinDatacomErrorMessage
         if (errmsg !== null && errmsg !== 'null' && errmsg !== '') {
-          return;
+          return
         }
         if (_this.echarts) {
-          _this.echartsResize.state = !_this.echartsResize.state;
+          _this.echartsResize.state = !_this.echartsResize.state
         } else {
-          _this.resizeHandler();
+          _this.resizeHandler()
         }
       }, time)
-    );
+    )
     // #endif
   },
-  destroyed(){
-    if(this.echarts === true){
+  destroyed() {
+    if (this.echarts === true) {
       delete cfe.option[this.cid]
       delete cfe.instance[this.cid]
-    }else{
+    } else {
       delete cfu.option[this.cid]
       delete cfu.instance[this.cid]
     }
     // #ifndef MP-ALIPAY || MP-BAIDU || MP-TOUTIAO
-    uni.offWindowResize(()=>{})
+    uni.offWindowResize(() => {})
     // #endif
   },
   watch: {
@@ -522,35 +570,35 @@ export default {
       handler(val, oldval) {
         if (typeof val === 'object') {
           if (JSON.stringify(val) !== JSON.stringify(oldval)) {
-            this._clearChart();
+            this._clearChart()
             if (val.series && val.series.length > 0) {
-              this.beforeInit();
-            }else{
-              this.mixinDatacomLoading = true;
-              this.showchart = false;
-              this.mixinDatacomErrorMessage = null;
+              this.beforeInit()
+            } else {
+              this.mixinDatacomLoading = true
+              this.showchart = false
+              this.mixinDatacomErrorMessage = null
             }
           }
         } else {
-          this.mixinDatacomLoading = false;
-          this._clearChart();
-          this.showchart = false;
-          this.mixinDatacomErrorMessage = '参数错误：chartData数据类型错误';
+          this.mixinDatacomLoading = false
+          this._clearChart()
+          this.showchart = false
+          this.mixinDatacomErrorMessage = '参数错误：chartData数据类型错误'
         }
       },
       immediate: false,
       deep: true
     },
-    localdata:{
+    localdata: {
       handler(val, oldval) {
         if (JSON.stringify(val) !== JSON.stringify(oldval)) {
           if (val.length > 0) {
-            this.beforeInit();
-          }else{
-            this.mixinDatacomLoading = true;
-            this._clearChart();
-            this.showchart = false;
-            this.mixinDatacomErrorMessage = null;
+            this.beforeInit()
+          } else {
+            this.mixinDatacomLoading = true
+            this._clearChart()
+            this.showchart = false
+            this.mixinDatacomErrorMessage = null
           }
         }
       },
@@ -560,14 +608,18 @@ export default {
     optsProps: {
       handler(val, oldval) {
         if (typeof val === 'object') {
-          if (JSON.stringify(val) !== JSON.stringify(oldval) && this.echarts === false && this.optsWatch == true) {
-            this.checkData(this.drawData);
+          if (
+            JSON.stringify(val) !== JSON.stringify(oldval) &&
+            this.echarts === false &&
+            this.optsWatch == true
+          ) {
+            this.checkData(this.drawData)
           }
         } else {
-          this.mixinDatacomLoading = false;
-          this._clearChart();
-          this.showchart = false;
-          this.mixinDatacomErrorMessage = '参数错误：opts数据类型错误';
+          this.mixinDatacomLoading = false
+          this._clearChart()
+          this.showchart = false
+          this.mixinDatacomErrorMessage = '参数错误：opts数据类型错误'
         }
       },
       immediate: false,
@@ -576,13 +628,16 @@ export default {
     eoptsProps: {
       handler(val, oldval) {
         if (typeof val === 'object') {
-          if (JSON.stringify(val) !== JSON.stringify(oldval) && this.echarts === true) {
-            this.checkData(this.drawData);
+          if (
+            JSON.stringify(val) !== JSON.stringify(oldval) &&
+            this.echarts === true
+          ) {
+            this.checkData(this.drawData)
           }
         } else {
-          this.mixinDatacomLoading = false;
-          this.showchart = false;
-          this.mixinDatacomErrorMessage = '参数错误：eopts数据类型错误';
+          this.mixinDatacomLoading = false
+          this.showchart = false
+          this.mixinDatacomErrorMessage = '参数错误：eopts数据类型错误'
         }
       },
       immediate: false,
@@ -591,174 +646,203 @@ export default {
     reshow(val, oldval) {
       if (val === true && this.mixinDatacomLoading === false) {
         setTimeout(() => {
-          this.mixinDatacomErrorMessage = null;
-          this.echartsResize.state = !this.echartsResize.state;
-          this.checkData(this.drawData);
-        }, 200);
+          this.mixinDatacomErrorMessage = null
+          this.echartsResize.state = !this.echartsResize.state
+          this.checkData(this.drawData)
+        }, 200)
       }
     },
     reload(val, oldval) {
       if (val === true) {
-        this.showchart = false;
-        this.mixinDatacomErrorMessage = null;
-        this.reloading();
+        this.showchart = false
+        this.mixinDatacomErrorMessage = null
+        this.reloading()
       }
     },
     mixinDatacomErrorMessage(val, oldval) {
       if (val) {
-        this.emitMsg({name: 'error', params: {type:"error", errorShow: this.errorShow, msg: val, id: this.cid}});
-        if(this.errorShow){
-          console.log('[秋云图表组件]' + val);
+        this.emitMsg({
+          name: 'error',
+          params: {
+            type: 'error',
+            errorShow: this.errorShow,
+            msg: val,
+            id: this.cid
+          }
+        })
+        if (this.errorShow) {
+          console.log('[秋云图表组件]' + val)
         }
       }
     },
     errorMessage(val, oldval) {
-      if (val && this.errorShow && val !== null && val !== 'null' && val !== '') {
-        this.showchart = false;
-        this.mixinDatacomLoading = false;
-        this.mixinDatacomErrorMessage = val;
+      if (
+        val &&
+        this.errorShow &&
+        val !== null &&
+        val !== 'null' &&
+        val !== ''
+      ) {
+        this.showchart = false
+        this.mixinDatacomLoading = false
+        this.mixinDatacomErrorMessage = val
       } else {
-        this.showchart = false;
-        this.mixinDatacomErrorMessage = null;
-        this.reloading();
+        this.showchart = false
+        this.mixinDatacomErrorMessage = null
+        this.reloading()
       }
     }
   },
   computed: {
     optsProps() {
-      return JSON.parse(JSON.stringify(this.opts));
+      return JSON.parse(JSON.stringify(this.opts))
     },
     eoptsProps() {
-      return JSON.parse(JSON.stringify(this.eopts));
+      return JSON.parse(JSON.stringify(this.eopts))
     },
     chartDataProps() {
-      return JSON.parse(JSON.stringify(this.chartData));
-    },
+      return JSON.parse(JSON.stringify(this.chartData))
+    }
   },
   methods: {
-    beforeInit(){
-      this.mixinDatacomErrorMessage = null;
-      if (typeof this.chartData === 'object' && this.chartData != null && this.chartData.series !== undefined && this.chartData.series.length > 0) {
+    beforeInit() {
+      this.mixinDatacomErrorMessage = null
+      if (
+        typeof this.chartData === 'object' &&
+        this.chartData != null &&
+        this.chartData.series !== undefined &&
+        this.chartData.series.length > 0
+      ) {
         //拷贝一下chartData，为了opts变更后统一数据来源
-        this.drawData = deepCloneAssign({}, this.chartData);
-        this.mixinDatacomLoading = false;
-        this.showchart = true;
-        this.checkData(this.chartData);
-      }else if(this.localdata.length>0){
-        this.mixinDatacomLoading = false;
-        this.showchart = true;
-        this.localdataInit(this.localdata);
-      }else if(this.collection !== ''){
-        this.mixinDatacomLoading = false;
-        this.getCloudData();
-      }else{
-        this.mixinDatacomLoading = true;
+        this.drawData = deepCloneAssign({}, this.chartData)
+        this.mixinDatacomLoading = false
+        this.showchart = true
+        this.checkData(this.chartData)
+      } else if (this.localdata.length > 0) {
+        this.mixinDatacomLoading = false
+        this.showchart = true
+        this.localdataInit(this.localdata)
+      } else if (this.collection !== '') {
+        this.mixinDatacomLoading = false
+        this.getCloudData()
+      } else {
+        this.mixinDatacomLoading = true
       }
     },
-    localdataInit(resdata){
+    localdataInit(resdata) {
       //替换enum类型为正确的描述
-      if(this.groupEnum.length>0){
+      if (this.groupEnum.length > 0) {
         for (let i = 0; i < resdata.length; i++) {
           for (let j = 0; j < this.groupEnum.length; j++) {
-            if(resdata[i].group === this.groupEnum[j].value){
+            if (resdata[i].group === this.groupEnum[j].value) {
               resdata[i].group = this.groupEnum[j].text
             }
           }
         }
       }
-      if(this.textEnum.length>0){
+      if (this.textEnum.length > 0) {
         for (let i = 0; i < resdata.length; i++) {
           for (let j = 0; j < this.textEnum.length; j++) {
-            if(resdata[i].text === this.textEnum[j].value){
+            if (resdata[i].text === this.textEnum[j].value) {
               resdata[i].text = this.textEnum[j].text
             }
           }
         }
       }
-      let needCategories = false;
-      let tmpData = {categories:[], series:[]}
+      let needCategories = false
+      let tmpData = { categories: [], series: [] }
       let tmpcategories = []
-      let tmpseries = [];
+      let tmpseries = []
       //拼接categories
-      if(this.echarts === true){
+      if (this.echarts === true) {
         needCategories = cfe.categories.includes(this.type)
-      }else{
+      } else {
         needCategories = cfu.categories.includes(this.type)
       }
-      if(needCategories === true){
+      if (needCategories === true) {
         //如果props中的chartData带有categories，则优先使用chartData的categories
-        if(this.chartData && this.chartData.categories && this.chartData.categories.length>0){
+        if (
+          this.chartData &&
+          this.chartData.categories &&
+          this.chartData.categories.length > 0
+        ) {
           tmpcategories = this.chartData.categories
-        }else{
+        } else {
           //如果是日期类型的数据，不管是本地数据还是云数据，都按起止日期自动拼接categories
-          if(this.startDate && this.endDate){
+          if (this.startDate && this.endDate) {
             let idate = new Date(this.startDate)
             let edate = new Date(this.endDate)
             while (idate <= edate) {
-            	tmpcategories.push(getFormatDate(idate))
-            	idate = idate.setDate(idate.getDate() + 1)
-            	idate = new Date(idate)
+              tmpcategories.push(getFormatDate(idate))
+              idate = idate.setDate(idate.getDate() + 1)
+              idate = new Date(idate)
             }
-          //否则从结果中去重并拼接categories
-          }else{
-            let tempckey = {};
-            resdata.map(function(item, index) {
+            //否则从结果中去重并拼接categories
+          } else {
+            let tempckey = {}
+            resdata.map(function (item, index) {
               if (item.text != undefined && !tempckey[item.text]) {
                 tmpcategories.push(item.text)
                 tempckey[item.text] = true
               }
-            });
+            })
           }
         }
         tmpData.categories = tmpcategories
       }
       //拼接series
-      let tempskey = {};
-      resdata.map(function(item, index) {
+      let tempskey = {}
+      resdata.map(function (item, index) {
         if (item.group != undefined && !tempskey[item.group]) {
-          tmpseries.push({ name: item.group, data: [] });
-          tempskey[item.group] = true;
+          tmpseries.push({ name: item.group, data: [] })
+          tempskey[item.group] = true
         }
-      });
+      })
       //如果没有获取到分组名称(可能是带categories的数据，也可能是不带的饼图类)
       if (tmpseries.length == 0) {
-        tmpseries = [{ name: '默认分组', data: [] }];
+        tmpseries = [{ name: '默认分组', data: [] }]
         //如果是需要categories的图表类型
-        if(needCategories === true){
+        if (needCategories === true) {
           for (let j = 0; j < tmpcategories.length; j++) {
-            let seriesdata = 0;
+            let seriesdata = 0
             for (let i = 0; i < resdata.length; i++) {
               if (resdata[i].text == tmpcategories[j]) {
-                seriesdata = resdata[i].value;
+                seriesdata = resdata[i].value
               }
             }
-            tmpseries[0].data.push(seriesdata);
+            tmpseries[0].data.push(seriesdata)
           }
-        //如果是饼图类的图表类型
-        }else{
+          //如果是饼图类的图表类型
+        } else {
           for (let i = 0; i < resdata.length; i++) {
-            tmpseries[0].data.push({"name": resdata[i].text,"value": resdata[i].value});
+            tmpseries[0].data.push({
+              name: resdata[i].text,
+              value: resdata[i].value
+            })
           }
         }
-      //如果有分组名
+        //如果有分组名
       } else {
         for (let k = 0; k < tmpseries.length; k++) {
           //如果有categories
           if (tmpcategories.length > 0) {
             for (let j = 0; j < tmpcategories.length; j++) {
-              let seriesdata = 0;
+              let seriesdata = 0
               for (let i = 0; i < resdata.length; i++) {
-                if (tmpseries[k].name == resdata[i].group && resdata[i].text == tmpcategories[j]) {
-                  seriesdata = resdata[i].value;
+                if (
+                  tmpseries[k].name == resdata[i].group &&
+                  resdata[i].text == tmpcategories[j]
+                ) {
+                  seriesdata = resdata[i].value
                 }
               }
-              tmpseries[k].data.push(seriesdata);
+              tmpseries[k].data.push(seriesdata)
             }
-          //如果传了group而没有传text，即没有categories（正常情况下这种数据是不符合数据要求规范的）
+            //如果传了group而没有传text，即没有categories（正常情况下这种数据是不符合数据要求规范的）
           } else {
             for (let i = 0; i < resdata.length; i++) {
               if (tmpseries[k].name == resdata[i].group) {
-                tmpseries[k].data.push(resdata[i].value);
+                tmpseries[k].data.push(resdata[i].value)
               }
             }
           }
@@ -766,52 +850,53 @@ export default {
       }
       tmpData.series = tmpseries
       //拷贝一下chartData，为了opts变更后统一数据来源
-      this.drawData = deepCloneAssign({}, tmpData);
+      this.drawData = deepCloneAssign({}, tmpData)
       this.checkData(tmpData)
     },
     reloading() {
-      if(this.errorReload === false){
-        return;
+      if (this.errorReload === false) {
+        return
       }
-      this.showchart = false;
-      this.mixinDatacomErrorMessage = null;
+      this.showchart = false
+      this.mixinDatacomErrorMessage = null
       if (this.collection !== '') {
-        this.mixinDatacomLoading = false;
-        this.onMixinDatacomPropsChange(true);
+        this.mixinDatacomLoading = false
+        this.onMixinDatacomPropsChange(true)
       } else {
-        this.beforeInit();
+        this.beforeInit()
       }
     },
     checkData(anyData) {
       let cid = this.cid
       //复位opts或eopts
-      if(this.echarts === true){
-        cfe.option[cid] = deepCloneAssign({}, this.eopts);
-        cfe.option[cid].id = cid;
-        cfe.option[cid].type = this.type;
-      }else{
+      if (this.echarts === true) {
+        cfe.option[cid] = deepCloneAssign({}, this.eopts)
+        cfe.option[cid].id = cid
+        cfe.option[cid].type = this.type
+      } else {
         if (this.type && cfu.type.includes(this.type)) {
-          cfu.option[cid] = deepCloneAssign({}, cfu[this.type], this.opts);
-          cfu.option[cid].canvasId = cid;
+          cfu.option[cid] = deepCloneAssign({}, cfu[this.type], this.opts)
+          cfu.option[cid].canvasId = cid
         } else {
-          this.mixinDatacomLoading = false;
-          this.showchart = false;
-          this.mixinDatacomErrorMessage = '参数错误：props参数中type类型不正确';
+          this.mixinDatacomLoading = false
+          this.showchart = false
+          this.mixinDatacomErrorMessage =
+            '参数错误：props参数中type类型不正确'
         }
       }
       //挂载categories和series
-      let newData = deepCloneAssign({}, anyData);
+      let newData = deepCloneAssign({}, anyData)
       if (newData.series !== undefined && newData.series.length > 0) {
-        this.mixinDatacomErrorMessage = null;
+        this.mixinDatacomErrorMessage = null
         if (this.echarts === true) {
-          cfe.option[cid].chartData = newData;
-          this.$nextTick(()=>{
+          cfe.option[cid].chartData = newData
+          this.$nextTick(() => {
             this.init()
           })
-        }else{
-          cfu.option[cid].categories = newData.categories;
-          cfu.option[cid].series = newData.series;
-          this.$nextTick(()=>{
+        } else {
+          cfu.option[cid].categories = newData.categories
+          cfu.option[cid].series = newData.series
+          this.$nextTick(() => {
             this.init()
           })
         }
@@ -819,57 +904,71 @@ export default {
     },
     resizeHandler() {
       //渲染防抖
-      let currTime = Date.now();
-      let lastDrawTime = this.lastDrawTime?this.lastDrawTime:currTime-3000;
-      let duration = currTime - lastDrawTime;
-      if (duration < 1000) return;
+      let currTime = Date.now()
+      let lastDrawTime = this.lastDrawTime
+        ? this.lastDrawTime
+        : currTime - 3000
+      let duration = currTime - lastDrawTime
+      if (duration < 1000) return
       let chartdom = uni
         .createSelectorQuery()
         // #ifndef MP-ALIPAY
         .in(this)
         // #endif
-        .select('#ChartBoxId'+this.cid)
+        .select('#ChartBoxId' + this.cid)
         .boundingClientRect(data => {
-          this.showchart = true;
+          this.showchart = true
           if (data.width > 0 && data.height > 0) {
-            if (data.width !== this.cWidth || data.height !== this.cHeight) {
+            if (
+              data.width !== this.cWidth ||
+              data.height !== this.cHeight
+            ) {
               this.checkData(this.drawData)
             }
           }
         })
-        .exec();
+        .exec()
     },
     getCloudData() {
       if (this.mixinDatacomLoading == true) {
-        return;
+        return
       }
-      this.mixinDatacomLoading = true;
+      this.mixinDatacomLoading = true
       this.mixinDatacomGet()
         .then(res => {
-          this.mixinDatacomResData = res.result.data;
-          this.localdataInit(this.mixinDatacomResData);
+          this.mixinDatacomResData = res.result.data
+          this.localdataInit(this.mixinDatacomResData)
         })
         .catch(err => {
-          this.mixinDatacomLoading = false;
-          this.showchart = false;
-          this.mixinDatacomErrorMessage = '请求错误：' + err;
-        });
+          this.mixinDatacomLoading = false
+          this.showchart = false
+          this.mixinDatacomErrorMessage = '请求错误：' + err
+        })
     },
     onMixinDatacomPropsChange(needReset, changed) {
       if (needReset == true && this.collection !== '') {
-        this.showchart = false;
-        this.mixinDatacomErrorMessage = null;
-        this._clearChart();
-        this.getCloudData();
+        this.showchart = false
+        this.mixinDatacomErrorMessage = null
+        this._clearChart()
+        this.getCloudData()
       }
     },
     _clearChart() {
       let cid = this.cid
-      if (this.echarts !== true && cfu.option[cid] && cfu.option[cid].context) {
-        const ctx = cfu.option[cid].context;
-        if(typeof ctx === "object" && !!!cfu.option[cid].update){
-          ctx.clearRect(0, 0, this.cWidth*this.pixel, this.cHeight*this.pixel);
-          ctx.draw();
+      if (
+        this.echarts !== true &&
+        cfu.option[cid] &&
+        cfu.option[cid].context
+      ) {
+        const ctx = cfu.option[cid].context
+        if (typeof ctx === 'object' && !!!cfu.option[cid].update) {
+          ctx.clearRect(
+            0,
+            0,
+            this.cWidth * this.pixel,
+            this.cHeight * this.pixel
+          )
+          ctx.draw()
         }
       }
     },
@@ -880,54 +979,60 @@ export default {
         // #ifndef MP-ALIPAY
         .in(this)
         // #endif
-        .select('#ChartBoxId'+cid)
+        .select('#ChartBoxId' + cid)
         .boundingClientRect(data => {
           if (data.width > 0 && data.height > 0) {
-            this.mixinDatacomLoading = false;
-            this.showchart = true;
-            this.lastDrawTime = Date.now();
-            this.cWidth = data.width;
-            this.cHeight = data.height;
-            if(this.echarts !== true){
-              cfu.option[cid].background = this.background == 'rgba(0,0,0,0)' ? '#FFFFFF' : this.background;
-              cfu.option[cid].canvas2d = this.type2d;
-              cfu.option[cid].pixelRatio = this.pixel;
-              cfu.option[cid].animation = this.animation;
-              cfu.option[cid].width = data.width * this.pixel;
-              cfu.option[cid].height = data.height * this.pixel;
-              cfu.option[cid].onzoom = this.onzoom;
-              cfu.option[cid].ontap = this.ontap;
-              cfu.option[cid].ontouch = this.ontouch;
-              cfu.option[cid].onmouse = this.openmouse;
-              cfu.option[cid].onmovetip = this.onmovetip;
-              cfu.option[cid].tooltipShow = this.tooltipShow;
-              cfu.option[cid].tooltipFormat = this.tooltipFormat;
-              cfu.option[cid].tooltipCustom = this.tooltipCustom;
-              cfu.option[cid].inScrollView = this.inScrollView;
-              cfu.option[cid].lastDrawTime = this.lastDrawTime;
-              cfu.option[cid].tapLegend = this.tapLegend;
+            this.mixinDatacomLoading = false
+            this.showchart = true
+            this.lastDrawTime = Date.now()
+            this.cWidth = data.width
+            this.cHeight = data.height
+            if (this.echarts !== true) {
+              cfu.option[cid].background =
+                this.background == 'rgba(0,0,0,0)'
+                  ? '#FFFFFF'
+                  : this.background
+              cfu.option[cid].canvas2d = this.type2d
+              cfu.option[cid].pixelRatio = this.pixel
+              cfu.option[cid].animation = this.animation
+              cfu.option[cid].width = data.width * this.pixel
+              cfu.option[cid].height = data.height * this.pixel
+              cfu.option[cid].onzoom = this.onzoom
+              cfu.option[cid].ontap = this.ontap
+              cfu.option[cid].ontouch = this.ontouch
+              cfu.option[cid].onmouse = this.openmouse
+              cfu.option[cid].onmovetip = this.onmovetip
+              cfu.option[cid].tooltipShow = this.tooltipShow
+              cfu.option[cid].tooltipFormat = this.tooltipFormat
+              cfu.option[cid].tooltipCustom = this.tooltipCustom
+              cfu.option[cid].inScrollView = this.inScrollView
+              cfu.option[cid].lastDrawTime = this.lastDrawTime
+              cfu.option[cid].tapLegend = this.tapLegend
             }
             //如果是H5或者App端，采用renderjs渲染图表
             if (this.inH5 || this.inApp) {
               if (this.echarts == true) {
-                cfe.option[cid].ontap = this.ontap;
-                cfe.option[cid].onmouse = this.openmouse;
-                cfe.option[cid].tooltipShow = this.tooltipShow;
-                cfe.option[cid].tooltipFormat = this.tooltipFormat;
-                cfe.option[cid].tooltipCustom = this.tooltipCustom;
-                cfe.option[cid].lastDrawTime = this.lastDrawTime;
-                this.echartsOpts = deepCloneAssign({}, cfe.option[cid]);
+                cfe.option[cid].ontap = this.ontap
+                cfe.option[cid].onmouse = this.openmouse
+                cfe.option[cid].tooltipShow = this.tooltipShow
+                cfe.option[cid].tooltipFormat = this.tooltipFormat
+                cfe.option[cid].tooltipCustom = this.tooltipCustom
+                cfe.option[cid].lastDrawTime = this.lastDrawTime
+                this.echartsOpts = deepCloneAssign({}, cfe.option[cid])
               } else {
-                cfu.option[cid].rotateLock = cfu.option[cid].rotate;
-                this.uchartsOpts = deepCloneAssign({}, cfu.option[cid]);
+                cfu.option[cid].rotateLock = cfu.option[cid].rotate
+                this.uchartsOpts = deepCloneAssign({}, cfu.option[cid])
               }
-            //如果是小程序端，采用uCharts渲染
+              //如果是小程序端，采用uCharts渲染
             } else {
-              cfu.option[cid] = formatterAssign(cfu.option[cid],cfu.formatter)
-              this.mixinDatacomErrorMessage = null;
-              this.mixinDatacomLoading = false;
-              this.showchart = true;
-              this.$nextTick(()=>{
+              cfu.option[cid] = formatterAssign(
+                cfu.option[cid],
+                cfu.formatter
+              )
+              this.mixinDatacomErrorMessage = null
+              this.mixinDatacomLoading = false
+              this.showchart = true
+              this.$nextTick(() => {
                 if (this.type2d === true) {
                   const query = uni.createSelectorQuery().in(this)
                   query
@@ -935,118 +1040,171 @@ export default {
                     .fields({ node: true, size: true })
                     .exec(res => {
                       if (res[0]) {
-                        const canvas = res[0].node;
-                        const ctx = canvas.getContext('2d');
-                        cfu.option[cid].context = ctx;
-                        cfu.option[cid].rotateLock = cfu.option[cid].rotate;
-                        if(cfu.instance[cid] && cfu.option[cid] && cfu.option[cid].update === true){
+                        const canvas = res[0].node
+                        const ctx = canvas.getContext('2d')
+                        cfu.option[cid].context = ctx
+                        cfu.option[cid].rotateLock = cfu.option[cid].rotate
+                        if (
+                          cfu.instance[cid] &&
+                          cfu.option[cid] &&
+                          cfu.option[cid].update === true
+                        ) {
                           this._updataUChart(cid)
-                        }else{
-                          canvas.width = data.width * this.pixel;
-                          canvas.height = data.height * this.pixel;
-                          canvas._width = data.width * this.pixel;
-                          canvas._height = data.height * this.pixel;
-                          setTimeout(()=>{
-                            cfu.option[cid].context.restore();
-                            cfu.option[cid].context.save();
+                        } else {
+                          canvas.width = data.width * this.pixel
+                          canvas.height = data.height * this.pixel
+                          canvas._width = data.width * this.pixel
+                          canvas._height = data.height * this.pixel
+                          setTimeout(() => {
+                            cfu.option[cid].context.restore()
+                            cfu.option[cid].context.save()
                             this._newChart(cid)
-                          },100)
+                          }, 100)
                         }
                       } else {
-                        this.showchart = false;
-                        this.mixinDatacomErrorMessage = '参数错误：开启2d模式后，未获取到dom节点，canvas-id:' + cid;
+                        this.showchart = false
+                        this.mixinDatacomErrorMessage =
+                          '参数错误：开启2d模式后，未获取到dom节点，canvas-id:' +
+                          cid
                       }
-                    });
+                    })
                 } else {
-                  if(this.inAli){
-                    cfu.option[cid].rotateLock = cfu.option[cid].rotate;
+                  if (this.inAli) {
+                    cfu.option[cid].rotateLock = cfu.option[cid].rotate
                   }
-                  cfu.option[cid].context = uni.createCanvasContext(cid, this);
-                  if(cfu.instance[cid] && cfu.option[cid] && cfu.option[cid].update === true){
+                  cfu.option[cid].context = uni.createCanvasContext(
+                    cid,
+                    this
+                  )
+                  if (
+                    cfu.instance[cid] &&
+                    cfu.option[cid] &&
+                    cfu.option[cid].update === true
+                  ) {
                     this._updataUChart(cid)
-                  }else{
-                    setTimeout(()=>{
-                      cfu.option[cid].context.restore();
-                      cfu.option[cid].context.save();
+                  } else {
+                    setTimeout(() => {
+                      cfu.option[cid].context.restore()
+                      cfu.option[cid].context.save()
                       this._newChart(cid)
-                    },100)
+                    }, 100)
                   }
                 }
               })
             }
           } else {
-            this.mixinDatacomLoading = false;
-            this.showchart = false;
+            this.mixinDatacomLoading = false
+            this.showchart = false
             if (this.reshow == true) {
-              this.mixinDatacomErrorMessage = '布局错误：未获取到父元素宽高尺寸！canvas-id:' + cid;
+              this.mixinDatacomErrorMessage =
+                '布局错误：未获取到父元素宽高尺寸！canvas-id:' + cid
             }
           }
         })
-        .exec();
-    },
-    saveImage(){
-    	uni.canvasToTempFilePath({
-    	  canvasId: this.cid,
-    	  success: res=>{
-    	    //#ifdef H5
-    			var a = document.createElement("a");
-    			a.href = res.tempFilePath;
-    			a.download = this.cid;
-    			a.target = '_blank'
-    			a.click();
-    	    //#endif
-    	    //#ifndef H5
-    	      uni.saveImageToPhotosAlbum({
+        .exec()
+    },
+    saveImage() {
+      uni.canvasToTempFilePath(
+        {
+          canvasId: this.cid,
+          success: res => {
+            //#ifdef H5
+            var a = document.createElement('a')
+            a.href = res.tempFilePath
+            a.download = this.cid
+            a.target = '_blank'
+            a.click()
+            //#endif
+            //#ifndef H5
+            uni.saveImageToPhotosAlbum({
               filePath: res.tempFilePath,
               success: function () {
                 uni.showToast({
                   title: '保存成功',
                   duration: 2000
-                });
+                })
               }
-    	      });
-    	    //#endif
-    	  } 
-    	},this);
-    },
-    getImage(){
-      if(this.type2d == false){
-        uni.canvasToTempFilePath({
-          canvasId: this.cid,
-          success: res=>{
-            this.emitMsg({name: 'getImage', params: {type:"getImage", base64: res.tempFilePath}});
+            })
+            //#endif
           }
-        },this);
-      }else{
+        },
+        this
+      )
+    },
+    getImage() {
+      if (this.type2d == false) {
+        uni.canvasToTempFilePath(
+          {
+            canvasId: this.cid,
+            success: res => {
+              this.emitMsg({
+                name: 'getImage',
+                params: { type: 'getImage', base64: res.tempFilePath }
+              })
+            }
+          },
+          this
+        )
+      } else {
         const query = uni.createSelectorQuery().in(this)
         query
           .select('#' + this.cid)
           .fields({ node: true, size: true })
           .exec(res => {
             if (res[0]) {
-              const canvas = res[0].node;
-              this.emitMsg({name: 'getImage', params: {type:"getImage", base64: canvas.toDataURL('image/png')}});
+              const canvas = res[0].node
+              this.emitMsg({
+                name: 'getImage',
+                params: {
+                  type: 'getImage',
+                  base64: canvas.toDataURL('image/png')
+                }
+              })
             }
-          });
+          })
       }
     },
     // #ifndef APP-VUE || H5
     _newChart(cid) {
       if (this.mixinDatacomLoading == true) {
-        return;
+        return
       }
-      this.showchart = true;
-      cfu.instance[cid] = new uCharts(cfu.option[cid]);
+      this.showchart = true
+      cfu.instance[cid] = new uCharts(cfu.option[cid])
       cfu.instance[cid].addEventListener('renderComplete', () => {
-        this.emitMsg({name: 'complete', params: {type:"complete", complete: true, id: cid, opts: cfu.instance[cid].opts}});
+        this.emitMsg({
+          name: 'complete',
+          params: {
+            type: 'complete',
+            complete: true,
+            id: cid,
+            opts: cfu.instance[cid].opts
+          }
+        })
         cfu.instance[cid].delEventListener('renderComplete')
-      });
+      })
       cfu.instance[cid].addEventListener('scrollLeft', () => {
-        this.emitMsg({name: 'scrollLeft', params: {type:"scrollLeft", scrollLeft: true, id: cid, opts: cfu.instance[cid].opts}});
-      });
+        this.emitMsg({
+          name: 'scrollLeft',
+          params: {
+            type: 'scrollLeft',
+            scrollLeft: true,
+            id: cid,
+            opts: cfu.instance[cid].opts
+          }
+        })
+      })
       cfu.instance[cid].addEventListener('scrollRight', () => {
-        this.emitMsg({name: 'scrollRight', params: {type:"scrollRight", scrollRight: true, id: cid, opts: cfu.instance[cid].opts}});
-      });
+        this.emitMsg({
+          name: 'scrollRight',
+          params: {
+            type: 'scrollRight',
+            scrollRight: true,
+            id: cid,
+            opts: cfu.instance[cid].opts
+          }
+        })
+      })
     },
     _updataUChart(cid) {
       cfu.instance[cid].updateData(cfu.option[cid])
@@ -1054,15 +1212,15 @@ export default {
     _tooltipDefault(item, category, index, opts) {
       if (category) {
         let data = item.data
-        if(typeof item.data === "object"){
+        if (typeof item.data === 'object') {
           data = item.data.value
         }
-        return category + ' ' + item.name + ':' + data;
+        return category + ' ' + item.name + ':' + data
       } else {
         if (item.properties && item.properties.name) {
-          return item.properties.name;
+          return item.properties.name
         } else {
-          return item.name + ':' + item.data;
+          return item.name + ':' + item.data
         }
       }
     },
@@ -1070,146 +1228,237 @@ export default {
       let cid = this.cid
       let tc = cfu.option[cid].tooltipCustom
       if (tc && tc !== undefined && tc !== null) {
-        let offset = undefined;
+        let offset = undefined
         if (tc.x >= 0 && tc.y >= 0) {
-          offset = { x: tc.x, y: tc.y + 10 };
+          offset = { x: tc.x, y: tc.y + 10 }
         }
         cfu.instance[cid].showToolTip(e, {
           index: tc.index,
           offset: offset,
           textList: tc.textList,
           formatter: (item, category, index, opts) => {
-            if (typeof cfu.option[cid].tooltipFormat === 'string' && cfu.formatter[cfu.option[cid].tooltipFormat]) {
-              return cfu.formatter[cfu.option[cid].tooltipFormat](item, category, index, opts);
+            if (
+              typeof cfu.option[cid].tooltipFormat === 'string' &&
+              cfu.formatter[cfu.option[cid].tooltipFormat]
+            ) {
+              return cfu.formatter[cfu.option[cid].tooltipFormat](
+                item,
+                category,
+                index,
+                opts
+              )
             } else {
-              return this._tooltipDefault(item, category, index, opts);
+              return this._tooltipDefault(item, category, index, opts)
             }
           }
-        });
+        })
       } else {
         cfu.instance[cid].showToolTip(e, {
           formatter: (item, category, index, opts) => {
-            if (typeof cfu.option[cid].tooltipFormat === 'string' && cfu.formatter[cfu.option[cid].tooltipFormat]) {
-              return cfu.formatter[cfu.option[cid].tooltipFormat](item, category, index, opts);
+            if (
+              typeof cfu.option[cid].tooltipFormat === 'string' &&
+              cfu.formatter[cfu.option[cid].tooltipFormat]
+            ) {
+              return cfu.formatter[cfu.option[cid].tooltipFormat](
+                item,
+                category,
+                index,
+                opts
+              )
             } else {
-              return this._tooltipDefault(item, category, index, opts);
+              return this._tooltipDefault(item, category, index, opts)
             }
           }
-        });
+        })
       }
     },
-    _tap(e,move) {
+    _tap(e, move) {
       let cid = this.cid
-      let currentIndex = null;
-      let legendIndex = null;
+      let currentIndex = null
+      let legendIndex = null
       if (this.inScrollView === true || this.inAli) {
         let chartdom = uni
           .createSelectorQuery()
           // #ifndef MP-ALIPAY
           .in(this)
-          .select('#ChartBoxId'+cid)
+          .select('#ChartBoxId' + cid)
           // #endif
           // #ifdef MP-ALIPAY
-          .select('#'+this.cid)
+          .select('#' + this.cid)
           // #endif
           .boundingClientRect(data => {
-            e.changedTouches=[];
+            e.changedTouches = []
             if (this.inAli) {
-              e.changedTouches.unshift({ x: e.detail.clientX - data.left, y: e.detail.clientY - data.top});
-            }else{
-              e.changedTouches.unshift({ x: e.detail.x - data.left, y: e.detail.y - data.top - this.pageScrollTop});
+              e.changedTouches.unshift({
+                x: e.detail.clientX - data.left,
+                y: e.detail.clientY - data.top
+              })
+            } else {
+              e.changedTouches.unshift({
+                x: e.detail.x - data.left,
+                y: e.detail.y - data.top - this.pageScrollTop
+              })
             }
-            if(move){
+            if (move) {
               if (this.tooltipShow === true) {
-                this._showTooltip(e);
+                this._showTooltip(e)
               }
-            }else{
-              currentIndex = cfu.instance[cid].getCurrentDataIndex(e);
-              legendIndex = cfu.instance[cid].getLegendDataIndex(e);
-              if(this.tapLegend === true){
-                cfu.instance[cid].touchLegend(e);
+            } else {
+              currentIndex = cfu.instance[cid].getCurrentDataIndex(e)
+              legendIndex = cfu.instance[cid].getLegendDataIndex(e)
+              if (this.tapLegend === true) {
+                cfu.instance[cid].touchLegend(e)
               }
               if (this.tooltipShow === true) {
-                this._showTooltip(e);
+                this._showTooltip(e)
               }
-              this.emitMsg({name: 'getIndex', params: { type:"getIndex", event:{ x: e.detail.x - data.left, y: e.detail.y - data.top }, currentIndex: currentIndex, legendIndex: legendIndex, id: cid, opts: cfu.instance[cid].opts}});
+              this.emitMsg({
+                name: 'getIndex',
+                params: {
+                  type: 'getIndex',
+                  event: {
+                    x: e.detail.x - data.left,
+                    y: e.detail.y - data.top
+                  },
+                  currentIndex: currentIndex,
+                  legendIndex: legendIndex,
+                  id: cid,
+                  opts: cfu.instance[cid].opts
+                }
+              })
             }
           })
-          .exec();
+          .exec()
       } else {
-        if(move){
+        if (move) {
           if (this.tooltipShow === true) {
-            this._showTooltip(e);
+            this._showTooltip(e)
           }
-        }else{
-          e.changedTouches=[];
-          e.changedTouches.unshift({ x: e.detail.x - e.currentTarget.offsetLeft, y: e.detail.y - e.currentTarget.offsetTop });
-          currentIndex = cfu.instance[cid].getCurrentDataIndex(e);
-          legendIndex = cfu.instance[cid].getLegendDataIndex(e);
-          if(this.tapLegend === true){
-            cfu.instance[cid].touchLegend(e);
+        } else {
+          e.changedTouches = []
+          e.changedTouches.unshift({
+            x: e.detail.x - e.currentTarget.offsetLeft,
+            y: e.detail.y - e.currentTarget.offsetTop
+          })
+          currentIndex = cfu.instance[cid].getCurrentDataIndex(e)
+          legendIndex = cfu.instance[cid].getLegendDataIndex(e)
+          if (this.tapLegend === true) {
+            cfu.instance[cid].touchLegend(e)
           }
           if (this.tooltipShow === true) {
-            this._showTooltip(e);
+            this._showTooltip(e)
           }
-          this.emitMsg({name: 'getIndex', params: {type:"getIndex", event:{ x: e.detail.x, y: e.detail.y - e.currentTarget.offsetTop }, currentIndex: currentIndex, legendIndex: legendIndex, id: cid, opts: cfu.instance[cid].opts}});
+          this.emitMsg({
+            name: 'getIndex',
+            params: {
+              type: 'getIndex',
+              event: {
+                x: e.detail.x,
+                y: e.detail.y - e.currentTarget.offsetTop
+              },
+              currentIndex: currentIndex,
+              legendIndex: legendIndex,
+              id: cid,
+              opts: cfu.instance[cid].opts
+            }
+          })
         }
       }
     },
     _touchStart(e) {
       let cid = this.cid
-      lastMoveTime=Date.now();
-      if(cfu.option[cid].enableScroll === true && e.touches.length == 1){
-        cfu.instance[cid].scrollStart(e);
+      lastMoveTime = Date.now()
+      if (cfu.option[cid].enableScroll === true && e.touches.length == 1) {
+        cfu.instance[cid].scrollStart(e)
       }
-      this.emitMsg({name:'getTouchStart', params:{type:"touchStart", event:e.changedTouches[0], id:cid, opts: cfu.instance[cid].opts}});
+      this.emitMsg({
+        name: 'getTouchStart',
+        params: {
+          type: 'touchStart',
+          event: e.changedTouches[0],
+          id: cid,
+          opts: cfu.instance[cid].opts
+        }
+      })
     },
     _touchMove(e) {
       let cid = this.cid
-      let currMoveTime = Date.now();
-      let duration = currMoveTime - lastMoveTime;
-      let touchMoveLimit = cfu.option[cid].touchMoveLimit || 24;
-      if (duration < Math.floor(1000 / touchMoveLimit)) return;//每秒60帧
-      lastMoveTime = currMoveTime;
-      if(cfu.option[cid].enableScroll === true && e.changedTouches.length == 1){
-        cfu.instance[cid].scroll(e);
+      let currMoveTime = Date.now()
+      let duration = currMoveTime - lastMoveTime
+      let touchMoveLimit = cfu.option[cid].touchMoveLimit || 24
+      if (duration < Math.floor(1000 / touchMoveLimit)) return //每秒60帧
+      lastMoveTime = currMoveTime
+      if (
+        cfu.option[cid].enableScroll === true &&
+        e.changedTouches.length == 1
+      ) {
+        cfu.instance[cid].scroll(e)
       }
-      if(this.ontap === true && cfu.option[cid].enableScroll === false && this.onmovetip === true){
-        this._tap(e,true)
+      if (
+        this.ontap === true &&
+        cfu.option[cid].enableScroll === false &&
+        this.onmovetip === true
+      ) {
+        this._tap(e, true)
       }
-      if(this.ontouch === true && cfu.option[cid].enableScroll === true && this.onzoom === true && e.changedTouches.length == 2){
-        cfu.instance[cid].dobuleZoom(e);
+      if (
+        this.ontouch === true &&
+        cfu.option[cid].enableScroll === true &&
+        this.onzoom === true &&
+        e.changedTouches.length == 2
+      ) {
+        cfu.instance[cid].dobuleZoom(e)
       }
-      this.emitMsg({name: 'getTouchMove', params: {type:"touchMove", event:e.changedTouches[0], id: cid, opts: cfu.instance[cid].opts}});
+      this.emitMsg({
+        name: 'getTouchMove',
+        params: {
+          type: 'touchMove',
+          event: e.changedTouches[0],
+          id: cid,
+          opts: cfu.instance[cid].opts
+        }
+      })
     },
     _touchEnd(e) {
       let cid = this.cid
-      if(cfu.option[cid].enableScroll === true && e.touches.length == 0){
-        cfu.instance[cid].scrollEnd(e);
+      if (cfu.option[cid].enableScroll === true && e.touches.length == 0) {
+        cfu.instance[cid].scrollEnd(e)
       }
-      this.emitMsg({name:'getTouchEnd', params:{type:"touchEnd", event:e.changedTouches[0], id:cid, opts: cfu.instance[cid].opts}});
-      if(this.ontap === true && cfu.option[cid].enableScroll === false && this.onmovetip === true){
-        this._tap(e,true)
+      this.emitMsg({
+        name: 'getTouchEnd',
+        params: {
+          type: 'touchEnd',
+          event: e.changedTouches[0],
+          id: cid,
+          opts: cfu.instance[cid].opts
+        }
+      })
+      if (
+        this.ontap === true &&
+        cfu.option[cid].enableScroll === false &&
+        this.onmovetip === true
+      ) {
+        this._tap(e, true)
       }
     },
     // #endif
     _error(e) {
-      this.mixinDatacomErrorMessage = e.detail.errMsg;
+      this.mixinDatacomErrorMessage = e.detail.errMsg
     },
     emitMsg(msg) {
-      this.$emit(msg.name, msg.params);
+      this.$emit(msg.name, msg.params)
     },
     getRenderType() {
       //防止如果开启echarts且父元素为v-if的情况renderjs监听不到prop变化的问题
-      if(this.echarts===true && this.mixinDatacomLoading===false){
+      if (this.echarts === true && this.mixinDatacomLoading === false) {
         this.beforeInit()
       }
     },
-    toJSON(){
+    toJSON() {
       return this
     }
   }
-};
+}
 </script>
 
 <!-- #ifdef APP-VUE || H5 -->
@@ -1300,7 +1549,7 @@ export default {
           cfe.option[cid].series.push(Template)
         }
       }
-      
+
       if (typeof window.echarts === 'object') {
           this.newEChart()
       }else{
@@ -1389,9 +1638,9 @@ export default {
       	let viewHeight = size.viewSize[1]
       	let boxWidth = size.contentSize[0]
       	let boxHeight = size.contentSize[1]
-      	let posX = x + 30 
-      	let posY = y + 30 
-      	if (posX + boxWidth > viewWidth) { 
+      	let posX = x + 30
+      	let posY = y + 30
+      	if (posX + boxWidth > viewWidth) {
       		posX = x - boxWidth - 30
       	}
       	if (posY + boxHeight > viewHeight) {
diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js
index 22662a8..8d2daf0 100644
--- a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js
+++ b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js
@@ -285,8 +285,8 @@ const cfe = {
 			"trigger": 'item'
 		},
 		"grid": {
-			"top": 40,
-			"bottom": 30,
+			"top": 0,
+			"bottom": 0,
 			"right": 15,
 			"left": 15
 		},
diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
index 17b28b3..52334d4 100644
--- a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
+++ b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
@@ -20,85 +20,106 @@
 const color = ['#1890FF', '#91CB74', '#FAC858', '#EE6666', '#73C0DE', '#3CA272', '#FC8452', '#9A60B4', '#ea7ccc'];
 
 //事件转换函数，主要用作格式化x轴为时间轴，根据需求自行修改
-const formatDateTime = (timeStamp, returnType)=>{
-  var date = new Date();
-  date.setTime(timeStamp * 1000);
-  var y = date.getFullYear();
-  var m = date.getMonth() + 1;
-  m = m < 10 ? ('0' + m) : m;
-  var d = date.getDate();
-  d = d < 10 ? ('0' + d) : d;
-  var h = date.getHours();
-  h = h < 10 ? ('0' + h) : h;
-  var minute = date.getMinutes();
-  var second = date.getSeconds();
-  minute = minute < 10 ? ('0' + minute) : minute;
-  second = second < 10 ? ('0' + second) : second;
-  if(returnType == 'full'){return y + '-' + m + '-' + d + ' '+ h +':' + minute + ':' + second;}
-  if(returnType == 'y-m-d'){return y + '-' + m + '-' + d;}
-  if(returnType == 'h:m'){return  h +':' + minute;}
-  if(returnType == 'h:m:s'){return  h +':' + minute +':' + second;}
-  return [y, m, d, h, minute, second];
+const formatDateTime = (timeStamp, returnType) => {
+	var date = new Date();
+	date.setTime(timeStamp * 1000);
+	var y = date.getFullYear();
+	var m = date.getMonth() + 1;
+	m = m < 10 ? ('0' + m) : m;
+	var d = date.getDate();
+	d = d < 10 ? ('0' + d) : d;
+	var h = date.getHours();
+	h = h < 10 ? ('0' + h) : h;
+	var minute = date.getMinutes();
+	var second = date.getSeconds();
+	minute = minute < 10 ? ('0' + minute) : minute;
+	second = second < 10 ? ('0' + second) : second;
+	if (returnType == 'full') {
+		return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
+	}
+	if (returnType == 'y-m-d') {
+		return y + '-' + m + '-' + d;
+	}
+	if (returnType == 'h:m') {
+		return h + ':' + minute;
+	}
+	if (returnType == 'h:m:s') {
+		return h + ':' + minute + ':' + second;
+	}
+	return [y, m, d, h, minute, second];
 }
 
 const cfu = {
-  //demotype为自定义图表类型，一般不需要自定义图表类型，只需要改根节点上对应的类型即可
-	"type":["pie","ring","rose","word","funnel","map","arcbar","line","column","mount","bar","area","radar","gauge","candle","mix","tline","tarea","scatter","bubble","demotype"],
-	"range":["饼状图","圆环图","玫瑰图","词云图","漏斗图","地图","圆弧进度条","折线图","柱状图","山峰图","条状图","区域图","雷达图","仪表盘","K线图","混合图","时间轴折线","时间轴区域","散点图","气泡图","自定义类型"],
-  //增加自定义图表类型，如果需要categories，请在这里加入您的图表类型，例如最后的"demotype"
-  //自定义类型时需要注意"tline","tarea","scatter","bubble"等时间轴（矢量x轴）类图表，没有categories，不需要加入categories
-	"categories":["line","column","mount","bar","area","radar","gauge","candle","mix","demotype"],
-  //instance为实例变量承载属性，不要删除
-  "instance":{},
-  //option为opts及eopts承载属性，不要删除
-  "option":{},
-  //下面是自定义format配置，因除H5端外的其他端无法通过props传递函数，只能通过此属性对应下标的方式来替换
-  "formatter":{
-    "yAxisDemo1":function(val, index, opts){return val+'元'},
-    "yAxisDemo2":function(val, index, opts){return val.toFixed(2)},
-    "xAxisDemo1":function(val, index, opts){return val+'年';},
-    "xAxisDemo2":function(val, index, opts){return formatDateTime(val,'h:m')},
-    "seriesDemo1":function(val, index, series, opts){return val+'元'},
-    "tooltipDemo1":function(item, category, index, opts){
-      if(index==0){
-      	return '随便用'+item.data+'年'
-      }else{
-      	return '其他我没改'+item.data+'天'
-      }
-    },
-    "pieDemo":function(val, index, series, opts){
-      if(index !== undefined){
-        return series[index].name+'：'+series[index].data+'元'
-      }
-    },
-  },
-  //这里演示了自定义您的图表类型的option，可以随意命名，之后在组件上 type="demotype" 后，组件会调用这个花括号里的option，如果组件上还存在opts参数，会将demotype与opts中option合并后渲染图表。
-  "demotype":{
-    //我这里把曲线图当做了自定义图表类型，您可以根据需要随意指定类型或配置
-    "type": "line",
-    "color": color,
-    "padding": [15,10,0,15],
-    "xAxis": {
-      "disableGrid": true,
-    },
-    "yAxis": {
-      "gridType": "dash",
-      "dashLength": 2,
-    },
-    "legend": {
-    },
-    "extra": {
-    	"line": {
-    		"type": "curve",
-    		"width": 2
-    	},
-    }
-  },
-  //下面是自定义配置，请添加项目所需的通用配置
-	"pie":{
+	//demotype为自定义图表类型，一般不需要自定义图表类型，只需要改根节点上对应的类型即可
+	"type": ["pie", "ring", "rose", "word", "funnel", "map", "arcbar", "line", "column", "mount", "bar", "area",
+		"radar", "gauge", "candle", "mix", "tline", "tarea", "scatter", "bubble", "demotype"
+	],
+	"range": ["饼状图", "圆环图", "玫瑰图", "词云图", "漏斗图", "地图", "圆弧进度条", "折线图", "柱状图", "山峰图", "条状图", "区域图", "雷达图", "仪表盘", "K线图",
+		"混合图", "时间轴折线", "时间轴区域", "散点图", "气泡图", "自定义类型"
+	],
+	//增加自定义图表类型，如果需要categories，请在这里加入您的图表类型，例如最后的"demotype"
+	//自定义类型时需要注意"tline","tarea","scatter","bubble"等时间轴（矢量x轴）类图表，没有categories，不需要加入categories
+	"categories": ["line", "column", "mount", "bar", "area", "radar", "gauge", "candle", "mix", "demotype"],
+	//instance为实例变量承载属性，不要删除
+	"instance": {},
+	//option为opts及eopts承载属性，不要删除
+	"option": {},
+	//下面是自定义format配置，因除H5端外的其他端无法通过props传递函数，只能通过此属性对应下标的方式来替换
+	"formatter": {
+		"yAxisDemo1": function(val, index, opts) {
+			return val + '元'
+		},
+		"yAxisDemo2": function(val, index, opts) {
+			return val.toFixed(2)
+		},
+		"xAxisDemo1": function(val, index, opts) {
+			return val + '年';
+		},
+		"xAxisDemo2": function(val, index, opts) {
+			return formatDateTime(val, 'h:m')
+		},
+		"seriesDemo1": function(val, index, series, opts) {
+			return val + '元'
+		},
+		"tooltipDemo1": function(item, category, index, opts) {
+			if (index == 0) {
+				return '随便用' + item.data + '年'
+			} else {
+				return '其他我没改' + item.data + '天'
+			}
+		},
+		"pieDemo": function(val, index, series, opts) {
+			if (index !== undefined) {
+				return series[index].name + '：' + series[index].data + '元'
+			}
+		},
+	},
+	//这里演示了自定义您的图表类型的option，可以随意命名，之后在组件上 type="demotype" 后，组件会调用这个花括号里的option，如果组件上还存在opts参数，会将demotype与opts中option合并后渲染图表。
+	"demotype": {
+		//我这里把曲线图当做了自定义图表类型，您可以根据需要随意指定类型或配置
+		"type": "line",
+		"color": color,
+		"padding": [15, 10, 0, 15],
+		"xAxis": {
+			"disableGrid": true,
+		},
+		"yAxis": {
+			"gridType": "dash",
+			"dashLength": 2,
+		},
+		"legend": {},
+		"extra": {
+			"line": {
+				"type": "curve",
+				"width": 2
+			},
+		}
+	},
+	//下面是自定义配置，请添加项目所需的通用配置
+	"pie": {
 		"type": "pie",
-    "color": color,
-		"padding": [5,5,5,5],
+		"color": color,
+		"padding": [5, 5, 5, 5],
 		"extra": {
 			"pie": {
 				"activeOpacity": 0.5,
@@ -111,30 +132,33 @@ const cfu = {
 			},
 		}
 	},
-	"ring":{
+	"ring": {
 		"type": "ring",
-    "color": color,
-		"padding": [5,5,5,5],
+		"color": color,
+		"padding": [0, 0, 0, 0],
 		"rotate": false,
 		"dataLabel": true,
 		"legend": {
 			"show": true,
 			"position": "right",
-      "lineHeight": 25,
+			"lineHeight": 25,
 		},
 		"title": {
 			"name": "收益率",
 			"fontSize": 15,
-			"color": "#666666"
+			"color": "#666666",
+			"fontFamoly": 'Tahoma',
+			"fontWeight": 'blod'
 		},
 		"subtitle": {
 			"name": "70%",
 			"fontSize": 25,
-			"color": "#7cb5ec"
+			"color": "#7cb5ec",
+			"fontFamoly": 'Tahoma'
 		},
 		"extra": {
 			"ring": {
-				"ringWidth":30,
+				"ringWidth": 30,
 				"activeOpacity": 0.5,
 				"activeRadius": 10,
 				"offsetAngle": 0,
@@ -145,14 +169,14 @@ const cfu = {
 			},
 		},
 	},
-	"rose":{
+	"rose": {
 		"type": "rose",
-    "color": color,
-		"padding": [5,5,5,5],
+		"color": color,
+		"padding": [5, 5, 5, 5],
 		"legend": {
 			"show": true,
 			"position": "left",
-      "lineHeight": 25,
+			"lineHeight": 25,
 		},
 		"extra": {
 			"rose": {
@@ -168,9 +192,9 @@ const cfu = {
 			},
 		}
 	},
-	"word":{
+	"word": {
 		"type": "word",
-    "color": color,
+		"color": color,
 		"extra": {
 			"word": {
 				"type": "normal",
@@ -178,10 +202,10 @@ const cfu = {
 			}
 		}
 	},
-	"funnel":{
+	"funnel": {
 		"type": "funnel",
-    "color": color,
-		"padding": [15,15,0,15],
+		"color": color,
+		"padding": [15, 15, 0, 15],
 		"extra": {
 			"funnel": {
 				"activeOpacity": 0.3,
@@ -194,11 +218,11 @@ const cfu = {
 			},
 		}
 	},
-	"map":{
+	"map": {
 		"type": "map",
-    "color": color,
-		"padding": [0,0,0,0],
-    "dataLabel": true,
+		"color": color,
+		"padding": [0, 0, 0, 0],
+		"dataLabel": true,
 		"extra": {
 			"map": {
 				"border": true,
@@ -211,9 +235,9 @@ const cfu = {
 			},
 		}
 	},
-	"arcbar":{
+	"arcbar": {
 		"type": "arcbar",
-    "color": color,
+		"color": color,
 		"title": {
 			"name": "百分比",
 			"fontSize": 25,
@@ -235,98 +259,92 @@ const cfu = {
 			}
 		}
 	},
-	"line":{
+	"line": {
 		"type": "line",
-    "color": color,
-		"padding": [15,10,0,15],
+		"color": color,
+		"padding": [15, 10, 0, 15],
 		"xAxis": {
-      "disableGrid": true,
+			"disableGrid": true,
 		},
 		"yAxis": {
-      "gridType": "dash",
-      "dashLength": 2,
-		},
-		"legend": {
+			"gridType": "dash",
+			"dashLength": 2,
 		},
+		"legend": {},
 		"extra": {
 			"line": {
 				"type": "straight",
 				"width": 2,
-        "activeType": "hollow"
+				"activeType": "hollow"
 			},
 		}
 	},
-  "tline":{
-  	"type": "line",
-    "color": color,
-  	"padding": [15,10,0,15],
-  	"xAxis": {
-      "disableGrid": false,
-      "boundaryGap":"justify",
-  	},
-  	"yAxis": {
-      "gridType": "dash",
-      "dashLength": 2,
-      "data":[
-        {
-          "min":0,
-          "max":80
-        }
-      ]
-  	},
-  	"legend": {
-  	},
-  	"extra": {
-  		"line": {
-  			"type": "curve",
-  			"width": 2,
-        "activeType": "hollow"
-  		},
-  	}
-  },
-  "tarea":{
-  	"type": "area",
-    "color": color,
-  	"padding": [15,10,0,15],
-  	"xAxis": {
-      "disableGrid": true,
-      "boundaryGap":"justify",
-  	},
-  	"yAxis": {
-      "gridType": "dash",
-      "dashLength": 2,
-      "data":[
-        {
-          "min":0,
-          "max":80
-        }
-      ]
-  	},
-  	"legend": {
-  	},
-  	"extra": {
-  		"area": {
-  			"type": "curve",
-  			"opacity": 0.2,
-  			"addLine": true,
-  			"width": 2,
-  			"gradient": true,
-        "activeType": "hollow"
-  		},
-  	}
-  },
-	"column":{
-		"type": "column",
-    "color": color,
-		"padding": [15,15,0,5],
+	"tline": {
+		"type": "line",
+		"color": color,
+		"padding": [15, 10, 0, 15],
 		"xAxis": {
-      "disableGrid": true,
+			"disableGrid": false,
+			"boundaryGap": "justify",
 		},
 		"yAxis": {
-      "data":[{"min":0}]
+			"gridType": "dash",
+			"dashLength": 2,
+			"data": [{
+				"min": 0,
+				"max": 80
+			}]
 		},
-		"legend": {
+		"legend": {},
+		"extra": {
+			"line": {
+				"type": "curve",
+				"width": 2,
+				"activeType": "hollow"
+			},
+		}
+	},
+	"tarea": {
+		"type": "area",
+		"color": color,
+		"padding": [15, 10, 0, 15],
+		"xAxis": {
+			"disableGrid": true,
+			"boundaryGap": "justify",
+		},
+		"yAxis": {
+			"gridType": "dash",
+			"dashLength": 2,
+			"data": [{
+				"min": 0,
+				"max": 80
+			}]
+		},
+		"legend": {},
+		"extra": {
+			"area": {
+				"type": "curve",
+				"opacity": 0.2,
+				"addLine": true,
+				"width": 2,
+				"gradient": true,
+				"activeType": "hollow"
+			},
+		}
+	},
+	"column": {
+		"type": "column",
+		"color": color,
+		"padding": [15, 15, 0, 5],
+		"xAxis": {
+			"disableGrid": true,
 		},
+		"yAxis": {
+			"data": [{
+				"min": 0
+			}]
+		},
+		"legend": {},
 		"extra": {
 			"column": {
 				"type": "group",
@@ -336,63 +354,61 @@ const cfu = {
 			},
 		}
 	},
-  "mount":{
-  	"type": "mount",
-    "color": color,
-  	"padding": [15,15,0,5],
-  	"xAxis": {
-      "disableGrid": true,
-  	},
-  	"yAxis": {
-      "data":[{"min":0}]
-  	},
-  	"legend": {
-  	},
-  	"extra": {
-  		"mount": {
-  			"type": "mount",
-  			"widthRatio": 1.5,
-  		},
-  	}
-  },
-  "bar":{
-  	"type": "bar",
-    "color": color,
-  	"padding": [15,30,0,5],
-  	"xAxis": {
-      "boundaryGap":"justify",
-      "disableGrid":false,
-      "min":0,
-      "axisLine":false
-  	},
-  	"yAxis": {
-  	},
-  	"legend": {
-  	},
-  	"extra": {
-  		"bar": {
-  			"type": "group",
-  			"width": 30,
-  			"meterBorde": 1,
-  			"meterFillColor": "#FFFFFF",
-  			"activeBgColor": "#000000",
-  			"activeBgOpacity": 0.08
-  		},
-  	}
-  },
-	"area":{
-		"type": "area",
+	"mount": {
+		"type": "mount",
 		"color": color,
-		"padding": [15,15,0,15],
+		"padding": [15, 15, 0, 5],
 		"xAxis": {
-      "disableGrid": true,
+			"disableGrid": true,
 		},
 		"yAxis": {
-      "gridType": "dash",
-      "dashLength": 2,
+			"data": [{
+				"min": 0
+			}]
 		},
-		"legend": {
+		"legend": {},
+		"extra": {
+			"mount": {
+				"type": "mount",
+				"widthRatio": 1.5,
+			},
+		}
+	},
+	"bar": {
+		"type": "bar",
+		"color": color,
+		"padding": [15, 30, 0, 5],
+		"xAxis": {
+			"boundaryGap": "justify",
+			"disableGrid": false,
+			"min": 0,
+			"axisLine": false
 		},
+		"yAxis": {},
+		"legend": {},
+		"extra": {
+			"bar": {
+				"type": "group",
+				"width": 30,
+				"meterBorde": 1,
+				"meterFillColor": "#FFFFFF",
+				"activeBgColor": "#000000",
+				"activeBgOpacity": 0.08
+			},
+		}
+	},
+	"area": {
+		"type": "area",
+		"color": color,
+		"padding": [15, 15, 0, 15],
+		"xAxis": {
+			"disableGrid": true,
+		},
+		"yAxis": {
+			"gridType": "dash",
+			"dashLength": 2,
+		},
+		"legend": {},
 		"extra": {
 			"area": {
 				"type": "straight",
@@ -400,19 +416,19 @@ const cfu = {
 				"addLine": true,
 				"width": 2,
 				"gradient": false,
-        "activeType": "hollow"
+				"activeType": "hollow"
 			},
 		}
 	},
-	"radar":{
+	"radar": {
 		"type": "radar",
 		"color": color,
-		"padding": [5,5,5,5],
-    "dataLabel": false,
+		"padding": [5, 5, 5, 5],
+		"dataLabel": false,
 		"legend": {
 			"show": true,
 			"position": "right",
-      "lineHeight": 25,
+			"lineHeight": 25,
 		},
 		"extra": {
 			"radar": {
@@ -425,7 +441,7 @@ const cfu = {
 			},
 		}
 	},
-	"gauge":{
+	"gauge": {
 		"type": "gauge",
 		"color": color,
 		"title": {
@@ -465,10 +481,10 @@ const cfu = {
 			}
 		}
 	},
-	"candle":{
+	"candle": {
 		"type": "candle",
 		"color": color,
-		"padding": [15,15,0,15],
+		"padding": [15, 15, 0, 15],
 		"enableScroll": true,
 		"enableMarkLine": true,
 		"dataLabel": false,
@@ -484,10 +500,8 @@ const cfu = {
 			"scrollColor": "#A6A6A6",
 			"scrollBackgroundColor": "#EFEBEF"
 		},
-		"yAxis": {
-		},
-		"legend": {
-		},
+		"yAxis": {},
+		"legend": {},
 		"extra": {
 			"candle": {
 				"color": {
@@ -498,16 +512,15 @@ const cfu = {
 				},
 				"average": {
 					"show": true,
-					"name": ["MA5","MA10","MA30"],
-					"day": [5,10,20],
-					"color": ["#1890ff","#2fc25b","#facc14"]
+					"name": ["MA5", "MA10", "MA30"],
+					"day": [5, 10, 20],
+					"color": ["#1890ff", "#2fc25b", "#facc14"]
 				}
 			},
 			"markLine": {
 				"type": "dash",
 				"dashLength": 5,
-				"data": [
-					{
+				"data": [{
 						"value": 2150,
 						"lineColor": "#f04864",
 						"showLabel": true
@@ -521,12 +534,12 @@ const cfu = {
 			}
 		}
 	},
-	"mix":{
+	"mix": {
 		"type": "mix",
 		"color": color,
-		"padding": [15,15,0,15],
+		"padding": [15, 15, 0, 15],
 		"xAxis": {
-      "disableGrid": true,
+			"disableGrid": true,
 		},
 		"yAxis": {
 			"disabled": false,
@@ -539,8 +552,7 @@ const cfu = {
 			"showTitle": true,
 			"data": []
 		},
-		"legend": {
-		},
+		"legend": {},
 		"extra": {
 			"mix": {
 				"column": {
@@ -549,57 +561,54 @@ const cfu = {
 			},
 		}
 	},
-	"scatter":{
+	"scatter": {
 		"type": "scatter",
-		"color":color,
-		"padding":[15,15,0,15],
-    "dataLabel":false,
-    "xAxis": {
-      "disableGrid": false,
-      "gridType":"dash",
-      "splitNumber":5,
-      "boundaryGap":"justify",
-      "min":0
-    },
-    "yAxis": {
-      "disableGrid": false,
-      "gridType":"dash",
-    },
-    "legend": {
-    },
-    "extra": {
-    	"scatter": {
-    	},
-    }
+		"color": color,
+		"padding": [15, 15, 0, 15],
+		"dataLabel": false,
+		"xAxis": {
+			"disableGrid": false,
+			"gridType": "dash",
+			"splitNumber": 5,
+			"boundaryGap": "justify",
+			"min": 0
+		},
+		"yAxis": {
+			"disableGrid": false,
+			"gridType": "dash",
+		},
+		"legend": {},
+		"extra": {
+			"scatter": {},
+		}
 	},
-	"bubble":{
+	"bubble": {
 		"type": "bubble",
-		"color":color,
-		"padding":[15,15,0,15],
-    "xAxis": {
-      "disableGrid": false,
-      "gridType":"dash",
-      "splitNumber":5,
-      "boundaryGap":"justify",
-      "min":0,
-      "max":250
-    },
-    "yAxis": {
-      "disableGrid": false,
-      "gridType":"dash",
-      "data":[{
-        "min":0,
-        "max":150
-      }]
-    },
-    "legend": {
-    },
-    "extra": {
-    	"bubble": {
-        "border":2,
-        "opacity": 0.5,
-    	},
-    }
+		"color": color,
+		"padding": [15, 15, 0, 15],
+		"xAxis": {
+			"disableGrid": false,
+			"gridType": "dash",
+			"splitNumber": 5,
+			"boundaryGap": "justify",
+			"min": 0,
+			"max": 250
+		},
+		"yAxis": {
+			"disableGrid": false,
+			"gridType": "dash",
+			"data": [{
+				"min": 0,
+				"max": 150
+			}]
+		},
+		"legend": {},
+		"extra": {
+			"bubble": {
+				"border": 2,
+				"opacity": 0.5,
+			},
+		}
 	}
 }
 
diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.js b/uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.js
index f78bde5..168fdfb 100644
--- a/uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.js
+++ b/uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.js
@@ -19,7688 +19,7889 @@
 'use strict';
 
 var config = {
-  version: 'v2.5.0-20230101',
-  yAxisWidth: 15,
-  xAxisHeight: 22,
-  padding: [10, 10, 10, 10],
-  rotate: false,
-  fontSize: 13,
-  fontColor: '#666666',
-  dataPointShape: ['circle', 'circle', 'circle', 'circle'],
-  color: ['#1890FF', '#91CB74', '#FAC858', '#EE6666', '#73C0DE', '#3CA272', '#FC8452', '#9A60B4', '#ea7ccc'],
-  linearColor: ['#0EE2F8', '#2BDCA8', '#FA7D8D', '#EB88E2', '#2AE3A0', '#0EE2F8', '#EB88E2', '#6773E3', '#F78A85'],
-  pieChartLinePadding: 15,
-  pieChartTextPadding: 5,
-  titleFontSize: 20,
-  subtitleFontSize: 15,
-  radarLabelTextMargin: 13,
+	version: 'v2.5.0-20230101',
+	yAxisWidth: 15,
+	xAxisHeight: 22,
+	padding: [10, 10, 10, 10],
+	rotate: false,
+	fontSize: 13,
+	fontColor: '#666666',
+	dataPointShape: ['circle', 'circle', 'circle', 'circle'],
+	color: ['#1890FF', '#91CB74', '#FAC858', '#EE6666', '#73C0DE', '#3CA272', '#FC8452', '#9A60B4', '#ea7ccc'],
+	linearColor: ['#0EE2F8', '#2BDCA8', '#FA7D8D', '#EB88E2', '#2AE3A0', '#0EE2F8', '#EB88E2', '#6773E3', '#F78A85'],
+	pieChartLinePadding: 15,
+	pieChartTextPadding: 5,
+	titleFontSize: 20,
+	subtitleFontSize: 15,
+	radarLabelTextMargin: 13,
 };
 
 var assign = function(target, ...varArgs) {
-  if (target == null) {
-    throw new TypeError('[uCharts] Cannot convert undefined or null to object');
-  }
-  if (!varArgs || varArgs.length <= 0) {
-    return target;
-  }
-  // 深度合并对象
-  function deepAssign(obj1, obj2) {
-    for (let key in obj2) {
-      obj1[key] = obj1[key] && obj1[key].toString() === "[object Object]" ?
-        deepAssign(obj1[key], obj2[key]) : obj1[key] = obj2[key];
-    }
-    return obj1;
-  }
-  varArgs.forEach(val => {
-    target = deepAssign(target, val);
-  });
-  return target;
+	if (target == null) {
+		throw new TypeError('[uCharts] Cannot convert undefined or null to object');
+	}
+	if (!varArgs || varArgs.length <= 0) {
+		return target;
+	}
+	// 深度合并对象
+	function deepAssign(obj1, obj2) {
+		for (let key in obj2) {
+			obj1[key] = obj1[key] && obj1[key].toString() === "[object Object]" ?
+				deepAssign(obj1[key], obj2[key]) : obj1[key] = obj2[key];
+		}
+		return obj1;
+	}
+	varArgs.forEach(val => {
+		target = deepAssign(target, val);
+	});
+	return target;
 };
 
 var util = {
-  toFixed: function toFixed(num, limit) {
-    limit = limit || 2;
-    if (this.isFloat(num)) {
-      num = num.toFixed(limit);
-    }
-    return num;
-  },
-  isFloat: function isFloat(num) {
-    return num % 1 !== 0;
-  },
-  approximatelyEqual: function approximatelyEqual(num1, num2) {
-    return Math.abs(num1 - num2) < 1e-10;
-  },
-  isSameSign: function isSameSign(num1, num2) {
-    return Math.abs(num1) === num1 && Math.abs(num2) === num2 || Math.abs(num1) !== num1 && Math.abs(num2) !== num2;
-  },
-  isSameXCoordinateArea: function isSameXCoordinateArea(p1, p2) {
-    return this.isSameSign(p1.x, p2.x);
-  },
-  isCollision: function isCollision(obj1, obj2) {
-    obj1.end = {};
-    obj1.end.x = obj1.start.x + obj1.width;
-    obj1.end.y = obj1.start.y - obj1.height;
-    obj2.end = {};
-    obj2.end.x = obj2.start.x + obj2.width;
-    obj2.end.y = obj2.start.y - obj2.height;
-    var flag = obj2.start.x > obj1.end.x || obj2.end.x < obj1.start.x || obj2.end.y > obj1.start.y || obj2.start.y < obj1.end.y;
-    return !flag;
-  }
+	toFixed: function toFixed(num, limit) {
+		limit = limit || 2;
+		if (this.isFloat(num)) {
+			num = num.toFixed(limit);
+		}
+		return num;
+	},
+	isFloat: function isFloat(num) {
+		return num % 1 !== 0;
+	},
+	approximatelyEqual: function approximatelyEqual(num1, num2) {
+		return Math.abs(num1 - num2) < 1e-10;
+	},
+	isSameSign: function isSameSign(num1, num2) {
+		return Math.abs(num1) === num1 && Math.abs(num2) === num2 || Math.abs(num1) !== num1 && Math.abs(num2) !== num2;
+	},
+	isSameXCoordinateArea: function isSameXCoordinateArea(p1, p2) {
+		return this.isSameSign(p1.x, p2.x);
+	},
+	isCollision: function isCollision(obj1, obj2) {
+		obj1.end = {};
+		obj1.end.x = obj1.start.x + obj1.width;
+		obj1.end.y = obj1.start.y - obj1.height;
+		obj2.end = {};
+		obj2.end.x = obj2.start.x + obj2.width;
+		obj2.end.y = obj2.start.y - obj2.height;
+		var flag = obj2.start.x > obj1.end.x || obj2.end.x < obj1.start.x || obj2.end.y > obj1.start.y || obj2.start.y <
+			obj1.end.y;
+		return !flag;
+	}
 };
 
 //兼容H5点击事件
 function getH5Offset(e) {
-  e.mp = {
-    changedTouches: []
-  };
-  e.mp.changedTouches.push({
-    x: e.offsetX,
-    y: e.offsetY
-  });
-  return e;
+	e.mp = {
+		changedTouches: []
+	};
+	e.mp.changedTouches.push({
+		x: e.offsetX,
+		y: e.offsetY
+	});
+	return e;
 }
 
 // hex 转 rgba
 function hexToRgb(hexValue, opc) {
-  var rgx = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
-  var hex = hexValue.replace(rgx, function(m, r, g, b) {
-    return r + r + g + g + b + b;
-  });
-  var rgb = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
-  var r = parseInt(rgb[1], 16);
-  var g = parseInt(rgb[2], 16);
-  var b = parseInt(rgb[3], 16);
-  return 'rgba(' + r + ',' + g + ',' + b + ',' + opc + ')';
+	var rgx = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
+	var hex = hexValue.replace(rgx, function(m, r, g, b) {
+		return r + r + g + g + b + b;
+	});
+	var rgb = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+	var r = parseInt(rgb[1], 16);
+	var g = parseInt(rgb[2], 16);
+	var b = parseInt(rgb[3], 16);
+	return 'rgba(' + r + ',' + g + ',' + b + ',' + opc + ')';
 }
 
 function findRange(num, type, limit) {
-  if (isNaN(num)) {
-    throw new Error('[uCharts] series数据需为Number格式');
-  }
-  limit = limit || 10;
-  type = type ? type : 'upper';
-  var multiple = 1;
-  while (limit < 1) {
-    limit *= 10;
-    multiple *= 10;
-  }
-  if (type === 'upper') {
-    num = Math.ceil(num * multiple);
-  } else {
-    num = Math.floor(num * multiple);
-  }
-  while (num % limit !== 0) {
-    if (type === 'upper') {
-      if (num == num + 1) { //修复数据值过大num++无效的bug by 向日葵 @xrk_jy
-        break;
-      }
-      num++;
-    } else {
-      num--;
-    }
-  }
-  return num / multiple;
+	if (isNaN(num)) {
+		throw new Error('[uCharts] series数据需为Number格式');
+	}
+	limit = limit || 10;
+	type = type ? type : 'upper';
+	var multiple = 1;
+	while (limit < 1) {
+		limit *= 10;
+		multiple *= 10;
+	}
+	if (type === 'upper') {
+		num = Math.ceil(num * multiple);
+	} else {
+		num = Math.floor(num * multiple);
+	}
+	while (num % limit !== 0) {
+		if (type === 'upper') {
+			if (num == num + 1) { //修复数据值过大num++无效的bug by 向日葵 @xrk_jy
+				break;
+			}
+			num++;
+		} else {
+			num--;
+		}
+	}
+	return num / multiple;
 }
 
 function calCandleMA(dayArr, nameArr, colorArr, kdata) {
-  let seriesTemp = [];
-  for (let k = 0; k < dayArr.length; k++) {
-    let seriesItem = {
-      data: [],
-      name: nameArr[k],
-      color: colorArr[k]
-    };
-    for (let i = 0, len = kdata.length; i < len; i++) {
-      if (i < dayArr[k]) {
-        seriesItem.data.push(null);
-        continue;
-      }
-      let sum = 0;
-      for (let j = 0; j < dayArr[k]; j++) {
-        sum += kdata[i - j][1];
-      }
-      seriesItem.data.push(+(sum / dayArr[k]).toFixed(3));
-    }
-    seriesTemp.push(seriesItem);
-  }
-  return seriesTemp;
+	let seriesTemp = [];
+	for (let k = 0; k < dayArr.length; k++) {
+		let seriesItem = {
+			data: [],
+			name: nameArr[k],
+			color: colorArr[k]
+		};
+		for (let i = 0, len = kdata.length; i < len; i++) {
+			if (i < dayArr[k]) {
+				seriesItem.data.push(null);
+				continue;
+			}
+			let sum = 0;
+			for (let j = 0; j < dayArr[k]; j++) {
+				sum += kdata[i - j][1];
+			}
+			seriesItem.data.push(+(sum / dayArr[k]).toFixed(3));
+		}
+		seriesTemp.push(seriesItem);
+	}
+	return seriesTemp;
 }
 
 function calValidDistance(self, distance, chartData, config, opts) {
-  var dataChartAreaWidth = opts.width - opts.area[1] - opts.area[3];
-  var dataChartWidth = chartData.eachSpacing * (opts.chartData.xAxisData.xAxisPoints.length - 1);
-  if(opts.type == 'mount' && opts.extra && opts.extra.mount && opts.extra.mount.widthRatio && opts.extra.mount.widthRatio > 1){
-    if(opts.extra.mount.widthRatio>2) opts.extra.mount.widthRatio = 2
-    dataChartWidth += (opts.extra.mount.widthRatio - 1)*chartData.eachSpacing;
-  }
-  var validDistance = distance;
-  if (distance >= 0) {
-    validDistance = 0;
-    self.uevent.trigger('scrollLeft');
-    self.scrollOption.position = 'left'
-    opts.xAxis.scrollPosition = 'left';
-  } else if (Math.abs(distance) >= dataChartWidth - dataChartAreaWidth) {
-    validDistance = dataChartAreaWidth - dataChartWidth;
-    self.uevent.trigger('scrollRight');
-    self.scrollOption.position = 'right'
-    opts.xAxis.scrollPosition = 'right';
-  } else {
-    self.scrollOption.position = distance
-    opts.xAxis.scrollPosition = distance;
-  }
-  return validDistance;
+	var dataChartAreaWidth = opts.width - opts.area[1] - opts.area[3];
+	var dataChartWidth = chartData.eachSpacing * (opts.chartData.xAxisData.xAxisPoints.length - 1);
+	if (opts.type == 'mount' && opts.extra && opts.extra.mount && opts.extra.mount.widthRatio && opts.extra.mount
+		.widthRatio > 1) {
+		if (opts.extra.mount.widthRatio > 2) opts.extra.mount.widthRatio = 2
+		dataChartWidth += (opts.extra.mount.widthRatio - 1) * chartData.eachSpacing;
+	}
+	var validDistance = distance;
+	if (distance >= 0) {
+		validDistance = 0;
+		self.uevent.trigger('scrollLeft');
+		self.scrollOption.position = 'left'
+		opts.xAxis.scrollPosition = 'left';
+	} else if (Math.abs(distance) >= dataChartWidth - dataChartAreaWidth) {
+		validDistance = dataChartAreaWidth - dataChartWidth;
+		self.uevent.trigger('scrollRight');
+		self.scrollOption.position = 'right'
+		opts.xAxis.scrollPosition = 'right';
+	} else {
+		self.scrollOption.position = distance
+		opts.xAxis.scrollPosition = distance;
+	}
+	return validDistance;
 }
 
 function isInAngleRange(angle, startAngle, endAngle) {
-  function adjust(angle) {
-    while (angle < 0) {
-      angle += 2 * Math.PI;
-    }
-    while (angle > 2 * Math.PI) {
-      angle -= 2 * Math.PI;
-    }
-    return angle;
-  }
-  angle = adjust(angle);
-  startAngle = adjust(startAngle);
-  endAngle = adjust(endAngle);
-  if (startAngle > endAngle) {
-    endAngle += 2 * Math.PI;
-    if (angle < startAngle) {
-      angle += 2 * Math.PI;
-    }
-  }
-  return angle >= startAngle && angle <= endAngle;
+	function adjust(angle) {
+		while (angle < 0) {
+			angle += 2 * Math.PI;
+		}
+		while (angle > 2 * Math.PI) {
+			angle -= 2 * Math.PI;
+		}
+		return angle;
+	}
+	angle = adjust(angle);
+	startAngle = adjust(startAngle);
+	endAngle = adjust(endAngle);
+	if (startAngle > endAngle) {
+		endAngle += 2 * Math.PI;
+		if (angle < startAngle) {
+			angle += 2 * Math.PI;
+		}
+	}
+	return angle >= startAngle && angle <= endAngle;
 }
 
 function createCurveControlPoints(points, i) {
-  function isNotMiddlePoint(points, i) {
-    if (points[i - 1] && points[i + 1]) {
-      return points[i].y >= Math.max(points[i - 1].y, points[i + 1].y) || points[i].y <= Math.min(points[i - 1].y,
-        points[i + 1].y);
-    } else {
-      return false;
-    }
-  }
-  function isNotMiddlePointX(points, i) {
-    if (points[i - 1] && points[i + 1]) {
-      return points[i].x >= Math.max(points[i - 1].x, points[i + 1].x) || points[i].x <= Math.min(points[i - 1].x,
-        points[i + 1].x);
-    } else {
-      return false;
-    }
-  }
-  var a = 0.2;
-  var b = 0.2;
-  var pAx = null;
-  var pAy = null;
-  var pBx = null;
-  var pBy = null;
-  if (i < 1) {
-    pAx = points[0].x + (points[1].x - points[0].x) * a;
-    pAy = points[0].y + (points[1].y - points[0].y) * a;
-  } else {
-    pAx = points[i].x + (points[i + 1].x - points[i - 1].x) * a;
-    pAy = points[i].y + (points[i + 1].y - points[i - 1].y) * a;
-  }
-
-  if (i > points.length - 3) {
-    var last = points.length - 1;
-    pBx = points[last].x - (points[last].x - points[last - 1].x) * b;
-    pBy = points[last].y - (points[last].y - points[last - 1].y) * b;
-  } else {
-    pBx = points[i + 1].x - (points[i + 2].x - points[i].x) * b;
-    pBy = points[i + 1].y - (points[i + 2].y - points[i].y) * b;
-  }
-  if (isNotMiddlePoint(points, i + 1)) {
-    pBy = points[i + 1].y;
-  }
-  if (isNotMiddlePoint(points, i)) {
-    pAy = points[i].y;
-  }
-  if (isNotMiddlePointX(points, i + 1)) {
-    pBx = points[i + 1].x;
-  }
-  if (isNotMiddlePointX(points, i)) {
-    pAx = points[i].x;
-  }
-  if (pAy >= Math.max(points[i].y, points[i + 1].y) || pAy <= Math.min(points[i].y, points[i + 1].y)) {
-    pAy = points[i].y;
-  }
-  if (pBy >= Math.max(points[i].y, points[i + 1].y) || pBy <= Math.min(points[i].y, points[i + 1].y)) {
-    pBy = points[i + 1].y;
-  }
-  if (pAx >= Math.max(points[i].x, points[i + 1].x) || pAx <= Math.min(points[i].x, points[i + 1].x)) {
-    pAx = points[i].x;
-  }
-  if (pBx >= Math.max(points[i].x, points[i + 1].x) || pBx <= Math.min(points[i].x, points[i + 1].x)) {
-    pBx = points[i + 1].x;
-  }
-  return {
-    ctrA: {
-      x: pAx,
-      y: pAy
-    },
-    ctrB: {
-      x: pBx,
-      y: pBy
-    }
-  };
+	function isNotMiddlePoint(points, i) {
+		if (points[i - 1] && points[i + 1]) {
+			return points[i].y >= Math.max(points[i - 1].y, points[i + 1].y) || points[i].y <= Math.min(points[i - 1].y,
+				points[i + 1].y);
+		} else {
+			return false;
+		}
+	}
+
+	function isNotMiddlePointX(points, i) {
+		if (points[i - 1] && points[i + 1]) {
+			return points[i].x >= Math.max(points[i - 1].x, points[i + 1].x) || points[i].x <= Math.min(points[i - 1].x,
+				points[i + 1].x);
+		} else {
+			return false;
+		}
+	}
+	var a = 0.2;
+	var b = 0.2;
+	var pAx = null;
+	var pAy = null;
+	var pBx = null;
+	var pBy = null;
+	if (i < 1) {
+		pAx = points[0].x + (points[1].x - points[0].x) * a;
+		pAy = points[0].y + (points[1].y - points[0].y) * a;
+	} else {
+		pAx = points[i].x + (points[i + 1].x - points[i - 1].x) * a;
+		pAy = points[i].y + (points[i + 1].y - points[i - 1].y) * a;
+	}
+
+	if (i > points.length - 3) {
+		var last = points.length - 1;
+		pBx = points[last].x - (points[last].x - points[last - 1].x) * b;
+		pBy = points[last].y - (points[last].y - points[last - 1].y) * b;
+	} else {
+		pBx = points[i + 1].x - (points[i + 2].x - points[i].x) * b;
+		pBy = points[i + 1].y - (points[i + 2].y - points[i].y) * b;
+	}
+	if (isNotMiddlePoint(points, i + 1)) {
+		pBy = points[i + 1].y;
+	}
+	if (isNotMiddlePoint(points, i)) {
+		pAy = points[i].y;
+	}
+	if (isNotMiddlePointX(points, i + 1)) {
+		pBx = points[i + 1].x;
+	}
+	if (isNotMiddlePointX(points, i)) {
+		pAx = points[i].x;
+	}
+	if (pAy >= Math.max(points[i].y, points[i + 1].y) || pAy <= Math.min(points[i].y, points[i + 1].y)) {
+		pAy = points[i].y;
+	}
+	if (pBy >= Math.max(points[i].y, points[i + 1].y) || pBy <= Math.min(points[i].y, points[i + 1].y)) {
+		pBy = points[i + 1].y;
+	}
+	if (pAx >= Math.max(points[i].x, points[i + 1].x) || pAx <= Math.min(points[i].x, points[i + 1].x)) {
+		pAx = points[i].x;
+	}
+	if (pBx >= Math.max(points[i].x, points[i + 1].x) || pBx <= Math.min(points[i].x, points[i + 1].x)) {
+		pBx = points[i + 1].x;
+	}
+	return {
+		ctrA: {
+			x: pAx,
+			y: pAy
+		},
+		ctrB: {
+			x: pBx,
+			y: pBy
+		}
+	};
 }
 
 
 function convertCoordinateOrigin(x, y, center) {
-  return {
-    x: center.x + x,
-    y: center.y - y
-  };
+	return {
+		x: center.x + x,
+		y: center.y - y
+	};
 }
 
 function avoidCollision(obj, target) {
-  if (target) {
-    // is collision test
-    while (util.isCollision(obj, target)) {
-      if (obj.start.x > 0) {
-        obj.start.y--;
-      } else if (obj.start.x < 0) {
-        obj.start.y++;
-      } else {
-        if (obj.start.y > 0) {
-          obj.start.y++;
-        } else {
-          obj.start.y--;
-        }
-      }
-    }
-  }
-  return obj;
+	if (target) {
+		// is collision test
+		while (util.isCollision(obj, target)) {
+			if (obj.start.x > 0) {
+				obj.start.y--;
+			} else if (obj.start.x < 0) {
+				obj.start.y++;
+			} else {
+				if (obj.start.y > 0) {
+					obj.start.y++;
+				} else {
+					obj.start.y--;
+				}
+			}
+		}
+	}
+	return obj;
 }
 
-function fixPieSeries(series, opts, config){
-  let pieSeriesArr = [];
-  if(series.length>0 && series[0].data.constructor.toString().indexOf('Array') > -1){
-    opts._pieSeries_ = series;
-    let oldseries = series[0].data;
-    for (var i = 0; i < oldseries.length; i++) {
-      oldseries[i].formatter = series[0].formatter;
-      oldseries[i].data = oldseries[i].value;
-      pieSeriesArr.push(oldseries[i]);
-    }
-    opts.series = pieSeriesArr;
-  }else{
-    pieSeriesArr = series;
-  }
-  return pieSeriesArr;
+function fixPieSeries(series, opts, config) {
+	let pieSeriesArr = [];
+	if (series.length > 0 && series[0].data.constructor.toString().indexOf('Array') > -1) {
+		opts._pieSeries_ = series;
+		let oldseries = series[0].data;
+		for (var i = 0; i < oldseries.length; i++) {
+			oldseries[i].formatter = series[0].formatter;
+			oldseries[i].data = oldseries[i].value;
+			pieSeriesArr.push(oldseries[i]);
+		}
+		opts.series = pieSeriesArr;
+	} else {
+		pieSeriesArr = series;
+	}
+	return pieSeriesArr;
 }
 
 function fillSeries(series, opts, config) {
-  var index = 0;
-  for (var i = 0; i < series.length; i++) {
-    let item = series[i];
-    if (!item.color) {
-      item.color = config.color[index];
-      index = (index + 1) % config.color.length;
-    }
-    if (!item.linearIndex) {
-      item.linearIndex = i;
-    }
-    if (!item.index) {
-      item.index = 0;
-    }
-    if (!item.type) {
-      item.type = opts.type;
-    }
-    if (typeof item.show == "undefined") {
-      item.show = true;
-    }
-    if (!item.type) {
-      item.type = opts.type;
-    }
-    if (!item.pointShape) {
-      item.pointShape = "circle";
-    }
-    if (!item.legendShape) {
-      switch (item.type) {
-        case 'line':
-          item.legendShape = "line";
-          break;
-        case 'column':
-        case 'bar':
-          item.legendShape = "rect";
-          break;
-        case 'area':
-        case 'mount':
-          item.legendShape = "triangle";
-          break;
-        default:
-          item.legendShape = "circle";
-      }
-    }
-  }
-  return series;
+	var index = 0;
+	for (var i = 0; i < series.length; i++) {
+		let item = series[i];
+		if (!item.color) {
+			item.color = config.color[index];
+			index = (index + 1) % config.color.length;
+		}
+		if (!item.linearIndex) {
+			item.linearIndex = i;
+		}
+		if (!item.index) {
+			item.index = 0;
+		}
+		if (!item.type) {
+			item.type = opts.type;
+		}
+		if (typeof item.show == "undefined") {
+			item.show = true;
+		}
+		if (!item.type) {
+			item.type = opts.type;
+		}
+		if (!item.pointShape) {
+			item.pointShape = "circle";
+		}
+		if (!item.legendShape) {
+			switch (item.type) {
+				case 'line':
+					item.legendShape = "line";
+					break;
+				case 'column':
+				case 'bar':
+					item.legendShape = "rect";
+					break;
+				case 'area':
+				case 'mount':
+					item.legendShape = "triangle";
+					break;
+				default:
+					item.legendShape = "circle";
+			}
+		}
+	}
+	return series;
 }
 
 function fillCustomColor(linearType, customColor, series, config) {
-  var newcolor = customColor || [];
-  if (linearType == 'custom' && newcolor.length == 0 ) {
-    newcolor = config.linearColor;
-  }
-  if (linearType == 'custom' && newcolor.length < series.length) {
-    let chazhi = series.length - newcolor.length;
-    for (var i = 0; i < chazhi; i++) {
-      newcolor.push(config.linearColor[(i + 1) % config.linearColor.length]);
-    }
-  }
-  return newcolor;
+	var newcolor = customColor || [];
+	if (linearType == 'custom' && newcolor.length == 0) {
+		newcolor = config.linearColor;
+	}
+	if (linearType == 'custom' && newcolor.length < series.length) {
+		let chazhi = series.length - newcolor.length;
+		for (var i = 0; i < chazhi; i++) {
+			newcolor.push(config.linearColor[(i + 1) % config.linearColor.length]);
+		}
+	}
+	return newcolor;
 }
 
 function getDataRange(minData, maxData) {
-  var limit = 0;
-  var range = maxData - minData;
-  if (range >= 10000) {
-    limit = 1000;
-  } else if (range >= 1000) {
-    limit = 100;
-  } else if (range >= 100) {
-    limit = 10;
-  } else if (range >= 10) {
-    limit = 5;
-  } else if (range >= 1) {
-    limit = 1;
-  } else if (range >= 0.1) {
-    limit = 0.1;
-  } else if (range >= 0.01) {
-    limit = 0.01;
-  } else if (range >= 0.001) {
-    limit = 0.001;
-  } else if (range >= 0.0001) {
-    limit = 0.0001;
-  } else if (range >= 0.00001) {
-    limit = 0.00001;
-  } else {
-    limit = 0.000001;
-  }
-  return {
-    minRange: findRange(minData, 'lower', limit),
-    maxRange: findRange(maxData, 'upper', limit)
-  };
+	var limit = 0;
+	var range = maxData - minData;
+	if (range >= 10000) {
+		limit = 1000;
+	} else if (range >= 1000) {
+		limit = 100;
+	} else if (range >= 100) {
+		limit = 10;
+	} else if (range >= 10) {
+		limit = 5;
+	} else if (range >= 1) {
+		limit = 1;
+	} else if (range >= 0.1) {
+		limit = 0.1;
+	} else if (range >= 0.01) {
+		limit = 0.01;
+	} else if (range >= 0.001) {
+		limit = 0.001;
+	} else if (range >= 0.0001) {
+		limit = 0.0001;
+	} else if (range >= 0.00001) {
+		limit = 0.00001;
+	} else {
+		limit = 0.000001;
+	}
+	return {
+		minRange: findRange(minData, 'lower', limit),
+		maxRange: findRange(maxData, 'upper', limit)
+	};
 }
 
 function measureText(text, fontSize, context) {
-  var width = 0;
-  text = String(text);
-  // #ifdef MP-ALIPAY || MP-BAIDU || APP-NVUE
-  context = false;
-  // #endif
-  if (context !== false && context !== undefined && context.setFontSize && context.measureText) {
-    context.setFontSize(fontSize);
-    return context.measureText(text).width;
-  } else {
-    var text = text.split('');
-    for (let i = 0; i < text.length; i++) {
-      let item = text[i];
-      if (/[a-zA-Z]/.test(item)) {
-        width += 7;
-      } else if (/[0-9]/.test(item)) {
-        width += 5.5;
-      } else if (/\./.test(item)) {
-        width += 2.7;
-      } else if (/-/.test(item)) {
-        width += 3.25;
-      } else if (/:/.test(item)) {
-        width += 2.5;
-      } else if (/[\u4e00-\u9fa5]/.test(item)) {
-        width += 10;
-      } else if (/\(|\)/.test(item)) {
-        width += 3.73;
-      } else if (/\s/.test(item)) {
-        width += 2.5;
-      } else if (/%/.test(item)) {
-        width += 8;
-      } else {
-        width += 10;
-      }
-    }
-    return width * fontSize / 10;
-  }
+	var width = 0;
+	text = String(text);
+	// #ifdef MP-ALIPAY || MP-BAIDU || APP-NVUE
+	context = false;
+	// #endif
+	if (context !== false && context !== undefined && context.setFontSize && context.measureText) {
+		context.setFontSize(fontSize);
+		return context.measureText(text).width;
+	} else {
+		var text = text.split('');
+		for (let i = 0; i < text.length; i++) {
+			let item = text[i];
+			if (/[a-zA-Z]/.test(item)) {
+				width += 7;
+			} else if (/[0-9]/.test(item)) {
+				width += 5.5;
+			} else if (/\./.test(item)) {
+				width += 2.7;
+			} else if (/-/.test(item)) {
+				width += 3.25;
+			} else if (/:/.test(item)) {
+				width += 2.5;
+			} else if (/[\u4e00-\u9fa5]/.test(item)) {
+				width += 10;
+			} else if (/\(|\)/.test(item)) {
+				width += 3.73;
+			} else if (/\s/.test(item)) {
+				width += 2.5;
+			} else if (/%/.test(item)) {
+				width += 8;
+			} else {
+				width += 10;
+			}
+		}
+		return width * fontSize / 10;
+	}
 }
 
 function dataCombine(series) {
-  return series.reduce(function(a, b) {
-    return (a.data ? a.data : a).concat(b.data);
-  }, []);
+	return series.reduce(function(a, b) {
+		return (a.data ? a.data : a).concat(b.data);
+	}, []);
 }
 
 function dataCombineStack(series, len) {
-  var sum = new Array(len);
-  for (var j = 0; j < sum.length; j++) {
-    sum[j] = 0;
-  }
-  for (var i = 0; i < series.length; i++) {
-    for (var j = 0; j < sum.length; j++) {
-      sum[j] += series[i].data[j];
-    }
-  }
-  return series.reduce(function(a, b) {
-    return (a.data ? a.data : a).concat(b.data).concat(sum);
-  }, []);
+	var sum = new Array(len);
+	for (var j = 0; j < sum.length; j++) {
+		sum[j] = 0;
+	}
+	for (var i = 0; i < series.length; i++) {
+		for (var j = 0; j < sum.length; j++) {
+			sum[j] += series[i].data[j];
+		}
+	}
+	return series.reduce(function(a, b) {
+		return (a.data ? a.data : a).concat(b.data).concat(sum);
+	}, []);
 }
 
 function getTouches(touches, opts, e) {
-  let x, y;
-  if (touches.clientX) {
-    if (opts.rotate) {
-      y = opts.height - touches.clientX * opts.pix;
-      x = (touches.pageY - e.currentTarget.offsetTop - (opts.height / opts.pix / 2) * (opts.pix - 1)) * opts.pix;
-    } else {
-      x = touches.clientX * opts.pix;
-      y = (touches.pageY - e.currentTarget.offsetTop - (opts.height / opts.pix / 2) * (opts.pix - 1)) * opts.pix;
-    }
-  } else {
-    if (opts.rotate) {
-      y = opts.height - touches.x * opts.pix;
-      x = touches.y * opts.pix;
-    } else {
-      x = touches.x * opts.pix;
-      y = touches.y * opts.pix;
-    }
-  }
-  return {
-    x: x,
-    y: y
-  }
+	let x, y;
+	if (touches.clientX) {
+		if (opts.rotate) {
+			y = opts.height - touches.clientX * opts.pix;
+			x = (touches.pageY - e.currentTarget.offsetTop - (opts.height / opts.pix / 2) * (opts.pix - 1)) * opts.pix;
+		} else {
+			x = touches.clientX * opts.pix;
+			y = (touches.pageY - e.currentTarget.offsetTop - (opts.height / opts.pix / 2) * (opts.pix - 1)) * opts.pix;
+		}
+	} else {
+		if (opts.rotate) {
+			y = opts.height - touches.x * opts.pix;
+			x = touches.y * opts.pix;
+		} else {
+			x = touches.x * opts.pix;
+			y = touches.y * opts.pix;
+		}
+	}
+	return {
+		x: x,
+		y: y
+	}
 }
 
 function getSeriesDataItem(series, index, group) {
-  var data = [];
-  var newSeries = [];
-  var indexIsArr = index.constructor.toString().indexOf('Array') > -1;
-  if(indexIsArr){
-    let tempSeries = filterSeries(series);
-    for (var i = 0; i < group.length; i++) {
-      newSeries.push(tempSeries[group[i]]);
-    }
-  }else{
-    newSeries = series;
-  };
-  for (let i = 0; i < newSeries.length; i++) {
-    let item = newSeries[i];
-    let tmpindex = -1;
-    if(indexIsArr){
-      tmpindex = index[i];
-    }else{
-      tmpindex = index;
-    }
-    if (item.data[tmpindex] !== null && typeof item.data[tmpindex] !== 'undefined' && item.show) {
-      let seriesItem = {};
-      seriesItem.color = item.color;
-      seriesItem.type = item.type;
-      seriesItem.style = item.style;
-      seriesItem.pointShape = item.pointShape;
-      seriesItem.disableLegend = item.disableLegend;
-      seriesItem.legendShape = item.legendShape;
-      seriesItem.name = item.name;
-      seriesItem.show = item.show;
-      seriesItem.data = item.formatter ? item.formatter(item.data[tmpindex]) : item.data[tmpindex];
-      data.push(seriesItem);
-    }
-  }
-  return data;
+	var data = [];
+	var newSeries = [];
+	var indexIsArr = index.constructor.toString().indexOf('Array') > -1;
+	if (indexIsArr) {
+		let tempSeries = filterSeries(series);
+		for (var i = 0; i < group.length; i++) {
+			newSeries.push(tempSeries[group[i]]);
+		}
+	} else {
+		newSeries = series;
+	};
+	for (let i = 0; i < newSeries.length; i++) {
+		let item = newSeries[i];
+		let tmpindex = -1;
+		if (indexIsArr) {
+			tmpindex = index[i];
+		} else {
+			tmpindex = index;
+		}
+		if (item.data[tmpindex] !== null && typeof item.data[tmpindex] !== 'undefined' && item.show) {
+			let seriesItem = {};
+			seriesItem.color = item.color;
+			seriesItem.type = item.type;
+			seriesItem.style = item.style;
+			seriesItem.pointShape = item.pointShape;
+			seriesItem.disableLegend = item.disableLegend;
+			seriesItem.legendShape = item.legendShape;
+			seriesItem.name = item.name;
+			seriesItem.show = item.show;
+			seriesItem.data = item.formatter ? item.formatter(item.data[tmpindex]) : item.data[tmpindex];
+			data.push(seriesItem);
+		}
+	}
+	return data;
 }
 
 function getMaxTextListLength(list, fontSize, context) {
-  var lengthList = list.map(function(item) {
-    return measureText(item, fontSize, context);
-  });
-  return Math.max.apply(null, lengthList);
+	var lengthList = list.map(function(item) {
+		return measureText(item, fontSize, context);
+	});
+	return Math.max.apply(null, lengthList);
 }
 
 function getRadarCoordinateSeries(length) {
-  var eachAngle = 2 * Math.PI / length;
-  var CoordinateSeries = [];
-  for (var i = 0; i < length; i++) {
-    CoordinateSeries.push(eachAngle * i);
-  }
-  return CoordinateSeries.map(function(item) {
-    return -1 * item + Math.PI / 2;
-  });
+	var eachAngle = 2 * Math.PI / length;
+	var CoordinateSeries = [];
+	for (var i = 0; i < length; i++) {
+		CoordinateSeries.push(eachAngle * i);
+	}
+	return CoordinateSeries.map(function(item) {
+		return -1 * item + Math.PI / 2;
+	});
 }
 
 function getToolTipData(seriesData, opts, index, group, categories) {
-  var option = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
-  var calPoints = opts.chartData.calPoints?opts.chartData.calPoints:[];
-  let points = {};
-  if(group.length > 0){
-    let filterPoints = [];
-    for (let i = 0; i < group.length; i++) {
-      filterPoints.push(calPoints[group[i]])
-    }
-    points = filterPoints[0][index[0]];
-  }else{
-    for (let i = 0; i < calPoints.length; i++) {
-      if(calPoints[i][index]){
-        points = calPoints[i][index];
-        break;
-      }
-    }
-  };
-  var textList = seriesData.map(function(item) {
-    let titleText = null;
-    if (opts.categories && opts.categories.length>0) {
-      titleText = categories[index];
-    };
-    return {
-      text: option.formatter ? option.formatter(item, titleText, index, opts) : item.name + ': ' + item.data,
-      color: item.color,
-      legendShape: opts.extra.tooltip.legendShape == 'auto'? item.legendShape : opts.extra.tooltip.legendShape
-    };
-  });
-  var offset = {
-    x: Math.round(points.x),
-    y: Math.round(points.y)
-  };
-  return {
-    textList: textList,
-    offset: offset
-  };
+	var option = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
+	var calPoints = opts.chartData.calPoints ? opts.chartData.calPoints : [];
+	let points = {};
+	if (group.length > 0) {
+		let filterPoints = [];
+		for (let i = 0; i < group.length; i++) {
+			filterPoints.push(calPoints[group[i]])
+		}
+		points = filterPoints[0][index[0]];
+	} else {
+		for (let i = 0; i < calPoints.length; i++) {
+			if (calPoints[i][index]) {
+				points = calPoints[i][index];
+				break;
+			}
+		}
+	};
+	var textList = seriesData.map(function(item) {
+		let titleText = null;
+		if (opts.categories && opts.categories.length > 0) {
+			titleText = categories[index];
+		};
+		return {
+			text: option.formatter ? option.formatter(item, titleText, index, opts) : item.name + ': ' + item.data,
+			color: item.color,
+			legendShape: opts.extra.tooltip.legendShape == 'auto' ? item.legendShape : opts.extra.tooltip.legendShape
+		};
+	});
+	var offset = {
+		x: Math.round(points.x),
+		y: Math.round(points.y)
+	};
+	return {
+		textList: textList,
+		offset: offset
+	};
 }
 
 function getMixToolTipData(seriesData, opts, index, categories) {
-  var option = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
-  var points = opts.chartData.xAxisPoints[index] + opts.chartData.eachSpacing / 2;
-  var textList = seriesData.map(function(item) {
-    return {
-      text: option.formatter ? option.formatter(item, categories[index], index, opts) : item.name + ': ' + item.data,
-      color: item.color,
-      disableLegend: item.disableLegend ? true : false,
-      legendShape: opts.extra.tooltip.legendShape == 'auto'? item.legendShape : opts.extra.tooltip.legendShape
-    };
-  });
-  textList = textList.filter(function(item) {
-    if (item.disableLegend !== true) {
-      return item;
-    }
-  });
-  var offset = {
-    x: Math.round(points),
-    y: 0
-  };
-  return {
-    textList: textList,
-    offset: offset
-  };
+	var option = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+	var points = opts.chartData.xAxisPoints[index] + opts.chartData.eachSpacing / 2;
+	var textList = seriesData.map(function(item) {
+		return {
+			text: option.formatter ? option.formatter(item, categories[index], index, opts) : item.name + ': ' + item
+				.data,
+			color: item.color,
+			disableLegend: item.disableLegend ? true : false,
+			legendShape: opts.extra.tooltip.legendShape == 'auto' ? item.legendShape : opts.extra.tooltip.legendShape
+		};
+	});
+	textList = textList.filter(function(item) {
+		if (item.disableLegend !== true) {
+			return item;
+		}
+	});
+	var offset = {
+		x: Math.round(points),
+		y: 0
+	};
+	return {
+		textList: textList,
+		offset: offset
+	};
 }
 
 function getCandleToolTipData(series, seriesData, opts, index, categories, extra) {
-  var option = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : {};
-  var calPoints = opts.chartData.calPoints;
-  let upColor = extra.color.upFill;
-  let downColor = extra.color.downFill;
-  //颜色顺序为开盘，收盘，最低，最高
-  let color = [upColor, upColor, downColor, upColor];
-  var textList = [];
-  seriesData.map(function(item) {
-    if (index == 0) {
-      if (item.data[1] - item.data[0] < 0) {
-        color[1] = downColor;
-      } else {
-        color[1] = upColor;
-      }
-    } else {
-      if (item.data[0] < series[index - 1][1]) {
-        color[0] = downColor;
-      }
-      if (item.data[1] < item.data[0]) {
-        color[1] = downColor;
-      }
-      if (item.data[2] > series[index - 1][1]) {
-        color[2] = upColor;
-      }
-      if (item.data[3] < series[index - 1][1]) {
-        color[3] = downColor;
-      }
-    }
-    let text1 = {
-      text: '开盘：' + item.data[0],
-      color: color[0],
-      legendShape: opts.extra.tooltip.legendShape == 'auto'? item.legendShape : opts.extra.tooltip.legendShape
-    };
-    let text2 = {
-      text: '收盘：' + item.data[1],
-      color: color[1],
-      legendShape: opts.extra.tooltip.legendShape == 'auto'? item.legendShape : opts.extra.tooltip.legendShape
-    };
-    let text3 = {
-      text: '最低：' + item.data[2],
-      color: color[2],
-      legendShape: opts.extra.tooltip.legendShape == 'auto'? item.legendShape : opts.extra.tooltip.legendShape
-    };
-    let text4 = {
-      text: '最高：' + item.data[3],
-      color: color[3],
-      legendShape: opts.extra.tooltip.legendShape == 'auto'? item.legendShape : opts.extra.tooltip.legendShape
-    };
-    textList.push(text1, text2, text3, text4);
-  });
-  var validCalPoints = [];
-  var offset = {
-    x: 0,
-    y: 0
-  };
-  for (let i = 0; i < calPoints.length; i++) {
-    let points = calPoints[i];
-    if (typeof points[index] !== 'undefined' && points[index] !== null) {
-      validCalPoints.push(points[index]);
-    }
-  }
-  offset.x = Math.round(validCalPoints[0][0].x);
-  return {
-    textList: textList,
-    offset: offset
-  };
+	var option = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : {};
+	var calPoints = opts.chartData.calPoints;
+	let upColor = extra.color.upFill;
+	let downColor = extra.color.downFill;
+	//颜色顺序为开盘，收盘，最低，最高
+	let color = [upColor, upColor, downColor, upColor];
+	var textList = [];
+	seriesData.map(function(item) {
+		if (index == 0) {
+			if (item.data[1] - item.data[0] < 0) {
+				color[1] = downColor;
+			} else {
+				color[1] = upColor;
+			}
+		} else {
+			if (item.data[0] < series[index - 1][1]) {
+				color[0] = downColor;
+			}
+			if (item.data[1] < item.data[0]) {
+				color[1] = downColor;
+			}
+			if (item.data[2] > series[index - 1][1]) {
+				color[2] = upColor;
+			}
+			if (item.data[3] < series[index - 1][1]) {
+				color[3] = downColor;
+			}
+		}
+		let text1 = {
+			text: '开盘：' + item.data[0],
+			color: color[0],
+			legendShape: opts.extra.tooltip.legendShape == 'auto' ? item.legendShape : opts.extra.tooltip.legendShape
+		};
+		let text2 = {
+			text: '收盘：' + item.data[1],
+			color: color[1],
+			legendShape: opts.extra.tooltip.legendShape == 'auto' ? item.legendShape : opts.extra.tooltip.legendShape
+		};
+		let text3 = {
+			text: '最低：' + item.data[2],
+			color: color[2],
+			legendShape: opts.extra.tooltip.legendShape == 'auto' ? item.legendShape : opts.extra.tooltip.legendShape
+		};
+		let text4 = {
+			text: '最高：' + item.data[3],
+			color: color[3],
+			legendShape: opts.extra.tooltip.legendShape == 'auto' ? item.legendShape : opts.extra.tooltip.legendShape
+		};
+		textList.push(text1, text2, text3, text4);
+	});
+	var validCalPoints = [];
+	var offset = {
+		x: 0,
+		y: 0
+	};
+	for (let i = 0; i < calPoints.length; i++) {
+		let points = calPoints[i];
+		if (typeof points[index] !== 'undefined' && points[index] !== null) {
+			validCalPoints.push(points[index]);
+		}
+	}
+	offset.x = Math.round(validCalPoints[0][0].x);
+	return {
+		textList: textList,
+		offset: offset
+	};
 }
 
 function filterSeries(series) {
-  let tempSeries = [];
-  for (let i = 0; i < series.length; i++) {
-    if (series[i].show == true) {
-      tempSeries.push(series[i])
-    }
-  }
-  return tempSeries;
+	let tempSeries = [];
+	for (let i = 0; i < series.length; i++) {
+		if (series[i].show == true) {
+			tempSeries.push(series[i])
+		}
+	}
+	return tempSeries;
 }
 
 function findCurrentIndex(currentPoints, calPoints, opts, config) {
-  var offset = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
-  var current={ index:-1, group:[] };
-  var spacing = opts.chartData.eachSpacing / 2;
-  let xAxisPoints = [];
-  if (calPoints && calPoints.length > 0) {
-    if (!opts.categories) {
-      spacing = 0;
-    }else{
-      for (let i = 1; i < opts.chartData.xAxisPoints.length; i++) {
-        xAxisPoints.push(opts.chartData.xAxisPoints[i] - spacing);
-      }
-      if ((opts.type == 'line' || opts.type == 'area') && opts.xAxis.boundaryGap == 'justify') {
-        xAxisPoints = opts.chartData.xAxisPoints;
-      }
-    }
-    if (isInExactChartArea(currentPoints, opts, config)) {
-      if (!opts.categories) {
-        let timePoints = Array(calPoints.length);
-        for (let i = 0; i < calPoints.length; i++) {
-          timePoints[i] = Array(calPoints[i].length)
-          for (let j = 0; j < calPoints[i].length; j++) {
-            timePoints[i][j] = (Math.abs(calPoints[i][j].x - currentPoints.x));
-          }
-        };
-        let pointValue =  Array(timePoints.length);
-        let pointIndex =  Array(timePoints.length);
-        for (let i = 0; i < timePoints.length; i++) {
-          pointValue[i] = Math.min.apply(null, timePoints[i]);
-          pointIndex[i] = timePoints[i].indexOf(pointValue[i]);
-        }
-        let minValue = Math.min.apply(null, pointValue);
-        current.index = [];
-        for (let i = 0; i < pointValue.length; i++) {
-          if(pointValue[i] == minValue){
-            current.group.push(i);
-            current.index.push(pointIndex[i]);
-          }
-        };
-      }else{
-        xAxisPoints.forEach(function(item, index) {
-          if (currentPoints.x + offset + spacing > item) {
-            current.index = index;
-          }
-        });
-      }
-    }
-  }
-  return current;
+	var offset = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+	var current = {
+		index: -1,
+		group: []
+	};
+	var spacing = opts.chartData.eachSpacing / 2;
+	let xAxisPoints = [];
+	if (calPoints && calPoints.length > 0) {
+		if (!opts.categories) {
+			spacing = 0;
+		} else {
+			for (let i = 1; i < opts.chartData.xAxisPoints.length; i++) {
+				xAxisPoints.push(opts.chartData.xAxisPoints[i] - spacing);
+			}
+			if ((opts.type == 'line' || opts.type == 'area') && opts.xAxis.boundaryGap == 'justify') {
+				xAxisPoints = opts.chartData.xAxisPoints;
+			}
+		}
+		if (isInExactChartArea(currentPoints, opts, config)) {
+			if (!opts.categories) {
+				let timePoints = Array(calPoints.length);
+				for (let i = 0; i < calPoints.length; i++) {
+					timePoints[i] = Array(calPoints[i].length)
+					for (let j = 0; j < calPoints[i].length; j++) {
+						timePoints[i][j] = (Math.abs(calPoints[i][j].x - currentPoints.x));
+					}
+				};
+				let pointValue = Array(timePoints.length);
+				let pointIndex = Array(timePoints.length);
+				for (let i = 0; i < timePoints.length; i++) {
+					pointValue[i] = Math.min.apply(null, timePoints[i]);
+					pointIndex[i] = timePoints[i].indexOf(pointValue[i]);
+				}
+				let minValue = Math.min.apply(null, pointValue);
+				current.index = [];
+				for (let i = 0; i < pointValue.length; i++) {
+					if (pointValue[i] == minValue) {
+						current.group.push(i);
+						current.index.push(pointIndex[i]);
+					}
+				};
+			} else {
+				xAxisPoints.forEach(function(item, index) {
+					if (currentPoints.x + offset + spacing > item) {
+						current.index = index;
+					}
+				});
+			}
+		}
+	}
+	return current;
 }
 
 function findBarChartCurrentIndex(currentPoints, calPoints, opts, config) {
-  var offset = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
-  var current={ index:-1, group:[] };
-  var spacing = opts.chartData.eachSpacing / 2;
-  let yAxisPoints = opts.chartData.yAxisPoints;
-  if (calPoints && calPoints.length > 0) {
-    if (isInExactChartArea(currentPoints, opts, config)) {
-      yAxisPoints.forEach(function(item, index) {
-        if (currentPoints.y + offset + spacing > item) {
-          current.index = index;
-        }
-      });
-    }
-  }
-  return current;
+	var offset = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+	var current = {
+		index: -1,
+		group: []
+	};
+	var spacing = opts.chartData.eachSpacing / 2;
+	let yAxisPoints = opts.chartData.yAxisPoints;
+	if (calPoints && calPoints.length > 0) {
+		if (isInExactChartArea(currentPoints, opts, config)) {
+			yAxisPoints.forEach(function(item, index) {
+				if (currentPoints.y + offset + spacing > item) {
+					current.index = index;
+				}
+			});
+		}
+	}
+	return current;
 }
 
 function findLegendIndex(currentPoints, legendData, opts) {
-  let currentIndex = -1;
-  let gap = 0;
-  if (isInExactLegendArea(currentPoints, legendData.area)) {
-    let points = legendData.points;
-    let index = -1;
-    for (let i = 0, len = points.length; i < len; i++) {
-      let item = points[i];
-      for (let j = 0; j < item.length; j++) {
-        index += 1;
-        let area = item[j]['area'];
-        if (area && currentPoints.x > area[0] - gap && currentPoints.x < area[2] + gap && currentPoints.y > area[1] - gap && currentPoints.y < area[3] + gap) {
-          currentIndex = index;
-          break;
-        }
-      }
-    }
-    return currentIndex;
-  }
-  return currentIndex;
+	let currentIndex = -1;
+	let gap = 0;
+	if (isInExactLegendArea(currentPoints, legendData.area)) {
+		let points = legendData.points;
+		let index = -1;
+		for (let i = 0, len = points.length; i < len; i++) {
+			let item = points[i];
+			for (let j = 0; j < item.length; j++) {
+				index += 1;
+				let area = item[j]['area'];
+				if (area && currentPoints.x > area[0] - gap && currentPoints.x < area[2] + gap && currentPoints.y > area[1] -
+					gap && currentPoints.y < area[3] + gap) {
+					currentIndex = index;
+					break;
+				}
+			}
+		}
+		return currentIndex;
+	}
+	return currentIndex;
 }
 
 function isInExactLegendArea(currentPoints, area) {
-  return currentPoints.x > area.start.x && currentPoints.x < area.end.x && currentPoints.y > area.start.y && currentPoints.y < area.end.y;
+	return currentPoints.x > area.start.x && currentPoints.x < area.end.x && currentPoints.y > area.start.y &&
+		currentPoints.y < area.end.y;
 }
 
 function isInExactChartArea(currentPoints, opts, config) {
-  return currentPoints.x <= opts.width - opts.area[1] + 10 && currentPoints.x >= opts.area[3] - 10 && currentPoints.y >= opts.area[0] && currentPoints.y <= opts.height - opts.area[2];
+	return currentPoints.x <= opts.width - opts.area[1] + 10 && currentPoints.x >= opts.area[3] - 10 && currentPoints.y >=
+		opts.area[0] && currentPoints.y <= opts.height - opts.area[2];
 }
 
 function findRadarChartCurrentIndex(currentPoints, radarData, count) {
-  var eachAngleArea = 2 * Math.PI / count;
-  var currentIndex = -1;
-  if (isInExactPieChartArea(currentPoints, radarData.center, radarData.radius)) {
-    var fixAngle = function fixAngle(angle) {
-      if (angle < 0) {
-        angle += 2 * Math.PI;
-      }
-      if (angle > 2 * Math.PI) {
-        angle -= 2 * Math.PI;
-      }
-      return angle;
-    };
-    var angle = Math.atan2(radarData.center.y - currentPoints.y, currentPoints.x - radarData.center.x);
-    angle = -1 * angle;
-    if (angle < 0) {
-      angle += 2 * Math.PI;
-    }
-    var angleList = radarData.angleList.map(function(item) {
-      item = fixAngle(-1 * item);
-      return item;
-    });
-    angleList.forEach(function(item, index) {
-      var rangeStart = fixAngle(item - eachAngleArea / 2);
-      var rangeEnd = fixAngle(item + eachAngleArea / 2);
-      if (rangeEnd < rangeStart) {
-        rangeEnd += 2 * Math.PI;
-      }
-      if (angle >= rangeStart && angle <= rangeEnd || angle + 2 * Math.PI >= rangeStart && angle + 2 * Math.PI <= rangeEnd) {
-        currentIndex = index;
-      }
-    });
-  }
-  return currentIndex;
+	var eachAngleArea = 2 * Math.PI / count;
+	var currentIndex = -1;
+	if (isInExactPieChartArea(currentPoints, radarData.center, radarData.radius)) {
+		var fixAngle = function fixAngle(angle) {
+			if (angle < 0) {
+				angle += 2 * Math.PI;
+			}
+			if (angle > 2 * Math.PI) {
+				angle -= 2 * Math.PI;
+			}
+			return angle;
+		};
+		var angle = Math.atan2(radarData.center.y - currentPoints.y, currentPoints.x - radarData.center.x);
+		angle = -1 * angle;
+		if (angle < 0) {
+			angle += 2 * Math.PI;
+		}
+		var angleList = radarData.angleList.map(function(item) {
+			item = fixAngle(-1 * item);
+			return item;
+		});
+		angleList.forEach(function(item, index) {
+			var rangeStart = fixAngle(item - eachAngleArea / 2);
+			var rangeEnd = fixAngle(item + eachAngleArea / 2);
+			if (rangeEnd < rangeStart) {
+				rangeEnd += 2 * Math.PI;
+			}
+			if (angle >= rangeStart && angle <= rangeEnd || angle + 2 * Math.PI >= rangeStart && angle + 2 * Math.PI <=
+				rangeEnd) {
+				currentIndex = index;
+			}
+		});
+	}
+	return currentIndex;
 }
 
 function findFunnelChartCurrentIndex(currentPoints, funnelData) {
-  var currentIndex = -1;
-  for (var i = 0, len = funnelData.series.length; i < len; i++) {
-    var item = funnelData.series[i];
-    if (currentPoints.x > item.funnelArea[0] && currentPoints.x < item.funnelArea[2] && currentPoints.y > item.funnelArea[1] && currentPoints.y < item.funnelArea[3]) {
-      currentIndex = i;
-      break;
-    }
-  }
-  return currentIndex;
+	var currentIndex = -1;
+	for (var i = 0, len = funnelData.series.length; i < len; i++) {
+		var item = funnelData.series[i];
+		if (currentPoints.x > item.funnelArea[0] && currentPoints.x < item.funnelArea[2] && currentPoints.y > item
+			.funnelArea[1] && currentPoints.y < item.funnelArea[3]) {
+			currentIndex = i;
+			break;
+		}
+	}
+	return currentIndex;
 }
 
 function findWordChartCurrentIndex(currentPoints, wordData) {
-  var currentIndex = -1;
-  for (var i = 0, len = wordData.length; i < len; i++) {
-    var item = wordData[i];
-    if (currentPoints.x > item.area[0] && currentPoints.x < item.area[2] && currentPoints.y > item.area[1] && currentPoints.y < item.area[3]) {
-      currentIndex = i;
-      break;
-    }
-  }
-  return currentIndex;
+	var currentIndex = -1;
+	for (var i = 0, len = wordData.length; i < len; i++) {
+		var item = wordData[i];
+		if (currentPoints.x > item.area[0] && currentPoints.x < item.area[2] && currentPoints.y > item.area[1] &&
+			currentPoints.y < item.area[3]) {
+			currentIndex = i;
+			break;
+		}
+	}
+	return currentIndex;
 }
 
 function findMapChartCurrentIndex(currentPoints, opts) {
-  var currentIndex = -1;
-  var cData = opts.chartData.mapData;
-  var data = opts.series;
-  var tmp = pointToCoordinate(currentPoints.y, currentPoints.x, cData.bounds, cData.scale, cData.xoffset, cData.yoffset);
-  var poi = [tmp.x, tmp.y];
-  for (var i = 0, len = data.length; i < len; i++) {
-    var item = data[i].geometry.coordinates;
-    if (isPoiWithinPoly(poi, item, opts.chartData.mapData.mercator)) {
-      currentIndex = i;
-      break;
-    }
-  }
-  return currentIndex;
+	var currentIndex = -1;
+	var cData = opts.chartData.mapData;
+	var data = opts.series;
+	var tmp = pointToCoordinate(currentPoints.y, currentPoints.x, cData.bounds, cData.scale, cData.xoffset, cData
+		.yoffset);
+	var poi = [tmp.x, tmp.y];
+	for (var i = 0, len = data.length; i < len; i++) {
+		var item = data[i].geometry.coordinates;
+		if (isPoiWithinPoly(poi, item, opts.chartData.mapData.mercator)) {
+			currentIndex = i;
+			break;
+		}
+	}
+	return currentIndex;
 }
 
 function findRoseChartCurrentIndex(currentPoints, pieData, opts) {
-  var currentIndex = -1;
-  var series = getRoseDataPoints(opts._series_, opts.extra.rose.type, pieData.radius, pieData.radius);
-  if (pieData && pieData.center && isInExactPieChartArea(currentPoints, pieData.center, pieData.radius)) {
-    var angle = Math.atan2(pieData.center.y - currentPoints.y, currentPoints.x - pieData.center.x);
-    angle = -angle;
-    if(opts.extra.rose && opts.extra.rose.offsetAngle){
-      angle = angle - opts.extra.rose.offsetAngle * Math.PI / 180;
-    }
-    for (var i = 0, len = series.length; i < len; i++) {
-      if (isInAngleRange(angle, series[i]._start_, series[i]._start_ + series[i]._rose_proportion_ * 2 * Math.PI)) {
-        currentIndex = i;
-        break;
-      }
-    }
-  }
-  return currentIndex;
+	var currentIndex = -1;
+	var series = getRoseDataPoints(opts._series_, opts.extra.rose.type, pieData.radius, pieData.radius);
+	if (pieData && pieData.center && isInExactPieChartArea(currentPoints, pieData.center, pieData.radius)) {
+		var angle = Math.atan2(pieData.center.y - currentPoints.y, currentPoints.x - pieData.center.x);
+		angle = -angle;
+		if (opts.extra.rose && opts.extra.rose.offsetAngle) {
+			angle = angle - opts.extra.rose.offsetAngle * Math.PI / 180;
+		}
+		for (var i = 0, len = series.length; i < len; i++) {
+			if (isInAngleRange(angle, series[i]._start_, series[i]._start_ + series[i]._rose_proportion_ * 2 * Math.PI)) {
+				currentIndex = i;
+				break;
+			}
+		}
+	}
+	return currentIndex;
 }
 
 function findPieChartCurrentIndex(currentPoints, pieData, opts) {
-  var currentIndex = -1;
-  var series = getPieDataPoints(pieData.series);
-  if (pieData && pieData.center && isInExactPieChartArea(currentPoints, pieData.center, pieData.radius)) {
-    var angle = Math.atan2(pieData.center.y - currentPoints.y, currentPoints.x - pieData.center.x);
-    angle = -angle;
-    if(opts.extra.pie && opts.extra.pie.offsetAngle){
-      angle = angle - opts.extra.pie.offsetAngle * Math.PI / 180;
-    }
-    if(opts.extra.ring && opts.extra.ring.offsetAngle){
-      angle = angle - opts.extra.ring.offsetAngle * Math.PI / 180;
-    }
-    for (var i = 0, len = series.length; i < len; i++) {
-      if (isInAngleRange(angle, series[i]._start_, series[i]._start_ + series[i]._proportion_ * 2 * Math.PI)) {
-        currentIndex = i;
-        break;
-      }
-    }
-  }
-  return currentIndex;
+	var currentIndex = -1;
+	var series = getPieDataPoints(pieData.series);
+	if (pieData && pieData.center && isInExactPieChartArea(currentPoints, pieData.center, pieData.radius)) {
+		var angle = Math.atan2(pieData.center.y - currentPoints.y, currentPoints.x - pieData.center.x);
+		angle = -angle;
+		if (opts.extra.pie && opts.extra.pie.offsetAngle) {
+			angle = angle - opts.extra.pie.offsetAngle * Math.PI / 180;
+		}
+		if (opts.extra.ring && opts.extra.ring.offsetAngle) {
+			angle = angle - opts.extra.ring.offsetAngle * Math.PI / 180;
+		}
+		for (var i = 0, len = series.length; i < len; i++) {
+			if (isInAngleRange(angle, series[i]._start_, series[i]._start_ + series[i]._proportion_ * 2 * Math.PI)) {
+				currentIndex = i;
+				break;
+			}
+		}
+	}
+	return currentIndex;
 }
 
 function isInExactPieChartArea(currentPoints, center, radius) {
-  return Math.pow(currentPoints.x - center.x, 2) + Math.pow(currentPoints.y - center.y, 2) <= Math.pow(radius, 2);
+	return Math.pow(currentPoints.x - center.x, 2) + Math.pow(currentPoints.y - center.y, 2) <= Math.pow(radius, 2);
 }
 
 
-function splitPoints(points,eachSeries) {
-  var newPoints = [];
-  var items = [];
-  points.forEach(function(item, index) {
-    if(eachSeries.connectNulls){
-      if (item !== null) {
-        items.push(item);
-      }
-    }else{
-      if (item !== null) {
-        items.push(item);
-      } else {
-        if (items.length) {
-          newPoints.push(items);
-        }
-        items = [];
-      }
-    }
-    
-  });
-  if (items.length) {
-    newPoints.push(items);
-  }
-  return newPoints;
+function splitPoints(points, eachSeries) {
+	var newPoints = [];
+	var items = [];
+	points.forEach(function(item, index) {
+		if (eachSeries.connectNulls) {
+			if (item !== null) {
+				items.push(item);
+			}
+		} else {
+			if (item !== null) {
+				items.push(item);
+			} else {
+				if (items.length) {
+					newPoints.push(items);
+				}
+				items = [];
+			}
+		}
+
+	});
+	if (items.length) {
+		newPoints.push(items);
+	}
+	return newPoints;
 }
 
 
 function calLegendData(series, opts, config, chartData, context) {
-  let legendData = {
-    area: {
-      start: {
-        x: 0,
-        y: 0
-      },
-      end: {
-        x: 0,
-        y: 0
-      },
-      width: 0,
-      height: 0,
-      wholeWidth: 0,
-      wholeHeight: 0
-    },
-    points: [],
-    widthArr: [],
-    heightArr: []
-  };
-  if (opts.legend.show === false) {
-    chartData.legendData = legendData;
-    return legendData;
-  }
-  let padding = opts.legend.padding * opts.pix;
-  let margin = opts.legend.margin * opts.pix;
-  let fontSize = opts.legend.fontSize ? opts.legend.fontSize * opts.pix : config.fontSize;
-  let shapeWidth = 15 * opts.pix;
-  let shapeRight = 5 * opts.pix;
-  let lineHeight = Math.max(opts.legend.lineHeight * opts.pix, fontSize);
-  if (opts.legend.position == 'top' || opts.legend.position == 'bottom') {
-    let legendList = [];
-    let widthCount = 0;
-    let widthCountArr = [];
-    let currentRow = [];
-    for (let i = 0; i < series.length; i++) {
-      let item = series[i];
-      const legendText = item.legendText ? item.legendText : item.name;
-      let itemWidth = shapeWidth + shapeRight + measureText(legendText || 'undefined', fontSize, context) + opts.legend.itemGap * opts.pix;
-      if (widthCount + itemWidth > opts.width - opts.area[1] - opts.area[3]) {
-        legendList.push(currentRow);
-        widthCountArr.push(widthCount - opts.legend.itemGap * opts.pix);
-        widthCount = itemWidth;
-        currentRow = [item];
-      } else {
-        widthCount += itemWidth;
-        currentRow.push(item);
-      }
-    }
-    if (currentRow.length) {
-      legendList.push(currentRow);
-      widthCountArr.push(widthCount - opts.legend.itemGap * opts.pix);
-      legendData.widthArr = widthCountArr;
-      let legendWidth = Math.max.apply(null, widthCountArr);
-      switch (opts.legend.float) {
-        case 'left':
-          legendData.area.start.x = opts.area[3];
-          legendData.area.end.x = opts.area[3] + legendWidth + 2 * padding;
-          break;
-        case 'right':
-          legendData.area.start.x = opts.width - opts.area[1] - legendWidth - 2 * padding;
-          legendData.area.end.x = opts.width - opts.area[1];
-          break;
-        default:
-          legendData.area.start.x = (opts.width - legendWidth) / 2 - padding;
-          legendData.area.end.x = (opts.width + legendWidth) / 2 + padding;
-      }
-      legendData.area.width = legendWidth + 2 * padding;
-      legendData.area.wholeWidth = legendWidth + 2 * padding;
-      legendData.area.height = legendList.length * lineHeight + 2 * padding;
-      legendData.area.wholeHeight = legendList.length * lineHeight + 2 * padding + 2 * margin;
-      legendData.points = legendList;
-    }
-  } else {
-    let len = series.length;
-    let maxHeight = opts.height - opts.area[0] - opts.area[2] - 2 * margin - 2 * padding;
-    let maxLength = Math.min(Math.floor(maxHeight / lineHeight), len);
-    legendData.area.height = maxLength * lineHeight + padding * 2;
-    legendData.area.wholeHeight = maxLength * lineHeight + padding * 2;
-    switch (opts.legend.float) {
-      case 'top':
-        legendData.area.start.y = opts.area[0] + margin;
-        legendData.area.end.y = opts.area[0] + margin + legendData.area.height;
-        break;
-      case 'bottom':
-        legendData.area.start.y = opts.height - opts.area[2] - margin - legendData.area.height;
-        legendData.area.end.y = opts.height - opts.area[2] - margin;
-        break;
-      default:
-        legendData.area.start.y = (opts.height - legendData.area.height) / 2;
-        legendData.area.end.y = (opts.height + legendData.area.height) / 2;
-    }
-    let lineNum = len % maxLength === 0 ? len / maxLength : Math.floor((len / maxLength) + 1);
-    let currentRow = [];
-    for (let i = 0; i < lineNum; i++) {
-      let temp = series.slice(i * maxLength, i * maxLength + maxLength);
-      currentRow.push(temp);
-    }
-    legendData.points = currentRow;
-    if (currentRow.length) {
-      for (let i = 0; i < currentRow.length; i++) {
-        let item = currentRow[i];
-        let maxWidth = 0;
-        for (let j = 0; j < item.length; j++) {
-          let itemWidth = shapeWidth + shapeRight + measureText(item[j].name || 'undefined', fontSize, context) + opts.legend.itemGap * opts.pix;
-          if (itemWidth > maxWidth) {
-            maxWidth = itemWidth;
-          }
-        }
-        legendData.widthArr.push(maxWidth);
-        legendData.heightArr.push(item.length * lineHeight + padding * 2);
-      }
-      let legendWidth = 0
-      for (let i = 0; i < legendData.widthArr.length; i++) {
-        legendWidth += legendData.widthArr[i];
-      }
-      legendData.area.width = legendWidth - opts.legend.itemGap * opts.pix + 2 * padding;
-      legendData.area.wholeWidth = legendData.area.width + padding;
-    }
-  }
-  switch (opts.legend.position) {
-    case 'top':
-      legendData.area.start.y = opts.area[0] + margin;
-      legendData.area.end.y = opts.area[0] + margin + legendData.area.height;
-      break;
-    case 'bottom':
-      legendData.area.start.y = opts.height - opts.area[2] - legendData.area.height - margin;
-      legendData.area.end.y = opts.height - opts.area[2] - margin;
-      break;
-    case 'left':
-      legendData.area.start.x = opts.area[3];
-      legendData.area.end.x = opts.area[3] + legendData.area.width;
-      break;
-    case 'right':
-      legendData.area.start.x = opts.width - opts.area[1] - legendData.area.width;
-      legendData.area.end.x = opts.width - opts.area[1];
-      break;
-  }
-  chartData.legendData = legendData;
-  return legendData;
+	let legendData = {
+		area: {
+			start: {
+				x: 0,
+				y: 0
+			},
+			end: {
+				x: 0,
+				y: 0
+			},
+			width: 0,
+			height: 0,
+			wholeWidth: 0,
+			wholeHeight: 0
+		},
+		points: [],
+		widthArr: [],
+		heightArr: []
+	};
+	if (opts.legend.show === false) {
+		chartData.legendData = legendData;
+		return legendData;
+	}
+	let padding = opts.legend.padding * opts.pix;
+	let margin = opts.legend.margin * opts.pix;
+	let fontSize = opts.legend.fontSize ? opts.legend.fontSize * opts.pix : config.fontSize;
+	let shapeWidth = 15 * opts.pix;
+	let shapeRight = 5 * opts.pix;
+	let lineHeight = Math.max(opts.legend.lineHeight * opts.pix, fontSize);
+	if (opts.legend.position == 'top' || opts.legend.position == 'bottom') {
+		let legendList = [];
+		let widthCount = 0;
+		let widthCountArr = [];
+		let currentRow = [];
+		for (let i = 0; i < series.length; i++) {
+			let item = series[i];
+			const legendText = item.legendText ? item.legendText : item.name;
+			let itemWidth = shapeWidth + shapeRight + measureText(legendText || 'undefined', fontSize, context) + opts.legend
+				.itemGap * opts.pix;
+			if (widthCount + itemWidth > opts.width - opts.area[1] - opts.area[3]) {
+				legendList.push(currentRow);
+				widthCountArr.push(widthCount - opts.legend.itemGap * opts.pix);
+				widthCount = itemWidth;
+				currentRow = [item];
+			} else {
+				widthCount += itemWidth;
+				currentRow.push(item);
+			}
+		}
+		if (currentRow.length) {
+			legendList.push(currentRow);
+			widthCountArr.push(widthCount - opts.legend.itemGap * opts.pix);
+			legendData.widthArr = widthCountArr;
+			let legendWidth = Math.max.apply(null, widthCountArr);
+			switch (opts.legend.float) {
+				case 'left':
+					legendData.area.start.x = opts.area[3];
+					legendData.area.end.x = opts.area[3] + legendWidth + 2 * padding;
+					break;
+				case 'right':
+					legendData.area.start.x = opts.width - opts.area[1] - legendWidth - 2 * padding;
+					legendData.area.end.x = opts.width - opts.area[1];
+					break;
+				default:
+					legendData.area.start.x = (opts.width - legendWidth) / 2 - padding;
+					legendData.area.end.x = (opts.width + legendWidth) / 2 + padding;
+			}
+			legendData.area.width = legendWidth + 2 * padding;
+			legendData.area.wholeWidth = legendWidth + 2 * padding;
+			legendData.area.height = legendList.length * lineHeight + 2 * padding;
+			legendData.area.wholeHeight = legendList.length * lineHeight + 2 * padding + 2 * margin;
+			legendData.points = legendList;
+		}
+	} else {
+		let len = series.length;
+		let maxHeight = opts.height - opts.area[0] - opts.area[2] - 2 * margin - 2 * padding;
+		let maxLength = Math.min(Math.floor(maxHeight / lineHeight), len);
+		legendData.area.height = maxLength * lineHeight + padding * 2;
+		legendData.area.wholeHeight = maxLength * lineHeight + padding * 2;
+		switch (opts.legend.float) {
+			case 'top':
+				legendData.area.start.y = opts.area[0] + margin;
+				legendData.area.end.y = opts.area[0] + margin + legendData.area.height;
+				break;
+			case 'bottom':
+				legendData.area.start.y = opts.height - opts.area[2] - margin - legendData.area.height;
+				legendData.area.end.y = opts.height - opts.area[2] - margin;
+				break;
+			default:
+				legendData.area.start.y = (opts.height - legendData.area.height) / 2;
+				legendData.area.end.y = (opts.height + legendData.area.height) / 2;
+		}
+		let lineNum = len % maxLength === 0 ? len / maxLength : Math.floor((len / maxLength) + 1);
+		let currentRow = [];
+		for (let i = 0; i < lineNum; i++) {
+			let temp = series.slice(i * maxLength, i * maxLength + maxLength);
+			currentRow.push(temp);
+		}
+		legendData.points = currentRow;
+		if (currentRow.length) {
+			for (let i = 0; i < currentRow.length; i++) {
+				let item = currentRow[i];
+				let maxWidth = 0;
+				for (let j = 0; j < item.length; j++) {
+					let itemWidth = shapeWidth + shapeRight + measureText(item[j].name || 'undefined', fontSize, context) + opts
+						.legend.itemGap * opts.pix;
+					if (itemWidth > maxWidth) {
+						maxWidth = itemWidth;
+					}
+				}
+				legendData.widthArr.push(maxWidth);
+				legendData.heightArr.push(item.length * lineHeight + padding * 2);
+			}
+			let legendWidth = 0
+			for (let i = 0; i < legendData.widthArr.length; i++) {
+				legendWidth += legendData.widthArr[i];
+			}
+			legendData.area.width = legendWidth - opts.legend.itemGap * opts.pix + 2 * padding;
+			legendData.area.wholeWidth = legendData.area.width + padding;
+		}
+	}
+	switch (opts.legend.position) {
+		case 'top':
+			legendData.area.start.y = opts.area[0] + margin;
+			legendData.area.end.y = opts.area[0] + margin + legendData.area.height;
+			break;
+		case 'bottom':
+			legendData.area.start.y = opts.height - opts.area[2] - legendData.area.height - margin;
+			legendData.area.end.y = opts.height - opts.area[2] - margin;
+			break;
+		case 'left':
+			legendData.area.start.x = opts.area[3];
+			legendData.area.end.x = opts.area[3] + legendData.area.width;
+			break;
+		case 'right':
+			legendData.area.start.x = opts.width - opts.area[1] - legendData.area.width;
+			legendData.area.end.x = opts.width - opts.area[1];
+			break;
+	}
+	chartData.legendData = legendData;
+	return legendData;
 }
 
 function calCategoriesData(categories, opts, config, eachSpacing, context) {
-  var result = {
-    angle: 0,
-    xAxisHeight: opts.xAxis.lineHeight * opts.pix + opts.xAxis.marginTop * opts.pix
-  };
-  var fontSize = opts.xAxis.fontSize * opts.pix;
-  var categoriesTextLenth = categories.map(function(item,index) {
-    var xitem = opts.xAxis.formatter ? opts.xAxis.formatter(item,index,opts) : item;
-    return measureText(String(xitem), fontSize, context);
-  });
-  var maxTextLength = Math.max.apply(this, categoriesTextLenth);
-  if (opts.xAxis.rotateLabel == true) {
-    result.angle = opts.xAxis.rotateAngle * Math.PI / 180;
-    let tempHeight = opts.xAxis.marginTop * opts.pix * 2 +  Math.abs(maxTextLength * Math.sin(result.angle))
-    tempHeight = tempHeight < fontSize + opts.xAxis.marginTop * opts.pix * 2 ? tempHeight + opts.xAxis.marginTop * opts.pix * 2 : tempHeight;
-    result.xAxisHeight = tempHeight;
-  }
-  if (opts.enableScroll && opts.xAxis.scrollShow) {
-    result.xAxisHeight += 6 * opts.pix;
-  }
-  if (opts.xAxis.disabled){
-    result.xAxisHeight = 0;
-  }
-  return result;
+	var result = {
+		angle: 0,
+		xAxisHeight: opts.xAxis.lineHeight * opts.pix + opts.xAxis.marginTop * opts.pix
+	};
+	var fontSize = opts.xAxis.fontSize * opts.pix;
+	var categoriesTextLenth = categories.map(function(item, index) {
+		var xitem = opts.xAxis.formatter ? opts.xAxis.formatter(item, index, opts) : item;
+		return measureText(String(xitem), fontSize, context);
+	});
+	var maxTextLength = Math.max.apply(this, categoriesTextLenth);
+	if (opts.xAxis.rotateLabel == true) {
+		result.angle = opts.xAxis.rotateAngle * Math.PI / 180;
+		let tempHeight = opts.xAxis.marginTop * opts.pix * 2 + Math.abs(maxTextLength * Math.sin(result.angle))
+		tempHeight = tempHeight < fontSize + opts.xAxis.marginTop * opts.pix * 2 ? tempHeight + opts.xAxis.marginTop * opts
+			.pix * 2 : tempHeight;
+		result.xAxisHeight = tempHeight;
+	}
+	if (opts.enableScroll && opts.xAxis.scrollShow) {
+		result.xAxisHeight += 6 * opts.pix;
+	}
+	if (opts.xAxis.disabled) {
+		result.xAxisHeight = 0;
+	}
+	return result;
 }
 
 function getXAxisTextList(series, opts, config, stack) {
-  var index = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : -1;
-  var data;
-  if (stack == 'stack') {
-    data = dataCombineStack(series, opts.categories.length);
-  } else {
-    data = dataCombine(series);
-  }
-  var sorted = [];
-  // remove null from data
-  data = data.filter(function(item) {
-    //return item !== null;
-    if (typeof item === 'object' && item !== null) {
-      if (item.constructor.toString().indexOf('Array') > -1) {
-        return item !== null;
-      } else {
-        return item.value !== null;
-      }
-    } else {
-      return item !== null;
-    }
-  });
-  data.map(function(item) {
-    if (typeof item === 'object') {
-      if (item.constructor.toString().indexOf('Array') > -1) {
-        if (opts.type == 'candle') {
-          item.map(function(subitem) {
-            sorted.push(subitem);
-          })
-        } else {
-          sorted.push(item[0]);
-        }
-      } else {
-        sorted.push(item.value);
-      }
-    } else {
-      sorted.push(item);
-    }
-  })
-
-  var minData = 0;
-  var maxData = 0;
-  if (sorted.length > 0) {
-    minData = Math.min.apply(this, sorted);
-    maxData = Math.max.apply(this, sorted);
-  }
-  //为了兼容v1.9.0之前的项目
-  if (index > -1) {
-    if (typeof opts.xAxis.data[index].min === 'number') {
-      minData = Math.min(opts.xAxis.data[index].min, minData);
-    }
-    if (typeof opts.xAxis.data[index].max === 'number') {
-      maxData = Math.max(opts.xAxis.data[index].max, maxData);
-    }
-  } else {
-    if (typeof opts.xAxis.min === 'number') {
-      minData = Math.min(opts.xAxis.min, minData);
-    }
-    if (typeof opts.xAxis.max === 'number') {
-      maxData = Math.max(opts.xAxis.max, maxData);
-    }
-  }
-  if (minData === maxData) {
-    var rangeSpan = maxData || 10;
-    maxData += rangeSpan;
-  }
-  //var dataRange = getDataRange(minData, maxData);
-  var minRange = minData;
-  var maxRange = maxData;
-  var range = [];
-  var eachRange = (maxRange - minRange) / opts.xAxis.splitNumber;
-  for (var i = 0; i <= opts.xAxis.splitNumber; i++) {
-    range.push(minRange + eachRange * i);
-  }
-  return range;
+	var index = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : -1;
+	var data;
+	if (stack == 'stack') {
+		data = dataCombineStack(series, opts.categories.length);
+	} else {
+		data = dataCombine(series);
+	}
+	var sorted = [];
+	// remove null from data
+	data = data.filter(function(item) {
+		//return item !== null;
+		if (typeof item === 'object' && item !== null) {
+			if (item.constructor.toString().indexOf('Array') > -1) {
+				return item !== null;
+			} else {
+				return item.value !== null;
+			}
+		} else {
+			return item !== null;
+		}
+	});
+	data.map(function(item) {
+		if (typeof item === 'object') {
+			if (item.constructor.toString().indexOf('Array') > -1) {
+				if (opts.type == 'candle') {
+					item.map(function(subitem) {
+						sorted.push(subitem);
+					})
+				} else {
+					sorted.push(item[0]);
+				}
+			} else {
+				sorted.push(item.value);
+			}
+		} else {
+			sorted.push(item);
+		}
+	})
+
+	var minData = 0;
+	var maxData = 0;
+	if (sorted.length > 0) {
+		minData = Math.min.apply(this, sorted);
+		maxData = Math.max.apply(this, sorted);
+	}
+	//为了兼容v1.9.0之前的项目
+	if (index > -1) {
+		if (typeof opts.xAxis.data[index].min === 'number') {
+			minData = Math.min(opts.xAxis.data[index].min, minData);
+		}
+		if (typeof opts.xAxis.data[index].max === 'number') {
+			maxData = Math.max(opts.xAxis.data[index].max, maxData);
+		}
+	} else {
+		if (typeof opts.xAxis.min === 'number') {
+			minData = Math.min(opts.xAxis.min, minData);
+		}
+		if (typeof opts.xAxis.max === 'number') {
+			maxData = Math.max(opts.xAxis.max, maxData);
+		}
+	}
+	if (minData === maxData) {
+		var rangeSpan = maxData || 10;
+		maxData += rangeSpan;
+	}
+	//var dataRange = getDataRange(minData, maxData);
+	var minRange = minData;
+	var maxRange = maxData;
+	var range = [];
+	var eachRange = (maxRange - minRange) / opts.xAxis.splitNumber;
+	for (var i = 0; i <= opts.xAxis.splitNumber; i++) {
+		range.push(minRange + eachRange * i);
+	}
+	return range;
 }
 
 function calXAxisData(series, opts, config, context) {
-  //堆叠图重算Y轴
-  var columnstyle = assign({}, {
-    type: ""
-  }, opts.extra.bar);
-  var result = {
-    angle: 0,
-    xAxisHeight: opts.xAxis.lineHeight * opts.pix + opts.xAxis.marginTop * opts.pix
-  };
-  result.ranges = getXAxisTextList(series, opts, config, columnstyle.type);
-  result.rangesFormat = result.ranges.map(function(item) {
-    //item = opts.xAxis.formatter ? opts.xAxis.formatter(item) : util.toFixed(item, 2);
-    item = util.toFixed(item, 2);
-    return item;
-  });
-  var xAxisScaleValues = result.ranges.map(function(item) {
-    // 如果刻度值是浮点数,则保留两位小数
-    item = util.toFixed(item, 2);
-    // 若有自定义格式则调用自定义的格式化函数
-    //item = opts.xAxis.formatter ? opts.xAxis.formatter(Number(item)) : item;
-    return item;
-  });
-  result = Object.assign(result, getXAxisPoints(xAxisScaleValues, opts, config));
-  // 计算X轴刻度的属性譬如每个刻度的间隔,刻度的起始点\结束点以及总长
-  var eachSpacing = result.eachSpacing;
-  var textLength = xAxisScaleValues.map(function(item) {
-    return measureText(item, opts.xAxis.fontSize * opts.pix, context);
-  });
-  if (opts.xAxis.disabled === true) {
-    result.xAxisHeight = 0;
-  }
-  return result;
+	//堆叠图重算Y轴
+	var columnstyle = assign({}, {
+		type: ""
+	}, opts.extra.bar);
+	var result = {
+		angle: 0,
+		xAxisHeight: opts.xAxis.lineHeight * opts.pix + opts.xAxis.marginTop * opts.pix
+	};
+	result.ranges = getXAxisTextList(series, opts, config, columnstyle.type);
+	result.rangesFormat = result.ranges.map(function(item) {
+		//item = opts.xAxis.formatter ? opts.xAxis.formatter(item) : util.toFixed(item, 2);
+		item = util.toFixed(item, 2);
+		return item;
+	});
+	var xAxisScaleValues = result.ranges.map(function(item) {
+		// 如果刻度值是浮点数,则保留两位小数
+		item = util.toFixed(item, 2);
+		// 若有自定义格式则调用自定义的格式化函数
+		//item = opts.xAxis.formatter ? opts.xAxis.formatter(Number(item)) : item;
+		return item;
+	});
+	result = Object.assign(result, getXAxisPoints(xAxisScaleValues, opts, config));
+	// 计算X轴刻度的属性譬如每个刻度的间隔,刻度的起始点\结束点以及总长
+	var eachSpacing = result.eachSpacing;
+	var textLength = xAxisScaleValues.map(function(item) {
+		return measureText(item, opts.xAxis.fontSize * opts.pix, context);
+	});
+	if (opts.xAxis.disabled === true) {
+		result.xAxisHeight = 0;
+	}
+	return result;
 }
 
 function getRadarDataPoints(angleList, center, radius, series, opts) {
-  var process = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
-  var radarOption = opts.extra.radar || {};
-  radarOption.max = radarOption.max || 0;
-  var maxData = Math.max(radarOption.max, Math.max.apply(null, dataCombine(series)));
-  var data = [];
-  for (let i = 0; i < series.length; i++) {
-    let each = series[i];
-    let listItem = {};
-    listItem.color = each.color;
-    listItem.legendShape = each.legendShape;
-    listItem.pointShape = each.pointShape;
-    listItem.data = [];
-    each.data.forEach(function(item, index) {
-      let tmp = {};
-      tmp.angle = angleList[index];
-      tmp.proportion = item / maxData;
-      tmp.value = item;
-      tmp.position = convertCoordinateOrigin(radius * tmp.proportion * process * Math.cos(tmp.angle), radius * tmp.proportion * process * Math.sin(tmp.angle), center);
-      listItem.data.push(tmp);
-    });
-    data.push(listItem);
-  }
-  return data;
+	var process = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
+	var radarOption = opts.extra.radar || {};
+	radarOption.max = radarOption.max || 0;
+	var maxData = Math.max(radarOption.max, Math.max.apply(null, dataCombine(series)));
+	var data = [];
+	for (let i = 0; i < series.length; i++) {
+		let each = series[i];
+		let listItem = {};
+		listItem.color = each.color;
+		listItem.legendShape = each.legendShape;
+		listItem.pointShape = each.pointShape;
+		listItem.data = [];
+		each.data.forEach(function(item, index) {
+			let tmp = {};
+			tmp.angle = angleList[index];
+			tmp.proportion = item / maxData;
+			tmp.value = item;
+			tmp.position = convertCoordinateOrigin(radius * tmp.proportion * process * Math.cos(tmp.angle), radius * tmp
+				.proportion * process * Math.sin(tmp.angle), center);
+			listItem.data.push(tmp);
+		});
+		data.push(listItem);
+	}
+	return data;
 }
 
 function getPieDataPoints(series, radius) {
-  var process = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
-  var count = 0;
-  var _start_ = 0;
-  for (let i = 0; i < series.length; i++) {
-    let item = series[i];
-    item.data = item.data === null ? 0 : item.data;
-    count += item.data;
-  }
-  for (let i = 0; i < series.length; i++) {
-    let item = series[i];
-    item.data = item.data === null ? 0 : item.data;
-    if (count === 0) {
-      item._proportion_ = 1 / series.length * process;
-    } else {
-      item._proportion_ = item.data / count * process;
-    }
-    item._radius_ = radius;
-  }
-  for (let i = 0; i < series.length; i++) {
-    let item = series[i];
-    item._start_ = _start_;
-    _start_ += 2 * item._proportion_ * Math.PI;
-  }
-  return series;
+	var process = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+	var count = 0;
+	var _start_ = 0;
+	for (let i = 0; i < series.length; i++) {
+		let item = series[i];
+		item.data = item.data === null ? 0 : item.data;
+		count += item.data;
+	}
+	for (let i = 0; i < series.length; i++) {
+		let item = series[i];
+		item.data = item.data === null ? 0 : item.data;
+		if (count === 0) {
+			item._proportion_ = 1 / series.length * process;
+		} else {
+			item._proportion_ = item.data / count * process;
+		}
+		item._radius_ = radius;
+	}
+	for (let i = 0; i < series.length; i++) {
+		let item = series[i];
+		item._start_ = _start_;
+		_start_ += 2 * item._proportion_ * Math.PI;
+	}
+	return series;
 }
 
 function getFunnelDataPoints(series, radius, option, eachSpacing) {
-  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
-  for (let i = 0; i < series.length; i++) {
-    if(option.type == 'funnel'){
-      series[i].radius = series[i].data / series[0].data * radius * process;
-    }else{
-      series[i].radius =  (eachSpacing * (series.length - i)) / (eachSpacing * series.length) * radius * process;
-    }
-    series[i]._proportion_ = series[i].data / series[0].data;
-  }
-  // if(option.type !== 'pyramid'){
-  //   series.reverse();
-  // }
-  return series;
+	var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	for (let i = 0; i < series.length; i++) {
+		if (option.type == 'funnel') {
+			series[i].radius = series[i].data / series[0].data * radius * process;
+		} else {
+			series[i].radius = (eachSpacing * (series.length - i)) / (eachSpacing * series.length) * radius * process;
+		}
+		series[i]._proportion_ = series[i].data / series[0].data;
+	}
+	// if(option.type !== 'pyramid'){
+	//   series.reverse();
+	// }
+	return series;
 }
 
 function getRoseDataPoints(series, type, minRadius, radius) {
-  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
-  var count = 0;
-  var _start_ = 0;
-  var dataArr = [];
-  for (let i = 0; i < series.length; i++) {
-    let item = series[i];
-    item.data = item.data === null ? 0 : item.data;
-    count += item.data;
-    dataArr.push(item.data);
-  }
-  var minData = Math.min.apply(null, dataArr);
-  var maxData = Math.max.apply(null, dataArr);
-  var radiusLength = radius - minRadius;
-  for (let i = 0; i < series.length; i++) {
-    let item = series[i];
-    item.data = item.data === null ? 0 : item.data;
-    if (count === 0) {
-      item._proportion_ = 1 / series.length * process;
-      item._rose_proportion_ = 1 / series.length * process;
-    } else {
-      item._proportion_ = item.data / count * process;
-      if(type == 'area'){
-        item._rose_proportion_ = 1 / series.length * process;
-      }else{
-        item._rose_proportion_ = item.data / count * process;
-      }
-    }
-    item._radius_ = minRadius + radiusLength * ((item.data - minData) / (maxData - minData)) || radius;
-  }
-  for (let i = 0; i < series.length; i++) {
-    let item = series[i];
-    item._start_ = _start_;
-    _start_ += 2 * item._rose_proportion_ * Math.PI;
-  }
-  return series;
+	var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	var count = 0;
+	var _start_ = 0;
+	var dataArr = [];
+	for (let i = 0; i < series.length; i++) {
+		let item = series[i];
+		item.data = item.data === null ? 0 : item.data;
+		count += item.data;
+		dataArr.push(item.data);
+	}
+	var minData = Math.min.apply(null, dataArr);
+	var maxData = Math.max.apply(null, dataArr);
+	var radiusLength = radius - minRadius;
+	for (let i = 0; i < series.length; i++) {
+		let item = series[i];
+		item.data = item.data === null ? 0 : item.data;
+		if (count === 0) {
+			item._proportion_ = 1 / series.length * process;
+			item._rose_proportion_ = 1 / series.length * process;
+		} else {
+			item._proportion_ = item.data / count * process;
+			if (type == 'area') {
+				item._rose_proportion_ = 1 / series.length * process;
+			} else {
+				item._rose_proportion_ = item.data / count * process;
+			}
+		}
+		item._radius_ = minRadius + radiusLength * ((item.data - minData) / (maxData - minData)) || radius;
+	}
+	for (let i = 0; i < series.length; i++) {
+		let item = series[i];
+		item._start_ = _start_;
+		_start_ += 2 * item._rose_proportion_ * Math.PI;
+	}
+	return series;
 }
 
 function getArcbarDataPoints(series, arcbarOption) {
-  var process = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
-  if (process == 1) {
-    process = 0.999999;
-  }
-  for (let i = 0; i < series.length; i++) {
-    let item = series[i];
-    item.data = item.data === null ? 0 : item.data;
-    let totalAngle;
-    if (arcbarOption.type == 'circle') {
-      totalAngle = 2;
-    } else {
-      if(arcbarOption.direction == 'ccw'){
-        if (arcbarOption.startAngle < arcbarOption.endAngle) {
-          totalAngle = 2 + arcbarOption.startAngle - arcbarOption.endAngle;
-        } else {
-          totalAngle = arcbarOption.startAngle - arcbarOption.endAngle;
-        }
-      }else{
-        if (arcbarOption.endAngle < arcbarOption.startAngle) {
-          totalAngle = 2 + arcbarOption.endAngle - arcbarOption.startAngle;
-        } else {
-          totalAngle = arcbarOption.startAngle - arcbarOption.endAngle;
-        }
-      }
-    }
-    item._proportion_ = totalAngle * item.data * process + arcbarOption.startAngle;
-    if(arcbarOption.direction == 'ccw'){
-      item._proportion_ = arcbarOption.startAngle - totalAngle * item.data * process ;
-    }
-    if (item._proportion_ >= 2) {
-      item._proportion_ = item._proportion_ % 2;
-    }
-  }
-  return series;
+	var process = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+	if (process == 1) {
+		process = 0.999999;
+	}
+	for (let i = 0; i < series.length; i++) {
+		let item = series[i];
+		item.data = item.data === null ? 0 : item.data;
+		let totalAngle;
+		if (arcbarOption.type == 'circle') {
+			totalAngle = 2;
+		} else {
+			if (arcbarOption.direction == 'ccw') {
+				if (arcbarOption.startAngle < arcbarOption.endAngle) {
+					totalAngle = 2 + arcbarOption.startAngle - arcbarOption.endAngle;
+				} else {
+					totalAngle = arcbarOption.startAngle - arcbarOption.endAngle;
+				}
+			} else {
+				if (arcbarOption.endAngle < arcbarOption.startAngle) {
+					totalAngle = 2 + arcbarOption.endAngle - arcbarOption.startAngle;
+				} else {
+					totalAngle = arcbarOption.startAngle - arcbarOption.endAngle;
+				}
+			}
+		}
+		item._proportion_ = totalAngle * item.data * process + arcbarOption.startAngle;
+		if (arcbarOption.direction == 'ccw') {
+			item._proportion_ = arcbarOption.startAngle - totalAngle * item.data * process;
+		}
+		if (item._proportion_ >= 2) {
+			item._proportion_ = item._proportion_ % 2;
+		}
+	}
+	return series;
 }
 
 function getGaugeArcbarDataPoints(series, arcbarOption) {
-  var process = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
-  if (process == 1) {
-    process = 0.999999;
-  }
-  for (let i = 0; i < series.length; i++) {
-    let item = series[i];
-    item.data = item.data === null ? 0 : item.data;
-    let totalAngle;
-    if (arcbarOption.type == 'circle') {
-      totalAngle = 2;
-    } else {
-      if (arcbarOption.endAngle < arcbarOption.startAngle) {
-        totalAngle = 2 + arcbarOption.endAngle - arcbarOption.startAngle;
-      } else {
-        totalAngle = arcbarOption.startAngle - arcbarOption.endAngle;
-      }
-    }
-    item._proportion_ = totalAngle * item.data * process + arcbarOption.startAngle;
-    if (item._proportion_ >= 2) {
-      item._proportion_ = item._proportion_ % 2;
-    }
-  }
-  return series;
+	var process = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+	if (process == 1) {
+		process = 0.999999;
+	}
+	for (let i = 0; i < series.length; i++) {
+		let item = series[i];
+		item.data = item.data === null ? 0 : item.data;
+		let totalAngle;
+		if (arcbarOption.type == 'circle') {
+			totalAngle = 2;
+		} else {
+			if (arcbarOption.endAngle < arcbarOption.startAngle) {
+				totalAngle = 2 + arcbarOption.endAngle - arcbarOption.startAngle;
+			} else {
+				totalAngle = arcbarOption.startAngle - arcbarOption.endAngle;
+			}
+		}
+		item._proportion_ = totalAngle * item.data * process + arcbarOption.startAngle;
+		if (item._proportion_ >= 2) {
+			item._proportion_ = item._proportion_ % 2;
+		}
+	}
+	return series;
 }
 
 function getGaugeAxisPoints(categories, startAngle, endAngle) {
-  let totalAngle;
-  if (endAngle < startAngle) {
-    totalAngle = 2 + endAngle - startAngle;
-  } else {
-    totalAngle = startAngle - endAngle;
-  }
-  let tempStartAngle = startAngle;
-  for (let i = 0; i < categories.length; i++) {
-    categories[i].value = categories[i].value === null ? 0 : categories[i].value;
-    categories[i]._startAngle_ = tempStartAngle;
-    categories[i]._endAngle_ = totalAngle * categories[i].value + startAngle;
-    if (categories[i]._endAngle_ >= 2) {
-      categories[i]._endAngle_ = categories[i]._endAngle_ % 2;
-    }
-    tempStartAngle = categories[i]._endAngle_;
-  }
-  return categories;
+	let totalAngle;
+	if (endAngle < startAngle) {
+		totalAngle = 2 + endAngle - startAngle;
+	} else {
+		totalAngle = startAngle - endAngle;
+	}
+	let tempStartAngle = startAngle;
+	for (let i = 0; i < categories.length; i++) {
+		categories[i].value = categories[i].value === null ? 0 : categories[i].value;
+		categories[i]._startAngle_ = tempStartAngle;
+		categories[i]._endAngle_ = totalAngle * categories[i].value + startAngle;
+		if (categories[i]._endAngle_ >= 2) {
+			categories[i]._endAngle_ = categories[i]._endAngle_ % 2;
+		}
+		tempStartAngle = categories[i]._endAngle_;
+	}
+	return categories;
 }
 
 function getGaugeDataPoints(series, categories, gaugeOption) {
-  let process = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 1;
-  for (let i = 0; i < series.length; i++) {
-    let item = series[i];
-    item.data = item.data === null ? 0 : item.data;
-    if (gaugeOption.pointer.color == 'auto') {
-      for (let i = 0; i < categories.length; i++) {
-        if (item.data <= categories[i].value) {
-          item.color = categories[i].color;
-          break;
-        }
-      }
-    } else {
-      item.color = gaugeOption.pointer.color;
-    }
-    let totalAngle;
-    if (gaugeOption.endAngle < gaugeOption.startAngle) {
-      totalAngle = 2 + gaugeOption.endAngle - gaugeOption.startAngle;
-    } else {
-      totalAngle = gaugeOption.startAngle - gaugeOption.endAngle;
-    }
-    item._endAngle_ = totalAngle * item.data + gaugeOption.startAngle;
-    item._oldAngle_ = gaugeOption.oldAngle;
-    if (gaugeOption.oldAngle < gaugeOption.endAngle) {
-      item._oldAngle_ += 2;
-    }
-    if (item.data >= gaugeOption.oldData) {
-      item._proportion_ = (item._endAngle_ - item._oldAngle_) * process + gaugeOption.oldAngle;
-    } else {
-      item._proportion_ = item._oldAngle_ - (item._oldAngle_ - item._endAngle_) * process;
-    }
-    if (item._proportion_ >= 2) {
-      item._proportion_ = item._proportion_ % 2;
-    }
-  }
-  return series;
+	let process = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 1;
+	for (let i = 0; i < series.length; i++) {
+		let item = series[i];
+		item.data = item.data === null ? 0 : item.data;
+		if (gaugeOption.pointer.color == 'auto') {
+			for (let i = 0; i < categories.length; i++) {
+				if (item.data <= categories[i].value) {
+					item.color = categories[i].color;
+					break;
+				}
+			}
+		} else {
+			item.color = gaugeOption.pointer.color;
+		}
+		let totalAngle;
+		if (gaugeOption.endAngle < gaugeOption.startAngle) {
+			totalAngle = 2 + gaugeOption.endAngle - gaugeOption.startAngle;
+		} else {
+			totalAngle = gaugeOption.startAngle - gaugeOption.endAngle;
+		}
+		item._endAngle_ = totalAngle * item.data + gaugeOption.startAngle;
+		item._oldAngle_ = gaugeOption.oldAngle;
+		if (gaugeOption.oldAngle < gaugeOption.endAngle) {
+			item._oldAngle_ += 2;
+		}
+		if (item.data >= gaugeOption.oldData) {
+			item._proportion_ = (item._endAngle_ - item._oldAngle_) * process + gaugeOption.oldAngle;
+		} else {
+			item._proportion_ = item._oldAngle_ - (item._oldAngle_ - item._endAngle_) * process;
+		}
+		if (item._proportion_ >= 2) {
+			item._proportion_ = item._proportion_ % 2;
+		}
+	}
+	return series;
 }
 
 function getPieTextMaxLength(series, config, context, opts) {
-  series = getPieDataPoints(series);
-  let maxLength = 0;
-  for (let i = 0; i < series.length; i++) {
-    let item = series[i];
-    let text = item.formatter ? item.formatter(+item._proportion_.toFixed(2)) : util.toFixed(item._proportion_ * 100) + '%';
-    maxLength = Math.max(maxLength, measureText(text, item.textSize * opts.pix || config.fontSize, context));
-  }
-  return maxLength;
+	series = getPieDataPoints(series);
+	let maxLength = 0;
+	for (let i = 0; i < series.length; i++) {
+		let item = series[i];
+		let text = item.formatter ? item.formatter(+item._proportion_.toFixed(2)) : util.toFixed(item._proportion_ * 100) +
+			'%';
+		maxLength = Math.max(maxLength, measureText(text, item.textSize * opts.pix || config.fontSize, context));
+	}
+	return maxLength;
 }
 
 function fixColumeData(points, eachSpacing, columnLen, index, config, opts) {
-  return points.map(function(item) {
-    if (item === null) {
-      return null;
-    }
-    var seriesGap = 0;
-    var categoryGap = 0;
-    if (opts.type == 'mix') {
-      seriesGap = opts.extra.mix.column.seriesGap * opts.pix || 0;
-      categoryGap = opts.extra.mix.column.categoryGap * opts.pix || 0;
-    } else {
-      seriesGap = opts.extra.column.seriesGap * opts.pix || 0;
-      categoryGap = opts.extra.column.categoryGap * opts.pix || 0;
-    }
-    seriesGap =  Math.min(seriesGap, eachSpacing / columnLen)
-    categoryGap =  Math.min(categoryGap, eachSpacing / columnLen)
-    item.width = Math.ceil((eachSpacing - 2 * categoryGap - seriesGap * (columnLen - 1)) / columnLen);
-    if (opts.extra.mix && opts.extra.mix.column.width && +opts.extra.mix.column.width > 0) {
-      item.width = Math.min(item.width, +opts.extra.mix.column.width * opts.pix);
-    }
-    if (opts.extra.column && opts.extra.column.width && +opts.extra.column.width > 0) {
-      item.width = Math.min(item.width, +opts.extra.column.width * opts.pix);
-    }
-    if (item.width <= 0) {
-      item.width = 1;
-    }
-    item.x += (index + 0.5 - columnLen / 2) * (item.width + seriesGap);
-    return item;
-  });
+	return points.map(function(item) {
+		if (item === null) {
+			return null;
+		}
+		var seriesGap = 0;
+		var categoryGap = 0;
+		if (opts.type == 'mix') {
+			seriesGap = opts.extra.mix.column.seriesGap * opts.pix || 0;
+			categoryGap = opts.extra.mix.column.categoryGap * opts.pix || 0;
+		} else {
+			seriesGap = opts.extra.column.seriesGap * opts.pix || 0;
+			categoryGap = opts.extra.column.categoryGap * opts.pix || 0;
+		}
+		seriesGap = Math.min(seriesGap, eachSpacing / columnLen)
+		categoryGap = Math.min(categoryGap, eachSpacing / columnLen)
+		item.width = Math.ceil((eachSpacing - 2 * categoryGap - seriesGap * (columnLen - 1)) / columnLen);
+		if (opts.extra.mix && opts.extra.mix.column.width && +opts.extra.mix.column.width > 0) {
+			item.width = Math.min(item.width, +opts.extra.mix.column.width * opts.pix);
+		}
+		if (opts.extra.column && opts.extra.column.width && +opts.extra.column.width > 0) {
+			item.width = Math.min(item.width, +opts.extra.column.width * opts.pix);
+		}
+		if (item.width <= 0) {
+			item.width = 1;
+		}
+		item.x += (index + 0.5 - columnLen / 2) * (item.width + seriesGap);
+		return item;
+	});
 }
 
 function fixBarData(points, eachSpacing, columnLen, index, config, opts) {
-  return points.map(function(item) {
-    if (item === null) {
-      return null;
-    }
-    var seriesGap = 0;
-    var categoryGap = 0;
-    seriesGap = opts.extra.bar.seriesGap * opts.pix || 0;
-    categoryGap = opts.extra.bar.categoryGap * opts.pix || 0;
-    seriesGap =  Math.min(seriesGap, eachSpacing / columnLen)
-    categoryGap =  Math.min(categoryGap, eachSpacing / columnLen)
-    item.width = Math.ceil((eachSpacing - 2 * categoryGap - seriesGap * (columnLen - 1)) / columnLen);
-    if (opts.extra.bar && opts.extra.bar.width && +opts.extra.bar.width > 0) {
-      item.width = Math.min(item.width, +opts.extra.bar.width * opts.pix);
-    }
-    if (item.width <= 0) {
-      item.width = 1;
-    }
-    item.y += (index + 0.5 - columnLen / 2) * (item.width + seriesGap);
-    return item;
-  });
+	return points.map(function(item) {
+		if (item === null) {
+			return null;
+		}
+		var seriesGap = 0;
+		var categoryGap = 0;
+		seriesGap = opts.extra.bar.seriesGap * opts.pix || 0;
+		categoryGap = opts.extra.bar.categoryGap * opts.pix || 0;
+		seriesGap = Math.min(seriesGap, eachSpacing / columnLen)
+		categoryGap = Math.min(categoryGap, eachSpacing / columnLen)
+		item.width = Math.ceil((eachSpacing - 2 * categoryGap - seriesGap * (columnLen - 1)) / columnLen);
+		if (opts.extra.bar && opts.extra.bar.width && +opts.extra.bar.width > 0) {
+			item.width = Math.min(item.width, +opts.extra.bar.width * opts.pix);
+		}
+		if (item.width <= 0) {
+			item.width = 1;
+		}
+		item.y += (index + 0.5 - columnLen / 2) * (item.width + seriesGap);
+		return item;
+	});
 }
 
 function fixColumeMeterData(points, eachSpacing, columnLen, index, config, opts, border) {
-  var categoryGap = opts.extra.column.categoryGap * opts.pix || 0;
-  return points.map(function(item) {
-    if (item === null) {
-      return null;
-    }
-    item.width = eachSpacing - 2 * categoryGap;
-    if (opts.extra.column && opts.extra.column.width && +opts.extra.column.width > 0) {
-      item.width = Math.min(item.width, +opts.extra.column.width * opts.pix);
-    }
-    if (index > 0) {
-      item.width -= border;
-    }
-    return item;
-  });
+	var categoryGap = opts.extra.column.categoryGap * opts.pix || 0;
+	return points.map(function(item) {
+		if (item === null) {
+			return null;
+		}
+		item.width = eachSpacing - 2 * categoryGap;
+		if (opts.extra.column && opts.extra.column.width && +opts.extra.column.width > 0) {
+			item.width = Math.min(item.width, +opts.extra.column.width * opts.pix);
+		}
+		if (index > 0) {
+			item.width -= border;
+		}
+		return item;
+	});
 }
 
 function fixColumeStackData(points, eachSpacing, columnLen, index, config, opts, series) {
-  var categoryGap = opts.extra.column.categoryGap * opts.pix || 0;
-  return points.map(function(item, indexn) {
-    if (item === null) {
-      return null;
-    }
-    item.width = Math.ceil(eachSpacing - 2 * categoryGap);
-    if (opts.extra.column && opts.extra.column.width && +opts.extra.column.width > 0) {
-      item.width = Math.min(item.width, +opts.extra.column.width * opts.pix);
-    }
-    if (item.width <= 0) {
-      item.width = 1;
-    }
-    return item;
-  });
+	var categoryGap = opts.extra.column.categoryGap * opts.pix || 0;
+	return points.map(function(item, indexn) {
+		if (item === null) {
+			return null;
+		}
+		item.width = Math.ceil(eachSpacing - 2 * categoryGap);
+		if (opts.extra.column && opts.extra.column.width && +opts.extra.column.width > 0) {
+			item.width = Math.min(item.width, +opts.extra.column.width * opts.pix);
+		}
+		if (item.width <= 0) {
+			item.width = 1;
+		}
+		return item;
+	});
 }
 
 function fixBarStackData(points, eachSpacing, columnLen, index, config, opts, series) {
-  var categoryGap = opts.extra.bar.categoryGap * opts.pix || 0;
-  return points.map(function(item, indexn) {
-    if (item === null) {
-      return null;
-    }
-    item.width = Math.ceil(eachSpacing - 2 * categoryGap);
-    if (opts.extra.bar && opts.extra.bar.width && +opts.extra.bar.width > 0) {
-      item.width = Math.min(item.width, +opts.extra.bar.width * opts.pix);
-    }
-    if (item.width <= 0) {
-      item.width = 1;
-    }
-    return item;
-  });
+	var categoryGap = opts.extra.bar.categoryGap * opts.pix || 0;
+	return points.map(function(item, indexn) {
+		if (item === null) {
+			return null;
+		}
+		item.width = Math.ceil(eachSpacing - 2 * categoryGap);
+		if (opts.extra.bar && opts.extra.bar.width && +opts.extra.bar.width > 0) {
+			item.width = Math.min(item.width, +opts.extra.bar.width * opts.pix);
+		}
+		if (item.width <= 0) {
+			item.width = 1;
+		}
+		return item;
+	});
 }
 
 function getXAxisPoints(categories, opts, config) {
-  var spacingValid = opts.width - opts.area[1] - opts.area[3];
-  var dataCount = opts.enableScroll ? Math.min(opts.xAxis.itemCount, categories.length) : categories.length;
-  if ((opts.type == 'line' || opts.type == 'area' || opts.type == 'scatter' || opts.type == 'bubble' || opts.type == 'bar') && dataCount > 1 && opts.xAxis.boundaryGap == 'justify') {
-    dataCount -= 1;
-  }
-  var widthRatio = 0;
-  if(opts.type == 'mount' && opts.extra && opts.extra.mount && opts.extra.mount.widthRatio && opts.extra.mount.widthRatio > 1){
-    if(opts.extra.mount.widthRatio>2) opts.extra.mount.widthRatio = 2
-    widthRatio = opts.extra.mount.widthRatio - 1;
-    dataCount += widthRatio;
-  }
-  var eachSpacing = spacingValid / dataCount;
-  var xAxisPoints = [];
-  var startX = opts.area[3];
-  var endX = opts.width - opts.area[1];
-  categories.forEach(function(item, index) {
-    xAxisPoints.push(startX + widthRatio / 2 * eachSpacing + index * eachSpacing);
-  });
-  if (opts.xAxis.boundaryGap !== 'justify') {
-    if (opts.enableScroll === true) {
-      xAxisPoints.push(startX + widthRatio * eachSpacing + categories.length * eachSpacing);
-    } else {
-      xAxisPoints.push(endX);
-    }
-  }
-  return {
-    xAxisPoints: xAxisPoints,
-    startX: startX,
-    endX: endX,
-    eachSpacing: eachSpacing
-  };
+	var spacingValid = opts.width - opts.area[1] - opts.area[3];
+	var dataCount = opts.enableScroll ? Math.min(opts.xAxis.itemCount, categories.length) : categories.length;
+	if ((opts.type == 'line' || opts.type == 'area' || opts.type == 'scatter' || opts.type == 'bubble' || opts.type ==
+			'bar') && dataCount > 1 && opts.xAxis.boundaryGap == 'justify') {
+		dataCount -= 1;
+	}
+	var widthRatio = 0;
+	if (opts.type == 'mount' && opts.extra && opts.extra.mount && opts.extra.mount.widthRatio && opts.extra.mount
+		.widthRatio > 1) {
+		if (opts.extra.mount.widthRatio > 2) opts.extra.mount.widthRatio = 2
+		widthRatio = opts.extra.mount.widthRatio - 1;
+		dataCount += widthRatio;
+	}
+	var eachSpacing = spacingValid / dataCount;
+	var xAxisPoints = [];
+	var startX = opts.area[3];
+	var endX = opts.width - opts.area[1];
+	categories.forEach(function(item, index) {
+		xAxisPoints.push(startX + widthRatio / 2 * eachSpacing + index * eachSpacing);
+	});
+	if (opts.xAxis.boundaryGap !== 'justify') {
+		if (opts.enableScroll === true) {
+			xAxisPoints.push(startX + widthRatio * eachSpacing + categories.length * eachSpacing);
+		} else {
+			xAxisPoints.push(endX);
+		}
+	}
+	return {
+		xAxisPoints: xAxisPoints,
+		startX: startX,
+		endX: endX,
+		eachSpacing: eachSpacing
+	};
 }
 
 function getCandleDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config) {
-  var process = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
-  var points = [];
-  var validHeight = opts.height - opts.area[0] - opts.area[2];
-  data.forEach(function(item, index) {
-    if (item === null) {
-      points.push(null);
-    } else {
-      var cPoints = [];
-      item.forEach(function(items, indexs) {
-        var point = {};
-        point.x = xAxisPoints[index] + Math.round(eachSpacing / 2);
-        var value = items.value || items;
-        var height = validHeight * (value - minRange) / (maxRange - minRange);
-        height *= process;
-        point.y = opts.height - Math.round(height) - opts.area[2];
-        cPoints.push(point);
-      });
-      points.push(cPoints);
-    }
-  });
-  return points;
+	var process = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
+	var points = [];
+	var validHeight = opts.height - opts.area[0] - opts.area[2];
+	data.forEach(function(item, index) {
+		if (item === null) {
+			points.push(null);
+		} else {
+			var cPoints = [];
+			item.forEach(function(items, indexs) {
+				var point = {};
+				point.x = xAxisPoints[index] + Math.round(eachSpacing / 2);
+				var value = items.value || items;
+				var height = validHeight * (value - minRange) / (maxRange - minRange);
+				height *= process;
+				point.y = opts.height - Math.round(height) - opts.area[2];
+				cPoints.push(point);
+			});
+			points.push(cPoints);
+		}
+	});
+	return points;
 }
 
 function getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config) {
-  var process = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
-  var boundaryGap = 'center';
-  if (opts.type == 'line' || opts.type == 'area' || opts.type == 'scatter' || opts.type == 'bubble' ) {
-    boundaryGap = opts.xAxis.boundaryGap;
-  }
-  var points = [];
-  var validHeight = opts.height - opts.area[0] - opts.area[2];
-  var validWidth = opts.width - opts.area[1] - opts.area[3];
-  data.forEach(function(item, index) {
-    if (item === null) {
-      points.push(null);
-    } else {
-      var point = {};
-      point.color = item.color;
-      point.x = xAxisPoints[index];
-      var value = item;
-      if (typeof item === 'object' && item !== null) {
-        if (item.constructor.toString().indexOf('Array') > -1) {
-          let xranges, xminRange, xmaxRange;
-          xranges = [].concat(opts.chartData.xAxisData.ranges);
-          xminRange = xranges.shift();
-          xmaxRange = xranges.pop();
-          value = item[1];
-          point.x = opts.area[3] + validWidth * (item[0] - xminRange) / (xmaxRange - xminRange);
-          if(opts.type == 'bubble'){
-            point.r = item[2];
-            point.t = item[3];
-          }
-        } else {
-          value = item.value;
-        }
-      }
-      if (boundaryGap == 'center') {
-        point.x += eachSpacing / 2;
-      }
-      var height = validHeight * (value - minRange) / (maxRange - minRange);
-      height *= process;
-      point.y = opts.height - height - opts.area[2];
-      points.push(point);
-    }
-  });
-  return points;
+	var process = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
+	var boundaryGap = 'center';
+	if (opts.type == 'line' || opts.type == 'area' || opts.type == 'scatter' || opts.type == 'bubble') {
+		boundaryGap = opts.xAxis.boundaryGap;
+	}
+	var points = [];
+	var validHeight = opts.height - opts.area[0] - opts.area[2];
+	var validWidth = opts.width - opts.area[1] - opts.area[3];
+	data.forEach(function(item, index) {
+		if (item === null) {
+			points.push(null);
+		} else {
+			var point = {};
+			point.color = item.color;
+			point.x = xAxisPoints[index];
+			var value = item;
+			if (typeof item === 'object' && item !== null) {
+				if (item.constructor.toString().indexOf('Array') > -1) {
+					let xranges, xminRange, xmaxRange;
+					xranges = [].concat(opts.chartData.xAxisData.ranges);
+					xminRange = xranges.shift();
+					xmaxRange = xranges.pop();
+					value = item[1];
+					point.x = opts.area[3] + validWidth * (item[0] - xminRange) / (xmaxRange - xminRange);
+					if (opts.type == 'bubble') {
+						point.r = item[2];
+						point.t = item[3];
+					}
+				} else {
+					value = item.value;
+				}
+			}
+			if (boundaryGap == 'center') {
+				point.x += eachSpacing / 2;
+			}
+			var height = validHeight * (value - minRange) / (maxRange - minRange);
+			height *= process;
+			point.y = opts.height - height - opts.area[2];
+			points.push(point);
+		}
+	});
+	return points;
 }
 
-function getLineDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, lineOption, process){
-  var process = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : 1;
-  var boundaryGap = opts.xAxis.boundaryGap;
-  var points = [];
-  var validHeight = opts.height - opts.area[0] - opts.area[2];
-  var validWidth = opts.width - opts.area[1] - opts.area[3];
-  data.forEach(function(item, index) {
-    if (item === null) {
-      points.push(null);
-    } else {
-      var point = {};
-      point.color = item.color;
-      if(lineOption.animation == 'vertical'){
-        point.x = xAxisPoints[index];
-        var value = item;
-        if (typeof item === 'object' && item !== null) {
-          if (item.constructor.toString().indexOf('Array') > -1) {
-            let xranges, xminRange, xmaxRange;
-            xranges = [].concat(opts.chartData.xAxisData.ranges);
-            xminRange = xranges.shift();
-            xmaxRange = xranges.pop();
-            value = item[1];
-            point.x = opts.area[3] + validWidth * (item[0] - xminRange) / (xmaxRange - xminRange);
-          } else {
-            value = item.value;
-          }
-        }
-        if (boundaryGap == 'center') {
-          point.x += eachSpacing / 2;
-        }
-        var height = validHeight * (value - minRange) / (maxRange - minRange);
-        height *= process;
-        point.y = opts.height - height - opts.area[2];
-        points.push(point);
-      }else{
-        point.x = xAxisPoints[0] + eachSpacing * index * process;
-        var value = item;
-        if (boundaryGap == 'center') {
-          point.x += eachSpacing / 2;
-        }
-        var height = validHeight * (value - minRange) / (maxRange - minRange);
-        point.y = opts.height - height - opts.area[2];
-        points.push(point);
-      }
-    }
-  });
-  return points;
+function getLineDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, lineOption, process) {
+	var process = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : 1;
+	var boundaryGap = opts.xAxis.boundaryGap;
+	var points = [];
+	var validHeight = opts.height - opts.area[0] - opts.area[2];
+	var validWidth = opts.width - opts.area[1] - opts.area[3];
+	data.forEach(function(item, index) {
+		if (item === null) {
+			points.push(null);
+		} else {
+			var point = {};
+			point.color = item.color;
+			if (lineOption.animation == 'vertical') {
+				point.x = xAxisPoints[index];
+				var value = item;
+				if (typeof item === 'object' && item !== null) {
+					if (item.constructor.toString().indexOf('Array') > -1) {
+						let xranges, xminRange, xmaxRange;
+						xranges = [].concat(opts.chartData.xAxisData.ranges);
+						xminRange = xranges.shift();
+						xmaxRange = xranges.pop();
+						value = item[1];
+						point.x = opts.area[3] + validWidth * (item[0] - xminRange) / (xmaxRange - xminRange);
+					} else {
+						value = item.value;
+					}
+				}
+				if (boundaryGap == 'center') {
+					point.x += eachSpacing / 2;
+				}
+				var height = validHeight * (value - minRange) / (maxRange - minRange);
+				height *= process;
+				point.y = opts.height - height - opts.area[2];
+				points.push(point);
+			} else {
+				point.x = xAxisPoints[0] + eachSpacing * index * process;
+				var value = item;
+				if (boundaryGap == 'center') {
+					point.x += eachSpacing / 2;
+				}
+				var height = validHeight * (value - minRange) / (maxRange - minRange);
+				point.y = opts.height - height - opts.area[2];
+				points.push(point);
+			}
+		}
+	});
+	return points;
 }
 
-function getColumnDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, zeroPoints, process){
-  var process = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : 1;
-  var points = [];
-  var validHeight = opts.height - opts.area[0] - opts.area[2];
-  var validWidth = opts.width - opts.area[1] - opts.area[3];
-  data.forEach(function(item, index) {
-    if (item === null) {
-      points.push(null);
-    } else {
-      var point = {};
-      point.color = item.color;
-      point.x = xAxisPoints[index];
-      var value = item;
-      if (typeof item === 'object' && item !== null) {
-        if (item.constructor.toString().indexOf('Array') > -1) {
-          let xranges, xminRange, xmaxRange;
-          xranges = [].concat(opts.chartData.xAxisData.ranges);
-          xminRange = xranges.shift();
-          xmaxRange = xranges.pop();
-          value = item[1];
-          point.x = opts.area[3] + validWidth * (item[0] - xminRange) / (xmaxRange - xminRange);
-        } else {
-          value = item.value;
-        }
-      }
-      point.x += eachSpacing / 2;
-      var height = validHeight * (value * process - minRange) / (maxRange - minRange);
-      point.y = opts.height - height - opts.area[2];
-      points.push(point);
-    }
-  });
-  return points;
+function getColumnDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, zeroPoints, process) {
+	var process = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : 1;
+	var points = [];
+	var validHeight = opts.height - opts.area[0] - opts.area[2];
+	var validWidth = opts.width - opts.area[1] - opts.area[3];
+	data.forEach(function(item, index) {
+		if (item === null) {
+			points.push(null);
+		} else {
+			var point = {};
+			point.color = item.color;
+			point.x = xAxisPoints[index];
+			var value = item;
+			if (typeof item === 'object' && item !== null) {
+				if (item.constructor.toString().indexOf('Array') > -1) {
+					let xranges, xminRange, xmaxRange;
+					xranges = [].concat(opts.chartData.xAxisData.ranges);
+					xminRange = xranges.shift();
+					xmaxRange = xranges.pop();
+					value = item[1];
+					point.x = opts.area[3] + validWidth * (item[0] - xminRange) / (xmaxRange - xminRange);
+				} else {
+					value = item.value;
+				}
+			}
+			point.x += eachSpacing / 2;
+			var height = validHeight * (value * process - minRange) / (maxRange - minRange);
+			point.y = opts.height - height - opts.area[2];
+			points.push(point);
+		}
+	});
+	return points;
 }
 
 function getMountDataPoints(series, minRange, maxRange, xAxisPoints, eachSpacing, opts, mountOption, zeroPoints) {
-  var process = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : 1;
-  var points = [];
-  var validHeight = opts.height - opts.area[0] - opts.area[2];
-  var validWidth = opts.width - opts.area[1] - opts.area[3];
-  var mountWidth = eachSpacing * mountOption.widthRatio;
-  series.forEach(function(item, index) {
-    if (item === null) {
-      points.push(null);
-    } else {
-      var point = {};
-      point.color = item.color;
-      point.x = xAxisPoints[index];
-      point.x += eachSpacing / 2;
-      var value = item.data;
-      var height = validHeight * (value * process - minRange) / (maxRange - minRange);
-      point.y = opts.height - height - opts.area[2];
-      point.value = value;
-      point.width = mountWidth;
-      points.push(point);
-    }
-  });
-  return points;
+	var process = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : 1;
+	var points = [];
+	var validHeight = opts.height - opts.area[0] - opts.area[2];
+	var validWidth = opts.width - opts.area[1] - opts.area[3];
+	var mountWidth = eachSpacing * mountOption.widthRatio;
+	series.forEach(function(item, index) {
+		if (item === null) {
+			points.push(null);
+		} else {
+			var point = {};
+			point.color = item.color;
+			point.x = xAxisPoints[index];
+			point.x += eachSpacing / 2;
+			var value = item.data;
+			var height = validHeight * (value * process - minRange) / (maxRange - minRange);
+			point.y = opts.height - height - opts.area[2];
+			point.value = value;
+			point.width = mountWidth;
+			points.push(point);
+		}
+	});
+	return points;
 }
 
 function getBarDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config) {
-  var process = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
-  var points = [];
-  var validHeight = opts.height - opts.area[0] - opts.area[2];
-  var validWidth = opts.width - opts.area[1] - opts.area[3];
-  data.forEach(function(item, index) {
-    if (item === null) {
-      points.push(null);
-    } else {
-      var point = {};
-      point.color = item.color;
-      point.y = yAxisPoints[index];
-      var value = item;
-      if (typeof item === 'object' && item !== null) {
-        value = item.value;
-      }
-      var height = validWidth * (value - minRange) / (maxRange - minRange);
-      height *= process;
-      point.height = height;
-      point.value = value;
-      point.x = height + opts.area[3];
-      points.push(point);
-    }
-  });
-  return points;
+	var process = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
+	var points = [];
+	var validHeight = opts.height - opts.area[0] - opts.area[2];
+	var validWidth = opts.width - opts.area[1] - opts.area[3];
+	data.forEach(function(item, index) {
+		if (item === null) {
+			points.push(null);
+		} else {
+			var point = {};
+			point.color = item.color;
+			point.y = yAxisPoints[index];
+			var value = item;
+			if (typeof item === 'object' && item !== null) {
+				value = item.value;
+			}
+			var height = validWidth * (value - minRange) / (maxRange - minRange);
+			height *= process;
+			point.height = height;
+			point.value = value;
+			point.x = height + opts.area[3];
+			points.push(point);
+		}
+	});
+	return points;
 }
 
-function getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, seriesIndex, stackSeries) {
-  var process = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : 1;
-  var points = [];
-  var validHeight = opts.height - opts.area[0] - opts.area[2];
-  data.forEach(function(item, index) {
-    if (item === null) {
-      points.push(null);
-    } else {
-      var point = {};
-      point.color = item.color;
-      point.x = xAxisPoints[index] + Math.round(eachSpacing / 2);
-
-      if (seriesIndex > 0) {
-        var value = 0;
-        for (let i = 0; i <= seriesIndex; i++) {
-          value += stackSeries[i].data[index];
-        }
-        var value0 = value - item;
-        var height = validHeight * (value - minRange) / (maxRange - minRange);
-        var height0 = validHeight * (value0 - minRange) / (maxRange - minRange);
-      } else {
-        var value = item;
-        if (typeof item === 'object' && item !== null) {
-          value = item.value;
-        }
-        var height = validHeight * (value - minRange) / (maxRange - minRange);
-        var height0 = 0;
-      }
-      var heightc = height0;
-      height *= process;
-      heightc *= process;
-      point.y = opts.height - Math.round(height) - opts.area[2];
-      point.y0 = opts.height - Math.round(heightc) - opts.area[2];
-      points.push(point);
-    }
-  });
-  return points;
+function getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, seriesIndex,
+	stackSeries) {
+	var process = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : 1;
+	var points = [];
+	var validHeight = opts.height - opts.area[0] - opts.area[2];
+	data.forEach(function(item, index) {
+		if (item === null) {
+			points.push(null);
+		} else {
+			var point = {};
+			point.color = item.color;
+			point.x = xAxisPoints[index] + Math.round(eachSpacing / 2);
+
+			if (seriesIndex > 0) {
+				var value = 0;
+				for (let i = 0; i <= seriesIndex; i++) {
+					value += stackSeries[i].data[index];
+				}
+				var value0 = value - item;
+				var height = validHeight * (value - minRange) / (maxRange - minRange);
+				var height0 = validHeight * (value0 - minRange) / (maxRange - minRange);
+			} else {
+				var value = item;
+				if (typeof item === 'object' && item !== null) {
+					value = item.value;
+				}
+				var height = validHeight * (value - minRange) / (maxRange - minRange);
+				var height0 = 0;
+			}
+			var heightc = height0;
+			height *= process;
+			heightc *= process;
+			point.y = opts.height - Math.round(height) - opts.area[2];
+			point.y0 = opts.height - Math.round(heightc) - opts.area[2];
+			points.push(point);
+		}
+	});
+	return points;
 }
 
-function getBarStackDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config, seriesIndex, stackSeries) {
-  var process = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : 1;
-  var points = [];
-  var validHeight = opts.width - opts.area[1] - opts.area[3];
-  data.forEach(function(item, index) {
-    if (item === null) {
-      points.push(null);
-    } else {
-      var point = {};
-      point.color = item.color;
-      point.y = yAxisPoints[index];
-      if (seriesIndex > 0) {
-        var value = 0;
-        for (let i = 0; i <= seriesIndex; i++) {
-          value += stackSeries[i].data[index];
-        }
-        var value0 = value - item;
-        var height = validHeight * (value - minRange) / (maxRange - minRange);
-        var height0 = validHeight * (value0 - minRange) / (maxRange - minRange);
-      } else {
-        var value = item;
-        if (typeof item === 'object' && item !== null) {
-          value = item.value;
-        }
-        var height = validHeight * (value - minRange) / (maxRange - minRange);
-        var height0 = 0;
-      }
-      var heightc = height0;
-      height *= process;
-      heightc *= process;
-      point.height = height - heightc;
-      point.x = opts.area[3] + height;
-      point.x0 = opts.area[3] + heightc;
-      points.push(point);
-    }
-  });
-  return points;
+function getBarStackDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config, seriesIndex,
+	stackSeries) {
+	var process = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : 1;
+	var points = [];
+	var validHeight = opts.width - opts.area[1] - opts.area[3];
+	data.forEach(function(item, index) {
+		if (item === null) {
+			points.push(null);
+		} else {
+			var point = {};
+			point.color = item.color;
+			point.y = yAxisPoints[index];
+			if (seriesIndex > 0) {
+				var value = 0;
+				for (let i = 0; i <= seriesIndex; i++) {
+					value += stackSeries[i].data[index];
+				}
+				var value0 = value - item;
+				var height = validHeight * (value - minRange) / (maxRange - minRange);
+				var height0 = validHeight * (value0 - minRange) / (maxRange - minRange);
+			} else {
+				var value = item;
+				if (typeof item === 'object' && item !== null) {
+					value = item.value;
+				}
+				var height = validHeight * (value - minRange) / (maxRange - minRange);
+				var height0 = 0;
+			}
+			var heightc = height0;
+			height *= process;
+			heightc *= process;
+			point.height = height - heightc;
+			point.x = opts.area[3] + height;
+			point.x0 = opts.area[3] + heightc;
+			points.push(point);
+		}
+	});
+	return points;
 }
 
 function getYAxisTextList(series, opts, config, stack, yData) {
-  var index = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : -1;
-  var data;
-  if (stack == 'stack') {
-    data = dataCombineStack(series, opts.categories.length);
-  } else {
-    data = dataCombine(series);
-  }
-  var sorted = [];
-  // remove null from data
-  data = data.filter(function(item) {
-    //return item !== null;
-    if (typeof item === 'object' && item !== null) {
-      if (item.constructor.toString().indexOf('Array') > -1) {
-        return item !== null;
-      } else {
-        return item.value !== null;
-      }
-    } else {
-      return item !== null;
-    }
-  });
-  data.map(function(item) {
-    if (typeof item === 'object') {
-      if (item.constructor.toString().indexOf('Array') > -1) {
-        if (opts.type == 'candle') {
-          item.map(function(subitem) {
-            sorted.push(subitem);
-          })
-        } else {
-          sorted.push(item[1]);
-        }
-      } else {
-        sorted.push(item.value);
-      }
-    } else {
-      sorted.push(item);
-    }
-  })
-  var minData = yData.min || 0;
-  var maxData = yData.max || 0;
-  if (sorted.length > 0) {
-    minData = Math.min.apply(this, sorted);
-    maxData = Math.max.apply(this, sorted);
-  }
-  if (minData === maxData) {
-    if(maxData == 0){
-      maxData = 10;
-    }else{
-      minData = 0;
-    }
-  }
-  var dataRange = getDataRange(minData, maxData);
-  var minRange = (yData.min === undefined || yData.min === null) ? dataRange.minRange : yData.min;
-  var maxRange = (yData.max === undefined || yData.max === null) ? dataRange.maxRange : yData.max;
-  var eachRange = (maxRange - minRange) / opts.yAxis.splitNumber;
-  var range = [];
-  for (var i = 0; i <= opts.yAxis.splitNumber; i++) {
-    range.push(minRange + eachRange * i);
-  }
-  return range.reverse();
+	var index = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : -1;
+	var data;
+	if (stack == 'stack') {
+		data = dataCombineStack(series, opts.categories.length);
+	} else {
+		data = dataCombine(series);
+	}
+	var sorted = [];
+	// remove null from data
+	data = data.filter(function(item) {
+		//return item !== null;
+		if (typeof item === 'object' && item !== null) {
+			if (item.constructor.toString().indexOf('Array') > -1) {
+				return item !== null;
+			} else {
+				return item.value !== null;
+			}
+		} else {
+			return item !== null;
+		}
+	});
+	data.map(function(item) {
+		if (typeof item === 'object') {
+			if (item.constructor.toString().indexOf('Array') > -1) {
+				if (opts.type == 'candle') {
+					item.map(function(subitem) {
+						sorted.push(subitem);
+					})
+				} else {
+					sorted.push(item[1]);
+				}
+			} else {
+				sorted.push(item.value);
+			}
+		} else {
+			sorted.push(item);
+		}
+	})
+	var minData = yData.min || 0;
+	var maxData = yData.max || 0;
+	if (sorted.length > 0) {
+		minData = Math.min.apply(this, sorted);
+		maxData = Math.max.apply(this, sorted);
+	}
+	if (minData === maxData) {
+		if (maxData == 0) {
+			maxData = 10;
+		} else {
+			minData = 0;
+		}
+	}
+	var dataRange = getDataRange(minData, maxData);
+	var minRange = (yData.min === undefined || yData.min === null) ? dataRange.minRange : yData.min;
+	var maxRange = (yData.max === undefined || yData.max === null) ? dataRange.maxRange : yData.max;
+	var eachRange = (maxRange - minRange) / opts.yAxis.splitNumber;
+	var range = [];
+	for (var i = 0; i <= opts.yAxis.splitNumber; i++) {
+		range.push(minRange + eachRange * i);
+	}
+	return range.reverse();
 }
 
 function calYAxisData(series, opts, config, context) {
-  //堆叠图重算Y轴
-  var columnstyle = assign({}, {
-    type: ""
-  }, opts.extra.column);
-  //如果是多Y轴，重新计算
-  var YLength = opts.yAxis.data.length;
-  var newSeries = new Array(YLength);
-  if (YLength > 0) {
-    for (let i = 0; i < YLength; i++) {
-      newSeries[i] = [];
-      for (let j = 0; j < series.length; j++) {
-        if (series[j].index == i) {
-          newSeries[i].push(series[j]);
-        }
-      }
-    }
-    var rangesArr = new Array(YLength);
-    var rangesFormatArr = new Array(YLength);
-    var yAxisWidthArr = new Array(YLength);
-
-    for (let i = 0; i < YLength; i++) {
-      let yData = opts.yAxis.data[i];
-      //如果总开关不显示，强制每个Y轴为不显示
-      if (opts.yAxis.disabled == true) {
-        yData.disabled = true;
-      }
-      if(yData.type === 'categories'){
-        if(!yData.formatter){
-          yData.formatter = (val,index,opts) => {return val + (yData.unit || '')};
-        }
-        yData.categories = yData.categories || opts.categories;
-        rangesArr[i] = yData.categories;
-      }else{
-        if(!yData.formatter){
-          yData.formatter = (val,index,opts) => {return util.toFixed(val, yData.tofix || 0) + (yData.unit || '')};
-        }
-        rangesArr[i] = getYAxisTextList(newSeries[i], opts, config, columnstyle.type, yData, i);
-      }
-      let yAxisFontSizes = yData.fontSize * opts.pix || config.fontSize;
-      yAxisWidthArr[i] = {
-        position: yData.position ? yData.position : 'left',
-        width: 0
-      };
-      rangesFormatArr[i] = rangesArr[i].map(function(items,index) {
-        items = yData.formatter(items,index,opts);
-        yAxisWidthArr[i].width = Math.max(yAxisWidthArr[i].width, measureText(items, yAxisFontSizes, context) + 5);
-        return items;
-      });
-      let calibration = yData.calibration ? 4 * opts.pix : 0;
-      yAxisWidthArr[i].width += calibration + 3 * opts.pix;
-      if (yData.disabled === true) {
-        yAxisWidthArr[i].width = 0;
-      }
-    }
-  } else {
-    var rangesArr = new Array(1);
-    var rangesFormatArr = new Array(1);
-    var yAxisWidthArr = new Array(1);
-    if(opts.type === 'bar'){
-      rangesArr[0] = opts.categories;
-      if(!opts.yAxis.formatter){
-        opts.yAxis.formatter = (val,index,opts) => {return val + (opts.yAxis.unit || '')}
-      }
-    }else{
-      if(!opts.yAxis.formatter){
-        opts.yAxis.formatter = (val,index,opts) => {return val.toFixed(opts.yAxis.tofix ) + (opts.yAxis.unit || '')}
-      }
-      rangesArr[0] = getYAxisTextList(series, opts, config, columnstyle.type, {});
-    }
-    yAxisWidthArr[0] = {
-      position: 'left',
-      width: 0
-    };
-    var yAxisFontSize = opts.yAxis.fontSize * opts.pix || config.fontSize;
-    rangesFormatArr[0] = rangesArr[0].map(function(item,index) {
-      item = opts.yAxis.formatter(item,index,opts);
-      yAxisWidthArr[0].width = Math.max(yAxisWidthArr[0].width, measureText(item, yAxisFontSize, context) + 5);
-      return item;
-    });
-    yAxisWidthArr[0].width += 3 * opts.pix;
-    if (opts.yAxis.disabled === true) {
-      yAxisWidthArr[0] = {
-        position: 'left',
-        width: 0
-      };
-      opts.yAxis.data[0] = {
-        disabled: true
-      };
-    } else {
-      opts.yAxis.data[0] = {
-        disabled: false,
-        position: 'left',
-        max: opts.yAxis.max,
-        min: opts.yAxis.min,
-        formatter: opts.yAxis.formatter
-      };
-      if(opts.type === 'bar'){
-        opts.yAxis.data[0].categories = opts.categories;
-        opts.yAxis.data[0].type = 'categories';
-      }
-    }
-  }
-  return {
-    rangesFormat: rangesFormatArr,
-    ranges: rangesArr,
-    yAxisWidth: yAxisWidthArr
-  };
+	//堆叠图重算Y轴
+	var columnstyle = assign({}, {
+		type: ""
+	}, opts.extra.column);
+	//如果是多Y轴，重新计算
+	var YLength = opts.yAxis.data.length;
+	var newSeries = new Array(YLength);
+	if (YLength > 0) {
+		for (let i = 0; i < YLength; i++) {
+			newSeries[i] = [];
+			for (let j = 0; j < series.length; j++) {
+				if (series[j].index == i) {
+					newSeries[i].push(series[j]);
+				}
+			}
+		}
+		var rangesArr = new Array(YLength);
+		var rangesFormatArr = new Array(YLength);
+		var yAxisWidthArr = new Array(YLength);
+
+		for (let i = 0; i < YLength; i++) {
+			let yData = opts.yAxis.data[i];
+			//如果总开关不显示，强制每个Y轴为不显示
+			if (opts.yAxis.disabled == true) {
+				yData.disabled = true;
+			}
+			if (yData.type === 'categories') {
+				if (!yData.formatter) {
+					yData.formatter = (val, index, opts) => {
+						return val + (yData.unit || '')
+					};
+				}
+				yData.categories = yData.categories || opts.categories;
+				rangesArr[i] = yData.categories;
+			} else {
+				if (!yData.formatter) {
+					yData.formatter = (val, index, opts) => {
+						return util.toFixed(val, yData.tofix || 0) + (yData.unit || '')
+					};
+				}
+				rangesArr[i] = getYAxisTextList(newSeries[i], opts, config, columnstyle.type, yData, i);
+			}
+			let yAxisFontSizes = yData.fontSize * opts.pix || config.fontSize;
+			yAxisWidthArr[i] = {
+				position: yData.position ? yData.position : 'left',
+				width: 0
+			};
+			rangesFormatArr[i] = rangesArr[i].map(function(items, index) {
+				items = yData.formatter(items, index, opts);
+				yAxisWidthArr[i].width = Math.max(yAxisWidthArr[i].width, measureText(items, yAxisFontSizes, context) + 5);
+				return items;
+			});
+			let calibration = yData.calibration ? 4 * opts.pix : 0;
+			yAxisWidthArr[i].width += calibration + 3 * opts.pix;
+			if (yData.disabled === true) {
+				yAxisWidthArr[i].width = 0;
+			}
+		}
+	} else {
+		var rangesArr = new Array(1);
+		var rangesFormatArr = new Array(1);
+		var yAxisWidthArr = new Array(1);
+		if (opts.type === 'bar') {
+			rangesArr[0] = opts.categories;
+			if (!opts.yAxis.formatter) {
+				opts.yAxis.formatter = (val, index, opts) => {
+					return val + (opts.yAxis.unit || '')
+				}
+			}
+		} else {
+			if (!opts.yAxis.formatter) {
+				opts.yAxis.formatter = (val, index, opts) => {
+					return val.toFixed(opts.yAxis.tofix) + (opts.yAxis.unit || '')
+				}
+			}
+			rangesArr[0] = getYAxisTextList(series, opts, config, columnstyle.type, {});
+		}
+		yAxisWidthArr[0] = {
+			position: 'left',
+			width: 0
+		};
+		var yAxisFontSize = opts.yAxis.fontSize * opts.pix || config.fontSize;
+		rangesFormatArr[0] = rangesArr[0].map(function(item, index) {
+			item = opts.yAxis.formatter(item, index, opts);
+			yAxisWidthArr[0].width = Math.max(yAxisWidthArr[0].width, measureText(item, yAxisFontSize, context) + 5);
+			return item;
+		});
+		yAxisWidthArr[0].width += 3 * opts.pix;
+		if (opts.yAxis.disabled === true) {
+			yAxisWidthArr[0] = {
+				position: 'left',
+				width: 0
+			};
+			opts.yAxis.data[0] = {
+				disabled: true
+			};
+		} else {
+			opts.yAxis.data[0] = {
+				disabled: false,
+				position: 'left',
+				max: opts.yAxis.max,
+				min: opts.yAxis.min,
+				formatter: opts.yAxis.formatter
+			};
+			if (opts.type === 'bar') {
+				opts.yAxis.data[0].categories = opts.categories;
+				opts.yAxis.data[0].type = 'categories';
+			}
+		}
+	}
+	return {
+		rangesFormat: rangesFormatArr,
+		ranges: rangesArr,
+		yAxisWidth: yAxisWidthArr
+	};
 }
 
 function calTooltipYAxisData(point, series, opts, config, eachSpacing) {
-  let ranges = [].concat(opts.chartData.yAxisData.ranges);
-  let spacingValid = opts.height - opts.area[0] - opts.area[2];
-  let minAxis = opts.area[0];
-  let items = [];
-  for (let i = 0; i < ranges.length; i++) {
-    let maxVal = Math.max.apply(this, ranges[i]);
-    let minVal = Math.min.apply(this, ranges[i]);
-    let item = maxVal - (maxVal - minVal) * (point - minAxis) / spacingValid;
-    item = opts.yAxis.data && opts.yAxis.data[i].formatter ? opts.yAxis.data[i].formatter(item, i, opts) : item.toFixed(0);
-    items.push(String(item))
-  }
-  return items;
+	let ranges = [].concat(opts.chartData.yAxisData.ranges);
+	let spacingValid = opts.height - opts.area[0] - opts.area[2];
+	let minAxis = opts.area[0];
+	let items = [];
+	for (let i = 0; i < ranges.length; i++) {
+		let maxVal = Math.max.apply(this, ranges[i]);
+		let minVal = Math.min.apply(this, ranges[i]);
+		let item = maxVal - (maxVal - minVal) * (point - minAxis) / spacingValid;
+		item = opts.yAxis.data && opts.yAxis.data[i].formatter ? opts.yAxis.data[i].formatter(item, i, opts) : item.toFixed(
+			0);
+		items.push(String(item))
+	}
+	return items;
 }
 
 function calMarkLineData(points, opts) {
-  let minRange, maxRange;
-  let spacingValid = opts.height - opts.area[0] - opts.area[2];
-  for (let i = 0; i < points.length; i++) {
-    points[i].yAxisIndex = points[i].yAxisIndex ? points[i].yAxisIndex : 0;
-    let range = [].concat(opts.chartData.yAxisData.ranges[points[i].yAxisIndex]);
-    minRange = range.pop();
-    maxRange = range.shift();
-    let height = spacingValid * (points[i].value - minRange) / (maxRange - minRange);
-    points[i].y = opts.height - Math.round(height) - opts.area[2];
-  }
-  return points;
+	let minRange, maxRange;
+	let spacingValid = opts.height - opts.area[0] - opts.area[2];
+	for (let i = 0; i < points.length; i++) {
+		points[i].yAxisIndex = points[i].yAxisIndex ? points[i].yAxisIndex : 0;
+		let range = [].concat(opts.chartData.yAxisData.ranges[points[i].yAxisIndex]);
+		minRange = range.pop();
+		maxRange = range.shift();
+		let height = spacingValid * (points[i].value - minRange) / (maxRange - minRange);
+		points[i].y = opts.height - Math.round(height) - opts.area[2];
+	}
+	return points;
 }
 
 function contextRotate(context, opts) {
-  if (opts.rotateLock !== true) {
-    context.translate(opts.height, 0);
-    context.rotate(90 * Math.PI / 180);
-  } else if (opts._rotate_ !== true) {
-    context.translate(opts.height, 0);
-    context.rotate(90 * Math.PI / 180);
-    opts._rotate_ = true;
-  }
+	if (opts.rotateLock !== true) {
+		context.translate(opts.height, 0);
+		context.rotate(90 * Math.PI / 180);
+	} else if (opts._rotate_ !== true) {
+		context.translate(opts.height, 0);
+		context.rotate(90 * Math.PI / 180);
+		opts._rotate_ = true;
+	}
 }
 
 function drawPointShape(points, color, shape, context, opts) {
-  context.beginPath();
-  if (opts.dataPointShapeType == 'hollow') {
-    context.setStrokeStyle(color);
-    context.setFillStyle(opts.background);
-    context.setLineWidth(2 * opts.pix);
-  } else {
-    context.setStrokeStyle("#ffffff");
-    context.setFillStyle(color);
-    context.setLineWidth(1 * opts.pix);
-  }
-  if (shape === 'diamond') {
-    points.forEach(function(item, index) {
-      if (item !== null) {
-        context.moveTo(item.x, item.y - 4.5);
-        context.lineTo(item.x - 4.5, item.y);
-        context.lineTo(item.x, item.y + 4.5);
-        context.lineTo(item.x + 4.5, item.y);
-        context.lineTo(item.x, item.y - 4.5);
-      }
-    });
-  } else if (shape === 'circle') {
-    points.forEach(function(item, index) {
-      if (item !== null) {
-        context.moveTo(item.x + 2.5 * opts.pix, item.y);
-        context.arc(item.x, item.y, 3 * opts.pix, 0, 2 * Math.PI, false);
-      }
-    });
-  } else if (shape === 'square') {
-    points.forEach(function(item, index) {
-      if (item !== null) {
-        context.moveTo(item.x - 3.5, item.y - 3.5);
-        context.rect(item.x - 3.5, item.y - 3.5, 7, 7);
-      }
-    });
-  } else if (shape === 'triangle') {
-    points.forEach(function(item, index) {
-      if (item !== null) {
-        context.moveTo(item.x, item.y - 4.5);
-        context.lineTo(item.x - 4.5, item.y + 4.5);
-        context.lineTo(item.x + 4.5, item.y + 4.5);
-        context.lineTo(item.x, item.y - 4.5);
-      }
-    });
-  } else if (shape === 'none') {
-    return;
-  }
-  context.closePath();
-  context.fill();
-  context.stroke();
+	context.beginPath();
+	if (opts.dataPointShapeType == 'hollow') {
+		context.setStrokeStyle(color);
+		context.setFillStyle(opts.background);
+		context.setLineWidth(2 * opts.pix);
+	} else {
+		context.setStrokeStyle("#ffffff");
+		context.setFillStyle(color);
+		context.setLineWidth(1 * opts.pix);
+	}
+	if (shape === 'diamond') {
+		points.forEach(function(item, index) {
+			if (item !== null) {
+				context.moveTo(item.x, item.y - 4.5);
+				context.lineTo(item.x - 4.5, item.y);
+				context.lineTo(item.x, item.y + 4.5);
+				context.lineTo(item.x + 4.5, item.y);
+				context.lineTo(item.x, item.y - 4.5);
+			}
+		});
+	} else if (shape === 'circle') {
+		points.forEach(function(item, index) {
+			if (item !== null) {
+				context.moveTo(item.x + 2.5 * opts.pix, item.y);
+				context.arc(item.x, item.y, 3 * opts.pix, 0, 2 * Math.PI, false);
+			}
+		});
+	} else if (shape === 'square') {
+		points.forEach(function(item, index) {
+			if (item !== null) {
+				context.moveTo(item.x - 3.5, item.y - 3.5);
+				context.rect(item.x - 3.5, item.y - 3.5, 7, 7);
+			}
+		});
+	} else if (shape === 'triangle') {
+		points.forEach(function(item, index) {
+			if (item !== null) {
+				context.moveTo(item.x, item.y - 4.5);
+				context.lineTo(item.x - 4.5, item.y + 4.5);
+				context.lineTo(item.x + 4.5, item.y + 4.5);
+				context.lineTo(item.x, item.y - 4.5);
+			}
+		});
+	} else if (shape === 'none') {
+		return;
+	}
+	context.closePath();
+	context.fill();
+	context.stroke();
 }
 
 function drawActivePoint(points, color, shape, context, opts, option, seriesIndex) {
-  if(!opts.tooltip){
-    return
-  }
-  if(opts.tooltip.group.length>0 && opts.tooltip.group.includes(seriesIndex) == false){
-    return
-  }
-  var pointIndex = typeof opts.tooltip.index === 'number' ? opts.tooltip.index : opts.tooltip.index[opts.tooltip.group.indexOf(seriesIndex)];
-  context.beginPath();
-  if (option.activeType == 'hollow') {
-    context.setStrokeStyle(color);
-    context.setFillStyle(opts.background);
-    context.setLineWidth(2 * opts.pix);
-  } else {
-    context.setStrokeStyle("#ffffff");
-    context.setFillStyle(color);
-    context.setLineWidth(1 * opts.pix);
-  }
-  if (shape === 'diamond') {
-    points.forEach(function(item, index) {
-      if (item !== null && pointIndex == index ) {
-        context.moveTo(item.x, item.y - 4.5);
-        context.lineTo(item.x - 4.5, item.y);
-        context.lineTo(item.x, item.y + 4.5);
-        context.lineTo(item.x + 4.5, item.y);
-        context.lineTo(item.x, item.y - 4.5);
-      }
-    });
-  } else if (shape === 'circle') {
-    points.forEach(function(item, index) {
-      if (item !== null && pointIndex == index) {
-        context.moveTo(item.x + 2.5 * opts.pix, item.y);
-        context.arc(item.x, item.y, 3 * opts.pix, 0, 2 * Math.PI, false);
-      }
-    });
-  } else if (shape === 'square') {
-    points.forEach(function(item, index) {
-      if (item !== null && pointIndex == index) {
-        context.moveTo(item.x - 3.5, item.y - 3.5);
-        context.rect(item.x - 3.5, item.y - 3.5, 7, 7);
-      }
-    });
-  } else if (shape === 'triangle') {
-    points.forEach(function(item, index) {
-      if (item !== null && pointIndex == index) {
-        context.moveTo(item.x, item.y - 4.5);
-        context.lineTo(item.x - 4.5, item.y + 4.5);
-        context.lineTo(item.x + 4.5, item.y + 4.5);
-        context.lineTo(item.x, item.y - 4.5);
-      }
-    });
-  } else if (shape === 'none') {
-    return;
-  }
-  context.closePath();
-  context.fill();
-  context.stroke();
+	if (!opts.tooltip) {
+		return
+	}
+	if (opts.tooltip.group.length > 0 && opts.tooltip.group.includes(seriesIndex) == false) {
+		return
+	}
+	var pointIndex = typeof opts.tooltip.index === 'number' ? opts.tooltip.index : opts.tooltip.index[opts.tooltip.group
+		.indexOf(seriesIndex)];
+	context.beginPath();
+	if (option.activeType == 'hollow') {
+		context.setStrokeStyle(color);
+		context.setFillStyle(opts.background);
+		context.setLineWidth(2 * opts.pix);
+	} else {
+		context.setStrokeStyle("#ffffff");
+		context.setFillStyle(color);
+		context.setLineWidth(1 * opts.pix);
+	}
+	if (shape === 'diamond') {
+		points.forEach(function(item, index) {
+			if (item !== null && pointIndex == index) {
+				context.moveTo(item.x, item.y - 4.5);
+				context.lineTo(item.x - 4.5, item.y);
+				context.lineTo(item.x, item.y + 4.5);
+				context.lineTo(item.x + 4.5, item.y);
+				context.lineTo(item.x, item.y - 4.5);
+			}
+		});
+	} else if (shape === 'circle') {
+		points.forEach(function(item, index) {
+			if (item !== null && pointIndex == index) {
+				context.moveTo(item.x + 2.5 * opts.pix, item.y);
+				context.arc(item.x, item.y, 3 * opts.pix, 0, 2 * Math.PI, false);
+			}
+		});
+	} else if (shape === 'square') {
+		points.forEach(function(item, index) {
+			if (item !== null && pointIndex == index) {
+				context.moveTo(item.x - 3.5, item.y - 3.5);
+				context.rect(item.x - 3.5, item.y - 3.5, 7, 7);
+			}
+		});
+	} else if (shape === 'triangle') {
+		points.forEach(function(item, index) {
+			if (item !== null && pointIndex == index) {
+				context.moveTo(item.x, item.y - 4.5);
+				context.lineTo(item.x - 4.5, item.y + 4.5);
+				context.lineTo(item.x + 4.5, item.y + 4.5);
+				context.lineTo(item.x, item.y - 4.5);
+			}
+		});
+	} else if (shape === 'none') {
+		return;
+	}
+	context.closePath();
+	context.fill();
+	context.stroke();
 }
 
 function drawRingTitle(opts, config, context, center) {
-  var titlefontSize = opts.title.fontSize || config.titleFontSize;
-  var subtitlefontSize = opts.subtitle.fontSize || config.subtitleFontSize;
-  var title = opts.title.name || '';
-  var subtitle = opts.subtitle.name || '';
-  var titleFontColor = opts.title.color || opts.fontColor;
-  var subtitleFontColor = opts.subtitle.color || opts.fontColor;
-  var titleHeight = title ? titlefontSize : 0;
-  var subtitleHeight = subtitle ? subtitlefontSize : 0;
-  var margin = 5;
-  if (subtitle) {
-    var textWidth = measureText(subtitle, subtitlefontSize * opts.pix, context);
-    var startX = center.x - textWidth / 2 + (opts.subtitle.offsetX|| 0) * opts.pix ;
-    var startY = center.y + subtitlefontSize * opts.pix / 2 + (opts.subtitle.offsetY || 0) * opts.pix;
-    if (title) {
-      startY += (titleHeight * opts.pix + margin) / 2;
-    }
-    context.beginPath();
-    context.setFontSize(subtitlefontSize * opts.pix);
-    context.setFillStyle(subtitleFontColor);
-    context.fillText(subtitle, startX, startY);
-    context.closePath();
-    context.stroke();
-  }
-  if (title) {
-    var _textWidth = measureText(title, titlefontSize * opts.pix, context);
-    var _startX = center.x - _textWidth / 2 + (opts.title.offsetX || 0);
-    var _startY = center.y + titlefontSize * opts.pix / 2 + (opts.title.offsetY || 0) * opts.pix;
-    if (subtitle) {
-      _startY -= (subtitleHeight * opts.pix + margin) / 2;
-    }
-    context.beginPath();
-    context.setFontSize(titlefontSize * opts.pix);
-    context.setFillStyle(titleFontColor);
-    context.fillText(title, _startX, _startY);
-    context.closePath();
-    context.stroke();
-  }
+	var titlefontSize = opts.title.fontSize || config.titleFontSize;
+	var subtitlefontSize = opts.subtitle.fontSize || config.subtitleFontSize;
+	var title = opts.title.name || '';
+	var subtitle = opts.subtitle.name || '';
+	var titleFontColor = opts.title.color || opts.fontColor;
+	var subtitleFontColor = opts.subtitle.color || opts.fontColor;
+	var titleHeight = title ? titlefontSize : 0;
+	var subtitleHeight = subtitle ? subtitlefontSize : 0;
+	var margin = 5;
+	if (subtitle) {
+		var textWidth = measureText(subtitle, subtitlefontSize * opts.pix, context);
+		var startX = center.x - textWidth / 2 + (opts.subtitle.offsetX || 0) * opts.pix;
+		var startY = center.y + subtitlefontSize * opts.pix / 2 + (opts.subtitle.offsetY || 0) * opts.pix;
+		if (title) {
+			startY += (titleHeight * opts.pix + margin) / 2;
+		}
+		context.beginPath();
+		context.setFontSize(subtitlefontSize * opts.pix);
+		context.setFillStyle(subtitleFontColor);
+		context.fillText(subtitle, startX, startY);
+		context.closePath();
+		context.stroke();
+	}
+	if (title) {
+		var _textWidth = measureText(title, titlefontSize * opts.pix, context);
+		var _startX = center.x - _textWidth / 2 + (opts.title.offsetX || 0);
+		var _startY = center.y + titlefontSize * opts.pix / 2 + (opts.title.offsetY || 0) * opts.pix;
+		if (subtitle) {
+			_startY -= (subtitleHeight * opts.pix + margin) / 2;
+		}
+		context.beginPath();
+		context.setFontSize(titlefontSize * opts.pix);
+		context.setFillStyle(titleFontColor);
+		context.fillText(title, _startX, _startY);
+		context.closePath();
+		context.stroke();
+	}
 }
 
 function drawPointText(points, series, config, context, opts) {
-  // 绘制数据文案
-  var data = series.data;
-  var textOffset = series.textOffset ? series.textOffset : 0;
-  points.forEach(function(item, index) {
-    if (item !== null) {
-      context.beginPath();
-      var fontSize = series.textSize ? series.textSize * opts.pix : config.fontSize;
-      context.setFontSize(fontSize);
-      context.setFillStyle(series.textColor || opts.fontColor);
-      var value = data[index]
-      if (typeof data[index] === 'object' && data[index] !== null) {
-        if (data[index].constructor.toString().indexOf('Array')>-1) {
-          value = data[index][1];
-        } else {
-          value = data[index].value
-        }
-      }
-      var formatVal = series.formatter ? series.formatter(value,index,series,opts) : value;
-      context.setTextAlign('center');
-      context.fillText(String(formatVal), item.x, item.y - 4 + textOffset * opts.pix);
-      context.closePath();
-      context.stroke();
-      context.setTextAlign('left');
-    }
-  });
+	// 绘制数据文案
+	var data = series.data;
+	var textOffset = series.textOffset ? series.textOffset : 0;
+	points.forEach(function(item, index) {
+		if (item !== null) {
+			context.beginPath();
+			var fontSize = series.textSize ? series.textSize * opts.pix : config.fontSize;
+			context.setFontSize(fontSize);
+			context.setFillStyle(series.textColor || opts.fontColor);
+			var value = data[index]
+			if (typeof data[index] === 'object' && data[index] !== null) {
+				if (data[index].constructor.toString().indexOf('Array') > -1) {
+					value = data[index][1];
+				} else {
+					value = data[index].value
+				}
+			}
+			var formatVal = series.formatter ? series.formatter(value, index, series, opts) : value;
+			context.setTextAlign('center');
+			context.fillText(String(formatVal), item.x, item.y - 4 + textOffset * opts.pix);
+			context.closePath();
+			context.stroke();
+			context.setTextAlign('left');
+		}
+	});
 }
 
 function drawColumePointText(points, series, config, context, opts) {
-  // 绘制数据文案
-  var data = series.data;
-  var textOffset = series.textOffset ? series.textOffset : 0;
-  var Position = opts.extra.column.labelPosition;
-  points.forEach(function(item, index) {
-    if (item !== null) {
-      context.beginPath();
-      var fontSize = series.textSize ? series.textSize * opts.pix : config.fontSize;
-      context.setFontSize(fontSize);
-      context.setFillStyle(series.textColor || opts.fontColor);
-      var value = data[index]
-      if (typeof data[index] === 'object' && data[index] !== null) {
-        if (data[index].constructor.toString().indexOf('Array')>-1) {
-          value = data[index][1];
-        } else {
-          value = data[index].value
-        }
-      }
-      var formatVal = series.formatter ? series.formatter(value,index,series,opts) : value;
-      context.setTextAlign('center');
-      var startY = item.y - 4 * opts.pix + textOffset * opts.pix;
-      if(item.y > series.zeroPoints){
-        startY = item.y + textOffset * opts.pix + fontSize;
-      }
-      if(Position == 'insideTop'){
-        startY = item.y + fontSize + textOffset * opts.pix;
-        if(item.y > series.zeroPoints){
-          startY = item.y - textOffset * opts.pix - 4 * opts.pix;
-        }
-      }
-      if(Position == 'center'){
-        startY = item.y + textOffset * opts.pix + (opts.height - opts.area[2] - item.y + fontSize)/2;
-        if(series.zeroPoints < opts.height - opts.area[2]){
-          startY = item.y + textOffset * opts.pix + (series.zeroPoints - item.y + fontSize)/2;
-        }
-        if(item.y > series.zeroPoints){
-          startY = item.y - textOffset * opts.pix - (item.y - series.zeroPoints - fontSize)/2;
-        }
-        if(opts.extra.column.type == 'stack'){
-          startY = item.y + textOffset * opts.pix + (item.y0 - item.y + fontSize)/2;
-        }
-      }
-      if(Position == 'bottom'){
-        startY = opts.height - opts.area[2] + textOffset * opts.pix - 4 * opts.pix;
-        if(series.zeroPoints < opts.height - opts.area[2]){
-          startY = series.zeroPoints + textOffset * opts.pix - 4 * opts.pix;
-        }
-        if(item.y > series.zeroPoints){
-          startY = series.zeroPoints - textOffset * opts.pix + fontSize + 2 * opts.pix;
-        }
-        if(opts.extra.column.type == 'stack'){
-          startY = item.y0 + textOffset * opts.pix - 4 * opts.pix;
-        }
-      }
-      context.fillText(String(formatVal), item.x, startY);
-      context.closePath();
-      context.stroke();
-      context.setTextAlign('left');
-    }
-  });
+	// 绘制数据文案
+	var data = series.data;
+	var textOffset = series.textOffset ? series.textOffset : 0;
+	var Position = opts.extra.column.labelPosition;
+	points.forEach(function(item, index) {
+		if (item !== null) {
+			context.beginPath();
+			var fontSize = series.textSize ? series.textSize * opts.pix : config.fontSize;
+			context.setFontSize(fontSize);
+			context.setFillStyle(series.textColor || opts.fontColor);
+			var value = data[index]
+			if (typeof data[index] === 'object' && data[index] !== null) {
+				if (data[index].constructor.toString().indexOf('Array') > -1) {
+					value = data[index][1];
+				} else {
+					value = data[index].value
+				}
+			}
+			var formatVal = series.formatter ? series.formatter(value, index, series, opts) : value;
+			context.setTextAlign('center');
+			var startY = item.y - 4 * opts.pix + textOffset * opts.pix;
+			if (item.y > series.zeroPoints) {
+				startY = item.y + textOffset * opts.pix + fontSize;
+			}
+			if (Position == 'insideTop') {
+				startY = item.y + fontSize + textOffset * opts.pix;
+				if (item.y > series.zeroPoints) {
+					startY = item.y - textOffset * opts.pix - 4 * opts.pix;
+				}
+			}
+			if (Position == 'center') {
+				startY = item.y + textOffset * opts.pix + (opts.height - opts.area[2] - item.y + fontSize) / 2;
+				if (series.zeroPoints < opts.height - opts.area[2]) {
+					startY = item.y + textOffset * opts.pix + (series.zeroPoints - item.y + fontSize) / 2;
+				}
+				if (item.y > series.zeroPoints) {
+					startY = item.y - textOffset * opts.pix - (item.y - series.zeroPoints - fontSize) / 2;
+				}
+				if (opts.extra.column.type == 'stack') {
+					startY = item.y + textOffset * opts.pix + (item.y0 - item.y + fontSize) / 2;
+				}
+			}
+			if (Position == 'bottom') {
+				startY = opts.height - opts.area[2] + textOffset * opts.pix - 4 * opts.pix;
+				if (series.zeroPoints < opts.height - opts.area[2]) {
+					startY = series.zeroPoints + textOffset * opts.pix - 4 * opts.pix;
+				}
+				if (item.y > series.zeroPoints) {
+					startY = series.zeroPoints - textOffset * opts.pix + fontSize + 2 * opts.pix;
+				}
+				if (opts.extra.column.type == 'stack') {
+					startY = item.y0 + textOffset * opts.pix - 4 * opts.pix;
+				}
+			}
+			context.fillText(String(formatVal), item.x, startY);
+			context.closePath();
+			context.stroke();
+			context.setTextAlign('left');
+		}
+	});
 }
 
 function drawMountPointText(points, series, config, context, opts, zeroPoints) {
-  // 绘制数据文案
-  var data = series.data;
-  var textOffset = series.textOffset ? series.textOffset : 0;
-  var Position = opts.extra.mount.labelPosition;
-  points.forEach(function(item, index) {
-    if (item !== null) {
-      context.beginPath();
-      var fontSize = series[index].textSize ? series[index].textSize * opts.pix : config.fontSize;
-      context.setFontSize(fontSize);
-      context.setFillStyle(series[index].textColor || opts.fontColor);
-      var value = item.value
-      var formatVal = series[index].formatter ? series[index].formatter(value,index,series,opts) : value;
-      context.setTextAlign('center');
-      var startY = item.y - 4 * opts.pix + textOffset * opts.pix;
-      if(item.y > zeroPoints){
-        startY = item.y + textOffset * opts.pix + fontSize;
-      }
-      context.fillText(String(formatVal), item.x, startY);
-      context.closePath();
-      context.stroke();
-      context.setTextAlign('left');
-    }
-  });
+	// 绘制数据文案
+	var data = series.data;
+	var textOffset = series.textOffset ? series.textOffset : 0;
+	var Position = opts.extra.mount.labelPosition;
+	points.forEach(function(item, index) {
+		if (item !== null) {
+			context.beginPath();
+			var fontSize = series[index].textSize ? series[index].textSize * opts.pix : config.fontSize;
+			context.setFontSize(fontSize);
+			context.setFillStyle(series[index].textColor || opts.fontColor);
+			var value = item.value
+			var formatVal = series[index].formatter ? series[index].formatter(value, index, series, opts) : value;
+			context.setTextAlign('center');
+			var startY = item.y - 4 * opts.pix + textOffset * opts.pix;
+			if (item.y > zeroPoints) {
+				startY = item.y + textOffset * opts.pix + fontSize;
+			}
+			context.fillText(String(formatVal), item.x, startY);
+			context.closePath();
+			context.stroke();
+			context.setTextAlign('left');
+		}
+	});
 }
 
 function drawBarPointText(points, series, config, context, opts) {
-  // 绘制数据文案
-  var data = series.data;
-  var textOffset = series.textOffset ? series.textOffset : 0;
-  points.forEach(function(item, index) {
-    if (item !== null) {
-      context.beginPath();
-      var fontSize = series.textSize ? series.textSize * opts.pix : config.fontSize;
-      context.setFontSize(fontSize);
-      context.setFillStyle(series.textColor || opts.fontColor);
-      var value = data[index]
-      if (typeof data[index] === 'object' && data[index] !== null) {
-        value = data[index].value ;
-      }
-      var formatVal = series.formatter ? series.formatter(value,index,series,opts) : value;
-      context.setTextAlign('left');
-      context.fillText(String(formatVal), item.x + 4 * opts.pix , item.y + fontSize / 2 - 3 );
-      context.closePath();
-      context.stroke();
-    }
-  });
+	// 绘制数据文案
+	var data = series.data;
+	var textOffset = series.textOffset ? series.textOffset : 0;
+	points.forEach(function(item, index) {
+		if (item !== null) {
+			context.beginPath();
+			var fontSize = series.textSize ? series.textSize * opts.pix : config.fontSize;
+			context.setFontSize(fontSize);
+			context.setFillStyle(series.textColor || opts.fontColor);
+			var value = data[index]
+			if (typeof data[index] === 'object' && data[index] !== null) {
+				value = data[index].value;
+			}
+			var formatVal = series.formatter ? series.formatter(value, index, series, opts) : value;
+			context.setTextAlign('left');
+			context.fillText(String(formatVal), item.x + 4 * opts.pix, item.y + fontSize / 2 - 3);
+			context.closePath();
+			context.stroke();
+		}
+	});
 }
 
 function drawGaugeLabel(gaugeOption, radius, centerPosition, opts, config, context) {
-  radius -= gaugeOption.width / 2 + gaugeOption.labelOffset * opts.pix;
-  radius = radius < 10 ? 10 : radius;
-  let totalAngle;
-  if (gaugeOption.endAngle < gaugeOption.startAngle) {
-    totalAngle = 2 + gaugeOption.endAngle - gaugeOption.startAngle;
-  } else {
-    totalAngle = gaugeOption.startAngle - gaugeOption.endAngle;
-  }
-  let splitAngle = totalAngle / gaugeOption.splitLine.splitNumber;
-  let totalNumber = gaugeOption.endNumber - gaugeOption.startNumber;
-  let splitNumber = totalNumber / gaugeOption.splitLine.splitNumber;
-  let nowAngle = gaugeOption.startAngle;
-  let nowNumber = gaugeOption.startNumber;
-  for (let i = 0; i < gaugeOption.splitLine.splitNumber + 1; i++) {
-    var pos = {
-      x: radius * Math.cos(nowAngle * Math.PI),
-      y: radius * Math.sin(nowAngle * Math.PI)
-    };
-    var labelText = gaugeOption.formatter ? gaugeOption.formatter(nowNumber,i,opts) : nowNumber;
-    pos.x += centerPosition.x - measureText(labelText, config.fontSize, context) / 2;
-    pos.y += centerPosition.y;
-    var startX = pos.x;
-    var startY = pos.y;
-    context.beginPath();
-    context.setFontSize(config.fontSize);
-    context.setFillStyle(gaugeOption.labelColor || opts.fontColor);
-    context.fillText(labelText, startX, startY + config.fontSize / 2);
-    context.closePath();
-    context.stroke();
-    nowAngle += splitAngle;
-    if (nowAngle >= 2) {
-      nowAngle = nowAngle % 2;
-    }
-    nowNumber += splitNumber;
-  }
+	radius -= gaugeOption.width / 2 + gaugeOption.labelOffset * opts.pix;
+	radius = radius < 10 ? 10 : radius;
+	let totalAngle;
+	if (gaugeOption.endAngle < gaugeOption.startAngle) {
+		totalAngle = 2 + gaugeOption.endAngle - gaugeOption.startAngle;
+	} else {
+		totalAngle = gaugeOption.startAngle - gaugeOption.endAngle;
+	}
+	let splitAngle = totalAngle / gaugeOption.splitLine.splitNumber;
+	let totalNumber = gaugeOption.endNumber - gaugeOption.startNumber;
+	let splitNumber = totalNumber / gaugeOption.splitLine.splitNumber;
+	let nowAngle = gaugeOption.startAngle;
+	let nowNumber = gaugeOption.startNumber;
+	for (let i = 0; i < gaugeOption.splitLine.splitNumber + 1; i++) {
+		var pos = {
+			x: radius * Math.cos(nowAngle * Math.PI),
+			y: radius * Math.sin(nowAngle * Math.PI)
+		};
+		var labelText = gaugeOption.formatter ? gaugeOption.formatter(nowNumber, i, opts) : nowNumber;
+		pos.x += centerPosition.x - measureText(labelText, config.fontSize, context) / 2;
+		pos.y += centerPosition.y;
+		var startX = pos.x;
+		var startY = pos.y;
+		context.beginPath();
+		context.setFontSize(config.fontSize);
+		context.setFillStyle(gaugeOption.labelColor || opts.fontColor);
+		context.fillText(labelText, startX, startY + config.fontSize / 2);
+		context.closePath();
+		context.stroke();
+		nowAngle += splitAngle;
+		if (nowAngle >= 2) {
+			nowAngle = nowAngle % 2;
+		}
+		nowNumber += splitNumber;
+	}
 }
 
 function drawRadarLabel(angleList, radius, centerPosition, opts, config, context) {
-  var radarOption = opts.extra.radar || {};
-  angleList.forEach(function(angle, index) {
-    if(radarOption.labelPointShow === true && opts.categories[index] !== ''){
-      var posPoint = {
-        x: radius * Math.cos(angle),
-        y: radius * Math.sin(angle)
-      };
-      var posPointAxis = convertCoordinateOrigin(posPoint.x, posPoint.y, centerPosition);
-      context.setFillStyle(radarOption.labelPointColor);
-      context.beginPath();
-      context.arc(posPointAxis.x, posPointAxis.y, radarOption.labelPointRadius * opts.pix, 0, 2 * Math.PI, false);
-      context.closePath();
-      context.fill();
-    }
-    if(radarOption.labelShow === true){
-      var pos = {
-        x: (radius + config.radarLabelTextMargin * opts.pix) * Math.cos(angle),
-        y: (radius + config.radarLabelTextMargin * opts.pix) * Math.sin(angle)
-      };
-      var posRelativeCanvas = convertCoordinateOrigin(pos.x, pos.y, centerPosition);
-      var startX = posRelativeCanvas.x;
-      var startY = posRelativeCanvas.y;
-      if (util.approximatelyEqual(pos.x, 0)) {
-        startX -= measureText(opts.categories[index] || '', config.fontSize, context) / 2;
-      } else if (pos.x < 0) {
-        startX -= measureText(opts.categories[index] || '', config.fontSize, context);
-      }
-      context.beginPath();
-      context.setFontSize(config.fontSize);
-      context.setFillStyle(radarOption.labelColor || opts.fontColor);
-      context.fillText(opts.categories[index] || '', startX, startY + config.fontSize / 2);
-      context.closePath();
-      context.stroke();
-    }
-  });
+	var radarOption = opts.extra.radar || {};
+	angleList.forEach(function(angle, index) {
+		if (radarOption.labelPointShow === true && opts.categories[index] !== '') {
+			var posPoint = {
+				x: radius * Math.cos(angle),
+				y: radius * Math.sin(angle)
+			};
+			var posPointAxis = convertCoordinateOrigin(posPoint.x, posPoint.y, centerPosition);
+			context.setFillStyle(radarOption.labelPointColor);
+			context.beginPath();
+			context.arc(posPointAxis.x, posPointAxis.y, radarOption.labelPointRadius * opts.pix, 0, 2 * Math.PI, false);
+			context.closePath();
+			context.fill();
+		}
+		if (radarOption.labelShow === true) {
+			var pos = {
+				x: (radius + config.radarLabelTextMargin * opts.pix) * Math.cos(angle),
+				y: (radius + config.radarLabelTextMargin * opts.pix) * Math.sin(angle)
+			};
+			var posRelativeCanvas = convertCoordinateOrigin(pos.x, pos.y, centerPosition);
+			var startX = posRelativeCanvas.x;
+			var startY = posRelativeCanvas.y;
+			if (util.approximatelyEqual(pos.x, 0)) {
+				startX -= measureText(opts.categories[index] || '', config.fontSize, context) / 2;
+			} else if (pos.x < 0) {
+				startX -= measureText(opts.categories[index] || '', config.fontSize, context);
+			}
+			context.beginPath();
+			context.setFontSize(config.fontSize);
+			context.setFillStyle(radarOption.labelColor || opts.fontColor);
+			context.fillText(opts.categories[index] || '', startX, startY + config.fontSize / 2);
+			context.closePath();
+			context.stroke();
+		}
+	});
 
 }
 
 function drawPieText(series, opts, config, context, radius, center) {
-  var lineRadius = config.pieChartLinePadding;
-  var textObjectCollection = [];
-  var lastTextObject = null;
-  var seriesConvert = series.map(function(item,index) {
-    var text = item.formatter ? item.formatter(item,index,series,opts) : util.toFixed(item._proportion_.toFixed(4) * 100) + '%';
-    text = item.labelText ? item.labelText : text;
-    var arc = 2 * Math.PI - (item._start_ + 2 * Math.PI * item._proportion_ / 2);
-    if (item._rose_proportion_) {
-      arc = 2 * Math.PI - (item._start_ + 2 * Math.PI * item._rose_proportion_ / 2);
-    }
-    var color = item.color;
-    var radius = item._radius_;
-    return {
-      arc: arc,
-      text: text,
-      color: color,
-      radius: radius,
-      textColor: item.textColor,
-      textSize: item.textSize,
-      labelShow: item.labelShow
-    };
-  });
-  for (let i = 0; i < seriesConvert.length; i++) {
-    let item = seriesConvert[i];
-    // line end
-    let orginX1 = Math.cos(item.arc) * (item.radius + lineRadius);
-    let orginY1 = Math.sin(item.arc) * (item.radius + lineRadius);
-    // line start
-    let orginX2 = Math.cos(item.arc) * item.radius;
-    let orginY2 = Math.sin(item.arc) * item.radius;
-    // text start
-    let orginX3 = orginX1 >= 0 ? orginX1 + config.pieChartTextPadding : orginX1 - config.pieChartTextPadding;
-    let orginY3 = orginY1;
-    let textWidth = measureText(item.text, item.textSize * opts.pix || config.fontSize, context);
-    let startY = orginY3;
-    if (lastTextObject && util.isSameXCoordinateArea(lastTextObject.start, {
-        x: orginX3
-      })) {
-      if (orginX3 > 0) {
-        startY = Math.min(orginY3, lastTextObject.start.y);
-      } else if (orginX1 < 0) {
-        startY = Math.max(orginY3, lastTextObject.start.y);
-      } else {
-        if (orginY3 > 0) {
-          startY = Math.max(orginY3, lastTextObject.start.y);
-        } else {
-          startY = Math.min(orginY3, lastTextObject.start.y);
-        }
-      }
-    }
-    if (orginX3 < 0) {
-      orginX3 -= textWidth;
-    }
-    let textObject = {
-      lineStart: {
-        x: orginX2,
-        y: orginY2
-      },
-      lineEnd: {
-        x: orginX1,
-        y: orginY1
-      },
-      start: {
-        x: orginX3,
-        y: startY
-      },
-      width: textWidth,
-      height: config.fontSize,
-      text: item.text,
-      color: item.color,
-      textColor: item.textColor,
-      textSize: item.textSize
-    };
-    lastTextObject = avoidCollision(textObject, lastTextObject);
-    textObjectCollection.push(lastTextObject);
-  }
-  for (let i = 0; i < textObjectCollection.length; i++) {
-    if(seriesConvert[i].labelShow === false){
-      continue;
-    }
-    let item = textObjectCollection[i];
-    let lineStartPoistion = convertCoordinateOrigin(item.lineStart.x, item.lineStart.y, center);
-    let lineEndPoistion = convertCoordinateOrigin(item.lineEnd.x, item.lineEnd.y, center);
-    let textPosition = convertCoordinateOrigin(item.start.x, item.start.y, center);
-    context.setLineWidth(1 * opts.pix);
-    context.setFontSize(item.textSize * opts.pix || config.fontSize);
-    context.beginPath();
-    context.setStrokeStyle(item.color);
-    context.setFillStyle(item.color);
-    context.moveTo(lineStartPoistion.x, lineStartPoistion.y);
-    let curveStartX = item.start.x < 0 ? textPosition.x + item.width : textPosition.x;
-    let textStartX = item.start.x < 0 ? textPosition.x - 5 : textPosition.x + 5;
-    context.quadraticCurveTo(lineEndPoistion.x, lineEndPoistion.y, curveStartX, textPosition.y);
-    context.moveTo(lineStartPoistion.x, lineStartPoistion.y);
-    context.stroke();
-    context.closePath();
-    context.beginPath();
-    context.moveTo(textPosition.x + item.width, textPosition.y);
-    context.arc(curveStartX, textPosition.y, 2 * opts.pix, 0, 2 * Math.PI);
-    context.closePath();
-    context.fill();
-    context.beginPath();
-    context.setFontSize(item.textSize * opts.pix || config.fontSize);
-    context.setFillStyle(item.textColor || opts.fontColor);
-    context.fillText(item.text, textStartX, textPosition.y + 3);
-    context.closePath();
-    context.stroke();
-    context.closePath();
-  }
+	var lineRadius = config.pieChartLinePadding;
+	var textObjectCollection = [];
+	var lastTextObject = null;
+	var seriesConvert = series.map(function(item, index) {
+		var text = item.formatter ? item.formatter(item, index, series, opts) : util.toFixed(item._proportion_.toFixed(
+			4) * 100) + '%';
+		text = item.labelText ? item.labelText : text;
+		var arc = 2 * Math.PI - (item._start_ + 2 * Math.PI * item._proportion_ / 2);
+		if (item._rose_proportion_) {
+			arc = 2 * Math.PI - (item._start_ + 2 * Math.PI * item._rose_proportion_ / 2);
+		}
+		var color = item.color;
+		var radius = item._radius_;
+		return {
+			arc: arc,
+			text: text,
+			color: color,
+			radius: radius,
+			textColor: item.textColor,
+			textSize: item.textSize,
+			labelShow: item.labelShow
+		};
+	});
+	for (let i = 0; i < seriesConvert.length; i++) {
+		let item = seriesConvert[i];
+		// line end
+		let orginX1 = Math.cos(item.arc) * (item.radius + lineRadius);
+		let orginY1 = Math.sin(item.arc) * (item.radius + lineRadius);
+		// line start
+		let orginX2 = Math.cos(item.arc) * item.radius;
+		let orginY2 = Math.sin(item.arc) * item.radius;
+		// text start
+		let orginX3 = orginX1 >= 0 ? orginX1 + config.pieChartTextPadding : orginX1 - config.pieChartTextPadding;
+		let orginY3 = orginY1;
+		let textWidth = measureText(item.text, item.textSize * opts.pix || config.fontSize, context);
+		let startY = orginY3;
+		if (lastTextObject && util.isSameXCoordinateArea(lastTextObject.start, {
+				x: orginX3
+			})) {
+			if (orginX3 > 0) {
+				startY = Math.min(orginY3, lastTextObject.start.y);
+			} else if (orginX1 < 0) {
+				startY = Math.max(orginY3, lastTextObject.start.y);
+			} else {
+				if (orginY3 > 0) {
+					startY = Math.max(orginY3, lastTextObject.start.y);
+				} else {
+					startY = Math.min(orginY3, lastTextObject.start.y);
+				}
+			}
+		}
+		if (orginX3 < 0) {
+			orginX3 -= textWidth;
+		}
+		let textObject = {
+			lineStart: {
+				x: orginX2,
+				y: orginY2
+			},
+			lineEnd: {
+				x: orginX1,
+				y: orginY1
+			},
+			start: {
+				x: orginX3,
+				y: startY
+			},
+			width: textWidth,
+			height: config.fontSize,
+			text: item.text,
+			color: item.color,
+			textColor: item.textColor,
+			textSize: item.textSize
+		};
+		lastTextObject = avoidCollision(textObject, lastTextObject);
+		textObjectCollection.push(lastTextObject);
+	}
+	for (let i = 0; i < textObjectCollection.length; i++) {
+		if (seriesConvert[i].labelShow === false) {
+			continue;
+		}
+		let item = textObjectCollection[i];
+		let lineStartPoistion = convertCoordinateOrigin(item.lineStart.x, item.lineStart.y, center);
+		let lineEndPoistion = convertCoordinateOrigin(item.lineEnd.x, item.lineEnd.y, center);
+		let textPosition = convertCoordinateOrigin(item.start.x, item.start.y, center);
+		context.setLineWidth(1 * opts.pix);
+		context.setFontSize(item.textSize * opts.pix || config.fontSize);
+		context.beginPath();
+		context.setStrokeStyle(item.color);
+		context.setFillStyle(item.color);
+		context.moveTo(lineStartPoistion.x, lineStartPoistion.y);
+		let curveStartX = item.start.x < 0 ? textPosition.x + item.width : textPosition.x;
+		let textStartX = item.start.x < 0 ? textPosition.x - 5 : textPosition.x + 5;
+		context.quadraticCurveTo(lineEndPoistion.x, lineEndPoistion.y, curveStartX, textPosition.y);
+		context.moveTo(lineStartPoistion.x, lineStartPoistion.y);
+		context.stroke();
+		context.closePath();
+		context.beginPath();
+		context.moveTo(textPosition.x + item.width, textPosition.y);
+		context.arc(curveStartX, textPosition.y, 2 * opts.pix, 0, 2 * Math.PI);
+		context.closePath();
+		context.fill();
+		context.beginPath();
+		context.setFontSize(item.textSize * opts.pix || config.fontSize);
+		context.setFillStyle(item.textColor || opts.fontColor);
+		context.fillText(item.text, textStartX, textPosition.y + 3);
+		context.closePath();
+		context.stroke();
+		context.closePath();
+	}
 }
 
 function drawToolTipSplitLine(offsetX, opts, config, context) {
-  var toolTipOption = opts.extra.tooltip || {};
-  toolTipOption.gridType = toolTipOption.gridType == undefined ? 'solid' : toolTipOption.gridType;
-  toolTipOption.dashLength = toolTipOption.dashLength == undefined ? 4 : toolTipOption.dashLength;
-  var startY = opts.area[0];
-  var endY = opts.height - opts.area[2];
-  if (toolTipOption.gridType == 'dash') {
-    context.setLineDash([toolTipOption.dashLength, toolTipOption.dashLength]);
-  }
-  context.setStrokeStyle(toolTipOption.gridColor || '#cccccc');
-  context.setLineWidth(1 * opts.pix);
-  context.beginPath();
-  context.moveTo(offsetX, startY);
-  context.lineTo(offsetX, endY);
-  context.stroke();
-  context.setLineDash([]);
-  if (toolTipOption.xAxisLabel) {
-    let labelText = opts.categories[opts.tooltip.index];
-    context.setFontSize(config.fontSize);
-    let textWidth = measureText(labelText, config.fontSize, context);
-    let textX = offsetX - 0.5 * textWidth;
-    let textY = endY + 2 * opts.pix;
-    context.beginPath();
-    context.setFillStyle(hexToRgb(toolTipOption.labelBgColor || config.toolTipBackground, toolTipOption.labelBgOpacity || config.toolTipOpacity));
-    context.setStrokeStyle(toolTipOption.labelBgColor || config.toolTipBackground);
-    context.setLineWidth(1 * opts.pix);
-    context.rect(textX - toolTipOption.boxPadding * opts.pix, textY, textWidth + 2 * toolTipOption.boxPadding * opts.pix, config.fontSize + 2 * toolTipOption.boxPadding * opts.pix);
-    context.closePath();
-    context.stroke();
-    context.fill();
-    context.beginPath();
-    context.setFontSize(config.fontSize);
-    context.setFillStyle(toolTipOption.labelFontColor || opts.fontColor);
-    context.fillText(String(labelText), textX, textY + toolTipOption.boxPadding * opts.pix + config.fontSize);
-    context.closePath();
-    context.stroke();
-  }
+	var toolTipOption = opts.extra.tooltip || {};
+	toolTipOption.gridType = toolTipOption.gridType == undefined ? 'solid' : toolTipOption.gridType;
+	toolTipOption.dashLength = toolTipOption.dashLength == undefined ? 4 : toolTipOption.dashLength;
+	var startY = opts.area[0];
+	var endY = opts.height - opts.area[2];
+	if (toolTipOption.gridType == 'dash') {
+		context.setLineDash([toolTipOption.dashLength, toolTipOption.dashLength]);
+	}
+	context.setStrokeStyle(toolTipOption.gridColor || '#cccccc');
+	context.setLineWidth(1 * opts.pix);
+	context.beginPath();
+	context.moveTo(offsetX, startY);
+	context.lineTo(offsetX, endY);
+	context.stroke();
+	context.setLineDash([]);
+	if (toolTipOption.xAxisLabel) {
+		let labelText = opts.categories[opts.tooltip.index];
+		context.setFontSize(config.fontSize);
+		let textWidth = measureText(labelText, config.fontSize, context);
+		let textX = offsetX - 0.5 * textWidth;
+		let textY = endY + 2 * opts.pix;
+		context.beginPath();
+		context.setFillStyle(hexToRgb(toolTipOption.labelBgColor || config.toolTipBackground, toolTipOption
+			.labelBgOpacity || config.toolTipOpacity));
+		context.setStrokeStyle(toolTipOption.labelBgColor || config.toolTipBackground);
+		context.setLineWidth(1 * opts.pix);
+		context.rect(textX - toolTipOption.boxPadding * opts.pix, textY, textWidth + 2 * toolTipOption.boxPadding * opts
+			.pix, config.fontSize + 2 * toolTipOption.boxPadding * opts.pix);
+		context.closePath();
+		context.stroke();
+		context.fill();
+		context.beginPath();
+		context.setFontSize(config.fontSize);
+		context.setFillStyle(toolTipOption.labelFontColor || opts.fontColor);
+		context.fillText(String(labelText), textX, textY + toolTipOption.boxPadding * opts.pix + config.fontSize);
+		context.closePath();
+		context.stroke();
+	}
 }
 
 function drawMarkLine(opts, config, context) {
-  let markLineOption = assign({}, {
-    type: 'solid',
-    dashLength: 4,
-    data: []
-  }, opts.extra.markLine);
-  let startX = opts.area[3];
-  let endX = opts.width - opts.area[1];
-  let points = calMarkLineData(markLineOption.data, opts);
-  for (let i = 0; i < points.length; i++) {
-    let item = assign({}, {
-      lineColor: '#DE4A42',
-      showLabel: false,
-      labelFontSize: 13,
-      labelPadding: 6,
-      labelFontColor: '#666666',
-      labelBgColor: '#DFE8FF',
-      labelBgOpacity: 0.8,
-      labelAlign: 'left',
-      labelOffsetX: 0,
-      labelOffsetY: 0,
-    }, points[i]);
-    if (markLineOption.type == 'dash') {
-      context.setLineDash([markLineOption.dashLength, markLineOption.dashLength]);
-    }
-    context.setStrokeStyle(item.lineColor);
-    context.setLineWidth(1 * opts.pix);
-    context.beginPath();
-    context.moveTo(startX, item.y);
-    context.lineTo(endX, item.y);
-    context.stroke();
-    context.setLineDash([]);
-    if (item.showLabel) {
-      let fontSize = item.labelFontSize * opts.pix;
-      let labelText = item.labelText ? item.labelText : item.value;
-      context.setFontSize(fontSize);
-      let textWidth = measureText(labelText, fontSize, context);
-      let bgWidth = textWidth + item.labelPadding * opts.pix * 2;
-      let bgStartX = item.labelAlign == 'left' ? opts.area[3] - bgWidth : opts.width - opts.area[1];
-      bgStartX += item.labelOffsetX;
-      let bgStartY = item.y - 0.5 * fontSize - item.labelPadding * opts.pix;
-      bgStartY += item.labelOffsetY;
-      let textX = bgStartX + item.labelPadding * opts.pix;
-      let textY = item.y;
-      context.setFillStyle(hexToRgb(item.labelBgColor, item.labelBgOpacity));
-      context.setStrokeStyle(item.labelBgColor);
-      context.setLineWidth(1 * opts.pix);
-      context.beginPath();
-      context.rect(bgStartX, bgStartY, bgWidth, fontSize + 2 * item.labelPadding * opts.pix);
-      context.closePath();
-      context.stroke();
-      context.fill();
-      context.setFontSize(fontSize);
-      context.setTextAlign('left');
-      context.setFillStyle(item.labelFontColor);
-      context.fillText(String(labelText), textX, bgStartY + fontSize + item.labelPadding * opts.pix/2);
-      context.stroke();
-      context.setTextAlign('left');
-    }
-  }
+	let markLineOption = assign({}, {
+		type: 'solid',
+		dashLength: 4,
+		data: []
+	}, opts.extra.markLine);
+	let startX = opts.area[3];
+	let endX = opts.width - opts.area[1];
+	let points = calMarkLineData(markLineOption.data, opts);
+	for (let i = 0; i < points.length; i++) {
+		let item = assign({}, {
+			lineColor: '#DE4A42',
+			showLabel: false,
+			labelFontSize: 13,
+			labelPadding: 6,
+			labelFontColor: '#666666',
+			labelBgColor: '#DFE8FF',
+			labelBgOpacity: 0.8,
+			labelAlign: 'left',
+			labelOffsetX: 0,
+			labelOffsetY: 0,
+		}, points[i]);
+		if (markLineOption.type == 'dash') {
+			context.setLineDash([markLineOption.dashLength, markLineOption.dashLength]);
+		}
+		context.setStrokeStyle(item.lineColor);
+		context.setLineWidth(1 * opts.pix);
+		context.beginPath();
+		context.moveTo(startX, item.y);
+		context.lineTo(endX, item.y);
+		context.stroke();
+		context.setLineDash([]);
+		if (item.showLabel) {
+			let fontSize = item.labelFontSize * opts.pix;
+			let labelText = item.labelText ? item.labelText : item.value;
+			context.setFontSize(fontSize);
+			let textWidth = measureText(labelText, fontSize, context);
+			let bgWidth = textWidth + item.labelPadding * opts.pix * 2;
+			let bgStartX = item.labelAlign == 'left' ? opts.area[3] - bgWidth : opts.width - opts.area[1];
+			bgStartX += item.labelOffsetX;
+			let bgStartY = item.y - 0.5 * fontSize - item.labelPadding * opts.pix;
+			bgStartY += item.labelOffsetY;
+			let textX = bgStartX + item.labelPadding * opts.pix;
+			let textY = item.y;
+			context.setFillStyle(hexToRgb(item.labelBgColor, item.labelBgOpacity));
+			context.setStrokeStyle(item.labelBgColor);
+			context.setLineWidth(1 * opts.pix);
+			context.beginPath();
+			context.rect(bgStartX, bgStartY, bgWidth, fontSize + 2 * item.labelPadding * opts.pix);
+			context.closePath();
+			context.stroke();
+			context.fill();
+			context.setFontSize(fontSize);
+			context.setTextAlign('left');
+			context.setFillStyle(item.labelFontColor);
+			context.fillText(String(labelText), textX, bgStartY + fontSize + item.labelPadding * opts.pix / 2);
+			context.stroke();
+			context.setTextAlign('left');
+		}
+	}
 }
 
 function drawToolTipHorizentalLine(opts, config, context, eachSpacing, xAxisPoints) {
-  var toolTipOption = assign({}, {
-    gridType: 'solid',
-    dashLength: 4
-  }, opts.extra.tooltip);
-  var startX = opts.area[3];
-  var endX = opts.width - opts.area[1];
-  if (toolTipOption.gridType == 'dash') {
-    context.setLineDash([toolTipOption.dashLength, toolTipOption.dashLength]);
-  }
-  context.setStrokeStyle(toolTipOption.gridColor || '#cccccc');
-  context.setLineWidth(1 * opts.pix);
-  context.beginPath();
-  context.moveTo(startX, opts.tooltip.offset.y);
-  context.lineTo(endX, opts.tooltip.offset.y);
-  context.stroke();
-  context.setLineDash([]);
-  if (toolTipOption.yAxisLabel) {
-    let boxPadding = toolTipOption.boxPadding * opts.pix;
-    let labelText = calTooltipYAxisData(opts.tooltip.offset.y, opts.series, opts, config, eachSpacing);
-    let widthArr = opts.chartData.yAxisData.yAxisWidth;
-    let tStartLeft = opts.area[3];
-    let tStartRight = opts.width - opts.area[1];
-    for (let i = 0; i < labelText.length; i++) {
-      context.setFontSize(toolTipOption.fontSize * opts.pix);
-      let textWidth = measureText(labelText[i], toolTipOption.fontSize * opts.pix, context);
-      let bgStartX, bgEndX, bgWidth;
-      if (widthArr[i].position == 'left') {
-        bgStartX = tStartLeft - (textWidth + boxPadding * 2) - 2 * opts.pix;
-        bgEndX = Math.max(bgStartX, bgStartX + textWidth + boxPadding * 2);
-      } else {
-        bgStartX = tStartRight + 2 * opts.pix;
-        bgEndX = Math.max(bgStartX + widthArr[i].width, bgStartX + textWidth + boxPadding * 2);
-      }
-      bgWidth = bgEndX - bgStartX;
-      let textX = bgStartX + (bgWidth - textWidth) / 2;
-      let textY = opts.tooltip.offset.y;
-      context.beginPath();
-      context.setFillStyle(hexToRgb(toolTipOption.labelBgColor || config.toolTipBackground, toolTipOption.labelBgOpacity || config.toolTipOpacity));
-      context.setStrokeStyle(toolTipOption.labelBgColor || config.toolTipBackground);
-      context.setLineWidth(1 * opts.pix);
-      context.rect(bgStartX, textY - 0.5 * config.fontSize - boxPadding, bgWidth, config.fontSize + 2 * boxPadding);
-      context.closePath();
-      context.stroke();
-      context.fill();
-      context.beginPath();
-      context.setFontSize(config.fontSize);
-      context.setFillStyle(toolTipOption.labelFontColor || opts.fontColor);
-      context.fillText(labelText[i], textX, textY + 0.5 * config.fontSize);
-      context.closePath();
-      context.stroke();
-      if (widthArr[i].position == 'left') {
-        tStartLeft -= (widthArr[i].width + opts.yAxis.padding * opts.pix);
-      } else {
-        tStartRight += widthArr[i].width + opts.yAxis.padding * opts.pix;
-      }
-    }
-  }
+	var toolTipOption = assign({}, {
+		gridType: 'solid',
+		dashLength: 4
+	}, opts.extra.tooltip);
+	var startX = opts.area[3];
+	var endX = opts.width - opts.area[1];
+	if (toolTipOption.gridType == 'dash') {
+		context.setLineDash([toolTipOption.dashLength, toolTipOption.dashLength]);
+	}
+	context.setStrokeStyle(toolTipOption.gridColor || '#cccccc');
+	context.setLineWidth(1 * opts.pix);
+	context.beginPath();
+	context.moveTo(startX, opts.tooltip.offset.y);
+	context.lineTo(endX, opts.tooltip.offset.y);
+	context.stroke();
+	context.setLineDash([]);
+	if (toolTipOption.yAxisLabel) {
+		let boxPadding = toolTipOption.boxPadding * opts.pix;
+		let labelText = calTooltipYAxisData(opts.tooltip.offset.y, opts.series, opts, config, eachSpacing);
+		let widthArr = opts.chartData.yAxisData.yAxisWidth;
+		let tStartLeft = opts.area[3];
+		let tStartRight = opts.width - opts.area[1];
+		for (let i = 0; i < labelText.length; i++) {
+			context.setFontSize(toolTipOption.fontSize * opts.pix);
+			let textWidth = measureText(labelText[i], toolTipOption.fontSize * opts.pix, context);
+			let bgStartX, bgEndX, bgWidth;
+			if (widthArr[i].position == 'left') {
+				bgStartX = tStartLeft - (textWidth + boxPadding * 2) - 2 * opts.pix;
+				bgEndX = Math.max(bgStartX, bgStartX + textWidth + boxPadding * 2);
+			} else {
+				bgStartX = tStartRight + 2 * opts.pix;
+				bgEndX = Math.max(bgStartX + widthArr[i].width, bgStartX + textWidth + boxPadding * 2);
+			}
+			bgWidth = bgEndX - bgStartX;
+			let textX = bgStartX + (bgWidth - textWidth) / 2;
+			let textY = opts.tooltip.offset.y;
+			context.beginPath();
+			context.setFillStyle(hexToRgb(toolTipOption.labelBgColor || config.toolTipBackground, toolTipOption
+				.labelBgOpacity || config.toolTipOpacity));
+			context.setStrokeStyle(toolTipOption.labelBgColor || config.toolTipBackground);
+			context.setLineWidth(1 * opts.pix);
+			context.rect(bgStartX, textY - 0.5 * config.fontSize - boxPadding, bgWidth, config.fontSize + 2 * boxPadding);
+			context.closePath();
+			context.stroke();
+			context.fill();
+			context.beginPath();
+			context.setFontSize(config.fontSize);
+			context.setFillStyle(toolTipOption.labelFontColor || opts.fontColor);
+			context.fillText(labelText[i], textX, textY + 0.5 * config.fontSize);
+			context.closePath();
+			context.stroke();
+			if (widthArr[i].position == 'left') {
+				tStartLeft -= (widthArr[i].width + opts.yAxis.padding * opts.pix);
+			} else {
+				tStartRight += widthArr[i].width + opts.yAxis.padding * opts.pix;
+			}
+		}
+	}
 }
 
 function drawToolTipSplitArea(offsetX, opts, config, context, eachSpacing) {
-  var toolTipOption = assign({}, {
-    activeBgColor: '#000000',
-    activeBgOpacity: 0.08,
-    activeWidth: eachSpacing
-  }, opts.extra.column);
-  toolTipOption.activeWidth = toolTipOption.activeWidth > eachSpacing ? eachSpacing : toolTipOption.activeWidth;
-  var startY = opts.area[0];
-  var endY = opts.height - opts.area[2];
-  context.beginPath();
-  context.setFillStyle(hexToRgb(toolTipOption.activeBgColor, toolTipOption.activeBgOpacity));
-  context.rect(offsetX - toolTipOption.activeWidth / 2, startY, toolTipOption.activeWidth, endY - startY);
-  context.closePath();
-  context.fill();
-  context.setFillStyle("#FFFFFF");
+	var toolTipOption = assign({}, {
+		activeBgColor: '#000000',
+		activeBgOpacity: 0.08,
+		activeWidth: eachSpacing
+	}, opts.extra.column);
+	toolTipOption.activeWidth = toolTipOption.activeWidth > eachSpacing ? eachSpacing : toolTipOption.activeWidth;
+	var startY = opts.area[0];
+	var endY = opts.height - opts.area[2];
+	context.beginPath();
+	context.setFillStyle(hexToRgb(toolTipOption.activeBgColor, toolTipOption.activeBgOpacity));
+	context.rect(offsetX - toolTipOption.activeWidth / 2, startY, toolTipOption.activeWidth, endY - startY);
+	context.closePath();
+	context.fill();
+	context.setFillStyle("#FFFFFF");
 }
 
 function drawBarToolTipSplitArea(offsetX, opts, config, context, eachSpacing) {
-  var toolTipOption = assign({}, {
-    activeBgColor: '#000000',
-    activeBgOpacity: 0.08
-  }, opts.extra.bar);
-  var startX = opts.area[3];
-  var endX = opts.width - opts.area[1];
-  context.beginPath();
-  context.setFillStyle(hexToRgb(toolTipOption.activeBgColor, toolTipOption.activeBgOpacity));
-  context.rect( startX ,offsetX - eachSpacing / 2 ,  endX - startX,eachSpacing);
-  context.closePath();
-  context.fill();
-  context.setFillStyle("#FFFFFF");
+	var toolTipOption = assign({}, {
+		activeBgColor: '#000000',
+		activeBgOpacity: 0.08
+	}, opts.extra.bar);
+	var startX = opts.area[3];
+	var endX = opts.width - opts.area[1];
+	context.beginPath();
+	context.setFillStyle(hexToRgb(toolTipOption.activeBgColor, toolTipOption.activeBgOpacity));
+	context.rect(startX, offsetX - eachSpacing / 2, endX - startX, eachSpacing);
+	context.closePath();
+	context.fill();
+	context.setFillStyle("#FFFFFF");
 }
 
 
 function drawToolTip(textList, offset, opts, config, context, eachSpacing, xAxisPoints) {
-  var toolTipOption = assign({}, {
-    showBox: true,
-    showArrow: true,
-    showCategory: false,
-    bgColor: '#000000',
-    bgOpacity: 0.7,
-    borderColor: '#000000',
-    borderWidth: 0,
-    borderRadius: 0,
-    borderOpacity: 0.7,
-    boxPadding: 3,
-    fontColor: '#FFFFFF',
-    fontSize: 13,
-    lineHeight: 20,
-    legendShow: true,
-    legendShape: 'auto',
-    splitLine: true,
-  }, opts.extra.tooltip);
-  if(toolTipOption.showCategory==true && opts.categories){
-    textList.unshift({text:opts.categories[opts.tooltip.index],color:null})
-  }
-  var fontSize = toolTipOption.fontSize * opts.pix;
-  var lineHeight = toolTipOption.lineHeight * opts.pix;
-  var boxPadding = toolTipOption.boxPadding * opts.pix;
-  var legendWidth = fontSize;
-  var legendMarginRight = 5 * opts.pix;
-  if(toolTipOption.legendShow == false){
-    legendWidth = 0;
-    legendMarginRight = 0;
-  }
-  var arrowWidth = toolTipOption.showArrow ? 8 * opts.pix : 0;
-  var isOverRightBorder = false;
-  if (opts.type == 'line' || opts.type == 'mount' || opts.type == 'area' || opts.type == 'candle' || opts.type == 'mix') {
-    if (toolTipOption.splitLine == true) {
-      drawToolTipSplitLine(opts.tooltip.offset.x, opts, config, context);
-    }
-  }
-  offset = assign({
-    x: 0,
-    y: 0
-  }, offset);
-  offset.y -= 8 * opts.pix;
-  var textWidth = textList.map(function(item) {
-    return measureText(item.text, fontSize, context);
-  });
-  var toolTipWidth = legendWidth + legendMarginRight + 4 * boxPadding + Math.max.apply(null, textWidth);
-  var toolTipHeight = 2 * boxPadding + textList.length * lineHeight;
-  if (toolTipOption.showBox == false) {
-    return
-  }
-  // if beyond the right border
-  if (offset.x - Math.abs(opts._scrollDistance_ || 0) + arrowWidth + toolTipWidth > opts.width) {
-    isOverRightBorder = true;
-  }
-  if (toolTipHeight + offset.y > opts.height) {
-    offset.y = opts.height - toolTipHeight;
-  }
-  // draw background rect
-  context.beginPath();
-  context.setFillStyle(hexToRgb(toolTipOption.bgColor, toolTipOption.bgOpacity));
-  context.setLineWidth(toolTipOption.borderWidth * opts.pix);
-  context.setStrokeStyle(hexToRgb(toolTipOption.borderColor, toolTipOption.borderOpacity));
-  var radius = toolTipOption.borderRadius;
-  if (isOverRightBorder) {
-    // 增加左侧仍然超出的判断
-    if(toolTipWidth + arrowWidth > opts.width){
-      offset.x = opts.width + Math.abs(opts._scrollDistance_ || 0) + arrowWidth + (toolTipWidth - opts.width)
-    }
-    if(toolTipWidth > offset.x){
-      offset.x = opts.width + Math.abs(opts._scrollDistance_ || 0) + arrowWidth + (toolTipWidth - opts.width)
-    }
-    if (toolTipOption.showArrow) {
-      context.moveTo(offset.x, offset.y + 10 * opts.pix);
-      context.lineTo(offset.x - arrowWidth, offset.y + 10 * opts.pix + 5 * opts.pix);
-    }
-    context.arc(offset.x - arrowWidth - radius, offset.y + toolTipHeight - radius, radius, 0, Math.PI / 2, false);
-    context.arc(offset.x - arrowWidth - Math.round(toolTipWidth) + radius, offset.y + toolTipHeight - radius, radius,
-      Math.PI / 2, Math.PI, false);
-    context.arc(offset.x - arrowWidth - Math.round(toolTipWidth) + radius, offset.y + radius, radius, -Math.PI, -Math.PI / 2, false);
-    context.arc(offset.x - arrowWidth - radius, offset.y + radius, radius, -Math.PI / 2, 0, false);
-    if (toolTipOption.showArrow) {
-      context.lineTo(offset.x - arrowWidth, offset.y + 10 * opts.pix - 5 * opts.pix);
-      context.lineTo(offset.x, offset.y + 10 * opts.pix);
-    }
-  } else {
-    if (toolTipOption.showArrow) {
-      context.moveTo(offset.x, offset.y + 10 * opts.pix);
-      context.lineTo(offset.x + arrowWidth, offset.y + 10 * opts.pix - 5 * opts.pix);
-    }
-    context.arc(offset.x + arrowWidth + radius, offset.y + radius, radius, -Math.PI, -Math.PI / 2, false);
-    context.arc(offset.x + arrowWidth + Math.round(toolTipWidth) - radius, offset.y + radius, radius, -Math.PI / 2, 0,
-      false);
-    context.arc(offset.x + arrowWidth + Math.round(toolTipWidth) - radius, offset.y + toolTipHeight - radius, radius, 0,
-      Math.PI / 2, false);
-    context.arc(offset.x + arrowWidth + radius, offset.y + toolTipHeight - radius, radius, Math.PI / 2, Math.PI, false);
-    if (toolTipOption.showArrow) {
-      context.lineTo(offset.x + arrowWidth, offset.y + 10 * opts.pix + 5 * opts.pix);
-      context.lineTo(offset.x, offset.y + 10 * opts.pix);
-    }
-  }
-  context.closePath();
-  context.fill();
-  if (toolTipOption.borderWidth > 0) {
-    context.stroke();
-  }
-  // draw legend
-  if(toolTipOption.legendShow){
-    textList.forEach(function(item, index) {
-      if (item.color !== null) {
-        context.beginPath();
-        context.setFillStyle(item.color);
-        var startX = offset.x + arrowWidth + 2 * boxPadding;
-        var startY = offset.y + (lineHeight - fontSize) / 2 + lineHeight * index + boxPadding + 1;
-        if (isOverRightBorder) {
-          startX = offset.x - toolTipWidth - arrowWidth + 2 * boxPadding;
-        }
-        switch (item.legendShape) {
-          case 'line':
-            context.moveTo(startX, startY + 0.5 * legendWidth - 2 * opts.pix);
-            context.fillRect(startX, startY + 0.5 * legendWidth - 2 * opts.pix, legendWidth, 4 * opts.pix);
-            break;
-          case 'triangle':
-            context.moveTo(startX + 7.5 * opts.pix, startY + 0.5 * legendWidth - 5 * opts.pix);
-            context.lineTo(startX + 2.5 * opts.pix, startY + 0.5 * legendWidth + 5 * opts.pix);
-            context.lineTo(startX + 12.5 * opts.pix, startY + 0.5 * legendWidth + 5 * opts.pix);
-            context.lineTo(startX + 7.5 * opts.pix, startY + 0.5 * legendWidth - 5 * opts.pix);
-            break;
-          case 'diamond':
-            context.moveTo(startX + 7.5 * opts.pix, startY + 0.5 * legendWidth - 5 * opts.pix);
-            context.lineTo(startX + 2.5 * opts.pix, startY + 0.5 * legendWidth);
-            context.lineTo(startX + 7.5 * opts.pix, startY + 0.5 * legendWidth + 5 * opts.pix);
-            context.lineTo(startX + 12.5 * opts.pix, startY + 0.5 * legendWidth);
-            context.lineTo(startX + 7.5 * opts.pix, startY + 0.5 * legendWidth - 5 * opts.pix);
-            break;
-          case 'circle':
-            context.moveTo(startX + 7.5 * opts.pix, startY + 0.5 * legendWidth);
-            context.arc(startX + 7.5 * opts.pix, startY + 0.5 * legendWidth, 5 * opts.pix, 0, 2 * Math.PI);
-            break;
-          case 'rect':
-            context.moveTo(startX, startY + 0.5 * legendWidth - 5 * opts.pix);
-            context.fillRect(startX, startY + 0.5 * legendWidth - 5 * opts.pix, 15 * opts.pix, 10 * opts.pix);
-            break;
-          case 'square':
-            context.moveTo(startX + 2 * opts.pix, startY + 0.5 * legendWidth - 5 * opts.pix);
-            context.fillRect(startX + 2 * opts.pix, startY + 0.5 * legendWidth - 5 * opts.pix, 10 * opts.pix, 10 * opts.pix);
-            break;
-          default:
-            context.moveTo(startX, startY + 0.5 * legendWidth - 5 * opts.pix);
-            context.fillRect(startX, startY + 0.5 * legendWidth - 5 * opts.pix, 15 * opts.pix, 10 * opts.pix);
-        }
-        context.closePath();
-        context.fill();
-      }
-    });
-  }
-  
-  // draw text list
-  textList.forEach(function(item, index) {
-    var startX = offset.x + arrowWidth + 2 * boxPadding + legendWidth + legendMarginRight;
-    if (isOverRightBorder) {
-      startX = offset.x - toolTipWidth - arrowWidth + 2 * boxPadding + legendWidth + legendMarginRight;
-    }
-    var startY = offset.y + lineHeight * index + (lineHeight - fontSize)/2 - 1 + boxPadding + fontSize;
-    context.beginPath();
-    context.setFontSize(fontSize);
-    context.setTextBaseline('normal');
-    context.setFillStyle(toolTipOption.fontColor);
-    context.fillText(item.text, startX, startY);
-    context.closePath();
-    context.stroke();
-  });
+	var toolTipOption = assign({}, {
+		showBox: true,
+		showArrow: true,
+		showCategory: false,
+		bgColor: '#000000',
+		bgOpacity: 0.7,
+		borderColor: '#000000',
+		borderWidth: 0,
+		borderRadius: 0,
+		borderOpacity: 0.7,
+		boxPadding: 3,
+		fontColor: '#FFFFFF',
+		fontSize: 13,
+		lineHeight: 20,
+		legendShow: true,
+		legendShape: 'auto',
+		splitLine: true,
+	}, opts.extra.tooltip);
+	if (toolTipOption.showCategory == true && opts.categories) {
+		textList.unshift({
+			text: opts.categories[opts.tooltip.index],
+			color: null
+		})
+	}
+	var fontSize = toolTipOption.fontSize * opts.pix;
+	var lineHeight = toolTipOption.lineHeight * opts.pix;
+	var boxPadding = toolTipOption.boxPadding * opts.pix;
+	var legendWidth = fontSize;
+	var legendMarginRight = 5 * opts.pix;
+	if (toolTipOption.legendShow == false) {
+		legendWidth = 0;
+		legendMarginRight = 0;
+	}
+	var arrowWidth = toolTipOption.showArrow ? 8 * opts.pix : 0;
+	var isOverRightBorder = false;
+	if (opts.type == 'line' || opts.type == 'mount' || opts.type == 'area' || opts.type == 'candle' || opts.type ==
+		'mix') {
+		if (toolTipOption.splitLine == true) {
+			drawToolTipSplitLine(opts.tooltip.offset.x, opts, config, context);
+		}
+	}
+	offset = assign({
+		x: 0,
+		y: 0
+	}, offset);
+	offset.y -= 8 * opts.pix;
+	var textWidth = textList.map(function(item) {
+		return measureText(item.text, fontSize, context);
+	});
+	var toolTipWidth = legendWidth + legendMarginRight + 4 * boxPadding + Math.max.apply(null, textWidth);
+	var toolTipHeight = 2 * boxPadding + textList.length * lineHeight;
+	if (toolTipOption.showBox == false) {
+		return
+	}
+	// if beyond the right border
+	if (offset.x - Math.abs(opts._scrollDistance_ || 0) + arrowWidth + toolTipWidth > opts.width) {
+		isOverRightBorder = true;
+	}
+	if (toolTipHeight + offset.y > opts.height) {
+		offset.y = opts.height - toolTipHeight;
+	}
+	// draw background rect
+	context.beginPath();
+	context.setFillStyle(hexToRgb(toolTipOption.bgColor, toolTipOption.bgOpacity));
+	context.setLineWidth(toolTipOption.borderWidth * opts.pix);
+	context.setStrokeStyle(hexToRgb(toolTipOption.borderColor, toolTipOption.borderOpacity));
+	var radius = toolTipOption.borderRadius;
+	if (isOverRightBorder) {
+		// 增加左侧仍然超出的判断
+		if (toolTipWidth + arrowWidth > opts.width) {
+			offset.x = opts.width + Math.abs(opts._scrollDistance_ || 0) + arrowWidth + (toolTipWidth - opts.width)
+		}
+		if (toolTipWidth > offset.x) {
+			offset.x = opts.width + Math.abs(opts._scrollDistance_ || 0) + arrowWidth + (toolTipWidth - opts.width)
+		}
+		if (toolTipOption.showArrow) {
+			context.moveTo(offset.x, offset.y + 10 * opts.pix);
+			context.lineTo(offset.x - arrowWidth, offset.y + 10 * opts.pix + 5 * opts.pix);
+		}
+		context.arc(offset.x - arrowWidth - radius, offset.y + toolTipHeight - radius, radius, 0, Math.PI / 2, false);
+		context.arc(offset.x - arrowWidth - Math.round(toolTipWidth) + radius, offset.y + toolTipHeight - radius, radius,
+			Math.PI / 2, Math.PI, false);
+		context.arc(offset.x - arrowWidth - Math.round(toolTipWidth) + radius, offset.y + radius, radius, -Math.PI, -Math
+			.PI / 2, false);
+		context.arc(offset.x - arrowWidth - radius, offset.y + radius, radius, -Math.PI / 2, 0, false);
+		if (toolTipOption.showArrow) {
+			context.lineTo(offset.x - arrowWidth, offset.y + 10 * opts.pix - 5 * opts.pix);
+			context.lineTo(offset.x, offset.y + 10 * opts.pix);
+		}
+	} else {
+		if (toolTipOption.showArrow) {
+			context.moveTo(offset.x, offset.y + 10 * opts.pix);
+			context.lineTo(offset.x + arrowWidth, offset.y + 10 * opts.pix - 5 * opts.pix);
+		}
+		context.arc(offset.x + arrowWidth + radius, offset.y + radius, radius, -Math.PI, -Math.PI / 2, false);
+		context.arc(offset.x + arrowWidth + Math.round(toolTipWidth) - radius, offset.y + radius, radius, -Math.PI / 2, 0,
+			false);
+		context.arc(offset.x + arrowWidth + Math.round(toolTipWidth) - radius, offset.y + toolTipHeight - radius, radius, 0,
+			Math.PI / 2, false);
+		context.arc(offset.x + arrowWidth + radius, offset.y + toolTipHeight - radius, radius, Math.PI / 2, Math.PI, false);
+		if (toolTipOption.showArrow) {
+			context.lineTo(offset.x + arrowWidth, offset.y + 10 * opts.pix + 5 * opts.pix);
+			context.lineTo(offset.x, offset.y + 10 * opts.pix);
+		}
+	}
+	context.closePath();
+	context.fill();
+	if (toolTipOption.borderWidth > 0) {
+		context.stroke();
+	}
+	// draw legend
+	if (toolTipOption.legendShow) {
+		textList.forEach(function(item, index) {
+			if (item.color !== null) {
+				context.beginPath();
+				context.setFillStyle(item.color);
+				var startX = offset.x + arrowWidth + 2 * boxPadding;
+				var startY = offset.y + (lineHeight - fontSize) / 2 + lineHeight * index + boxPadding + 1;
+				if (isOverRightBorder) {
+					startX = offset.x - toolTipWidth - arrowWidth + 2 * boxPadding;
+				}
+				switch (item.legendShape) {
+					case 'line':
+						context.moveTo(startX, startY + 0.5 * legendWidth - 2 * opts.pix);
+						context.fillRect(startX, startY + 0.5 * legendWidth - 2 * opts.pix, legendWidth, 4 * opts.pix);
+						break;
+					case 'triangle':
+						context.moveTo(startX + 7.5 * opts.pix, startY + 0.5 * legendWidth - 5 * opts.pix);
+						context.lineTo(startX + 2.5 * opts.pix, startY + 0.5 * legendWidth + 5 * opts.pix);
+						context.lineTo(startX + 12.5 * opts.pix, startY + 0.5 * legendWidth + 5 * opts.pix);
+						context.lineTo(startX + 7.5 * opts.pix, startY + 0.5 * legendWidth - 5 * opts.pix);
+						break;
+					case 'diamond':
+						context.moveTo(startX + 7.5 * opts.pix, startY + 0.5 * legendWidth - 5 * opts.pix);
+						context.lineTo(startX + 2.5 * opts.pix, startY + 0.5 * legendWidth);
+						context.lineTo(startX + 7.5 * opts.pix, startY + 0.5 * legendWidth + 5 * opts.pix);
+						context.lineTo(startX + 12.5 * opts.pix, startY + 0.5 * legendWidth);
+						context.lineTo(startX + 7.5 * opts.pix, startY + 0.5 * legendWidth - 5 * opts.pix);
+						break;
+					case 'circle':
+						context.moveTo(startX + 7.5 * opts.pix, startY + 0.5 * legendWidth);
+						context.arc(startX + 7.5 * opts.pix, startY + 0.5 * legendWidth, 5 * opts.pix, 0, 2 * Math.PI);
+						break;
+					case 'rect':
+						context.moveTo(startX, startY + 0.5 * legendWidth - 5 * opts.pix);
+						context.fillRect(startX, startY + 0.5 * legendWidth - 5 * opts.pix, 15 * opts.pix, 10 * opts.pix);
+						break;
+					case 'square':
+						context.moveTo(startX + 2 * opts.pix, startY + 0.5 * legendWidth - 5 * opts.pix);
+						context.fillRect(startX + 2 * opts.pix, startY + 0.5 * legendWidth - 5 * opts.pix, 10 * opts.pix, 10 *
+							opts.pix);
+						break;
+					default:
+						context.moveTo(startX, startY + 0.5 * legendWidth - 5 * opts.pix);
+						context.fillRect(startX, startY + 0.5 * legendWidth - 5 * opts.pix, 15 * opts.pix, 10 * opts.pix);
+				}
+				context.closePath();
+				context.fill();
+			}
+		});
+	}
+
+	// draw text list
+	textList.forEach(function(item, index) {
+		var startX = offset.x + arrowWidth + 2 * boxPadding + legendWidth + legendMarginRight;
+		if (isOverRightBorder) {
+			startX = offset.x - toolTipWidth - arrowWidth + 2 * boxPadding + legendWidth + legendMarginRight;
+		}
+		var startY = offset.y + lineHeight * index + (lineHeight - fontSize) / 2 - 1 + boxPadding + fontSize;
+		context.beginPath();
+		context.setFontSize(fontSize);
+		context.setTextBaseline('normal');
+		context.setFillStyle(toolTipOption.fontColor);
+		context.fillText(item.text, startX, startY);
+		context.closePath();
+		context.stroke();
+	});
 }
 
 function drawColumnDataPoints(series, opts, config, context) {
-  let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
-  let xAxisData = opts.chartData.xAxisData,
-    xAxisPoints = xAxisData.xAxisPoints,
-    eachSpacing = xAxisData.eachSpacing;
-  let columnOption = assign({}, {
-    type: 'group',
-    width: eachSpacing / 2,
-    meterBorder: 4,
-    meterFillColor: '#FFFFFF',
-    barBorderCircle: false,
-    barBorderRadius: [],
-    seriesGap: 2,
-    linearType: 'none',
-    linearOpacity: 1,
-    customColor: [],
-    colorStop: 0,
-    labelPosition: 'outside'
-  }, opts.extra.column);
-  let calPoints = [];
-  context.save();
-  let leftNum = -2;
-  let rightNum = xAxisPoints.length + 2;
-  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
-    context.translate(opts._scrollDistance_, 0);
-    leftNum = Math.floor(-opts._scrollDistance_ / eachSpacing) - 2;
-    rightNum = leftNum + opts.xAxis.itemCount + 4;
-  }
-  if (opts.tooltip && opts.tooltip.textList && opts.tooltip.textList.length && process === 1) {
-    drawToolTipSplitArea(opts.tooltip.offset.x, opts, config, context, eachSpacing);
-  }
-  columnOption.customColor = fillCustomColor(columnOption.linearType, columnOption.customColor, series, config);
-  series.forEach(function(eachSeries, seriesIndex) {
-    let ranges, minRange, maxRange;
-    ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
-    minRange = ranges.pop();
-    maxRange = ranges.shift();
-    
-    // 计算0轴坐标
-    let spacingValid = opts.height - opts.area[0] - opts.area[2];
-    let zeroHeight = spacingValid * (0 - minRange) / (maxRange - minRange);
-    let zeroPoints = opts.height - Math.round(zeroHeight) - opts.area[2];
-    eachSeries.zeroPoints = zeroPoints;
-    var data = eachSeries.data;
-    switch (columnOption.type) {
-      case 'group':
-        var points = getColumnDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, zeroPoints, process);
-        var tooltipPoints = getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, seriesIndex, series, process);
-        calPoints.push(tooltipPoints);
-        points = fixColumeData(points, eachSpacing, series.length, seriesIndex, config, opts);
-        for (let i = 0; i < points.length; i++) {
-          let item = points[i];
-          //fix issues/I27B1N yyoinge & Joeshu
-          if (item !== null && i > leftNum && i < rightNum) {
-            var startX = item.x - item.width / 2;
-            var height = opts.height - item.y - opts.area[2];
-            context.beginPath();
-            var fillColor = item.color || eachSeries.color
-            var strokeColor = item.color || eachSeries.color
-            if (columnOption.linearType !== 'none') {
-              var grd = context.createLinearGradient(startX, item.y, startX, zeroPoints);
-              //透明渐变
-              if (columnOption.linearType == 'opacity') {
-                grd.addColorStop(0, hexToRgb(fillColor, columnOption.linearOpacity));
-                grd.addColorStop(1, hexToRgb(fillColor, 1));
-              } else {
-                grd.addColorStop(0, hexToRgb(columnOption.customColor[eachSeries.linearIndex], columnOption.linearOpacity));
-                grd.addColorStop(columnOption.colorStop, hexToRgb(columnOption.customColor[eachSeries.linearIndex],columnOption.linearOpacity));
-                grd.addColorStop(1, hexToRgb(fillColor, 1));
-              }
-              fillColor = grd
-            }
-            // 圆角边框
-            if ((columnOption.barBorderRadius && columnOption.barBorderRadius.length === 4) || columnOption.barBorderCircle === true) {
-              const left = startX;
-              const top = item.y > zeroPoints ? zeroPoints : item.y;
-              const width = item.width;
-              const height = Math.abs(zeroPoints - item.y);
-              if (columnOption.barBorderCircle) {
-                columnOption.barBorderRadius = [width / 2, width / 2, 0, 0];
-              }
-              if(item.y > zeroPoints){
-                columnOption.barBorderRadius = [0, 0,width / 2, width / 2];
-              }
-              let [r0, r1, r2, r3] = columnOption.barBorderRadius;
-              let minRadius = Math.min(width/2,height/2);
-              r0 = r0 > minRadius ? minRadius : r0;
-              r1 = r1 > minRadius ? minRadius : r1;
-              r2 = r2 > minRadius ? minRadius : r2;
-              r3 = r3 > minRadius ? minRadius : r3;
-              r0 = r0 < 0 ? 0 : r0;
-              r1 = r1 < 0 ? 0 : r1;
-              r2 = r2 < 0 ? 0 : r2;
-              r3 = r3 < 0 ? 0 : r3;
-              context.arc(left + r0, top + r0, r0, -Math.PI, -Math.PI / 2);
-              context.arc(left + width - r1, top + r1, r1, -Math.PI / 2, 0);
-              context.arc(left + width - r2, top + height - r2, r2, 0, Math.PI / 2);
-              context.arc(left + r3, top + height - r3, r3, Math.PI / 2, Math.PI);
-            } else {
-              context.moveTo(startX, item.y);
-              context.lineTo(startX + item.width, item.y);
-              context.lineTo(startX + item.width, zeroPoints);
-              context.lineTo(startX, zeroPoints);
-              context.lineTo(startX, item.y);
-              context.setLineWidth(1)
-              context.setStrokeStyle(strokeColor);
-            }
-            context.setFillStyle(fillColor);
-            context.closePath();
-            //context.stroke();
-            context.fill();
-          }
-        };
-        break;
-      case 'stack':
-        // 绘制堆叠数据图
-        var points = getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, seriesIndex, series, process);
-        calPoints.push(points);
-        points = fixColumeStackData(points, eachSpacing, series.length, seriesIndex, config, opts, series);
-        for (let i = 0; i < points.length; i++) {
-          let item = points[i];
-          if (item !== null && i > leftNum && i < rightNum) {
-            context.beginPath();
-            var fillColor = item.color || eachSeries.color;
-            var startX = item.x - item.width / 2 + 1;
-            var height = opts.height - item.y - opts.area[2];
-            var height0 = opts.height - item.y0 - opts.area[2];
-            if (seriesIndex > 0) {
-              height -= height0;
-            }
-            context.setFillStyle(fillColor);
-            context.moveTo(startX, item.y);
-            context.fillRect(startX, item.y, item.width, height);
-            context.closePath();
-            context.fill();
-          }
-        };
-        break;
-      case 'meter':
-        // 绘制温度计数据图
-        var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
-        calPoints.push(points);
-        points = fixColumeMeterData(points, eachSpacing, series.length, seriesIndex, config, opts, columnOption.meterBorder);
-          for (let i = 0; i < points.length; i++) {
-            let item = points[i];
-            if (item !== null && i > leftNum && i < rightNum) {
-              //画背景颜色
-              context.beginPath();
-              if (seriesIndex == 0 && columnOption.meterBorder > 0) {
-                context.setStrokeStyle(eachSeries.color);
-                context.setLineWidth(columnOption.meterBorder * opts.pix);
-              }
-              if(seriesIndex == 0){
-                context.setFillStyle(columnOption.meterFillColor);
-              }else{
-                context.setFillStyle(item.color || eachSeries.color);
-              }
-              var startX = item.x - item.width / 2;
-              var height = opts.height - item.y - opts.area[2];
-              if ((columnOption.barBorderRadius && columnOption.barBorderRadius.length === 4) || columnOption.barBorderCircle === true) {
-                const left = startX;
-                const top = item.y;
-                const width = item.width;
-                const height = zeroPoints - item.y;
-                if (columnOption.barBorderCircle) {
-                  columnOption.barBorderRadius = [width / 2, width / 2, 0, 0];
-                }
-                let [r0, r1, r2, r3] = columnOption.barBorderRadius;
-                let minRadius = Math.min(width/2,height/2);
-                r0 = r0 > minRadius ? minRadius : r0;
-                r1 = r1 > minRadius ? minRadius : r1;
-                r2 = r2 > minRadius ? minRadius : r2;
-                r3 = r3 > minRadius ? minRadius : r3;
-                r0 = r0 < 0 ? 0 : r0;
-                r1 = r1 < 0 ? 0 : r1;
-                r2 = r2 < 0 ? 0 : r2;
-                r3 = r3 < 0 ? 0 : r3;
-                context.arc(left + r0, top + r0, r0, -Math.PI, -Math.PI / 2);
-                context.arc(left + width - r1, top + r1, r1, -Math.PI / 2, 0);
-                context.arc(left + width - r2, top + height - r2, r2, 0, Math.PI / 2);
-                context.arc(left + r3, top + height - r3, r3, Math.PI / 2, Math.PI);
-                context.fill();
-              }else{
-                context.moveTo(startX, item.y);
-                context.lineTo(startX + item.width, item.y);
-                context.lineTo(startX + item.width, zeroPoints);
-                context.lineTo(startX, zeroPoints);
-                context.lineTo(startX, item.y);
-                context.fill();
-              }
-              if (seriesIndex == 0 && columnOption.meterBorder > 0) {
-                context.closePath();
-                context.stroke();
-              }
-            }
-          }
-        break;
-    }
-  });
-
-  if (opts.dataLabel !== false && process === 1) {
-    series.forEach(function(eachSeries, seriesIndex) {
-      let ranges, minRange, maxRange;
-      ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
-      minRange = ranges.pop();
-      maxRange = ranges.shift();
-      var data = eachSeries.data;
-      switch (columnOption.type) {
-        case 'group':
-          var points = getColumnDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
-          points = fixColumeData(points, eachSpacing, series.length, seriesIndex, config, opts);
-          drawColumePointText(points, eachSeries, config, context, opts);
-          break;
-        case 'stack':
-          var points = getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, seriesIndex, series, process);
-          drawColumePointText(points, eachSeries, config, context, opts);
-          break;
-        case 'meter':
-          var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
-          drawColumePointText(points, eachSeries, config, context, opts);
-          break;
-      }
-    });
-  }
-  context.restore();
-  return {
-    xAxisPoints: xAxisPoints,
-    calPoints: calPoints,
-    eachSpacing: eachSpacing
-  };
+	let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	let xAxisData = opts.chartData.xAxisData,
+		xAxisPoints = xAxisData.xAxisPoints,
+		eachSpacing = xAxisData.eachSpacing;
+	let columnOption = assign({}, {
+		type: 'group',
+		width: eachSpacing / 2,
+		meterBorder: 4,
+		meterFillColor: '#FFFFFF',
+		barBorderCircle: false,
+		barBorderRadius: [],
+		seriesGap: 2,
+		linearType: 'none',
+		linearOpacity: 1,
+		customColor: [],
+		colorStop: 0,
+		labelPosition: 'outside'
+	}, opts.extra.column);
+	let calPoints = [];
+	context.save();
+	let leftNum = -2;
+	let rightNum = xAxisPoints.length + 2;
+	if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+		context.translate(opts._scrollDistance_, 0);
+		leftNum = Math.floor(-opts._scrollDistance_ / eachSpacing) - 2;
+		rightNum = leftNum + opts.xAxis.itemCount + 4;
+	}
+	if (opts.tooltip && opts.tooltip.textList && opts.tooltip.textList.length && process === 1) {
+		drawToolTipSplitArea(opts.tooltip.offset.x, opts, config, context, eachSpacing);
+	}
+	columnOption.customColor = fillCustomColor(columnOption.linearType, columnOption.customColor, series, config);
+	series.forEach(function(eachSeries, seriesIndex) {
+		let ranges, minRange, maxRange;
+		ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+		minRange = ranges.pop();
+		maxRange = ranges.shift();
+
+		// 计算0轴坐标
+		let spacingValid = opts.height - opts.area[0] - opts.area[2];
+		let zeroHeight = spacingValid * (0 - minRange) / (maxRange - minRange);
+		let zeroPoints = opts.height - Math.round(zeroHeight) - opts.area[2];
+		eachSeries.zeroPoints = zeroPoints;
+		var data = eachSeries.data;
+		switch (columnOption.type) {
+			case 'group':
+				var points = getColumnDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config,
+					zeroPoints, process);
+				var tooltipPoints = getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config,
+					seriesIndex, series, process);
+				calPoints.push(tooltipPoints);
+				points = fixColumeData(points, eachSpacing, series.length, seriesIndex, config, opts);
+				for (let i = 0; i < points.length; i++) {
+					let item = points[i];
+					//fix issues/I27B1N yyoinge & Joeshu
+					if (item !== null && i > leftNum && i < rightNum) {
+						var startX = item.x - item.width / 2;
+						var height = opts.height - item.y - opts.area[2];
+						context.beginPath();
+						var fillColor = item.color || eachSeries.color
+						var strokeColor = item.color || eachSeries.color
+						if (columnOption.linearType !== 'none') {
+							var grd = context.createLinearGradient(startX, item.y, startX, zeroPoints);
+							//透明渐变
+							if (columnOption.linearType == 'opacity') {
+								grd.addColorStop(0, hexToRgb(fillColor, columnOption.linearOpacity));
+								grd.addColorStop(1, hexToRgb(fillColor, 1));
+							} else {
+								grd.addColorStop(0, hexToRgb(columnOption.customColor[eachSeries.linearIndex], columnOption
+									.linearOpacity));
+								grd.addColorStop(columnOption.colorStop, hexToRgb(columnOption.customColor[eachSeries.linearIndex],
+									columnOption.linearOpacity));
+								grd.addColorStop(1, hexToRgb(fillColor, 1));
+							}
+							fillColor = grd
+						}
+						// 圆角边框
+						if ((columnOption.barBorderRadius && columnOption.barBorderRadius.length === 4) || columnOption
+							.barBorderCircle === true) {
+							const left = startX;
+							const top = item.y > zeroPoints ? zeroPoints : item.y;
+							const width = item.width;
+							const height = Math.abs(zeroPoints - item.y);
+							if (columnOption.barBorderCircle) {
+								columnOption.barBorderRadius = [width / 2, width / 2, 0, 0];
+							}
+							if (item.y > zeroPoints) {
+								columnOption.barBorderRadius = [0, 0, width / 2, width / 2];
+							}
+							let [r0, r1, r2, r3] = columnOption.barBorderRadius;
+							let minRadius = Math.min(width / 2, height / 2);
+							r0 = r0 > minRadius ? minRadius : r0;
+							r1 = r1 > minRadius ? minRadius : r1;
+							r2 = r2 > minRadius ? minRadius : r2;
+							r3 = r3 > minRadius ? minRadius : r3;
+							r0 = r0 < 0 ? 0 : r0;
+							r1 = r1 < 0 ? 0 : r1;
+							r2 = r2 < 0 ? 0 : r2;
+							r3 = r3 < 0 ? 0 : r3;
+							context.arc(left + r0, top + r0, r0, -Math.PI, -Math.PI / 2);
+							context.arc(left + width - r1, top + r1, r1, -Math.PI / 2, 0);
+							context.arc(left + width - r2, top + height - r2, r2, 0, Math.PI / 2);
+							context.arc(left + r3, top + height - r3, r3, Math.PI / 2, Math.PI);
+						} else {
+							context.moveTo(startX, item.y);
+							context.lineTo(startX + item.width, item.y);
+							context.lineTo(startX + item.width, zeroPoints);
+							context.lineTo(startX, zeroPoints);
+							context.lineTo(startX, item.y);
+							context.setLineWidth(1)
+							context.setStrokeStyle(strokeColor);
+						}
+						context.setFillStyle(fillColor);
+						context.closePath();
+						//context.stroke();
+						context.fill();
+					}
+				};
+				break;
+			case 'stack':
+				// 绘制堆叠数据图
+				var points = getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config,
+					seriesIndex, series, process);
+				calPoints.push(points);
+				points = fixColumeStackData(points, eachSpacing, series.length, seriesIndex, config, opts, series);
+				for (let i = 0; i < points.length; i++) {
+					let item = points[i];
+					if (item !== null && i > leftNum && i < rightNum) {
+						context.beginPath();
+						var fillColor = item.color || eachSeries.color;
+						var startX = item.x - item.width / 2 + 1;
+						var height = opts.height - item.y - opts.area[2];
+						var height0 = opts.height - item.y0 - opts.area[2];
+						if (seriesIndex > 0) {
+							height -= height0;
+						}
+						context.setFillStyle(fillColor);
+						context.moveTo(startX, item.y);
+						context.fillRect(startX, item.y, item.width, height);
+						context.closePath();
+						context.fill();
+					}
+				};
+				break;
+			case 'meter':
+				// 绘制温度计数据图
+				var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+				calPoints.push(points);
+				points = fixColumeMeterData(points, eachSpacing, series.length, seriesIndex, config, opts, columnOption
+					.meterBorder);
+				for (let i = 0; i < points.length; i++) {
+					let item = points[i];
+					if (item !== null && i > leftNum && i < rightNum) {
+						//画背景颜色
+						context.beginPath();
+						if (seriesIndex == 0 && columnOption.meterBorder > 0) {
+							context.setStrokeStyle(eachSeries.color);
+							context.setLineWidth(columnOption.meterBorder * opts.pix);
+						}
+						if (seriesIndex == 0) {
+							context.setFillStyle(columnOption.meterFillColor);
+						} else {
+							context.setFillStyle(item.color || eachSeries.color);
+						}
+						var startX = item.x - item.width / 2;
+						var height = opts.height - item.y - opts.area[2];
+						if ((columnOption.barBorderRadius && columnOption.barBorderRadius.length === 4) || columnOption
+							.barBorderCircle === true) {
+							const left = startX;
+							const top = item.y;
+							const width = item.width;
+							const height = zeroPoints - item.y;
+							if (columnOption.barBorderCircle) {
+								columnOption.barBorderRadius = [width / 2, width / 2, 0, 0];
+							}
+							let [r0, r1, r2, r3] = columnOption.barBorderRadius;
+							let minRadius = Math.min(width / 2, height / 2);
+							r0 = r0 > minRadius ? minRadius : r0;
+							r1 = r1 > minRadius ? minRadius : r1;
+							r2 = r2 > minRadius ? minRadius : r2;
+							r3 = r3 > minRadius ? minRadius : r3;
+							r0 = r0 < 0 ? 0 : r0;
+							r1 = r1 < 0 ? 0 : r1;
+							r2 = r2 < 0 ? 0 : r2;
+							r3 = r3 < 0 ? 0 : r3;
+							context.arc(left + r0, top + r0, r0, -Math.PI, -Math.PI / 2);
+							context.arc(left + width - r1, top + r1, r1, -Math.PI / 2, 0);
+							context.arc(left + width - r2, top + height - r2, r2, 0, Math.PI / 2);
+							context.arc(left + r3, top + height - r3, r3, Math.PI / 2, Math.PI);
+							context.fill();
+						} else {
+							context.moveTo(startX, item.y);
+							context.lineTo(startX + item.width, item.y);
+							context.lineTo(startX + item.width, zeroPoints);
+							context.lineTo(startX, zeroPoints);
+							context.lineTo(startX, item.y);
+							context.fill();
+						}
+						if (seriesIndex == 0 && columnOption.meterBorder > 0) {
+							context.closePath();
+							context.stroke();
+						}
+					}
+				}
+				break;
+		}
+	});
+
+	if (opts.dataLabel !== false && process === 1) {
+		series.forEach(function(eachSeries, seriesIndex) {
+			let ranges, minRange, maxRange;
+			ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+			minRange = ranges.pop();
+			maxRange = ranges.shift();
+			var data = eachSeries.data;
+			switch (columnOption.type) {
+				case 'group':
+					var points = getColumnDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config,
+						process);
+					points = fixColumeData(points, eachSpacing, series.length, seriesIndex, config, opts);
+					drawColumePointText(points, eachSeries, config, context, opts);
+					break;
+				case 'stack':
+					var points = getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config,
+						seriesIndex, series, process);
+					drawColumePointText(points, eachSeries, config, context, opts);
+					break;
+				case 'meter':
+					var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+					drawColumePointText(points, eachSeries, config, context, opts);
+					break;
+			}
+		});
+	}
+	context.restore();
+	return {
+		xAxisPoints: xAxisPoints,
+		calPoints: calPoints,
+		eachSpacing: eachSpacing
+	};
 }
 
 function drawMountDataPoints(series, opts, config, context) {
-  let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
-  let xAxisData = opts.chartData.xAxisData,
-    xAxisPoints = xAxisData.xAxisPoints,
-    eachSpacing = xAxisData.eachSpacing;
-  let mountOption = assign({}, {
-    type: 'mount',
-    widthRatio: 1,
-    borderWidth: 1,
-    barBorderCircle: false,
-    barBorderRadius: [],
-    linearType: 'none',
-    linearOpacity: 1,
-    customColor: [],
-    colorStop: 0,
-  }, opts.extra.mount);
-  mountOption.widthRatio = mountOption.widthRatio <= 0 ? 0 : mountOption.widthRatio;
-  mountOption.widthRatio = mountOption.widthRatio >= 2 ? 2 : mountOption.widthRatio;
-  let calPoints = [];
-  context.save();
-  let leftNum = -2;
-  let rightNum = xAxisPoints.length + 2;
-  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
-    context.translate(opts._scrollDistance_, 0);
-    leftNum = Math.floor(-opts._scrollDistance_ / eachSpacing) - 2;
-    rightNum = leftNum + opts.xAxis.itemCount + 4;
-  }
-  mountOption.customColor = fillCustomColor(mountOption.linearType, mountOption.customColor, series, config);
-    let ranges, minRange, maxRange;
-    ranges = [].concat(opts.chartData.yAxisData.ranges[0]);
-    minRange = ranges.pop();
-    maxRange = ranges.shift();
-    
-    // 计算0轴坐标
-    let spacingValid = opts.height - opts.area[0] - opts.area[2];
-    let zeroHeight = spacingValid * (0 - minRange) / (maxRange - minRange);
-    let zeroPoints = opts.height - Math.round(zeroHeight) - opts.area[2];
-    
-    var points = getMountDataPoints(series, minRange, maxRange, xAxisPoints, eachSpacing, opts, mountOption, zeroPoints, process);
-    switch (mountOption.type) {
-      case 'bar':
-        for (let i = 0; i < points.length; i++) {
-          let item = points[i];
-          if (item !== null && i > leftNum && i < rightNum) {
-            var startX = item.x - eachSpacing*mountOption.widthRatio/2;
-            var height = opts.height - item.y - opts.area[2];
-            context.beginPath();
-            var fillColor = item.color || series[i].color
-            var strokeColor = item.color || series[i].color
-            if (mountOption.linearType !== 'none') {
-              var grd = context.createLinearGradient(startX, item.y, startX, zeroPoints);
-              //透明渐变
-              if (mountOption.linearType == 'opacity') {
-                grd.addColorStop(0, hexToRgb(fillColor, mountOption.linearOpacity));
-                grd.addColorStop(1, hexToRgb(fillColor, 1));
-              } else {
-                grd.addColorStop(0, hexToRgb(mountOption.customColor[series[i].linearIndex], mountOption.linearOpacity));
-                grd.addColorStop(mountOption.colorStop, hexToRgb(mountOption.customColor[series[i].linearIndex],mountOption.linearOpacity));
-                grd.addColorStop(1, hexToRgb(fillColor, 1));
-              }
-              fillColor = grd
-            }
-            // 圆角边框
-            if ((mountOption.barBorderRadius && mountOption.barBorderRadius.length === 4) || mountOption.barBorderCircle === true) {
-              const left = startX;
-              const top = item.y > zeroPoints ? zeroPoints : item.y;
-              const width = item.width;
-              const height = Math.abs(zeroPoints - item.y);
-              if (mountOption.barBorderCircle) {
-                mountOption.barBorderRadius = [width / 2, width / 2, 0, 0];
-              }
-              if(item.y > zeroPoints){
-                mountOption.barBorderRadius = [0, 0,width / 2, width / 2];
-              }
-              let [r0, r1, r2, r3] = mountOption.barBorderRadius;
-              let minRadius = Math.min(width/2,height/2);
-              r0 = r0 > minRadius ? minRadius : r0;
-              r1 = r1 > minRadius ? minRadius : r1;
-              r2 = r2 > minRadius ? minRadius : r2;
-              r3 = r3 > minRadius ? minRadius : r3;
-              r0 = r0 < 0 ? 0 : r0;
-              r1 = r1 < 0 ? 0 : r1;
-              r2 = r2 < 0 ? 0 : r2;
-              r3 = r3 < 0 ? 0 : r3;
-              context.arc(left + r0, top + r0, r0, -Math.PI, -Math.PI / 2);
-              context.arc(left + width - r1, top + r1, r1, -Math.PI / 2, 0);
-              context.arc(left + width - r2, top + height - r2, r2, 0, Math.PI / 2);
-              context.arc(left + r3, top + height - r3, r3, Math.PI / 2, Math.PI);
-            } else {
-              context.moveTo(startX, item.y);
-              context.lineTo(startX + item.width, item.y);
-              context.lineTo(startX + item.width, zeroPoints);
-              context.lineTo(startX, zeroPoints);
-              context.lineTo(startX, item.y);
-            }
-            context.setStrokeStyle(strokeColor);
-            context.setFillStyle(fillColor);
-            if(mountOption.borderWidth > 0){
-              context.setLineWidth(mountOption.borderWidth * opts.pix);
-              context.closePath();
-              context.stroke();
-            }
-            context.fill();
-          }
-        };
-        break;
-      case 'triangle':
-        for (let i = 0; i < points.length; i++) {
-          let item = points[i];
-          if (item !== null && i > leftNum && i < rightNum) {
-            var startX = item.x - eachSpacing*mountOption.widthRatio/2;
-            var height = opts.height - item.y - opts.area[2];
-            context.beginPath();
-            var fillColor = item.color || series[i].color
-            var strokeColor = item.color || series[i].color
-            if (mountOption.linearType !== 'none') {
-              var grd = context.createLinearGradient(startX, item.y, startX, zeroPoints);
-              //透明渐变
-              if (mountOption.linearType == 'opacity') {
-                grd.addColorStop(0, hexToRgb(fillColor, mountOption.linearOpacity));
-                grd.addColorStop(1, hexToRgb(fillColor, 1));
-              } else {
-                grd.addColorStop(0, hexToRgb(mountOption.customColor[series[i].linearIndex], mountOption.linearOpacity));
-                grd.addColorStop(mountOption.colorStop, hexToRgb(mountOption.customColor[series[i].linearIndex],mountOption.linearOpacity));
-                grd.addColorStop(1, hexToRgb(fillColor, 1));
-              }
-              fillColor = grd
-            }
-            context.moveTo(startX, zeroPoints);
-            context.lineTo(item.x, item.y);
-            context.lineTo(startX + item.width, zeroPoints);
-            context.setStrokeStyle(strokeColor);
-            context.setFillStyle(fillColor);
-            if(mountOption.borderWidth > 0){
-              context.setLineWidth(mountOption.borderWidth * opts.pix);
-              context.stroke();
-            }
-            context.fill();
-          }
-        };
-        break;
-      case 'mount':
-        for (let i = 0; i < points.length; i++) {
-          let item = points[i];
-          if (item !== null && i > leftNum && i < rightNum) {
-            var startX = item.x - eachSpacing*mountOption.widthRatio/2;
-            var height = opts.height - item.y - opts.area[2];
-            context.beginPath();
-            var fillColor = item.color || series[i].color
-            var strokeColor = item.color || series[i].color
-            if (mountOption.linearType !== 'none') {
-              var grd = context.createLinearGradient(startX, item.y, startX, zeroPoints);
-              //透明渐变
-              if (mountOption.linearType == 'opacity') {
-                grd.addColorStop(0, hexToRgb(fillColor, mountOption.linearOpacity));
-                grd.addColorStop(1, hexToRgb(fillColor, 1));
-              } else {
-                grd.addColorStop(0, hexToRgb(mountOption.customColor[series[i].linearIndex], mountOption.linearOpacity));
-                grd.addColorStop(mountOption.colorStop, hexToRgb(mountOption.customColor[series[i].linearIndex],mountOption.linearOpacity));
-                grd.addColorStop(1, hexToRgb(fillColor, 1));
-              }
-              fillColor = grd
-            }
-            context.moveTo(startX, zeroPoints);
-            context.bezierCurveTo(item.x - item.width/4, zeroPoints, item.x - item.width/4, item.y, item.x, item.y);
-            context.bezierCurveTo(item.x + item.width/4, item.y, item.x + item.width/4, zeroPoints, startX + item.width, zeroPoints);
-            context.setStrokeStyle(strokeColor);
-            context.setFillStyle(fillColor);
-            if(mountOption.borderWidth > 0){
-              context.setLineWidth(mountOption.borderWidth * opts.pix);
-              context.stroke();
-            }
-            context.fill();
-          }
-        };
-        break;
-      case 'sharp':
-        for (let i = 0; i < points.length; i++) {
-          let item = points[i];
-          if (item !== null && i > leftNum && i < rightNum) {
-            var startX = item.x - eachSpacing*mountOption.widthRatio/2;
-            var height = opts.height - item.y - opts.area[2];
-            context.beginPath();
-            var fillColor = item.color || series[i].color
-            var strokeColor = item.color || series[i].color
-            if (mountOption.linearType !== 'none') {
-              var grd = context.createLinearGradient(startX, item.y, startX, zeroPoints);
-              //透明渐变
-              if (mountOption.linearType == 'opacity') {
-                grd.addColorStop(0, hexToRgb(fillColor, mountOption.linearOpacity));
-                grd.addColorStop(1, hexToRgb(fillColor, 1));
-              } else {
-                grd.addColorStop(0, hexToRgb(mountOption.customColor[series[i].linearIndex], mountOption.linearOpacity));
-                grd.addColorStop(mountOption.colorStop, hexToRgb(mountOption.customColor[series[i].linearIndex],mountOption.linearOpacity));
-                grd.addColorStop(1, hexToRgb(fillColor, 1));
-              }
-              fillColor = grd
-            }
-            context.moveTo(startX, zeroPoints);
-            context.quadraticCurveTo(item.x - 0, zeroPoints - height/4, item.x, item.y);
-            context.quadraticCurveTo(item.x + 0, zeroPoints - height/4, startX + item.width, zeroPoints)
-            context.setStrokeStyle(strokeColor);
-            context.setFillStyle(fillColor);
-            if(mountOption.borderWidth > 0){
-              context.setLineWidth(mountOption.borderWidth * opts.pix);
-              context.stroke();
-            }
-            context.fill();
-          }
-        };
-        break;
-    }
-
-  if (opts.dataLabel !== false && process === 1) {
-    let ranges, minRange, maxRange;
-    ranges = [].concat(opts.chartData.yAxisData.ranges[0]);
-    minRange = ranges.pop();
-    maxRange = ranges.shift();
-    var points = getMountDataPoints(series, minRange, maxRange, xAxisPoints, eachSpacing, opts, mountOption, zeroPoints, process);
-    drawMountPointText(points, series, config, context, opts, zeroPoints);
-  }
-  context.restore();
-  return {
-    xAxisPoints: xAxisPoints,
-    calPoints: points,
-    eachSpacing: eachSpacing
-  };
+	let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	let xAxisData = opts.chartData.xAxisData,
+		xAxisPoints = xAxisData.xAxisPoints,
+		eachSpacing = xAxisData.eachSpacing;
+	let mountOption = assign({}, {
+		type: 'mount',
+		widthRatio: 1,
+		borderWidth: 1,
+		barBorderCircle: false,
+		barBorderRadius: [],
+		linearType: 'none',
+		linearOpacity: 1,
+		customColor: [],
+		colorStop: 0,
+	}, opts.extra.mount);
+	mountOption.widthRatio = mountOption.widthRatio <= 0 ? 0 : mountOption.widthRatio;
+	mountOption.widthRatio = mountOption.widthRatio >= 2 ? 2 : mountOption.widthRatio;
+	let calPoints = [];
+	context.save();
+	let leftNum = -2;
+	let rightNum = xAxisPoints.length + 2;
+	if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+		context.translate(opts._scrollDistance_, 0);
+		leftNum = Math.floor(-opts._scrollDistance_ / eachSpacing) - 2;
+		rightNum = leftNum + opts.xAxis.itemCount + 4;
+	}
+	mountOption.customColor = fillCustomColor(mountOption.linearType, mountOption.customColor, series, config);
+	let ranges, minRange, maxRange;
+	ranges = [].concat(opts.chartData.yAxisData.ranges[0]);
+	minRange = ranges.pop();
+	maxRange = ranges.shift();
+
+	// 计算0轴坐标
+	let spacingValid = opts.height - opts.area[0] - opts.area[2];
+	let zeroHeight = spacingValid * (0 - minRange) / (maxRange - minRange);
+	let zeroPoints = opts.height - Math.round(zeroHeight) - opts.area[2];
+
+	var points = getMountDataPoints(series, minRange, maxRange, xAxisPoints, eachSpacing, opts, mountOption, zeroPoints,
+		process);
+	switch (mountOption.type) {
+		case 'bar':
+			for (let i = 0; i < points.length; i++) {
+				let item = points[i];
+				if (item !== null && i > leftNum && i < rightNum) {
+					var startX = item.x - eachSpacing * mountOption.widthRatio / 2;
+					var height = opts.height - item.y - opts.area[2];
+					context.beginPath();
+					var fillColor = item.color || series[i].color
+					var strokeColor = item.color || series[i].color
+					if (mountOption.linearType !== 'none') {
+						var grd = context.createLinearGradient(startX, item.y, startX, zeroPoints);
+						//透明渐变
+						if (mountOption.linearType == 'opacity') {
+							grd.addColorStop(0, hexToRgb(fillColor, mountOption.linearOpacity));
+							grd.addColorStop(1, hexToRgb(fillColor, 1));
+						} else {
+							grd.addColorStop(0, hexToRgb(mountOption.customColor[series[i].linearIndex], mountOption.linearOpacity));
+							grd.addColorStop(mountOption.colorStop, hexToRgb(mountOption.customColor[series[i].linearIndex],
+								mountOption.linearOpacity));
+							grd.addColorStop(1, hexToRgb(fillColor, 1));
+						}
+						fillColor = grd
+					}
+					// 圆角边框
+					if ((mountOption.barBorderRadius && mountOption.barBorderRadius.length === 4) || mountOption
+						.barBorderCircle === true) {
+						const left = startX;
+						const top = item.y > zeroPoints ? zeroPoints : item.y;
+						const width = item.width;
+						const height = Math.abs(zeroPoints - item.y);
+						if (mountOption.barBorderCircle) {
+							mountOption.barBorderRadius = [width / 2, width / 2, 0, 0];
+						}
+						if (item.y > zeroPoints) {
+							mountOption.barBorderRadius = [0, 0, width / 2, width / 2];
+						}
+						let [r0, r1, r2, r3] = mountOption.barBorderRadius;
+						let minRadius = Math.min(width / 2, height / 2);
+						r0 = r0 > minRadius ? minRadius : r0;
+						r1 = r1 > minRadius ? minRadius : r1;
+						r2 = r2 > minRadius ? minRadius : r2;
+						r3 = r3 > minRadius ? minRadius : r3;
+						r0 = r0 < 0 ? 0 : r0;
+						r1 = r1 < 0 ? 0 : r1;
+						r2 = r2 < 0 ? 0 : r2;
+						r3 = r3 < 0 ? 0 : r3;
+						context.arc(left + r0, top + r0, r0, -Math.PI, -Math.PI / 2);
+						context.arc(left + width - r1, top + r1, r1, -Math.PI / 2, 0);
+						context.arc(left + width - r2, top + height - r2, r2, 0, Math.PI / 2);
+						context.arc(left + r3, top + height - r3, r3, Math.PI / 2, Math.PI);
+					} else {
+						context.moveTo(startX, item.y);
+						context.lineTo(startX + item.width, item.y);
+						context.lineTo(startX + item.width, zeroPoints);
+						context.lineTo(startX, zeroPoints);
+						context.lineTo(startX, item.y);
+					}
+					context.setStrokeStyle(strokeColor);
+					context.setFillStyle(fillColor);
+					if (mountOption.borderWidth > 0) {
+						context.setLineWidth(mountOption.borderWidth * opts.pix);
+						context.closePath();
+						context.stroke();
+					}
+					context.fill();
+				}
+			};
+			break;
+		case 'triangle':
+			for (let i = 0; i < points.length; i++) {
+				let item = points[i];
+				if (item !== null && i > leftNum && i < rightNum) {
+					var startX = item.x - eachSpacing * mountOption.widthRatio / 2;
+					var height = opts.height - item.y - opts.area[2];
+					context.beginPath();
+					var fillColor = item.color || series[i].color
+					var strokeColor = item.color || series[i].color
+					if (mountOption.linearType !== 'none') {
+						var grd = context.createLinearGradient(startX, item.y, startX, zeroPoints);
+						//透明渐变
+						if (mountOption.linearType == 'opacity') {
+							grd.addColorStop(0, hexToRgb(fillColor, mountOption.linearOpacity));
+							grd.addColorStop(1, hexToRgb(fillColor, 1));
+						} else {
+							grd.addColorStop(0, hexToRgb(mountOption.customColor[series[i].linearIndex], mountOption.linearOpacity));
+							grd.addColorStop(mountOption.colorStop, hexToRgb(mountOption.customColor[series[i].linearIndex],
+								mountOption.linearOpacity));
+							grd.addColorStop(1, hexToRgb(fillColor, 1));
+						}
+						fillColor = grd
+					}
+					context.moveTo(startX, zeroPoints);
+					context.lineTo(item.x, item.y);
+					context.lineTo(startX + item.width, zeroPoints);
+					context.setStrokeStyle(strokeColor);
+					context.setFillStyle(fillColor);
+					if (mountOption.borderWidth > 0) {
+						context.setLineWidth(mountOption.borderWidth * opts.pix);
+						context.stroke();
+					}
+					context.fill();
+				}
+			};
+			break;
+		case 'mount':
+			for (let i = 0; i < points.length; i++) {
+				let item = points[i];
+				if (item !== null && i > leftNum && i < rightNum) {
+					var startX = item.x - eachSpacing * mountOption.widthRatio / 2;
+					var height = opts.height - item.y - opts.area[2];
+					context.beginPath();
+					var fillColor = item.color || series[i].color
+					var strokeColor = item.color || series[i].color
+					if (mountOption.linearType !== 'none') {
+						var grd = context.createLinearGradient(startX, item.y, startX, zeroPoints);
+						//透明渐变
+						if (mountOption.linearType == 'opacity') {
+							grd.addColorStop(0, hexToRgb(fillColor, mountOption.linearOpacity));
+							grd.addColorStop(1, hexToRgb(fillColor, 1));
+						} else {
+							grd.addColorStop(0, hexToRgb(mountOption.customColor[series[i].linearIndex], mountOption.linearOpacity));
+							grd.addColorStop(mountOption.colorStop, hexToRgb(mountOption.customColor[series[i].linearIndex],
+								mountOption.linearOpacity));
+							grd.addColorStop(1, hexToRgb(fillColor, 1));
+						}
+						fillColor = grd
+					}
+					context.moveTo(startX, zeroPoints);
+					context.bezierCurveTo(item.x - item.width / 4, zeroPoints, item.x - item.width / 4, item.y, item.x, item.y);
+					context.bezierCurveTo(item.x + item.width / 4, item.y, item.x + item.width / 4, zeroPoints, startX + item
+						.width, zeroPoints);
+					context.setStrokeStyle(strokeColor);
+					context.setFillStyle(fillColor);
+					if (mountOption.borderWidth > 0) {
+						context.setLineWidth(mountOption.borderWidth * opts.pix);
+						context.stroke();
+					}
+					context.fill();
+				}
+			};
+			break;
+		case 'sharp':
+			for (let i = 0; i < points.length; i++) {
+				let item = points[i];
+				if (item !== null && i > leftNum && i < rightNum) {
+					var startX = item.x - eachSpacing * mountOption.widthRatio / 2;
+					var height = opts.height - item.y - opts.area[2];
+					context.beginPath();
+					var fillColor = item.color || series[i].color
+					var strokeColor = item.color || series[i].color
+					if (mountOption.linearType !== 'none') {
+						var grd = context.createLinearGradient(startX, item.y, startX, zeroPoints);
+						//透明渐变
+						if (mountOption.linearType == 'opacity') {
+							grd.addColorStop(0, hexToRgb(fillColor, mountOption.linearOpacity));
+							grd.addColorStop(1, hexToRgb(fillColor, 1));
+						} else {
+							grd.addColorStop(0, hexToRgb(mountOption.customColor[series[i].linearIndex], mountOption.linearOpacity));
+							grd.addColorStop(mountOption.colorStop, hexToRgb(mountOption.customColor[series[i].linearIndex],
+								mountOption.linearOpacity));
+							grd.addColorStop(1, hexToRgb(fillColor, 1));
+						}
+						fillColor = grd
+					}
+					context.moveTo(startX, zeroPoints);
+					context.quadraticCurveTo(item.x - 0, zeroPoints - height / 4, item.x, item.y);
+					context.quadraticCurveTo(item.x + 0, zeroPoints - height / 4, startX + item.width, zeroPoints)
+					context.setStrokeStyle(strokeColor);
+					context.setFillStyle(fillColor);
+					if (mountOption.borderWidth > 0) {
+						context.setLineWidth(mountOption.borderWidth * opts.pix);
+						context.stroke();
+					}
+					context.fill();
+				}
+			};
+			break;
+	}
+
+	if (opts.dataLabel !== false && process === 1) {
+		let ranges, minRange, maxRange;
+		ranges = [].concat(opts.chartData.yAxisData.ranges[0]);
+		minRange = ranges.pop();
+		maxRange = ranges.shift();
+		var points = getMountDataPoints(series, minRange, maxRange, xAxisPoints, eachSpacing, opts, mountOption, zeroPoints,
+			process);
+		drawMountPointText(points, series, config, context, opts, zeroPoints);
+	}
+	context.restore();
+	return {
+		xAxisPoints: xAxisPoints,
+		calPoints: points,
+		eachSpacing: eachSpacing
+	};
 }
 
 function drawBarDataPoints(series, opts, config, context) {
-  let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
-  let yAxisPoints = [];
-  let eachSpacing = (opts.height - opts.area[0] - opts.area[2])/opts.categories.length;
-  for (let i = 0; i < opts.categories.length; i++) {
-    yAxisPoints.push(opts.area[0] + eachSpacing / 2 + eachSpacing * i);
-  }
-  let columnOption = assign({}, {
-    type: 'group',
-    width: eachSpacing / 2,
-    meterBorder: 4,
-    meterFillColor: '#FFFFFF',
-    barBorderCircle: false,
-    barBorderRadius: [],
-    seriesGap: 2,
-    linearType: 'none',
-    linearOpacity: 1,
-    customColor: [],
-    colorStop: 0,
-  }, opts.extra.bar);
-  let calPoints = [];
-  context.save();
-  let leftNum = -2;
-  let rightNum = yAxisPoints.length + 2;
-  if (opts.tooltip && opts.tooltip.textList && opts.tooltip.textList.length && process === 1) {
-    drawBarToolTipSplitArea(opts.tooltip.offset.y, opts, config, context, eachSpacing);
-  }
-  columnOption.customColor = fillCustomColor(columnOption.linearType, columnOption.customColor, series, config);
-  series.forEach(function(eachSeries, seriesIndex) {
-    let ranges, minRange, maxRange;
-    ranges = [].concat(opts.chartData.xAxisData.ranges);
-    maxRange = ranges.pop();
-    minRange = ranges.shift();
-    var data = eachSeries.data;
-    switch (columnOption.type) {
-      case 'group':
-        var points = getBarDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config, process);
-        var tooltipPoints = getBarStackDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config, seriesIndex, series, process);
-        calPoints.push(tooltipPoints);
-        points = fixBarData(points, eachSpacing, series.length, seriesIndex, config, opts);
-        for (let i = 0; i < points.length; i++) {
-          let item = points[i];
-          //fix issues/I27B1N yyoinge & Joeshu
-          if (item !== null && i > leftNum && i < rightNum) {
-            //var startX = item.x - item.width / 2;
-            var startX = opts.area[3];
-            var startY = item.y - item.width / 2;
-            var height = item.height;
-            context.beginPath();
-            var fillColor = item.color || eachSeries.color
-            var strokeColor = item.color || eachSeries.color
-            if (columnOption.linearType !== 'none') {
-              var grd = context.createLinearGradient(startX, item.y, item.x, item.y);
-              //透明渐变
-              if (columnOption.linearType == 'opacity') {
-                grd.addColorStop(0, hexToRgb(fillColor, columnOption.linearOpacity));
-                grd.addColorStop(1, hexToRgb(fillColor, 1));
-              } else {
-                grd.addColorStop(0, hexToRgb(columnOption.customColor[eachSeries.linearIndex], columnOption.linearOpacity));
-                grd.addColorStop(columnOption.colorStop, hexToRgb(columnOption.customColor[eachSeries.linearIndex],columnOption.linearOpacity));
-                grd.addColorStop(1, hexToRgb(fillColor, 1));
-              }
-              fillColor = grd
-            }
-            // 圆角边框
-            if ((columnOption.barBorderRadius && columnOption.barBorderRadius.length === 4) || columnOption.barBorderCircle === true) {
-              const left = startX;
-              const width = item.width;
-              const top = item.y - item.width / 2;
-              const height = item.height;
-              if (columnOption.barBorderCircle) {
-                columnOption.barBorderRadius = [width / 2, width / 2, 0, 0];
-              }
-              let [r0, r1, r2, r3] = columnOption.barBorderRadius;
-              let minRadius = Math.min(width/2,height/2);
-              r0 = r0 > minRadius ? minRadius : r0;
-              r1 = r1 > minRadius ? minRadius : r1;
-              r2 = r2 > minRadius ? minRadius : r2;
-              r3 = r3 > minRadius ? minRadius : r3;
-              r0 = r0 < 0 ? 0 : r0;
-              r1 = r1 < 0 ? 0 : r1;
-              r2 = r2 < 0 ? 0 : r2;
-              r3 = r3 < 0 ? 0 : r3;
-              
-              context.arc(left + r3, top + r3, r3, -Math.PI, -Math.PI / 2);
-              context.arc(item.x - r0, top + r0, r0, -Math.PI / 2, 0);
-              context.arc(item.x - r1, top + width - r1, r1, 0, Math.PI / 2);
-              context.arc(left + r2, top + width - r2, r2, Math.PI / 2, Math.PI);
-            } else {
-              context.moveTo(startX, startY);
-              context.lineTo(item.x, startY);
-              context.lineTo(item.x, startY + item.width);
-              context.lineTo(startX, startY + item.width);
-              context.lineTo(startX, startY);
-              context.setLineWidth(1)
-              context.setStrokeStyle(strokeColor);
-            }
-            context.setFillStyle(fillColor);
-            context.closePath();
-            //context.stroke();
-            context.fill();
-          }
-        };
-        break;
-      case 'stack':
-        // 绘制堆叠数据图
-        var points = getBarStackDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config, seriesIndex, series, process);
-        calPoints.push(points);
-        points = fixBarStackData(points, eachSpacing, series.length, seriesIndex, config, opts, series);
-        for (let i = 0; i < points.length; i++) {
-          let item = points[i];
-          if (item !== null && i > leftNum && i < rightNum) {
-            context.beginPath();
-            var fillColor = item.color || eachSeries.color;
-            var startX = item.x0;
-            context.setFillStyle(fillColor);
-            context.moveTo(startX, item.y - item.width/2);
-            context.fillRect(startX, item.y - item.width/2, item.height , item.width);
-            context.closePath();
-            context.fill();
-          }
-        };
-        break;
-    }
-  });
-
-  if (opts.dataLabel !== false && process === 1) {
-    series.forEach(function(eachSeries, seriesIndex) {
-      let ranges, minRange, maxRange;
-      ranges = [].concat(opts.chartData.xAxisData.ranges);
-      maxRange = ranges.pop();
-      minRange = ranges.shift();
-      var data = eachSeries.data;
-      switch (columnOption.type) {
-        case 'group':
-          var points = getBarDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config, process);
-          points = fixBarData(points, eachSpacing, series.length, seriesIndex, config, opts);
-          drawBarPointText(points, eachSeries, config, context, opts);
-          break;
-        case 'stack':
-          var points = getBarStackDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config, seriesIndex, series, process);
-          drawBarPointText(points, eachSeries, config, context, opts);
-          break;
-      }
-    });
-  }
-  return {
-    yAxisPoints: yAxisPoints,
-    calPoints: calPoints,
-    eachSpacing: eachSpacing
-  };
+	let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	let yAxisPoints = [];
+	let eachSpacing = (opts.height - opts.area[0] - opts.area[2]) / opts.categories.length;
+	for (let i = 0; i < opts.categories.length; i++) {
+		yAxisPoints.push(opts.area[0] + eachSpacing / 2 + eachSpacing * i);
+	}
+	let columnOption = assign({}, {
+		type: 'group',
+		width: eachSpacing / 2,
+		meterBorder: 4,
+		meterFillColor: '#FFFFFF',
+		barBorderCircle: false,
+		barBorderRadius: [],
+		seriesGap: 2,
+		linearType: 'none',
+		linearOpacity: 1,
+		customColor: [],
+		colorStop: 0,
+	}, opts.extra.bar);
+	let calPoints = [];
+	context.save();
+	let leftNum = -2;
+	let rightNum = yAxisPoints.length + 2;
+	if (opts.tooltip && opts.tooltip.textList && opts.tooltip.textList.length && process === 1) {
+		drawBarToolTipSplitArea(opts.tooltip.offset.y, opts, config, context, eachSpacing);
+	}
+	columnOption.customColor = fillCustomColor(columnOption.linearType, columnOption.customColor, series, config);
+	series.forEach(function(eachSeries, seriesIndex) {
+		let ranges, minRange, maxRange;
+		ranges = [].concat(opts.chartData.xAxisData.ranges);
+		maxRange = ranges.pop();
+		minRange = ranges.shift();
+		var data = eachSeries.data;
+		switch (columnOption.type) {
+			case 'group':
+				var points = getBarDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config, process);
+				var tooltipPoints = getBarStackDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config,
+					seriesIndex, series, process);
+				calPoints.push(tooltipPoints);
+				points = fixBarData(points, eachSpacing, series.length, seriesIndex, config, opts);
+				for (let i = 0; i < points.length; i++) {
+					let item = points[i];
+					//fix issues/I27B1N yyoinge & Joeshu
+					if (item !== null && i > leftNum && i < rightNum) {
+						//var startX = item.x - item.width / 2;
+						var startX = opts.area[3];
+						var startY = item.y - item.width / 2;
+						var height = item.height;
+						context.beginPath();
+						var fillColor = item.color || eachSeries.color
+						var strokeColor = item.color || eachSeries.color
+						if (columnOption.linearType !== 'none') {
+							var grd = context.createLinearGradient(startX, item.y, item.x, item.y);
+							//透明渐变
+							if (columnOption.linearType == 'opacity') {
+								grd.addColorStop(0, hexToRgb(fillColor, columnOption.linearOpacity));
+								grd.addColorStop(1, hexToRgb(fillColor, 1));
+							} else {
+								grd.addColorStop(0, hexToRgb(columnOption.customColor[eachSeries.linearIndex], columnOption
+									.linearOpacity));
+								grd.addColorStop(columnOption.colorStop, hexToRgb(columnOption.customColor[eachSeries.linearIndex],
+									columnOption.linearOpacity));
+								grd.addColorStop(1, hexToRgb(fillColor, 1));
+							}
+							fillColor = grd
+						}
+						// 圆角边框
+						if ((columnOption.barBorderRadius && columnOption.barBorderRadius.length === 4) || columnOption
+							.barBorderCircle === true) {
+							const left = startX;
+							const width = item.width;
+							const top = item.y - item.width / 2;
+							const height = item.height;
+							if (columnOption.barBorderCircle) {
+								columnOption.barBorderRadius = [width / 2, width / 2, 0, 0];
+							}
+							let [r0, r1, r2, r3] = columnOption.barBorderRadius;
+							let minRadius = Math.min(width / 2, height / 2);
+							r0 = r0 > minRadius ? minRadius : r0;
+							r1 = r1 > minRadius ? minRadius : r1;
+							r2 = r2 > minRadius ? minRadius : r2;
+							r3 = r3 > minRadius ? minRadius : r3;
+							r0 = r0 < 0 ? 0 : r0;
+							r1 = r1 < 0 ? 0 : r1;
+							r2 = r2 < 0 ? 0 : r2;
+							r3 = r3 < 0 ? 0 : r3;
+
+							context.arc(left + r3, top + r3, r3, -Math.PI, -Math.PI / 2);
+							context.arc(item.x - r0, top + r0, r0, -Math.PI / 2, 0);
+							context.arc(item.x - r1, top + width - r1, r1, 0, Math.PI / 2);
+							context.arc(left + r2, top + width - r2, r2, Math.PI / 2, Math.PI);
+						} else {
+							context.moveTo(startX, startY);
+							context.lineTo(item.x, startY);
+							context.lineTo(item.x, startY + item.width);
+							context.lineTo(startX, startY + item.width);
+							context.lineTo(startX, startY);
+							context.setLineWidth(1)
+							context.setStrokeStyle(strokeColor);
+						}
+						context.setFillStyle(fillColor);
+						context.closePath();
+						//context.stroke();
+						context.fill();
+					}
+				};
+				break;
+			case 'stack':
+				// 绘制堆叠数据图
+				var points = getBarStackDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config,
+					seriesIndex, series, process);
+				calPoints.push(points);
+				points = fixBarStackData(points, eachSpacing, series.length, seriesIndex, config, opts, series);
+				for (let i = 0; i < points.length; i++) {
+					let item = points[i];
+					if (item !== null && i > leftNum && i < rightNum) {
+						context.beginPath();
+						var fillColor = item.color || eachSeries.color;
+						var startX = item.x0;
+						context.setFillStyle(fillColor);
+						context.moveTo(startX, item.y - item.width / 2);
+						context.fillRect(startX, item.y - item.width / 2, item.height, item.width);
+						context.closePath();
+						context.fill();
+					}
+				};
+				break;
+		}
+	});
+
+	if (opts.dataLabel !== false && process === 1) {
+		series.forEach(function(eachSeries, seriesIndex) {
+			let ranges, minRange, maxRange;
+			ranges = [].concat(opts.chartData.xAxisData.ranges);
+			maxRange = ranges.pop();
+			minRange = ranges.shift();
+			var data = eachSeries.data;
+			switch (columnOption.type) {
+				case 'group':
+					var points = getBarDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config, process);
+					points = fixBarData(points, eachSpacing, series.length, seriesIndex, config, opts);
+					drawBarPointText(points, eachSeries, config, context, opts);
+					break;
+				case 'stack':
+					var points = getBarStackDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config,
+						seriesIndex, series, process);
+					drawBarPointText(points, eachSeries, config, context, opts);
+					break;
+			}
+		});
+	}
+	return {
+		yAxisPoints: yAxisPoints,
+		calPoints: calPoints,
+		eachSpacing: eachSpacing
+	};
 }
 
 function drawCandleDataPoints(series, seriesMA, opts, config, context) {
-  var process = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
-  var candleOption = assign({}, {
-    color: {},
-    average: {}
-  }, opts.extra.candle);
-  candleOption.color = assign({}, {
-    upLine: '#f04864',
-    upFill: '#f04864',
-    downLine: '#2fc25b',
-    downFill: '#2fc25b'
-  }, candleOption.color);
-  candleOption.average = assign({}, {
-    show: false,
-    name: [],
-    day: [],
-    color: config.color
-  }, candleOption.average);
-  opts.extra.candle = candleOption;
-  let xAxisData = opts.chartData.xAxisData,
-    xAxisPoints = xAxisData.xAxisPoints,
-    eachSpacing = xAxisData.eachSpacing;
-  let calPoints = [];
-  context.save();
-  let leftNum = -2;
-  let rightNum = xAxisPoints.length + 2;
-  let leftSpace = 0;
-  let rightSpace = opts.width + eachSpacing;
-  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
-    context.translate(opts._scrollDistance_, 0);
-    leftNum = Math.floor(-opts._scrollDistance_ / eachSpacing) - 2;
-    rightNum = leftNum + opts.xAxis.itemCount + 4;
-    leftSpace = -opts._scrollDistance_ - eachSpacing * 2 + opts.area[3];
-    rightSpace = leftSpace + (opts.xAxis.itemCount + 4) * eachSpacing;
-  }
-  //画均线
-  if (candleOption.average.show || seriesMA) { //Merge pull request !12 from 邱贵翔
-    seriesMA.forEach(function(eachSeries, seriesIndex) {
-      let ranges, minRange, maxRange;
-      ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
-      minRange = ranges.pop();
-      maxRange = ranges.shift();
-      var data = eachSeries.data;
-      var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
-      var splitPointList = splitPoints(points,eachSeries);
-      for (let i = 0; i < splitPointList.length; i++) {
-        let points = splitPointList[i];
-        context.beginPath();
-        context.setStrokeStyle(eachSeries.color);
-        context.setLineWidth(1);
-        if (points.length === 1) {
-          context.moveTo(points[0].x, points[0].y);
-          context.arc(points[0].x, points[0].y, 1, 0, 2 * Math.PI);
-        } else {
-          context.moveTo(points[0].x, points[0].y);
-          let startPoint = 0;
-          for (let j = 0; j < points.length; j++) {
-            let item = points[j];
-            if (startPoint == 0 && item.x > leftSpace) {
-              context.moveTo(item.x, item.y);
-              startPoint = 1;
-            }
-            if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
-              var ctrlPoint = createCurveControlPoints(points, j - 1);
-              context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y, item.x,
-                item.y);
-            }
-          }
-          context.moveTo(points[0].x, points[0].y);
-        }
-        context.closePath();
-        context.stroke();
-      }
-    });
-  }
-  //画K线
-  series.forEach(function(eachSeries, seriesIndex) {
-    let ranges, minRange, maxRange;
-    ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
-    minRange = ranges.pop();
-    maxRange = ranges.shift();
-    var data = eachSeries.data;
-    var points = getCandleDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
-    calPoints.push(points);
-    var splitPointList = splitPoints(points,eachSeries);
-    for (let i = 0; i < splitPointList[0].length; i++) {
-      if (i > leftNum && i < rightNum) {
-        let item = splitPointList[0][i];
-        context.beginPath();
-        //如果上涨
-        if (data[i][1] - data[i][0] > 0) {
-          context.setStrokeStyle(candleOption.color.upLine);
-          context.setFillStyle(candleOption.color.upFill);
-          context.setLineWidth(1 * opts.pix);
-          context.moveTo(item[3].x, item[3].y); //顶点
-          context.lineTo(item[1].x, item[1].y); //收盘中间点
-          context.lineTo(item[1].x - eachSpacing / 4, item[1].y); //收盘左侧点
-          context.lineTo(item[0].x - eachSpacing / 4, item[0].y); //开盘左侧点
-          context.lineTo(item[0].x, item[0].y); //开盘中间点
-          context.lineTo(item[2].x, item[2].y); //底点
-          context.lineTo(item[0].x, item[0].y); //开盘中间点
-          context.lineTo(item[0].x + eachSpacing / 4, item[0].y); //开盘右侧点
-          context.lineTo(item[1].x + eachSpacing / 4, item[1].y); //收盘右侧点
-          context.lineTo(item[1].x, item[1].y); //收盘中间点
-          context.moveTo(item[3].x, item[3].y); //顶点
-        } else {
-          context.setStrokeStyle(candleOption.color.downLine);
-          context.setFillStyle(candleOption.color.downFill);
-          context.setLineWidth(1 * opts.pix);
-          context.moveTo(item[3].x, item[3].y); //顶点
-          context.lineTo(item[0].x, item[0].y); //开盘中间点
-          context.lineTo(item[0].x - eachSpacing / 4, item[0].y); //开盘左侧点
-          context.lineTo(item[1].x - eachSpacing / 4, item[1].y); //收盘左侧点
-          context.lineTo(item[1].x, item[1].y); //收盘中间点
-          context.lineTo(item[2].x, item[2].y); //底点
-          context.lineTo(item[1].x, item[1].y); //收盘中间点
-          context.lineTo(item[1].x + eachSpacing / 4, item[1].y); //收盘右侧点
-          context.lineTo(item[0].x + eachSpacing / 4, item[0].y); //开盘右侧点
-          context.lineTo(item[0].x, item[0].y); //开盘中间点
-          context.moveTo(item[3].x, item[3].y); //顶点
-        }
-        context.closePath();
-        context.fill();
-        context.stroke();
-      }
-    }
-  });
-  context.restore();
-  return {
-    xAxisPoints: xAxisPoints,
-    calPoints: calPoints,
-    eachSpacing: eachSpacing
-  };
+	var process = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
+	var candleOption = assign({}, {
+		color: {},
+		average: {}
+	}, opts.extra.candle);
+	candleOption.color = assign({}, {
+		upLine: '#f04864',
+		upFill: '#f04864',
+		downLine: '#2fc25b',
+		downFill: '#2fc25b'
+	}, candleOption.color);
+	candleOption.average = assign({}, {
+		show: false,
+		name: [],
+		day: [],
+		color: config.color
+	}, candleOption.average);
+	opts.extra.candle = candleOption;
+	let xAxisData = opts.chartData.xAxisData,
+		xAxisPoints = xAxisData.xAxisPoints,
+		eachSpacing = xAxisData.eachSpacing;
+	let calPoints = [];
+	context.save();
+	let leftNum = -2;
+	let rightNum = xAxisPoints.length + 2;
+	let leftSpace = 0;
+	let rightSpace = opts.width + eachSpacing;
+	if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+		context.translate(opts._scrollDistance_, 0);
+		leftNum = Math.floor(-opts._scrollDistance_ / eachSpacing) - 2;
+		rightNum = leftNum + opts.xAxis.itemCount + 4;
+		leftSpace = -opts._scrollDistance_ - eachSpacing * 2 + opts.area[3];
+		rightSpace = leftSpace + (opts.xAxis.itemCount + 4) * eachSpacing;
+	}
+	//画均线
+	if (candleOption.average.show || seriesMA) { //Merge pull request !12 from 邱贵翔
+		seriesMA.forEach(function(eachSeries, seriesIndex) {
+			let ranges, minRange, maxRange;
+			ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+			minRange = ranges.pop();
+			maxRange = ranges.shift();
+			var data = eachSeries.data;
+			var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+			var splitPointList = splitPoints(points, eachSeries);
+			for (let i = 0; i < splitPointList.length; i++) {
+				let points = splitPointList[i];
+				context.beginPath();
+				context.setStrokeStyle(eachSeries.color);
+				context.setLineWidth(1);
+				if (points.length === 1) {
+					context.moveTo(points[0].x, points[0].y);
+					context.arc(points[0].x, points[0].y, 1, 0, 2 * Math.PI);
+				} else {
+					context.moveTo(points[0].x, points[0].y);
+					let startPoint = 0;
+					for (let j = 0; j < points.length; j++) {
+						let item = points[j];
+						if (startPoint == 0 && item.x > leftSpace) {
+							context.moveTo(item.x, item.y);
+							startPoint = 1;
+						}
+						if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+							var ctrlPoint = createCurveControlPoints(points, j - 1);
+							context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y, item.x,
+								item.y);
+						}
+					}
+					context.moveTo(points[0].x, points[0].y);
+				}
+				context.closePath();
+				context.stroke();
+			}
+		});
+	}
+	//画K线
+	series.forEach(function(eachSeries, seriesIndex) {
+		let ranges, minRange, maxRange;
+		ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+		minRange = ranges.pop();
+		maxRange = ranges.shift();
+		var data = eachSeries.data;
+		var points = getCandleDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+		calPoints.push(points);
+		var splitPointList = splitPoints(points, eachSeries);
+		for (let i = 0; i < splitPointList[0].length; i++) {
+			if (i > leftNum && i < rightNum) {
+				let item = splitPointList[0][i];
+				context.beginPath();
+				//如果上涨
+				if (data[i][1] - data[i][0] > 0) {
+					context.setStrokeStyle(candleOption.color.upLine);
+					context.setFillStyle(candleOption.color.upFill);
+					context.setLineWidth(1 * opts.pix);
+					context.moveTo(item[3].x, item[3].y); //顶点
+					context.lineTo(item[1].x, item[1].y); //收盘中间点
+					context.lineTo(item[1].x - eachSpacing / 4, item[1].y); //收盘左侧点
+					context.lineTo(item[0].x - eachSpacing / 4, item[0].y); //开盘左侧点
+					context.lineTo(item[0].x, item[0].y); //开盘中间点
+					context.lineTo(item[2].x, item[2].y); //底点
+					context.lineTo(item[0].x, item[0].y); //开盘中间点
+					context.lineTo(item[0].x + eachSpacing / 4, item[0].y); //开盘右侧点
+					context.lineTo(item[1].x + eachSpacing / 4, item[1].y); //收盘右侧点
+					context.lineTo(item[1].x, item[1].y); //收盘中间点
+					context.moveTo(item[3].x, item[3].y); //顶点
+				} else {
+					context.setStrokeStyle(candleOption.color.downLine);
+					context.setFillStyle(candleOption.color.downFill);
+					context.setLineWidth(1 * opts.pix);
+					context.moveTo(item[3].x, item[3].y); //顶点
+					context.lineTo(item[0].x, item[0].y); //开盘中间点
+					context.lineTo(item[0].x - eachSpacing / 4, item[0].y); //开盘左侧点
+					context.lineTo(item[1].x - eachSpacing / 4, item[1].y); //收盘左侧点
+					context.lineTo(item[1].x, item[1].y); //收盘中间点
+					context.lineTo(item[2].x, item[2].y); //底点
+					context.lineTo(item[1].x, item[1].y); //收盘中间点
+					context.lineTo(item[1].x + eachSpacing / 4, item[1].y); //收盘右侧点
+					context.lineTo(item[0].x + eachSpacing / 4, item[0].y); //开盘右侧点
+					context.lineTo(item[0].x, item[0].y); //开盘中间点
+					context.moveTo(item[3].x, item[3].y); //顶点
+				}
+				context.closePath();
+				context.fill();
+				context.stroke();
+			}
+		}
+	});
+	context.restore();
+	return {
+		xAxisPoints: xAxisPoints,
+		calPoints: calPoints,
+		eachSpacing: eachSpacing
+	};
 }
 
 function drawAreaDataPoints(series, opts, config, context) {
-  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
-  var areaOption = assign({}, {
-    type: 'straight',
-    opacity: 0.2,
-    addLine: false,
-    width: 2,
-    gradient: false,
-    activeType: 'none'
-  }, opts.extra.area);
-  let xAxisData = opts.chartData.xAxisData,
-    xAxisPoints = xAxisData.xAxisPoints,
-    eachSpacing = xAxisData.eachSpacing;
-  let endY = opts.height - opts.area[2];
-  let calPoints = [];
-  context.save();
-  let leftSpace = 0;
-  let rightSpace = opts.width + eachSpacing;
-  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
-    context.translate(opts._scrollDistance_, 0);
-    leftSpace = -opts._scrollDistance_ - eachSpacing * 2 + opts.area[3];
-    rightSpace = leftSpace + (opts.xAxis.itemCount + 4) * eachSpacing;
-  }
-  series.forEach(function(eachSeries, seriesIndex) {
-    let ranges, minRange, maxRange;
-    ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
-    minRange = ranges.pop();
-    maxRange = ranges.shift();
-    let data = eachSeries.data;
-    let points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
-    calPoints.push(points);
-    let splitPointList = splitPoints(points,eachSeries);
-    for (let i = 0; i < splitPointList.length; i++) {
-      let points = splitPointList[i];
-      // 绘制区域数
-      context.beginPath();
-      context.setStrokeStyle(hexToRgb(eachSeries.color, areaOption.opacity));
-      if (areaOption.gradient) {
-        let gradient = context.createLinearGradient(0, opts.area[0], 0, opts.height - opts.area[2]);
-        gradient.addColorStop('0', hexToRgb(eachSeries.color, areaOption.opacity));
-        gradient.addColorStop('1.0', hexToRgb("#FFFFFF", 0.1));
-        context.setFillStyle(gradient);
-      } else {
-        context.setFillStyle(hexToRgb(eachSeries.color, areaOption.opacity));
-      }
-      context.setLineWidth(areaOption.width * opts.pix);
-      if (points.length > 1) {
-        let firstPoint = points[0];
-        let lastPoint = points[points.length - 1];
-        context.moveTo(firstPoint.x, firstPoint.y);
-        let startPoint = 0;
-        if (areaOption.type === 'curve') {
-          for (let j = 0; j < points.length; j++) {
-            let item = points[j];
-            if (startPoint == 0 && item.x > leftSpace) {
-              context.moveTo(item.x, item.y);
-              startPoint = 1;
-            }
-            if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
-              let ctrlPoint = createCurveControlPoints(points, j - 1);
-              context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y, item.x, item.y);
-            }
-          };
-        } 
-        if (areaOption.type === 'straight') {
-          for (let j = 0; j < points.length; j++) {
-            let item = points[j];
-            if (startPoint == 0 && item.x > leftSpace) {
-              context.moveTo(item.x, item.y);
-              startPoint = 1;
-            }
-            if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
-              context.lineTo(item.x, item.y);
-            }
-          };
-        }
-        if (areaOption.type === 'step') {
-          for (let j = 0; j < points.length; j++) {
-            let item = points[j];
-            if (startPoint == 0 && item.x > leftSpace) {
-              context.moveTo(item.x, item.y);
-              startPoint = 1;
-            }
-            if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
-              context.lineTo(item.x, points[j - 1].y);
-              context.lineTo(item.x, item.y);
-            }
-          };
-        }
-        context.lineTo(lastPoint.x, endY);
-        context.lineTo(firstPoint.x, endY);
-        context.lineTo(firstPoint.x, firstPoint.y);
-      } else {
-        let item = points[0];
-        context.moveTo(item.x - eachSpacing / 2, item.y);
-        // context.lineTo(item.x + eachSpacing / 2, item.y);
-        // context.lineTo(item.x + eachSpacing / 2, endY);
-        // context.lineTo(item.x - eachSpacing / 2, endY);
-        // context.moveTo(item.x - eachSpacing / 2, item.y);
-      }
-      context.closePath();
-      context.fill();
-      //画连线
-      if (areaOption.addLine) {
-        if (eachSeries.lineType == 'dash') {
-          let dashLength = eachSeries.dashLength ? eachSeries.dashLength : 8;
-          dashLength *= opts.pix;
-          context.setLineDash([dashLength, dashLength]);
-        }
-        context.beginPath();
-        context.setStrokeStyle(eachSeries.color);
-        context.setLineWidth(areaOption.width * opts.pix);
-        if (points.length === 1) {
-          context.moveTo(points[0].x, points[0].y);
-          // context.arc(points[0].x, points[0].y, 1, 0, 2 * Math.PI);
-        } else {
-          context.moveTo(points[0].x, points[0].y);
-          let startPoint = 0;
-          if (areaOption.type === 'curve') {
-            for (let j = 0; j < points.length; j++) {
-              let item = points[j];
-              if (startPoint == 0 && item.x > leftSpace) {
-                context.moveTo(item.x, item.y);
-                startPoint = 1;
-              }
-              if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
-                let ctrlPoint = createCurveControlPoints(points, j - 1);
-                context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y, item.x, item.y);
-              }
-            };
-          }
-          if (areaOption.type === 'straight') {
-            for (let j = 0; j < points.length; j++) {
-              let item = points[j];
-              if (startPoint == 0 && item.x > leftSpace) {
-                context.moveTo(item.x, item.y);
-                startPoint = 1;
-              }
-              if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
-                context.lineTo(item.x, item.y);
-              }
-            };
-          }
-          if (areaOption.type === 'step') {
-            for (let j = 0; j < points.length; j++) {
-              let item = points[j];
-              if (startPoint == 0 && item.x > leftSpace) {
-                context.moveTo(item.x, item.y);
-                startPoint = 1;
-              }
-              if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
-                context.lineTo(item.x, points[j - 1].y);
-                context.lineTo(item.x, item.y);
-              }
-            };
-          }
-          context.moveTo(points[0].x, points[0].y);
-        }
-        context.stroke();
-        context.setLineDash([]);
-      }
-    }
-    //画点
-    if (opts.dataPointShape !== false) {
-      drawPointShape(points, eachSeries.color, eachSeries.pointShape, context, opts);
-    }
-    drawActivePoint(points, eachSeries.color, eachSeries.pointShape, context, opts, areaOption,seriesIndex);
-  });
-
-  if (opts.dataLabel !== false && process === 1) {
-    series.forEach(function(eachSeries, seriesIndex) {
-      let ranges, minRange, maxRange;
-      ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
-      minRange = ranges.pop();
-      maxRange = ranges.shift();
-      var data = eachSeries.data;
-      var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
-      drawPointText(points, eachSeries, config, context, opts);
-    });
-  }
-  context.restore();
-  return {
-    xAxisPoints: xAxisPoints,
-    calPoints: calPoints,
-    eachSpacing: eachSpacing
-  };
+	var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	var areaOption = assign({}, {
+		type: 'straight',
+		opacity: 0.2,
+		addLine: false,
+		width: 2,
+		gradient: false,
+		activeType: 'none'
+	}, opts.extra.area);
+	let xAxisData = opts.chartData.xAxisData,
+		xAxisPoints = xAxisData.xAxisPoints,
+		eachSpacing = xAxisData.eachSpacing;
+	let endY = opts.height - opts.area[2];
+	let calPoints = [];
+	context.save();
+	let leftSpace = 0;
+	let rightSpace = opts.width + eachSpacing;
+	if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+		context.translate(opts._scrollDistance_, 0);
+		leftSpace = -opts._scrollDistance_ - eachSpacing * 2 + opts.area[3];
+		rightSpace = leftSpace + (opts.xAxis.itemCount + 4) * eachSpacing;
+	}
+	series.forEach(function(eachSeries, seriesIndex) {
+		let ranges, minRange, maxRange;
+		ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+		minRange = ranges.pop();
+		maxRange = ranges.shift();
+		let data = eachSeries.data;
+		let points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+		calPoints.push(points);
+		let splitPointList = splitPoints(points, eachSeries);
+		for (let i = 0; i < splitPointList.length; i++) {
+			let points = splitPointList[i];
+			// 绘制区域数
+			context.beginPath();
+			context.setStrokeStyle(hexToRgb(eachSeries.color, areaOption.opacity));
+			if (areaOption.gradient) {
+				let gradient = context.createLinearGradient(0, opts.area[0], 0, opts.height - opts.area[2]);
+				gradient.addColorStop('0', hexToRgb(eachSeries.color, areaOption.opacity));
+				gradient.addColorStop('1.0', hexToRgb("#FFFFFF", 0.1));
+				context.setFillStyle(gradient);
+			} else {
+				context.setFillStyle(hexToRgb(eachSeries.color, areaOption.opacity));
+			}
+			context.setLineWidth(areaOption.width * opts.pix);
+			if (points.length > 1) {
+				let firstPoint = points[0];
+				let lastPoint = points[points.length - 1];
+				context.moveTo(firstPoint.x, firstPoint.y);
+				let startPoint = 0;
+				if (areaOption.type === 'curve') {
+					for (let j = 0; j < points.length; j++) {
+						let item = points[j];
+						if (startPoint == 0 && item.x > leftSpace) {
+							context.moveTo(item.x, item.y);
+							startPoint = 1;
+						}
+						if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+							let ctrlPoint = createCurveControlPoints(points, j - 1);
+							context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y, item.x,
+								item.y);
+						}
+					};
+				}
+				if (areaOption.type === 'straight') {
+					for (let j = 0; j < points.length; j++) {
+						let item = points[j];
+						if (startPoint == 0 && item.x > leftSpace) {
+							context.moveTo(item.x, item.y);
+							startPoint = 1;
+						}
+						if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+							context.lineTo(item.x, item.y);
+						}
+					};
+				}
+				if (areaOption.type === 'step') {
+					for (let j = 0; j < points.length; j++) {
+						let item = points[j];
+						if (startPoint == 0 && item.x > leftSpace) {
+							context.moveTo(item.x, item.y);
+							startPoint = 1;
+						}
+						if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+							context.lineTo(item.x, points[j - 1].y);
+							context.lineTo(item.x, item.y);
+						}
+					};
+				}
+				context.lineTo(lastPoint.x, endY);
+				context.lineTo(firstPoint.x, endY);
+				context.lineTo(firstPoint.x, firstPoint.y);
+			} else {
+				let item = points[0];
+				context.moveTo(item.x - eachSpacing / 2, item.y);
+				// context.lineTo(item.x + eachSpacing / 2, item.y);
+				// context.lineTo(item.x + eachSpacing / 2, endY);
+				// context.lineTo(item.x - eachSpacing / 2, endY);
+				// context.moveTo(item.x - eachSpacing / 2, item.y);
+			}
+			context.closePath();
+			context.fill();
+			//画连线
+			if (areaOption.addLine) {
+				if (eachSeries.lineType == 'dash') {
+					let dashLength = eachSeries.dashLength ? eachSeries.dashLength : 8;
+					dashLength *= opts.pix;
+					context.setLineDash([dashLength, dashLength]);
+				}
+				context.beginPath();
+				context.setStrokeStyle(eachSeries.color);
+				context.setLineWidth(areaOption.width * opts.pix);
+				if (points.length === 1) {
+					context.moveTo(points[0].x, points[0].y);
+					// context.arc(points[0].x, points[0].y, 1, 0, 2 * Math.PI);
+				} else {
+					context.moveTo(points[0].x, points[0].y);
+					let startPoint = 0;
+					if (areaOption.type === 'curve') {
+						for (let j = 0; j < points.length; j++) {
+							let item = points[j];
+							if (startPoint == 0 && item.x > leftSpace) {
+								context.moveTo(item.x, item.y);
+								startPoint = 1;
+							}
+							if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+								let ctrlPoint = createCurveControlPoints(points, j - 1);
+								context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y, item
+									.x, item.y);
+							}
+						};
+					}
+					if (areaOption.type === 'straight') {
+						for (let j = 0; j < points.length; j++) {
+							let item = points[j];
+							if (startPoint == 0 && item.x > leftSpace) {
+								context.moveTo(item.x, item.y);
+								startPoint = 1;
+							}
+							if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+								context.lineTo(item.x, item.y);
+							}
+						};
+					}
+					if (areaOption.type === 'step') {
+						for (let j = 0; j < points.length; j++) {
+							let item = points[j];
+							if (startPoint == 0 && item.x > leftSpace) {
+								context.moveTo(item.x, item.y);
+								startPoint = 1;
+							}
+							if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+								context.lineTo(item.x, points[j - 1].y);
+								context.lineTo(item.x, item.y);
+							}
+						};
+					}
+					context.moveTo(points[0].x, points[0].y);
+				}
+				context.stroke();
+				context.setLineDash([]);
+			}
+		}
+		//画点
+		if (opts.dataPointShape !== false) {
+			drawPointShape(points, eachSeries.color, eachSeries.pointShape, context, opts);
+		}
+		drawActivePoint(points, eachSeries.color, eachSeries.pointShape, context, opts, areaOption, seriesIndex);
+	});
+
+	if (opts.dataLabel !== false && process === 1) {
+		series.forEach(function(eachSeries, seriesIndex) {
+			let ranges, minRange, maxRange;
+			ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+			minRange = ranges.pop();
+			maxRange = ranges.shift();
+			var data = eachSeries.data;
+			var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+			drawPointText(points, eachSeries, config, context, opts);
+		});
+	}
+	context.restore();
+	return {
+		xAxisPoints: xAxisPoints,
+		calPoints: calPoints,
+		eachSpacing: eachSpacing
+	};
 }
 
 function drawScatterDataPoints(series, opts, config, context) {
-  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
-  var scatterOption = assign({}, {
-    type: 'circle'
-  }, opts.extra.scatter);
-  let xAxisData = opts.chartData.xAxisData,
-    xAxisPoints = xAxisData.xAxisPoints,
-    eachSpacing = xAxisData.eachSpacing;
-  var calPoints = [];
-  context.save();
-  let leftSpace = 0;
-  let rightSpace = opts.width + eachSpacing;
-  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
-    context.translate(opts._scrollDistance_, 0);
-    leftSpace = -opts._scrollDistance_ - eachSpacing * 2 + opts.area[3];
-    rightSpace = leftSpace + (opts.xAxis.itemCount + 4) * eachSpacing;
-  }
-  series.forEach(function(eachSeries, seriesIndex) {
-    let ranges, minRange, maxRange;
-    ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
-    minRange = ranges.pop();
-    maxRange = ranges.shift();
-    var data = eachSeries.data;
-    var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
-    context.beginPath();
-    context.setStrokeStyle(eachSeries.color);
-    context.setFillStyle(eachSeries.color);
-    context.setLineWidth(1 * opts.pix);
-    var shape = eachSeries.pointShape;
-    if (shape === 'diamond') {
-      points.forEach(function(item, index) {
-        if (item !== null) {
-          context.moveTo(item.x, item.y - 4.5);
-          context.lineTo(item.x - 4.5, item.y);
-          context.lineTo(item.x, item.y + 4.5);
-          context.lineTo(item.x + 4.5, item.y);
-          context.lineTo(item.x, item.y - 4.5);
-        }
-      });
-    } else if (shape === 'circle') {
-      points.forEach(function(item, index) {
-        if (item !== null) {
-          context.moveTo(item.x + 2.5 * opts.pix, item.y);
-          context.arc(item.x, item.y, 3 * opts.pix, 0, 2 * Math.PI, false);
-        }
-      });
-    } else if (shape === 'square') {
-      points.forEach(function(item, index) {
-        if (item !== null) {
-          context.moveTo(item.x - 3.5, item.y - 3.5);
-          context.rect(item.x - 3.5, item.y - 3.5, 7, 7);
-        }
-      });
-    } else if (shape === 'triangle') {
-      points.forEach(function(item, index) {
-        if (item !== null) {
-          context.moveTo(item.x, item.y - 4.5);
-          context.lineTo(item.x - 4.5, item.y + 4.5);
-          context.lineTo(item.x + 4.5, item.y + 4.5);
-          context.lineTo(item.x, item.y - 4.5);
-        }
-      });
-    } else if (shape === 'triangle') {
-      return;
-    }
-    context.closePath();
-    context.fill();
-    context.stroke();
-  });
-  if (opts.dataLabel !== false && process === 1) {
-    series.forEach(function(eachSeries, seriesIndex) {
-      let ranges, minRange, maxRange;
-      ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
-      minRange = ranges.pop();
-      maxRange = ranges.shift();
-      var data = eachSeries.data;
-      var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
-      drawPointText(points, eachSeries, config, context, opts);
-    });
-  }
-  context.restore();
-  return {
-    xAxisPoints: xAxisPoints,
-    calPoints: calPoints,
-    eachSpacing: eachSpacing
-  };
+	var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	var scatterOption = assign({}, {
+		type: 'circle'
+	}, opts.extra.scatter);
+	let xAxisData = opts.chartData.xAxisData,
+		xAxisPoints = xAxisData.xAxisPoints,
+		eachSpacing = xAxisData.eachSpacing;
+	var calPoints = [];
+	context.save();
+	let leftSpace = 0;
+	let rightSpace = opts.width + eachSpacing;
+	if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+		context.translate(opts._scrollDistance_, 0);
+		leftSpace = -opts._scrollDistance_ - eachSpacing * 2 + opts.area[3];
+		rightSpace = leftSpace + (opts.xAxis.itemCount + 4) * eachSpacing;
+	}
+	series.forEach(function(eachSeries, seriesIndex) {
+		let ranges, minRange, maxRange;
+		ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+		minRange = ranges.pop();
+		maxRange = ranges.shift();
+		var data = eachSeries.data;
+		var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+		context.beginPath();
+		context.setStrokeStyle(eachSeries.color);
+		context.setFillStyle(eachSeries.color);
+		context.setLineWidth(1 * opts.pix);
+		var shape = eachSeries.pointShape;
+		if (shape === 'diamond') {
+			points.forEach(function(item, index) {
+				if (item !== null) {
+					context.moveTo(item.x, item.y - 4.5);
+					context.lineTo(item.x - 4.5, item.y);
+					context.lineTo(item.x, item.y + 4.5);
+					context.lineTo(item.x + 4.5, item.y);
+					context.lineTo(item.x, item.y - 4.5);
+				}
+			});
+		} else if (shape === 'circle') {
+			points.forEach(function(item, index) {
+				if (item !== null) {
+					context.moveTo(item.x + 2.5 * opts.pix, item.y);
+					context.arc(item.x, item.y, 3 * opts.pix, 0, 2 * Math.PI, false);
+				}
+			});
+		} else if (shape === 'square') {
+			points.forEach(function(item, index) {
+				if (item !== null) {
+					context.moveTo(item.x - 3.5, item.y - 3.5);
+					context.rect(item.x - 3.5, item.y - 3.5, 7, 7);
+				}
+			});
+		} else if (shape === 'triangle') {
+			points.forEach(function(item, index) {
+				if (item !== null) {
+					context.moveTo(item.x, item.y - 4.5);
+					context.lineTo(item.x - 4.5, item.y + 4.5);
+					context.lineTo(item.x + 4.5, item.y + 4.5);
+					context.lineTo(item.x, item.y - 4.5);
+				}
+			});
+		} else if (shape === 'triangle') {
+			return;
+		}
+		context.closePath();
+		context.fill();
+		context.stroke();
+	});
+	if (opts.dataLabel !== false && process === 1) {
+		series.forEach(function(eachSeries, seriesIndex) {
+			let ranges, minRange, maxRange;
+			ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+			minRange = ranges.pop();
+			maxRange = ranges.shift();
+			var data = eachSeries.data;
+			var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+			drawPointText(points, eachSeries, config, context, opts);
+		});
+	}
+	context.restore();
+	return {
+		xAxisPoints: xAxisPoints,
+		calPoints: calPoints,
+		eachSpacing: eachSpacing
+	};
 }
 
 function drawBubbleDataPoints(series, opts, config, context) {
-  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
-  var bubbleOption = assign({}, {
-    opacity: 1,
-    border:2
-  }, opts.extra.bubble);
-  let xAxisData = opts.chartData.xAxisData,
-    xAxisPoints = xAxisData.xAxisPoints,
-    eachSpacing = xAxisData.eachSpacing;
-  var calPoints = [];
-  context.save();
-  let leftSpace = 0;
-  let rightSpace = opts.width + eachSpacing;
-  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
-    context.translate(opts._scrollDistance_, 0);
-    leftSpace = -opts._scrollDistance_ - eachSpacing * 2 + opts.area[3];
-    rightSpace = leftSpace + (opts.xAxis.itemCount + 4) * eachSpacing;
-  }
-  series.forEach(function(eachSeries, seriesIndex) {
-    let ranges, minRange, maxRange;
-    ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
-    minRange = ranges.pop();
-    maxRange = ranges.shift();
-    var data = eachSeries.data;
-    var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
-    context.beginPath();
-    context.setStrokeStyle(eachSeries.color);
-    context.setLineWidth(bubbleOption.border * opts.pix);
-    context.setFillStyle(hexToRgb(eachSeries.color, bubbleOption.opacity));
-    points.forEach(function(item, index) {
-      context.moveTo(item.x + item.r, item.y);
-      context.arc(item.x, item.y, item.r * opts.pix, 0, 2 * Math.PI, false);
-    });
-    context.closePath();
-    context.fill();
-    context.stroke();
-    
-    if (opts.dataLabel !== false && process === 1) {
-      points.forEach(function(item, index) {
-        context.beginPath();
-        var fontSize = eachSeries.textSize * opts.pix || config.fontSize;
-        context.setFontSize(fontSize);
-        context.setFillStyle(eachSeries.textColor || "#FFFFFF");
-        context.setTextAlign('center');
-        context.fillText(String(item.t), item.x, item.y + fontSize/2);
-        context.closePath();
-        context.stroke();
-        context.setTextAlign('left');
-      });
-    }
-  });
-  context.restore();
-  return {
-    xAxisPoints: xAxisPoints,
-    calPoints: calPoints,
-    eachSpacing: eachSpacing
-  };
+	var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	var bubbleOption = assign({}, {
+		opacity: 1,
+		border: 2
+	}, opts.extra.bubble);
+	let xAxisData = opts.chartData.xAxisData,
+		xAxisPoints = xAxisData.xAxisPoints,
+		eachSpacing = xAxisData.eachSpacing;
+	var calPoints = [];
+	context.save();
+	let leftSpace = 0;
+	let rightSpace = opts.width + eachSpacing;
+	if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+		context.translate(opts._scrollDistance_, 0);
+		leftSpace = -opts._scrollDistance_ - eachSpacing * 2 + opts.area[3];
+		rightSpace = leftSpace + (opts.xAxis.itemCount + 4) * eachSpacing;
+	}
+	series.forEach(function(eachSeries, seriesIndex) {
+		let ranges, minRange, maxRange;
+		ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+		minRange = ranges.pop();
+		maxRange = ranges.shift();
+		var data = eachSeries.data;
+		var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+		context.beginPath();
+		context.setStrokeStyle(eachSeries.color);
+		context.setLineWidth(bubbleOption.border * opts.pix);
+		context.setFillStyle(hexToRgb(eachSeries.color, bubbleOption.opacity));
+		points.forEach(function(item, index) {
+			context.moveTo(item.x + item.r, item.y);
+			context.arc(item.x, item.y, item.r * opts.pix, 0, 2 * Math.PI, false);
+		});
+		context.closePath();
+		context.fill();
+		context.stroke();
+
+		if (opts.dataLabel !== false && process === 1) {
+			points.forEach(function(item, index) {
+				context.beginPath();
+				var fontSize = eachSeries.textSize * opts.pix || config.fontSize;
+				context.setFontSize(fontSize);
+				context.setFillStyle(eachSeries.textColor || "#FFFFFF");
+				context.setTextAlign('center');
+				context.fillText(String(item.t), item.x, item.y + fontSize / 2);
+				context.closePath();
+				context.stroke();
+				context.setTextAlign('left');
+			});
+		}
+	});
+	context.restore();
+	return {
+		xAxisPoints: xAxisPoints,
+		calPoints: calPoints,
+		eachSpacing: eachSpacing
+	};
 }
 
 function drawLineDataPoints(series, opts, config, context) {
-  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
-  var lineOption = assign({}, {
-    type: 'straight',
-    width: 2,
-    activeType: 'none',
-    linearType: 'none',
-    onShadow: false,
-    animation: 'vertical',
-  }, opts.extra.line);
-  lineOption.width *= opts.pix;
-  let xAxisData = opts.chartData.xAxisData,
-    xAxisPoints = xAxisData.xAxisPoints,
-    eachSpacing = xAxisData.eachSpacing;
-  var calPoints = [];
-  context.save();
-  let leftSpace = 0;
-  let rightSpace = opts.width + eachSpacing;
-  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
-    context.translate(opts._scrollDistance_, 0);
-    leftSpace = -opts._scrollDistance_ - eachSpacing * 2 + opts.area[3];
-    rightSpace = leftSpace + (opts.xAxis.itemCount + 4) * eachSpacing;
-  }
-  series.forEach(function(eachSeries, seriesIndex) {
-    // 这段很神奇的代码用于解决ios16的setStrokeStyle失效的bug
-    context.beginPath();
-    context.setStrokeStyle(eachSeries.color);
-    context.moveTo(-10000, -10000);
-    context.lineTo(-10001, -10001);
-    context.stroke();
-    let ranges, minRange, maxRange;
-    ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
-    minRange = ranges.pop();
-    maxRange = ranges.shift();
-    var data = eachSeries.data;
-    var points = getLineDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, lineOption, process);
-    calPoints.push(points);
-    var splitPointList = splitPoints(points,eachSeries);
-    if (eachSeries.lineType == 'dash') {
-      let dashLength = eachSeries.dashLength ? eachSeries.dashLength : 8;
-      dashLength *= opts.pix;
-      context.setLineDash([dashLength, dashLength]);
-    }
-    context.beginPath();
-    var strokeColor = eachSeries.color;
-    if (lineOption.linearType !== 'none' && eachSeries.linearColor && eachSeries.linearColor.length > 0) {
-      var grd = context.createLinearGradient(opts.chartData.xAxisData.startX, opts.height/2, opts.chartData.xAxisData.endX, opts.height/2);
-      for (var i = 0; i < eachSeries.linearColor.length; i++) {
-        grd.addColorStop(eachSeries.linearColor[i][0], hexToRgb(eachSeries.linearColor[i][1], 1));
-      }
-      strokeColor = grd
-    }
-    context.setStrokeStyle(strokeColor);
-    if (lineOption.onShadow == true && eachSeries.setShadow && eachSeries.setShadow.length > 0) {
-      context.setShadow(eachSeries.setShadow[0], eachSeries.setShadow[1], eachSeries.setShadow[2], eachSeries.setShadow[3]);
-    }else{
-      context.setShadow(0, 0, 0, 'rgba(0,0,0,0)');
-    }
-    context.setLineWidth(lineOption.width);
-    splitPointList.forEach(function(points, index) {
-      if (points.length === 1) {
-        context.moveTo(points[0].x, points[0].y);
-        // context.arc(points[0].x, points[0].y, 1, 0, 2 * Math.PI);
-      } else {
-        context.moveTo(points[0].x, points[0].y);
-        let startPoint = 0;
-        if (lineOption.type === 'curve') {
-          for (let j = 0; j < points.length; j++) {
-            let item = points[j];
-            if (startPoint == 0 && item.x > leftSpace) {
-              context.moveTo(item.x, item.y);
-              startPoint = 1;
-            }
-            if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
-              var ctrlPoint = createCurveControlPoints(points, j - 1);
-              context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y, item.x, item.y);
-            }
-          };
-        }
-        if (lineOption.type === 'straight') {
-          for (let j = 0; j < points.length; j++) {
-            let item = points[j];
-            if (startPoint == 0 && item.x > leftSpace) {
-              context.moveTo(item.x, item.y);
-              startPoint = 1;
-            }
-            if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
-              context.lineTo(item.x, item.y);
-            }
-          };
-        }
-        if (lineOption.type === 'step') {
-          for (let j = 0; j < points.length; j++) {
-            let item = points[j];
-            if (startPoint == 0 && item.x > leftSpace) {
-              context.moveTo(item.x, item.y);
-              startPoint = 1;
-            }
-            if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
-              context.lineTo(item.x, points[j - 1].y);
-              context.lineTo(item.x, item.y);
-            }
-          };
-        }
-        context.moveTo(points[0].x, points[0].y);
-      }
-    });
-    context.stroke();
-    context.setLineDash([]);
-    if (opts.dataPointShape !== false) {
-      drawPointShape(points, eachSeries.color, eachSeries.pointShape, context, opts);
-    }
-    drawActivePoint(points, eachSeries.color, eachSeries.pointShape, context, opts, lineOption);
-  });
-  if (opts.dataLabel !== false && process === 1) {
-    series.forEach(function(eachSeries, seriesIndex) {
-      let ranges, minRange, maxRange;
-      ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
-      minRange = ranges.pop();
-      maxRange = ranges.shift();
-      var data = eachSeries.data;
-      var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
-      drawPointText(points, eachSeries, config, context, opts);
-    });
-  }
-  context.restore();
-  return {
-    xAxisPoints: xAxisPoints,
-    calPoints: calPoints,
-    eachSpacing: eachSpacing
-  };
+	var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	var lineOption = assign({}, {
+		type: 'straight',
+		width: 2,
+		activeType: 'none',
+		linearType: 'none',
+		onShadow: false,
+		animation: 'vertical',
+	}, opts.extra.line);
+	lineOption.width *= opts.pix;
+	let xAxisData = opts.chartData.xAxisData,
+		xAxisPoints = xAxisData.xAxisPoints,
+		eachSpacing = xAxisData.eachSpacing;
+	var calPoints = [];
+	context.save();
+	let leftSpace = 0;
+	let rightSpace = opts.width + eachSpacing;
+	if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+		context.translate(opts._scrollDistance_, 0);
+		leftSpace = -opts._scrollDistance_ - eachSpacing * 2 + opts.area[3];
+		rightSpace = leftSpace + (opts.xAxis.itemCount + 4) * eachSpacing;
+	}
+	series.forEach(function(eachSeries, seriesIndex) {
+		// 这段很神奇的代码用于解决ios16的setStrokeStyle失效的bug
+		context.beginPath();
+		context.setStrokeStyle(eachSeries.color);
+		context.moveTo(-10000, -10000);
+		context.lineTo(-10001, -10001);
+		context.stroke();
+		let ranges, minRange, maxRange;
+		ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+		minRange = ranges.pop();
+		maxRange = ranges.shift();
+		var data = eachSeries.data;
+		var points = getLineDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, lineOption,
+			process);
+		calPoints.push(points);
+		var splitPointList = splitPoints(points, eachSeries);
+		if (eachSeries.lineType == 'dash') {
+			let dashLength = eachSeries.dashLength ? eachSeries.dashLength : 8;
+			dashLength *= opts.pix;
+			context.setLineDash([dashLength, dashLength]);
+		}
+		context.beginPath();
+		var strokeColor = eachSeries.color;
+		if (lineOption.linearType !== 'none' && eachSeries.linearColor && eachSeries.linearColor.length > 0) {
+			var grd = context.createLinearGradient(opts.chartData.xAxisData.startX, opts.height / 2, opts.chartData
+				.xAxisData.endX, opts.height / 2);
+			for (var i = 0; i < eachSeries.linearColor.length; i++) {
+				grd.addColorStop(eachSeries.linearColor[i][0], hexToRgb(eachSeries.linearColor[i][1], 1));
+			}
+			strokeColor = grd
+		}
+		context.setStrokeStyle(strokeColor);
+		if (lineOption.onShadow == true && eachSeries.setShadow && eachSeries.setShadow.length > 0) {
+			context.setShadow(eachSeries.setShadow[0], eachSeries.setShadow[1], eachSeries.setShadow[2], eachSeries
+				.setShadow[3]);
+		} else {
+			context.setShadow(0, 0, 0, 'rgba(0,0,0,0)');
+		}
+		context.setLineWidth(lineOption.width);
+		splitPointList.forEach(function(points, index) {
+			if (points.length === 1) {
+				context.moveTo(points[0].x, points[0].y);
+				// context.arc(points[0].x, points[0].y, 1, 0, 2 * Math.PI);
+			} else {
+				context.moveTo(points[0].x, points[0].y);
+				let startPoint = 0;
+				if (lineOption.type === 'curve') {
+					for (let j = 0; j < points.length; j++) {
+						let item = points[j];
+						if (startPoint == 0 && item.x > leftSpace) {
+							context.moveTo(item.x, item.y);
+							startPoint = 1;
+						}
+						if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+							var ctrlPoint = createCurveControlPoints(points, j - 1);
+							context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y, item
+								.x, item.y);
+						}
+					};
+				}
+				if (lineOption.type === 'straight') {
+					for (let j = 0; j < points.length; j++) {
+						let item = points[j];
+						if (startPoint == 0 && item.x > leftSpace) {
+							context.moveTo(item.x, item.y);
+							startPoint = 1;
+						}
+						if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+							context.lineTo(item.x, item.y);
+						}
+					};
+				}
+				if (lineOption.type === 'step') {
+					for (let j = 0; j < points.length; j++) {
+						let item = points[j];
+						if (startPoint == 0 && item.x > leftSpace) {
+							context.moveTo(item.x, item.y);
+							startPoint = 1;
+						}
+						if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+							context.lineTo(item.x, points[j - 1].y);
+							context.lineTo(item.x, item.y);
+						}
+					};
+				}
+				context.moveTo(points[0].x, points[0].y);
+			}
+		});
+		context.stroke();
+		context.setLineDash([]);
+		if (opts.dataPointShape !== false) {
+			drawPointShape(points, eachSeries.color, eachSeries.pointShape, context, opts);
+		}
+		drawActivePoint(points, eachSeries.color, eachSeries.pointShape, context, opts, lineOption);
+	});
+	if (opts.dataLabel !== false && process === 1) {
+		series.forEach(function(eachSeries, seriesIndex) {
+			let ranges, minRange, maxRange;
+			ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+			minRange = ranges.pop();
+			maxRange = ranges.shift();
+			var data = eachSeries.data;
+			var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+			drawPointText(points, eachSeries, config, context, opts);
+		});
+	}
+	context.restore();
+	return {
+		xAxisPoints: xAxisPoints,
+		calPoints: calPoints,
+		eachSpacing: eachSpacing
+	};
 }
 
 function drawMixDataPoints(series, opts, config, context) {
-  let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
-  let xAxisData = opts.chartData.xAxisData,
-    xAxisPoints = xAxisData.xAxisPoints,
-    eachSpacing = xAxisData.eachSpacing;
-  let columnOption = assign({}, {
-    width: eachSpacing / 2,
-    barBorderCircle: false,
-    barBorderRadius: [],
-    seriesGap: 2,
-    linearType: 'none',
-    linearOpacity: 1,
-    customColor: [],
-    colorStop: 0,
-  }, opts.extra.mix.column);
-  let areaOption = assign({}, {
-    opacity: 0.2,
-    gradient: false
-  }, opts.extra.mix.area);
-  let lineOption = assign({}, {
-    width: 2
-  }, opts.extra.mix.line);
-  let endY = opts.height - opts.area[2];
-  let calPoints = [];
-  var columnIndex = 0;
-  var columnLength = 0;
-  series.forEach(function(eachSeries, seriesIndex) {
-    if (eachSeries.type == 'column') {
-      columnLength += 1;
-    }
-  });
-  context.save();
-  let leftNum = -2;
-  let rightNum = xAxisPoints.length + 2;
-  let leftSpace = 0;
-  let rightSpace = opts.width + eachSpacing;
-  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
-    context.translate(opts._scrollDistance_, 0);
-    leftNum = Math.floor(-opts._scrollDistance_ / eachSpacing) - 2;
-    rightNum = leftNum + opts.xAxis.itemCount + 4;
-    leftSpace = -opts._scrollDistance_ - eachSpacing * 2 + opts.area[3];
-    rightSpace = leftSpace + (opts.xAxis.itemCount + 4) * eachSpacing;
-  }
-  columnOption.customColor = fillCustomColor(columnOption.linearType, columnOption.customColor, series, config);
-  series.forEach(function(eachSeries, seriesIndex) {
-    let ranges, minRange, maxRange;
-    ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
-    minRange = ranges.pop();
-    maxRange = ranges.shift();
-    var data = eachSeries.data;
-    var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
-    calPoints.push(points);
-    // 绘制柱状数据图
-    if (eachSeries.type == 'column') {
-      points = fixColumeData(points, eachSpacing, columnLength, columnIndex, config, opts);
-      for (let i = 0; i < points.length; i++) {
-        let item = points[i];
-        if (item !== null && i > leftNum && i < rightNum) {
-          var startX = item.x - item.width / 2;
-          var height = opts.height - item.y - opts.area[2];
-          context.beginPath();
-          var fillColor = item.color || eachSeries.color
-          var strokeColor = item.color || eachSeries.color
-          if (columnOption.linearType !== 'none') {
-            var grd = context.createLinearGradient(startX, item.y, startX, opts.height - opts.area[2]);
-            //透明渐变
-            if (columnOption.linearType == 'opacity') {
-              grd.addColorStop(0, hexToRgb(fillColor, columnOption.linearOpacity));
-              grd.addColorStop(1, hexToRgb(fillColor, 1));
-            } else {
-              grd.addColorStop(0, hexToRgb(columnOption.customColor[eachSeries.linearIndex], columnOption.linearOpacity));
-              grd.addColorStop(columnOption.colorStop, hexToRgb(columnOption.customColor[eachSeries.linearIndex], columnOption.linearOpacity));
-              grd.addColorStop(1, hexToRgb(fillColor, 1));
-            }
-            fillColor = grd
-          }
-          // 圆角边框
-          if ((columnOption.barBorderRadius && columnOption.barBorderRadius.length === 4) || columnOption.barBorderCircle) {
-            const left = startX;
-            const top = item.y;
-            const width = item.width;
-            const height = opts.height - opts.area[2] - item.y;
-            if (columnOption.barBorderCircle) {
-              columnOption.barBorderRadius = [width / 2, width / 2, 0, 0];
-            }
-            let [r0, r1, r2, r3] = columnOption.barBorderRadius;
-            let minRadius = Math.min(width/2,height/2);
-            r0 = r0 > minRadius ? minRadius : r0;
-            r1 = r1 > minRadius ? minRadius : r1;
-            r2 = r2 > minRadius ? minRadius : r2;
-            r3 = r3 > minRadius ? minRadius : r3;
-            r0 = r0 < 0 ? 0 : r0;
-            r1 = r1 < 0 ? 0 : r1;
-            r2 = r2 < 0 ? 0 : r2;
-            r3 = r3 < 0 ? 0 : r3;
-            context.arc(left + r0, top + r0, r0, -Math.PI, -Math.PI / 2);
-            context.arc(left + width - r1, top + r1, r1, -Math.PI / 2, 0);
-            context.arc(left + width - r2, top + height - r2, r2, 0, Math.PI / 2);
-            context.arc(left + r3, top + height - r3, r3, Math.PI / 2, Math.PI);
-          } else {
-            context.moveTo(startX, item.y);
-            context.lineTo(startX + item.width, item.y);
-            context.lineTo(startX + item.width, opts.height - opts.area[2]);
-            context.lineTo(startX, opts.height - opts.area[2]);
-            context.lineTo(startX, item.y);
-            context.setLineWidth(1)
-            context.setStrokeStyle(strokeColor);
-          }
-          context.setFillStyle(fillColor);
-          context.closePath();
-          context.fill();
-        }
-      }
-      columnIndex += 1;
-    }
-    //绘制区域图数据
-    if (eachSeries.type == 'area') {
-      let splitPointList = splitPoints(points,eachSeries);
-      for (let i = 0; i < splitPointList.length; i++) {
-        let points = splitPointList[i];
-        // 绘制区域数据
-        context.beginPath();
-        context.setStrokeStyle(eachSeries.color);
-        context.setStrokeStyle(hexToRgb(eachSeries.color, areaOption.opacity));
-        if (areaOption.gradient) {
-          let gradient = context.createLinearGradient(0, opts.area[0], 0, opts.height - opts.area[2]);
-          gradient.addColorStop('0', hexToRgb(eachSeries.color, areaOption.opacity));
-          gradient.addColorStop('1.0', hexToRgb("#FFFFFF", 0.1));
-          context.setFillStyle(gradient);
-        } else {
-          context.setFillStyle(hexToRgb(eachSeries.color, areaOption.opacity));
-        }
-        context.setLineWidth(2 * opts.pix);
-        if (points.length > 1) {
-          var firstPoint = points[0];
-          let lastPoint = points[points.length - 1];
-          context.moveTo(firstPoint.x, firstPoint.y);
-          let startPoint = 0;
-          if (eachSeries.style === 'curve') {
-            for (let j = 0; j < points.length; j++) {
-              let item = points[j];
-              if (startPoint == 0 && item.x > leftSpace) {
-                context.moveTo(item.x, item.y);
-                startPoint = 1;
-              }
-              if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
-                var ctrlPoint = createCurveControlPoints(points, j - 1);
-                context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y, item.x, item.y);
-              }
-            };
-          } else {
-            for (let j = 0; j < points.length; j++) {
-              let item = points[j];
-              if (startPoint == 0 && item.x > leftSpace) {
-                context.moveTo(item.x, item.y);
-                startPoint = 1;
-              }
-              if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
-                context.lineTo(item.x, item.y);
-              }
-            };
-          }
-          context.lineTo(lastPoint.x, endY);
-          context.lineTo(firstPoint.x, endY);
-          context.lineTo(firstPoint.x, firstPoint.y);
-        } else {
-          let item = points[0];
-          context.moveTo(item.x - eachSpacing / 2, item.y);
-          // context.lineTo(item.x + eachSpacing / 2, item.y);
-          // context.lineTo(item.x + eachSpacing / 2, endY);
-          // context.lineTo(item.x - eachSpacing / 2, endY);
-          // context.moveTo(item.x - eachSpacing / 2, item.y);
-        }
-        context.closePath();
-        context.fill();
-      }
-    }
-    // 绘制折线数据图
-    if (eachSeries.type == 'line') {
-      var splitPointList = splitPoints(points,eachSeries);
-      splitPointList.forEach(function(points, index) {
-        if (eachSeries.lineType == 'dash') {
-          let dashLength = eachSeries.dashLength ? eachSeries.dashLength : 8;
-          dashLength *= opts.pix;
-          context.setLineDash([dashLength, dashLength]);
-        }
-        context.beginPath();
-        context.setStrokeStyle(eachSeries.color);
-        context.setLineWidth(lineOption.width * opts.pix);
-        if (points.length === 1) {
-          context.moveTo(points[0].x, points[0].y);
-          // context.arc(points[0].x, points[0].y, 1, 0, 2 * Math.PI);
-        } else {
-          context.moveTo(points[0].x, points[0].y);
-          let startPoint = 0;
-          if (eachSeries.style == 'curve') {
-            for (let j = 0; j < points.length; j++) {
-              let item = points[j];
-              if (startPoint == 0 && item.x > leftSpace) {
-                context.moveTo(item.x, item.y);
-                startPoint = 1;
-              }
-              if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
-                var ctrlPoint = createCurveControlPoints(points, j - 1);
-                context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y,
-                  item.x, item.y);
-              }
-            }
-          } else {
-            for (let j = 0; j < points.length; j++) {
-              let item = points[j];
-              if (startPoint == 0 && item.x > leftSpace) {
-                context.moveTo(item.x, item.y);
-                startPoint = 1;
-              }
-              if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
-                context.lineTo(item.x, item.y);
-              }
-            }
-          }
-          context.moveTo(points[0].x, points[0].y);
-        }
-        context.stroke();
-        context.setLineDash([]);
-      });
-    }
-    // 绘制点数据图
-    if (eachSeries.type == 'point') {
-      eachSeries.addPoint = true;
-    }
-    if (eachSeries.addPoint == true && eachSeries.type !== 'column') {
-      drawPointShape(points, eachSeries.color, eachSeries.pointShape, context, opts);
-    }
-  });
-  if (opts.dataLabel !== false && process === 1) {
-    var columnIndex = 0;
-    series.forEach(function(eachSeries, seriesIndex) {
-      let ranges, minRange, maxRange;
-      ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
-      minRange = ranges.pop();
-      maxRange = ranges.shift();
-      var data = eachSeries.data;
-      var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
-      if (eachSeries.type !== 'column') {
-        drawPointText(points, eachSeries, config, context, opts);
-      } else {
-        points = fixColumeData(points, eachSpacing, columnLength, columnIndex, config, opts);
-        drawPointText(points, eachSeries, config, context, opts);
-        columnIndex += 1;
-      }
-    });
-  }
-  context.restore();
-  return {
-    xAxisPoints: xAxisPoints,
-    calPoints: calPoints,
-    eachSpacing: eachSpacing,
-  }
+	let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	let xAxisData = opts.chartData.xAxisData,
+		xAxisPoints = xAxisData.xAxisPoints,
+		eachSpacing = xAxisData.eachSpacing;
+	let columnOption = assign({}, {
+		width: eachSpacing / 2,
+		barBorderCircle: false,
+		barBorderRadius: [],
+		seriesGap: 2,
+		linearType: 'none',
+		linearOpacity: 1,
+		customColor: [],
+		colorStop: 0,
+	}, opts.extra.mix.column);
+	let areaOption = assign({}, {
+		opacity: 0.2,
+		gradient: false
+	}, opts.extra.mix.area);
+	let lineOption = assign({}, {
+		width: 2
+	}, opts.extra.mix.line);
+	let endY = opts.height - opts.area[2];
+	let calPoints = [];
+	var columnIndex = 0;
+	var columnLength = 0;
+	series.forEach(function(eachSeries, seriesIndex) {
+		if (eachSeries.type == 'column') {
+			columnLength += 1;
+		}
+	});
+	context.save();
+	let leftNum = -2;
+	let rightNum = xAxisPoints.length + 2;
+	let leftSpace = 0;
+	let rightSpace = opts.width + eachSpacing;
+	if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+		context.translate(opts._scrollDistance_, 0);
+		leftNum = Math.floor(-opts._scrollDistance_ / eachSpacing) - 2;
+		rightNum = leftNum + opts.xAxis.itemCount + 4;
+		leftSpace = -opts._scrollDistance_ - eachSpacing * 2 + opts.area[3];
+		rightSpace = leftSpace + (opts.xAxis.itemCount + 4) * eachSpacing;
+	}
+	columnOption.customColor = fillCustomColor(columnOption.linearType, columnOption.customColor, series, config);
+	series.forEach(function(eachSeries, seriesIndex) {
+		let ranges, minRange, maxRange;
+		ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+		minRange = ranges.pop();
+		maxRange = ranges.shift();
+		var data = eachSeries.data;
+		var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+		calPoints.push(points);
+		// 绘制柱状数据图
+		if (eachSeries.type == 'column') {
+			points = fixColumeData(points, eachSpacing, columnLength, columnIndex, config, opts);
+			for (let i = 0; i < points.length; i++) {
+				let item = points[i];
+				if (item !== null && i > leftNum && i < rightNum) {
+					var startX = item.x - item.width / 2;
+					var height = opts.height - item.y - opts.area[2];
+					context.beginPath();
+					var fillColor = item.color || eachSeries.color
+					var strokeColor = item.color || eachSeries.color
+					if (columnOption.linearType !== 'none') {
+						var grd = context.createLinearGradient(startX, item.y, startX, opts.height - opts.area[2]);
+						//透明渐变
+						if (columnOption.linearType == 'opacity') {
+							grd.addColorStop(0, hexToRgb(fillColor, columnOption.linearOpacity));
+							grd.addColorStop(1, hexToRgb(fillColor, 1));
+						} else {
+							grd.addColorStop(0, hexToRgb(columnOption.customColor[eachSeries.linearIndex], columnOption
+								.linearOpacity));
+							grd.addColorStop(columnOption.colorStop, hexToRgb(columnOption.customColor[eachSeries.linearIndex],
+								columnOption.linearOpacity));
+							grd.addColorStop(1, hexToRgb(fillColor, 1));
+						}
+						fillColor = grd
+					}
+					// 圆角边框
+					if ((columnOption.barBorderRadius && columnOption.barBorderRadius.length === 4) || columnOption
+						.barBorderCircle) {
+						const left = startX;
+						const top = item.y;
+						const width = item.width;
+						const height = opts.height - opts.area[2] - item.y;
+						if (columnOption.barBorderCircle) {
+							columnOption.barBorderRadius = [width / 2, width / 2, 0, 0];
+						}
+						let [r0, r1, r2, r3] = columnOption.barBorderRadius;
+						let minRadius = Math.min(width / 2, height / 2);
+						r0 = r0 > minRadius ? minRadius : r0;
+						r1 = r1 > minRadius ? minRadius : r1;
+						r2 = r2 > minRadius ? minRadius : r2;
+						r3 = r3 > minRadius ? minRadius : r3;
+						r0 = r0 < 0 ? 0 : r0;
+						r1 = r1 < 0 ? 0 : r1;
+						r2 = r2 < 0 ? 0 : r2;
+						r3 = r3 < 0 ? 0 : r3;
+						context.arc(left + r0, top + r0, r0, -Math.PI, -Math.PI / 2);
+						context.arc(left + width - r1, top + r1, r1, -Math.PI / 2, 0);
+						context.arc(left + width - r2, top + height - r2, r2, 0, Math.PI / 2);
+						context.arc(left + r3, top + height - r3, r3, Math.PI / 2, Math.PI);
+					} else {
+						context.moveTo(startX, item.y);
+						context.lineTo(startX + item.width, item.y);
+						context.lineTo(startX + item.width, opts.height - opts.area[2]);
+						context.lineTo(startX, opts.height - opts.area[2]);
+						context.lineTo(startX, item.y);
+						context.setLineWidth(1)
+						context.setStrokeStyle(strokeColor);
+					}
+					context.setFillStyle(fillColor);
+					context.closePath();
+					context.fill();
+				}
+			}
+			columnIndex += 1;
+		}
+		//绘制区域图数据
+		if (eachSeries.type == 'area') {
+			let splitPointList = splitPoints(points, eachSeries);
+			for (let i = 0; i < splitPointList.length; i++) {
+				let points = splitPointList[i];
+				// 绘制区域数据
+				context.beginPath();
+				context.setStrokeStyle(eachSeries.color);
+				context.setStrokeStyle(hexToRgb(eachSeries.color, areaOption.opacity));
+				if (areaOption.gradient) {
+					let gradient = context.createLinearGradient(0, opts.area[0], 0, opts.height - opts.area[2]);
+					gradient.addColorStop('0', hexToRgb(eachSeries.color, areaOption.opacity));
+					gradient.addColorStop('1.0', hexToRgb("#FFFFFF", 0.1));
+					context.setFillStyle(gradient);
+				} else {
+					context.setFillStyle(hexToRgb(eachSeries.color, areaOption.opacity));
+				}
+				context.setLineWidth(2 * opts.pix);
+				if (points.length > 1) {
+					var firstPoint = points[0];
+					let lastPoint = points[points.length - 1];
+					context.moveTo(firstPoint.x, firstPoint.y);
+					let startPoint = 0;
+					if (eachSeries.style === 'curve') {
+						for (let j = 0; j < points.length; j++) {
+							let item = points[j];
+							if (startPoint == 0 && item.x > leftSpace) {
+								context.moveTo(item.x, item.y);
+								startPoint = 1;
+							}
+							if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+								var ctrlPoint = createCurveControlPoints(points, j - 1);
+								context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y, item
+									.x, item.y);
+							}
+						};
+					} else {
+						for (let j = 0; j < points.length; j++) {
+							let item = points[j];
+							if (startPoint == 0 && item.x > leftSpace) {
+								context.moveTo(item.x, item.y);
+								startPoint = 1;
+							}
+							if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+								context.lineTo(item.x, item.y);
+							}
+						};
+					}
+					context.lineTo(lastPoint.x, endY);
+					context.lineTo(firstPoint.x, endY);
+					context.lineTo(firstPoint.x, firstPoint.y);
+				} else {
+					let item = points[0];
+					context.moveTo(item.x - eachSpacing / 2, item.y);
+					// context.lineTo(item.x + eachSpacing / 2, item.y);
+					// context.lineTo(item.x + eachSpacing / 2, endY);
+					// context.lineTo(item.x - eachSpacing / 2, endY);
+					// context.moveTo(item.x - eachSpacing / 2, item.y);
+				}
+				context.closePath();
+				context.fill();
+			}
+		}
+		// 绘制折线数据图
+		if (eachSeries.type == 'line') {
+			var splitPointList = splitPoints(points, eachSeries);
+			splitPointList.forEach(function(points, index) {
+				if (eachSeries.lineType == 'dash') {
+					let dashLength = eachSeries.dashLength ? eachSeries.dashLength : 8;
+					dashLength *= opts.pix;
+					context.setLineDash([dashLength, dashLength]);
+				}
+				context.beginPath();
+				context.setStrokeStyle(eachSeries.color);
+				context.setLineWidth(lineOption.width * opts.pix);
+				if (points.length === 1) {
+					context.moveTo(points[0].x, points[0].y);
+					// context.arc(points[0].x, points[0].y, 1, 0, 2 * Math.PI);
+				} else {
+					context.moveTo(points[0].x, points[0].y);
+					let startPoint = 0;
+					if (eachSeries.style == 'curve') {
+						for (let j = 0; j < points.length; j++) {
+							let item = points[j];
+							if (startPoint == 0 && item.x > leftSpace) {
+								context.moveTo(item.x, item.y);
+								startPoint = 1;
+							}
+							if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+								var ctrlPoint = createCurveControlPoints(points, j - 1);
+								context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y,
+									item.x, item.y);
+							}
+						}
+					} else {
+						for (let j = 0; j < points.length; j++) {
+							let item = points[j];
+							if (startPoint == 0 && item.x > leftSpace) {
+								context.moveTo(item.x, item.y);
+								startPoint = 1;
+							}
+							if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+								context.lineTo(item.x, item.y);
+							}
+						}
+					}
+					context.moveTo(points[0].x, points[0].y);
+				}
+				context.stroke();
+				context.setLineDash([]);
+			});
+		}
+		// 绘制点数据图
+		if (eachSeries.type == 'point') {
+			eachSeries.addPoint = true;
+		}
+		if (eachSeries.addPoint == true && eachSeries.type !== 'column') {
+			drawPointShape(points, eachSeries.color, eachSeries.pointShape, context, opts);
+		}
+	});
+	if (opts.dataLabel !== false && process === 1) {
+		var columnIndex = 0;
+		series.forEach(function(eachSeries, seriesIndex) {
+			let ranges, minRange, maxRange;
+			ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+			minRange = ranges.pop();
+			maxRange = ranges.shift();
+			var data = eachSeries.data;
+			var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+			if (eachSeries.type !== 'column') {
+				drawPointText(points, eachSeries, config, context, opts);
+			} else {
+				points = fixColumeData(points, eachSpacing, columnLength, columnIndex, config, opts);
+				drawPointText(points, eachSeries, config, context, opts);
+				columnIndex += 1;
+			}
+		});
+	}
+	context.restore();
+	return {
+		xAxisPoints: xAxisPoints,
+		calPoints: calPoints,
+		eachSpacing: eachSpacing,
+	}
 }
 
 
 function drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints) {
-  var toolTipOption = opts.extra.tooltip || {};
-  if (toolTipOption.horizentalLine && opts.tooltip && process === 1 && (opts.type == 'line' || opts.type == 'area' || opts.type == 'column' || opts.type == 'mount' || opts.type == 'candle' || opts.type == 'mix')) {
-    drawToolTipHorizentalLine(opts, config, context, eachSpacing, xAxisPoints)
-  }
-  context.save();
-  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
-    context.translate(opts._scrollDistance_, 0);
-  }
-  if (opts.tooltip && opts.tooltip.textList && opts.tooltip.textList.length && process === 1) {
-    drawToolTip(opts.tooltip.textList, opts.tooltip.offset, opts, config, context, eachSpacing, xAxisPoints);
-  }
-  context.restore();
+	var toolTipOption = opts.extra.tooltip || {};
+	if (toolTipOption.horizentalLine && opts.tooltip && process === 1 && (opts.type == 'line' || opts.type == 'area' ||
+			opts.type == 'column' || opts.type == 'mount' || opts.type == 'candle' || opts.type == 'mix')) {
+		drawToolTipHorizentalLine(opts, config, context, eachSpacing, xAxisPoints)
+	}
+	context.save();
+	if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+		context.translate(opts._scrollDistance_, 0);
+	}
+	if (opts.tooltip && opts.tooltip.textList && opts.tooltip.textList.length && process === 1) {
+		drawToolTip(opts.tooltip.textList, opts.tooltip.offset, opts, config, context, eachSpacing, xAxisPoints);
+	}
+	context.restore();
 
 }
 
 function drawXAxis(categories, opts, config, context) {
 
-  let xAxisData = opts.chartData.xAxisData,
-    xAxisPoints = xAxisData.xAxisPoints,
-    startX = xAxisData.startX,
-    endX = xAxisData.endX,
-    eachSpacing = xAxisData.eachSpacing;
-  var boundaryGap = 'center';
-  if (opts.type == 'bar' || opts.type == 'line' || opts.type == 'area'|| opts.type == 'scatter' || opts.type == 'bubble') {
-    boundaryGap = opts.xAxis.boundaryGap;
-  }
-  var startY = opts.height - opts.area[2];
-  var endY = opts.area[0];
-
-  //绘制滚动条
-  if (opts.enableScroll && opts.xAxis.scrollShow) {
-    var scrollY = opts.height - opts.area[2] + config.xAxisHeight;
-    var scrollScreenWidth = endX - startX;
-    var scrollTotalWidth = eachSpacing * (xAxisPoints.length - 1);
-    if(opts.type == 'mount' && opts.extra && opts.extra.mount && opts.extra.mount.widthRatio && opts.extra.mount.widthRatio > 1){
-      if(opts.extra.mount.widthRatio>2) opts.extra.mount.widthRatio = 2
-      scrollTotalWidth += (opts.extra.mount.widthRatio - 1)*eachSpacing;
-    }
-    var scrollWidth = scrollScreenWidth * scrollScreenWidth / scrollTotalWidth;
-    var scrollLeft = 0;
-    if (opts._scrollDistance_) {
-      scrollLeft = -opts._scrollDistance_ * (scrollScreenWidth) / scrollTotalWidth;
-    }
-    context.beginPath();
-    context.setLineCap('round');
-    context.setLineWidth(6 * opts.pix);
-    context.setStrokeStyle(opts.xAxis.scrollBackgroundColor || "#EFEBEF");
-    context.moveTo(startX, scrollY);
-    context.lineTo(endX, scrollY);
-    context.stroke();
-    context.closePath();
-    context.beginPath();
-    context.setLineCap('round');
-    context.setLineWidth(6 * opts.pix);
-    context.setStrokeStyle(opts.xAxis.scrollColor || "#A6A6A6");
-    context.moveTo(startX + scrollLeft, scrollY);
-    context.lineTo(startX + scrollLeft + scrollWidth, scrollY);
-    context.stroke();
-    context.closePath();
-    context.setLineCap('butt');
-  }
-  context.save();
-  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0) {
-    context.translate(opts._scrollDistance_, 0);
-  }
-  //绘制X轴刻度线
-  if (opts.xAxis.calibration === true) {
-    context.setStrokeStyle(opts.xAxis.gridColor || "#cccccc");
-    context.setLineCap('butt');
-    context.setLineWidth(1 * opts.pix);
-    xAxisPoints.forEach(function(item, index) {
-      if (index > 0) {
-        context.beginPath();
-        context.moveTo(item - eachSpacing / 2, startY);
-        context.lineTo(item - eachSpacing / 2, startY + 3 * opts.pix);
-        context.closePath();
-        context.stroke();
-      }
-    });
-  }
-  //绘制X轴网格
-  if (opts.xAxis.disableGrid !== true) {
-    context.setStrokeStyle(opts.xAxis.gridColor || "#cccccc");
-    context.setLineCap('butt');
-    context.setLineWidth(1 * opts.pix);
-    if (opts.xAxis.gridType == 'dash') {
-      context.setLineDash([opts.xAxis.dashLength * opts.pix, opts.xAxis.dashLength * opts.pix]);
-    }
-    opts.xAxis.gridEval = opts.xAxis.gridEval || 1;
-    xAxisPoints.forEach(function(item, index) {
-      if (index % opts.xAxis.gridEval == 0) {
-        context.beginPath();
-        context.moveTo(item, startY);
-        context.lineTo(item, endY);
-        context.stroke();
-      }
-    });
-    context.setLineDash([]);
-  }
-  //绘制X轴文案
-  if (opts.xAxis.disabled !== true) {
-    // 对X轴列表做抽稀处理
-    //默认全部显示X轴标签
-    let maxXAxisListLength = categories.length;
-    //如果设置了X轴单屏数量
-    if (opts.xAxis.labelCount) {
-      //如果设置X轴密度
-      if (opts.xAxis.itemCount) {
-        maxXAxisListLength = Math.ceil(categories.length / opts.xAxis.itemCount * opts.xAxis.labelCount);
-      } else {
-        maxXAxisListLength = opts.xAxis.labelCount;
-      }
-      maxXAxisListLength -= 1;
-    }
-
-    let ratio = Math.ceil(categories.length / maxXAxisListLength);
-
-    let newCategories = [];
-    let cgLength = categories.length;
-    for (let i = 0; i < cgLength; i++) {
-      if (i % ratio !== 0) {
-        newCategories.push("");
-      } else {
-        newCategories.push(categories[i]);
-      }
-    }
-    newCategories[cgLength - 1] = categories[cgLength - 1];
-    var xAxisFontSize = opts.xAxis.fontSize * opts.pix || config.fontSize;
-    if (config._xAxisTextAngle_ === 0) {
-      newCategories.forEach(function(item, index) {
-        var xitem = opts.xAxis.formatter ? opts.xAxis.formatter(item,index,opts) : item;
-        var offset = -measureText(String(xitem), xAxisFontSize, context) / 2;
-        if (boundaryGap == 'center') {
-          offset += eachSpacing / 2;
-        }
-        var scrollHeight = 0;
-        if (opts.xAxis.scrollShow) {
-          scrollHeight = 6 * opts.pix;
-        }
-        // 如果在主视图区域内
-        var _scrollDistance_ = opts._scrollDistance_ || 0;
-        var truePoints = boundaryGap == 'center' ? xAxisPoints[index] + eachSpacing / 2 : xAxisPoints[index];
-        if((truePoints - Math.abs(_scrollDistance_)) >= (opts.area[3] - 1) && (truePoints - Math.abs(_scrollDistance_)) <= (opts.width - opts.area[1] + 1)){
-          context.beginPath();
-          context.setFontSize(xAxisFontSize);
-          context.setFillStyle(opts.xAxis.fontColor || opts.fontColor);
-          context.fillText(String(xitem), xAxisPoints[index] + offset, startY + opts.xAxis.marginTop * opts.pix + (opts.xAxis.lineHeight - opts.xAxis.fontSize) * opts.pix / 2 + opts.xAxis.fontSize * opts.pix);
-          context.closePath();
-          context.stroke();
-        }
-      });
-    } else {
-      newCategories.forEach(function(item, index) {
-        var xitem = opts.xAxis.formatter ? opts.xAxis.formatter(item) : item;
-        // 如果在主视图区域内
-        var _scrollDistance_ = opts._scrollDistance_ || 0;
-        var truePoints = boundaryGap == 'center' ? xAxisPoints[index] + eachSpacing / 2 : xAxisPoints[index];
-        if((truePoints - Math.abs(_scrollDistance_)) >= (opts.area[3] - 1) && (truePoints - Math.abs(_scrollDistance_)) <= (opts.width - opts.area[1] + 1)){
-          context.save();
-          context.beginPath();
-          context.setFontSize(xAxisFontSize);
-          context.setFillStyle(opts.xAxis.fontColor || opts.fontColor);
-          var textWidth = measureText(String(xitem), xAxisFontSize, context);
-          var offsetX = xAxisPoints[index];
-          if (boundaryGap == 'center') {
-            offsetX = xAxisPoints[index] + eachSpacing / 2;
-          }
-          var scrollHeight = 0;
-          if (opts.xAxis.scrollShow) {
-            scrollHeight = 6 * opts.pix;
-          }
-          var offsetY = startY + opts.xAxis.marginTop * opts.pix + xAxisFontSize - xAxisFontSize * Math.abs(Math.sin(config._xAxisTextAngle_));
-          if(opts.xAxis.rotateAngle < 0){
-            offsetX -= xAxisFontSize / 2;
-            textWidth = 0;
-          }else{
-            offsetX += xAxisFontSize / 2;
-            textWidth = -textWidth;
-          }
-          context.translate(offsetX, offsetY);
-          context.rotate(-1 * config._xAxisTextAngle_);
-          context.fillText(String(xitem), textWidth , 0 );
-          context.closePath();
-          context.stroke();
-          context.restore();
-        }
-      });
-    }
-  }
-  context.restore();
-  
-  //画X轴标题
-  if (opts.xAxis.title) {
-    context.beginPath();
-    context.setFontSize(opts.xAxis.titleFontSize * opts.pix);
-    context.setFillStyle(opts.xAxis.titleFontColor);
-    context.fillText(String(opts.xAxis.title), opts.width - opts.area[1] + opts.xAxis.titleOffsetX * opts.pix,opts.height - opts.area[2] + opts.xAxis.marginTop * opts.pix + (opts.xAxis.lineHeight - opts.xAxis.titleFontSize) * opts.pix / 2 + (opts.xAxis.titleFontSize + opts.xAxis.titleOffsetY) * opts.pix);
-    context.closePath();
-    context.stroke();
-  }
-  
-  //绘制X轴轴线
-  if (opts.xAxis.axisLine) {
-    context.beginPath();
-    context.setStrokeStyle(opts.xAxis.axisLineColor);
-    context.setLineWidth(1 * opts.pix);
-    context.moveTo(startX, opts.height - opts.area[2]);
-    context.lineTo(endX, opts.height - opts.area[2]);
-    context.stroke();
-  }
+	let xAxisData = opts.chartData.xAxisData,
+		xAxisPoints = xAxisData.xAxisPoints,
+		startX = xAxisData.startX,
+		endX = xAxisData.endX,
+		eachSpacing = xAxisData.eachSpacing;
+	var boundaryGap = 'center';
+	if (opts.type == 'bar' || opts.type == 'line' || opts.type == 'area' || opts.type == 'scatter' || opts.type ==
+		'bubble') {
+		boundaryGap = opts.xAxis.boundaryGap;
+	}
+	var startY = opts.height - opts.area[2];
+	var endY = opts.area[0];
+
+	//绘制滚动条
+	if (opts.enableScroll && opts.xAxis.scrollShow) {
+		var scrollY = opts.height - opts.area[2] + config.xAxisHeight;
+		var scrollScreenWidth = endX - startX;
+		var scrollTotalWidth = eachSpacing * (xAxisPoints.length - 1);
+		if (opts.type == 'mount' && opts.extra && opts.extra.mount && opts.extra.mount.widthRatio && opts.extra.mount
+			.widthRatio > 1) {
+			if (opts.extra.mount.widthRatio > 2) opts.extra.mount.widthRatio = 2
+			scrollTotalWidth += (opts.extra.mount.widthRatio - 1) * eachSpacing;
+		}
+		var scrollWidth = scrollScreenWidth * scrollScreenWidth / scrollTotalWidth;
+		var scrollLeft = 0;
+		if (opts._scrollDistance_) {
+			scrollLeft = -opts._scrollDistance_ * (scrollScreenWidth) / scrollTotalWidth;
+		}
+		context.beginPath();
+		context.setLineCap('round');
+		context.setLineWidth(6 * opts.pix);
+		context.setStrokeStyle(opts.xAxis.scrollBackgroundColor || "#EFEBEF");
+		context.moveTo(startX, scrollY);
+		context.lineTo(endX, scrollY);
+		context.stroke();
+		context.closePath();
+		context.beginPath();
+		context.setLineCap('round');
+		context.setLineWidth(6 * opts.pix);
+		context.setStrokeStyle(opts.xAxis.scrollColor || "#A6A6A6");
+		context.moveTo(startX + scrollLeft, scrollY);
+		context.lineTo(startX + scrollLeft + scrollWidth, scrollY);
+		context.stroke();
+		context.closePath();
+		context.setLineCap('butt');
+	}
+	context.save();
+	if (opts._scrollDistance_ && opts._scrollDistance_ !== 0) {
+		context.translate(opts._scrollDistance_, 0);
+	}
+	//绘制X轴刻度线
+	if (opts.xAxis.calibration === true) {
+		context.setStrokeStyle(opts.xAxis.gridColor || "#cccccc");
+		context.setLineCap('butt');
+		context.setLineWidth(1 * opts.pix);
+		xAxisPoints.forEach(function(item, index) {
+			if (index > 0) {
+				context.beginPath();
+				context.moveTo(item - eachSpacing / 2, startY);
+				context.lineTo(item - eachSpacing / 2, startY + 3 * opts.pix);
+				context.closePath();
+				context.stroke();
+			}
+		});
+	}
+	//绘制X轴网格
+	if (opts.xAxis.disableGrid !== true) {
+		context.setStrokeStyle(opts.xAxis.gridColor || "#cccccc");
+		context.setLineCap('butt');
+		context.setLineWidth(1 * opts.pix);
+		if (opts.xAxis.gridType == 'dash') {
+			context.setLineDash([opts.xAxis.dashLength * opts.pix, opts.xAxis.dashLength * opts.pix]);
+		}
+		opts.xAxis.gridEval = opts.xAxis.gridEval || 1;
+		xAxisPoints.forEach(function(item, index) {
+			if (index % opts.xAxis.gridEval == 0) {
+				context.beginPath();
+				context.moveTo(item, startY);
+				context.lineTo(item, endY);
+				context.stroke();
+			}
+		});
+		context.setLineDash([]);
+	}
+	//绘制X轴文案
+	if (opts.xAxis.disabled !== true) {
+		// 对X轴列表做抽稀处理
+		//默认全部显示X轴标签
+		let maxXAxisListLength = categories.length;
+		//如果设置了X轴单屏数量
+		if (opts.xAxis.labelCount) {
+			//如果设置X轴密度
+			if (opts.xAxis.itemCount) {
+				maxXAxisListLength = Math.ceil(categories.length / opts.xAxis.itemCount * opts.xAxis.labelCount);
+			} else {
+				maxXAxisListLength = opts.xAxis.labelCount;
+			}
+			maxXAxisListLength -= 1;
+		}
+
+		let ratio = Math.ceil(categories.length / maxXAxisListLength);
+
+		let newCategories = [];
+		let cgLength = categories.length;
+		for (let i = 0; i < cgLength; i++) {
+			if (i % ratio !== 0) {
+				newCategories.push("");
+			} else {
+				newCategories.push(categories[i]);
+			}
+		}
+		newCategories[cgLength - 1] = categories[cgLength - 1];
+		var xAxisFontSize = opts.xAxis.fontSize * opts.pix || config.fontSize;
+		if (config._xAxisTextAngle_ === 0) {
+			newCategories.forEach(function(item, index) {
+				var xitem = opts.xAxis.formatter ? opts.xAxis.formatter(item, index, opts) : item;
+				var offset = -measureText(String(xitem), xAxisFontSize, context) / 2;
+				if (boundaryGap == 'center') {
+					offset += eachSpacing / 2;
+				}
+				var scrollHeight = 0;
+				if (opts.xAxis.scrollShow) {
+					scrollHeight = 6 * opts.pix;
+				}
+				// 如果在主视图区域内
+				var _scrollDistance_ = opts._scrollDistance_ || 0;
+				var truePoints = boundaryGap == 'center' ? xAxisPoints[index] + eachSpacing / 2 : xAxisPoints[index];
+				if ((truePoints - Math.abs(_scrollDistance_)) >= (opts.area[3] - 1) && (truePoints - Math.abs(
+						_scrollDistance_)) <= (opts.width - opts.area[1] + 1)) {
+					context.beginPath();
+					context.setFontSize(xAxisFontSize);
+					context.setFillStyle(opts.xAxis.fontColor || opts.fontColor);
+					context.fillText(String(xitem), xAxisPoints[index] + offset, startY + opts.xAxis.marginTop * opts.pix + (
+						opts.xAxis.lineHeight - opts.xAxis.fontSize) * opts.pix / 2 + opts.xAxis.fontSize * opts.pix);
+					context.closePath();
+					context.stroke();
+				}
+			});
+		} else {
+			newCategories.forEach(function(item, index) {
+				var xitem = opts.xAxis.formatter ? opts.xAxis.formatter(item) : item;
+				// 如果在主视图区域内
+				var _scrollDistance_ = opts._scrollDistance_ || 0;
+				var truePoints = boundaryGap == 'center' ? xAxisPoints[index] + eachSpacing / 2 : xAxisPoints[index];
+				if ((truePoints - Math.abs(_scrollDistance_)) >= (opts.area[3] - 1) && (truePoints - Math.abs(
+						_scrollDistance_)) <= (opts.width - opts.area[1] + 1)) {
+					context.save();
+					context.beginPath();
+					context.setFontSize(xAxisFontSize);
+					context.setFillStyle(opts.xAxis.fontColor || opts.fontColor);
+					var textWidth = measureText(String(xitem), xAxisFontSize, context);
+					var offsetX = xAxisPoints[index];
+					if (boundaryGap == 'center') {
+						offsetX = xAxisPoints[index] + eachSpacing / 2;
+					}
+					var scrollHeight = 0;
+					if (opts.xAxis.scrollShow) {
+						scrollHeight = 6 * opts.pix;
+					}
+					var offsetY = startY + opts.xAxis.marginTop * opts.pix + xAxisFontSize - xAxisFontSize * Math.abs(Math
+						.sin(config._xAxisTextAngle_));
+					if (opts.xAxis.rotateAngle < 0) {
+						offsetX -= xAxisFontSize / 2;
+						textWidth = 0;
+					} else {
+						offsetX += xAxisFontSize / 2;
+						textWidth = -textWidth;
+					}
+					context.translate(offsetX, offsetY);
+					context.rotate(-1 * config._xAxisTextAngle_);
+					context.fillText(String(xitem), textWidth, 0);
+					context.closePath();
+					context.stroke();
+					context.restore();
+				}
+			});
+		}
+	}
+	context.restore();
+
+	//画X轴标题
+	if (opts.xAxis.title) {
+		context.beginPath();
+		context.setFontSize(opts.xAxis.titleFontSize * opts.pix);
+		context.setFillStyle(opts.xAxis.titleFontColor);
+		context.fillText(String(opts.xAxis.title), opts.width - opts.area[1] + opts.xAxis.titleOffsetX * opts.pix, opts
+			.height - opts.area[2] + opts.xAxis.marginTop * opts.pix + (opts.xAxis.lineHeight - opts.xAxis.titleFontSize) *
+			opts.pix / 2 + (opts.xAxis.titleFontSize + opts.xAxis.titleOffsetY) * opts.pix);
+		context.closePath();
+		context.stroke();
+	}
+
+	//绘制X轴轴线
+	if (opts.xAxis.axisLine) {
+		context.beginPath();
+		context.setStrokeStyle(opts.xAxis.axisLineColor);
+		context.setLineWidth(1 * opts.pix);
+		context.moveTo(startX, opts.height - opts.area[2]);
+		context.lineTo(endX, opts.height - opts.area[2]);
+		context.stroke();
+	}
 }
 
 function drawYAxisGrid(categories, opts, config, context) {
-  if (opts.yAxis.disableGrid === true) {
-    return;
-  }
-  let spacingValid = opts.height - opts.area[0] - opts.area[2];
-  let eachSpacing = spacingValid / opts.yAxis.splitNumber;
-  let startX = opts.area[3];
-  let xAxisPoints = opts.chartData.xAxisData.xAxisPoints,
-    xAxiseachSpacing = opts.chartData.xAxisData.eachSpacing;
-  let TotalWidth = xAxiseachSpacing * (xAxisPoints.length - 1);
-  if(opts.type == 'mount' && opts.extra && opts.extra.mount && opts.extra.mount.widthRatio && opts.extra.mount.widthRatio > 1 ){
-    if(opts.extra.mount.widthRatio>2) opts.extra.mount.widthRatio = 2
-    TotalWidth += (opts.extra.mount.widthRatio - 1) * xAxiseachSpacing;
-  }
-  let endX = startX + TotalWidth;
-  let points = [];
-  let startY = 1
-  if (opts.xAxis.axisLine === false) {
-    startY = 0
-  }
-  for (let i = startY; i < opts.yAxis.splitNumber + 1; i++) {
-    points.push(opts.height - opts.area[2] - eachSpacing * i);
-  }
-  context.save();
-  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0) {
-    context.translate(opts._scrollDistance_, 0);
-  }
-  if (opts.yAxis.gridType == 'dash') {
-    context.setLineDash([opts.yAxis.dashLength * opts.pix, opts.yAxis.dashLength * opts.pix]);
-  }
-  context.setStrokeStyle(opts.yAxis.gridColor);
-  context.setLineWidth(1 * opts.pix);
-  points.forEach(function(item, index) {
-    context.beginPath();
-    context.moveTo(startX, item);
-    context.lineTo(endX, item);
-    context.stroke();
-  });
-  context.setLineDash([]);
-  context.restore();
+	if (opts.yAxis.disableGrid === true) {
+		return;
+	}
+	let spacingValid = opts.height - opts.area[0] - opts.area[2];
+	let eachSpacing = spacingValid / opts.yAxis.splitNumber;
+	let startX = opts.area[3];
+	let xAxisPoints = opts.chartData.xAxisData.xAxisPoints,
+		xAxiseachSpacing = opts.chartData.xAxisData.eachSpacing;
+	let TotalWidth = xAxiseachSpacing * (xAxisPoints.length - 1);
+	if (opts.type == 'mount' && opts.extra && opts.extra.mount && opts.extra.mount.widthRatio && opts.extra.mount
+		.widthRatio > 1) {
+		if (opts.extra.mount.widthRatio > 2) opts.extra.mount.widthRatio = 2
+		TotalWidth += (opts.extra.mount.widthRatio - 1) * xAxiseachSpacing;
+	}
+	let endX = startX + TotalWidth;
+	let points = [];
+	let startY = 1
+	if (opts.xAxis.axisLine === false) {
+		startY = 0
+	}
+	for (let i = startY; i < opts.yAxis.splitNumber + 1; i++) {
+		points.push(opts.height - opts.area[2] - eachSpacing * i);
+	}
+	context.save();
+	if (opts._scrollDistance_ && opts._scrollDistance_ !== 0) {
+		context.translate(opts._scrollDistance_, 0);
+	}
+	if (opts.yAxis.gridType == 'dash') {
+		context.setLineDash([opts.yAxis.dashLength * opts.pix, opts.yAxis.dashLength * opts.pix]);
+	}
+	context.setStrokeStyle(opts.yAxis.gridColor);
+	context.setLineWidth(1 * opts.pix);
+	points.forEach(function(item, index) {
+		context.beginPath();
+		context.moveTo(startX, item);
+		context.lineTo(endX, item);
+		context.stroke();
+	});
+	context.setLineDash([]);
+	context.restore();
 }
 
 function drawYAxis(series, opts, config, context) {
-  if (opts.yAxis.disabled === true) {
-    return;
-  }
-  var spacingValid = opts.height - opts.area[0] - opts.area[2];
-  var eachSpacing = spacingValid / opts.yAxis.splitNumber;
-  var startX = opts.area[3];
-  var endX = opts.width - opts.area[1];
-  var endY = opts.height - opts.area[2];
-  // set YAxis background
-  context.beginPath();
-  context.setFillStyle(opts.background);
-  if (opts.enableScroll == true && opts.xAxis.scrollPosition && opts.xAxis.scrollPosition !== 'left') {
-    context.fillRect(0, 0, startX, endY + 2 * opts.pix);
-  }
-  if (opts.enableScroll == true && opts.xAxis.scrollPosition && opts.xAxis.scrollPosition !== 'right') {
-    context.fillRect(endX, 0, opts.width, endY + 2 * opts.pix);
-  }
-  context.closePath();
-  context.stroke();
-  
-  let tStartLeft = opts.area[3];
-  let tStartRight = opts.width - opts.area[1];
-  let tStartCenter = opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2;
-  if (opts.yAxis.data) {
-    for (let i = 0; i < opts.yAxis.data.length; i++) {
-      let yData = opts.yAxis.data[i];
-      var points = [];
-      if(yData.type === 'categories'){
-        for (let i = 0; i <= yData.categories.length; i++) {
-          points.push(opts.area[0] + spacingValid / yData.categories.length / 2 + spacingValid / yData.categories.length * i);
-        }
-      }else{
-        for (let i = 0; i <= opts.yAxis.splitNumber; i++) {
-          points.push(opts.area[0] + eachSpacing * i);
-        }
-      }
-      if (yData.disabled !== true) {
-        let rangesFormat = opts.chartData.yAxisData.rangesFormat[i];
-        let yAxisFontSize = yData.fontSize ? yData.fontSize * opts.pix : config.fontSize;
-        let yAxisWidth = opts.chartData.yAxisData.yAxisWidth[i];
-        let textAlign = yData.textAlign || "right";
-        //画Y轴刻度及文案
-        rangesFormat.forEach(function(item, index) {
-          var pos = points[index];
-          context.beginPath();
-          context.setFontSize(yAxisFontSize);
-          context.setLineWidth(1 * opts.pix);
-          context.setStrokeStyle(yData.axisLineColor || '#cccccc');
-          context.setFillStyle(yData.fontColor || opts.fontColor);
-          let tmpstrat = 0;
-          let gapwidth = 4 * opts.pix;
-          if (yAxisWidth.position == 'left') {
-            //画刻度线
-            if (yData.calibration == true) {
-              context.moveTo(tStartLeft, pos);
-              context.lineTo(tStartLeft - 3 * opts.pix, pos);
-              gapwidth += 3 * opts.pix;
-            }
-            //画文字
-            switch (textAlign) {
-              case "left":
-                context.setTextAlign('left');
-                tmpstrat = tStartLeft - yAxisWidth.width
-                break;
-              case "right":
-                context.setTextAlign('right');
-                tmpstrat = tStartLeft - gapwidth
-                break;
-              default:
-                context.setTextAlign('center');
-                tmpstrat = tStartLeft - yAxisWidth.width / 2
-            }
-            context.fillText(String(item), tmpstrat, pos + yAxisFontSize / 2 - 3 * opts.pix);
-
-          } else if (yAxisWidth.position == 'right') {
-            //画刻度线
-            if (yData.calibration == true) {
-              context.moveTo(tStartRight, pos);
-              context.lineTo(tStartRight + 3 * opts.pix, pos);
-              gapwidth += 3 * opts.pix;
-            }
-            switch (textAlign) {
-              case "left":
-                context.setTextAlign('left');
-                tmpstrat = tStartRight + gapwidth
-                break;
-              case "right":
-                context.setTextAlign('right');
-                tmpstrat = tStartRight + yAxisWidth.width
-                break;
-              default:
-                context.setTextAlign('center');
-                tmpstrat = tStartRight + yAxisWidth.width / 2
-            }
-            context.fillText(String(item), tmpstrat, pos + yAxisFontSize / 2 - 3 * opts.pix);
-          } else if (yAxisWidth.position == 'center') {
-            //画刻度线
-            if (yData.calibration == true) {
-              context.moveTo(tStartCenter, pos);
-              context.lineTo(tStartCenter - 3 * opts.pix, pos);
-              gapwidth += 3 * opts.pix;
-            }
-            //画文字
-            switch (textAlign) {
-              case "left":
-                context.setTextAlign('left');
-                tmpstrat = tStartCenter - yAxisWidth.width
-                break;
-              case "right":
-                context.setTextAlign('right');
-                tmpstrat = tStartCenter - gapwidth
-                break;
-              default:
-                context.setTextAlign('center');
-                tmpstrat = tStartCenter - yAxisWidth.width / 2
-            }
-            context.fillText(String(item), tmpstrat, pos + yAxisFontSize / 2 - 3 * opts.pix);
-          }
-          context.closePath();
-          context.stroke();
-          context.setTextAlign('left');
-        });
-        //画Y轴轴线
-        if (yData.axisLine !== false) {
-          context.beginPath();
-          context.setStrokeStyle(yData.axisLineColor || '#cccccc');
-          context.setLineWidth(1 * opts.pix);
-          if (yAxisWidth.position == 'left') {
-            context.moveTo(tStartLeft, opts.height - opts.area[2]);
-            context.lineTo(tStartLeft, opts.area[0]);
-          } else if (yAxisWidth.position == 'right') {
-            context.moveTo(tStartRight, opts.height - opts.area[2]);
-            context.lineTo(tStartRight, opts.area[0]);
-          } else if (yAxisWidth.position == 'center') {
-            context.moveTo(tStartCenter, opts.height - opts.area[2]);
-            context.lineTo(tStartCenter, opts.area[0]);
-          }
-          context.stroke();
-        }
-        //画Y轴标题
-        if (opts.yAxis.showTitle) {
-          let titleFontSize = yData.titleFontSize * opts.pix || config.fontSize;
-          let title = yData.title;
-          context.beginPath();
-          context.setFontSize(titleFontSize);
-          context.setFillStyle(yData.titleFontColor || opts.fontColor);
-          if (yAxisWidth.position == 'left') {
-            context.fillText(title, tStartLeft - measureText(title, titleFontSize, context) / 2 + (yData.titleOffsetX || 0), opts.area[0] - (10 - (yData.titleOffsetY || 0)) * opts.pix);
-          } else if (yAxisWidth.position == 'right') {
-            context.fillText(title, tStartRight - measureText(title, titleFontSize, context) / 2 + (yData.titleOffsetX || 0), opts.area[0] - (10 - (yData.titleOffsetY || 0)) * opts.pix);
-          } else if (yAxisWidth.position == 'center') {
-            context.fillText(title, tStartCenter - measureText(title, titleFontSize, context) / 2 + (yData.titleOffsetX || 0), opts.area[0] - (10 - (yData.titleOffsetY || 0)) * opts.pix);
-          }
-          context.closePath();
-          context.stroke();
-        }
-        if (yAxisWidth.position == 'left') {
-          tStartLeft -= (yAxisWidth.width + opts.yAxis.padding * opts.pix);
-        } else {
-          tStartRight += yAxisWidth.width + opts.yAxis.padding * opts.pix;
-        }
-      }
-    }
-  }
+	if (opts.yAxis.disabled === true) {
+		return;
+	}
+	var spacingValid = opts.height - opts.area[0] - opts.area[2];
+	var eachSpacing = spacingValid / opts.yAxis.splitNumber;
+	var startX = opts.area[3];
+	var endX = opts.width - opts.area[1];
+	var endY = opts.height - opts.area[2];
+	// set YAxis background
+	context.beginPath();
+	context.setFillStyle(opts.background);
+	if (opts.enableScroll == true && opts.xAxis.scrollPosition && opts.xAxis.scrollPosition !== 'left') {
+		context.fillRect(0, 0, startX, endY + 2 * opts.pix);
+	}
+	if (opts.enableScroll == true && opts.xAxis.scrollPosition && opts.xAxis.scrollPosition !== 'right') {
+		context.fillRect(endX, 0, opts.width, endY + 2 * opts.pix);
+	}
+	context.closePath();
+	context.stroke();
+
+	let tStartLeft = opts.area[3];
+	let tStartRight = opts.width - opts.area[1];
+	let tStartCenter = opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2;
+	if (opts.yAxis.data) {
+		for (let i = 0; i < opts.yAxis.data.length; i++) {
+			let yData = opts.yAxis.data[i];
+			var points = [];
+			if (yData.type === 'categories') {
+				for (let i = 0; i <= yData.categories.length; i++) {
+					points.push(opts.area[0] + spacingValid / yData.categories.length / 2 + spacingValid / yData.categories
+						.length * i);
+				}
+			} else {
+				for (let i = 0; i <= opts.yAxis.splitNumber; i++) {
+					points.push(opts.area[0] + eachSpacing * i);
+				}
+			}
+			if (yData.disabled !== true) {
+				let rangesFormat = opts.chartData.yAxisData.rangesFormat[i];
+				let yAxisFontSize = yData.fontSize ? yData.fontSize * opts.pix : config.fontSize;
+				let yAxisWidth = opts.chartData.yAxisData.yAxisWidth[i];
+				let textAlign = yData.textAlign || "right";
+				//画Y轴刻度及文案
+				rangesFormat.forEach(function(item, index) {
+					var pos = points[index];
+					context.beginPath();
+					context.setFontSize(yAxisFontSize);
+					context.setLineWidth(1 * opts.pix);
+					context.setStrokeStyle(yData.axisLineColor || '#cccccc');
+					context.setFillStyle(yData.fontColor || opts.fontColor);
+					let tmpstrat = 0;
+					let gapwidth = 4 * opts.pix;
+					if (yAxisWidth.position == 'left') {
+						//画刻度线
+						if (yData.calibration == true) {
+							context.moveTo(tStartLeft, pos);
+							context.lineTo(tStartLeft - 3 * opts.pix, pos);
+							gapwidth += 3 * opts.pix;
+						}
+						//画文字
+						switch (textAlign) {
+							case "left":
+								context.setTextAlign('left');
+								tmpstrat = tStartLeft - yAxisWidth.width
+								break;
+							case "right":
+								context.setTextAlign('right');
+								tmpstrat = tStartLeft - gapwidth
+								break;
+							default:
+								context.setTextAlign('center');
+								tmpstrat = tStartLeft - yAxisWidth.width / 2
+						}
+						context.fillText(String(item), tmpstrat, pos + yAxisFontSize / 2 - 3 * opts.pix);
+
+					} else if (yAxisWidth.position == 'right') {
+						//画刻度线
+						if (yData.calibration == true) {
+							context.moveTo(tStartRight, pos);
+							context.lineTo(tStartRight + 3 * opts.pix, pos);
+							gapwidth += 3 * opts.pix;
+						}
+						switch (textAlign) {
+							case "left":
+								context.setTextAlign('left');
+								tmpstrat = tStartRight + gapwidth
+								break;
+							case "right":
+								context.setTextAlign('right');
+								tmpstrat = tStartRight + yAxisWidth.width
+								break;
+							default:
+								context.setTextAlign('center');
+								tmpstrat = tStartRight + yAxisWidth.width / 2
+						}
+						context.fillText(String(item), tmpstrat, pos + yAxisFontSize / 2 - 3 * opts.pix);
+					} else if (yAxisWidth.position == 'center') {
+						//画刻度线
+						if (yData.calibration == true) {
+							context.moveTo(tStartCenter, pos);
+							context.lineTo(tStartCenter - 3 * opts.pix, pos);
+							gapwidth += 3 * opts.pix;
+						}
+						//画文字
+						switch (textAlign) {
+							case "left":
+								context.setTextAlign('left');
+								tmpstrat = tStartCenter - yAxisWidth.width
+								break;
+							case "right":
+								context.setTextAlign('right');
+								tmpstrat = tStartCenter - gapwidth
+								break;
+							default:
+								context.setTextAlign('center');
+								tmpstrat = tStartCenter - yAxisWidth.width / 2
+						}
+						context.fillText(String(item), tmpstrat, pos + yAxisFontSize / 2 - 3 * opts.pix);
+					}
+					context.closePath();
+					context.stroke();
+					context.setTextAlign('left');
+				});
+				//画Y轴轴线
+				if (yData.axisLine !== false) {
+					context.beginPath();
+					context.setStrokeStyle(yData.axisLineColor || '#cccccc');
+					context.setLineWidth(1 * opts.pix);
+					if (yAxisWidth.position == 'left') {
+						context.moveTo(tStartLeft, opts.height - opts.area[2]);
+						context.lineTo(tStartLeft, opts.area[0]);
+					} else if (yAxisWidth.position == 'right') {
+						context.moveTo(tStartRight, opts.height - opts.area[2]);
+						context.lineTo(tStartRight, opts.area[0]);
+					} else if (yAxisWidth.position == 'center') {
+						context.moveTo(tStartCenter, opts.height - opts.area[2]);
+						context.lineTo(tStartCenter, opts.area[0]);
+					}
+					context.stroke();
+				}
+				//画Y轴标题
+				if (opts.yAxis.showTitle) {
+					let titleFontSize = yData.titleFontSize * opts.pix || config.fontSize;
+					let title = yData.title;
+					context.beginPath();
+					context.setFontSize(titleFontSize);
+					context.setFillStyle(yData.titleFontColor || opts.fontColor);
+					if (yAxisWidth.position == 'left') {
+						context.fillText(title, tStartLeft - measureText(title, titleFontSize, context) / 2 + (yData.titleOffsetX ||
+							0), opts.area[0] - (10 - (yData.titleOffsetY || 0)) * opts.pix);
+					} else if (yAxisWidth.position == 'right') {
+						context.fillText(title, tStartRight - measureText(title, titleFontSize, context) / 2 + (yData
+							.titleOffsetX || 0), opts.area[0] - (10 - (yData.titleOffsetY || 0)) * opts.pix);
+					} else if (yAxisWidth.position == 'center') {
+						context.fillText(title, tStartCenter - measureText(title, titleFontSize, context) / 2 + (yData
+							.titleOffsetX || 0), opts.area[0] - (10 - (yData.titleOffsetY || 0)) * opts.pix);
+					}
+					context.closePath();
+					context.stroke();
+				}
+				if (yAxisWidth.position == 'left') {
+					tStartLeft -= (yAxisWidth.width + opts.yAxis.padding * opts.pix);
+				} else {
+					tStartRight += yAxisWidth.width + opts.yAxis.padding * opts.pix;
+				}
+			}
+		}
+	}
 
 }
 
 function drawLegend(series, opts, config, context, chartData) {
-  if (opts.legend.show === false) {
-    return;
-  }
-  let legendData = chartData.legendData;
-  let legendList = legendData.points;
-  let legendArea = legendData.area;
-  let padding = opts.legend.padding * opts.pix;
-  let fontSize = opts.legend.fontSize * opts.pix;
-  let shapeWidth = 15 * opts.pix;
-  let shapeRight = 5 * opts.pix;
-  let itemGap = opts.legend.itemGap * opts.pix;
-  let lineHeight = Math.max(opts.legend.lineHeight * opts.pix, fontSize);
-  //画背景及边框
-  context.beginPath();
-  context.setLineWidth(opts.legend.borderWidth * opts.pix);
-  context.setStrokeStyle(opts.legend.borderColor);
-  context.setFillStyle(opts.legend.backgroundColor);
-  context.moveTo(legendArea.start.x, legendArea.start.y);
-  context.rect(legendArea.start.x, legendArea.start.y, legendArea.width, legendArea.height);
-  context.closePath();
-  context.fill();
-  context.stroke();
-  legendList.forEach(function(itemList, listIndex) {
-    let width = 0;
-    let height = 0;
-    width = legendData.widthArr[listIndex];
-    height = legendData.heightArr[listIndex];
-    let startX = 0;
-    let startY = 0;
-    if (opts.legend.position == 'top' || opts.legend.position == 'bottom') {
-      switch (opts.legend.float) {
-        case 'left':
-          startX = legendArea.start.x + padding;
-        break;
-        case 'right':
-          startX = legendArea.start.x + legendArea.width - width;
-        break;
-        default:
-        startX = legendArea.start.x + (legendArea.width - width) / 2;
-      }
-      startY = legendArea.start.y + padding + listIndex * lineHeight;
-    } else {
-      if (listIndex == 0) {
-        width = 0;
-      } else {
-        width = legendData.widthArr[listIndex - 1];
-      }
-      startX = legendArea.start.x + padding + width;
-      startY = legendArea.start.y + padding + (legendArea.height - height) / 2;
-    }
-    context.setFontSize(config.fontSize);
-    for (let i = 0; i < itemList.length; i++) {
-      let item = itemList[i];
-      item.area = [0, 0, 0, 0];
-      item.area[0] = startX;
-      item.area[1] = startY;
-      item.area[3] = startY + lineHeight;
-      context.beginPath();
-      context.setLineWidth(1 * opts.pix);
-      context.setStrokeStyle(item.show ? item.color : opts.legend.hiddenColor);
-      context.setFillStyle(item.show ? item.color : opts.legend.hiddenColor);
-      switch (item.legendShape) {
-        case 'line':
-          context.moveTo(startX, startY + 0.5 * lineHeight - 2 * opts.pix);
-          context.fillRect(startX, startY + 0.5 * lineHeight - 2 * opts.pix, 15 * opts.pix, 4 * opts.pix);
-          break;
-        case 'triangle':
-          context.moveTo(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight - 5 * opts.pix);
-          context.lineTo(startX + 2.5 * opts.pix, startY + 0.5 * lineHeight + 5 * opts.pix);
-          context.lineTo(startX + 12.5 * opts.pix, startY + 0.5 * lineHeight + 5 * opts.pix);
-          context.lineTo(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight - 5 * opts.pix);
-          break;
-        case 'diamond':
-          context.moveTo(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight - 5 * opts.pix);
-          context.lineTo(startX + 2.5 * opts.pix, startY + 0.5 * lineHeight);
-          context.lineTo(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight + 5 * opts.pix);
-          context.lineTo(startX + 12.5 * opts.pix, startY + 0.5 * lineHeight);
-          context.lineTo(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight - 5 * opts.pix);
-          break;
-        case 'circle':
-          context.moveTo(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight);
-          context.arc(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight, 5 * opts.pix, 0, 2 * Math.PI);
-          break;
-        case 'rect':
-          context.moveTo(startX, startY + 0.5 * lineHeight - 5 * opts.pix);
-          context.fillRect(startX, startY + 0.5 * lineHeight - 5 * opts.pix, 15 * opts.pix, 10 * opts.pix);
-          break;
-        case 'square':
-          context.moveTo(startX + 5 * opts.pix, startY + 0.5 * lineHeight - 5 * opts.pix);
-          context.fillRect(startX + 5 * opts.pix, startY + 0.5 * lineHeight - 5 * opts.pix, 10 * opts.pix, 10 * opts.pix);
-          break;
-        case 'none':
-          break;
-        default:
-          context.moveTo(startX, startY + 0.5 * lineHeight - 5 * opts.pix);
-          context.fillRect(startX, startY + 0.5 * lineHeight - 5 * opts.pix, 15 * opts.pix, 10 * opts.pix);
-      }
-      context.closePath();
-      context.fill();
-      context.stroke();
-      startX += shapeWidth + shapeRight;
-      let fontTrans = 0.5 * lineHeight + 0.5 * fontSize - 2;
-      const legendText = item.legendText ? item.legendText : item.name;
-      context.beginPath();
-      context.setFontSize(fontSize);
-      context.setFillStyle(item.show ? opts.legend.fontColor : opts.legend.hiddenColor);
-      context.fillText(legendText, startX, startY + fontTrans);
-      context.closePath();
-      context.stroke();
-      if (opts.legend.position == 'top' || opts.legend.position == 'bottom') {
-        startX += measureText(legendText, fontSize, context) + itemGap;
-        item.area[2] = startX;
-      } else {
-        item.area[2] = startX + measureText(legendText, fontSize, context) + itemGap;;
-        startX -= shapeWidth + shapeRight;
-        startY += lineHeight;
-      }
-    }
-  });
+	if (opts.legend.show === false) {
+		return;
+	}
+	let legendData = chartData.legendData;
+	let legendList = legendData.points;
+	let legendArea = legendData.area;
+	let padding = opts.legend.padding * opts.pix;
+	let fontSize = opts.legend.fontSize * opts.pix;
+	let shapeWidth = 15 * opts.pix;
+	let shapeRight = 5 * opts.pix;
+	let itemGap = opts.legend.itemGap * opts.pix;
+	let lineHeight = Math.max(opts.legend.lineHeight * opts.pix, fontSize);
+	//画背景及边框
+	context.beginPath();
+	context.setLineWidth(opts.legend.borderWidth * opts.pix);
+	context.setStrokeStyle(opts.legend.borderColor);
+	context.setFillStyle(opts.legend.backgroundColor);
+	context.moveTo(legendArea.start.x, legendArea.start.y);
+	context.rect(legendArea.start.x, legendArea.start.y, legendArea.width, legendArea.height);
+	context.closePath();
+	context.fill();
+	context.stroke();
+	legendList.forEach(function(itemList, listIndex) {
+		let width = 0;
+		let height = 0;
+		width = legendData.widthArr[listIndex];
+		height = legendData.heightArr[listIndex];
+		let startX = 0;
+		let startY = 0;
+		if (opts.legend.position == 'top' || opts.legend.position == 'bottom') {
+			switch (opts.legend.float) {
+				case 'left':
+					startX = legendArea.start.x + padding;
+					break;
+				case 'right':
+					startX = legendArea.start.x + legendArea.width - width;
+					break;
+				default:
+					startX = legendArea.start.x + (legendArea.width - width) / 2;
+			}
+			startY = legendArea.start.y + padding + listIndex * lineHeight;
+		} else {
+			if (listIndex == 0) {
+				width = 0;
+			} else {
+				width = legendData.widthArr[listIndex - 1];
+			}
+			startX = legendArea.start.x + padding + width;
+			startY = legendArea.start.y + padding + (legendArea.height - height) / 2;
+		}
+		context.setFontSize(config.fontSize);
+		for (let i = 0; i < itemList.length; i++) {
+			let item = itemList[i];
+			item.area = [0, 0, 0, 0];
+			item.area[0] = startX;
+			item.area[1] = startY;
+			item.area[3] = startY + lineHeight;
+			context.beginPath();
+			context.setLineWidth(1 * opts.pix);
+			context.setStrokeStyle(item.show ? item.color : opts.legend.hiddenColor);
+			context.setFillStyle(item.show ? item.color : opts.legend.hiddenColor);
+			switch (item.legendShape) {
+				case 'line':
+					context.moveTo(startX, startY + 0.5 * lineHeight - 2 * opts.pix);
+					context.fillRect(startX, startY + 0.5 * lineHeight - 2 * opts.pix, 15 * opts.pix, 4 * opts.pix);
+					break;
+				case 'triangle':
+					context.moveTo(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight - 5 * opts.pix);
+					context.lineTo(startX + 2.5 * opts.pix, startY + 0.5 * lineHeight + 5 * opts.pix);
+					context.lineTo(startX + 12.5 * opts.pix, startY + 0.5 * lineHeight + 5 * opts.pix);
+					context.lineTo(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight - 5 * opts.pix);
+					break;
+				case 'diamond':
+					context.moveTo(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight - 5 * opts.pix);
+					context.lineTo(startX + 2.5 * opts.pix, startY + 0.5 * lineHeight);
+					context.lineTo(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight + 5 * opts.pix);
+					context.lineTo(startX + 12.5 * opts.pix, startY + 0.5 * lineHeight);
+					context.lineTo(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight - 5 * opts.pix);
+					break;
+				case 'circle':
+					context.moveTo(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight);
+					context.arc(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight, 5 * opts.pix, 0, 2 * Math.PI);
+					break;
+				case 'rect':
+					context.moveTo(startX, startY + 0.5 * lineHeight - 5 * opts.pix);
+					context.fillRect(startX, startY + 0.5 * lineHeight - 5 * opts.pix, 15 * opts.pix, 10 * opts.pix);
+					break;
+				case 'square':
+					context.moveTo(startX + 5 * opts.pix, startY + 0.5 * lineHeight - 5 * opts.pix);
+					context.fillRect(startX + 5 * opts.pix, startY + 0.5 * lineHeight - 5 * opts.pix, 10 * opts.pix, 10 * opts
+						.pix);
+					break;
+				case 'none':
+					break;
+				default:
+					context.moveTo(startX, startY + 0.5 * lineHeight - 5 * opts.pix);
+					context.fillRect(startX, startY + 0.5 * lineHeight - 5 * opts.pix, 15 * opts.pix, 10 * opts.pix);
+			}
+			context.closePath();
+			context.fill();
+			context.stroke();
+			startX += shapeWidth + shapeRight;
+			let fontTrans = 0.5 * lineHeight + 0.5 * fontSize - 2;
+			const legendText = item.legendText ? item.legendText : item.name;
+			context.beginPath();
+			context.setFontSize(fontSize);
+			context.setFillStyle(item.show ? opts.legend.fontColor : opts.legend.hiddenColor);
+			context.fillText(legendText, startX, startY + fontTrans);
+			context.closePath();
+			context.stroke();
+			if (opts.legend.position == 'top' || opts.legend.position == 'bottom') {
+				startX += measureText(legendText, fontSize, context) + itemGap;
+				item.area[2] = startX;
+			} else {
+				item.area[2] = startX + measureText(legendText, fontSize, context) + itemGap;;
+				startX -= shapeWidth + shapeRight;
+				startY += lineHeight;
+			}
+		}
+	});
 }
 
 function drawPieDataPoints(series, opts, config, context) {
-  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
-  var pieOption = assign({}, {
-    activeOpacity: 0.5,
-    activeRadius: 10,
-    offsetAngle: 0,
-    labelWidth: 15,
-    ringWidth: 30,
-    customRadius: 0,
-    border: false,
-    borderWidth: 2,
-    borderColor: '#FFFFFF',
-    centerColor: '#FFFFFF',
-    linearType: 'none',
-    customColor: [],
-  }, opts.type == "pie" ? opts.extra.pie : opts.extra.ring);
-  var centerPosition = {
-    x: opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2,
-    y: opts.area[0] + (opts.height - opts.area[0] - opts.area[2]) / 2
-  };
-  if (config.pieChartLinePadding == 0) {
-    config.pieChartLinePadding = pieOption.activeRadius * opts.pix;
-  }
-
-  var radius = Math.min((opts.width - opts.area[1] - opts.area[3]) / 2 - config.pieChartLinePadding - config.pieChartTextPadding - config._pieTextMaxLength_, (opts.height - opts.area[0] - opts.area[2]) / 2 - config.pieChartLinePadding - config.pieChartTextPadding);
-  radius = radius < 10 ? 10 : radius;
-  if (pieOption.customRadius > 0) {
-    radius = pieOption.customRadius * opts.pix;
-  }
-  series = getPieDataPoints(series, radius, process);
-  var activeRadius = pieOption.activeRadius * opts.pix;
-  pieOption.customColor = fillCustomColor(pieOption.linearType, pieOption.customColor, series, config);
-  series = series.map(function(eachSeries) {
-    eachSeries._start_ += (pieOption.offsetAngle) * Math.PI / 180;
-    return eachSeries;
-  });
-  series.forEach(function(eachSeries, seriesIndex) {
-    if (opts.tooltip) {
-      if (opts.tooltip.index == seriesIndex) {
-        context.beginPath();
-        context.setFillStyle(hexToRgb(eachSeries.color, pieOption.activeOpacity || 0.5));
-        context.moveTo(centerPosition.x, centerPosition.y);
-        context.arc(centerPosition.x, centerPosition.y, eachSeries._radius_ + activeRadius, eachSeries._start_, eachSeries._start_ + 2 * eachSeries._proportion_ * Math.PI);
-        context.closePath();
-        context.fill();
-      }
-    }
-    context.beginPath();
-    context.setLineWidth(pieOption.borderWidth * opts.pix);
-    context.lineJoin = "round";
-    context.setStrokeStyle(pieOption.borderColor);
-    var fillcolor = eachSeries.color;
-    if (pieOption.linearType == 'custom') {
-      var grd;
-      if(context.createCircularGradient){
-        grd = context.createCircularGradient(centerPosition.x, centerPosition.y, eachSeries._radius_)
-      }else{
-        grd = context.createRadialGradient(centerPosition.x, centerPosition.y, 0,centerPosition.x, centerPosition.y, eachSeries._radius_)
-      }
-      grd.addColorStop(0, hexToRgb(pieOption.customColor[eachSeries.linearIndex], 1))
-      grd.addColorStop(1, hexToRgb(eachSeries.color, 1))
-      fillcolor = grd
-    }
-    context.setFillStyle(fillcolor);
-    context.moveTo(centerPosition.x, centerPosition.y);
-    context.arc(centerPosition.x, centerPosition.y, eachSeries._radius_, eachSeries._start_, eachSeries._start_ + 2 * eachSeries._proportion_ * Math.PI);
-    context.closePath();
-    context.fill();
-    if (pieOption.border == true) {
-      context.stroke();
-    }
-  });
-  if (opts.type === 'ring') {
-    var innerPieWidth = radius * 0.6;
-    if (typeof pieOption.ringWidth === 'number' && pieOption.ringWidth > 0) {
-      innerPieWidth = Math.max(0, radius - pieOption.ringWidth * opts.pix);
-    }
-    context.beginPath();
-    context.setFillStyle(pieOption.centerColor);
-    context.moveTo(centerPosition.x, centerPosition.y);
-    context.arc(centerPosition.x, centerPosition.y, innerPieWidth, 0, 2 * Math.PI);
-    context.closePath();
-    context.fill();
-  }
-  if (opts.dataLabel !== false && process === 1) {
-    drawPieText(series, opts, config, context, radius, centerPosition);
-  }
-  if (process === 1 && opts.type === 'ring') {
-    drawRingTitle(opts, config, context, centerPosition);
-  }
-  return {
-    center: centerPosition,
-    radius: radius,
-    series: series
-  };
+	var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	var pieOption = assign({}, {
+		activeOpacity: 0.5,
+		activeRadius: 10,
+		offsetAngle: 0,
+		labelWidth: 15,
+		ringWidth: 30,
+		customRadius: 0,
+		border: false,
+		borderWidth: 2,
+		borderColor: '#FFFFFF',
+		centerColor: '#FFFFFF',
+		linearType: 'none',
+		customColor: [],
+	}, opts.type == "pie" ? opts.extra.pie : opts.extra.ring);
+	var centerPosition = {
+		x: opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2,
+		y: opts.area[0] + (opts.height - opts.area[0] - opts.area[2]) / 2
+	};
+	if (config.pieChartLinePadding == 0) {
+		config.pieChartLinePadding = pieOption.activeRadius * opts.pix;
+	}
+
+	var radius = Math.min((opts.width - opts.area[1] - opts.area[3]) / 2 - config.pieChartLinePadding - config
+		.pieChartTextPadding - config._pieTextMaxLength_, (opts.height - opts.area[0] - opts.area[2]) / 2 - config
+		.pieChartLinePadding - config.pieChartTextPadding);
+	radius = radius < 10 ? 10 : radius;
+	if (pieOption.customRadius > 0) {
+		radius = pieOption.customRadius * opts.pix;
+	}
+	series = getPieDataPoints(series, radius, process);
+	var activeRadius = pieOption.activeRadius * opts.pix;
+	pieOption.customColor = fillCustomColor(pieOption.linearType, pieOption.customColor, series, config);
+	series = series.map(function(eachSeries) {
+		eachSeries._start_ += (pieOption.offsetAngle) * Math.PI / 180;
+		return eachSeries;
+	});
+	series.forEach(function(eachSeries, seriesIndex) {
+		if (opts.tooltip) {
+			if (opts.tooltip.index == seriesIndex) {
+				context.beginPath();
+				context.setFillStyle(hexToRgb(eachSeries.color, pieOption.activeOpacity || 0.5));
+				context.moveTo(centerPosition.x, centerPosition.y);
+				context.arc(centerPosition.x, centerPosition.y, eachSeries._radius_ + activeRadius, eachSeries._start_,
+					eachSeries._start_ + 2 * eachSeries._proportion_ * Math.PI);
+				context.closePath();
+				context.fill();
+			}
+		}
+		context.beginPath();
+		context.setLineWidth(pieOption.borderWidth * opts.pix);
+		context.lineJoin = "round";
+		context.setStrokeStyle(pieOption.borderColor);
+		var fillcolor = eachSeries.color;
+		if (pieOption.linearType == 'custom') {
+			var grd;
+			if (context.createCircularGradient) {
+				grd = context.createCircularGradient(centerPosition.x, centerPosition.y, eachSeries._radius_)
+			} else {
+				grd = context.createRadialGradient(centerPosition.x, centerPosition.y, 0, centerPosition.x, centerPosition
+					.y, eachSeries._radius_)
+			}
+			grd.addColorStop(0, hexToRgb(pieOption.customColor[eachSeries.linearIndex], 1))
+			grd.addColorStop(1, hexToRgb(eachSeries.color, 1))
+			fillcolor = grd
+		}
+		context.setFillStyle(fillcolor);
+		context.moveTo(centerPosition.x, centerPosition.y);
+		context.arc(centerPosition.x, centerPosition.y, eachSeries._radius_, eachSeries._start_, eachSeries._start_ +
+			2 * eachSeries._proportion_ * Math.PI);
+		context.closePath();
+		context.fill();
+		if (pieOption.border == true) {
+			context.stroke();
+		}
+	});
+	if (opts.type === 'ring') {
+		var innerPieWidth = radius * 0.6;
+		if (typeof pieOption.ringWidth === 'number' && pieOption.ringWidth > 0) {
+			innerPieWidth = Math.max(0, radius - pieOption.ringWidth * opts.pix);
+		}
+		context.beginPath();
+		context.setFillStyle(pieOption.centerColor);
+		context.moveTo(centerPosition.x, centerPosition.y);
+		context.arc(centerPosition.x, centerPosition.y, innerPieWidth, 0, 2 * Math.PI);
+		context.closePath();
+		context.fill();
+	}
+	if (opts.dataLabel !== false && process === 1) {
+		drawPieText(series, opts, config, context, radius, centerPosition);
+	}
+	if (process === 1 && opts.type === 'ring') {
+		drawRingTitle(opts, config, context, centerPosition);
+	}
+	return {
+		center: centerPosition,
+		radius: radius,
+		series: series
+	};
 }
 
 function drawRoseDataPoints(series, opts, config, context) {
-  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
-  var roseOption = assign({}, {
-    type: 'area',
-    activeOpacity: 0.5,
-    activeRadius: 10,
-    offsetAngle: 0,
-    labelWidth: 15,
-    border: false,
-    borderWidth: 2,
-    borderColor: '#FFFFFF',
-    linearType: 'none',
-    customColor: [],
-  }, opts.extra.rose);
-  if (config.pieChartLinePadding == 0) {
-    config.pieChartLinePadding = roseOption.activeRadius * opts.pix;
-  }
-  var centerPosition = {
-    x: opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2,
-    y: opts.area[0] + (opts.height - opts.area[0] - opts.area[2]) / 2
-  };
-  var radius = Math.min((opts.width - opts.area[1] - opts.area[3]) / 2 - config.pieChartLinePadding - config.pieChartTextPadding - config._pieTextMaxLength_, (opts.height - opts.area[0] - opts.area[2]) / 2 - config.pieChartLinePadding - config.pieChartTextPadding);
-  radius = radius < 10 ? 10 : radius;
-  var minRadius = roseOption.minRadius || radius * 0.5;
-  if(radius < minRadius){
-    radius = minRadius + 10;
-  }
-  series = getRoseDataPoints(series, roseOption.type, minRadius, radius, process);
-  var activeRadius = roseOption.activeRadius * opts.pix;
-  roseOption.customColor = fillCustomColor(roseOption.linearType, roseOption.customColor, series, config);
-  series = series.map(function(eachSeries) {
-    eachSeries._start_ += (roseOption.offsetAngle || 0) * Math.PI / 180;
-    return eachSeries;
-  });
-  series.forEach(function(eachSeries, seriesIndex) {
-    if (opts.tooltip) {
-      if (opts.tooltip.index == seriesIndex) {
-        context.beginPath();
-        context.setFillStyle(hexToRgb(eachSeries.color, roseOption.activeOpacity || 0.5));
-        context.moveTo(centerPosition.x, centerPosition.y);
-        context.arc(centerPosition.x, centerPosition.y, activeRadius + eachSeries._radius_, eachSeries._start_, eachSeries._start_ + 2 * eachSeries._rose_proportion_ * Math.PI);
-        context.closePath();
-        context.fill();
-      }
-    }
-    context.beginPath();
-    context.setLineWidth(roseOption.borderWidth * opts.pix);
-    context.lineJoin = "round";
-    context.setStrokeStyle(roseOption.borderColor);
-    var fillcolor = eachSeries.color;
-    if (roseOption.linearType == 'custom') {
-      var grd;
-      if(context.createCircularGradient){
-        grd = context.createCircularGradient(centerPosition.x, centerPosition.y, eachSeries._radius_)
-      }else{
-        grd = context.createRadialGradient(centerPosition.x, centerPosition.y, 0,centerPosition.x, centerPosition.y, eachSeries._radius_)
-      }
-      grd.addColorStop(0, hexToRgb(roseOption.customColor[eachSeries.linearIndex], 1))
-      grd.addColorStop(1, hexToRgb(eachSeries.color, 1))
-      fillcolor = grd
-    }
-    context.setFillStyle(fillcolor);
-    context.moveTo(centerPosition.x, centerPosition.y);
-    context.arc(centerPosition.x, centerPosition.y, eachSeries._radius_, eachSeries._start_, eachSeries._start_ + 2 * eachSeries._rose_proportion_ * Math.PI);
-    context.closePath();
-    context.fill();
-    if (roseOption.border == true) {
-      context.stroke();
-    }
-  });
-
-  if (opts.dataLabel !== false && process === 1) {
-    drawPieText(series, opts, config, context, radius, centerPosition);
-  }
-  return {
-    center: centerPosition,
-    radius: radius,
-    series: series
-  };
+	var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	var roseOption = assign({}, {
+		type: 'area',
+		activeOpacity: 0.5,
+		activeRadius: 10,
+		offsetAngle: 0,
+		labelWidth: 15,
+		border: false,
+		borderWidth: 2,
+		borderColor: '#FFFFFF',
+		linearType: 'none',
+		customColor: [],
+	}, opts.extra.rose);
+	if (config.pieChartLinePadding == 0) {
+		config.pieChartLinePadding = roseOption.activeRadius * opts.pix;
+	}
+	var centerPosition = {
+		x: opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2,
+		y: opts.area[0] + (opts.height - opts.area[0] - opts.area[2]) / 2
+	};
+	var radius = Math.min((opts.width - opts.area[1] - opts.area[3]) / 2 - config.pieChartLinePadding - config
+		.pieChartTextPadding - config._pieTextMaxLength_, (opts.height - opts.area[0] - opts.area[2]) / 2 - config
+		.pieChartLinePadding - config.pieChartTextPadding);
+	radius = radius < 10 ? 10 : radius;
+	var minRadius = roseOption.minRadius || radius * 0.5;
+	if (radius < minRadius) {
+		radius = minRadius + 10;
+	}
+	series = getRoseDataPoints(series, roseOption.type, minRadius, radius, process);
+	var activeRadius = roseOption.activeRadius * opts.pix;
+	roseOption.customColor = fillCustomColor(roseOption.linearType, roseOption.customColor, series, config);
+	series = series.map(function(eachSeries) {
+		eachSeries._start_ += (roseOption.offsetAngle || 0) * Math.PI / 180;
+		return eachSeries;
+	});
+	series.forEach(function(eachSeries, seriesIndex) {
+		if (opts.tooltip) {
+			if (opts.tooltip.index == seriesIndex) {
+				context.beginPath();
+				context.setFillStyle(hexToRgb(eachSeries.color, roseOption.activeOpacity || 0.5));
+				context.moveTo(centerPosition.x, centerPosition.y);
+				context.arc(centerPosition.x, centerPosition.y, activeRadius + eachSeries._radius_, eachSeries._start_,
+					eachSeries._start_ + 2 * eachSeries._rose_proportion_ * Math.PI);
+				context.closePath();
+				context.fill();
+			}
+		}
+		context.beginPath();
+		context.setLineWidth(roseOption.borderWidth * opts.pix);
+		context.lineJoin = "round";
+		context.setStrokeStyle(roseOption.borderColor);
+		var fillcolor = eachSeries.color;
+		if (roseOption.linearType == 'custom') {
+			var grd;
+			if (context.createCircularGradient) {
+				grd = context.createCircularGradient(centerPosition.x, centerPosition.y, eachSeries._radius_)
+			} else {
+				grd = context.createRadialGradient(centerPosition.x, centerPosition.y, 0, centerPosition.x, centerPosition
+					.y, eachSeries._radius_)
+			}
+			grd.addColorStop(0, hexToRgb(roseOption.customColor[eachSeries.linearIndex], 1))
+			grd.addColorStop(1, hexToRgb(eachSeries.color, 1))
+			fillcolor = grd
+		}
+		context.setFillStyle(fillcolor);
+		context.moveTo(centerPosition.x, centerPosition.y);
+		context.arc(centerPosition.x, centerPosition.y, eachSeries._radius_, eachSeries._start_, eachSeries._start_ +
+			2 * eachSeries._rose_proportion_ * Math.PI);
+		context.closePath();
+		context.fill();
+		if (roseOption.border == true) {
+			context.stroke();
+		}
+	});
+
+	if (opts.dataLabel !== false && process === 1) {
+		drawPieText(series, opts, config, context, radius, centerPosition);
+	}
+	return {
+		center: centerPosition,
+		radius: radius,
+		series: series
+	};
 }
 
 function drawArcbarDataPoints(series, opts, config, context) {
-  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
-  var arcbarOption = assign({}, {
-    startAngle: 0.75,
-    endAngle: 0.25,
-    type: 'default',
-    direction: 'cw',
-    lineCap: 'round',
-    width: 12 ,
-    gap: 2 ,
-    linearType: 'none',
-    customColor: [],
-  }, opts.extra.arcbar);
-  series = getArcbarDataPoints(series, arcbarOption, process);
-  var centerPosition;
-  if (arcbarOption.centerX || arcbarOption.centerY) {
-    centerPosition = {
-      x: arcbarOption.centerX ? arcbarOption.centerX : opts.width / 2,
-      y: arcbarOption.centerY ? arcbarOption.centerY : opts.height / 2
-    };
-  } else {
-    centerPosition = {
-      x: opts.width / 2,
-      y: opts.height / 2
-    };
-  }
-  var radius;
-  if (arcbarOption.radius) {
-    radius = arcbarOption.radius;
-  } else {
-    radius = Math.min(centerPosition.x, centerPosition.y);
-    radius -= 5 * opts.pix;
-    radius -= arcbarOption.width / 2;
-  }
-  radius = radius < 10 ? 10 : radius;
-  arcbarOption.customColor = fillCustomColor(arcbarOption.linearType, arcbarOption.customColor, series, config);
-  
-  for (let i = 0; i < series.length; i++) {
-    let eachSeries = series[i];
-    //背景颜色
-    context.setLineWidth(arcbarOption.width * opts.pix);
-    context.setStrokeStyle(arcbarOption.backgroundColor || '#E9E9E9');
-    context.setLineCap(arcbarOption.lineCap);
-    context.beginPath();
-    if (arcbarOption.type == 'default') {
-      context.arc(centerPosition.x, centerPosition.y, radius - (arcbarOption.width * opts.pix + arcbarOption.gap * opts.pix) * i, arcbarOption.startAngle * Math.PI, arcbarOption.endAngle * Math.PI, arcbarOption.direction == 'ccw');
-    } else {
-      context.arc(centerPosition.x, centerPosition.y, radius - (arcbarOption.width * opts.pix + arcbarOption.gap * opts.pix) * i, 0, 2 * Math.PI, arcbarOption.direction == 'ccw');
-    }
-    context.stroke();
-    //进度条
-    var fillColor = eachSeries.color
-    if(arcbarOption.linearType == 'custom'){
-      var grd = context.createLinearGradient(centerPosition.x - radius, centerPosition.y, centerPosition.x + radius, centerPosition.y);
-      grd.addColorStop(1, hexToRgb(arcbarOption.customColor[eachSeries.linearIndex], 1))
-      grd.addColorStop(0, hexToRgb(eachSeries.color, 1))
-      fillColor = grd;
-    }
-    context.setLineWidth(arcbarOption.width * opts.pix);
-    context.setStrokeStyle(fillColor);
-    context.setLineCap(arcbarOption.lineCap);
-    context.beginPath();
-    context.arc(centerPosition.x, centerPosition.y, radius - (arcbarOption.width * opts.pix + arcbarOption.gap * opts.pix) * i, arcbarOption.startAngle * Math.PI, eachSeries._proportion_ * Math.PI, arcbarOption.direction == 'ccw');
-    context.stroke();
-  }
-  drawRingTitle(opts, config, context, centerPosition);
-  return {
-    center: centerPosition,
-    radius: radius,
-    series: series
-  };
+	var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	var arcbarOption = assign({}, {
+		startAngle: 0.75,
+		endAngle: 0.25,
+		type: 'default',
+		direction: 'cw',
+		lineCap: 'round',
+		width: 12,
+		gap: 2,
+		linearType: 'none',
+		customColor: [],
+	}, opts.extra.arcbar);
+	series = getArcbarDataPoints(series, arcbarOption, process);
+	var centerPosition;
+	if (arcbarOption.centerX || arcbarOption.centerY) {
+		centerPosition = {
+			x: arcbarOption.centerX ? arcbarOption.centerX : opts.width / 2,
+			y: arcbarOption.centerY ? arcbarOption.centerY : opts.height / 2
+		};
+	} else {
+		centerPosition = {
+			x: opts.width / 2,
+			y: opts.height / 2
+		};
+	}
+	var radius;
+	if (arcbarOption.radius) {
+		radius = arcbarOption.radius;
+	} else {
+		radius = Math.min(centerPosition.x, centerPosition.y);
+		radius -= 5 * opts.pix;
+		radius -= arcbarOption.width / 2;
+	}
+	radius = radius < 10 ? 10 : radius;
+	arcbarOption.customColor = fillCustomColor(arcbarOption.linearType, arcbarOption.customColor, series, config);
+
+	for (let i = 0; i < series.length; i++) {
+		let eachSeries = series[i];
+		//背景颜色
+		context.setLineWidth(arcbarOption.width * opts.pix);
+		context.setStrokeStyle(arcbarOption.backgroundColor || '#E9E9E9');
+		context.setLineCap(arcbarOption.lineCap);
+		context.beginPath();
+		if (arcbarOption.type == 'default') {
+			context.arc(centerPosition.x, centerPosition.y, radius - (arcbarOption.width * opts.pix + arcbarOption.gap * opts
+					.pix) * i, arcbarOption.startAngle * Math.PI, arcbarOption.endAngle * Math.PI, arcbarOption.direction ==
+				'ccw');
+		} else {
+			context.arc(centerPosition.x, centerPosition.y, radius - (arcbarOption.width * opts.pix + arcbarOption.gap * opts
+				.pix) * i, 0, 2 * Math.PI, arcbarOption.direction == 'ccw');
+		}
+		context.stroke();
+		//进度条
+		var fillColor = eachSeries.color
+		if (arcbarOption.linearType == 'custom') {
+			var grd = context.createLinearGradient(centerPosition.x - radius, centerPosition.y, centerPosition.x + radius,
+				centerPosition.y);
+			grd.addColorStop(1, hexToRgb(arcbarOption.customColor[eachSeries.linearIndex], 1))
+			grd.addColorStop(0, hexToRgb(eachSeries.color, 1))
+			fillColor = grd;
+		}
+		context.setLineWidth(arcbarOption.width * opts.pix);
+		context.setStrokeStyle(fillColor);
+		context.setLineCap(arcbarOption.lineCap);
+		context.beginPath();
+		context.arc(centerPosition.x, centerPosition.y, radius - (arcbarOption.width * opts.pix + arcbarOption.gap * opts
+				.pix) * i, arcbarOption.startAngle * Math.PI, eachSeries._proportion_ * Math.PI, arcbarOption.direction ==
+			'ccw');
+		context.stroke();
+	}
+	drawRingTitle(opts, config, context, centerPosition);
+	return {
+		center: centerPosition,
+		radius: radius,
+		series: series
+	};
 }
 
 function drawGaugeDataPoints(categories, series, opts, config, context) {
-  var process = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
-  var gaugeOption = assign({}, {
-    type: 'default',
-    startAngle: 0.75,
-    endAngle: 0.25,
-    width: 15,
-    labelOffset:13,
-    splitLine: {
-      fixRadius: 0,
-      splitNumber: 10,
-      width: 15,
-      color: '#FFFFFF',
-      childNumber: 5,
-      childWidth: 5
-    },
-    pointer: {
-      width: 15,
-      color: 'auto'
-    }
-  }, opts.extra.gauge);
-  if (gaugeOption.oldAngle == undefined) {
-    gaugeOption.oldAngle = gaugeOption.startAngle;
-  }
-  if (gaugeOption.oldData == undefined) {
-    gaugeOption.oldData = 0;
-  }
-  categories = getGaugeAxisPoints(categories, gaugeOption.startAngle, gaugeOption.endAngle);
-  var centerPosition = {
-    x: opts.width / 2,
-    y: opts.height / 2
-  };
-  var radius = Math.min(centerPosition.x, centerPosition.y);
-  radius -= 5 * opts.pix;
-  radius -= gaugeOption.width / 2;
-  radius = radius < 10 ? 10 : radius;
-  var innerRadius = radius - gaugeOption.width;
-  var totalAngle = 0;
-  //判断仪表盘的样式：default百度样式，progress新样式
-  if (gaugeOption.type == 'progress') {
-    //## 第一步画中心圆形背景和进度条背景
-    //中心圆形背景
-    var pieRadius = radius - gaugeOption.width * 3;
-    context.beginPath();
-    let gradient = context.createLinearGradient(centerPosition.x, centerPosition.y - pieRadius, centerPosition.x, centerPosition.y + pieRadius);
-    //配置渐变填充（起点：中心点向上减半径；结束点中心点向下加半径）
-    gradient.addColorStop('0', hexToRgb(series[0].color, 0.3));
-    gradient.addColorStop('1.0', hexToRgb("#FFFFFF", 0.1));
-    context.setFillStyle(gradient);
-    context.arc(centerPosition.x, centerPosition.y, pieRadius, 0, 2 * Math.PI, false);
-    context.fill();
-    //画进度条背景
-    context.setLineWidth(gaugeOption.width);
-    context.setStrokeStyle(hexToRgb(series[0].color, 0.3));
-    context.setLineCap('round');
-    context.beginPath();
-    context.arc(centerPosition.x, centerPosition.y, innerRadius, gaugeOption.startAngle * Math.PI, gaugeOption.endAngle * Math.PI, false);
-    context.stroke();
-    //## 第二步画刻度线
-    if (gaugeOption.endAngle < gaugeOption.startAngle) {
-      totalAngle = 2 + gaugeOption.endAngle - gaugeOption.startAngle;
-    } else {
-      totalAngle = gaugeOption.startAngle - gaugeOption.endAngle;
-    }
-    let splitAngle = totalAngle / gaugeOption.splitLine.splitNumber;
-    let childAngle = totalAngle / gaugeOption.splitLine.splitNumber / gaugeOption.splitLine.childNumber;
-    let startX = -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius;
-    let endX = -radius - gaugeOption.width - gaugeOption.splitLine.fixRadius + gaugeOption.splitLine.width;
-    context.save();
-    context.translate(centerPosition.x, centerPosition.y);
-    context.rotate((gaugeOption.startAngle - 1) * Math.PI);
-    let len = gaugeOption.splitLine.splitNumber * gaugeOption.splitLine.childNumber + 1;
-    let proc = series[0].data * process;
-    for (let i = 0; i < len; i++) {
-      context.beginPath();
-      //刻度线随进度变色
-      if (proc > (i / len)) {
-        context.setStrokeStyle(hexToRgb(series[0].color, 1));
-      } else {
-        context.setStrokeStyle(hexToRgb(series[0].color, 0.3));
-      }
-      context.setLineWidth(3 * opts.pix);
-      context.moveTo(startX, 0);
-      context.lineTo(endX, 0);
-      context.stroke();
-      context.rotate(childAngle * Math.PI);
-    }
-    context.restore();
-    //## 第三步画进度条
-    series = getGaugeArcbarDataPoints(series, gaugeOption, process);
-    context.setLineWidth(gaugeOption.width);
-    context.setStrokeStyle(series[0].color);
-    context.setLineCap('round');
-    context.beginPath();
-    context.arc(centerPosition.x, centerPosition.y, innerRadius, gaugeOption.startAngle * Math.PI, series[0]._proportion_ * Math.PI, false);
-    context.stroke();
-    //## 第四步画指针
-    let pointerRadius = radius - gaugeOption.width * 2.5;
-    context.save();
-    context.translate(centerPosition.x, centerPosition.y);
-    context.rotate((series[0]._proportion_ - 1) * Math.PI);
-    context.beginPath();
-    context.setLineWidth(gaugeOption.width / 3);
-    let gradient3 = context.createLinearGradient(0, -pointerRadius * 0.6, 0, pointerRadius * 0.6);
-    gradient3.addColorStop('0', hexToRgb('#FFFFFF', 0));
-    gradient3.addColorStop('0.5', hexToRgb(series[0].color, 1));
-    gradient3.addColorStop('1.0', hexToRgb('#FFFFFF', 0));
-    context.setStrokeStyle(gradient3);
-    context.arc(0, 0, pointerRadius, 0.85 * Math.PI, 1.15 * Math.PI, false);
-    context.stroke();
-    context.beginPath();
-    context.setLineWidth(1);
-    context.setStrokeStyle(series[0].color);
-    context.setFillStyle(series[0].color);
-    context.moveTo(-pointerRadius - gaugeOption.width / 3 / 2, -4);
-    context.lineTo(-pointerRadius - gaugeOption.width / 3 / 2 - 4, 0);
-    context.lineTo(-pointerRadius - gaugeOption.width / 3 / 2, 4);
-    context.lineTo(-pointerRadius - gaugeOption.width / 3 / 2, -4);
-    context.stroke();
-    context.fill();
-    context.restore();
-    //default百度样式
-  } else {
-    //画背景
-    context.setLineWidth(gaugeOption.width);
-    context.setLineCap('butt');
-    for (let i = 0; i < categories.length; i++) {
-      let eachCategories = categories[i];
-      context.beginPath();
-      context.setStrokeStyle(eachCategories.color);
-      context.arc(centerPosition.x, centerPosition.y, radius, eachCategories._startAngle_ * Math.PI, eachCategories._endAngle_ * Math.PI, false);
-      context.stroke();
-    }
-    context.save();
-    //画刻度线
-    if (gaugeOption.endAngle < gaugeOption.startAngle) {
-      totalAngle = 2 + gaugeOption.endAngle - gaugeOption.startAngle;
-    } else {
-      totalAngle = gaugeOption.startAngle - gaugeOption.endAngle;
-    }
-    let splitAngle = totalAngle / gaugeOption.splitLine.splitNumber;
-    let childAngle = totalAngle / gaugeOption.splitLine.splitNumber / gaugeOption.splitLine.childNumber;
-    let startX = -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius;
-    let endX = -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius + gaugeOption.splitLine.width;
-    let childendX = -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius + gaugeOption.splitLine.childWidth;
-    context.translate(centerPosition.x, centerPosition.y);
-    context.rotate((gaugeOption.startAngle - 1) * Math.PI);
-    for (let i = 0; i < gaugeOption.splitLine.splitNumber + 1; i++) {
-      context.beginPath();
-      context.setStrokeStyle(gaugeOption.splitLine.color);
-      context.setLineWidth(2 * opts.pix);
-      context.moveTo(startX, 0);
-      context.lineTo(endX, 0);
-      context.stroke();
-      context.rotate(splitAngle * Math.PI);
-    }
-    context.restore();
-    context.save();
-    context.translate(centerPosition.x, centerPosition.y);
-    context.rotate((gaugeOption.startAngle - 1) * Math.PI);
-    for (let i = 0; i < gaugeOption.splitLine.splitNumber * gaugeOption.splitLine.childNumber + 1; i++) {
-      context.beginPath();
-      context.setStrokeStyle(gaugeOption.splitLine.color);
-      context.setLineWidth(1 * opts.pix);
-      context.moveTo(startX, 0);
-      context.lineTo(childendX, 0);
-      context.stroke();
-      context.rotate(childAngle * Math.PI);
-    }
-    context.restore();
-    //画指针
-    series = getGaugeDataPoints(series, categories, gaugeOption, process);
-    for (let i = 0; i < series.length; i++) {
-      let eachSeries = series[i];
-      context.save();
-      context.translate(centerPosition.x, centerPosition.y);
-      context.rotate((eachSeries._proportion_ - 1) * Math.PI);
-      context.beginPath();
-      context.setFillStyle(eachSeries.color);
-      context.moveTo(gaugeOption.pointer.width, 0);
-      context.lineTo(0, -gaugeOption.pointer.width / 2);
-      context.lineTo(-innerRadius, 0);
-      context.lineTo(0, gaugeOption.pointer.width / 2);
-      context.lineTo(gaugeOption.pointer.width, 0);
-      context.closePath();
-      context.fill();
-      context.beginPath();
-      context.setFillStyle('#FFFFFF');
-      context.arc(0, 0, gaugeOption.pointer.width / 6, 0, 2 * Math.PI, false);
-      context.fill();
-      context.restore();
-    }
-    if (opts.dataLabel !== false) {
-      drawGaugeLabel(gaugeOption, radius, centerPosition, opts, config, context);
-    }
-  }
-  //画仪表盘标题，副标题
-  drawRingTitle(opts, config, context, centerPosition);
-  if (process === 1 && opts.type === 'gauge') {
-    opts.extra.gauge.oldAngle = series[0]._proportion_;
-    opts.extra.gauge.oldData = series[0].data;
-  }
-  return {
-    center: centerPosition,
-    radius: radius,
-    innerRadius: innerRadius,
-    categories: categories,
-    totalAngle: totalAngle
-  };
+	var process = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
+	var gaugeOption = assign({}, {
+		type: 'default',
+		startAngle: 0.75,
+		endAngle: 0.25,
+		width: 15,
+		labelOffset: 13,
+		splitLine: {
+			fixRadius: 0,
+			splitNumber: 10,
+			width: 15,
+			color: '#FFFFFF',
+			childNumber: 5,
+			childWidth: 5
+		},
+		pointer: {
+			width: 15,
+			color: 'auto'
+		}
+	}, opts.extra.gauge);
+	if (gaugeOption.oldAngle == undefined) {
+		gaugeOption.oldAngle = gaugeOption.startAngle;
+	}
+	if (gaugeOption.oldData == undefined) {
+		gaugeOption.oldData = 0;
+	}
+	categories = getGaugeAxisPoints(categories, gaugeOption.startAngle, gaugeOption.endAngle);
+	var centerPosition = {
+		x: opts.width / 2,
+		y: opts.height / 2
+	};
+	var radius = Math.min(centerPosition.x, centerPosition.y);
+	radius -= 5 * opts.pix;
+	radius -= gaugeOption.width / 2;
+	radius = radius < 10 ? 10 : radius;
+	var innerRadius = radius - gaugeOption.width;
+	var totalAngle = 0;
+	//判断仪表盘的样式：default百度样式，progress新样式
+	if (gaugeOption.type == 'progress') {
+		//## 第一步画中心圆形背景和进度条背景
+		//中心圆形背景
+		var pieRadius = radius - gaugeOption.width * 3;
+		context.beginPath();
+		let gradient = context.createLinearGradient(centerPosition.x, centerPosition.y - pieRadius, centerPosition.x,
+			centerPosition.y + pieRadius);
+		//配置渐变填充（起点：中心点向上减半径；结束点中心点向下加半径）
+		gradient.addColorStop('0', hexToRgb(series[0].color, 0.3));
+		gradient.addColorStop('1.0', hexToRgb("#FFFFFF", 0.1));
+		context.setFillStyle(gradient);
+		context.arc(centerPosition.x, centerPosition.y, pieRadius, 0, 2 * Math.PI, false);
+		context.fill();
+		//画进度条背景
+		context.setLineWidth(gaugeOption.width);
+		context.setStrokeStyle(hexToRgb(series[0].color, 0.3));
+		context.setLineCap('round');
+		context.beginPath();
+		context.arc(centerPosition.x, centerPosition.y, innerRadius, gaugeOption.startAngle * Math.PI, gaugeOption
+			.endAngle * Math.PI, false);
+		context.stroke();
+		//## 第二步画刻度线
+		if (gaugeOption.endAngle < gaugeOption.startAngle) {
+			totalAngle = 2 + gaugeOption.endAngle - gaugeOption.startAngle;
+		} else {
+			totalAngle = gaugeOption.startAngle - gaugeOption.endAngle;
+		}
+		let splitAngle = totalAngle / gaugeOption.splitLine.splitNumber;
+		let childAngle = totalAngle / gaugeOption.splitLine.splitNumber / gaugeOption.splitLine.childNumber;
+		let startX = -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius;
+		let endX = -radius - gaugeOption.width - gaugeOption.splitLine.fixRadius + gaugeOption.splitLine.width;
+		context.save();
+		context.translate(centerPosition.x, centerPosition.y);
+		context.rotate((gaugeOption.startAngle - 1) * Math.PI);
+		let len = gaugeOption.splitLine.splitNumber * gaugeOption.splitLine.childNumber + 1;
+		let proc = series[0].data * process;
+		for (let i = 0; i < len; i++) {
+			context.beginPath();
+			//刻度线随进度变色
+			if (proc > (i / len)) {
+				context.setStrokeStyle(hexToRgb(series[0].color, 1));
+			} else {
+				context.setStrokeStyle(hexToRgb(series[0].color, 0.3));
+			}
+			context.setLineWidth(3 * opts.pix);
+			context.moveTo(startX, 0);
+			context.lineTo(endX, 0);
+			context.stroke();
+			context.rotate(childAngle * Math.PI);
+		}
+		context.restore();
+		//## 第三步画进度条
+		series = getGaugeArcbarDataPoints(series, gaugeOption, process);
+		context.setLineWidth(gaugeOption.width);
+		context.setStrokeStyle(series[0].color);
+		context.setLineCap('round');
+		context.beginPath();
+		context.arc(centerPosition.x, centerPosition.y, innerRadius, gaugeOption.startAngle * Math.PI, series[0]
+			._proportion_ * Math.PI, false);
+		context.stroke();
+		//## 第四步画指针
+		let pointerRadius = radius - gaugeOption.width * 2.5;
+		context.save();
+		context.translate(centerPosition.x, centerPosition.y);
+		context.rotate((series[0]._proportion_ - 1) * Math.PI);
+		context.beginPath();
+		context.setLineWidth(gaugeOption.width / 3);
+		let gradient3 = context.createLinearGradient(0, -pointerRadius * 0.6, 0, pointerRadius * 0.6);
+		gradient3.addColorStop('0', hexToRgb('#FFFFFF', 0));
+		gradient3.addColorStop('0.5', hexToRgb(series[0].color, 1));
+		gradient3.addColorStop('1.0', hexToRgb('#FFFFFF', 0));
+		context.setStrokeStyle(gradient3);
+		context.arc(0, 0, pointerRadius, 0.85 * Math.PI, 1.15 * Math.PI, false);
+		context.stroke();
+		context.beginPath();
+		context.setLineWidth(1);
+		context.setStrokeStyle(series[0].color);
+		context.setFillStyle(series[0].color);
+		context.moveTo(-pointerRadius - gaugeOption.width / 3 / 2, -4);
+		context.lineTo(-pointerRadius - gaugeOption.width / 3 / 2 - 4, 0);
+		context.lineTo(-pointerRadius - gaugeOption.width / 3 / 2, 4);
+		context.lineTo(-pointerRadius - gaugeOption.width / 3 / 2, -4);
+		context.stroke();
+		context.fill();
+		context.restore();
+		//default百度样式
+	} else {
+		//画背景
+		context.setLineWidth(gaugeOption.width);
+		context.setLineCap('butt');
+		for (let i = 0; i < categories.length; i++) {
+			let eachCategories = categories[i];
+			context.beginPath();
+			context.setStrokeStyle(eachCategories.color);
+			context.arc(centerPosition.x, centerPosition.y, radius, eachCategories._startAngle_ * Math.PI, eachCategories
+				._endAngle_ * Math.PI, false);
+			context.stroke();
+		}
+		context.save();
+		//画刻度线
+		if (gaugeOption.endAngle < gaugeOption.startAngle) {
+			totalAngle = 2 + gaugeOption.endAngle - gaugeOption.startAngle;
+		} else {
+			totalAngle = gaugeOption.startAngle - gaugeOption.endAngle;
+		}
+		let splitAngle = totalAngle / gaugeOption.splitLine.splitNumber;
+		let childAngle = totalAngle / gaugeOption.splitLine.splitNumber / gaugeOption.splitLine.childNumber;
+		let startX = -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius;
+		let endX = -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius + gaugeOption.splitLine.width;
+		let childendX = -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius + gaugeOption.splitLine
+			.childWidth;
+		context.translate(centerPosition.x, centerPosition.y);
+		context.rotate((gaugeOption.startAngle - 1) * Math.PI);
+		for (let i = 0; i < gaugeOption.splitLine.splitNumber + 1; i++) {
+			context.beginPath();
+			context.setStrokeStyle(gaugeOption.splitLine.color);
+			context.setLineWidth(2 * opts.pix);
+			context.moveTo(startX, 0);
+			context.lineTo(endX, 0);
+			context.stroke();
+			context.rotate(splitAngle * Math.PI);
+		}
+		context.restore();
+		context.save();
+		context.translate(centerPosition.x, centerPosition.y);
+		context.rotate((gaugeOption.startAngle - 1) * Math.PI);
+		for (let i = 0; i < gaugeOption.splitLine.splitNumber * gaugeOption.splitLine.childNumber + 1; i++) {
+			context.beginPath();
+			context.setStrokeStyle(gaugeOption.splitLine.color);
+			context.setLineWidth(1 * opts.pix);
+			context.moveTo(startX, 0);
+			context.lineTo(childendX, 0);
+			context.stroke();
+			context.rotate(childAngle * Math.PI);
+		}
+		context.restore();
+		//画指针
+		series = getGaugeDataPoints(series, categories, gaugeOption, process);
+		for (let i = 0; i < series.length; i++) {
+			let eachSeries = series[i];
+			context.save();
+			context.translate(centerPosition.x, centerPosition.y);
+			context.rotate((eachSeries._proportion_ - 1) * Math.PI);
+			context.beginPath();
+			context.setFillStyle(eachSeries.color);
+			context.moveTo(gaugeOption.pointer.width, 0);
+			context.lineTo(0, -gaugeOption.pointer.width / 2);
+			context.lineTo(-innerRadius, 0);
+			context.lineTo(0, gaugeOption.pointer.width / 2);
+			context.lineTo(gaugeOption.pointer.width, 0);
+			context.closePath();
+			context.fill();
+			context.beginPath();
+			context.setFillStyle('#FFFFFF');
+			context.arc(0, 0, gaugeOption.pointer.width / 6, 0, 2 * Math.PI, false);
+			context.fill();
+			context.restore();
+		}
+		if (opts.dataLabel !== false) {
+			drawGaugeLabel(gaugeOption, radius, centerPosition, opts, config, context);
+		}
+	}
+	//画仪表盘标题，副标题
+	drawRingTitle(opts, config, context, centerPosition);
+	if (process === 1 && opts.type === 'gauge') {
+		opts.extra.gauge.oldAngle = series[0]._proportion_;
+		opts.extra.gauge.oldData = series[0].data;
+	}
+	return {
+		center: centerPosition,
+		radius: radius,
+		innerRadius: innerRadius,
+		categories: categories,
+		totalAngle: totalAngle
+	};
 }
 
 function drawRadarDataPoints(series, opts, config, context) {
-  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
-  var radarOption = assign({}, {
-    gridColor: '#cccccc',
-    gridType: 'radar',
-    gridEval:1,
-    axisLabel:false,
-    axisLabelTofix:0,
-    labelShow:true,
-    labelColor:'#666666',
-    labelPointShow:false,
-    labelPointRadius:3,
-    labelPointColor:'#cccccc',
-    opacity: 0.2,
-    gridCount: 3,
-    border:false,
-    borderWidth:2,
-    linearType: 'none',
-    customColor: [],
-  }, opts.extra.radar);
-  var coordinateAngle = getRadarCoordinateSeries(opts.categories.length);
-  var centerPosition = {
-    x: opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2,
-    y: opts.area[0] + (opts.height - opts.area[0] - opts.area[2]) / 2
-  };
-  var xr = (opts.width - opts.area[1] - opts.area[3]) / 2
-  var yr = (opts.height - opts.area[0] - opts.area[2]) / 2
-  var radius = Math.min(xr - (getMaxTextListLength(opts.categories, config.fontSize, context) + config.radarLabelTextMargin), yr - config.radarLabelTextMargin);
-  radius -= config.radarLabelTextMargin * opts.pix;
-  radius = radius < 10 ? 10 : radius;
-  radius = radarOption.radius ? radarOption.radius : radius;
-  // 画分割线
-  context.beginPath();
-  context.setLineWidth(1 * opts.pix);
-  context.setStrokeStyle(radarOption.gridColor);
-  coordinateAngle.forEach(function(angle,index) {
-    var pos = convertCoordinateOrigin(radius * Math.cos(angle), radius * Math.sin(angle), centerPosition);
-    context.moveTo(centerPosition.x, centerPosition.y);
-    if (index % radarOption.gridEval == 0) {
-      context.lineTo(pos.x, pos.y);
-    }
-  });
-  context.stroke();
-  context.closePath();
-  
-  // 画背景网格
-  var _loop = function _loop(i) {
-    var startPos = {};
-    context.beginPath();
-    context.setLineWidth(1 * opts.pix);
-    context.setStrokeStyle(radarOption.gridColor);
-    if (radarOption.gridType == 'radar') {
-      coordinateAngle.forEach(function(angle, index) {
-        var pos = convertCoordinateOrigin(radius / radarOption.gridCount * i * Math.cos(angle), radius /
-          radarOption.gridCount * i * Math.sin(angle), centerPosition);
-        if (index === 0) {
-          startPos = pos;
-          context.moveTo(pos.x, pos.y);
-        } else {
-          context.lineTo(pos.x, pos.y);
-        }
-      });
-      context.lineTo(startPos.x, startPos.y);
-    } else {
-      var pos = convertCoordinateOrigin(radius / radarOption.gridCount * i * Math.cos(1.5), radius / radarOption.gridCount * i * Math.sin(1.5), centerPosition);
-      context.arc(centerPosition.x, centerPosition.y, centerPosition.y - pos.y, 0, 2 * Math.PI, false);
-    }
-    context.stroke();
-    context.closePath();
-  };
-  for (var i = 1; i <= radarOption.gridCount; i++) {
-    _loop(i);
-  }
-  radarOption.customColor = fillCustomColor(radarOption.linearType, radarOption.customColor, series, config);
-  var radarDataPoints = getRadarDataPoints(coordinateAngle, centerPosition, radius, series, opts, process);
-  radarDataPoints.forEach(function(eachSeries, seriesIndex) {
-    // 绘制区域数据
-    context.beginPath();
-    context.setLineWidth(radarOption.borderWidth * opts.pix);
-    context.setStrokeStyle(eachSeries.color);
-    
-    var fillcolor = hexToRgb(eachSeries.color, radarOption.opacity);
-    if (radarOption.linearType == 'custom') {
-      var grd;
-      if(context.createCircularGradient){
-        grd = context.createCircularGradient(centerPosition.x, centerPosition.y, radius)
-      }else{
-        grd = context.createRadialGradient(centerPosition.x, centerPosition.y, 0,centerPosition.x, centerPosition.y, radius)
-      }
-      grd.addColorStop(0, hexToRgb(radarOption.customColor[series[seriesIndex].linearIndex], radarOption.opacity))
-      grd.addColorStop(1, hexToRgb(eachSeries.color, radarOption.opacity))
-      fillcolor = grd
-    }
-    
-    context.setFillStyle(fillcolor);
-    eachSeries.data.forEach(function(item, index) {
-      if (index === 0) {
-        context.moveTo(item.position.x, item.position.y);
-      } else {
-        context.lineTo(item.position.x, item.position.y);
-      }
-    });
-    context.closePath();
-    context.fill();
-    if(radarOption.border === true){
-      context.stroke();
-    }
-    context.closePath();
-    if (opts.dataPointShape !== false) {
-      var points = eachSeries.data.map(function(item) {
-        return item.position;
-      });
-      drawPointShape(points, eachSeries.color, eachSeries.pointShape, context, opts);
-    }
-  });
-  // 画刻度值
-  if(radarOption.axisLabel === true){
-    const maxData = Math.max(radarOption.max, Math.max.apply(null, dataCombine(series)));
-    const stepLength = radius / radarOption.gridCount;
-    const fontSize = opts.fontSize * opts.pix;
-    context.setFontSize(fontSize);
-    context.setFillStyle(opts.fontColor);
-    context.setTextAlign('left');
-    for (var i = 0; i < radarOption.gridCount + 1; i++) {
-      let label = i * maxData / radarOption.gridCount;
-      label = label.toFixed(radarOption.axisLabelTofix);
-      context.fillText(String(label), centerPosition.x + 3 * opts.pix, centerPosition.y - i * stepLength + fontSize / 2);
-    }
-  }
-  
-  // draw label text
-  drawRadarLabel(coordinateAngle, radius, centerPosition, opts, config, context);
-  
-  // draw dataLabel
-  if (opts.dataLabel !== false && process === 1) {
-    radarDataPoints.forEach(function(eachSeries, seriesIndex) {
-      context.beginPath();
-      var fontSize = eachSeries.textSize * opts.pix || config.fontSize;
-      context.setFontSize(fontSize);
-      context.setFillStyle(eachSeries.textColor || opts.fontColor);
-      eachSeries.data.forEach(function(item, index) {
-        //如果是中心点垂直的上下点位
-        if(Math.abs(item.position.x - centerPosition.x)<2){
-          //如果在上面
-          if(item.position.y < centerPosition.y){
-            context.setTextAlign('center');
-            context.fillText(item.value, item.position.x, item.position.y - 4);
-          }else{
-            context.setTextAlign('center');
-            context.fillText(item.value, item.position.x, item.position.y + fontSize + 2);
-          }
-        }else{
-          //如果在左侧
-          if(item.position.x < centerPosition.x){
-            context.setTextAlign('right');
-            context.fillText(item.value, item.position.x - 4, item.position.y + fontSize / 2 - 2);
-          }else{
-            context.setTextAlign('left');
-            context.fillText(item.value, item.position.x + 4, item.position.y + fontSize / 2 - 2);
-          }
-        }
-      });
-      context.closePath();
-      context.stroke();
-    });
-    context.setTextAlign('left');
-  }
-  
-  return {
-    center: centerPosition,
-    radius: radius,
-    angleList: coordinateAngle
-  };
+	var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	var radarOption = assign({}, {
+		gridColor: '#cccccc',
+		gridType: 'radar',
+		gridEval: 1,
+		axisLabel: false,
+		axisLabelTofix: 0,
+		labelShow: true,
+		labelColor: '#666666',
+		labelPointShow: false,
+		labelPointRadius: 3,
+		labelPointColor: '#cccccc',
+		opacity: 0.2,
+		gridCount: 3,
+		border: false,
+		borderWidth: 2,
+		linearType: 'none',
+		customColor: [],
+	}, opts.extra.radar);
+	var coordinateAngle = getRadarCoordinateSeries(opts.categories.length);
+	var centerPosition = {
+		x: opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2,
+		y: opts.area[0] + (opts.height - opts.area[0] - opts.area[2]) / 2
+	};
+	var xr = (opts.width - opts.area[1] - opts.area[3]) / 2
+	var yr = (opts.height - opts.area[0] - opts.area[2]) / 2
+	var radius = Math.min(xr - (getMaxTextListLength(opts.categories, config.fontSize, context) + config
+		.radarLabelTextMargin), yr - config.radarLabelTextMargin);
+	radius -= config.radarLabelTextMargin * opts.pix;
+	radius = radius < 10 ? 10 : radius;
+	radius = radarOption.radius ? radarOption.radius : radius;
+	// 画分割线
+	context.beginPath();
+	context.setLineWidth(1 * opts.pix);
+	context.setStrokeStyle(radarOption.gridColor);
+	coordinateAngle.forEach(function(angle, index) {
+		var pos = convertCoordinateOrigin(radius * Math.cos(angle), radius * Math.sin(angle), centerPosition);
+		context.moveTo(centerPosition.x, centerPosition.y);
+		if (index % radarOption.gridEval == 0) {
+			context.lineTo(pos.x, pos.y);
+		}
+	});
+	context.stroke();
+	context.closePath();
+
+	// 画背景网格
+	var _loop = function _loop(i) {
+		var startPos = {};
+		context.beginPath();
+		context.setLineWidth(1 * opts.pix);
+		context.setStrokeStyle(radarOption.gridColor);
+		if (radarOption.gridType == 'radar') {
+			coordinateAngle.forEach(function(angle, index) {
+				var pos = convertCoordinateOrigin(radius / radarOption.gridCount * i * Math.cos(angle), radius /
+					radarOption.gridCount * i * Math.sin(angle), centerPosition);
+				if (index === 0) {
+					startPos = pos;
+					context.moveTo(pos.x, pos.y);
+				} else {
+					context.lineTo(pos.x, pos.y);
+				}
+			});
+			context.lineTo(startPos.x, startPos.y);
+		} else {
+			var pos = convertCoordinateOrigin(radius / radarOption.gridCount * i * Math.cos(1.5), radius / radarOption
+				.gridCount * i * Math.sin(1.5), centerPosition);
+			context.arc(centerPosition.x, centerPosition.y, centerPosition.y - pos.y, 0, 2 * Math.PI, false);
+		}
+		context.stroke();
+		context.closePath();
+	};
+	for (var i = 1; i <= radarOption.gridCount; i++) {
+		_loop(i);
+	}
+	radarOption.customColor = fillCustomColor(radarOption.linearType, radarOption.customColor, series, config);
+	var radarDataPoints = getRadarDataPoints(coordinateAngle, centerPosition, radius, series, opts, process);
+	radarDataPoints.forEach(function(eachSeries, seriesIndex) {
+		// 绘制区域数据
+		context.beginPath();
+		context.setLineWidth(radarOption.borderWidth * opts.pix);
+		context.setStrokeStyle(eachSeries.color);
+
+		var fillcolor = hexToRgb(eachSeries.color, radarOption.opacity);
+		if (radarOption.linearType == 'custom') {
+			var grd;
+			if (context.createCircularGradient) {
+				grd = context.createCircularGradient(centerPosition.x, centerPosition.y, radius)
+			} else {
+				grd = context.createRadialGradient(centerPosition.x, centerPosition.y, 0, centerPosition.x, centerPosition
+					.y, radius)
+			}
+			grd.addColorStop(0, hexToRgb(radarOption.customColor[series[seriesIndex].linearIndex], radarOption.opacity))
+			grd.addColorStop(1, hexToRgb(eachSeries.color, radarOption.opacity))
+			fillcolor = grd
+		}
+
+		context.setFillStyle(fillcolor);
+		eachSeries.data.forEach(function(item, index) {
+			if (index === 0) {
+				context.moveTo(item.position.x, item.position.y);
+			} else {
+				context.lineTo(item.position.x, item.position.y);
+			}
+		});
+		context.closePath();
+		context.fill();
+		if (radarOption.border === true) {
+			context.stroke();
+		}
+		context.closePath();
+		if (opts.dataPointShape !== false) {
+			var points = eachSeries.data.map(function(item) {
+				return item.position;
+			});
+			drawPointShape(points, eachSeries.color, eachSeries.pointShape, context, opts);
+		}
+	});
+	// 画刻度值
+	if (radarOption.axisLabel === true) {
+		const maxData = Math.max(radarOption.max, Math.max.apply(null, dataCombine(series)));
+		const stepLength = radius / radarOption.gridCount;
+		const fontSize = opts.fontSize * opts.pix;
+		context.setFontSize(fontSize);
+		context.setFillStyle(opts.fontColor);
+		context.setTextAlign('left');
+		for (var i = 0; i < radarOption.gridCount + 1; i++) {
+			let label = i * maxData / radarOption.gridCount;
+			label = label.toFixed(radarOption.axisLabelTofix);
+			context.fillText(String(label), centerPosition.x + 3 * opts.pix, centerPosition.y - i * stepLength + fontSize /
+				2);
+		}
+	}
+
+	// draw label text
+	drawRadarLabel(coordinateAngle, radius, centerPosition, opts, config, context);
+
+	// draw dataLabel
+	if (opts.dataLabel !== false && process === 1) {
+		radarDataPoints.forEach(function(eachSeries, seriesIndex) {
+			context.beginPath();
+			var fontSize = eachSeries.textSize * opts.pix || config.fontSize;
+			context.setFontSize(fontSize);
+			context.setFillStyle(eachSeries.textColor || opts.fontColor);
+			eachSeries.data.forEach(function(item, index) {
+				//如果是中心点垂直的上下点位
+				if (Math.abs(item.position.x - centerPosition.x) < 2) {
+					//如果在上面
+					if (item.position.y < centerPosition.y) {
+						context.setTextAlign('center');
+						context.fillText(item.value, item.position.x, item.position.y - 4);
+					} else {
+						context.setTextAlign('center');
+						context.fillText(item.value, item.position.x, item.position.y + fontSize + 2);
+					}
+				} else {
+					//如果在左侧
+					if (item.position.x < centerPosition.x) {
+						context.setTextAlign('right');
+						context.fillText(item.value, item.position.x - 4, item.position.y + fontSize / 2 - 2);
+					} else {
+						context.setTextAlign('left');
+						context.fillText(item.value, item.position.x + 4, item.position.y + fontSize / 2 - 2);
+					}
+				}
+			});
+			context.closePath();
+			context.stroke();
+		});
+		context.setTextAlign('left');
+	}
+
+	return {
+		center: centerPosition,
+		radius: radius,
+		angleList: coordinateAngle
+	};
 }
 
 // 经纬度转墨卡托
 function lonlat2mercator(longitude, latitude) {
-  var mercator = Array(2);
-  var x = longitude * 20037508.34 / 180;
-  var y = Math.log(Math.tan((90 + latitude) * Math.PI / 360)) / (Math.PI / 180);
-  y = y * 20037508.34 / 180;
-  mercator[0] = x;
-  mercator[1] = y;
-  return mercator;
+	var mercator = Array(2);
+	var x = longitude * 20037508.34 / 180;
+	var y = Math.log(Math.tan((90 + latitude) * Math.PI / 360)) / (Math.PI / 180);
+	y = y * 20037508.34 / 180;
+	mercator[0] = x;
+	mercator[1] = y;
+	return mercator;
 }
 
 // 墨卡托转经纬度
 function mercator2lonlat(longitude, latitude) {
-  var lonlat = Array(2)
-  var x = longitude / 20037508.34 * 180;
-  var y = latitude / 20037508.34 * 180;
-  y = 180 / Math.PI * (2 * Math.atan(Math.exp(y * Math.PI / 180)) - Math.PI / 2);
-  lonlat[0] = x;
-  lonlat[1] = y;
-  return lonlat;
+	var lonlat = Array(2)
+	var x = longitude / 20037508.34 * 180;
+	var y = latitude / 20037508.34 * 180;
+	y = 180 / Math.PI * (2 * Math.atan(Math.exp(y * Math.PI / 180)) - Math.PI / 2);
+	lonlat[0] = x;
+	lonlat[1] = y;
+	return lonlat;
 }
 
 function getBoundingBox(data) {
-  var bounds = {},coords;
-  bounds.xMin = 180;
-  bounds.xMax = 0;
-  bounds.yMin = 90;
-  bounds.yMax = 0
-  for (var i = 0; i < data.length; i++) {
-    var coorda = data[i].geometry.coordinates
-    for (var k = 0; k < coorda.length; k++) {
-      coords = coorda[k];
-      if (coords.length == 1) {
-        coords = coords[0]
-      }
-      for (var j = 0; j < coords.length; j++) {
-        var longitude = coords[j][0];
-        var latitude = coords[j][1];
-        var point = {
-          x: longitude,
-          y: latitude
-        }
-        bounds.xMin = bounds.xMin < point.x ? bounds.xMin : point.x;
-        bounds.xMax = bounds.xMax > point.x ? bounds.xMax : point.x;
-        bounds.yMin = bounds.yMin < point.y ? bounds.yMin : point.y;
-        bounds.yMax = bounds.yMax > point.y ? bounds.yMax : point.y;
-      }
-    }
-  }
-  return bounds;
+	var bounds = {},
+		coords;
+	bounds.xMin = 180;
+	bounds.xMax = 0;
+	bounds.yMin = 90;
+	bounds.yMax = 0
+	for (var i = 0; i < data.length; i++) {
+		var coorda = data[i].geometry.coordinates
+		for (var k = 0; k < coorda.length; k++) {
+			coords = coorda[k];
+			if (coords.length == 1) {
+				coords = coords[0]
+			}
+			for (var j = 0; j < coords.length; j++) {
+				var longitude = coords[j][0];
+				var latitude = coords[j][1];
+				var point = {
+					x: longitude,
+					y: latitude
+				}
+				bounds.xMin = bounds.xMin < point.x ? bounds.xMin : point.x;
+				bounds.xMax = bounds.xMax > point.x ? bounds.xMax : point.x;
+				bounds.yMin = bounds.yMin < point.y ? bounds.yMin : point.y;
+				bounds.yMax = bounds.yMax > point.y ? bounds.yMax : point.y;
+			}
+		}
+	}
+	return bounds;
 }
 
 function coordinateToPoint(latitude, longitude, bounds, scale, xoffset, yoffset) {
-  return {
-    x: (longitude - bounds.xMin) * scale + xoffset,
-    y: (bounds.yMax - latitude) * scale + yoffset
-  };
+	return {
+		x: (longitude - bounds.xMin) * scale + xoffset,
+		y: (bounds.yMax - latitude) * scale + yoffset
+	};
 }
 
 function pointToCoordinate(pointY, pointX, bounds, scale, xoffset, yoffset) {
-  return {
-    x: (pointX - xoffset) / scale + bounds.xMin,
-    y: bounds.yMax - (pointY - yoffset) / scale
-  };
+	return {
+		x: (pointX - xoffset) / scale + bounds.xMin,
+		y: bounds.yMax - (pointY - yoffset) / scale
+	};
 }
 
 function isRayIntersectsSegment(poi, s_poi, e_poi) {
-  if (s_poi[1] == e_poi[1]) {
-    return false;
-  }
-  if (s_poi[1] > poi[1] && e_poi[1] > poi[1]) {
-    return false;
-  }
-  if (s_poi[1] < poi[1] && e_poi[1] < poi[1]) {
-    return false;
-  }
-  if (s_poi[1] == poi[1] && e_poi[1] > poi[1]) {
-    return false;
-  }
-  if (e_poi[1] == poi[1] && s_poi[1] > poi[1]) {
-    return false;
-  }
-  if (s_poi[0] < poi[0] && e_poi[1] < poi[1]) {
-    return false;
-  }
-  let xseg = e_poi[0] - (e_poi[0] - s_poi[0]) * (e_poi[1] - poi[1]) / (e_poi[1] - s_poi[1]);
-  if (xseg < poi[0]) {
-    return false;
-  } else {
-    return true;
-  }
+	if (s_poi[1] == e_poi[1]) {
+		return false;
+	}
+	if (s_poi[1] > poi[1] && e_poi[1] > poi[1]) {
+		return false;
+	}
+	if (s_poi[1] < poi[1] && e_poi[1] < poi[1]) {
+		return false;
+	}
+	if (s_poi[1] == poi[1] && e_poi[1] > poi[1]) {
+		return false;
+	}
+	if (e_poi[1] == poi[1] && s_poi[1] > poi[1]) {
+		return false;
+	}
+	if (s_poi[0] < poi[0] && e_poi[1] < poi[1]) {
+		return false;
+	}
+	let xseg = e_poi[0] - (e_poi[0] - s_poi[0]) * (e_poi[1] - poi[1]) / (e_poi[1] - s_poi[1]);
+	if (xseg < poi[0]) {
+		return false;
+	} else {
+		return true;
+	}
 }
 
 function isPoiWithinPoly(poi, poly, mercator) {
-  let sinsc = 0;
-  for (let i = 0; i < poly.length; i++) {
-    let epoly = poly[i][0];
-    if (poly.length == 1) {
-      epoly = poly[i][0]
-    }
-    for (let j = 0; j < epoly.length - 1; j++) {
-      let s_poi = epoly[j];
-      let e_poi = epoly[j + 1];
-      if (mercator) {
-        s_poi = lonlat2mercator(epoly[j][0], epoly[j][1]);
-        e_poi = lonlat2mercator(epoly[j + 1][0], epoly[j + 1][1]);
-      }
-      if (isRayIntersectsSegment(poi, s_poi, e_poi)) {
-        sinsc += 1;
-      }
-    }
-  }
-  if (sinsc % 2 == 1) {
-    return true;
-  } else {
-    return false;
-  }
+	let sinsc = 0;
+	for (let i = 0; i < poly.length; i++) {
+		let epoly = poly[i][0];
+		if (poly.length == 1) {
+			epoly = poly[i][0]
+		}
+		for (let j = 0; j < epoly.length - 1; j++) {
+			let s_poi = epoly[j];
+			let e_poi = epoly[j + 1];
+			if (mercator) {
+				s_poi = lonlat2mercator(epoly[j][0], epoly[j][1]);
+				e_poi = lonlat2mercator(epoly[j + 1][0], epoly[j + 1][1]);
+			}
+			if (isRayIntersectsSegment(poi, s_poi, e_poi)) {
+				sinsc += 1;
+			}
+		}
+	}
+	if (sinsc % 2 == 1) {
+		return true;
+	} else {
+		return false;
+	}
 }
 
 function drawMapDataPoints(series, opts, config, context) {
-  var mapOption = assign({}, {
-    border: true,
-    mercator: false,
-    borderWidth: 1,
-    active:true,
-    borderColor: '#666666',
-    fillOpacity: 0.6,
-    activeBorderColor: '#f04864',
-    activeFillColor: '#facc14',
-    activeFillOpacity: 1
-  }, opts.extra.map);
-  var coords, point;
-  var data = series;
-  var bounds = getBoundingBox(data);
-  if (mapOption.mercator) {
-    var max = lonlat2mercator(bounds.xMax, bounds.yMax)
-    var min = lonlat2mercator(bounds.xMin, bounds.yMin)
-    bounds.xMax = max[0]
-    bounds.yMax = max[1]
-    bounds.xMin = min[0]
-    bounds.yMin = min[1]
-  }
-  var xScale = opts.width / Math.abs(bounds.xMax - bounds.xMin);
-  var yScale = opts.height / Math.abs(bounds.yMax - bounds.yMin);
-  var scale = xScale < yScale ? xScale : yScale;
-  var xoffset = opts.width / 2 - Math.abs(bounds.xMax - bounds.xMin) / 2 * scale;
-  var yoffset = opts.height / 2 - Math.abs(bounds.yMax - bounds.yMin) / 2 * scale;
-  for (var i = 0; i < data.length; i++) {
-    context.beginPath();
-    context.setLineWidth(mapOption.borderWidth * opts.pix);
-    context.setStrokeStyle(mapOption.borderColor);
-    context.setFillStyle(hexToRgb(series[i].color, series[i].fillOpacity||mapOption.fillOpacity));
-    if (mapOption.active == true && opts.tooltip) {
-      if (opts.tooltip.index == i) {
-        context.setStrokeStyle(mapOption.activeBorderColor);
-        context.setFillStyle(hexToRgb(mapOption.activeFillColor, mapOption.activeFillOpacity));
-      }
-    }
-    var coorda = data[i].geometry.coordinates
-    for (var k = 0; k < coorda.length; k++) {
-      coords = coorda[k];
-      if (coords.length == 1) {
-        coords = coords[0]
-      }
-      for (var j = 0; j < coords.length; j++) {
-        var gaosi = Array(2);
-        if (mapOption.mercator) {
-          gaosi = lonlat2mercator(coords[j][0], coords[j][1])
-        } else {
-          gaosi = coords[j]
-        }
-        point = coordinateToPoint(gaosi[1], gaosi[0], bounds, scale, xoffset, yoffset)
-        if (j === 0) {
-          context.beginPath();
-          context.moveTo(point.x, point.y);
-        } else {
-          context.lineTo(point.x, point.y);
-        }
-      }
-      context.fill();
-      if (mapOption.border == true) {
-        context.stroke();
-      }
-    }
-  }
-  if (opts.dataLabel == true) {
-    for (var i = 0; i < data.length; i++) {
-      var centerPoint = data[i].properties.centroid;
-      if (centerPoint) {
-        if (mapOption.mercator) {
-          centerPoint = lonlat2mercator(data[i].properties.centroid[0], data[i].properties.centroid[1])
-        }
-        point = coordinateToPoint(centerPoint[1], centerPoint[0], bounds, scale, xoffset, yoffset);
-        let fontSize = data[i].textSize * opts.pix || config.fontSize;
-        let fontColor = data[i].textColor || opts.fontColor;
-        if(mapOption.active && mapOption.activeTextColor && opts.tooltip && opts.tooltip.index == i){
-          fontColor = mapOption.activeTextColor;
-        }
-        let text = data[i].properties.name;
-        context.beginPath();
-        context.setFontSize(fontSize)
-        context.setFillStyle(fontColor)
-        context.fillText(text, point.x - measureText(text, fontSize, context) / 2, point.y + fontSize / 2);
-        context.closePath();
-        context.stroke();
-      }
-    }
-  }
-  opts.chartData.mapData = {
-    bounds: bounds,
-    scale: scale,
-    xoffset: xoffset,
-    yoffset: yoffset,
-    mercator: mapOption.mercator
-  }
-  drawToolTipBridge(opts, config, context, 1);
-  context.draw();
+	var mapOption = assign({}, {
+		border: true,
+		mercator: false,
+		borderWidth: 1,
+		active: true,
+		borderColor: '#666666',
+		fillOpacity: 0.6,
+		activeBorderColor: '#f04864',
+		activeFillColor: '#facc14',
+		activeFillOpacity: 1
+	}, opts.extra.map);
+	var coords, point;
+	var data = series;
+	var bounds = getBoundingBox(data);
+	if (mapOption.mercator) {
+		var max = lonlat2mercator(bounds.xMax, bounds.yMax)
+		var min = lonlat2mercator(bounds.xMin, bounds.yMin)
+		bounds.xMax = max[0]
+		bounds.yMax = max[1]
+		bounds.xMin = min[0]
+		bounds.yMin = min[1]
+	}
+	var xScale = opts.width / Math.abs(bounds.xMax - bounds.xMin);
+	var yScale = opts.height / Math.abs(bounds.yMax - bounds.yMin);
+	var scale = xScale < yScale ? xScale : yScale;
+	var xoffset = opts.width / 2 - Math.abs(bounds.xMax - bounds.xMin) / 2 * scale;
+	var yoffset = opts.height / 2 - Math.abs(bounds.yMax - bounds.yMin) / 2 * scale;
+	for (var i = 0; i < data.length; i++) {
+		context.beginPath();
+		context.setLineWidth(mapOption.borderWidth * opts.pix);
+		context.setStrokeStyle(mapOption.borderColor);
+		context.setFillStyle(hexToRgb(series[i].color, series[i].fillOpacity || mapOption.fillOpacity));
+		if (mapOption.active == true && opts.tooltip) {
+			if (opts.tooltip.index == i) {
+				context.setStrokeStyle(mapOption.activeBorderColor);
+				context.setFillStyle(hexToRgb(mapOption.activeFillColor, mapOption.activeFillOpacity));
+			}
+		}
+		var coorda = data[i].geometry.coordinates
+		for (var k = 0; k < coorda.length; k++) {
+			coords = coorda[k];
+			if (coords.length == 1) {
+				coords = coords[0]
+			}
+			for (var j = 0; j < coords.length; j++) {
+				var gaosi = Array(2);
+				if (mapOption.mercator) {
+					gaosi = lonlat2mercator(coords[j][0], coords[j][1])
+				} else {
+					gaosi = coords[j]
+				}
+				point = coordinateToPoint(gaosi[1], gaosi[0], bounds, scale, xoffset, yoffset)
+				if (j === 0) {
+					context.beginPath();
+					context.moveTo(point.x, point.y);
+				} else {
+					context.lineTo(point.x, point.y);
+				}
+			}
+			context.fill();
+			if (mapOption.border == true) {
+				context.stroke();
+			}
+		}
+	}
+	if (opts.dataLabel == true) {
+		for (var i = 0; i < data.length; i++) {
+			var centerPoint = data[i].properties.centroid;
+			if (centerPoint) {
+				if (mapOption.mercator) {
+					centerPoint = lonlat2mercator(data[i].properties.centroid[0], data[i].properties.centroid[1])
+				}
+				point = coordinateToPoint(centerPoint[1], centerPoint[0], bounds, scale, xoffset, yoffset);
+				let fontSize = data[i].textSize * opts.pix || config.fontSize;
+				let fontColor = data[i].textColor || opts.fontColor;
+				if (mapOption.active && mapOption.activeTextColor && opts.tooltip && opts.tooltip.index == i) {
+					fontColor = mapOption.activeTextColor;
+				}
+				let text = data[i].properties.name;
+				context.beginPath();
+				context.setFontSize(fontSize)
+				context.setFillStyle(fontColor)
+				context.fillText(text, point.x - measureText(text, fontSize, context) / 2, point.y + fontSize / 2);
+				context.closePath();
+				context.stroke();
+			}
+		}
+	}
+	opts.chartData.mapData = {
+		bounds: bounds,
+		scale: scale,
+		xoffset: xoffset,
+		yoffset: yoffset,
+		mercator: mapOption.mercator
+	}
+	drawToolTipBridge(opts, config, context, 1);
+	context.draw();
 }
 
 function normalInt(min, max, iter) {
-  iter = iter == 0 ? 1 : iter;
-  var arr = [];
-  for (var i = 0; i < iter; i++) {
-    arr[i] = Math.random();
-  };
-  return Math.floor(arr.reduce(function(i, j) {
-    return i + j
-  }) / iter * (max - min)) + min;
+	iter = iter == 0 ? 1 : iter;
+	var arr = [];
+	for (var i = 0; i < iter; i++) {
+		arr[i] = Math.random();
+	};
+	return Math.floor(arr.reduce(function(i, j) {
+		return i + j
+	}) / iter * (max - min)) + min;
 };
 
 function collisionNew(area, points, width, height) {
-  var isIn = false;
-  for (let i = 0; i < points.length; i++) {
-    if (points[i].area) {
-      if (area[3] < points[i].area[1] || area[0] > points[i].area[2] || area[1] > points[i].area[3] || area[2] < points[i].area[0]) {
-        if (area[0] < 0 || area[1] < 0 || area[2] > width || area[3] > height) {
-          isIn = true;
-          break;
-        } else {
-          isIn = false;
-        }
-      } else {
-        isIn = true;
-        break;
-      }
-    }
-  }
-  return isIn;
+	var isIn = false;
+	for (let i = 0; i < points.length; i++) {
+		if (points[i].area) {
+			if (area[3] < points[i].area[1] || area[0] > points[i].area[2] || area[1] > points[i].area[3] || area[2] < points[
+					i].area[0]) {
+				if (area[0] < 0 || area[1] < 0 || area[2] > width || area[3] > height) {
+					isIn = true;
+					break;
+				} else {
+					isIn = false;
+				}
+			} else {
+				isIn = true;
+				break;
+			}
+		}
+	}
+	return isIn;
 };
 
 function getWordCloudPoint(opts, type, context) {
-  let points = opts.series;
-  switch (type) {
-    case 'normal':
-      for (let i = 0; i < points.length; i++) {
-        let text = points[i].name;
-        let tHeight = points[i].textSize * opts.pix;
-        let tWidth = measureText(text, tHeight, context);
-        let x, y;
-        let area;
-        let breaknum = 0;
-        while (true) {
-          breaknum++;
-          x = normalInt(-opts.width / 2, opts.width / 2, 5) - tWidth / 2;
-          y = normalInt(-opts.height / 2, opts.height / 2, 5) + tHeight / 2;
-          area = [x - 5 + opts.width / 2, y - 5 - tHeight + opts.height / 2, x + tWidth + 5 + opts.width / 2, y + 5 +
-            opts.height / 2
-          ];
-          let isCollision = collisionNew(area, points, opts.width, opts.height);
-          if (!isCollision) break;
-          if (breaknum == 1000) {
-            area = [-100, -100, -100, -100];
-            break;
-          }
-        };
-        points[i].area = area;
-      }
-      break;
-    case 'vertical':
-      function Spin() {
-        //获取均匀随机值，是否旋转，旋转的概率为（1-0.5）
-        if (Math.random() > 0.7) {
-          return true;
-        } else {
-          return false
-        };
-      };
-      for (let i = 0; i < points.length; i++) {
-        let text = points[i].name;
-        let tHeight = points[i].textSize * opts.pix;
-        let tWidth = measureText(text, tHeight, context);
-        let isSpin = Spin();
-        let x, y, area, areav;
-        let breaknum = 0;
-        while (true) {
-          breaknum++;
-          let isCollision;
-          if (isSpin) {
-            x = normalInt(-opts.width / 2, opts.width / 2, 5) - tWidth / 2;
-            y = normalInt(-opts.height / 2, opts.height / 2, 5) + tHeight / 2;
-            area = [y - 5 - tWidth + opts.width / 2, (-x - 5 + opts.height / 2), y + 5 + opts.width / 2, (-x + tHeight + 5 + opts.height / 2)];
-            areav = [opts.width - (opts.width / 2 - opts.height / 2) - (-x + tHeight + 5 + opts.height / 2) - 5, (opts.height / 2 - opts.width / 2) + (y - 5 - tWidth + opts.width / 2) - 5, opts.width - (opts.width / 2 - opts.height / 2) - (-x + tHeight + 5 + opts.height / 2) + tHeight, (opts.height / 2 - opts.width / 2) + (y - 5 - tWidth + opts.width / 2) + tWidth + 5];
-            isCollision = collisionNew(areav, points, opts.height, opts.width);
-          } else {
-            x = normalInt(-opts.width / 2, opts.width / 2, 5) - tWidth / 2;
-            y = normalInt(-opts.height / 2, opts.height / 2, 5) + tHeight / 2;
-            area = [x - 5 + opts.width / 2, y - 5 - tHeight + opts.height / 2, x + tWidth + 5 + opts.width / 2, y + 5 + opts.height / 2];
-            isCollision = collisionNew(area, points, opts.width, opts.height);
-          }
-          if (!isCollision) break;
-          if (breaknum == 1000) {
-            area = [-1000, -1000, -1000, -1000];
-            break;
-          }
-        };
-        if (isSpin) {
-          points[i].area = areav;
-          points[i].areav = area;
-        } else {
-          points[i].area = area;
-        }
-        points[i].rotate = isSpin;
-      };
-      break;
-  }
-  return points;
+	let points = opts.series;
+	switch (type) {
+		case 'normal':
+			for (let i = 0; i < points.length; i++) {
+				let text = points[i].name;
+				let tHeight = points[i].textSize * opts.pix;
+				let tWidth = measureText(text, tHeight, context);
+				let x, y;
+				let area;
+				let breaknum = 0;
+				while (true) {
+					breaknum++;
+					x = normalInt(-opts.width / 2, opts.width / 2, 5) - tWidth / 2;
+					y = normalInt(-opts.height / 2, opts.height / 2, 5) + tHeight / 2;
+					area = [x - 5 + opts.width / 2, y - 5 - tHeight + opts.height / 2, x + tWidth + 5 + opts.width / 2, y + 5 +
+						opts.height / 2
+					];
+					let isCollision = collisionNew(area, points, opts.width, opts.height);
+					if (!isCollision) break;
+					if (breaknum == 1000) {
+						area = [-100, -100, -100, -100];
+						break;
+					}
+				};
+				points[i].area = area;
+			}
+			break;
+		case 'vertical':
+			function Spin() {
+				//获取均匀随机值，是否旋转，旋转的概率为（1-0.5）
+				if (Math.random() > 0.7) {
+					return true;
+				} else {
+					return false
+				};
+			};
+			for (let i = 0; i < points.length; i++) {
+				let text = points[i].name;
+				let tHeight = points[i].textSize * opts.pix;
+				let tWidth = measureText(text, tHeight, context);
+				let isSpin = Spin();
+				let x, y, area, areav;
+				let breaknum = 0;
+				while (true) {
+					breaknum++;
+					let isCollision;
+					if (isSpin) {
+						x = normalInt(-opts.width / 2, opts.width / 2, 5) - tWidth / 2;
+						y = normalInt(-opts.height / 2, opts.height / 2, 5) + tHeight / 2;
+						area = [y - 5 - tWidth + opts.width / 2, (-x - 5 + opts.height / 2), y + 5 + opts.width / 2, (-x + tHeight +
+							5 + opts.height / 2)];
+						areav = [opts.width - (opts.width / 2 - opts.height / 2) - (-x + tHeight + 5 + opts.height / 2) - 5, (opts
+							.height / 2 - opts.width / 2) + (y - 5 - tWidth + opts.width / 2) - 5, opts.width - (opts.width / 2 -
+							opts.height / 2) - (-x + tHeight + 5 + opts.height / 2) + tHeight, (opts.height / 2 - opts.width /
+							2) + (y - 5 - tWidth + opts.width / 2) + tWidth + 5];
+						isCollision = collisionNew(areav, points, opts.height, opts.width);
+					} else {
+						x = normalInt(-opts.width / 2, opts.width / 2, 5) - tWidth / 2;
+						y = normalInt(-opts.height / 2, opts.height / 2, 5) + tHeight / 2;
+						area = [x - 5 + opts.width / 2, y - 5 - tHeight + opts.height / 2, x + tWidth + 5 + opts.width / 2, y + 5 +
+							opts.height / 2
+						];
+						isCollision = collisionNew(area, points, opts.width, opts.height);
+					}
+					if (!isCollision) break;
+					if (breaknum == 1000) {
+						area = [-1000, -1000, -1000, -1000];
+						break;
+					}
+				};
+				if (isSpin) {
+					points[i].area = areav;
+					points[i].areav = area;
+				} else {
+					points[i].area = area;
+				}
+				points[i].rotate = isSpin;
+			};
+			break;
+	}
+	return points;
 }
 
 function drawWordCloudDataPoints(series, opts, config, context) {
-  let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
-  let wordOption = assign({}, {
-    type: 'normal',
-    autoColors: true
-  }, opts.extra.word);
-  if (!opts.chartData.wordCloudData) {
-    opts.chartData.wordCloudData = getWordCloudPoint(opts, wordOption.type, context);
-  }
-  context.beginPath();
-  context.setFillStyle(opts.background);
-  context.rect(0, 0, opts.width, opts.height);
-  context.fill();
-  context.save();
-  let points = opts.chartData.wordCloudData;
-  context.translate(opts.width / 2, opts.height / 2);
-  for (let i = 0; i < points.length; i++) {
-    context.save();
-    if (points[i].rotate) {
-      context.rotate(90 * Math.PI / 180);
-    }
-    let text = points[i].name;
-    let tHeight = points[i].textSize * opts.pix;
-    let tWidth = measureText(text, tHeight, context);
-    context.beginPath();
-    context.setStrokeStyle(points[i].color);
-    context.setFillStyle(points[i].color);
-    context.setFontSize(tHeight);
-    if (points[i].rotate) {
-      if (points[i].areav[0] > 0) {
-        if (opts.tooltip) {
-          if (opts.tooltip.index == i) {
-            context.strokeText(text, (points[i].areav[0] + 5 - opts.width / 2) * process - tWidth * (1 - process) / 2, (points[i].areav[1] + 5 + tHeight - opts.height / 2) * process);
-          } else {
-            context.fillText(text, (points[i].areav[0] + 5 - opts.width / 2) * process - tWidth * (1 - process) / 2, (points[i].areav[1] + 5 + tHeight - opts.height / 2) * process);
-          }
-        } else {
-          context.fillText(text, (points[i].areav[0] + 5 - opts.width / 2) * process - tWidth * (1 - process) / 2, (points[i].areav[1] + 5 + tHeight - opts.height / 2) * process);
-        }
-      }
-    } else {
-      if (points[i].area[0] > 0) {
-        if (opts.tooltip) {
-          if (opts.tooltip.index == i) {
-            context.strokeText(text, (points[i].area[0] + 5 - opts.width / 2) * process - tWidth * (1 - process) / 2, (points[i].area[1] + 5 + tHeight - opts.height / 2) * process);
-          } else {
-            context.fillText(text, (points[i].area[0] + 5 - opts.width / 2) * process - tWidth * (1 - process) / 2, (points[i].area[1] + 5 + tHeight - opts.height / 2) * process);
-          }
-        } else {
-          context.fillText(text, (points[i].area[0] + 5 - opts.width / 2) * process - tWidth * (1 - process) / 2, (points[i].area[1] + 5 + tHeight - opts.height / 2) * process);
-        }
-      }
-    }
-    context.stroke();
-    context.restore();
-  }
-  context.restore();
+	let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	let wordOption = assign({}, {
+		type: 'normal',
+		autoColors: true
+	}, opts.extra.word);
+	if (!opts.chartData.wordCloudData) {
+		opts.chartData.wordCloudData = getWordCloudPoint(opts, wordOption.type, context);
+	}
+	context.beginPath();
+	context.setFillStyle(opts.background);
+	context.rect(0, 0, opts.width, opts.height);
+	context.fill();
+	context.save();
+	let points = opts.chartData.wordCloudData;
+	context.translate(opts.width / 2, opts.height / 2);
+	for (let i = 0; i < points.length; i++) {
+		context.save();
+		if (points[i].rotate) {
+			context.rotate(90 * Math.PI / 180);
+		}
+		let text = points[i].name;
+		let tHeight = points[i].textSize * opts.pix;
+		let tWidth = measureText(text, tHeight, context);
+		context.beginPath();
+		context.setStrokeStyle(points[i].color);
+		context.setFillStyle(points[i].color);
+		context.setFontSize(tHeight);
+		if (points[i].rotate) {
+			if (points[i].areav[0] > 0) {
+				if (opts.tooltip) {
+					if (opts.tooltip.index == i) {
+						context.strokeText(text, (points[i].areav[0] + 5 - opts.width / 2) * process - tWidth * (1 - process) / 2, (
+							points[i].areav[1] + 5 + tHeight - opts.height / 2) * process);
+					} else {
+						context.fillText(text, (points[i].areav[0] + 5 - opts.width / 2) * process - tWidth * (1 - process) / 2, (
+							points[i].areav[1] + 5 + tHeight - opts.height / 2) * process);
+					}
+				} else {
+					context.fillText(text, (points[i].areav[0] + 5 - opts.width / 2) * process - tWidth * (1 - process) / 2, (
+						points[i].areav[1] + 5 + tHeight - opts.height / 2) * process);
+				}
+			}
+		} else {
+			if (points[i].area[0] > 0) {
+				if (opts.tooltip) {
+					if (opts.tooltip.index == i) {
+						context.strokeText(text, (points[i].area[0] + 5 - opts.width / 2) * process - tWidth * (1 - process) / 2, (
+							points[i].area[1] + 5 + tHeight - opts.height / 2) * process);
+					} else {
+						context.fillText(text, (points[i].area[0] + 5 - opts.width / 2) * process - tWidth * (1 - process) / 2, (
+							points[i].area[1] + 5 + tHeight - opts.height / 2) * process);
+					}
+				} else {
+					context.fillText(text, (points[i].area[0] + 5 - opts.width / 2) * process - tWidth * (1 - process) / 2, (
+						points[i].area[1] + 5 + tHeight - opts.height / 2) * process);
+				}
+			}
+		}
+		context.stroke();
+		context.restore();
+	}
+	context.restore();
 }
 
 function drawFunnelDataPoints(series, opts, config, context) {
-  let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
-  let funnelOption = assign({}, {
-    type:'funnel',
-    activeWidth: 10,
-    activeOpacity: 0.3,
-    border: false,
-    borderWidth: 2,
-    borderColor: '#FFFFFF',
-    fillOpacity: 1,
-    minSize: 0,
-    labelAlign: 'right',
-    linearType: 'none',
-    customColor: [],
-  }, opts.extra.funnel);
-  let eachSpacing = (opts.height - opts.area[0] - opts.area[2]) / series.length;
-  let centerPosition = {
-    x: opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2,
-    y: opts.height - opts.area[2]
-  };
-  let activeWidth = funnelOption.activeWidth * opts.pix;
-  let radius = Math.min((opts.width - opts.area[1] - opts.area[3]) / 2 - activeWidth, (opts.height - opts.area[0] - opts.area[2]) / 2 - activeWidth);
-  let seriesNew = getFunnelDataPoints(series, radius, funnelOption, eachSpacing, process);
-  context.save();
-  context.translate(centerPosition.x, centerPosition.y);
-  funnelOption.customColor = fillCustomColor(funnelOption.linearType, funnelOption.customColor, series, config);
-  if(funnelOption.type == 'pyramid'){
-    for (let i = 0; i < seriesNew.length; i++) {
-      if (i == seriesNew.length -1) {
-        if (opts.tooltip) {
-          if (opts.tooltip.index == i) {
-            context.beginPath();
-            context.setFillStyle(hexToRgb(seriesNew[i].color, funnelOption.activeOpacity));
-            context.moveTo(-activeWidth, -eachSpacing);
-            context.lineTo(-seriesNew[i].radius - activeWidth, 0);
-            context.lineTo(seriesNew[i].radius + activeWidth, 0);
-            context.lineTo(activeWidth, -eachSpacing);
-            context.lineTo(-activeWidth, -eachSpacing);
-            context.closePath();
-            context.fill();
-          }
-        }
-        seriesNew[i].funnelArea = [centerPosition.x - seriesNew[i].radius, centerPosition.y - eachSpacing * (i + 1), centerPosition.x + seriesNew[i].radius, centerPosition.y - eachSpacing * i];
-        context.beginPath();
-        context.setLineWidth(funnelOption.borderWidth * opts.pix);
-        context.setStrokeStyle(funnelOption.borderColor);
-        var fillColor = hexToRgb(seriesNew[i].color, funnelOption.fillOpacity);
-        if (funnelOption.linearType == 'custom') {
-          var grd = context.createLinearGradient(seriesNew[i].radius, -eachSpacing, -seriesNew[i].radius, -eachSpacing);
-          grd.addColorStop(0, hexToRgb(seriesNew[i].color, funnelOption.fillOpacity));
-          grd.addColorStop(0.5, hexToRgb(funnelOption.customColor[seriesNew[i].linearIndex], funnelOption.fillOpacity));
-          grd.addColorStop(1, hexToRgb(seriesNew[i].color, funnelOption.fillOpacity));
-          fillColor = grd
-        }
-        context.setFillStyle(fillColor);
-        context.moveTo(0, -eachSpacing);
-        context.lineTo(-seriesNew[i].radius, 0);
-        context.lineTo(seriesNew[i].radius, 0);
-        context.lineTo(0, -eachSpacing);
-        context.closePath();
-        context.fill();
-        if (funnelOption.border == true) {
-          context.stroke();
-        }
-      } else {
-        if (opts.tooltip) {
-          if (opts.tooltip.index == i) {
-            context.beginPath();
-            context.setFillStyle(hexToRgb(seriesNew[i].color, funnelOption.activeOpacity));
-            context.moveTo(0, 0);
-            context.lineTo(-seriesNew[i].radius - activeWidth, 0);
-            context.lineTo(-seriesNew[i + 1].radius - activeWidth, -eachSpacing);
-            context.lineTo(seriesNew[i + 1].radius + activeWidth, -eachSpacing);
-            context.lineTo(seriesNew[i].radius + activeWidth, 0);
-            context.lineTo(0, 0);
-            context.closePath();
-            context.fill();
-          }
-        }
-        seriesNew[i].funnelArea = [centerPosition.x - seriesNew[i].radius, centerPosition.y - eachSpacing * (i + 1), centerPosition.x + seriesNew[i].radius, centerPosition.y - eachSpacing * i];
-        context.beginPath();
-        context.setLineWidth(funnelOption.borderWidth * opts.pix);
-        context.setStrokeStyle(funnelOption.borderColor);
-        var fillColor = hexToRgb(seriesNew[i].color, funnelOption.fillOpacity);
-        if (funnelOption.linearType == 'custom') {
-          var grd = context.createLinearGradient(seriesNew[i].radius, -eachSpacing, -seriesNew[i].radius, -eachSpacing);
-          grd.addColorStop(0, hexToRgb(seriesNew[i].color, funnelOption.fillOpacity));
-          grd.addColorStop(0.5, hexToRgb(funnelOption.customColor[seriesNew[i].linearIndex], funnelOption.fillOpacity));
-          grd.addColorStop(1, hexToRgb(seriesNew[i].color, funnelOption.fillOpacity));
-          fillColor = grd
-        }
-        context.setFillStyle(fillColor);
-        context.moveTo(0, 0);
-        context.lineTo(-seriesNew[i].radius, 0);
-        context.lineTo(-seriesNew[i + 1].radius, -eachSpacing);
-        context.lineTo(seriesNew[i + 1].radius, -eachSpacing);
-        context.lineTo(seriesNew[i].radius, 0);
-        context.lineTo(0, 0);
-        context.closePath();
-        context.fill();
-        if (funnelOption.border == true) {
-          context.stroke();
-        }
-      }
-      context.translate(0, -eachSpacing)
-    }
-  }else{
-    context.translate(0, - (seriesNew.length - 1) * eachSpacing);
-    for (let i = 0; i < seriesNew.length; i++) {
-      if (i == seriesNew.length - 1) {
-        if (opts.tooltip) {
-          if (opts.tooltip.index == i) {
-            context.beginPath();
-            context.setFillStyle(hexToRgb(seriesNew[i].color, funnelOption.activeOpacity));
-            context.moveTo(-activeWidth - funnelOption.minSize/2, 0);
-            context.lineTo(-seriesNew[i].radius - activeWidth, -eachSpacing);
-            context.lineTo(seriesNew[i].radius + activeWidth, -eachSpacing);
-            context.lineTo(activeWidth + funnelOption.minSize/2, 0);
-            context.lineTo(-activeWidth - funnelOption.minSize/2, 0);
-            context.closePath();
-            context.fill();
-          }
-        }
-        seriesNew[i].funnelArea = [centerPosition.x - seriesNew[i].radius, centerPosition.y - eachSpacing, centerPosition.x + seriesNew[i].radius, centerPosition.y ];
-        context.beginPath();
-        context.setLineWidth(funnelOption.borderWidth * opts.pix);
-        context.setStrokeStyle(funnelOption.borderColor);
-        var fillColor = hexToRgb(seriesNew[i].color, funnelOption.fillOpacity);
-        if (funnelOption.linearType == 'custom') {
-          var grd = context.createLinearGradient(seriesNew[i].radius, -eachSpacing, -seriesNew[i].radius, -eachSpacing);
-          grd.addColorStop(0, hexToRgb(seriesNew[i].color, funnelOption.fillOpacity));
-          grd.addColorStop(0.5, hexToRgb(funnelOption.customColor[seriesNew[i].linearIndex], funnelOption.fillOpacity));
-          grd.addColorStop(1, hexToRgb(seriesNew[i].color, funnelOption.fillOpacity));
-          fillColor = grd
-        }
-        context.setFillStyle(fillColor);
-        context.moveTo(0, 0);
-        context.lineTo(-funnelOption.minSize/2, 0);
-        context.lineTo(-seriesNew[i].radius, -eachSpacing);
-        context.lineTo(seriesNew[i].radius, -eachSpacing);
-        context.lineTo(funnelOption.minSize/2, 0);
-        context.lineTo(0, 0);
-        context.closePath();
-        context.fill();
-        if (funnelOption.border == true) {
-          context.stroke();
-        }
-      } else {
-        if (opts.tooltip) {
-          if (opts.tooltip.index == i) {
-            context.beginPath();
-            context.setFillStyle(hexToRgb(seriesNew[i].color, funnelOption.activeOpacity));
-            context.moveTo(0, 0);
-            context.lineTo(-seriesNew[i + 1].radius - activeWidth, 0);
-            context.lineTo(-seriesNew[i].radius - activeWidth, -eachSpacing);
-            context.lineTo(seriesNew[i].radius + activeWidth, -eachSpacing);
-            context.lineTo(seriesNew[i + 1].radius + activeWidth, 0);
-            context.lineTo(0, 0);
-            context.closePath();
-            context.fill();
-          }
-        }
-        seriesNew[i].funnelArea = [centerPosition.x - seriesNew[i].radius, centerPosition.y - eachSpacing * (seriesNew.length - i), centerPosition.x + seriesNew[i].radius, centerPosition.y - eachSpacing * (seriesNew.length - i - 1)];
-        context.beginPath();
-        context.setLineWidth(funnelOption.borderWidth * opts.pix);
-        context.setStrokeStyle(funnelOption.borderColor);
-        var fillColor = hexToRgb(seriesNew[i].color, funnelOption.fillOpacity);
-        if (funnelOption.linearType == 'custom') {
-          var grd = context.createLinearGradient(seriesNew[i].radius, -eachSpacing, -seriesNew[i].radius, -eachSpacing);
-          grd.addColorStop(0, hexToRgb(seriesNew[i].color, funnelOption.fillOpacity));
-          grd.addColorStop(0.5, hexToRgb(funnelOption.customColor[seriesNew[i].linearIndex], funnelOption.fillOpacity));
-          grd.addColorStop(1, hexToRgb(seriesNew[i].color, funnelOption.fillOpacity));
-          fillColor = grd
-        }
-        context.setFillStyle(fillColor);
-        context.moveTo(0, 0);
-        context.lineTo(-seriesNew[i + 1].radius, 0);
-        context.lineTo(-seriesNew[i].radius, -eachSpacing);
-        context.lineTo(seriesNew[i].radius, -eachSpacing);
-        context.lineTo(seriesNew[i + 1].radius, 0);
-        context.lineTo(0, 0);
-        context.closePath();
-        context.fill();
-        if (funnelOption.border == true) {
-          context.stroke();
-        }
-      }
-      context.translate(0, eachSpacing)
-    }
-  }
-  
-  context.restore();
-  if (opts.dataLabel !== false && process === 1) {
-    drawFunnelText(seriesNew, opts, context, eachSpacing, funnelOption.labelAlign, activeWidth, centerPosition);
-  }
-  if (process === 1) {
-    drawFunnelCenterText(seriesNew, opts, context, eachSpacing, funnelOption.labelAlign, activeWidth, centerPosition);
-  }
-  return {
-    center: centerPosition,
-    radius: radius,
-    series: seriesNew
-  };
+	let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	let funnelOption = assign({}, {
+		type: 'funnel',
+		activeWidth: 10,
+		activeOpacity: 0.3,
+		border: false,
+		borderWidth: 2,
+		borderColor: '#FFFFFF',
+		fillOpacity: 1,
+		minSize: 0,
+		labelAlign: 'right',
+		linearType: 'none',
+		customColor: [],
+	}, opts.extra.funnel);
+	let eachSpacing = (opts.height - opts.area[0] - opts.area[2]) / series.length;
+	let centerPosition = {
+		x: opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2,
+		y: opts.height - opts.area[2]
+	};
+	let activeWidth = funnelOption.activeWidth * opts.pix;
+	let radius = Math.min((opts.width - opts.area[1] - opts.area[3]) / 2 - activeWidth, (opts.height - opts.area[0] - opts
+		.area[2]) / 2 - activeWidth);
+	let seriesNew = getFunnelDataPoints(series, radius, funnelOption, eachSpacing, process);
+	context.save();
+	context.translate(centerPosition.x, centerPosition.y);
+	funnelOption.customColor = fillCustomColor(funnelOption.linearType, funnelOption.customColor, series, config);
+	if (funnelOption.type == 'pyramid') {
+		for (let i = 0; i < seriesNew.length; i++) {
+			if (i == seriesNew.length - 1) {
+				if (opts.tooltip) {
+					if (opts.tooltip.index == i) {
+						context.beginPath();
+						context.setFillStyle(hexToRgb(seriesNew[i].color, funnelOption.activeOpacity));
+						context.moveTo(-activeWidth, -eachSpacing);
+						context.lineTo(-seriesNew[i].radius - activeWidth, 0);
+						context.lineTo(seriesNew[i].radius + activeWidth, 0);
+						context.lineTo(activeWidth, -eachSpacing);
+						context.lineTo(-activeWidth, -eachSpacing);
+						context.closePath();
+						context.fill();
+					}
+				}
+				seriesNew[i].funnelArea = [centerPosition.x - seriesNew[i].radius, centerPosition.y - eachSpacing * (i + 1),
+					centerPosition.x + seriesNew[i].radius, centerPosition.y - eachSpacing * i
+				];
+				context.beginPath();
+				context.setLineWidth(funnelOption.borderWidth * opts.pix);
+				context.setStrokeStyle(funnelOption.borderColor);
+				var fillColor = hexToRgb(seriesNew[i].color, funnelOption.fillOpacity);
+				if (funnelOption.linearType == 'custom') {
+					var grd = context.createLinearGradient(seriesNew[i].radius, -eachSpacing, -seriesNew[i].radius, -eachSpacing);
+					grd.addColorStop(0, hexToRgb(seriesNew[i].color, funnelOption.fillOpacity));
+					grd.addColorStop(0.5, hexToRgb(funnelOption.customColor[seriesNew[i].linearIndex], funnelOption.fillOpacity));
+					grd.addColorStop(1, hexToRgb(seriesNew[i].color, funnelOption.fillOpacity));
+					fillColor = grd
+				}
+				context.setFillStyle(fillColor);
+				context.moveTo(0, -eachSpacing);
+				context.lineTo(-seriesNew[i].radius, 0);
+				context.lineTo(seriesNew[i].radius, 0);
+				context.lineTo(0, -eachSpacing);
+				context.closePath();
+				context.fill();
+				if (funnelOption.border == true) {
+					context.stroke();
+				}
+			} else {
+				if (opts.tooltip) {
+					if (opts.tooltip.index == i) {
+						context.beginPath();
+						context.setFillStyle(hexToRgb(seriesNew[i].color, funnelOption.activeOpacity));
+						context.moveTo(0, 0);
+						context.lineTo(-seriesNew[i].radius - activeWidth, 0);
+						context.lineTo(-seriesNew[i + 1].radius - activeWidth, -eachSpacing);
+						context.lineTo(seriesNew[i + 1].radius + activeWidth, -eachSpacing);
+						context.lineTo(seriesNew[i].radius + activeWidth, 0);
+						context.lineTo(0, 0);
+						context.closePath();
+						context.fill();
+					}
+				}
+				seriesNew[i].funnelArea = [centerPosition.x - seriesNew[i].radius, centerPosition.y - eachSpacing * (i + 1),
+					centerPosition.x + seriesNew[i].radius, centerPosition.y - eachSpacing * i
+				];
+				context.beginPath();
+				context.setLineWidth(funnelOption.borderWidth * opts.pix);
+				context.setStrokeStyle(funnelOption.borderColor);
+				var fillColor = hexToRgb(seriesNew[i].color, funnelOption.fillOpacity);
+				if (funnelOption.linearType == 'custom') {
+					var grd = context.createLinearGradient(seriesNew[i].radius, -eachSpacing, -seriesNew[i].radius, -eachSpacing);
+					grd.addColorStop(0, hexToRgb(seriesNew[i].color, funnelOption.fillOpacity));
+					grd.addColorStop(0.5, hexToRgb(funnelOption.customColor[seriesNew[i].linearIndex], funnelOption.fillOpacity));
+					grd.addColorStop(1, hexToRgb(seriesNew[i].color, funnelOption.fillOpacity));
+					fillColor = grd
+				}
+				context.setFillStyle(fillColor);
+				context.moveTo(0, 0);
+				context.lineTo(-seriesNew[i].radius, 0);
+				context.lineTo(-seriesNew[i + 1].radius, -eachSpacing);
+				context.lineTo(seriesNew[i + 1].radius, -eachSpacing);
+				context.lineTo(seriesNew[i].radius, 0);
+				context.lineTo(0, 0);
+				context.closePath();
+				context.fill();
+				if (funnelOption.border == true) {
+					context.stroke();
+				}
+			}
+			context.translate(0, -eachSpacing)
+		}
+	} else {
+		context.translate(0, -(seriesNew.length - 1) * eachSpacing);
+		for (let i = 0; i < seriesNew.length; i++) {
+			if (i == seriesNew.length - 1) {
+				if (opts.tooltip) {
+					if (opts.tooltip.index == i) {
+						context.beginPath();
+						context.setFillStyle(hexToRgb(seriesNew[i].color, funnelOption.activeOpacity));
+						context.moveTo(-activeWidth - funnelOption.minSize / 2, 0);
+						context.lineTo(-seriesNew[i].radius - activeWidth, -eachSpacing);
+						context.lineTo(seriesNew[i].radius + activeWidth, -eachSpacing);
+						context.lineTo(activeWidth + funnelOption.minSize / 2, 0);
+						context.lineTo(-activeWidth - funnelOption.minSize / 2, 0);
+						context.closePath();
+						context.fill();
+					}
+				}
+				seriesNew[i].funnelArea = [centerPosition.x - seriesNew[i].radius, centerPosition.y - eachSpacing,
+					centerPosition.x + seriesNew[i].radius, centerPosition.y
+				];
+				context.beginPath();
+				context.setLineWidth(funnelOption.borderWidth * opts.pix);
+				context.setStrokeStyle(funnelOption.borderColor);
+				var fillColor = hexToRgb(seriesNew[i].color, funnelOption.fillOpacity);
+				if (funnelOption.linearType == 'custom') {
+					var grd = context.createLinearGradient(seriesNew[i].radius, -eachSpacing, -seriesNew[i].radius, -eachSpacing);
+					grd.addColorStop(0, hexToRgb(seriesNew[i].color, funnelOption.fillOpacity));
+					grd.addColorStop(0.5, hexToRgb(funnelOption.customColor[seriesNew[i].linearIndex], funnelOption.fillOpacity));
+					grd.addColorStop(1, hexToRgb(seriesNew[i].color, funnelOption.fillOpacity));
+					fillColor = grd
+				}
+				context.setFillStyle(fillColor);
+				context.moveTo(0, 0);
+				context.lineTo(-funnelOption.minSize / 2, 0);
+				context.lineTo(-seriesNew[i].radius, -eachSpacing);
+				context.lineTo(seriesNew[i].radius, -eachSpacing);
+				context.lineTo(funnelOption.minSize / 2, 0);
+				context.lineTo(0, 0);
+				context.closePath();
+				context.fill();
+				if (funnelOption.border == true) {
+					context.stroke();
+				}
+			} else {
+				if (opts.tooltip) {
+					if (opts.tooltip.index == i) {
+						context.beginPath();
+						context.setFillStyle(hexToRgb(seriesNew[i].color, funnelOption.activeOpacity));
+						context.moveTo(0, 0);
+						context.lineTo(-seriesNew[i + 1].radius - activeWidth, 0);
+						context.lineTo(-seriesNew[i].radius - activeWidth, -eachSpacing);
+						context.lineTo(seriesNew[i].radius + activeWidth, -eachSpacing);
+						context.lineTo(seriesNew[i + 1].radius + activeWidth, 0);
+						context.lineTo(0, 0);
+						context.closePath();
+						context.fill();
+					}
+				}
+				seriesNew[i].funnelArea = [centerPosition.x - seriesNew[i].radius, centerPosition.y - eachSpacing * (seriesNew
+					.length - i), centerPosition.x + seriesNew[i].radius, centerPosition.y - eachSpacing * (seriesNew.length -
+					i - 1)];
+				context.beginPath();
+				context.setLineWidth(funnelOption.borderWidth * opts.pix);
+				context.setStrokeStyle(funnelOption.borderColor);
+				var fillColor = hexToRgb(seriesNew[i].color, funnelOption.fillOpacity);
+				if (funnelOption.linearType == 'custom') {
+					var grd = context.createLinearGradient(seriesNew[i].radius, -eachSpacing, -seriesNew[i].radius, -eachSpacing);
+					grd.addColorStop(0, hexToRgb(seriesNew[i].color, funnelOption.fillOpacity));
+					grd.addColorStop(0.5, hexToRgb(funnelOption.customColor[seriesNew[i].linearIndex], funnelOption.fillOpacity));
+					grd.addColorStop(1, hexToRgb(seriesNew[i].color, funnelOption.fillOpacity));
+					fillColor = grd
+				}
+				context.setFillStyle(fillColor);
+				context.moveTo(0, 0);
+				context.lineTo(-seriesNew[i + 1].radius, 0);
+				context.lineTo(-seriesNew[i].radius, -eachSpacing);
+				context.lineTo(seriesNew[i].radius, -eachSpacing);
+				context.lineTo(seriesNew[i + 1].radius, 0);
+				context.lineTo(0, 0);
+				context.closePath();
+				context.fill();
+				if (funnelOption.border == true) {
+					context.stroke();
+				}
+			}
+			context.translate(0, eachSpacing)
+		}
+	}
+
+	context.restore();
+	if (opts.dataLabel !== false && process === 1) {
+		drawFunnelText(seriesNew, opts, context, eachSpacing, funnelOption.labelAlign, activeWidth, centerPosition);
+	}
+	if (process === 1) {
+		drawFunnelCenterText(seriesNew, opts, context, eachSpacing, funnelOption.labelAlign, activeWidth, centerPosition);
+	}
+	return {
+		center: centerPosition,
+		radius: radius,
+		series: seriesNew
+	};
 }
 
 function drawFunnelText(series, opts, context, eachSpacing, labelAlign, activeWidth, centerPosition) {
-  for (let i = 0; i < series.length; i++) {
-    let item = series[i];
-    if(item.labelShow === false){
-      continue;
-    }
-    let startX, endX, startY, fontSize;
-    let text = item.formatter ? item.formatter(item,i,series,opts) : util.toFixed(item._proportion_ * 100) + '%';
-    text = item.labelText ? item.labelText : text;
-    if (labelAlign == 'right') {
-      if (i == series.length -1) {
-        startX = (item.funnelArea[2] + centerPosition.x) / 2;
-      } else {
-        startX = (item.funnelArea[2] + series[i + 1].funnelArea[2]) / 2;
-      }
-      endX = startX + activeWidth * 2;
-      startY = item.funnelArea[1] + eachSpacing / 2;
-      fontSize = item.textSize * opts.pix || opts.fontSize * opts.pix;
-      context.setLineWidth(1 * opts.pix);
-      context.setStrokeStyle(item.color);
-      context.setFillStyle(item.color);
-      context.beginPath();
-      context.moveTo(startX, startY);
-      context.lineTo(endX, startY);
-      context.stroke();
-      context.closePath();
-      context.beginPath();
-      context.moveTo(endX, startY);
-      context.arc(endX, startY, 2 * opts.pix, 0, 2 * Math.PI);
-      context.closePath();
-      context.fill();
-      context.beginPath();
-      context.setFontSize(fontSize);
-      context.setFillStyle(item.textColor || opts.fontColor);
-      context.fillText(text, endX + 5, startY + fontSize / 2 - 2);
-      context.closePath();
-      context.stroke();
-      context.closePath();
-    }
-    if (labelAlign == 'left') {
-      if (i == series.length -1) {
-        startX = (item.funnelArea[0] + centerPosition.x) / 2;
-      } else {
-        startX = (item.funnelArea[0] + series[i + 1].funnelArea[0]) / 2;
-      }
-      endX = startX - activeWidth * 2;
-      startY = item.funnelArea[1] + eachSpacing / 2;
-      fontSize = item.textSize * opts.pix || opts.fontSize * opts.pix;
-      context.setLineWidth(1 * opts.pix);
-      context.setStrokeStyle(item.color);
-      context.setFillStyle(item.color);
-      context.beginPath();
-      context.moveTo(startX, startY);
-      context.lineTo(endX, startY);
-      context.stroke();
-      context.closePath();
-      context.beginPath();
-      context.moveTo(endX, startY);
-      context.arc(endX, startY, 2, 0, 2 * Math.PI);
-      context.closePath();
-      context.fill();
-      context.beginPath();
-      context.setFontSize(fontSize);
-      context.setFillStyle(item.textColor || opts.fontColor);
-      context.fillText(text, endX - 5 - measureText(text, fontSize, context), startY + fontSize / 2 - 2);
-      context.closePath();
-      context.stroke();
-      context.closePath();
-    }
-  }
+	for (let i = 0; i < series.length; i++) {
+		let item = series[i];
+		if (item.labelShow === false) {
+			continue;
+		}
+		let startX, endX, startY, fontSize;
+		let text = item.formatter ? item.formatter(item, i, series, opts) : util.toFixed(item._proportion_ * 100) + '%';
+		text = item.labelText ? item.labelText : text;
+		if (labelAlign == 'right') {
+			if (i == series.length - 1) {
+				startX = (item.funnelArea[2] + centerPosition.x) / 2;
+			} else {
+				startX = (item.funnelArea[2] + series[i + 1].funnelArea[2]) / 2;
+			}
+			endX = startX + activeWidth * 2;
+			startY = item.funnelArea[1] + eachSpacing / 2;
+			fontSize = item.textSize * opts.pix || opts.fontSize * opts.pix;
+			context.setLineWidth(1 * opts.pix);
+			context.setStrokeStyle(item.color);
+			context.setFillStyle(item.color);
+			context.beginPath();
+			context.moveTo(startX, startY);
+			context.lineTo(endX, startY);
+			context.stroke();
+			context.closePath();
+			context.beginPath();
+			context.moveTo(endX, startY);
+			context.arc(endX, startY, 2 * opts.pix, 0, 2 * Math.PI);
+			context.closePath();
+			context.fill();
+			context.beginPath();
+			context.setFontSize(fontSize);
+			context.setFillStyle(item.textColor || opts.fontColor);
+			context.fillText(text, endX + 5, startY + fontSize / 2 - 2);
+			context.closePath();
+			context.stroke();
+			context.closePath();
+		}
+		if (labelAlign == 'left') {
+			if (i == series.length - 1) {
+				startX = (item.funnelArea[0] + centerPosition.x) / 2;
+			} else {
+				startX = (item.funnelArea[0] + series[i + 1].funnelArea[0]) / 2;
+			}
+			endX = startX - activeWidth * 2;
+			startY = item.funnelArea[1] + eachSpacing / 2;
+			fontSize = item.textSize * opts.pix || opts.fontSize * opts.pix;
+			context.setLineWidth(1 * opts.pix);
+			context.setStrokeStyle(item.color);
+			context.setFillStyle(item.color);
+			context.beginPath();
+			context.moveTo(startX, startY);
+			context.lineTo(endX, startY);
+			context.stroke();
+			context.closePath();
+			context.beginPath();
+			context.moveTo(endX, startY);
+			context.arc(endX, startY, 2, 0, 2 * Math.PI);
+			context.closePath();
+			context.fill();
+			context.beginPath();
+			context.setFontSize(fontSize);
+			context.setFillStyle(item.textColor || opts.fontColor);
+			context.fillText(text, endX - 5 - measureText(text, fontSize, context), startY + fontSize / 2 - 2);
+			context.closePath();
+			context.stroke();
+			context.closePath();
+		}
+	}
 }
 
 function drawFunnelCenterText(series, opts, context, eachSpacing, labelAlign, activeWidth, centerPosition) {
-  for (let i = 0; i < series.length; i++) {
-    let item = series[i];
-    let startY, fontSize;
-    if (item.centerText) {
-      startY = item.funnelArea[1] + eachSpacing / 2;
-      fontSize = item.centerTextSize * opts.pix || opts.fontSize * opts.pix;
-      context.beginPath();
-      context.setFontSize(fontSize);
-      context.setFillStyle(item.centerTextColor || "#FFFFFF");
-      context.fillText(item.centerText, centerPosition.x - measureText(item.centerText, fontSize, context) / 2, startY + fontSize / 2 - 2);
-      context.closePath();
-      context.stroke();
-      context.closePath();
-    }
-  }
+	for (let i = 0; i < series.length; i++) {
+		let item = series[i];
+		let startY, fontSize;
+		if (item.centerText) {
+			startY = item.funnelArea[1] + eachSpacing / 2;
+			fontSize = item.centerTextSize * opts.pix || opts.fontSize * opts.pix;
+			context.beginPath();
+			context.setFontSize(fontSize);
+			context.setFillStyle(item.centerTextColor || "#FFFFFF");
+			context.fillText(item.centerText, centerPosition.x - measureText(item.centerText, fontSize, context) / 2, startY +
+				fontSize / 2 - 2);
+			context.closePath();
+			context.stroke();
+			context.closePath();
+		}
+	}
 }
 
 
 function drawCanvas(opts, context) {
-  context.save();
-  context.translate(0, 0.5);
-  context.restore();
-  context.draw();
+	context.save();
+	context.translate(0, 0.5);
+	context.restore();
+	context.draw();
 }
 
 var Timing = {
-  easeIn: function easeIn(pos) {
-    return Math.pow(pos, 3);
-  },
-  easeOut: function easeOut(pos) {
-    return Math.pow(pos - 1, 3) + 1;
-  },
-  easeInOut: function easeInOut(pos) {
-    if ((pos /= 0.5) < 1) {
-      return 0.5 * Math.pow(pos, 3);
-    } else {
-      return 0.5 * (Math.pow(pos - 2, 3) + 2);
-    }
-  },
-  linear: function linear(pos) {
-    return pos;
-  }
+	easeIn: function easeIn(pos) {
+		return Math.pow(pos, 3);
+	},
+	easeOut: function easeOut(pos) {
+		return Math.pow(pos - 1, 3) + 1;
+	},
+	easeInOut: function easeInOut(pos) {
+		if ((pos /= 0.5) < 1) {
+			return 0.5 * Math.pow(pos, 3);
+		} else {
+			return 0.5 * (Math.pow(pos - 2, 3) + 2);
+		}
+	},
+	linear: function linear(pos) {
+		return pos;
+	}
 };
 
 function Animation(opts) {
-  this.isStop = false;
-  opts.duration = typeof opts.duration === 'undefined' ? 1000 : opts.duration;
-  opts.timing = opts.timing || 'easeInOut';
-  var delay = 17;
-  function createAnimationFrame() {
-    if (typeof setTimeout !== 'undefined') {
-      return function(step, delay) {
-        setTimeout(function() {
-          var timeStamp = +new Date();
-          step(timeStamp);
-        }, delay);
-      };
-    } else if (typeof requestAnimationFrame !== 'undefined') {
-      return requestAnimationFrame;
-    } else {
-      return function(step) {
-        step(null);
-      };
-    }
-  };
-  var animationFrame = createAnimationFrame();
-  var startTimeStamp = null;
-  var _step = function step(timestamp) {
-    if (timestamp === null || this.isStop === true) {
-      opts.onProcess && opts.onProcess(1);
-      opts.onAnimationFinish && opts.onAnimationFinish();
-      return;
-    }
-    if (startTimeStamp === null) {
-      startTimeStamp = timestamp;
-    }
-    if (timestamp - startTimeStamp < opts.duration) {
-      var process = (timestamp - startTimeStamp) / opts.duration;
-      var timingFunction = Timing[opts.timing];
-      process = timingFunction(process);
-      opts.onProcess && opts.onProcess(process);
-      animationFrame(_step, delay);
-    } else {
-      opts.onProcess && opts.onProcess(1);
-      opts.onAnimationFinish && opts.onAnimationFinish();
-    }
-  };
-  _step = _step.bind(this);
-  animationFrame(_step, delay);
+	this.isStop = false;
+	opts.duration = typeof opts.duration === 'undefined' ? 1000 : opts.duration;
+	opts.timing = opts.timing || 'easeInOut';
+	var delay = 17;
+
+	function createAnimationFrame() {
+		if (typeof setTimeout !== 'undefined') {
+			return function(step, delay) {
+				setTimeout(function() {
+					var timeStamp = +new Date();
+					step(timeStamp);
+				}, delay);
+			};
+		} else if (typeof requestAnimationFrame !== 'undefined') {
+			return requestAnimationFrame;
+		} else {
+			return function(step) {
+				step(null);
+			};
+		}
+	};
+	var animationFrame = createAnimationFrame();
+	var startTimeStamp = null;
+	var _step = function step(timestamp) {
+		if (timestamp === null || this.isStop === true) {
+			opts.onProcess && opts.onProcess(1);
+			opts.onAnimationFinish && opts.onAnimationFinish();
+			return;
+		}
+		if (startTimeStamp === null) {
+			startTimeStamp = timestamp;
+		}
+		if (timestamp - startTimeStamp < opts.duration) {
+			var process = (timestamp - startTimeStamp) / opts.duration;
+			var timingFunction = Timing[opts.timing];
+			process = timingFunction(process);
+			opts.onProcess && opts.onProcess(process);
+			animationFrame(_step, delay);
+		} else {
+			opts.onProcess && opts.onProcess(1);
+			opts.onAnimationFinish && opts.onAnimationFinish();
+		}
+	};
+	_step = _step.bind(this);
+	animationFrame(_step, delay);
 }
 
 Animation.prototype.stop = function() {
-  this.isStop = true;
+	this.isStop = true;
 };
 
 function drawCharts(type, opts, config, context) {
-  var _this = this;
-  var series = opts.series;
-  //兼容ECharts饼图类数据格式
-  if (type === 'pie' || type === 'ring' || type === 'mount' || type === 'rose' || type === 'funnel') {
-    series = fixPieSeries(series, opts, config);
-  }
-  var categories = opts.categories;
-  if (type === 'mount') {
-    categories = [];
-    for (let j = 0; j < series.length; j++) {
-      if(series[j].show !== false) categories.push(series[j].name)
-    }
-    opts.categories = categories;
-  }
-  series = fillSeries(series, opts, config);
-  var duration = opts.animation ? opts.duration : 0;
-  _this.animationInstance && _this.animationInstance.stop();
-  var seriesMA = null;
-  if (type == 'candle') {
-    let average = assign({}, opts.extra.candle.average);
-    if (average.show) {
-      seriesMA = calCandleMA(average.day, average.name, average.color, series[0].data);
-      seriesMA = fillSeries(seriesMA, opts, config);
-      opts.seriesMA = seriesMA;
-    } else if (opts.seriesMA) {
-      seriesMA = opts.seriesMA = fillSeries(opts.seriesMA, opts, config);
-    } else {
-      seriesMA = series;
-    }
-  } else {
-    seriesMA = series;
-  }
-  /* 过滤掉show=false的series */
-  opts._series_ = series = filterSeries(series);
-  //重新计算图表区域
-  opts.area = new Array(4);
-  //复位绘图区域
-  for (let j = 0; j < 4; j++) {
-    opts.area[j] = opts.padding[j] * opts.pix;
-  }
-  //通过计算三大区域：图例、X轴、Y轴的大小，确定绘图区域
-  var _calLegendData = calLegendData(seriesMA, opts, config, opts.chartData, context),
-    legendHeight = _calLegendData.area.wholeHeight,
-    legendWidth = _calLegendData.area.wholeWidth;
-
-  switch (opts.legend.position) {
-    case 'top':
-      opts.area[0] += legendHeight;
-      break;
-    case 'bottom':
-      opts.area[2] += legendHeight;
-      break;
-    case 'left':
-      opts.area[3] += legendWidth;
-      break;
-    case 'right':
-      opts.area[1] += legendWidth;
-      break;
-  }
-
-  let _calYAxisData = {},
-    yAxisWidth = 0;
-  if (opts.type === 'line' || opts.type === 'column'|| opts.type === 'mount' || opts.type === 'area' || opts.type === 'mix' || opts.type === 'candle' || opts.type === 'scatter'  || opts.type === 'bubble' || opts.type === 'bar') {
-      _calYAxisData = calYAxisData(series, opts, config, context);
-      yAxisWidth = _calYAxisData.yAxisWidth;
-    //如果显示Y轴标题
-    if (opts.yAxis.showTitle) {
-      let maxTitleHeight = 0;
-      for (let i = 0; i < opts.yAxis.data.length; i++) {
-        maxTitleHeight = Math.max(maxTitleHeight, opts.yAxis.data[i].titleFontSize ? opts.yAxis.data[i].titleFontSize * opts.pix : config.fontSize)
-      }
-      opts.area[0] += maxTitleHeight;
-    }
-    let rightIndex = 0,
-      leftIndex = 0;
-    //计算主绘图区域左右位置
-    for (let i = 0; i < yAxisWidth.length; i++) {
-      if (yAxisWidth[i].position == 'left') {
-        if (leftIndex > 0) {
-          opts.area[3] += yAxisWidth[i].width + opts.yAxis.padding * opts.pix;
-        } else {
-          opts.area[3] += yAxisWidth[i].width;
-        }
-        leftIndex += 1;
-      } else if (yAxisWidth[i].position == 'right') {
-        if (rightIndex > 0) {
-          opts.area[1] += yAxisWidth[i].width + opts.yAxis.padding * opts.pix;
-        } else {
-          opts.area[1] += yAxisWidth[i].width;
-        }
-        rightIndex += 1;
-      }
-    }
-  } else {
-    config.yAxisWidth = yAxisWidth;
-  }
-  opts.chartData.yAxisData = _calYAxisData;
-
-  if (opts.categories && opts.categories.length && opts.type !== 'radar' && opts.type !== 'gauge' && opts.type !== 'bar') {
-    opts.chartData.xAxisData = getXAxisPoints(opts.categories, opts, config);
-    let _calCategoriesData = calCategoriesData(opts.categories, opts, config, opts.chartData.xAxisData.eachSpacing, context),
-      xAxisHeight = _calCategoriesData.xAxisHeight,
-      angle = _calCategoriesData.angle;
-    config.xAxisHeight = xAxisHeight;
-    config._xAxisTextAngle_ = angle;
-    opts.area[2] += xAxisHeight;
-    opts.chartData.categoriesData = _calCategoriesData;
-  } else {
-    if (opts.type === 'line' || opts.type === 'area' || opts.type === 'scatter' || opts.type === 'bubble' || opts.type === 'bar') {
-      opts.chartData.xAxisData = calXAxisData(series, opts, config, context);
-      categories = opts.chartData.xAxisData.rangesFormat;
-      let _calCategoriesData = calCategoriesData(categories, opts, config, opts.chartData.xAxisData.eachSpacing, context),
-        xAxisHeight = _calCategoriesData.xAxisHeight,
-        angle = _calCategoriesData.angle;
-      config.xAxisHeight = xAxisHeight;
-      config._xAxisTextAngle_ = angle;
-      opts.area[2] += xAxisHeight;
-      opts.chartData.categoriesData = _calCategoriesData;
-    } else {
-      opts.chartData.xAxisData = {
-        xAxisPoints: []
-      };
-    }
-  }
-
-  //计算右对齐偏移距离
-  if (opts.enableScroll && opts.xAxis.scrollAlign == 'right' && opts._scrollDistance_ === undefined) {
-    let offsetLeft = 0,
-      xAxisPoints = opts.chartData.xAxisData.xAxisPoints,
-      startX = opts.chartData.xAxisData.startX,
-      endX = opts.chartData.xAxisData.endX,
-      eachSpacing = opts.chartData.xAxisData.eachSpacing;
-    let totalWidth = eachSpacing * (xAxisPoints.length - 1);
-    let screenWidth = endX - startX;
-    offsetLeft = screenWidth - totalWidth;
-    _this.scrollOption.currentOffset = offsetLeft;
-    _this.scrollOption.startTouchX = offsetLeft;
-    _this.scrollOption.distance = 0;
-    _this.scrollOption.lastMoveTime = 0;
-    opts._scrollDistance_ = offsetLeft;
-  }
-
-  if (type === 'pie' || type === 'ring' || type === 'rose') {
-    config._pieTextMaxLength_ = opts.dataLabel === false ? 0 : getPieTextMaxLength(seriesMA, config, context, opts);
-  }
-  
-  switch (type) {
-    case 'word':
-      this.animationInstance = new Animation({
-        timing: opts.timing,
-        duration: duration,
-        onProcess: function(process) {
-          context.clearRect(0, 0, opts.width, opts.height);
-          if (opts.rotate) {
-            contextRotate(context, opts);
-          }
-          drawWordCloudDataPoints(series, opts, config, context, process);
-          drawCanvas(opts, context);
-        },
-        onAnimationFinish: function onAnimationFinish() {
-          _this.uevent.trigger('renderComplete');
-        }
-      });
-      break;
-    case 'map':
-      context.clearRect(0, 0, opts.width, opts.height);
-      drawMapDataPoints(series, opts, config, context);
-      setTimeout(()=>{
-        this.uevent.trigger('renderComplete');
-      },50)
-      break;
-    case 'funnel':
-      this.animationInstance = new Animation({
-        timing: opts.timing,
-        duration: duration,
-        onProcess: function(process) {
-          context.clearRect(0, 0, opts.width, opts.height);
-          if (opts.rotate) {
-            contextRotate(context, opts);
-          }
-          opts.chartData.funnelData = drawFunnelDataPoints(series, opts, config, context, process);
-          drawLegend(opts.series, opts, config, context, opts.chartData);
-          drawToolTipBridge(opts, config, context, process);
-          drawCanvas(opts, context);
-        },
-        onAnimationFinish: function onAnimationFinish() {
-          _this.uevent.trigger('renderComplete');
-        }
-      });
-      break;
-    case 'line':
-      this.animationInstance = new Animation({
-        timing: opts.timing,
-        duration: duration,
-        onProcess: function onProcess(process) {
-          context.clearRect(0, 0, opts.width, opts.height);
-          if (opts.rotate) {
-            contextRotate(context, opts);
-          }
-          drawYAxisGrid(categories, opts, config, context);
-          drawXAxis(categories, opts, config, context);
-          var _drawLineDataPoints = drawLineDataPoints(series, opts, config, context, process),
-            xAxisPoints = _drawLineDataPoints.xAxisPoints,
-            calPoints = _drawLineDataPoints.calPoints,
-            eachSpacing = _drawLineDataPoints.eachSpacing;
-          opts.chartData.xAxisPoints = xAxisPoints;
-          opts.chartData.calPoints = calPoints;
-          opts.chartData.eachSpacing = eachSpacing;
-          drawYAxis(series, opts, config, context);
-          if (opts.enableMarkLine !== false && process === 1) {
-            drawMarkLine(opts, config, context);
-          }
-          drawLegend(opts.series, opts, config, context, opts.chartData);
-          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
-          drawCanvas(opts, context);
-        },
-        onAnimationFinish: function onAnimationFinish() {
-          _this.uevent.trigger('renderComplete');
-        }
-      });
-      break;
-    case 'scatter':
-      this.animationInstance = new Animation({
-        timing: opts.timing,
-        duration: duration,
-        onProcess: function onProcess(process) {
-          context.clearRect(0, 0, opts.width, opts.height);
-          if (opts.rotate) {
-            contextRotate(context, opts);
-          }
-          drawYAxisGrid(categories, opts, config, context);
-          drawXAxis(categories, opts, config, context);
-          var _drawScatterDataPoints = drawScatterDataPoints(series, opts, config, context, process),
-            xAxisPoints = _drawScatterDataPoints.xAxisPoints,
-            calPoints = _drawScatterDataPoints.calPoints,
-            eachSpacing = _drawScatterDataPoints.eachSpacing;
-          opts.chartData.xAxisPoints = xAxisPoints;
-          opts.chartData.calPoints = calPoints;
-          opts.chartData.eachSpacing = eachSpacing;
-          drawYAxis(series, opts, config, context);
-          if (opts.enableMarkLine !== false && process === 1) {
-            drawMarkLine(opts, config, context);
-          }
-          drawLegend(opts.series, opts, config, context, opts.chartData);
-          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
-          drawCanvas(opts, context);
-        },
-        onAnimationFinish: function onAnimationFinish() {
-          _this.uevent.trigger('renderComplete');
-        }
-      });
-      break;
-    case 'bubble':
-      this.animationInstance = new Animation({
-        timing: opts.timing,
-        duration: duration,
-        onProcess: function onProcess(process) {
-          context.clearRect(0, 0, opts.width, opts.height);
-          if (opts.rotate) {
-            contextRotate(context, opts);
-          }
-          drawYAxisGrid(categories, opts, config, context);
-          drawXAxis(categories, opts, config, context);
-          var _drawBubbleDataPoints = drawBubbleDataPoints(series, opts, config, context, process),
-            xAxisPoints = _drawBubbleDataPoints.xAxisPoints,
-            calPoints = _drawBubbleDataPoints.calPoints,
-            eachSpacing = _drawBubbleDataPoints.eachSpacing;
-          opts.chartData.xAxisPoints = xAxisPoints;
-          opts.chartData.calPoints = calPoints;
-          opts.chartData.eachSpacing = eachSpacing;
-          drawYAxis(series, opts, config, context);
-          if (opts.enableMarkLine !== false && process === 1) {
-            drawMarkLine(opts, config, context);
-          }
-          drawLegend(opts.series, opts, config, context, opts.chartData);
-          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
-          drawCanvas(opts, context);
-        },
-        onAnimationFinish: function onAnimationFinish() {
-          _this.uevent.trigger('renderComplete');
-        }
-      });
-      break;
-    case 'mix':
-      this.animationInstance = new Animation({
-        timing: opts.timing,
-        duration: duration,
-        onProcess: function onProcess(process) {
-          context.clearRect(0, 0, opts.width, opts.height);
-          if (opts.rotate) {
-            contextRotate(context, opts);
-          }
-          drawYAxisGrid(categories, opts, config, context);
-          drawXAxis(categories, opts, config, context);
-          var _drawMixDataPoints = drawMixDataPoints(series, opts, config, context, process),
-            xAxisPoints = _drawMixDataPoints.xAxisPoints,
-            calPoints = _drawMixDataPoints.calPoints,
-            eachSpacing = _drawMixDataPoints.eachSpacing;
-          opts.chartData.xAxisPoints = xAxisPoints;
-          opts.chartData.calPoints = calPoints;
-          opts.chartData.eachSpacing = eachSpacing;
-          drawYAxis(series, opts, config, context);
-          if (opts.enableMarkLine !== false && process === 1) {
-            drawMarkLine(opts, config, context);
-          }
-          drawLegend(opts.series, opts, config, context, opts.chartData);
-          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
-          drawCanvas(opts, context);
-        },
-        onAnimationFinish: function onAnimationFinish() {
-          _this.uevent.trigger('renderComplete');
-        }
-      });
-      break;
-    case 'column':
-      this.animationInstance = new Animation({
-        timing: opts.timing,
-        duration: duration,
-        onProcess: function onProcess(process) {
-          context.clearRect(0, 0, opts.width, opts.height);
-          if (opts.rotate) {
-            contextRotate(context, opts);
-          }
-          drawYAxisGrid(categories, opts, config, context);
-          drawXAxis(categories, opts, config, context);
-          var _drawColumnDataPoints = drawColumnDataPoints(series, opts, config, context, process),
-            xAxisPoints = _drawColumnDataPoints.xAxisPoints,
-            calPoints = _drawColumnDataPoints.calPoints,
-            eachSpacing = _drawColumnDataPoints.eachSpacing;
-          opts.chartData.xAxisPoints = xAxisPoints;
-          opts.chartData.calPoints = calPoints;
-          opts.chartData.eachSpacing = eachSpacing;
-          drawYAxis(series, opts, config, context);
-          if (opts.enableMarkLine !== false && process === 1) {
-            drawMarkLine(opts, config, context);
-          }
-          drawLegend(opts.series, opts, config, context, opts.chartData);
-          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
-          drawCanvas(opts, context);
-        },
-        onAnimationFinish: function onAnimationFinish() {
-          _this.uevent.trigger('renderComplete');
-        }
-      });
-      break;
-    case 'mount':
-      this.animationInstance = new Animation({
-        timing: opts.timing,
-        duration: duration,
-        onProcess: function onProcess(process) {
-          context.clearRect(0, 0, opts.width, opts.height);
-          if (opts.rotate) {
-            contextRotate(context, opts);
-          }
-          drawYAxisGrid(categories, opts, config, context);
-          drawXAxis(categories, opts, config, context);
-          var _drawMountDataPoints = drawMountDataPoints(series, opts, config, context, process),
-            xAxisPoints = _drawMountDataPoints.xAxisPoints,
-            calPoints = _drawMountDataPoints.calPoints,
-            eachSpacing = _drawMountDataPoints.eachSpacing;
-          opts.chartData.xAxisPoints = xAxisPoints;
-          opts.chartData.calPoints = calPoints;
-          opts.chartData.eachSpacing = eachSpacing;
-          drawYAxis(series, opts, config, context);
-          if (opts.enableMarkLine !== false && process === 1) {
-            drawMarkLine(opts, config, context);
-          }
-          drawLegend(opts.series, opts, config, context, opts.chartData);
-          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
-          drawCanvas(opts, context);
-        },
-        onAnimationFinish: function onAnimationFinish() {
-          _this.uevent.trigger('renderComplete');
-        }
-      });
-      break;
-    case 'bar':
-      this.animationInstance = new Animation({
-        timing: opts.timing,
-        duration: duration,
-        onProcess: function onProcess(process) {
-          context.clearRect(0, 0, opts.width, opts.height);
-          if (opts.rotate) {
-            contextRotate(context, opts);
-          }
-          drawXAxis(categories, opts, config, context);
-          var _drawBarDataPoints = drawBarDataPoints(series, opts, config, context, process),
-            yAxisPoints = _drawBarDataPoints.yAxisPoints,
-            calPoints = _drawBarDataPoints.calPoints,
-            eachSpacing = _drawBarDataPoints.eachSpacing;
-          opts.chartData.yAxisPoints = yAxisPoints;
-          opts.chartData.xAxisPoints = opts.chartData.xAxisData.xAxisPoints;
-          opts.chartData.calPoints = calPoints;
-          opts.chartData.eachSpacing = eachSpacing;
-          drawYAxis(series, opts, config, context);
-          if (opts.enableMarkLine !== false && process === 1) {
-            drawMarkLine(opts, config, context);
-          }
-          drawLegend(opts.series, opts, config, context, opts.chartData);
-          drawToolTipBridge(opts, config, context, process, eachSpacing, yAxisPoints);
-          drawCanvas(opts, context);
-        },
-        onAnimationFinish: function onAnimationFinish() {
-          _this.uevent.trigger('renderComplete');
-        }
-      });
-      break;
-    case 'area':
-      this.animationInstance = new Animation({
-        timing: opts.timing,
-        duration: duration,
-        onProcess: function onProcess(process) {
-          context.clearRect(0, 0, opts.width, opts.height);
-          if (opts.rotate) {
-            contextRotate(context, opts);
-          }
-          drawYAxisGrid(categories, opts, config, context);
-          drawXAxis(categories, opts, config, context);
-          var _drawAreaDataPoints = drawAreaDataPoints(series, opts, config, context, process),
-            xAxisPoints = _drawAreaDataPoints.xAxisPoints,
-            calPoints = _drawAreaDataPoints.calPoints,
-            eachSpacing = _drawAreaDataPoints.eachSpacing;
-          opts.chartData.xAxisPoints = xAxisPoints;
-          opts.chartData.calPoints = calPoints;
-          opts.chartData.eachSpacing = eachSpacing;
-          drawYAxis(series, opts, config, context);
-          if (opts.enableMarkLine !== false && process === 1) {
-            drawMarkLine(opts, config, context);
-          }
-          drawLegend(opts.series, opts, config, context, opts.chartData);
-          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
-          drawCanvas(opts, context);
-        },
-        onAnimationFinish: function onAnimationFinish() {
-          _this.uevent.trigger('renderComplete');
-        }
-      });
-      break;
-    case 'ring':
-      this.animationInstance = new Animation({
-        timing: opts.timing,
-        duration: duration,
-        onProcess: function onProcess(process) {
-          context.clearRect(0, 0, opts.width, opts.height);
-          if (opts.rotate) {
-            contextRotate(context, opts);
-          }
-          opts.chartData.pieData = drawPieDataPoints(series, opts, config, context, process);
-          drawLegend(opts.series, opts, config, context, opts.chartData);
-          drawToolTipBridge(opts, config, context, process);
-          drawCanvas(opts, context);
-        },
-        onAnimationFinish: function onAnimationFinish() {
-          _this.uevent.trigger('renderComplete');
-        }
-      });
-      break;
-    case 'pie':
-      this.animationInstance = new Animation({
-        timing: opts.timing,
-        duration: duration,
-        onProcess: function onProcess(process) {
-          context.clearRect(0, 0, opts.width, opts.height);
-          if (opts.rotate) {
-            contextRotate(context, opts);
-          }
-          opts.chartData.pieData = drawPieDataPoints(series, opts, config, context, process);
-          drawLegend(opts.series, opts, config, context, opts.chartData);
-          drawToolTipBridge(opts, config, context, process);
-          drawCanvas(opts, context);
-        },
-        onAnimationFinish: function onAnimationFinish() {
-          _this.uevent.trigger('renderComplete');
-        }
-      });
-      break;
-    case 'rose':
-      this.animationInstance = new Animation({
-        timing: opts.timing,
-        duration: duration,
-        onProcess: function onProcess(process) {
-          context.clearRect(0, 0, opts.width, opts.height);
-          if (opts.rotate) {
-            contextRotate(context, opts);
-          }
-          opts.chartData.pieData = drawRoseDataPoints(series, opts, config, context, process);
-          drawLegend(opts.series, opts, config, context, opts.chartData);
-          drawToolTipBridge(opts, config, context, process);
-          drawCanvas(opts, context);
-        },
-        onAnimationFinish: function onAnimationFinish() {
-          _this.uevent.trigger('renderComplete');
-        }
-      });
-      break;
-    case 'radar':
-      this.animationInstance = new Animation({
-        timing: opts.timing,
-        duration: duration,
-        onProcess: function onProcess(process) {
-          context.clearRect(0, 0, opts.width, opts.height);
-          if (opts.rotate) {
-            contextRotate(context, opts);
-          }
-          opts.chartData.radarData = drawRadarDataPoints(series, opts, config, context, process);
-          drawLegend(opts.series, opts, config, context, opts.chartData);
-          drawToolTipBridge(opts, config, context, process);
-          drawCanvas(opts, context);
-        },
-        onAnimationFinish: function onAnimationFinish() {
-          _this.uevent.trigger('renderComplete');
-        }
-      });
-      break;
-    case 'arcbar':
-      this.animationInstance = new Animation({
-        timing: opts.timing,
-        duration: duration,
-        onProcess: function onProcess(process) {
-          context.clearRect(0, 0, opts.width, opts.height);
-          if (opts.rotate) {
-            contextRotate(context, opts);
-          }
-          opts.chartData.arcbarData = drawArcbarDataPoints(series, opts, config, context, process);
-          drawCanvas(opts, context);
-        },
-        onAnimationFinish: function onAnimationFinish() {
-          _this.uevent.trigger('renderComplete');
-        }
-      });
-      break;
-    case 'gauge':
-      this.animationInstance = new Animation({
-        timing: opts.timing,
-        duration: duration,
-        onProcess: function onProcess(process) {
-          context.clearRect(0, 0, opts.width, opts.height);
-          if (opts.rotate) {
-            contextRotate(context, opts);
-          }
-          opts.chartData.gaugeData = drawGaugeDataPoints(categories, series, opts, config, context, process);
-          drawCanvas(opts, context);
-        },
-        onAnimationFinish: function onAnimationFinish() {
-          _this.uevent.trigger('renderComplete');
-        }
-      });
-      break;
-    case 'candle':
-      this.animationInstance = new Animation({
-        timing: opts.timing,
-        duration: duration,
-        onProcess: function onProcess(process) {
-          context.clearRect(0, 0, opts.width, opts.height);
-          if (opts.rotate) {
-            contextRotate(context, opts);
-          }
-          drawYAxisGrid(categories, opts, config, context);
-          drawXAxis(categories, opts, config, context);
-          var _drawCandleDataPoints = drawCandleDataPoints(series, seriesMA, opts, config, context, process),
-            xAxisPoints = _drawCandleDataPoints.xAxisPoints,
-            calPoints = _drawCandleDataPoints.calPoints,
-            eachSpacing = _drawCandleDataPoints.eachSpacing;
-          opts.chartData.xAxisPoints = xAxisPoints;
-          opts.chartData.calPoints = calPoints;
-          opts.chartData.eachSpacing = eachSpacing;
-          drawYAxis(series, opts, config, context);
-          if (opts.enableMarkLine !== false && process === 1) {
-            drawMarkLine(opts, config, context);
-          }
-          if (seriesMA) {
-            drawLegend(seriesMA, opts, config, context, opts.chartData);
-          } else {
-            drawLegend(opts.series, opts, config, context, opts.chartData);
-          }
-          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
-          drawCanvas(opts, context);
-        },
-        onAnimationFinish: function onAnimationFinish() {
-          _this.uevent.trigger('renderComplete');
-        }
-      });
-      break;
-  }
+	var _this = this;
+	var series = opts.series;
+	//兼容ECharts饼图类数据格式
+	if (type === 'pie' || type === 'ring' || type === 'mount' || type === 'rose' || type === 'funnel') {
+		series = fixPieSeries(series, opts, config);
+	}
+	var categories = opts.categories;
+	if (type === 'mount') {
+		categories = [];
+		for (let j = 0; j < series.length; j++) {
+			if (series[j].show !== false) categories.push(series[j].name)
+		}
+		opts.categories = categories;
+	}
+	series = fillSeries(series, opts, config);
+	var duration = opts.animation ? opts.duration : 0;
+	_this.animationInstance && _this.animationInstance.stop();
+	var seriesMA = null;
+	if (type == 'candle') {
+		let average = assign({}, opts.extra.candle.average);
+		if (average.show) {
+			seriesMA = calCandleMA(average.day, average.name, average.color, series[0].data);
+			seriesMA = fillSeries(seriesMA, opts, config);
+			opts.seriesMA = seriesMA;
+		} else if (opts.seriesMA) {
+			seriesMA = opts.seriesMA = fillSeries(opts.seriesMA, opts, config);
+		} else {
+			seriesMA = series;
+		}
+	} else {
+		seriesMA = series;
+	}
+	/* 过滤掉show=false的series */
+	opts._series_ = series = filterSeries(series);
+	//重新计算图表区域
+	opts.area = new Array(4);
+	//复位绘图区域
+	for (let j = 0; j < 4; j++) {
+		opts.area[j] = opts.padding[j] * opts.pix;
+	}
+	//通过计算三大区域：图例、X轴、Y轴的大小，确定绘图区域
+	var _calLegendData = calLegendData(seriesMA, opts, config, opts.chartData, context),
+		legendHeight = _calLegendData.area.wholeHeight,
+		legendWidth = _calLegendData.area.wholeWidth;
+
+	switch (opts.legend.position) {
+		case 'top':
+			opts.area[0] += legendHeight;
+			break;
+		case 'bottom':
+			opts.area[2] += legendHeight;
+			break;
+		case 'left':
+			opts.area[3] += legendWidth;
+			break;
+		case 'right':
+			opts.area[1] += legendWidth;
+			break;
+	}
+
+	let _calYAxisData = {},
+		yAxisWidth = 0;
+	if (opts.type === 'line' || opts.type === 'column' || opts.type === 'mount' || opts.type === 'area' || opts.type ===
+		'mix' || opts.type === 'candle' || opts.type === 'scatter' || opts.type === 'bubble' || opts.type === 'bar') {
+		_calYAxisData = calYAxisData(series, opts, config, context);
+		yAxisWidth = _calYAxisData.yAxisWidth;
+		//如果显示Y轴标题
+		if (opts.yAxis.showTitle) {
+			let maxTitleHeight = 0;
+			for (let i = 0; i < opts.yAxis.data.length; i++) {
+				maxTitleHeight = Math.max(maxTitleHeight, opts.yAxis.data[i].titleFontSize ? opts.yAxis.data[i].titleFontSize *
+					opts.pix : config.fontSize)
+			}
+			opts.area[0] += maxTitleHeight;
+		}
+		let rightIndex = 0,
+			leftIndex = 0;
+		//计算主绘图区域左右位置
+		for (let i = 0; i < yAxisWidth.length; i++) {
+			if (yAxisWidth[i].position == 'left') {
+				if (leftIndex > 0) {
+					opts.area[3] += yAxisWidth[i].width + opts.yAxis.padding * opts.pix;
+				} else {
+					opts.area[3] += yAxisWidth[i].width;
+				}
+				leftIndex += 1;
+			} else if (yAxisWidth[i].position == 'right') {
+				if (rightIndex > 0) {
+					opts.area[1] += yAxisWidth[i].width + opts.yAxis.padding * opts.pix;
+				} else {
+					opts.area[1] += yAxisWidth[i].width;
+				}
+				rightIndex += 1;
+			}
+		}
+	} else {
+		config.yAxisWidth = yAxisWidth;
+	}
+	opts.chartData.yAxisData = _calYAxisData;
+
+	if (opts.categories && opts.categories.length && opts.type !== 'radar' && opts.type !== 'gauge' && opts.type !==
+		'bar') {
+		opts.chartData.xAxisData = getXAxisPoints(opts.categories, opts, config);
+		let _calCategoriesData = calCategoriesData(opts.categories, opts, config, opts.chartData.xAxisData.eachSpacing,
+				context),
+			xAxisHeight = _calCategoriesData.xAxisHeight,
+			angle = _calCategoriesData.angle;
+		config.xAxisHeight = xAxisHeight;
+		config._xAxisTextAngle_ = angle;
+		opts.area[2] += xAxisHeight;
+		opts.chartData.categoriesData = _calCategoriesData;
+	} else {
+		if (opts.type === 'line' || opts.type === 'area' || opts.type === 'scatter' || opts.type === 'bubble' || opts
+			.type === 'bar') {
+			opts.chartData.xAxisData = calXAxisData(series, opts, config, context);
+			categories = opts.chartData.xAxisData.rangesFormat;
+			let _calCategoriesData = calCategoriesData(categories, opts, config, opts.chartData.xAxisData.eachSpacing,
+					context),
+				xAxisHeight = _calCategoriesData.xAxisHeight,
+				angle = _calCategoriesData.angle;
+			config.xAxisHeight = xAxisHeight;
+			config._xAxisTextAngle_ = angle;
+			opts.area[2] += xAxisHeight;
+			opts.chartData.categoriesData = _calCategoriesData;
+		} else {
+			opts.chartData.xAxisData = {
+				xAxisPoints: []
+			};
+		}
+	}
+
+	//计算右对齐偏移距离
+	if (opts.enableScroll && opts.xAxis.scrollAlign == 'right' && opts._scrollDistance_ === undefined) {
+		let offsetLeft = 0,
+			xAxisPoints = opts.chartData.xAxisData.xAxisPoints,
+			startX = opts.chartData.xAxisData.startX,
+			endX = opts.chartData.xAxisData.endX,
+			eachSpacing = opts.chartData.xAxisData.eachSpacing;
+		let totalWidth = eachSpacing * (xAxisPoints.length - 1);
+		let screenWidth = endX - startX;
+		offsetLeft = screenWidth - totalWidth;
+		_this.scrollOption.currentOffset = offsetLeft;
+		_this.scrollOption.startTouchX = offsetLeft;
+		_this.scrollOption.distance = 0;
+		_this.scrollOption.lastMoveTime = 0;
+		opts._scrollDistance_ = offsetLeft;
+	}
+
+	if (type === 'pie' || type === 'ring' || type === 'rose') {
+		config._pieTextMaxLength_ = opts.dataLabel === false ? 0 : getPieTextMaxLength(seriesMA, config, context, opts);
+	}
+
+	switch (type) {
+		case 'word':
+			this.animationInstance = new Animation({
+				timing: opts.timing,
+				duration: duration,
+				onProcess: function(process) {
+					context.clearRect(0, 0, opts.width, opts.height);
+					if (opts.rotate) {
+						contextRotate(context, opts);
+					}
+					drawWordCloudDataPoints(series, opts, config, context, process);
+					drawCanvas(opts, context);
+				},
+				onAnimationFinish: function onAnimationFinish() {
+					_this.uevent.trigger('renderComplete');
+				}
+			});
+			break;
+		case 'map':
+			context.clearRect(0, 0, opts.width, opts.height);
+			drawMapDataPoints(series, opts, config, context);
+			setTimeout(() => {
+				this.uevent.trigger('renderComplete');
+			}, 50)
+			break;
+		case 'funnel':
+			this.animationInstance = new Animation({
+				timing: opts.timing,
+				duration: duration,
+				onProcess: function(process) {
+					context.clearRect(0, 0, opts.width, opts.height);
+					if (opts.rotate) {
+						contextRotate(context, opts);
+					}
+					opts.chartData.funnelData = drawFunnelDataPoints(series, opts, config, context, process);
+					drawLegend(opts.series, opts, config, context, opts.chartData);
+					drawToolTipBridge(opts, config, context, process);
+					drawCanvas(opts, context);
+				},
+				onAnimationFinish: function onAnimationFinish() {
+					_this.uevent.trigger('renderComplete');
+				}
+			});
+			break;
+		case 'line':
+			this.animationInstance = new Animation({
+				timing: opts.timing,
+				duration: duration,
+				onProcess: function onProcess(process) {
+					context.clearRect(0, 0, opts.width, opts.height);
+					if (opts.rotate) {
+						contextRotate(context, opts);
+					}
+					drawYAxisGrid(categories, opts, config, context);
+					drawXAxis(categories, opts, config, context);
+					var _drawLineDataPoints = drawLineDataPoints(series, opts, config, context, process),
+						xAxisPoints = _drawLineDataPoints.xAxisPoints,
+						calPoints = _drawLineDataPoints.calPoints,
+						eachSpacing = _drawLineDataPoints.eachSpacing;
+					opts.chartData.xAxisPoints = xAxisPoints;
+					opts.chartData.calPoints = calPoints;
+					opts.chartData.eachSpacing = eachSpacing;
+					drawYAxis(series, opts, config, context);
+					if (opts.enableMarkLine !== false && process === 1) {
+						drawMarkLine(opts, config, context);
+					}
+					drawLegend(opts.series, opts, config, context, opts.chartData);
+					drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+					drawCanvas(opts, context);
+				},
+				onAnimationFinish: function onAnimationFinish() {
+					_this.uevent.trigger('renderComplete');
+				}
+			});
+			break;
+		case 'scatter':
+			this.animationInstance = new Animation({
+				timing: opts.timing,
+				duration: duration,
+				onProcess: function onProcess(process) {
+					context.clearRect(0, 0, opts.width, opts.height);
+					if (opts.rotate) {
+						contextRotate(context, opts);
+					}
+					drawYAxisGrid(categories, opts, config, context);
+					drawXAxis(categories, opts, config, context);
+					var _drawScatterDataPoints = drawScatterDataPoints(series, opts, config, context, process),
+						xAxisPoints = _drawScatterDataPoints.xAxisPoints,
+						calPoints = _drawScatterDataPoints.calPoints,
+						eachSpacing = _drawScatterDataPoints.eachSpacing;
+					opts.chartData.xAxisPoints = xAxisPoints;
+					opts.chartData.calPoints = calPoints;
+					opts.chartData.eachSpacing = eachSpacing;
+					drawYAxis(series, opts, config, context);
+					if (opts.enableMarkLine !== false && process === 1) {
+						drawMarkLine(opts, config, context);
+					}
+					drawLegend(opts.series, opts, config, context, opts.chartData);
+					drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+					drawCanvas(opts, context);
+				},
+				onAnimationFinish: function onAnimationFinish() {
+					_this.uevent.trigger('renderComplete');
+				}
+			});
+			break;
+		case 'bubble':
+			this.animationInstance = new Animation({
+				timing: opts.timing,
+				duration: duration,
+				onProcess: function onProcess(process) {
+					context.clearRect(0, 0, opts.width, opts.height);
+					if (opts.rotate) {
+						contextRotate(context, opts);
+					}
+					drawYAxisGrid(categories, opts, config, context);
+					drawXAxis(categories, opts, config, context);
+					var _drawBubbleDataPoints = drawBubbleDataPoints(series, opts, config, context, process),
+						xAxisPoints = _drawBubbleDataPoints.xAxisPoints,
+						calPoints = _drawBubbleDataPoints.calPoints,
+						eachSpacing = _drawBubbleDataPoints.eachSpacing;
+					opts.chartData.xAxisPoints = xAxisPoints;
+					opts.chartData.calPoints = calPoints;
+					opts.chartData.eachSpacing = eachSpacing;
+					drawYAxis(series, opts, config, context);
+					if (opts.enableMarkLine !== false && process === 1) {
+						drawMarkLine(opts, config, context);
+					}
+					drawLegend(opts.series, opts, config, context, opts.chartData);
+					drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+					drawCanvas(opts, context);
+				},
+				onAnimationFinish: function onAnimationFinish() {
+					_this.uevent.trigger('renderComplete');
+				}
+			});
+			break;
+		case 'mix':
+			this.animationInstance = new Animation({
+				timing: opts.timing,
+				duration: duration,
+				onProcess: function onProcess(process) {
+					context.clearRect(0, 0, opts.width, opts.height);
+					if (opts.rotate) {
+						contextRotate(context, opts);
+					}
+					drawYAxisGrid(categories, opts, config, context);
+					drawXAxis(categories, opts, config, context);
+					var _drawMixDataPoints = drawMixDataPoints(series, opts, config, context, process),
+						xAxisPoints = _drawMixDataPoints.xAxisPoints,
+						calPoints = _drawMixDataPoints.calPoints,
+						eachSpacing = _drawMixDataPoints.eachSpacing;
+					opts.chartData.xAxisPoints = xAxisPoints;
+					opts.chartData.calPoints = calPoints;
+					opts.chartData.eachSpacing = eachSpacing;
+					drawYAxis(series, opts, config, context);
+					if (opts.enableMarkLine !== false && process === 1) {
+						drawMarkLine(opts, config, context);
+					}
+					drawLegend(opts.series, opts, config, context, opts.chartData);
+					drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+					drawCanvas(opts, context);
+				},
+				onAnimationFinish: function onAnimationFinish() {
+					_this.uevent.trigger('renderComplete');
+				}
+			});
+			break;
+		case 'column':
+			this.animationInstance = new Animation({
+				timing: opts.timing,
+				duration: duration,
+				onProcess: function onProcess(process) {
+					context.clearRect(0, 0, opts.width, opts.height);
+					if (opts.rotate) {
+						contextRotate(context, opts);
+					}
+					drawYAxisGrid(categories, opts, config, context);
+					drawXAxis(categories, opts, config, context);
+					var _drawColumnDataPoints = drawColumnDataPoints(series, opts, config, context, process),
+						xAxisPoints = _drawColumnDataPoints.xAxisPoints,
+						calPoints = _drawColumnDataPoints.calPoints,
+						eachSpacing = _drawColumnDataPoints.eachSpacing;
+					opts.chartData.xAxisPoints = xAxisPoints;
+					opts.chartData.calPoints = calPoints;
+					opts.chartData.eachSpacing = eachSpacing;
+					drawYAxis(series, opts, config, context);
+					if (opts.enableMarkLine !== false && process === 1) {
+						drawMarkLine(opts, config, context);
+					}
+					drawLegend(opts.series, opts, config, context, opts.chartData);
+					drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+					drawCanvas(opts, context);
+				},
+				onAnimationFinish: function onAnimationFinish() {
+					_this.uevent.trigger('renderComplete');
+				}
+			});
+			break;
+		case 'mount':
+			this.animationInstance = new Animation({
+				timing: opts.timing,
+				duration: duration,
+				onProcess: function onProcess(process) {
+					context.clearRect(0, 0, opts.width, opts.height);
+					if (opts.rotate) {
+						contextRotate(context, opts);
+					}
+					drawYAxisGrid(categories, opts, config, context);
+					drawXAxis(categories, opts, config, context);
+					var _drawMountDataPoints = drawMountDataPoints(series, opts, config, context, process),
+						xAxisPoints = _drawMountDataPoints.xAxisPoints,
+						calPoints = _drawMountDataPoints.calPoints,
+						eachSpacing = _drawMountDataPoints.eachSpacing;
+					opts.chartData.xAxisPoints = xAxisPoints;
+					opts.chartData.calPoints = calPoints;
+					opts.chartData.eachSpacing = eachSpacing;
+					drawYAxis(series, opts, config, context);
+					if (opts.enableMarkLine !== false && process === 1) {
+						drawMarkLine(opts, config, context);
+					}
+					drawLegend(opts.series, opts, config, context, opts.chartData);
+					drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+					drawCanvas(opts, context);
+				},
+				onAnimationFinish: function onAnimationFinish() {
+					_this.uevent.trigger('renderComplete');
+				}
+			});
+			break;
+		case 'bar':
+			this.animationInstance = new Animation({
+				timing: opts.timing,
+				duration: duration,
+				onProcess: function onProcess(process) {
+					context.clearRect(0, 0, opts.width, opts.height);
+					if (opts.rotate) {
+						contextRotate(context, opts);
+					}
+					drawXAxis(categories, opts, config, context);
+					var _drawBarDataPoints = drawBarDataPoints(series, opts, config, context, process),
+						yAxisPoints = _drawBarDataPoints.yAxisPoints,
+						calPoints = _drawBarDataPoints.calPoints,
+						eachSpacing = _drawBarDataPoints.eachSpacing;
+					opts.chartData.yAxisPoints = yAxisPoints;
+					opts.chartData.xAxisPoints = opts.chartData.xAxisData.xAxisPoints;
+					opts.chartData.calPoints = calPoints;
+					opts.chartData.eachSpacing = eachSpacing;
+					drawYAxis(series, opts, config, context);
+					if (opts.enableMarkLine !== false && process === 1) {
+						drawMarkLine(opts, config, context);
+					}
+					drawLegend(opts.series, opts, config, context, opts.chartData);
+					drawToolTipBridge(opts, config, context, process, eachSpacing, yAxisPoints);
+					drawCanvas(opts, context);
+				},
+				onAnimationFinish: function onAnimationFinish() {
+					_this.uevent.trigger('renderComplete');
+				}
+			});
+			break;
+		case 'area':
+			this.animationInstance = new Animation({
+				timing: opts.timing,
+				duration: duration,
+				onProcess: function onProcess(process) {
+					context.clearRect(0, 0, opts.width, opts.height);
+					if (opts.rotate) {
+						contextRotate(context, opts);
+					}
+					drawYAxisGrid(categories, opts, config, context);
+					drawXAxis(categories, opts, config, context);
+					var _drawAreaDataPoints = drawAreaDataPoints(series, opts, config, context, process),
+						xAxisPoints = _drawAreaDataPoints.xAxisPoints,
+						calPoints = _drawAreaDataPoints.calPoints,
+						eachSpacing = _drawAreaDataPoints.eachSpacing;
+					opts.chartData.xAxisPoints = xAxisPoints;
+					opts.chartData.calPoints = calPoints;
+					opts.chartData.eachSpacing = eachSpacing;
+					drawYAxis(series, opts, config, context);
+					if (opts.enableMarkLine !== false && process === 1) {
+						drawMarkLine(opts, config, context);
+					}
+					drawLegend(opts.series, opts, config, context, opts.chartData);
+					drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+					drawCanvas(opts, context);
+				},
+				onAnimationFinish: function onAnimationFinish() {
+					_this.uevent.trigger('renderComplete');
+				}
+			});
+			break;
+		case 'ring':
+			this.animationInstance = new Animation({
+				timing: opts.timing,
+				duration: duration,
+				onProcess: function onProcess(process) {
+					context.clearRect(0, 0, opts.width, opts.height);
+					if (opts.rotate) {
+						contextRotate(context, opts);
+					}
+					opts.chartData.pieData = drawPieDataPoints(series, opts, config, context, process);
+					drawLegend(opts.series, opts, config, context, opts.chartData);
+					drawToolTipBridge(opts, config, context, process);
+					drawCanvas(opts, context);
+				},
+				onAnimationFinish: function onAnimationFinish() {
+					_this.uevent.trigger('renderComplete');
+				}
+			});
+			break;
+		case 'pie':
+			this.animationInstance = new Animation({
+				timing: opts.timing,
+				duration: duration,
+				onProcess: function onProcess(process) {
+					context.clearRect(0, 0, opts.width, opts.height);
+					if (opts.rotate) {
+						contextRotate(context, opts);
+					}
+					opts.chartData.pieData = drawPieDataPoints(series, opts, config, context, process);
+					drawLegend(opts.series, opts, config, context, opts.chartData);
+					drawToolTipBridge(opts, config, context, process);
+					drawCanvas(opts, context);
+				},
+				onAnimationFinish: function onAnimationFinish() {
+					_this.uevent.trigger('renderComplete');
+				}
+			});
+			break;
+		case 'rose':
+			this.animationInstance = new Animation({
+				timing: opts.timing,
+				duration: duration,
+				onProcess: function onProcess(process) {
+					context.clearRect(0, 0, opts.width, opts.height);
+					if (opts.rotate) {
+						contextRotate(context, opts);
+					}
+					opts.chartData.pieData = drawRoseDataPoints(series, opts, config, context, process);
+					drawLegend(opts.series, opts, config, context, opts.chartData);
+					drawToolTipBridge(opts, config, context, process);
+					drawCanvas(opts, context);
+				},
+				onAnimationFinish: function onAnimationFinish() {
+					_this.uevent.trigger('renderComplete');
+				}
+			});
+			break;
+		case 'radar':
+			this.animationInstance = new Animation({
+				timing: opts.timing,
+				duration: duration,
+				onProcess: function onProcess(process) {
+					context.clearRect(0, 0, opts.width, opts.height);
+					if (opts.rotate) {
+						contextRotate(context, opts);
+					}
+					opts.chartData.radarData = drawRadarDataPoints(series, opts, config, context, process);
+					drawLegend(opts.series, opts, config, context, opts.chartData);
+					drawToolTipBridge(opts, config, context, process);
+					drawCanvas(opts, context);
+				},
+				onAnimationFinish: function onAnimationFinish() {
+					_this.uevent.trigger('renderComplete');
+				}
+			});
+			break;
+		case 'arcbar':
+			this.animationInstance = new Animation({
+				timing: opts.timing,
+				duration: duration,
+				onProcess: function onProcess(process) {
+					context.clearRect(0, 0, opts.width, opts.height);
+					if (opts.rotate) {
+						contextRotate(context, opts);
+					}
+					opts.chartData.arcbarData = drawArcbarDataPoints(series, opts, config, context, process);
+					drawCanvas(opts, context);
+				},
+				onAnimationFinish: function onAnimationFinish() {
+					_this.uevent.trigger('renderComplete');
+				}
+			});
+			break;
+		case 'gauge':
+			this.animationInstance = new Animation({
+				timing: opts.timing,
+				duration: duration,
+				onProcess: function onProcess(process) {
+					context.clearRect(0, 0, opts.width, opts.height);
+					if (opts.rotate) {
+						contextRotate(context, opts);
+					}
+					opts.chartData.gaugeData = drawGaugeDataPoints(categories, series, opts, config, context, process);
+					drawCanvas(opts, context);
+				},
+				onAnimationFinish: function onAnimationFinish() {
+					_this.uevent.trigger('renderComplete');
+				}
+			});
+			break;
+		case 'candle':
+			this.animationInstance = new Animation({
+				timing: opts.timing,
+				duration: duration,
+				onProcess: function onProcess(process) {
+					context.clearRect(0, 0, opts.width, opts.height);
+					if (opts.rotate) {
+						contextRotate(context, opts);
+					}
+					drawYAxisGrid(categories, opts, config, context);
+					drawXAxis(categories, opts, config, context);
+					var _drawCandleDataPoints = drawCandleDataPoints(series, seriesMA, opts, config, context, process),
+						xAxisPoints = _drawCandleDataPoints.xAxisPoints,
+						calPoints = _drawCandleDataPoints.calPoints,
+						eachSpacing = _drawCandleDataPoints.eachSpacing;
+					opts.chartData.xAxisPoints = xAxisPoints;
+					opts.chartData.calPoints = calPoints;
+					opts.chartData.eachSpacing = eachSpacing;
+					drawYAxis(series, opts, config, context);
+					if (opts.enableMarkLine !== false && process === 1) {
+						drawMarkLine(opts, config, context);
+					}
+					if (seriesMA) {
+						drawLegend(seriesMA, opts, config, context, opts.chartData);
+					} else {
+						drawLegend(opts.series, opts, config, context, opts.chartData);
+					}
+					drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+					drawCanvas(opts, context);
+				},
+				onAnimationFinish: function onAnimationFinish() {
+					_this.uevent.trigger('renderComplete');
+				}
+			});
+			break;
+	}
 }
 
 function uChartsEvent() {
-  this.events = {};
+	this.events = {};
 }
 
 uChartsEvent.prototype.addEventListener = function(type, listener) {
-  this.events[type] = this.events[type] || [];
-  this.events[type].push(listener);
+	this.events[type] = this.events[type] || [];
+	this.events[type].push(listener);
 };
 
 uChartsEvent.prototype.delEventListener = function(type) {
-  this.events[type] = [];
+	this.events[type] = [];
 };
 
 uChartsEvent.prototype.trigger = function() {
-  for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-    args[_key] = arguments[_key];
-  }
-  var type = args[0];
-  var params = args.slice(1);
-  if (!!this.events[type]) {
-    this.events[type].forEach(function(listener) {
-      try {
-        listener.apply(null, params);
-      } catch (e) {
-          //console.log('[uCharts] '+e);
-      }
-    });
-  }
+	for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+		args[_key] = arguments[_key];
+	}
+	var type = args[0];
+	var params = args.slice(1);
+	if (!!this.events[type]) {
+		this.events[type].forEach(function(listener) {
+			try {
+				listener.apply(null, params);
+			} catch (e) {
+				//console.log('[uCharts] '+e);
+			}
+		});
+	}
 };
 
 var uCharts = function uCharts(opts) {
-  opts.pix = opts.pixelRatio ? opts.pixelRatio : 1;
-  opts.fontSize = opts.fontSize ? opts.fontSize : 13;
-  opts.fontColor = opts.fontColor ? opts.fontColor : config.fontColor;
-  if (opts.background == "" || opts.background == "none") {
-    opts.background = "#FFFFFF"
-  }
-  opts.title = assign({}, opts.title);
-  opts.subtitle = assign({}, opts.subtitle);
-  opts.duration = opts.duration ? opts.duration : 1000;
-  opts.yAxis = assign({}, {
-    data: [],
-    showTitle: false,
-    disabled: false,
-    disableGrid: false,
-    gridSet: 'number',
-    splitNumber: 5,
-    gridType: 'solid',
-    dashLength: 4 * opts.pix,
-    gridColor: '#cccccc',
-    padding: 10,
-    fontColor: '#666666'
-  }, opts.yAxis);
-  opts.xAxis = assign({}, {
-    rotateLabel: false,
-    rotateAngle:45,
-    disabled: false,
-    disableGrid: false,
-    splitNumber: 5,
-    calibration:false,
-    fontColor: '#666666',
-    fontSize: 13,
-    lineHeight: 20,
-    marginTop: 0,
-    gridType: 'solid',
-    dashLength: 4,
-    scrollAlign: 'left',
-    boundaryGap: 'center',
-    axisLine: true,
-    axisLineColor: '#cccccc',
-    titleFontSize: 13,
-    titleOffsetY: 0,
-    titleOffsetX: 0,
-    titleFontColor: '#666666'
-  }, opts.xAxis);
-  opts.xAxis.scrollPosition = opts.xAxis.scrollAlign;
-  opts.legend = assign({}, {
-    show: true,
-    position: 'bottom',
-    float: 'center',
-    backgroundColor: 'rgba(0,0,0,0)',
-    borderColor: 'rgba(0,0,0,0)',
-    borderWidth: 0,
-    padding: 5,
-    margin: 5,
-    itemGap: 10,
-    fontSize: opts.fontSize,
-    lineHeight: opts.fontSize,
-    fontColor: opts.fontColor,
-    formatter: {},
-    hiddenColor: '#CECECE'
-  }, opts.legend);
-  opts.extra = assign({
-    tooltip:{
-      legendShape: 'auto'
-    }
-  }, opts.extra);
-  opts.rotate = opts.rotate ? true : false;
-  opts.animation = opts.animation ? true : false;
-  opts.rotate = opts.rotate ? true : false;
-  opts.canvas2d = opts.canvas2d ? true : false;
-  
-  let config$$1 = assign({}, config);
-  config$$1.color = opts.color ? opts.color : config$$1.color;
-  if (opts.type == 'pie') {
-    config$$1.pieChartLinePadding = opts.dataLabel === false ? 0 : opts.extra.pie.labelWidth * opts.pix || config$$1.pieChartLinePadding * opts.pix;
-  }
-  if (opts.type == 'ring') {
-    config$$1.pieChartLinePadding = opts.dataLabel === false ? 0 : opts.extra.ring.labelWidth * opts.pix || config$$1.pieChartLinePadding * opts.pix;
-  }
-  if (opts.type == 'rose') {
-    config$$1.pieChartLinePadding = opts.dataLabel === false ? 0 : opts.extra.rose.labelWidth * opts.pix || config$$1.pieChartLinePadding * opts.pix;
-  }
-  config$$1.pieChartTextPadding = opts.dataLabel === false ? 0 : config$$1.pieChartTextPadding * opts.pix;
-
-  //屏幕旋转
-  config$$1.rotate = opts.rotate;
-  if (opts.rotate) {
-    let tempWidth = opts.width;
-    let tempHeight = opts.height;
-    opts.width = tempHeight;
-    opts.height = tempWidth;
-  }
-
-  //适配高分屏
-  opts.padding = opts.padding ? opts.padding : config$$1.padding;
-  config$$1.yAxisWidth = config.yAxisWidth * opts.pix;
-  config$$1.fontSize = opts.fontSize * opts.pix;
-  config$$1.titleFontSize = config.titleFontSize * opts.pix;
-  config$$1.subtitleFontSize = config.subtitleFontSize * opts.pix;
-  if(!opts.context){
-    throw new Error('[uCharts] 未获取到context！注意：v2.0版本后，需要自行获取canvas的绘图上下文并传入opts.context！');
-  }
-  this.context = opts.context;
-  if (!this.context.setTextAlign) {
-    this.context.setStrokeStyle = function(e) {
-      return this.strokeStyle = e;
-    }
-    this.context.setLineWidth = function(e) {
-      return this.lineWidth = e;
-    }
-    this.context.setLineCap = function(e) {
-      return this.lineCap = e;
-    }
-    this.context.setFontSize = function(e) {
-      return this.font = e + "px sans-serif";
-    }
-    this.context.setFillStyle = function(e) {
-      return this.fillStyle = e;
-    }
-    this.context.setTextAlign = function(e) {
-      return this.textAlign = e;
-    }
-    this.context.setTextBaseline = function(e) {
-      return this.textBaseline = e;
-    }
-    this.context.setShadow = function(offsetX,offsetY,blur,color) {
-      this.shadowColor = color;
-      this.shadowOffsetX = offsetX;
-      this.shadowOffsetY = offsetY;
-      this.shadowBlur = blur;
-    }
-    this.context.draw = function() {}
-  }
-  //兼容NVUEsetLineDash
-  if(!this.context.setLineDash){
-    this.context.setLineDash = function(e) {}
-  }
-  opts.chartData = {};
-  this.uevent = new uChartsEvent();
-  this.scrollOption = {
-    currentOffset: 0,
-    startTouchX: 0,
-    distance: 0,
-    lastMoveTime: 0
-  };
-  this.opts = opts;
-  this.config = config$$1;
-  drawCharts.call(this, opts.type, opts, config$$1, this.context);
+	opts.pix = opts.pixelRatio ? opts.pixelRatio : 1;
+	opts.fontSize = opts.fontSize ? opts.fontSize : 13;
+	opts.fontColor = opts.fontColor ? opts.fontColor : config.fontColor;
+	if (opts.background == "" || opts.background == "none") {
+		opts.background = "#FFFFFF"
+	}
+	opts.title = assign({}, opts.title);
+	opts.subtitle = assign({}, opts.subtitle);
+	opts.duration = opts.duration ? opts.duration : 1000;
+	opts.yAxis = assign({}, {
+		data: [],
+		showTitle: false,
+		disabled: false,
+		disableGrid: false,
+		gridSet: 'number',
+		splitNumber: 5,
+		gridType: 'solid',
+		dashLength: 4 * opts.pix,
+		gridColor: '#cccccc',
+		padding: 10,
+		fontColor: '#666666'
+	}, opts.yAxis);
+	opts.xAxis = assign({}, {
+		rotateLabel: false,
+		rotateAngle: 45,
+		disabled: false,
+		disableGrid: false,
+		splitNumber: 5,
+		calibration: false,
+		fontColor: '#666666',
+		fontSize: 13,
+		lineHeight: 20,
+		marginTop: 0,
+		gridType: 'solid',
+		dashLength: 4,
+		scrollAlign: 'left',
+		boundaryGap: 'center',
+		axisLine: true,
+		axisLineColor: '#cccccc',
+		titleFontSize: 13,
+		titleOffsetY: 0,
+		titleOffsetX: 0,
+		titleFontColor: '#666666'
+	}, opts.xAxis);
+	opts.xAxis.scrollPosition = opts.xAxis.scrollAlign;
+	opts.legend = assign({}, {
+		show: true,
+		position: 'bottom',
+		float: 'center',
+		backgroundColor: 'rgba(0,0,0,0)',
+		borderColor: 'rgba(0,0,0,0)',
+		borderWidth: 0,
+		padding: 5,
+		margin: 5,
+		itemGap: 10,
+		fontSize: opts.fontSize,
+		lineHeight: opts.fontSize,
+		fontColor: opts.fontColor,
+		formatter: {},
+		hiddenColor: '#CECECE'
+	}, opts.legend);
+	opts.extra = assign({
+		tooltip: {
+			legendShape: 'auto'
+		}
+	}, opts.extra);
+	opts.rotate = opts.rotate ? true : false;
+	opts.animation = opts.animation ? true : false;
+	opts.rotate = opts.rotate ? true : false;
+	opts.canvas2d = opts.canvas2d ? true : false;
+
+	let config$$1 = assign({}, config);
+	config$$1.color = opts.color ? opts.color : config$$1.color;
+	if (opts.type == 'pie') {
+		config$$1.pieChartLinePadding = opts.dataLabel === false ? 0 : opts.extra.pie.labelWidth * opts.pix || config$$1
+			.pieChartLinePadding * opts.pix;
+	}
+	if (opts.type == 'ring') {
+		config$$1.pieChartLinePadding = opts.dataLabel === false ? 0 : opts.extra.ring.labelWidth * opts.pix || config$$1
+			.pieChartLinePadding * opts.pix;
+	}
+	if (opts.type == 'rose') {
+		config$$1.pieChartLinePadding = opts.dataLabel === false ? 0 : opts.extra.rose.labelWidth * opts.pix || config$$1
+			.pieChartLinePadding * opts.pix;
+	}
+	config$$1.pieChartTextPadding = opts.dataLabel === false ? 0 : config$$1.pieChartTextPadding * opts.pix;
+
+	//屏幕旋转
+	config$$1.rotate = opts.rotate;
+	if (opts.rotate) {
+		let tempWidth = opts.width;
+		let tempHeight = opts.height;
+		opts.width = tempHeight;
+		opts.height = tempWidth;
+	}
+
+	//适配高分屏
+	opts.padding = opts.padding ? opts.padding : config$$1.padding;
+	config$$1.yAxisWidth = config.yAxisWidth * opts.pix;
+	config$$1.fontSize = opts.fontSize * opts.pix;
+	config$$1.titleFontSize = config.titleFontSize * opts.pix;
+	config$$1.subtitleFontSize = config.subtitleFontSize * opts.pix;
+	if (!opts.context) {
+		throw new Error('[uCharts] 未获取到context！注意：v2.0版本后，需要自行获取canvas的绘图上下文并传入opts.context！');
+	}
+	this.context = opts.context;
+	if (!this.context.setTextAlign) {
+		this.context.setStrokeStyle = function(e) {
+			return this.strokeStyle = e;
+		}
+		this.context.setLineWidth = function(e) {
+			return this.lineWidth = e;
+		}
+		this.context.setLineCap = function(e) {
+			return this.lineCap = e;
+		}
+		this.context.setFontSize = function(e) {
+			return this.font = e + "px sans-serif";
+		}
+		this.context.setFillStyle = function(e) {
+			return this.fillStyle = e;
+		}
+		this.context.setTextAlign = function(e) {
+			return this.textAlign = e;
+		}
+		this.context.setTextBaseline = function(e) {
+			return this.textBaseline = e;
+		}
+		this.context.setShadow = function(offsetX, offsetY, blur, color) {
+			this.shadowColor = color;
+			this.shadowOffsetX = offsetX;
+			this.shadowOffsetY = offsetY;
+			this.shadowBlur = blur;
+		}
+		this.context.draw = function() {}
+	}
+	//兼容NVUEsetLineDash
+	if (!this.context.setLineDash) {
+		this.context.setLineDash = function(e) {}
+	}
+	opts.chartData = {};
+	this.uevent = new uChartsEvent();
+	this.scrollOption = {
+		currentOffset: 0,
+		startTouchX: 0,
+		distance: 0,
+		lastMoveTime: 0
+	};
+	this.opts = opts;
+	this.config = config$$1;
+	drawCharts.call(this, opts.type, opts, config$$1, this.context);
 };
 
 uCharts.prototype.updateData = function() {
-  let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  this.opts = assign({}, this.opts, data);
-  this.opts.updateData = true;
-  let scrollPosition = data.scrollPosition || 'current';
-  switch (scrollPosition) {
-    case 'current':
-      this.opts._scrollDistance_ = this.scrollOption.currentOffset;
-      break;
-    case 'left':
-      this.opts._scrollDistance_ = 0;
-      this.scrollOption = {
-        currentOffset: 0,
-        startTouchX: 0,
-        distance: 0,
-        lastMoveTime: 0
-      };
-      break;
-    case 'right':
-      let _calYAxisData = calYAxisData(this.opts.series, this.opts, this.config, this.context), yAxisWidth = _calYAxisData.yAxisWidth;
-      this.config.yAxisWidth = yAxisWidth;
-      let offsetLeft = 0;
-      let _getXAxisPoints0 = getXAxisPoints(this.opts.categories, this.opts, this.config), xAxisPoints = _getXAxisPoints0.xAxisPoints,
-        startX = _getXAxisPoints0.startX,
-        endX = _getXAxisPoints0.endX,
-        eachSpacing = _getXAxisPoints0.eachSpacing;
-      let totalWidth = eachSpacing * (xAxisPoints.length - 1);
-      let screenWidth = endX - startX;
-      offsetLeft = screenWidth - totalWidth;
-      this.scrollOption = {
-        currentOffset: offsetLeft,
-        startTouchX: offsetLeft,
-        distance: 0,
-        lastMoveTime: 0
-      };
-      this.opts._scrollDistance_ = offsetLeft;
-      break;
-  }
-  drawCharts.call(this, this.opts.type, this.opts, this.config, this.context);
+	let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+	this.opts = assign({}, this.opts, data);
+	this.opts.updateData = true;
+	let scrollPosition = data.scrollPosition || 'current';
+	switch (scrollPosition) {
+		case 'current':
+			this.opts._scrollDistance_ = this.scrollOption.currentOffset;
+			break;
+		case 'left':
+			this.opts._scrollDistance_ = 0;
+			this.scrollOption = {
+				currentOffset: 0,
+				startTouchX: 0,
+				distance: 0,
+				lastMoveTime: 0
+			};
+			break;
+		case 'right':
+			let _calYAxisData = calYAxisData(this.opts.series, this.opts, this.config, this.context),
+				yAxisWidth = _calYAxisData.yAxisWidth;
+			this.config.yAxisWidth = yAxisWidth;
+			let offsetLeft = 0;
+			let _getXAxisPoints0 = getXAxisPoints(this.opts.categories, this.opts, this.config),
+				xAxisPoints = _getXAxisPoints0.xAxisPoints,
+				startX = _getXAxisPoints0.startX,
+				endX = _getXAxisPoints0.endX,
+				eachSpacing = _getXAxisPoints0.eachSpacing;
+			let totalWidth = eachSpacing * (xAxisPoints.length - 1);
+			let screenWidth = endX - startX;
+			offsetLeft = screenWidth - totalWidth;
+			this.scrollOption = {
+				currentOffset: offsetLeft,
+				startTouchX: offsetLeft,
+				distance: 0,
+				lastMoveTime: 0
+			};
+			this.opts._scrollDistance_ = offsetLeft;
+			break;
+	}
+	drawCharts.call(this, this.opts.type, this.opts, this.config, this.context);
 };
 
 uCharts.prototype.zoom = function() {
-  var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.opts.xAxis.itemCount;
-  if (this.opts.enableScroll !== true) {
-    console.log('[uCharts] 请启用滚动条后使用')
-    return;
-  }
-  //当前屏幕中间点
-  let centerPoint = Math.round(Math.abs(this.scrollOption.currentOffset) / this.opts.chartData.eachSpacing) + Math.round(this.opts.xAxis.itemCount / 2);
-  this.opts.animation = false;
-  this.opts.xAxis.itemCount = val.itemCount;
-  //重新计算x轴偏移距离
-  let _calYAxisData = calYAxisData(this.opts.series, this.opts, this.config, this.context),
-    yAxisWidth = _calYAxisData.yAxisWidth;
-  this.config.yAxisWidth = yAxisWidth;
-  let offsetLeft = 0;
-  let _getXAxisPoints0 = getXAxisPoints(this.opts.categories, this.opts, this.config),
-    xAxisPoints = _getXAxisPoints0.xAxisPoints,
-    startX = _getXAxisPoints0.startX,
-    endX = _getXAxisPoints0.endX,
-    eachSpacing = _getXAxisPoints0.eachSpacing;
-  let centerLeft = eachSpacing * centerPoint;
-  let screenWidth = endX - startX;
-  let MaxLeft = screenWidth - eachSpacing * (xAxisPoints.length - 1);
-  offsetLeft = screenWidth / 2 - centerLeft;
-  if (offsetLeft > 0) {
-    offsetLeft = 0;
-  }
-  if (offsetLeft < MaxLeft) {
-    offsetLeft = MaxLeft;
-  }
-  this.scrollOption = {
-    currentOffset: offsetLeft,
-    startTouchX: 0,
-    distance: 0,
-    lastMoveTime: 0
-  };
-  calValidDistance(this, offsetLeft, this.opts.chartData, this.config, this.opts);
-  this.opts._scrollDistance_ = offsetLeft;
-  drawCharts.call(this, this.opts.type, this.opts, this.config, this.context);
+	var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.opts.xAxis.itemCount;
+	if (this.opts.enableScroll !== true) {
+		console.log('[uCharts] 请启用滚动条后使用')
+		return;
+	}
+	//当前屏幕中间点
+	let centerPoint = Math.round(Math.abs(this.scrollOption.currentOffset) / this.opts.chartData.eachSpacing) + Math
+		.round(this.opts.xAxis.itemCount / 2);
+	this.opts.animation = false;
+	this.opts.xAxis.itemCount = val.itemCount;
+	//重新计算x轴偏移距离
+	let _calYAxisData = calYAxisData(this.opts.series, this.opts, this.config, this.context),
+		yAxisWidth = _calYAxisData.yAxisWidth;
+	this.config.yAxisWidth = yAxisWidth;
+	let offsetLeft = 0;
+	let _getXAxisPoints0 = getXAxisPoints(this.opts.categories, this.opts, this.config),
+		xAxisPoints = _getXAxisPoints0.xAxisPoints,
+		startX = _getXAxisPoints0.startX,
+		endX = _getXAxisPoints0.endX,
+		eachSpacing = _getXAxisPoints0.eachSpacing;
+	let centerLeft = eachSpacing * centerPoint;
+	let screenWidth = endX - startX;
+	let MaxLeft = screenWidth - eachSpacing * (xAxisPoints.length - 1);
+	offsetLeft = screenWidth / 2 - centerLeft;
+	if (offsetLeft > 0) {
+		offsetLeft = 0;
+	}
+	if (offsetLeft < MaxLeft) {
+		offsetLeft = MaxLeft;
+	}
+	this.scrollOption = {
+		currentOffset: offsetLeft,
+		startTouchX: 0,
+		distance: 0,
+		lastMoveTime: 0
+	};
+	calValidDistance(this, offsetLeft, this.opts.chartData, this.config, this.opts);
+	this.opts._scrollDistance_ = offsetLeft;
+	drawCharts.call(this, this.opts.type, this.opts, this.config, this.context);
 };
 
 uCharts.prototype.dobuleZoom = function(e) {
-  if (this.opts.enableScroll !== true) {
-    console.log('[uCharts] 请启用滚动条后使用')
-    return;
-  }
-  const tcs = e.changedTouches;
-  if (tcs.length < 2) {
-    return;
-  }
-  for (var i = 0; i < tcs.length; i++) {
-    tcs[i].x = tcs[i].x ? tcs[i].x : tcs[i].clientX;
-    tcs[i].y = tcs[i].y ? tcs[i].y : tcs[i].clientY;
-  }
-  const ntcs = [getTouches(tcs[0], this.opts, e),getTouches(tcs[1], this.opts, e)]; 
-  const xlength = Math.abs(ntcs[0].x - ntcs[1].x);
-  // 记录初始的两指之间的数据
-  if(!this.scrollOption.moveCount){
-    let cts0 = {changedTouches:[{x:tcs[0].x,y:this.opts.area[0] / this.opts.pix + 2}]};
-    let cts1 = {changedTouches:[{x:tcs[1].x,y:this.opts.area[0] / this.opts.pix + 2}]};
-    if(this.opts.rotate){
-      cts0 = {changedTouches:[{x:this.opts.height / this.opts.pix - this.opts.area[0] / this.opts.pix - 2,y:tcs[0].y}]};
-      cts1 = {changedTouches:[{x:this.opts.height / this.opts.pix - this.opts.area[0] / this.opts.pix - 2,y:tcs[1].y}]};
-    }
-    const moveCurrent1 = this.getCurrentDataIndex(cts0).index;
-    const moveCurrent2 = this.getCurrentDataIndex(cts1).index;
-    const moveCount = Math.abs(moveCurrent1 - moveCurrent2);
-    this.scrollOption.moveCount = moveCount;
-    this.scrollOption.moveCurrent1 = Math.min(moveCurrent1, moveCurrent2);
-    this.scrollOption.moveCurrent2 = Math.max(moveCurrent1, moveCurrent2);
-    return;
-  }
-  
-  let currentEachSpacing = xlength / this.scrollOption.moveCount;
-  let itemCount = (this.opts.width - this.opts.area[1] - this.opts.area[3]) / currentEachSpacing;
-  itemCount = itemCount <= 2 ? 2 : itemCount;
-  itemCount = itemCount >= this.opts.categories.length ? this.opts.categories.length : itemCount;
-  this.opts.animation = false;
-  this.opts.xAxis.itemCount = itemCount;
-  // 重新计算滚动条偏移距离
-  let offsetLeft = 0;
-  let _getXAxisPoints0 = getXAxisPoints(this.opts.categories, this.opts, this.config),
-    xAxisPoints = _getXAxisPoints0.xAxisPoints,
-    startX = _getXAxisPoints0.startX,
-    endX = _getXAxisPoints0.endX,
-    eachSpacing = _getXAxisPoints0.eachSpacing;
-  let currentLeft = eachSpacing * this.scrollOption.moveCurrent1;
-  let screenWidth = endX - startX;
-  let MaxLeft = screenWidth - eachSpacing * (xAxisPoints.length - 1);
-  offsetLeft = -currentLeft+Math.min(ntcs[0].x,ntcs[1].x)-this.opts.area[3]-eachSpacing;
-  if (offsetLeft > 0) {
-    offsetLeft = 0;
-  }
-  if (offsetLeft < MaxLeft) {
-    offsetLeft = MaxLeft;
-  }
-  this.scrollOption.currentOffset= offsetLeft;
-  this.scrollOption.startTouchX= 0;
-  this.scrollOption.distance=0;
-  calValidDistance(this, offsetLeft, this.opts.chartData, this.config, this.opts);
-  this.opts._scrollDistance_ = offsetLeft;
-  drawCharts.call(this, this.opts.type, this.opts, this.config, this.context);
+	if (this.opts.enableScroll !== true) {
+		console.log('[uCharts] 请启用滚动条后使用')
+		return;
+	}
+	const tcs = e.changedTouches;
+	if (tcs.length < 2) {
+		return;
+	}
+	for (var i = 0; i < tcs.length; i++) {
+		tcs[i].x = tcs[i].x ? tcs[i].x : tcs[i].clientX;
+		tcs[i].y = tcs[i].y ? tcs[i].y : tcs[i].clientY;
+	}
+	const ntcs = [getTouches(tcs[0], this.opts, e), getTouches(tcs[1], this.opts, e)];
+	const xlength = Math.abs(ntcs[0].x - ntcs[1].x);
+	// 记录初始的两指之间的数据
+	if (!this.scrollOption.moveCount) {
+		let cts0 = {
+			changedTouches: [{
+				x: tcs[0].x,
+				y: this.opts.area[0] / this.opts.pix + 2
+			}]
+		};
+		let cts1 = {
+			changedTouches: [{
+				x: tcs[1].x,
+				y: this.opts.area[0] / this.opts.pix + 2
+			}]
+		};
+		if (this.opts.rotate) {
+			cts0 = {
+				changedTouches: [{
+					x: this.opts.height / this.opts.pix - this.opts.area[0] / this.opts.pix - 2,
+					y: tcs[0].y
+				}]
+			};
+			cts1 = {
+				changedTouches: [{
+					x: this.opts.height / this.opts.pix - this.opts.area[0] / this.opts.pix - 2,
+					y: tcs[1].y
+				}]
+			};
+		}
+		const moveCurrent1 = this.getCurrentDataIndex(cts0).index;
+		const moveCurrent2 = this.getCurrentDataIndex(cts1).index;
+		const moveCount = Math.abs(moveCurrent1 - moveCurrent2);
+		this.scrollOption.moveCount = moveCount;
+		this.scrollOption.moveCurrent1 = Math.min(moveCurrent1, moveCurrent2);
+		this.scrollOption.moveCurrent2 = Math.max(moveCurrent1, moveCurrent2);
+		return;
+	}
+
+	let currentEachSpacing = xlength / this.scrollOption.moveCount;
+	let itemCount = (this.opts.width - this.opts.area[1] - this.opts.area[3]) / currentEachSpacing;
+	itemCount = itemCount <= 2 ? 2 : itemCount;
+	itemCount = itemCount >= this.opts.categories.length ? this.opts.categories.length : itemCount;
+	this.opts.animation = false;
+	this.opts.xAxis.itemCount = itemCount;
+	// 重新计算滚动条偏移距离
+	let offsetLeft = 0;
+	let _getXAxisPoints0 = getXAxisPoints(this.opts.categories, this.opts, this.config),
+		xAxisPoints = _getXAxisPoints0.xAxisPoints,
+		startX = _getXAxisPoints0.startX,
+		endX = _getXAxisPoints0.endX,
+		eachSpacing = _getXAxisPoints0.eachSpacing;
+	let currentLeft = eachSpacing * this.scrollOption.moveCurrent1;
+	let screenWidth = endX - startX;
+	let MaxLeft = screenWidth - eachSpacing * (xAxisPoints.length - 1);
+	offsetLeft = -currentLeft + Math.min(ntcs[0].x, ntcs[1].x) - this.opts.area[3] - eachSpacing;
+	if (offsetLeft > 0) {
+		offsetLeft = 0;
+	}
+	if (offsetLeft < MaxLeft) {
+		offsetLeft = MaxLeft;
+	}
+	this.scrollOption.currentOffset = offsetLeft;
+	this.scrollOption.startTouchX = 0;
+	this.scrollOption.distance = 0;
+	calValidDistance(this, offsetLeft, this.opts.chartData, this.config, this.opts);
+	this.opts._scrollDistance_ = offsetLeft;
+	drawCharts.call(this, this.opts.type, this.opts, this.config, this.context);
 }
 
 uCharts.prototype.stopAnimation = function() {
-  this.animationInstance && this.animationInstance.stop();
+	this.animationInstance && this.animationInstance.stop();
 };
 
 uCharts.prototype.addEventListener = function(type, listener) {
-  this.uevent.addEventListener(type, listener);
+	this.uevent.addEventListener(type, listener);
 };
 
 uCharts.prototype.delEventListener = function(type) {
-  this.uevent.delEventListener(type);
+	this.uevent.delEventListener(type);
 };
 
 uCharts.prototype.getCurrentDataIndex = function(e) {
-  var touches = null;
-  if (e.changedTouches) {
-    touches = e.changedTouches[0];
-  } else {
-    touches = e.mp.changedTouches[0];
-  }
-  if (touches) {
-    let _touches$ = getTouches(touches, this.opts, e);
-    if (this.opts.type === 'pie' || this.opts.type === 'ring') {
-      return findPieChartCurrentIndex({
-        x: _touches$.x,
-        y: _touches$.y
-      }, this.opts.chartData.pieData, this.opts);
-    } else if (this.opts.type === 'rose') {
-      return findRoseChartCurrentIndex({
-        x: _touches$.x,
-        y: _touches$.y
-      }, this.opts.chartData.pieData, this.opts);
-    } else if (this.opts.type === 'radar') {
-      return findRadarChartCurrentIndex({
-        x: _touches$.x,
-        y: _touches$.y
-      }, this.opts.chartData.radarData, this.opts.categories.length);
-    } else if (this.opts.type === 'funnel') {
-      return findFunnelChartCurrentIndex({
-        x: _touches$.x,
-        y: _touches$.y
-      }, this.opts.chartData.funnelData);
-    } else if (this.opts.type === 'map') {
-      return findMapChartCurrentIndex({
-        x: _touches$.x,
-        y: _touches$.y
-      }, this.opts);
-    } else if (this.opts.type === 'word') {
-      return findWordChartCurrentIndex({
-        x: _touches$.x,
-        y: _touches$.y
-      }, this.opts.chartData.wordCloudData);
-    } else if (this.opts.type === 'bar') {
-      return findBarChartCurrentIndex({
-        x: _touches$.x,
-        y: _touches$.y
-      }, this.opts.chartData.calPoints, this.opts, this.config, Math.abs(this.scrollOption.currentOffset));
-    } else {
-      return findCurrentIndex({
-        x: _touches$.x,
-        y: _touches$.y
-      }, this.opts.chartData.calPoints, this.opts, this.config, Math.abs(this.scrollOption.currentOffset));
-    }
-  }
-  return -1;
+	var touches = null;
+	if (e.changedTouches) {
+		touches = e.changedTouches[0];
+	} else {
+		touches = e.mp.changedTouches[0];
+	}
+	if (touches) {
+		let _touches$ = getTouches(touches, this.opts, e);
+		if (this.opts.type === 'pie' || this.opts.type === 'ring') {
+			return findPieChartCurrentIndex({
+				x: _touches$.x,
+				y: _touches$.y
+			}, this.opts.chartData.pieData, this.opts);
+		} else if (this.opts.type === 'rose') {
+			return findRoseChartCurrentIndex({
+				x: _touches$.x,
+				y: _touches$.y
+			}, this.opts.chartData.pieData, this.opts);
+		} else if (this.opts.type === 'radar') {
+			return findRadarChartCurrentIndex({
+				x: _touches$.x,
+				y: _touches$.y
+			}, this.opts.chartData.radarData, this.opts.categories.length);
+		} else if (this.opts.type === 'funnel') {
+			return findFunnelChartCurrentIndex({
+				x: _touches$.x,
+				y: _touches$.y
+			}, this.opts.chartData.funnelData);
+		} else if (this.opts.type === 'map') {
+			return findMapChartCurrentIndex({
+				x: _touches$.x,
+				y: _touches$.y
+			}, this.opts);
+		} else if (this.opts.type === 'word') {
+			return findWordChartCurrentIndex({
+				x: _touches$.x,
+				y: _touches$.y
+			}, this.opts.chartData.wordCloudData);
+		} else if (this.opts.type === 'bar') {
+			return findBarChartCurrentIndex({
+				x: _touches$.x,
+				y: _touches$.y
+			}, this.opts.chartData.calPoints, this.opts, this.config, Math.abs(this.scrollOption.currentOffset));
+		} else {
+			return findCurrentIndex({
+				x: _touches$.x,
+				y: _touches$.y
+			}, this.opts.chartData.calPoints, this.opts, this.config, Math.abs(this.scrollOption.currentOffset));
+		}
+	}
+	return -1;
 };
 
 uCharts.prototype.getLegendDataIndex = function(e) {
-  var touches = null;
-  if (e.changedTouches) {
-    touches = e.changedTouches[0];
-  } else {
-    touches = e.mp.changedTouches[0];
-  }
-  if (touches) {
-    let _touches$ = getTouches(touches, this.opts, e);
-    return findLegendIndex({
-      x: _touches$.x,
-      y: _touches$.y
-    }, this.opts.chartData.legendData);
-  }
-  return -1;
+	var touches = null;
+	if (e.changedTouches) {
+		touches = e.changedTouches[0];
+	} else {
+		touches = e.mp.changedTouches[0];
+	}
+	if (touches) {
+		let _touches$ = getTouches(touches, this.opts, e);
+		return findLegendIndex({
+			x: _touches$.x,
+			y: _touches$.y
+		}, this.opts.chartData.legendData);
+	}
+	return -1;
 };
 
 uCharts.prototype.touchLegend = function(e) {
-  var option = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var touches = null;
-  if (e.changedTouches) {
-    touches = e.changedTouches[0];
-  } else {
-    touches = e.mp.changedTouches[0];
-  }
-  if (touches) {
-    var _touches$ = getTouches(touches, this.opts, e);
-    var index = this.getLegendDataIndex(e);
-    if (index >= 0) {
-      if (this.opts.type == 'candle') {
-        this.opts.seriesMA[index].show = !this.opts.seriesMA[index].show;
-      } else {
-        this.opts.series[index].show = !this.opts.series[index].show;
-      }
-      this.opts.animation = option.animation ? true : false;
-      this.opts._scrollDistance_ = this.scrollOption.currentOffset;
-      drawCharts.call(this, this.opts.type, this.opts, this.config, this.context);
-    }
-  }
+	var option = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+	var touches = null;
+	if (e.changedTouches) {
+		touches = e.changedTouches[0];
+	} else {
+		touches = e.mp.changedTouches[0];
+	}
+	if (touches) {
+		var _touches$ = getTouches(touches, this.opts, e);
+		var index = this.getLegendDataIndex(e);
+		if (index >= 0) {
+			if (this.opts.type == 'candle') {
+				this.opts.seriesMA[index].show = !this.opts.seriesMA[index].show;
+			} else {
+				this.opts.series[index].show = !this.opts.series[index].show;
+			}
+			this.opts.animation = option.animation ? true : false;
+			this.opts._scrollDistance_ = this.scrollOption.currentOffset;
+			drawCharts.call(this, this.opts.type, this.opts, this.config, this.context);
+		}
+	}
 
 };
 
 uCharts.prototype.showToolTip = function(e) {
-  var option = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var touches = null;
-  if (e.changedTouches) {
-    touches = e.changedTouches[0];
-  } else {
-    touches = e.mp.changedTouches[0];
-  }
-  if (!touches) {
-    console.log("[uCharts] 未获取到event坐标信息");
-  }
-  var _touches$ = getTouches(touches, this.opts, e);
-  var currentOffset = this.scrollOption.currentOffset;
-  var opts = assign({}, this.opts, {
-    _scrollDistance_: currentOffset,
-    animation: false
-  });
-  if (this.opts.type === 'line' || this.opts.type === 'area' || this.opts.type === 'column' || this.opts.type === 'scatter' || this.opts.type === 'bubble') {
-    var current = this.getCurrentDataIndex(e);
-    var index = option.index == undefined ? current.index : option.index;
-    if (index > -1 || index.length>0) {
-      var seriesData = getSeriesDataItem(this.opts.series, index, current.group);
-      if (seriesData.length !== 0) {
-        var _getToolTipData = getToolTipData(seriesData, this.opts, index, current.group, this.opts.categories, option),
-          textList = _getToolTipData.textList,
-          offset = _getToolTipData.offset;
-        offset.y = _touches$.y;
-        opts.tooltip = {
-          textList: option.textList !== undefined ? option.textList : textList,
-          offset: option.offset !== undefined ? option.offset : offset,
-          option: option,
-          index: index,
-          group: current.group
-        };
-      }
-    }
-    drawCharts.call(this, opts.type, opts, this.config, this.context);
-  }
-  if (this.opts.type === 'mount') {
-    var index = option.index == undefined ? this.getCurrentDataIndex(e).index : option.index;
-    if (index > -1) {
-      var opts = assign({}, this.opts, {animation: false});
-      var seriesData = assign({}, opts._series_[index]);
-      var textList = [{
-        text: option.formatter ? option.formatter(seriesData, undefined, index, opts) : seriesData.name + ': ' + seriesData.data,
-        color: seriesData.color,
-        legendShape: this.opts.extra.tooltip.legendShape == 'auto' ? seriesData.legendShape : this.opts.extra.tooltip.legendShape
-      }];
-      var offset = {
-        x: opts.chartData.calPoints[index].x,
-        y: _touches$.y
-      };
-      opts.tooltip = {
-        textList: option.textList ? option.textList : textList,
-        offset: option.offset !== undefined ? option.offset : offset,
-        option: option,
-        index: index
-      };
-    }
-    
-    drawCharts.call(this, opts.type, opts, this.config, this.context);
-  }
-  if (this.opts.type === 'bar') {
-    var current = this.getCurrentDataIndex(e);
-    var index = option.index == undefined ? current.index : option.index;
-    if (index > -1 || index.length>0) {
-      var seriesData = getSeriesDataItem(this.opts.series, index, current.group);
-      if (seriesData.length !== 0) {
-        var _getToolTipData = getToolTipData(seriesData, this.opts, index, current.group, this.opts.categories, option),
-          textList = _getToolTipData.textList,
-          offset = _getToolTipData.offset;
-        offset.x = _touches$.x;
-        opts.tooltip = {
-          textList: option.textList !== undefined ? option.textList : textList,
-          offset: option.offset !== undefined ? option.offset : offset,
-          option: option,
-          index: index
-        };
-      }
-    }
-    drawCharts.call(this, opts.type, opts, this.config, this.context);
-  }
-  if (this.opts.type === 'mix') {
-    var current = this.getCurrentDataIndex(e);
-    var index = option.index == undefined ? current.index : option.index;
-    if (index > -1) {
-      var currentOffset = this.scrollOption.currentOffset;
-      var opts = assign({}, this.opts, {
-        _scrollDistance_: currentOffset,
-        animation: false
-      });
-      var seriesData = getSeriesDataItem(this.opts.series, index);
-      if (seriesData.length !== 0) {
-        var _getMixToolTipData = getMixToolTipData(seriesData, this.opts, index, this.opts.categories, option),
-          textList = _getMixToolTipData.textList,
-          offset = _getMixToolTipData.offset;
-        offset.y = _touches$.y;
-        opts.tooltip = {
-          textList: option.textList ? option.textList : textList,
-          offset: option.offset !== undefined ? option.offset : offset,
-          option: option,
-          index: index
-        };
-      }
-    }
-    drawCharts.call(this, opts.type, opts, this.config, this.context);
-  }
-  if (this.opts.type === 'candle') {
-    var current = this.getCurrentDataIndex(e);
-    var index = option.index == undefined ? current.index : option.index;
-    if (index > -1) {
-      var currentOffset = this.scrollOption.currentOffset;
-      var opts = assign({}, this.opts, {
-        _scrollDistance_: currentOffset,
-        animation: false
-      });
-      var seriesData = getSeriesDataItem(this.opts.series, index);
-      if (seriesData.length !== 0) {
-        var _getToolTipData = getCandleToolTipData(this.opts.series[0].data, seriesData, this.opts, index, this.opts.categories, this.opts.extra.candle, option),
-          textList = _getToolTipData.textList,
-          offset = _getToolTipData.offset;
-        offset.y = _touches$.y;
-        opts.tooltip = {
-          textList: option.textList ? option.textList : textList,
-          offset: option.offset !== undefined ? option.offset : offset,
-          option: option,
-          index: index
-        };
-      }
-    }
-    drawCharts.call(this, opts.type, opts, this.config, this.context);
-  }
-  if (this.opts.type === 'pie' || this.opts.type === 'ring' || this.opts.type === 'rose' || this.opts.type === 'funnel') {
-    var index = option.index == undefined ? this.getCurrentDataIndex(e) : option.index;
-    if (index > -1) {
-      var opts = assign({}, this.opts, {animation: false});
-      var seriesData = assign({}, opts._series_[index]);
-      var textList = [{
-        text: option.formatter ? option.formatter(seriesData, undefined, index, opts) : seriesData.name + ': ' + seriesData.data,
-        color: seriesData.color,
-        legendShape: this.opts.extra.tooltip.legendShape == 'auto' ? seriesData.legendShape : this.opts.extra.tooltip.legendShape
-      }];
-      var offset = {
-        x: _touches$.x,
-        y: _touches$.y
-      };
-      opts.tooltip = {
-        textList: option.textList ? option.textList : textList,
-        offset: option.offset !== undefined ? option.offset : offset,
-        option: option,
-        index: index
-      };
-    }
-    drawCharts.call(this, opts.type, opts, this.config, this.context);
-  }
-  if (this.opts.type === 'map') {
-    var index = option.index == undefined ? this.getCurrentDataIndex(e) : option.index;
-    if (index > -1) {
-      var opts = assign({}, this.opts, {animation: false});
-      var seriesData = assign({}, this.opts.series[index]);
-      seriesData.name = seriesData.properties.name
-      var textList = [{
-        text: option.formatter ? option.formatter(seriesData, undefined, index, this.opts) : seriesData.name,
-        color: seriesData.color,
-        legendShape: this.opts.extra.tooltip.legendShape == 'auto' ? seriesData.legendShape : this.opts.extra.tooltip.legendShape
-      }];
-      var offset = {
-        x: _touches$.x,
-        y: _touches$.y
-      };
-      opts.tooltip = {
-        textList: option.textList ? option.textList : textList,
-        offset: option.offset !== undefined ? option.offset : offset,
-        option: option,
-        index: index
-      };
-    }
-    opts.updateData = false;
-    drawCharts.call(this, opts.type, opts, this.config, this.context);
-  }
-  if (this.opts.type === 'word') {
-    var index = option.index == undefined ? this.getCurrentDataIndex(e) : option.index;
-    if (index > -1) {
-      var opts = assign({}, this.opts, {animation: false});
-      var seriesData = assign({}, this.opts.series[index]);
-      var textList = [{
-        text: option.formatter ? option.formatter(seriesData, undefined, index, this.opts) : seriesData.name,
-        color: seriesData.color,
-        legendShape: this.opts.extra.tooltip.legendShape == 'auto' ? seriesData.legendShape : this.opts.extra.tooltip.legendShape
-      }];
-      var offset = {
-        x: _touches$.x,
-        y: _touches$.y
-      };
-      opts.tooltip = {
-        textList: option.textList ? option.textList : textList,
-        offset: option.offset !== undefined ? option.offset : offset,
-        option: option,
-        index: index
-      };
-    }
-    opts.updateData = false;
-    drawCharts.call(this, opts.type, opts, this.config, this.context);
-  }
-  if (this.opts.type === 'radar') {
-    var index = option.index == undefined ? this.getCurrentDataIndex(e) : option.index;
-    if (index > -1) {
-      var opts = assign({}, this.opts, {animation: false});
-      var seriesData = getSeriesDataItem(this.opts.series, index);
-      if (seriesData.length !== 0) {
-        var textList = seriesData.map((item) => {
-          return {
-            text: option.formatter ? option.formatter(item, this.opts.categories[index], index, this.opts) : item.name + ': ' + item.data,
-            color: item.color,
-            legendShape: this.opts.extra.tooltip.legendShape == 'auto' ? item.legendShape : this.opts.extra.tooltip.legendShape
-          };
-        });
-        var offset = {
-          x: _touches$.x,
-          y: _touches$.y
-        };
-        opts.tooltip = {
-          textList: option.textList ? option.textList : textList,
-          offset: option.offset !== undefined ? option.offset : offset,
-          option: option,
-          index: index
-        };
-      }
-    }
-    drawCharts.call(this, opts.type, opts, this.config, this.context);
-  }
+	var option = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+	var touches = null;
+	if (e.changedTouches) {
+		touches = e.changedTouches[0];
+	} else {
+		touches = e.mp.changedTouches[0];
+	}
+	if (!touches) {
+		console.log("[uCharts] 未获取到event坐标信息");
+	}
+	var _touches$ = getTouches(touches, this.opts, e);
+	var currentOffset = this.scrollOption.currentOffset;
+	var opts = assign({}, this.opts, {
+		_scrollDistance_: currentOffset,
+		animation: false
+	});
+	if (this.opts.type === 'line' || this.opts.type === 'area' || this.opts.type === 'column' || this.opts.type ===
+		'scatter' || this.opts.type === 'bubble') {
+		var current = this.getCurrentDataIndex(e);
+		var index = option.index == undefined ? current.index : option.index;
+		if (index > -1 || index.length > 0) {
+			var seriesData = getSeriesDataItem(this.opts.series, index, current.group);
+			if (seriesData.length !== 0) {
+				var _getToolTipData = getToolTipData(seriesData, this.opts, index, current.group, this.opts.categories,
+						option),
+					textList = _getToolTipData.textList,
+					offset = _getToolTipData.offset;
+				offset.y = _touches$.y;
+				opts.tooltip = {
+					textList: option.textList !== undefined ? option.textList : textList,
+					offset: option.offset !== undefined ? option.offset : offset,
+					option: option,
+					index: index,
+					group: current.group
+				};
+			}
+		}
+		drawCharts.call(this, opts.type, opts, this.config, this.context);
+	}
+	if (this.opts.type === 'mount') {
+		var index = option.index == undefined ? this.getCurrentDataIndex(e).index : option.index;
+		if (index > -1) {
+			var opts = assign({}, this.opts, {
+				animation: false
+			});
+			var seriesData = assign({}, opts._series_[index]);
+			var textList = [{
+				text: option.formatter ? option.formatter(seriesData, undefined, index, opts) : seriesData.name + ': ' +
+					seriesData.data,
+				color: seriesData.color,
+				legendShape: this.opts.extra.tooltip.legendShape == 'auto' ? seriesData.legendShape : this.opts.extra
+					.tooltip.legendShape
+			}];
+			var offset = {
+				x: opts.chartData.calPoints[index].x,
+				y: _touches$.y
+			};
+			opts.tooltip = {
+				textList: option.textList ? option.textList : textList,
+				offset: option.offset !== undefined ? option.offset : offset,
+				option: option,
+				index: index
+			};
+		}
+
+		drawCharts.call(this, opts.type, opts, this.config, this.context);
+	}
+	if (this.opts.type === 'bar') {
+		var current = this.getCurrentDataIndex(e);
+		var index = option.index == undefined ? current.index : option.index;
+		if (index > -1 || index.length > 0) {
+			var seriesData = getSeriesDataItem(this.opts.series, index, current.group);
+			if (seriesData.length !== 0) {
+				var _getToolTipData = getToolTipData(seriesData, this.opts, index, current.group, this.opts.categories,
+						option),
+					textList = _getToolTipData.textList,
+					offset = _getToolTipData.offset;
+				offset.x = _touches$.x;
+				opts.tooltip = {
+					textList: option.textList !== undefined ? option.textList : textList,
+					offset: option.offset !== undefined ? option.offset : offset,
+					option: option,
+					index: index
+				};
+			}
+		}
+		drawCharts.call(this, opts.type, opts, this.config, this.context);
+	}
+	if (this.opts.type === 'mix') {
+		var current = this.getCurrentDataIndex(e);
+		var index = option.index == undefined ? current.index : option.index;
+		if (index > -1) {
+			var currentOffset = this.scrollOption.currentOffset;
+			var opts = assign({}, this.opts, {
+				_scrollDistance_: currentOffset,
+				animation: false
+			});
+			var seriesData = getSeriesDataItem(this.opts.series, index);
+			if (seriesData.length !== 0) {
+				var _getMixToolTipData = getMixToolTipData(seriesData, this.opts, index, this.opts.categories, option),
+					textList = _getMixToolTipData.textList,
+					offset = _getMixToolTipData.offset;
+				offset.y = _touches$.y;
+				opts.tooltip = {
+					textList: option.textList ? option.textList : textList,
+					offset: option.offset !== undefined ? option.offset : offset,
+					option: option,
+					index: index
+				};
+			}
+		}
+		drawCharts.call(this, opts.type, opts, this.config, this.context);
+	}
+	if (this.opts.type === 'candle') {
+		var current = this.getCurrentDataIndex(e);
+		var index = option.index == undefined ? current.index : option.index;
+		if (index > -1) {
+			var currentOffset = this.scrollOption.currentOffset;
+			var opts = assign({}, this.opts, {
+				_scrollDistance_: currentOffset,
+				animation: false
+			});
+			var seriesData = getSeriesDataItem(this.opts.series, index);
+			if (seriesData.length !== 0) {
+				var _getToolTipData = getCandleToolTipData(this.opts.series[0].data, seriesData, this.opts, index, this.opts
+						.categories, this.opts.extra.candle, option),
+					textList = _getToolTipData.textList,
+					offset = _getToolTipData.offset;
+				offset.y = _touches$.y;
+				opts.tooltip = {
+					textList: option.textList ? option.textList : textList,
+					offset: option.offset !== undefined ? option.offset : offset,
+					option: option,
+					index: index
+				};
+			}
+		}
+		drawCharts.call(this, opts.type, opts, this.config, this.context);
+	}
+	if (this.opts.type === 'pie' || this.opts.type === 'ring' || this.opts.type === 'rose' || this.opts.type ===
+		'funnel') {
+		var index = option.index == undefined ? this.getCurrentDataIndex(e) : option.index;
+		if (index > -1) {
+			var opts = assign({}, this.opts, {
+				animation: false
+			});
+			var seriesData = assign({}, opts._series_[index]);
+			var textList = [{
+				text: option.formatter ? option.formatter(seriesData, undefined, index, opts) : seriesData.name + ': ' +
+					seriesData.data,
+				color: seriesData.color,
+				legendShape: this.opts.extra.tooltip.legendShape == 'auto' ? seriesData.legendShape : this.opts.extra
+					.tooltip.legendShape
+			}];
+			var offset = {
+				x: _touches$.x,
+				y: _touches$.y
+			};
+			opts.tooltip = {
+				textList: option.textList ? option.textList : textList,
+				offset: option.offset !== undefined ? option.offset : offset,
+				option: option,
+				index: index
+			};
+		}
+		drawCharts.call(this, opts.type, opts, this.config, this.context);
+	}
+	if (this.opts.type === 'map') {
+		var index = option.index == undefined ? this.getCurrentDataIndex(e) : option.index;
+		if (index > -1) {
+			var opts = assign({}, this.opts, {
+				animation: false
+			});
+			var seriesData = assign({}, this.opts.series[index]);
+			seriesData.name = seriesData.properties.name
+			var textList = [{
+				text: option.formatter ? option.formatter(seriesData, undefined, index, this.opts) : seriesData.name,
+				color: seriesData.color,
+				legendShape: this.opts.extra.tooltip.legendShape == 'auto' ? seriesData.legendShape : this.opts.extra
+					.tooltip.legendShape
+			}];
+			var offset = {
+				x: _touches$.x,
+				y: _touches$.y
+			};
+			opts.tooltip = {
+				textList: option.textList ? option.textList : textList,
+				offset: option.offset !== undefined ? option.offset : offset,
+				option: option,
+				index: index
+			};
+		}
+		opts.updateData = false;
+		drawCharts.call(this, opts.type, opts, this.config, this.context);
+	}
+	if (this.opts.type === 'word') {
+		var index = option.index == undefined ? this.getCurrentDataIndex(e) : option.index;
+		if (index > -1) {
+			var opts = assign({}, this.opts, {
+				animation: false
+			});
+			var seriesData = assign({}, this.opts.series[index]);
+			var textList = [{
+				text: option.formatter ? option.formatter(seriesData, undefined, index, this.opts) : seriesData.name,
+				color: seriesData.color,
+				legendShape: this.opts.extra.tooltip.legendShape == 'auto' ? seriesData.legendShape : this.opts.extra
+					.tooltip.legendShape
+			}];
+			var offset = {
+				x: _touches$.x,
+				y: _touches$.y
+			};
+			opts.tooltip = {
+				textList: option.textList ? option.textList : textList,
+				offset: option.offset !== undefined ? option.offset : offset,
+				option: option,
+				index: index
+			};
+		}
+		opts.updateData = false;
+		drawCharts.call(this, opts.type, opts, this.config, this.context);
+	}
+	if (this.opts.type === 'radar') {
+		var index = option.index == undefined ? this.getCurrentDataIndex(e) : option.index;
+		if (index > -1) {
+			var opts = assign({}, this.opts, {
+				animation: false
+			});
+			var seriesData = getSeriesDataItem(this.opts.series, index);
+			if (seriesData.length !== 0) {
+				var textList = seriesData.map((item) => {
+					return {
+						text: option.formatter ? option.formatter(item, this.opts.categories[index], index, this.opts) : item
+							.name + ': ' + item.data,
+						color: item.color,
+						legendShape: this.opts.extra.tooltip.legendShape == 'auto' ? item.legendShape : this.opts.extra
+							.tooltip.legendShape
+					};
+				});
+				var offset = {
+					x: _touches$.x,
+					y: _touches$.y
+				};
+				opts.tooltip = {
+					textList: option.textList ? option.textList : textList,
+					offset: option.offset !== undefined ? option.offset : offset,
+					option: option,
+					index: index
+				};
+			}
+		}
+		drawCharts.call(this, opts.type, opts, this.config, this.context);
+	}
 };
 
 uCharts.prototype.translate = function(distance) {
-  this.scrollOption = {
-    currentOffset: distance,
-    startTouchX: distance,
-    distance: 0,
-    lastMoveTime: 0
-  };
-  let opts = assign({}, this.opts, {
-    _scrollDistance_: distance,
-    animation: false
-  });
-  drawCharts.call(this, this.opts.type, opts, this.config, this.context);
+	this.scrollOption = {
+		currentOffset: distance,
+		startTouchX: distance,
+		distance: 0,
+		lastMoveTime: 0
+	};
+	let opts = assign({}, this.opts, {
+		_scrollDistance_: distance,
+		animation: false
+	});
+	drawCharts.call(this, this.opts.type, opts, this.config, this.context);
 };
 
 uCharts.prototype.scrollStart = function(e) {
-  var touches = null;
-  if (e.changedTouches) {
-    touches = e.changedTouches[0];
-  } else {
-    touches = e.mp.changedTouches[0];
-  }
-  var _touches$ = getTouches(touches, this.opts, e);
-  if (touches && this.opts.enableScroll === true) {
-    this.scrollOption.startTouchX = _touches$.x;
-  }
+	var touches = null;
+	if (e.changedTouches) {
+		touches = e.changedTouches[0];
+	} else {
+		touches = e.mp.changedTouches[0];
+	}
+	var _touches$ = getTouches(touches, this.opts, e);
+	if (touches && this.opts.enableScroll === true) {
+		this.scrollOption.startTouchX = _touches$.x;
+	}
 };
 
 uCharts.prototype.scroll = function(e) {
-  if (this.scrollOption.lastMoveTime === 0) {
-    this.scrollOption.lastMoveTime = Date.now();
-  }
-  let Limit = this.opts.touchMoveLimit || 60;
-  let currMoveTime = Date.now();
-  let duration = currMoveTime - this.scrollOption.lastMoveTime;
-  if (duration < Math.floor(1000 / Limit)) return;
-  if (this.scrollOption.startTouchX == 0) return;
-  this.scrollOption.lastMoveTime = currMoveTime;
-  var touches = null;
-  if (e.changedTouches) {
-    touches = e.changedTouches[0];
-  } else {
-    touches = e.mp.changedTouches[0];
-  }
-  if (touches && this.opts.enableScroll === true) {
-    var _touches$ = getTouches(touches, this.opts, e);
-    var _distance;
-    _distance = _touches$.x - this.scrollOption.startTouchX;
-    var currentOffset = this.scrollOption.currentOffset;
-    var validDistance = calValidDistance(this, currentOffset + _distance, this.opts.chartData, this.config, this.opts);
-    this.scrollOption.distance = _distance = validDistance - currentOffset;
-    var opts = assign({}, this.opts, {
-      _scrollDistance_: currentOffset + _distance,
-      animation: false
-    });
+	if (this.scrollOption.lastMoveTime === 0) {
+		this.scrollOption.lastMoveTime = Date.now();
+	}
+	let Limit = this.opts.touchMoveLimit || 60;
+	let currMoveTime = Date.now();
+	let duration = currMoveTime - this.scrollOption.lastMoveTime;
+	if (duration < Math.floor(1000 / Limit)) return;
+	if (this.scrollOption.startTouchX == 0) return;
+	this.scrollOption.lastMoveTime = currMoveTime;
+	var touches = null;
+	if (e.changedTouches) {
+		touches = e.changedTouches[0];
+	} else {
+		touches = e.mp.changedTouches[0];
+	}
+	if (touches && this.opts.enableScroll === true) {
+		var _touches$ = getTouches(touches, this.opts, e);
+		var _distance;
+		_distance = _touches$.x - this.scrollOption.startTouchX;
+		var currentOffset = this.scrollOption.currentOffset;
+		var validDistance = calValidDistance(this, currentOffset + _distance, this.opts.chartData, this.config, this
+			.opts);
+		this.scrollOption.distance = _distance = validDistance - currentOffset;
+		var opts = assign({}, this.opts, {
+			_scrollDistance_: currentOffset + _distance,
+			animation: false
+		});
 		this.opts = opts;
-    drawCharts.call(this, opts.type, opts, this.config, this.context);
-    return currentOffset + _distance;
-  }
+		drawCharts.call(this, opts.type, opts, this.config, this.context);
+		return currentOffset + _distance;
+	}
 };
 
 uCharts.prototype.scrollEnd = function(e) {
-  if (this.opts.enableScroll === true) {
-    var _scrollOption = this.scrollOption,
-      currentOffset = _scrollOption.currentOffset,
-      distance = _scrollOption.distance;
-    this.scrollOption.currentOffset = currentOffset + distance;
-    this.scrollOption.distance = 0;
-    this.scrollOption.moveCount = 0;
-  }
+	if (this.opts.enableScroll === true) {
+		var _scrollOption = this.scrollOption,
+			currentOffset = _scrollOption.currentOffset,
+			distance = _scrollOption.distance;
+		this.scrollOption.currentOffset = currentOffset + distance;
+		this.scrollOption.distance = 0;
+		this.scrollOption.moveCount = 0;
+	}
 };
 
 export default uCharts;
\ No newline at end of file
diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.min.js b/uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.min.js
index 0902ecd..1fc2cef 100644
--- a/uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.min.js
+++ b/uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.min.js
@@ -15,4 +15,7544 @@
  * http://ext.dcloud.net.cn/plugin?id=271
  * 
  */
-"use strict";var config={version:"v2.5.0-20230101",yAxisWidth:15,xAxisHeight:22,padding:[10,10,10,10],rotate:false,fontSize:13,fontColor:"#666666",dataPointShape:["circle","circle","circle","circle"],color:["#1890FF","#91CB74","#FAC858","#EE6666","#73C0DE","#3CA272","#FC8452","#9A60B4","#ea7ccc"],linearColor:["#0EE2F8","#2BDCA8","#FA7D8D","#EB88E2","#2AE3A0","#0EE2F8","#EB88E2","#6773E3","#F78A85"],pieChartLinePadding:15,pieChartTextPadding:5,titleFontSize:20,subtitleFontSize:15,radarLabelTextMargin:13};var assign=function(e,...t){if(e==null){throw new TypeError("[uCharts] Cannot convert undefined or null to object")}if(!t||t.length<=0){return e}function i(e,a){for(let t in a){e[t]=e[t]&&e[t].toString()==="[object Object]"?i(e[t],a[t]):e[t]=a[t]}return e}t.forEach(t=>{e=i(e,t)});return e};var util={toFixed:function t(e,a){a=a||2;if(this.isFloat(e)){e=e.toFixed(a)}return e},isFloat:function t(e){return e%1!==0},approximatelyEqual:function t(e,a){return Math.abs(e-a)<1e-10},isSameSign:function t(e,a){return Math.abs(e)===e&&Math.abs(a)===a||Math.abs(e)!==e&&Math.abs(a)!==a},isSameXCoordinateArea:function t(e,a){return this.isSameSign(e.x,a.x)},isCollision:function t(e,a){e.end={};e.end.x=e.start.x+e.width;e.end.y=e.start.y-e.height;a.end={};a.end.x=a.start.x+a.width;a.end.y=a.start.y-a.height;var i=a.start.x>e.end.x||a.end.x<e.start.x||a.end.y>e.start.y||a.start.y<e.end.y;return!i}};function getH5Offset(t){t.mp={changedTouches:[]};t.mp.changedTouches.push({x:t.offsetX,y:t.offsetY});return t}function hexToRgb(t,e){var a=/^#?([a-f\d])([a-f\d])([a-f\d])$/i;var i=t.replace(a,function(t,e,a,i){return e+e+a+a+i+i});var r=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(i);var o=parseInt(r[1],16);var n=parseInt(r[2],16);var l=parseInt(r[3],16);return"rgba("+o+","+n+","+l+","+e+")"}function findRange(t,e,a){if(isNaN(t)){throw new Error("[uCharts] series数据需为Number格式")}a=a||10;e=e?e:"upper";var i=1;while(a<1){a*=10;i*=10}if(e==="upper"){t=Math.ceil(t*i)}else{t=Math.floor(t*i)}while(t%a!==0){if(e==="upper"){if(t==t+1){break}t++}else{t--}}return t/i}function calCandleMA(o,t,e,n){let a=[];for(let r=0;r<o.length;r++){let i={data:[],name:t[r],color:e[r]};for(let a=0,t=n.length;a<t;a++){if(a<o[r]){i.data.push(null);continue}let e=0;for(let t=0;t<o[r];t++){e+=n[a-t][1]}i.data.push(+(e/o[r]).toFixed(3))}a.push(i)}return a}function calValidDistance(t,e,a,i,r){var o=r.width-r.area[1]-r.area[3];var n=a.eachSpacing*(r.chartData.xAxisData.xAxisPoints.length-1);if(r.type=="mount"&&r.extra&&r.extra.mount&&r.extra.mount.widthRatio&&r.extra.mount.widthRatio>1){if(r.extra.mount.widthRatio>2)r.extra.mount.widthRatio=2;n+=(r.extra.mount.widthRatio-1)*a.eachSpacing}var l=e;if(e>=0){l=0;t.uevent.trigger("scrollLeft");t.scrollOption.position="left";r.xAxis.scrollPosition="left"}else if(Math.abs(e)>=n-o){l=o-n;t.uevent.trigger("scrollRight");t.scrollOption.position="right";r.xAxis.scrollPosition="right"}else{t.scrollOption.position=e;r.xAxis.scrollPosition=e}return l}function isInAngleRange(t,e,a){function i(t){while(t<0){t+=2*Math.PI}while(t>2*Math.PI){t-=2*Math.PI}return t}t=i(t);e=i(e);a=i(a);if(e>a){a+=2*Math.PI;if(t<e){t+=2*Math.PI}}return t>=e&&t<=a}function createCurveControlPoints(t,e){function a(t,e){if(t[e-1]&&t[e+1]){return t[e].y>=Math.max(t[e-1].y,t[e+1].y)||t[e].y<=Math.min(t[e-1].y,t[e+1].y)}else{return false}}function c(t,e){if(t[e-1]&&t[e+1]){return t[e].x>=Math.max(t[e-1].x,t[e+1].x)||t[e].x<=Math.min(t[e-1].x,t[e+1].x)}else{return false}}var i=.2;var r=.2;var o=null;var n=null;var l=null;var s=null;if(e<1){o=t[0].x+(t[1].x-t[0].x)*i;n=t[0].y+(t[1].y-t[0].y)*i}else{o=t[e].x+(t[e+1].x-t[e-1].x)*i;n=t[e].y+(t[e+1].y-t[e-1].y)*i}if(e>t.length-3){var h=t.length-1;l=t[h].x-(t[h].x-t[h-1].x)*r;s=t[h].y-(t[h].y-t[h-1].y)*r}else{l=t[e+1].x-(t[e+2].x-t[e].x)*r;s=t[e+1].y-(t[e+2].y-t[e].y)*r}if(a(t,e+1)){s=t[e+1].y}if(a(t,e)){n=t[e].y}if(c(t,e+1)){l=t[e+1].x}if(c(t,e)){o=t[e].x}if(n>=Math.max(t[e].y,t[e+1].y)||n<=Math.min(t[e].y,t[e+1].y)){n=t[e].y}if(s>=Math.max(t[e].y,t[e+1].y)||s<=Math.min(t[e].y,t[e+1].y)){s=t[e+1].y}if(o>=Math.max(t[e].x,t[e+1].x)||o<=Math.min(t[e].x,t[e+1].x)){o=t[e].x}if(l>=Math.max(t[e].x,t[e+1].x)||l<=Math.min(t[e].x,t[e+1].x)){l=t[e+1].x}return{ctrA:{x:o,y:n},ctrB:{x:l,y:s}}}function convertCoordinateOrigin(t,e,a){return{x:a.x+t,y:a.y-e}}function avoidCollision(t,e){if(e){while(util.isCollision(t,e)){if(t.start.x>0){t.start.y--}else if(t.start.x<0){t.start.y++}else{if(t.start.y>0){t.start.y++}else{t.start.y--}}}}return t}function fixPieSeries(e,a,t){let i=[];if(e.length>0&&e[0].data.constructor.toString().indexOf("Array")>-1){a._pieSeries_=e;let t=e[0].data;for(var r=0;r<t.length;r++){t[r].formatter=e[0].formatter;t[r].data=t[r].value;i.push(t[r])}a.series=i}else{i=e}return i}function fillSeries(e,a,i){var r=0;for(var o=0;o<e.length;o++){let t=e[o];if(!t.color){t.color=i.color[r];r=(r+1)%i.color.length}if(!t.linearIndex){t.linearIndex=o}if(!t.index){t.index=0}if(!t.type){t.type=a.type}if(typeof t.show=="undefined"){t.show=true}if(!t.type){t.type=a.type}if(!t.pointShape){t.pointShape="circle"}if(!t.legendShape){switch(t.type){case"line":t.legendShape="line";break;case"column":case"bar":t.legendShape="rect";break;case"area":case"mount":t.legendShape="triangle";break;default:t.legendShape="circle"}}}return e}function fillCustomColor(t,e,a,i){var r=e||[];if(t=="custom"&&r.length==0){r=i.linearColor}if(t=="custom"&&r.length<a.length){let t=a.length-r.length;for(var o=0;o<t;o++){r.push(i.linearColor[(o+1)%i.linearColor.length])}}return r}function getDataRange(t,e){var a=0;var i=e-t;if(i>=1e4){a=1e3}else if(i>=1e3){a=100}else if(i>=100){a=10}else if(i>=10){a=5}else if(i>=1){a=1}else if(i>=.1){a=.1}else if(i>=.01){a=.01}else if(i>=.001){a=.001}else if(i>=1e-4){a=1e-4}else if(i>=1e-5){a=1e-5}else{a=1e-6}return{minRange:findRange(t,"lower",a),maxRange:findRange(e,"upper",a)}}function measureText(a,t,e){var i=0;a=String(a);e=false;if(e!==false&&e!==undefined&&e.setFontSize&&e.measureText){e.setFontSize(t);return e.measureText(a).width}else{var a=a.split("");for(let e=0;e<a.length;e++){let t=a[e];if(/[a-zA-Z]/.test(t)){i+=7}else if(/[0-9]/.test(t)){i+=5.5}else if(/\./.test(t)){i+=2.7}else if(/-/.test(t)){i+=3.25}else if(/:/.test(t)){i+=2.5}else if(/[\u4e00-\u9fa5]/.test(t)){i+=10}else if(/\(|\)/.test(t)){i+=3.73}else if(/\s/.test(t)){i+=2.5}else if(/%/.test(t)){i+=8}else{i+=10}}return i*t/10}}function dataCombine(t){return t.reduce(function(t,e){return(t.data?t.data:t).concat(e.data)},[])}function dataCombineStack(t,e){var a=new Array(e);for(var i=0;i<a.length;i++){a[i]=0}for(var r=0;r<t.length;r++){for(var i=0;i<a.length;i++){a[i]+=t[r].data[i]}}return t.reduce(function(t,e){return(t.data?t.data:t).concat(e.data).concat(a)},[])}function getTouches(t,e,a){let i,r;if(t.clientX){if(e.rotate){r=e.height-t.clientX*e.pix;i=(t.pageY-a.currentTarget.offsetTop-e.height/e.pix/2*(e.pix-1))*e.pix}else{i=t.clientX*e.pix;r=(t.pageY-a.currentTarget.offsetTop-e.height/e.pix/2*(e.pix-1))*e.pix}}else{if(e.rotate){r=e.height-t.x*e.pix;i=t.y*e.pix}else{i=t.x*e.pix;r=t.y*e.pix}}return{x:i,y:r}}function getSeriesDataItem(e,i,a){var r=[];var o=[];var n=i.constructor.toString().indexOf("Array")>-1;if(n){let t=filterSeries(e);for(var l=0;l<a.length;l++){o.push(t[a[l]])}}else{o=e}for(let t=0;t<o.length;t++){let e=o[t];let a=-1;if(n){a=i[t]}else{a=i}if(e.data[a]!==null&&typeof e.data[a]!=="undefined"&&e.show){let t={};t.color=e.color;t.type=e.type;t.style=e.style;t.pointShape=e.pointShape;t.disableLegend=e.disableLegend;t.legendShape=e.legendShape;t.name=e.name;t.show=e.show;t.data=e.formatter?e.formatter(e.data[a]):e.data[a];r.push(t)}}return r}function getMaxTextListLength(t,e,a){var i=t.map(function(t){return measureText(t,e,a)});return Math.max.apply(null,i)}function getRadarCoordinateSeries(t){var e=2*Math.PI/t;var a=[];for(var i=0;i<t;i++){a.push(e*i)}return a.map(function(t){return-1*t+Math.PI/2})}function getToolTipData(t,a,i,r,o){var n=arguments.length>5&&arguments[5]!==undefined?arguments[5]:{};var l=a.chartData.calPoints?a.chartData.calPoints:[];let s={};if(r.length>0){let e=[];for(let t=0;t<r.length;t++){e.push(l[r[t]])}s=e[0][i[0]]}else{for(let t=0;t<l.length;t++){if(l[t][i]){s=l[t][i];break}}}var e=t.map(function(t){let e=null;if(a.categories&&a.categories.length>0){e=o[i]}return{text:n.formatter?n.formatter(t,e,i,a):t.name+": "+t.data,color:t.color,legendShape:a.extra.tooltip.legendShape=="auto"?t.legendShape:a.extra.tooltip.legendShape}});var h={x:Math.round(s.x),y:Math.round(s.y)};return{textList:e,offset:h}}function getMixToolTipData(t,e,a,i){var r=arguments.length>4&&arguments[4]!==undefined?arguments[4]:{};var o=e.chartData.xAxisPoints[a]+e.chartData.eachSpacing/2;var n=t.map(function(t){return{text:r.formatter?r.formatter(t,i[a],a,e):t.name+": "+t.data,color:t.color,disableLegend:t.disableLegend?true:false,legendShape:e.extra.tooltip.legendShape=="auto"?t.legendShape:e.extra.tooltip.legendShape}});n=n.filter(function(t){if(t.disableLegend!==true){return t}});var l={x:Math.round(o),y:0};return{textList:n,offset:l}}function getCandleToolTipData(o,e,n,l,i,t){var r=arguments.length>6&&arguments[6]!==undefined?arguments[6]:{};var a=n.chartData.calPoints;let s=t.color.upFill;let h=t.color.downFill;let c=[s,s,h,s];var d=[];e.map(function(t){if(l==0){if(t.data[1]-t.data[0]<0){c[1]=h}else{c[1]=s}}else{if(t.data[0]<o[l-1][1]){c[0]=h}if(t.data[1]<t.data[0]){c[1]=h}if(t.data[2]>o[l-1][1]){c[2]=s}if(t.data[3]<o[l-1][1]){c[3]=h}}let e={text:"开盘："+t.data[0],color:c[0],legendShape:n.extra.tooltip.legendShape=="auto"?t.legendShape:n.extra.tooltip.legendShape};let a={text:"收盘："+t.data[1],color:c[1],legendShape:n.extra.tooltip.legendShape=="auto"?t.legendShape:n.extra.tooltip.legendShape};let i={text:"最低："+t.data[2],color:c[2],legendShape:n.extra.tooltip.legendShape=="auto"?t.legendShape:n.extra.tooltip.legendShape};let r={text:"最高："+t.data[3],color:c[3],legendShape:n.extra.tooltip.legendShape=="auto"?t.legendShape:n.extra.tooltip.legendShape};d.push(e,a,i,r)});var x=[];var f={x:0,y:0};for(let e=0;e<a.length;e++){let t=a[e];if(typeof t[l]!=="undefined"&&t[l]!==null){x.push(t[l])}}f.x=Math.round(x[0][0].x);return{textList:d,offset:f}}function filterSeries(e){let a=[];for(let t=0;t<e.length;t++){if(e[t].show==true){a.push(e[t])}}return a}function findCurrentIndex(o,n,e,t){var a=arguments.length>4&&arguments[4]!==undefined?arguments[4]:0;var l={index:-1,group:[]};var i=e.chartData.eachSpacing/2;let r=[];if(n&&n.length>0){if(!e.categories){i=0}else{for(let t=1;t<e.chartData.xAxisPoints.length;t++){r.push(e.chartData.xAxisPoints[t]-i)}if((e.type=="line"||e.type=="area")&&e.xAxis.boundaryGap=="justify"){r=e.chartData.xAxisPoints}}if(isInExactChartArea(o,e,t)){if(!e.categories){let a=Array(n.length);for(let e=0;e<n.length;e++){a[e]=Array(n[e].length);for(let t=0;t<n[e].length;t++){a[e][t]=Math.abs(n[e][t].x-o.x)}}let e=Array(a.length);let i=Array(a.length);for(let t=0;t<a.length;t++){e[t]=Math.min.apply(null,a[t]);i[t]=a[t].indexOf(e[t])}let r=Math.min.apply(null,e);l.index=[];for(let t=0;t<e.length;t++){if(e[t]==r){l.group.push(t);l.index.push(i[t])}}}else{r.forEach(function(t,e){if(o.x+a+i>t){l.index=e}})}}}return l}function findBarChartCurrentIndex(a,t,e,i){var r=arguments.length>4&&arguments[4]!==undefined?arguments[4]:0;var o={index:-1,group:[]};var n=e.chartData.eachSpacing/2;let l=e.chartData.yAxisPoints;if(t&&t.length>0){if(isInExactChartArea(a,e,i)){l.forEach(function(t,e){if(a.y+r+n>t){o.index=e}})}}return o}function findLegendIndex(o,t,e){let n=-1;let l=0;if(isInExactLegendArea(o,t.area)){let i=t.points;let r=-1;for(let t=0,e=i.length;t<e;t++){let a=i[t];for(let e=0;e<a.length;e++){r+=1;let t=a[e]["area"];if(t&&o.x>t[0]-l&&o.x<t[2]+l&&o.y>t[1]-l&&o.y<t[3]+l){n=r;break}}}return n}return n}function isInExactLegendArea(t,e){return t.x>e.start.x&&t.x<e.end.x&&t.y>e.start.y&&t.y<e.end.y}function isInExactChartArea(t,e,a){return t.x<=e.width-e.area[1]+10&&t.x>=e.area[3]-10&&t.y>=e.area[0]&&t.y<=e.height-e.area[2]}function findRadarChartCurrentIndex(t,e,a){var r=2*Math.PI/a;var o=-1;if(isInExactPieChartArea(t,e.center,e.radius)){var n=function t(e){if(e<0){e+=2*Math.PI}if(e>2*Math.PI){e-=2*Math.PI}return e};var l=Math.atan2(e.center.y-t.y,t.x-e.center.x);l=-1*l;if(l<0){l+=2*Math.PI}var i=e.angleList.map(function(t){t=n(-1*t);return t});i.forEach(function(t,e){var a=n(t-r/2);var i=n(t+r/2);if(i<a){i+=2*Math.PI}if(l>=a&&l<=i||l+2*Math.PI>=a&&l+2*Math.PI<=i){o=e}})}return o}function findFunnelChartCurrentIndex(t,e){var a=-1;for(var i=0,r=e.series.length;i<r;i++){var o=e.series[i];if(t.x>o.funnelArea[0]&&t.x<o.funnelArea[2]&&t.y>o.funnelArea[1]&&t.y<o.funnelArea[3]){a=i;break}}return a}function findWordChartCurrentIndex(t,e){var a=-1;for(var i=0,r=e.length;i<r;i++){var o=e[i];if(t.x>o.area[0]&&t.x<o.area[2]&&t.y>o.area[1]&&t.y<o.area[3]){a=i;break}}return a}function findMapChartCurrentIndex(t,e){var a=-1;var i=e.chartData.mapData;var r=e.series;var o=pointToCoordinate(t.y,t.x,i.bounds,i.scale,i.xoffset,i.yoffset);var n=[o.x,o.y];for(var l=0,s=r.length;l<s;l++){var h=r[l].geometry.coordinates;if(isPoiWithinPoly(n,h,e.chartData.mapData.mercator)){a=l;break}}return a}function findRoseChartCurrentIndex(t,e,a){var i=-1;var r=getRoseDataPoints(a._series_,a.extra.rose.type,e.radius,e.radius);if(e&&e.center&&isInExactPieChartArea(t,e.center,e.radius)){var o=Math.atan2(e.center.y-t.y,t.x-e.center.x);o=-o;if(a.extra.rose&&a.extra.rose.offsetAngle){o=o-a.extra.rose.offsetAngle*Math.PI/180}for(var n=0,l=r.length;n<l;n++){if(isInAngleRange(o,r[n]._start_,r[n]._start_+r[n]._rose_proportion_*2*Math.PI)){i=n;break}}}return i}function findPieChartCurrentIndex(t,e,a){var i=-1;var r=getPieDataPoints(e.series);if(e&&e.center&&isInExactPieChartArea(t,e.center,e.radius)){var o=Math.atan2(e.center.y-t.y,t.x-e.center.x);o=-o;if(a.extra.pie&&a.extra.pie.offsetAngle){o=o-a.extra.pie.offsetAngle*Math.PI/180}if(a.extra.ring&&a.extra.ring.offsetAngle){o=o-a.extra.ring.offsetAngle*Math.PI/180}for(var n=0,l=r.length;n<l;n++){if(isInAngleRange(o,r[n]._start_,r[n]._start_+r[n]._proportion_*2*Math.PI)){i=n;break}}}return i}function isInExactPieChartArea(t,e,a){return Math.pow(t.x-e.x,2)+Math.pow(t.y-e.y,2)<=Math.pow(a,2)}function splitPoints(t,a){var i=[];var r=[];t.forEach(function(t,e){if(a.connectNulls){if(t!==null){r.push(t)}}else{if(t!==null){r.push(t)}else{if(r.length){i.push(r)}r=[]}}});if(r.length){i.push(r)}return i}function calLegendData(l,s,e,t,h){let c={area:{start:{x:0,y:0},end:{x:0,y:0},width:0,height:0,wholeWidth:0,wholeHeight:0},points:[],widthArr:[],heightArr:[]};if(s.legend.show===false){t.legendData=c;return c}let d=s.legend.padding*s.pix;let x=s.legend.margin*s.pix;let f=s.legend.fontSize?s.legend.fontSize*s.pix:e.fontSize;let p=15*s.pix;let g=5*s.pix;let u=Math.max(s.legend.lineHeight*s.pix,f);if(s.legend.position=="top"||s.legend.position=="bottom"){let i=[];let r=0;let o=[];let n=[];for(let a=0;a<l.length;a++){let t=l[a];const y=t.legendText?t.legendText:t.name;let e=p+g+measureText(y||"undefined",f,h)+s.legend.itemGap*s.pix;if(r+e>s.width-s.area[1]-s.area[3]){i.push(n);o.push(r-s.legend.itemGap*s.pix);r=e;n=[t]}else{r+=e;n.push(t)}}if(n.length){i.push(n);o.push(r-s.legend.itemGap*s.pix);c.widthArr=o;let t=Math.max.apply(null,o);switch(s.legend.float){case"left":c.area.start.x=s.area[3];c.area.end.x=s.area[3]+t+2*d;break;case"right":c.area.start.x=s.width-s.area[1]-t-2*d;c.area.end.x=s.width-s.area[1];break;default:c.area.start.x=(s.width-t)/2-d;c.area.end.x=(s.width+t)/2+d}c.area.width=t+2*d;c.area.wholeWidth=t+2*d;c.area.height=i.length*u+2*d;c.area.wholeHeight=i.length*u+2*d+2*x;c.points=i}}else{let t=l.length;let e=s.height-s.area[0]-s.area[2]-2*x-2*d;let a=Math.min(Math.floor(e/u),t);c.area.height=a*u+d*2;c.area.wholeHeight=a*u+d*2;switch(s.legend.float){case"top":c.area.start.y=s.area[0]+x;c.area.end.y=s.area[0]+x+c.area.height;break;case"bottom":c.area.start.y=s.height-s.area[2]-x-c.area.height;c.area.end.y=s.height-s.area[2]-x;break;default:c.area.start.y=(s.height-c.area.height)/2;c.area.end.y=(s.height+c.area.height)/2}let i=t%a===0?t/a:Math.floor(t/a+1);let r=[];for(let e=0;e<i;e++){let t=l.slice(e*a,e*a+a);r.push(t)}c.points=r;if(r.length){for(let t=0;t<r.length;t++){let a=r[t];let i=0;for(let e=0;e<a.length;e++){let t=p+g+measureText(a[e].name||"undefined",f,h)+s.legend.itemGap*s.pix;if(t>i){i=t}}c.widthArr.push(i);c.heightArr.push(a.length*u+d*2)}let e=0;for(let t=0;t<c.widthArr.length;t++){e+=c.widthArr[t]}c.area.width=e-s.legend.itemGap*s.pix+2*d;c.area.wholeWidth=c.area.width+d}}switch(s.legend.position){case"top":c.area.start.y=s.area[0]+x;c.area.end.y=s.area[0]+x+c.area.height;break;case"bottom":c.area.start.y=s.height-s.area[2]-c.area.height-x;c.area.end.y=s.height-s.area[2]-x;break;case"left":c.area.start.x=s.area[3];c.area.end.x=s.area[3]+c.area.width;break;case"right":c.area.start.x=s.width-s.area[1]-c.area.width;c.area.end.x=s.width-s.area[1];break}t.legendData=c;return c}function calCategoriesData(t,i,e,a,r){var o={angle:0,xAxisHeight:i.xAxis.lineHeight*i.pix+i.xAxis.marginTop*i.pix};var n=i.xAxis.fontSize*i.pix;var l=t.map(function(t,e){var a=i.xAxis.formatter?i.xAxis.formatter(t,e,i):t;return measureText(String(a),n,r)});var s=Math.max.apply(this,l);if(i.xAxis.rotateLabel==true){o.angle=i.xAxis.rotateAngle*Math.PI/180;let t=i.xAxis.marginTop*i.pix*2+Math.abs(s*Math.sin(o.angle));t=t<n+i.xAxis.marginTop*i.pix*2?t+i.xAxis.marginTop*i.pix*2:t;o.xAxisHeight=t}if(i.enableScroll&&i.xAxis.scrollShow){o.xAxisHeight+=6*i.pix}if(i.xAxis.disabled){o.xAxisHeight=0}return o}function getXAxisTextList(t,e,h,c){var a=arguments.length>4&&arguments[4]!==undefined?arguments[4]:-1;var i;if(c=="stack"){i=dataCombineStack(t,e.categories.length)}else{i=dataCombine(t)}var r=[];i=i.filter(function(t){if(typeof t==="object"&&t!==null){if(t.constructor.toString().indexOf("Array")>-1){return t!==null}else{return t.value!==null}}else{return t!==null}});i.map(function(t){if(typeof t==="object"){if(t.constructor.toString().indexOf("Array")>-1){if(e.type=="candle"){t.map(function(t){r.push(t)})}else{r.push(t[0])}}else{r.push(t.value)}}else{r.push(t)}});var o=0;var n=0;if(r.length>0){o=Math.min.apply(this,r);n=Math.max.apply(this,r)}if(a>-1){if(typeof e.xAxis.data[a].min==="number"){o=Math.min(e.xAxis.data[a].min,o)}if(typeof e.xAxis.data[a].max==="number"){n=Math.max(e.xAxis.data[a].max,n)}}else{if(typeof e.xAxis.min==="number"){o=Math.min(e.xAxis.min,o)}if(typeof e.xAxis.max==="number"){n=Math.max(e.xAxis.max,n)}}if(o===n){var d=n||10;n+=d}var l=o;var x=n;var f=[];var p=(x-l)/e.xAxis.splitNumber;for(var s=0;s<=e.xAxis.splitNumber;s++){f.push(l+p*s)}return f}function calXAxisData(t,e,a,i){var r=assign({},{type:""},e.extra.bar);var o={angle:0,xAxisHeight:e.xAxis.lineHeight*e.pix+e.xAxis.marginTop*e.pix};o.ranges=getXAxisTextList(t,e,a,r.type);o.rangesFormat=o.ranges.map(function(t){t=util.toFixed(t,2);return t});var n=o.ranges.map(function(t){t=util.toFixed(t,2);return t});o=Object.assign(o,getXAxisPoints(n,e,a));var l=o.eachSpacing;var s=n.map(function(t){return measureText(t,e.xAxis.fontSize*e.pix,i)});if(e.xAxis.disabled===true){o.xAxisHeight=0}return o}function getRadarDataPoints(r,o,n,a,t){var l=arguments.length>5&&arguments[5]!==undefined?arguments[5]:1;var e=t.extra.radar||{};e.max=e.max||0;var s=Math.max(e.max,Math.max.apply(null,dataCombine(a)));var h=[];for(let e=0;e<a.length;e++){let t=a[e];let i={};i.color=t.color;i.legendShape=t.legendShape;i.pointShape=t.pointShape;i.data=[];t.data.forEach(function(t,e){let a={};a.angle=r[e];a.proportion=t/s;a.value=t;a.position=convertCoordinateOrigin(n*a.proportion*l*Math.cos(a.angle),n*a.proportion*l*Math.sin(a.angle),o);i.data.push(a)});h.push(i)}return h}function getPieDataPoints(a,i){var r=arguments.length>2&&arguments[2]!==undefined?arguments[2]:1;var o=0;var n=0;for(let e=0;e<a.length;e++){let t=a[e];t.data=t.data===null?0:t.data;o+=t.data}for(let e=0;e<a.length;e++){let t=a[e];t.data=t.data===null?0:t.data;if(o===0){t._proportion_=1/a.length*r}else{t._proportion_=t.data/o*r}t._radius_=i}for(let e=0;e<a.length;e++){let t=a[e];t._start_=n;n+=2*t._proportion_*Math.PI}return a}function getFunnelDataPoints(e,a,i,r){var o=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;for(let t=0;t<e.length;t++){if(i.type=="funnel"){e[t].radius=e[t].data/e[0].data*a*o}else{e[t].radius=r*(e.length-t)/(r*e.length)*a*o}e[t]._proportion_=e[t].data/e[0].data}return e}function getRoseDataPoints(a,i,r,o){var n=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;var l=0;var s=0;var h=[];for(let e=0;e<a.length;e++){let t=a[e];t.data=t.data===null?0:t.data;l+=t.data;h.push(t.data)}var c=Math.min.apply(null,h);var d=Math.max.apply(null,h);var x=o-r;for(let e=0;e<a.length;e++){let t=a[e];t.data=t.data===null?0:t.data;if(l===0){t._proportion_=1/a.length*n;t._rose_proportion_=1/a.length*n}else{t._proportion_=t.data/l*n;if(i=="area"){t._rose_proportion_=1/a.length*n}else{t._rose_proportion_=t.data/l*n}}t._radius_=r+x*((t.data-c)/(d-c))||o}for(let e=0;e<a.length;e++){let t=a[e];t._start_=s;s+=2*t._rose_proportion_*Math.PI}return a}function getArcbarDataPoints(i,r){var o=arguments.length>2&&arguments[2]!==undefined?arguments[2]:1;if(o==1){o=.999999}for(let a=0;a<i.length;a++){let t=i[a];t.data=t.data===null?0:t.data;let e;if(r.type=="circle"){e=2}else{if(r.direction=="ccw"){if(r.startAngle<r.endAngle){e=2+r.startAngle-r.endAngle}else{e=r.startAngle-r.endAngle}}else{if(r.endAngle<r.startAngle){e=2+r.endAngle-r.startAngle}else{e=r.startAngle-r.endAngle}}}t._proportion_=e*t.data*o+r.startAngle;if(r.direction=="ccw"){t._proportion_=r.startAngle-e*t.data*o}if(t._proportion_>=2){t._proportion_=t._proportion_%2}}return i}function getGaugeArcbarDataPoints(i,r){var o=arguments.length>2&&arguments[2]!==undefined?arguments[2]:1;if(o==1){o=.999999}for(let a=0;a<i.length;a++){let t=i[a];t.data=t.data===null?0:t.data;let e;if(r.type=="circle"){e=2}else{if(r.endAngle<r.startAngle){e=2+r.endAngle-r.startAngle}else{e=r.startAngle-r.endAngle}}t._proportion_=e*t.data*o+r.startAngle;if(t._proportion_>=2){t._proportion_=t._proportion_%2}}return i}function getGaugeAxisPoints(e,a,t){let i;if(t<a){i=2+t-a}else{i=a-t}let r=a;for(let t=0;t<e.length;t++){e[t].value=e[t].value===null?0:e[t].value;e[t]._startAngle_=r;e[t]._endAngle_=i*e[t].value+a;if(e[t]._endAngle_>=2){e[t]._endAngle_=e[t]._endAngle_%2}r=e[t]._endAngle_}return e}function getGaugeDataPoints(i,r,o){let n=arguments.length>3&&arguments[3]!==undefined?arguments[3]:1;for(let a=0;a<i.length;a++){let e=i[a];e.data=e.data===null?0:e.data;if(o.pointer.color=="auto"){for(let t=0;t<r.length;t++){if(e.data<=r[t].value){e.color=r[t].color;break}}}else{e.color=o.pointer.color}let t;if(o.endAngle<o.startAngle){t=2+o.endAngle-o.startAngle}else{t=o.startAngle-o.endAngle}e._endAngle_=t*e.data+o.startAngle;e._oldAngle_=o.oldAngle;if(o.oldAngle<o.endAngle){e._oldAngle_+=2}if(e.data>=o.oldData){e._proportion_=(e._endAngle_-e._oldAngle_)*n+o.oldAngle}else{e._proportion_=e._oldAngle_-(e._oldAngle_-e._endAngle_)*n}if(e._proportion_>=2){e._proportion_=e._proportion_%2}}return i}function getPieTextMaxLength(i,r,o,n){i=getPieDataPoints(i);let l=0;for(let a=0;a<i.length;a++){let t=i[a];let e=t.formatter?t.formatter(+t._proportion_.toFixed(2)):util.toFixed(t._proportion_*100)+"%";l=Math.max(l,measureText(e,t.textSize*n.pix||r.fontSize,o))}return l}function fixColumeData(t,i,r,o,e,n){return t.map(function(t){if(t===null){return null}var e=0;var a=0;if(n.type=="mix"){e=n.extra.mix.column.seriesGap*n.pix||0;a=n.extra.mix.column.categoryGap*n.pix||0}else{e=n.extra.column.seriesGap*n.pix||0;a=n.extra.column.categoryGap*n.pix||0}e=Math.min(e,i/r);a=Math.min(a,i/r);t.width=Math.ceil((i-2*a-e*(r-1))/r);if(n.extra.mix&&n.extra.mix.column.width&&+n.extra.mix.column.width>0){t.width=Math.min(t.width,+n.extra.mix.column.width*n.pix)}if(n.extra.column&&n.extra.column.width&&+n.extra.column.width>0){t.width=Math.min(t.width,+n.extra.column.width*n.pix)}if(t.width<=0){t.width=1}t.x+=(o+.5-r/2)*(t.width+e);return t})}function fixBarData(t,i,r,o,e,n){return t.map(function(t){if(t===null){return null}var e=0;var a=0;e=n.extra.bar.seriesGap*n.pix||0;a=n.extra.bar.categoryGap*n.pix||0;e=Math.min(e,i/r);a=Math.min(a,i/r);t.width=Math.ceil((i-2*a-e*(r-1))/r);if(n.extra.bar&&n.extra.bar.width&&+n.extra.bar.width>0){t.width=Math.min(t.width,+n.extra.bar.width*n.pix)}if(t.width<=0){t.width=1}t.y+=(o+.5-r/2)*(t.width+e);return t})}function fixColumeMeterData(t,e,a,i,r,o,n){var l=o.extra.column.categoryGap*o.pix||0;return t.map(function(t){if(t===null){return null}t.width=e-2*l;if(o.extra.column&&o.extra.column.width&&+o.extra.column.width>0){t.width=Math.min(t.width,+o.extra.column.width*o.pix)}if(i>0){t.width-=n}return t})}function fixColumeStackData(t,a,e,i,r,o,n){var l=o.extra.column.categoryGap*o.pix||0;return t.map(function(t,e){if(t===null){return null}t.width=Math.ceil(a-2*l);if(o.extra.column&&o.extra.column.width&&+o.extra.column.width>0){t.width=Math.min(t.width,+o.extra.column.width*o.pix)}if(t.width<=0){t.width=1}return t})}function fixBarStackData(t,a,e,i,r,o,n){var l=o.extra.bar.categoryGap*o.pix||0;return t.map(function(t,e){if(t===null){return null}t.width=Math.ceil(a-2*l);if(o.extra.bar&&o.extra.bar.width&&+o.extra.bar.width>0){t.width=Math.min(t.width,+o.extra.bar.width*o.pix)}if(t.width<=0){t.width=1}return t})}function getXAxisPoints(t,e,h){var a=e.width-e.area[1]-e.area[3];var i=e.enableScroll?Math.min(e.xAxis.itemCount,t.length):t.length;if((e.type=="line"||e.type=="area"||e.type=="scatter"||e.type=="bubble"||e.type=="bar")&&i>1&&e.xAxis.boundaryGap=="justify"){i-=1}var r=0;if(e.type=="mount"&&e.extra&&e.extra.mount&&e.extra.mount.widthRatio&&e.extra.mount.widthRatio>1){if(e.extra.mount.widthRatio>2)e.extra.mount.widthRatio=2;r=e.extra.mount.widthRatio-1;i+=r}var o=a/i;var n=[];var l=e.area[3];var s=e.width-e.area[1];t.forEach(function(t,e){n.push(l+r/2*o+e*o)});if(e.xAxis.boundaryGap!=="justify"){if(e.enableScroll===true){n.push(l+r*o+t.length*o)}else{n.push(s)}}return{xAxisPoints:n,startX:l,endX:s,eachSpacing:o}}function getCandleDataPoints(t,l,s,h,c,d,a){var x=arguments.length>7&&arguments[7]!==undefined?arguments[7]:1;var e=[];var f=d.height-d.area[0]-d.area[2];t.forEach(function(t,o){if(t===null){e.push(null)}else{var n=[];t.forEach(function(t,e){var a={};a.x=h[o]+Math.round(c/2);var i=t.value||t;var r=f*(i-l)/(s-l);r*=x;a.y=d.height-Math.round(r)-d.area[2];n.push(a)});e.push(n)}});return e}function getDataPoints(t,a,n,l,s,h,e){var c=arguments.length>7&&arguments[7]!==undefined?arguments[7]:1;var d="center";if(h.type=="line"||h.type=="area"||h.type=="scatter"||h.type=="bubble"){d=h.xAxis.boundaryGap}var x=[];var f=h.height-h.area[0]-h.area[2];var p=h.width-h.area[1]-h.area[3];t.forEach(function(i,t){if(i===null){x.push(null)}else{var r={};r.color=i.color;r.x=l[t];var o=i;if(typeof i==="object"&&i!==null){if(i.constructor.toString().indexOf("Array")>-1){let t,e,a;t=[].concat(h.chartData.xAxisData.ranges);e=t.shift();a=t.pop();o=i[1];r.x=h.area[3]+p*(i[0]-e)/(a-e);if(h.type=="bubble"){r.r=i[2];r.t=i[3]}}else{o=i.value}}if(d=="center"){r.x+=s/2}var e=f*(o-a)/(n-a);e*=c;r.y=h.height-e-h.area[2];x.push(r)}});return x}function getLineDataPoints(t,a,n,l,s,h,e,p,c){var c=arguments.length>8&&arguments[8]!==undefined?arguments[8]:1;var d=h.xAxis.boundaryGap;var x=[];var f=h.height-h.area[0]-h.area[2];var u=h.width-h.area[1]-h.area[3];t.forEach(function(i,t){if(i===null){x.push(null)}else{var r={};r.color=i.color;if(p.animation=="vertical"){r.x=l[t];var o=i;if(typeof i==="object"&&i!==null){if(i.constructor.toString().indexOf("Array")>-1){let t,e,a;t=[].concat(h.chartData.xAxisData.ranges);e=t.shift();a=t.pop();o=i[1];r.x=h.area[3]+u*(i[0]-e)/(a-e)}else{o=i.value}}if(d=="center"){r.x+=s/2}var e=f*(o-a)/(n-a);e*=c;r.y=h.height-e-h.area[2];x.push(r)}else{r.x=l[0]+s*t*c;var o=i;if(d=="center"){r.x+=s/2}var e=f*(o-a)/(n-a);r.y=h.height-e-h.area[2];x.push(r)}}});return x}function getColumnDataPoints(t,a,n,l,s,h,e,i,c){var c=arguments.length>8&&arguments[8]!==undefined?arguments[8]:1;var d=[];var x=h.height-h.area[0]-h.area[2];var f=h.width-h.area[1]-h.area[3];t.forEach(function(i,t){if(i===null){d.push(null)}else{var r={};r.color=i.color;r.x=l[t];var o=i;if(typeof i==="object"&&i!==null){if(i.constructor.toString().indexOf("Array")>-1){let t,e,a;t=[].concat(h.chartData.xAxisData.ranges);e=t.shift();a=t.pop();o=i[1];r.x=h.area[3]+f*(i[0]-e)/(a-e)}else{o=i.value}}r.x+=s/2;var e=x*(o*c-a)/(n-a);r.y=h.height-e-h.area[2];d.push(r)}});return d}function getMountDataPoints(t,o,n,l,s,h,e,a){var c=arguments.length>8&&arguments[8]!==undefined?arguments[8]:1;var d=[];var x=h.height-h.area[0]-h.area[2];var i=h.width-h.area[1]-h.area[3];var f=s*e.widthRatio;t.forEach(function(t,e){if(t===null){d.push(null)}else{var a={};a.color=t.color;a.x=l[e];a.x+=s/2;var i=t.data;var r=x*(i*c-o)/(n-o);a.y=h.height-r-h.area[2];a.value=i;a.width=f;d.push(a)}});return d}function getBarDataPoints(t,o,n,l,e,s,a){var h=arguments.length>7&&arguments[7]!==undefined?arguments[7]:1;var c=[];var i=s.height-s.area[0]-s.area[2];var d=s.width-s.area[1]-s.area[3];t.forEach(function(t,e){if(t===null){c.push(null)}else{var a={};a.color=t.color;a.y=l[e];var i=t;if(typeof t==="object"&&t!==null){i=t.value}var r=d*(i-o)/(n-o);r*=h;a.height=r;a.value=i;a.x=r+s.area[3];c.push(a)}});return c}function getStackDataPoints(t,s,h,c,g,d,e,x,y){var f=arguments.length>9&&arguments[9]!==undefined?arguments[9]:1;var p=[];var u=d.height-d.area[0]-d.area[2];t.forEach(function(t,e){if(t===null){p.push(null)}else{var a={};a.color=t.color;a.x=c[e]+Math.round(g/2);if(x>0){var i=0;for(let t=0;t<=x;t++){i+=y[t].data[e]}var r=i-t;var o=u*(i-s)/(h-s);var n=u*(r-s)/(h-s)}else{var i=t;if(typeof t==="object"&&t!==null){i=t.value}var o=u*(i-s)/(h-s);var n=0}var l=n;o*=f;l*=f;a.y=d.height-Math.round(o)-d.area[2];a.y0=d.height-Math.round(l)-d.area[2];p.push(a)}});return p}function getBarStackDataPoints(t,s,h,c,e,d,a,x,g){var f=arguments.length>9&&arguments[9]!==undefined?arguments[9]:1;var p=[];var u=d.width-d.area[1]-d.area[3];t.forEach(function(t,e){if(t===null){p.push(null)}else{var a={};a.color=t.color;a.y=c[e];if(x>0){var i=0;for(let t=0;t<=x;t++){i+=g[t].data[e]}var r=i-t;var o=u*(i-s)/(h-s);var n=u*(r-s)/(h-s)}else{var i=t;if(typeof t==="object"&&t!==null){i=t.value}var o=u*(i-s)/(h-s);var n=0}var l=n;o*=f;l*=f;a.height=o-l;a.x=d.area[3]+o;a.x0=d.area[3]+l;p.push(a)}});return p}function getYAxisTextList(t,e,h,c,a){var d=arguments.length>5&&arguments[5]!==undefined?arguments[5]:-1;var i;if(c=="stack"){i=dataCombineStack(t,e.categories.length)}else{i=dataCombine(t)}var r=[];i=i.filter(function(t){if(typeof t==="object"&&t!==null){if(t.constructor.toString().indexOf("Array")>-1){return t!==null}else{return t.value!==null}}else{return t!==null}});i.map(function(t){if(typeof t==="object"){if(t.constructor.toString().indexOf("Array")>-1){if(e.type=="candle"){t.map(function(t){r.push(t)})}else{r.push(t[1])}}else{r.push(t.value)}}else{r.push(t)}});var o=a.min||0;var n=a.max||0;if(r.length>0){o=Math.min.apply(this,r);n=Math.max.apply(this,r)}if(o===n){if(n==0){n=10}else{o=0}}var l=getDataRange(o,n);var x=a.min===undefined||a.min===null?l.minRange:a.min;var f=a.max===undefined||a.max===null?l.maxRange:a.max;var p=(f-x)/e.yAxis.splitNumber;var u=[];for(var s=0;s<=e.yAxis.splitNumber;s++){u.push(x+p*s)}return u.reverse()}function calYAxisData(a,o,e,n){var l=assign({},{type:""},o.extra.column);var t=o.yAxis.data.length;var s=new Array(t);if(t>0){for(let e=0;e<t;e++){s[e]=[];for(let t=0;t<a.length;t++){if(a[t].index==e){s[e].push(a[t])}}}var h=new Array(t);var c=new Array(t);var d=new Array(t);for(let r=0;r<t;r++){let i=o.yAxis.data[r];if(o.yAxis.disabled==true){i.disabled=true}if(i.type==="categories"){if(!i.formatter){i.formatter=(t,e,a)=>{return t+(i.unit||"")}}i.categories=i.categories||o.categories;h[r]=i.categories}else{if(!i.formatter){i.formatter=(t,e,a)=>{return util.toFixed(t,i.tofix||0)+(i.unit||"")}}h[r]=getYAxisTextList(s[r],o,e,l.type,i,r)}let a=i.fontSize*o.pix||e.fontSize;d[r]={position:i.position?i.position:"left",width:0};c[r]=h[r].map(function(t,e){t=i.formatter(t,e,o);d[r].width=Math.max(d[r].width,measureText(t,a,n)+5);return t});let t=i.calibration?4*o.pix:0;d[r].width+=t+3*o.pix;if(i.disabled===true){d[r].width=0}}}else{var h=new Array(1);var c=new Array(1);var d=new Array(1);if(o.type==="bar"){h[0]=o.categories;if(!o.yAxis.formatter){o.yAxis.formatter=(t,e,a)=>{return t+(a.yAxis.unit||"")}}}else{if(!o.yAxis.formatter){o.yAxis.formatter=(t,e,a)=>{return t.toFixed(a.yAxis.tofix)+(a.yAxis.unit||"")}}h[0]=getYAxisTextList(a,o,e,l.type,{})}d[0]={position:"left",width:0};var i=o.yAxis.fontSize*o.pix||e.fontSize;c[0]=h[0].map(function(t,e){t=o.yAxis.formatter(t,e,o);d[0].width=Math.max(d[0].width,measureText(t,i,n)+5);return t});d[0].width+=3*o.pix;if(o.yAxis.disabled===true){d[0]={position:"left",width:0};o.yAxis.data[0]={disabled:true}}else{o.yAxis.data[0]={disabled:false,position:"left",max:o.yAxis.max,min:o.yAxis.min,formatter:o.yAxis.formatter};if(o.type==="bar"){o.yAxis.data[0].categories=o.categories;o.yAxis.data[0].type="categories"}}}return{rangesFormat:c,ranges:h,yAxisWidth:d}}function calTooltipYAxisData(r,t,o,e,a){let n=[].concat(o.chartData.yAxisData.ranges);let l=o.height-o.area[0]-o.area[2];let s=o.area[0];let h=[];for(let i=0;i<n.length;i++){let t=Math.max.apply(this,n[i]);let e=Math.min.apply(this,n[i]);let a=t-(t-e)*(r-s)/l;a=o.yAxis.data&&o.yAxis.data[i].formatter?o.yAxis.data[i].formatter(a,i,o):a.toFixed(0);h.push(String(a))}return h}function calMarkLineData(i,r){let o,n;let l=r.height-r.area[0]-r.area[2];for(let a=0;a<i.length;a++){i[a].yAxisIndex=i[a].yAxisIndex?i[a].yAxisIndex:0;let t=[].concat(r.chartData.yAxisData.ranges[i[a].yAxisIndex]);o=t.pop();n=t.shift();let e=l*(i[a].value-o)/(n-o);i[a].y=r.height-Math.round(e)-r.area[2]}return i}function contextRotate(t,e){if(e.rotateLock!==true){t.translate(e.height,0);t.rotate(90*Math.PI/180)}else if(e._rotate_!==true){t.translate(e.height,0);t.rotate(90*Math.PI/180);e._rotate_=true}}function drawPointShape(t,e,a,i,r){i.beginPath();if(r.dataPointShapeType=="hollow"){i.setStrokeStyle(e);i.setFillStyle(r.background);i.setLineWidth(2*r.pix)}else{i.setStrokeStyle("#ffffff");i.setFillStyle(e);i.setLineWidth(1*r.pix)}if(a==="diamond"){t.forEach(function(t,e){if(t!==null){i.moveTo(t.x,t.y-4.5);i.lineTo(t.x-4.5,t.y);i.lineTo(t.x,t.y+4.5);i.lineTo(t.x+4.5,t.y);i.lineTo(t.x,t.y-4.5)}})}else if(a==="circle"){t.forEach(function(t,e){if(t!==null){i.moveTo(t.x+2.5*r.pix,t.y);i.arc(t.x,t.y,3*r.pix,0,2*Math.PI,false)}})}else if(a==="square"){t.forEach(function(t,e){if(t!==null){i.moveTo(t.x-3.5,t.y-3.5);i.rect(t.x-3.5,t.y-3.5,7,7)}})}else if(a==="triangle"){t.forEach(function(t,e){if(t!==null){i.moveTo(t.x,t.y-4.5);i.lineTo(t.x-4.5,t.y+4.5);i.lineTo(t.x+4.5,t.y+4.5);i.lineTo(t.x,t.y-4.5)}})}else if(a==="none"){return}i.closePath();i.fill();i.stroke()}function drawActivePoint(t,e,a,i,r,o,n){if(!r.tooltip){return}if(r.tooltip.group.length>0&&r.tooltip.group.includes(n)==false){return}var l=typeof r.tooltip.index==="number"?r.tooltip.index:r.tooltip.index[r.tooltip.group.indexOf(n)];i.beginPath();if(o.activeType=="hollow"){i.setStrokeStyle(e);i.setFillStyle(r.background);i.setLineWidth(2*r.pix)}else{i.setStrokeStyle("#ffffff");i.setFillStyle(e);i.setLineWidth(1*r.pix)}if(a==="diamond"){t.forEach(function(t,e){if(t!==null&&l==e){i.moveTo(t.x,t.y-4.5);i.lineTo(t.x-4.5,t.y);i.lineTo(t.x,t.y+4.5);i.lineTo(t.x+4.5,t.y);i.lineTo(t.x,t.y-4.5)}})}else if(a==="circle"){t.forEach(function(t,e){if(t!==null&&l==e){i.moveTo(t.x+2.5*r.pix,t.y);i.arc(t.x,t.y,3*r.pix,0,2*Math.PI,false)}})}else if(a==="square"){t.forEach(function(t,e){if(t!==null&&l==e){i.moveTo(t.x-3.5,t.y-3.5);i.rect(t.x-3.5,t.y-3.5,7,7)}})}else if(a==="triangle"){t.forEach(function(t,e){if(t!==null&&l==e){i.moveTo(t.x,t.y-4.5);i.lineTo(t.x-4.5,t.y+4.5);i.lineTo(t.x+4.5,t.y+4.5);i.lineTo(t.x,t.y-4.5)}})}else if(a==="none"){return}i.closePath();i.fill();i.stroke()}function drawRingTitle(t,e,a,i){var r=t.title.fontSize||e.titleFontSize;var o=t.subtitle.fontSize||e.subtitleFontSize;var n=t.title.name||"";var l=t.subtitle.name||"";var c=t.title.color||t.fontColor;var d=t.subtitle.color||t.fontColor;var x=n?r:0;var f=l?o:0;var s=5;if(l){var p=measureText(l,o*t.pix,a);var u=i.x-p/2+(t.subtitle.offsetX||0)*t.pix;var h=i.y+o*t.pix/2+(t.subtitle.offsetY||0)*t.pix;if(n){h+=(x*t.pix+s)/2}a.beginPath();a.setFontSize(o*t.pix);a.setFillStyle(d);a.fillText(l,u,h);a.closePath();a.stroke()}if(n){var g=measureText(n,r*t.pix,a);var y=i.x-g/2+(t.title.offsetX||0);var v=i.y+r*t.pix/2+(t.title.offsetY||0)*t.pix;if(l){v-=(f*t.pix+s)/2}a.beginPath();a.setFontSize(r*t.pix);a.setFillStyle(c);a.fillText(n,y,v);a.closePath();a.stroke()}}function drawPointText(t,o,n,l,s){var h=o.data;var c=o.textOffset?o.textOffset:0;t.forEach(function(t,e){if(t!==null){l.beginPath();var a=o.textSize?o.textSize*s.pix:n.fontSize;l.setFontSize(a);l.setFillStyle(o.textColor||s.fontColor);var i=h[e];if(typeof h[e]==="object"&&h[e]!==null){if(h[e].constructor.toString().indexOf("Array")>-1){i=h[e][1]}else{i=h[e].value}}var r=o.formatter?o.formatter(i,e,o,s):i;l.setTextAlign("center");l.fillText(String(r),t.x,t.y-4+c*s.pix);l.closePath();l.stroke();l.setTextAlign("left")}})}function drawColumePointText(t,n,l,s,h){var c=n.data;var d=n.textOffset?n.textOffset:0;var x=h.extra.column.labelPosition;t.forEach(function(t,e){if(t!==null){s.beginPath();var a=n.textSize?n.textSize*h.pix:l.fontSize;s.setFontSize(a);s.setFillStyle(n.textColor||h.fontColor);var i=c[e];if(typeof c[e]==="object"&&c[e]!==null){if(c[e].constructor.toString().indexOf("Array")>-1){i=c[e][1]}else{i=c[e].value}}var r=n.formatter?n.formatter(i,e,n,h):i;s.setTextAlign("center");var o=t.y-4*h.pix+d*h.pix;if(t.y>n.zeroPoints){o=t.y+d*h.pix+a}if(x=="insideTop"){o=t.y+a+d*h.pix;if(t.y>n.zeroPoints){o=t.y-d*h.pix-4*h.pix}}if(x=="center"){o=t.y+d*h.pix+(h.height-h.area[2]-t.y+a)/2;if(n.zeroPoints<h.height-h.area[2]){o=t.y+d*h.pix+(n.zeroPoints-t.y+a)/2}if(t.y>n.zeroPoints){o=t.y-d*h.pix-(t.y-n.zeroPoints-a)/2}if(h.extra.column.type=="stack"){o=t.y+d*h.pix+(t.y0-t.y+a)/2}}if(x=="bottom"){o=h.height-h.area[2]+d*h.pix-4*h.pix;if(n.zeroPoints<h.height-h.area[2]){o=n.zeroPoints+d*h.pix-4*h.pix}if(t.y>n.zeroPoints){o=n.zeroPoints-d*h.pix+a+2*h.pix}if(h.extra.column.type=="stack"){o=t.y0+d*h.pix-4*h.pix}}s.fillText(String(r),t.x,o);s.closePath();s.stroke();s.setTextAlign("left")}})}function drawMountPointText(t,n,l,s,h,c){var e=n.data;var d=n.textOffset?n.textOffset:0;var a=h.extra.mount.labelPosition;t.forEach(function(t,e){if(t!==null){s.beginPath();var a=n[e].textSize?n[e].textSize*h.pix:l.fontSize;s.setFontSize(a);s.setFillStyle(n[e].textColor||h.fontColor);var i=t.value;var r=n[e].formatter?n[e].formatter(i,e,n,h):i;s.setTextAlign("center");var o=t.y-4*h.pix+d*h.pix;if(t.y>c){o=t.y+d*h.pix+a}s.fillText(String(r),t.x,o);s.closePath();s.stroke();s.setTextAlign("left")}})}function drawBarPointText(t,o,n,l,s){var h=o.data;var e=o.textOffset?o.textOffset:0;t.forEach(function(t,e){if(t!==null){l.beginPath();var a=o.textSize?o.textSize*s.pix:n.fontSize;l.setFontSize(a);l.setFillStyle(o.textColor||s.fontColor);var i=h[e];if(typeof h[e]==="object"&&h[e]!==null){i=h[e].value}var r=o.formatter?o.formatter(i,e,o,s):i;l.setTextAlign("left");l.fillText(String(r),t.x+4*s.pix,t.y+a/2-3);l.closePath();l.stroke()}})}function drawGaugeLabel(e,a,i,r,o,n){a-=e.width/2+e.labelOffset*r.pix;a=a<10?10:a;let t;if(e.endAngle<e.startAngle){t=2+e.endAngle-e.startAngle}else{t=e.startAngle-e.endAngle}let c=t/e.splitLine.splitNumber;let d=e.endNumber-e.startNumber;let x=d/e.splitLine.splitNumber;let l=e.startAngle;let s=e.startNumber;for(let t=0;t<e.splitLine.splitNumber+1;t++){var h={x:a*Math.cos(l*Math.PI),y:a*Math.sin(l*Math.PI)};var f=e.formatter?e.formatter(s,t,r):s;h.x+=i.x-measureText(f,o.fontSize,n)/2;h.y+=i.y;var p=h.x;var u=h.y;n.beginPath();n.setFontSize(o.fontSize);n.setFillStyle(e.labelColor||r.fontColor);n.fillText(f,p,u+o.fontSize/2);n.closePath();n.stroke();l+=c;if(l>=2){l=l%2}s+=x}}function drawRadarLabel(t,s,h,c,d,x){var f=c.extra.radar||{};t.forEach(function(t,e){if(f.labelPointShow===true&&c.categories[e]!==""){var a={x:s*Math.cos(t),y:s*Math.sin(t)};var i=convertCoordinateOrigin(a.x,a.y,h);x.setFillStyle(f.labelPointColor);x.beginPath();x.arc(i.x,i.y,f.labelPointRadius*c.pix,0,2*Math.PI,false);x.closePath();x.fill()}if(f.labelShow===true){var r={x:(s+d.radarLabelTextMargin*c.pix)*Math.cos(t),y:(s+d.radarLabelTextMargin*c.pix)*Math.sin(t)};var o=convertCoordinateOrigin(r.x,r.y,h);var n=o.x;var l=o.y;if(util.approximatelyEqual(r.x,0)){n-=measureText(c.categories[e]||"",d.fontSize,x)/2}else if(r.x<0){n-=measureText(c.categories[e]||"",d.fontSize,x)}x.beginPath();x.setFontSize(d.fontSize);x.setFillStyle(f.labelColor||c.fontColor);x.fillText(c.categories[e]||"",n,l+d.fontSize/2);x.closePath();x.stroke()}})}function drawPieText(n,d,x,f,t,l){var p=x.pieChartLinePadding;var u=[];var g=null;var y=n.map(function(t,e){var a=t.formatter?t.formatter(t,e,n,d):util.toFixed(t._proportion_.toFixed(4)*100)+"%";a=t.labelText?t.labelText:a;var i=2*Math.PI-(t._start_+2*Math.PI*t._proportion_/2);if(t._rose_proportion_){i=2*Math.PI-(t._start_+2*Math.PI*t._rose_proportion_/2)}var r=t.color;var o=t._radius_;return{arc:i,text:a,color:r,radius:o,textColor:t.textColor,textSize:t.textSize,labelShow:t.labelShow}});for(let c=0;c<y.length;c++){let t=y[c];let e=Math.cos(t.arc)*(t.radius+p);let a=Math.sin(t.arc)*(t.radius+p);let i=Math.cos(t.arc)*t.radius;let r=Math.sin(t.arc)*t.radius;let o=e>=0?e+x.pieChartTextPadding:e-x.pieChartTextPadding;let n=a;let l=measureText(t.text,t.textSize*d.pix||x.fontSize,f);let s=n;if(g&&util.isSameXCoordinateArea(g.start,{x:o})){if(o>0){s=Math.min(n,g.start.y)}else if(e<0){s=Math.max(n,g.start.y)}else{if(n>0){s=Math.max(n,g.start.y)}else{s=Math.min(n,g.start.y)}}}if(o<0){o-=l}let h={lineStart:{x:i,y:r},lineEnd:{x:e,y:a},start:{x:o,y:s},width:l,height:x.fontSize,text:t.text,color:t.color,textColor:t.textColor,textSize:t.textSize};g=avoidCollision(h,g);u.push(g)}for(let n=0;n<u.length;n++){if(y[n].labelShow===false){continue}let t=u[n];let e=convertCoordinateOrigin(t.lineStart.x,t.lineStart.y,l);let a=convertCoordinateOrigin(t.lineEnd.x,t.lineEnd.y,l);let i=convertCoordinateOrigin(t.start.x,t.start.y,l);f.setLineWidth(1*d.pix);f.setFontSize(t.textSize*d.pix||x.fontSize);f.beginPath();f.setStrokeStyle(t.color);f.setFillStyle(t.color);f.moveTo(e.x,e.y);let r=t.start.x<0?i.x+t.width:i.x;let o=t.start.x<0?i.x-5:i.x+5;f.quadraticCurveTo(a.x,a.y,r,i.y);f.moveTo(e.x,e.y);f.stroke();f.closePath();f.beginPath();f.moveTo(i.x+t.width,i.y);f.arc(r,i.y,2*d.pix,0,2*Math.PI);f.closePath();f.fill();f.beginPath();f.setFontSize(t.textSize*d.pix||x.fontSize);f.setFillStyle(t.textColor||d.fontColor);f.fillText(t.text,o,i.y+3);f.closePath();f.stroke();f.closePath()}}function drawToolTipSplitLine(r,o,n,l){var s=o.extra.tooltip||{};s.gridType=s.gridType==undefined?"solid":s.gridType;s.dashLength=s.dashLength==undefined?4:s.dashLength;var t=o.area[0];var h=o.height-o.area[2];if(s.gridType=="dash"){l.setLineDash([s.dashLength,s.dashLength])}l.setStrokeStyle(s.gridColor||"#cccccc");l.setLineWidth(1*o.pix);l.beginPath();l.moveTo(r,t);l.lineTo(r,h);l.stroke();l.setLineDash([]);if(s.xAxisLabel){let t=o.categories[o.tooltip.index];l.setFontSize(n.fontSize);let e=measureText(t,n.fontSize,l);let a=r-.5*e;let i=h+2*o.pix;l.beginPath();l.setFillStyle(hexToRgb(s.labelBgColor||n.toolTipBackground,s.labelBgOpacity||n.toolTipOpacity));l.setStrokeStyle(s.labelBgColor||n.toolTipBackground);l.setLineWidth(1*o.pix);l.rect(a-s.boxPadding*o.pix,i,e+2*s.boxPadding*o.pix,n.fontSize+2*s.boxPadding*o.pix);l.closePath();l.stroke();l.fill();l.beginPath();l.setFontSize(n.fontSize);l.setFillStyle(s.labelFontColor||o.fontColor);l.fillText(String(t),a,i+s.boxPadding*o.pix+n.fontSize);l.closePath();l.stroke()}}function drawMarkLine(h,t,c){let e=assign({},{type:"solid",dashLength:4,data:[]},h.extra.markLine);let a=h.area[3];let i=h.width-h.area[1];let r=calMarkLineData(e.data,h);for(let t=0;t<r.length;t++){let s=assign({},{lineColor:"#DE4A42",showLabel:false,labelFontSize:13,labelPadding:6,labelFontColor:"#666666",labelBgColor:"#DFE8FF",labelBgOpacity:.8,labelAlign:"left",labelOffsetX:0,labelOffsetY:0},r[t]);if(e.type=="dash"){c.setLineDash([e.dashLength,e.dashLength])}c.setStrokeStyle(s.lineColor);c.setLineWidth(1*h.pix);c.beginPath();c.moveTo(a,s.y);c.lineTo(i,s.y);c.stroke();c.setLineDash([]);if(s.showLabel){let t=s.labelFontSize*h.pix;let e=s.labelText?s.labelText:s.value;c.setFontSize(t);let a=measureText(e,t,c);let i=a+s.labelPadding*h.pix*2;let r=s.labelAlign=="left"?h.area[3]-i:h.width-h.area[1];r+=s.labelOffsetX;let o=s.y-.5*t-s.labelPadding*h.pix;o+=s.labelOffsetY;let n=r+s.labelPadding*h.pix;let l=s.y;c.setFillStyle(hexToRgb(s.labelBgColor,s.labelBgOpacity));c.setStrokeStyle(s.labelBgColor);c.setLineWidth(1*h.pix);c.beginPath();c.rect(r,o,i,t+2*s.labelPadding*h.pix);c.closePath();c.stroke();c.fill();c.setFontSize(t);c.setTextAlign("left");c.setFillStyle(s.labelFontColor);c.fillText(String(e),n,o+t+s.labelPadding*h.pix/2);c.stroke();c.setTextAlign("left")}}}function drawToolTipHorizentalLine(x,f,p,t,e){var u=assign({},{gridType:"solid",dashLength:4},x.extra.tooltip);var a=x.area[3];var i=x.width-x.area[1];if(u.gridType=="dash"){p.setLineDash([u.dashLength,u.dashLength])}p.setStrokeStyle(u.gridColor||"#cccccc");p.setLineWidth(1*x.pix);p.beginPath();p.moveTo(a,x.tooltip.offset.y);p.lineTo(i,x.tooltip.offset.y);p.stroke();p.setLineDash([]);if(u.yAxisLabel){let l=u.boxPadding*x.pix;let s=calTooltipYAxisData(x.tooltip.offset.y,x.series,x,f,t);let h=x.chartData.yAxisData.yAxisWidth;let c=x.area[3];let d=x.width-x.area[1];for(let n=0;n<s.length;n++){p.setFontSize(u.fontSize*x.pix);let t=measureText(s[n],u.fontSize*x.pix,p);let e,a,i;if(h[n].position=="left"){e=c-(t+l*2)-2*x.pix;a=Math.max(e,e+t+l*2)}else{e=d+2*x.pix;a=Math.max(e+h[n].width,e+t+l*2)}i=a-e;let r=e+(i-t)/2;let o=x.tooltip.offset.y;p.beginPath();p.setFillStyle(hexToRgb(u.labelBgColor||f.toolTipBackground,u.labelBgOpacity||f.toolTipOpacity));p.setStrokeStyle(u.labelBgColor||f.toolTipBackground);p.setLineWidth(1*x.pix);p.rect(e,o-.5*f.fontSize-l,i,f.fontSize+2*l);p.closePath();p.stroke();p.fill();p.beginPath();p.setFontSize(f.fontSize);p.setFillStyle(u.labelFontColor||x.fontColor);p.fillText(s[n],r,o+.5*f.fontSize);p.closePath();p.stroke();if(h[n].position=="left"){c-=h[n].width+x.yAxis.padding*x.pix}else{d+=h[n].width+x.yAxis.padding*x.pix}}}}function drawToolTipSplitArea(t,e,a,i,r){var o=assign({},{activeBgColor:"#000000",activeBgOpacity:.08,activeWidth:r},e.extra.column);o.activeWidth=o.activeWidth>r?r:o.activeWidth;var n=e.area[0];var l=e.height-e.area[2];i.beginPath();i.setFillStyle(hexToRgb(o.activeBgColor,o.activeBgOpacity));i.rect(t-o.activeWidth/2,n,o.activeWidth,l-n);i.closePath();i.fill();i.setFillStyle("#FFFFFF")}function drawBarToolTipSplitArea(t,e,a,i,r){var o=assign({},{activeBgColor:"#000000",activeBgOpacity:.08},e.extra.bar);var n=e.area[3];var l=e.width-e.area[1];i.beginPath();i.setFillStyle(hexToRgb(o.activeBgColor,o.activeBgOpacity));i.rect(n,t-r/2,l-n,r);i.closePath();i.fill();i.setFillStyle("#FFFFFF")}function drawToolTip(e,r,o,a,n,i,f){var l=assign({},{showBox:true,showArrow:true,showCategory:false,bgColor:"#000000",bgOpacity:.7,borderColor:"#000000",borderWidth:0,borderRadius:0,borderOpacity:.7,boxPadding:3,fontColor:"#FFFFFF",fontSize:13,lineHeight:20,legendShow:true,legendShape:"auto",splitLine:true},o.extra.tooltip);if(l.showCategory==true&&o.categories){e.unshift({text:o.categories[o.tooltip.index],color:null})}var s=l.fontSize*o.pix;var p=l.lineHeight*o.pix;var h=l.boxPadding*o.pix;var c=s;var u=5*o.pix;if(l.legendShow==false){c=0;u=0}var d=l.showArrow?8*o.pix:0;var g=false;if(o.type=="line"||o.type=="mount"||o.type=="area"||o.type=="candle"||o.type=="mix"){if(l.splitLine==true){drawToolTipSplitLine(o.tooltip.offset.x,o,a,n)}}r=assign({x:0,y:0},r);r.y-=8*o.pix;var y=e.map(function(t){return measureText(t.text,s,n)});var x=c+u+4*h+Math.max.apply(null,y);var v=2*h+e.length*p;if(l.showBox==false){return}if(r.x-Math.abs(o._scrollDistance_||0)+d+x>o.width){g=true}if(v+r.y>o.height){r.y=o.height-v}n.beginPath();n.setFillStyle(hexToRgb(l.bgColor,l.bgOpacity));n.setLineWidth(l.borderWidth*o.pix);n.setStrokeStyle(hexToRgb(l.borderColor,l.borderOpacity));var t=l.borderRadius;if(g){if(x+d>o.width){r.x=o.width+Math.abs(o._scrollDistance_||0)+d+(x-o.width)}if(x>r.x){r.x=o.width+Math.abs(o._scrollDistance_||0)+d+(x-o.width)}if(l.showArrow){n.moveTo(r.x,r.y+10*o.pix);n.lineTo(r.x-d,r.y+10*o.pix+5*o.pix)}n.arc(r.x-d-t,r.y+v-t,t,0,Math.PI/2,false);n.arc(r.x-d-Math.round(x)+t,r.y+v-t,t,Math.PI/2,Math.PI,false);n.arc(r.x-d-Math.round(x)+t,r.y+t,t,-Math.PI,-Math.PI/2,false);n.arc(r.x-d-t,r.y+t,t,-Math.PI/2,0,false);if(l.showArrow){n.lineTo(r.x-d,r.y+10*o.pix-5*o.pix);n.lineTo(r.x,r.y+10*o.pix)}}else{if(l.showArrow){n.moveTo(r.x,r.y+10*o.pix);n.lineTo(r.x+d,r.y+10*o.pix-5*o.pix)}n.arc(r.x+d+t,r.y+t,t,-Math.PI,-Math.PI/2,false);n.arc(r.x+d+Math.round(x)-t,r.y+t,t,-Math.PI/2,0,false);n.arc(r.x+d+Math.round(x)-t,r.y+v-t,t,0,Math.PI/2,false);n.arc(r.x+d+t,r.y+v-t,t,Math.PI/2,Math.PI,false);if(l.showArrow){n.lineTo(r.x+d,r.y+10*o.pix+5*o.pix);n.lineTo(r.x,r.y+10*o.pix)}}n.closePath();n.fill();if(l.borderWidth>0){n.stroke()}if(l.legendShow){e.forEach(function(t,e){if(t.color!==null){n.beginPath();n.setFillStyle(t.color);var a=r.x+d+2*h;var i=r.y+(p-s)/2+p*e+h+1;if(g){a=r.x-x-d+2*h}switch(t.legendShape){case"line":n.moveTo(a,i+.5*c-2*o.pix);n.fillRect(a,i+.5*c-2*o.pix,c,4*o.pix);break;case"triangle":n.moveTo(a+7.5*o.pix,i+.5*c-5*o.pix);n.lineTo(a+2.5*o.pix,i+.5*c+5*o.pix);n.lineTo(a+12.5*o.pix,i+.5*c+5*o.pix);n.lineTo(a+7.5*o.pix,i+.5*c-5*o.pix);break;case"diamond":n.moveTo(a+7.5*o.pix,i+.5*c-5*o.pix);n.lineTo(a+2.5*o.pix,i+.5*c);n.lineTo(a+7.5*o.pix,i+.5*c+5*o.pix);n.lineTo(a+12.5*o.pix,i+.5*c);n.lineTo(a+7.5*o.pix,i+.5*c-5*o.pix);break;case"circle":n.moveTo(a+7.5*o.pix,i+.5*c);n.arc(a+7.5*o.pix,i+.5*c,5*o.pix,0,2*Math.PI);break;case"rect":n.moveTo(a,i+.5*c-5*o.pix);n.fillRect(a,i+.5*c-5*o.pix,15*o.pix,10*o.pix);break;case"square":n.moveTo(a+2*o.pix,i+.5*c-5*o.pix);n.fillRect(a+2*o.pix,i+.5*c-5*o.pix,10*o.pix,10*o.pix);break;default:n.moveTo(a,i+.5*c-5*o.pix);n.fillRect(a,i+.5*c-5*o.pix,15*o.pix,10*o.pix)}n.closePath();n.fill()}})}e.forEach(function(t,e){var a=r.x+d+2*h+c+u;if(g){a=r.x-x-d+2*h+c+u}var i=r.y+p*e+(p-s)/2-1+h+s;n.beginPath();n.setFontSize(s);n.setTextBaseline("normal");n.setFillStyle(l.fontColor);n.fillText(t.text,a,i);n.closePath();n.stroke()})}function drawColumnDataPoints(T,b,S,w){let A=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;let t=b.chartData.xAxisData,P=t.xAxisPoints,C=t.eachSpacing;let D=assign({},{type:"group",width:C/2,meterBorder:4,meterFillColor:"#FFFFFF",barBorderCircle:false,barBorderRadius:[],seriesGap:2,linearType:"none",linearOpacity:1,customColor:[],colorStop:0,labelPosition:"outside"},b.extra.column);let M=[];w.save();let L=-2;let F=P.length+2;if(b._scrollDistance_&&b._scrollDistance_!==0&&b.enableScroll===true){w.translate(b._scrollDistance_,0);L=Math.floor(-b._scrollDistance_/C)-2;F=L+b.xAxis.itemCount+4}if(b.tooltip&&b.tooltip.textList&&b.tooltip.textList.length&&A===1){drawToolTipSplitArea(b.tooltip.offset.x,b,S,w,C)}D.customColor=fillCustomColor(D.linearType,D.customColor,T,S);T.forEach(function(a,i){let e,t,o;e=[].concat(b.chartData.yAxisData.ranges[a.index]);t=e.pop();o=e.shift();let x=b.height-b.area[0]-b.area[2];let f=x*(0-t)/(o-t);let n=b.height-Math.round(f)-b.area[2];a.zeroPoints=n;var p=a.data;switch(D.type){case"group":var r=getColumnDataPoints(p,t,o,P,C,b,S,n,A);var u=getStackDataPoints(p,t,o,P,C,b,S,i,T,A);M.push(u);r=fixColumeData(r,C,T.length,i,S,b);for(let t=0;t<r.length;t++){let o=r[t];if(o!==null&&t>L&&t<F){var l=o.x-o.width/2;var s=b.height-o.y-b.area[2];w.beginPath();var g=o.color||a.color;var y=o.color||a.color;if(D.linearType!=="none"){var v=w.createLinearGradient(l,o.y,l,n);if(D.linearType=="opacity"){v.addColorStop(0,hexToRgb(g,D.linearOpacity));v.addColorStop(1,hexToRgb(g,1))}else{v.addColorStop(0,hexToRgb(D.customColor[a.linearIndex],D.linearOpacity));v.addColorStop(D.colorStop,hexToRgb(D.customColor[a.linearIndex],D.linearOpacity));v.addColorStop(1,hexToRgb(g,1))}g=v}if(D.barBorderRadius&&D.barBorderRadius.length===4||D.barBorderCircle===true){const h=l;const c=o.y>n?n:o.y;const d=o.width;const s=Math.abs(n-o.y);if(D.barBorderCircle){D.barBorderRadius=[d/2,d/2,0,0]}if(o.y>n){D.barBorderRadius=[0,0,d/2,d/2]}let[t,e,a,i]=D.barBorderRadius;let r=Math.min(d/2,s/2);t=t>r?r:t;e=e>r?r:e;a=a>r?r:a;i=i>r?r:i;t=t<0?0:t;e=e<0?0:e;a=a<0?0:a;i=i<0?0:i;w.arc(h+t,c+t,t,-Math.PI,-Math.PI/2);w.arc(h+d-e,c+e,e,-Math.PI/2,0);w.arc(h+d-a,c+s-a,a,0,Math.PI/2);w.arc(h+i,c+s-i,i,Math.PI/2,Math.PI)}else{w.moveTo(l,o.y);w.lineTo(l+o.width,o.y);w.lineTo(l+o.width,n);w.lineTo(l,n);w.lineTo(l,o.y);w.setLineWidth(1);w.setStrokeStyle(y)}w.setFillStyle(g);w.closePath();w.fill()}};break;case"stack":var r=getStackDataPoints(p,t,o,P,C,b,S,i,T,A);M.push(r);r=fixColumeStackData(r,C,T.length,i,S,b,T);for(let e=0;e<r.length;e++){let t=r[e];if(t!==null&&e>L&&e<F){w.beginPath();var g=t.color||a.color;var l=t.x-t.width/2+1;var s=b.height-t.y-b.area[2];var m=b.height-t.y0-b.area[2];if(i>0){s-=m}w.setFillStyle(g);w.moveTo(l,t.y);w.fillRect(l,t.y,t.width,s);w.closePath();w.fill()}};break;case"meter":var r=getDataPoints(p,t,o,P,C,b,S,A);M.push(r);r=fixColumeMeterData(r,C,T.length,i,S,b,D.meterBorder);for(let t=0;t<r.length;t++){let o=r[t];if(o!==null&&t>L&&t<F){w.beginPath();if(i==0&&D.meterBorder>0){w.setStrokeStyle(a.color);w.setLineWidth(D.meterBorder*b.pix)}if(i==0){w.setFillStyle(D.meterFillColor)}else{w.setFillStyle(o.color||a.color)}var l=o.x-o.width/2;var s=b.height-o.y-b.area[2];if(D.barBorderRadius&&D.barBorderRadius.length===4||D.barBorderCircle===true){const h=l;const c=o.y;const d=o.width;const s=n-o.y;if(D.barBorderCircle){D.barBorderRadius=[d/2,d/2,0,0]}let[t,e,a,i]=D.barBorderRadius;let r=Math.min(d/2,s/2);t=t>r?r:t;e=e>r?r:e;a=a>r?r:a;i=i>r?r:i;t=t<0?0:t;e=e<0?0:e;a=a<0?0:a;i=i<0?0:i;w.arc(h+t,c+t,t,-Math.PI,-Math.PI/2);w.arc(h+d-e,c+e,e,-Math.PI/2,0);w.arc(h+d-a,c+s-a,a,0,Math.PI/2);w.arc(h+i,c+s-i,i,Math.PI/2,Math.PI);w.fill()}else{w.moveTo(l,o.y);w.lineTo(l+o.width,o.y);w.lineTo(l+o.width,n);w.lineTo(l,n);w.lineTo(l,o.y);w.fill()}if(i==0&&D.meterBorder>0){w.closePath();w.stroke()}}}break}});if(b.dataLabel!==false&&A===1){T.forEach(function(t,e){let a,i,r;a=[].concat(b.chartData.yAxisData.ranges[t.index]);i=a.pop();r=a.shift();var o=t.data;switch(D.type){case"group":var n=getColumnDataPoints(o,i,r,P,C,b,S,A);n=fixColumeData(n,C,T.length,e,S,b);drawColumePointText(n,t,S,w,b);break;case"stack":var n=getStackDataPoints(o,i,r,P,C,b,S,e,T,A);drawColumePointText(n,t,S,w,b);break;case"meter":var n=getDataPoints(o,i,r,P,C,b,S,A);drawColumePointText(n,t,S,w,b);break}})}w.restore();return{xAxisPoints:P,calPoints:M,eachSpacing:C}}function drawMountDataPoints(i,r,o,n){let f=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;let t=r.chartData.xAxisData,p=t.xAxisPoints,l=t.eachSpacing;let s=assign({},{type:"mount",widthRatio:1,borderWidth:1,barBorderCircle:false,barBorderRadius:[],linearType:"none",linearOpacity:1,customColor:[],colorStop:0},r.extra.mount);s.widthRatio=s.widthRatio<=0?0:s.widthRatio;s.widthRatio=s.widthRatio>=2?2:s.widthRatio;let e=[];n.save();let u=-2;let g=p.length+2;if(r._scrollDistance_&&r._scrollDistance_!==0&&r.enableScroll===true){n.translate(r._scrollDistance_,0);u=Math.floor(-r._scrollDistance_/l)-2;g=u+r.xAxis.itemCount+4}s.customColor=fillCustomColor(s.linearType,s.customColor,i,o);let y,v,m;y=[].concat(r.chartData.yAxisData.ranges[0]);v=y.pop();m=y.shift();let T=r.height-r.area[0]-r.area[2];let b=T*(0-v)/(m-v);let h=r.height-Math.round(b)-r.area[2];var c=getMountDataPoints(i,v,m,p,l,r,s,h,f);switch(s.type){case"bar":for(let t=0;t<c.length;t++){let o=c[t];if(o!==null&&t>u&&t<g){var d=o.x-l*s.widthRatio/2;var S=r.height-o.y-r.area[2];n.beginPath();var a=o.color||i[t].color;var w=o.color||i[t].color;if(s.linearType!=="none"){var x=n.createLinearGradient(d,o.y,d,h);if(s.linearType=="opacity"){x.addColorStop(0,hexToRgb(a,s.linearOpacity));x.addColorStop(1,hexToRgb(a,1))}else{x.addColorStop(0,hexToRgb(s.customColor[i[t].linearIndex],s.linearOpacity));x.addColorStop(s.colorStop,hexToRgb(s.customColor[i[t].linearIndex],s.linearOpacity));x.addColorStop(1,hexToRgb(a,1))}a=x}if(s.barBorderRadius&&s.barBorderRadius.length===4||s.barBorderCircle===true){const A=d;const P=o.y>h?h:o.y;const C=o.width;const S=Math.abs(h-o.y);if(s.barBorderCircle){s.barBorderRadius=[C/2,C/2,0,0]}if(o.y>h){s.barBorderRadius=[0,0,C/2,C/2]}let[t,e,a,i]=s.barBorderRadius;let r=Math.min(C/2,S/2);t=t>r?r:t;e=e>r?r:e;a=a>r?r:a;i=i>r?r:i;t=t<0?0:t;e=e<0?0:e;a=a<0?0:a;i=i<0?0:i;n.arc(A+t,P+t,t,-Math.PI,-Math.PI/2);n.arc(A+C-e,P+e,e,-Math.PI/2,0);n.arc(A+C-a,P+S-a,a,0,Math.PI/2);n.arc(A+i,P+S-i,i,Math.PI/2,Math.PI)}else{n.moveTo(d,o.y);n.lineTo(d+o.width,o.y);n.lineTo(d+o.width,h);n.lineTo(d,h);n.lineTo(d,o.y)}n.setStrokeStyle(w);n.setFillStyle(a);if(s.borderWidth>0){n.setLineWidth(s.borderWidth*r.pix);n.closePath();n.stroke()}n.fill()}};break;case"triangle":for(let e=0;e<c.length;e++){let t=c[e];if(t!==null&&e>u&&e<g){var d=t.x-l*s.widthRatio/2;var S=r.height-t.y-r.area[2];n.beginPath();var a=t.color||i[e].color;var w=t.color||i[e].color;if(s.linearType!=="none"){var x=n.createLinearGradient(d,t.y,d,h);if(s.linearType=="opacity"){x.addColorStop(0,hexToRgb(a,s.linearOpacity));x.addColorStop(1,hexToRgb(a,1))}else{x.addColorStop(0,hexToRgb(s.customColor[i[e].linearIndex],s.linearOpacity));x.addColorStop(s.colorStop,hexToRgb(s.customColor[i[e].linearIndex],s.linearOpacity));x.addColorStop(1,hexToRgb(a,1))}a=x}n.moveTo(d,h);n.lineTo(t.x,t.y);n.lineTo(d+t.width,h);n.setStrokeStyle(w);n.setFillStyle(a);if(s.borderWidth>0){n.setLineWidth(s.borderWidth*r.pix);n.stroke()}n.fill()}};break;case"mount":for(let e=0;e<c.length;e++){let t=c[e];if(t!==null&&e>u&&e<g){var d=t.x-l*s.widthRatio/2;var S=r.height-t.y-r.area[2];n.beginPath();var a=t.color||i[e].color;var w=t.color||i[e].color;if(s.linearType!=="none"){var x=n.createLinearGradient(d,t.y,d,h);if(s.linearType=="opacity"){x.addColorStop(0,hexToRgb(a,s.linearOpacity));x.addColorStop(1,hexToRgb(a,1))}else{x.addColorStop(0,hexToRgb(s.customColor[i[e].linearIndex],s.linearOpacity));x.addColorStop(s.colorStop,hexToRgb(s.customColor[i[e].linearIndex],s.linearOpacity));x.addColorStop(1,hexToRgb(a,1))}a=x}n.moveTo(d,h);n.bezierCurveTo(t.x-t.width/4,h,t.x-t.width/4,t.y,t.x,t.y);n.bezierCurveTo(t.x+t.width/4,t.y,t.x+t.width/4,h,d+t.width,h);n.setStrokeStyle(w);n.setFillStyle(a);if(s.borderWidth>0){n.setLineWidth(s.borderWidth*r.pix);n.stroke()}n.fill()}};break;case"sharp":for(let e=0;e<c.length;e++){let t=c[e];if(t!==null&&e>u&&e<g){var d=t.x-l*s.widthRatio/2;var S=r.height-t.y-r.area[2];n.beginPath();var a=t.color||i[e].color;var w=t.color||i[e].color;if(s.linearType!=="none"){var x=n.createLinearGradient(d,t.y,d,h);if(s.linearType=="opacity"){x.addColorStop(0,hexToRgb(a,s.linearOpacity));x.addColorStop(1,hexToRgb(a,1))}else{x.addColorStop(0,hexToRgb(s.customColor[i[e].linearIndex],s.linearOpacity));x.addColorStop(s.colorStop,hexToRgb(s.customColor[i[e].linearIndex],s.linearOpacity));x.addColorStop(1,hexToRgb(a,1))}a=x}n.moveTo(d,h);n.quadraticCurveTo(t.x-0,h-S/4,t.x,t.y);n.quadraticCurveTo(t.x+0,h-S/4,d+t.width,h);n.setStrokeStyle(w);n.setFillStyle(a);if(s.borderWidth>0){n.setLineWidth(s.borderWidth*r.pix);n.stroke()}n.fill()}};break}if(r.dataLabel!==false&&f===1){let t,e,a;t=[].concat(r.chartData.yAxisData.ranges[0]);e=t.pop();a=t.shift();var c=getMountDataPoints(i,e,a,p,l,r,s,h,f);drawMountPointText(c,i,o,n,r,h)}n.restore();return{xAxisPoints:p,calPoints:c,eachSpacing:l}}function drawBarDataPoints(y,v,m,T){let b=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;let S=[];let w=(v.height-v.area[0]-v.area[2])/v.categories.length;for(let t=0;t<v.categories.length;t++){S.push(v.area[0]+w/2+w*t)}let A=assign({},{type:"group",width:w/2,meterBorder:4,meterFillColor:"#FFFFFF",barBorderCircle:false,barBorderRadius:[],seriesGap:2,linearType:"none",linearOpacity:1,customColor:[],colorStop:0},v.extra.bar);let P=[];T.save();let C=-2;let D=S.length+2;if(v.tooltip&&v.tooltip.textList&&v.tooltip.textList.length&&b===1){drawBarToolTipSplitArea(v.tooltip.offset.y,v,m,T,w)}A.customColor=fillCustomColor(A.linearType,A.customColor,y,m);y.forEach(function(a,t){let o,e,d;o=[].concat(v.chartData.xAxisData.ranges);d=o.pop();e=o.shift();var x=a.data;switch(A.type){case"group":var i=getBarDataPoints(x,e,d,S,w,v,m,b);var f=getBarStackDataPoints(x,e,d,S,w,v,m,t,y,b);P.push(f);i=fixBarData(i,w,y.length,t,m,v);for(let t=0;t<i.length;t++){let o=i[t];if(o!==null&&t>C&&t<D){var n=v.area[3];var r=o.y-o.width/2;var p=o.height;T.beginPath();var l=o.color||a.color;var u=o.color||a.color;if(A.linearType!=="none"){var s=T.createLinearGradient(n,o.y,o.x,o.y);if(A.linearType=="opacity"){s.addColorStop(0,hexToRgb(l,A.linearOpacity));s.addColorStop(1,hexToRgb(l,1))}else{s.addColorStop(0,hexToRgb(A.customColor[a.linearIndex],A.linearOpacity));s.addColorStop(A.colorStop,hexToRgb(A.customColor[a.linearIndex],A.linearOpacity));s.addColorStop(1,hexToRgb(l,1))}l=s}if(A.barBorderRadius&&A.barBorderRadius.length===4||A.barBorderCircle===true){const g=n;const h=o.width;const c=o.y-o.width/2;const p=o.height;if(A.barBorderCircle){A.barBorderRadius=[h/2,h/2,0,0]}let[t,e,a,i]=A.barBorderRadius;let r=Math.min(h/2,p/2);t=t>r?r:t;e=e>r?r:e;a=a>r?r:a;i=i>r?r:i;t=t<0?0:t;e=e<0?0:e;a=a<0?0:a;i=i<0?0:i;T.arc(g+i,c+i,i,-Math.PI,-Math.PI/2);T.arc(o.x-t,c+t,t,-Math.PI/2,0);T.arc(o.x-e,c+h-e,e,0,Math.PI/2);T.arc(g+a,c+h-a,a,Math.PI/2,Math.PI)}else{T.moveTo(n,r);T.lineTo(o.x,r);T.lineTo(o.x,r+o.width);T.lineTo(n,r+o.width);T.lineTo(n,r);T.setLineWidth(1);T.setStrokeStyle(u)}T.setFillStyle(l);T.closePath();T.fill()}};break;case"stack":var i=getBarStackDataPoints(x,e,d,S,w,v,m,t,y,b);P.push(i);i=fixBarStackData(i,w,y.length,t,m,v,y);for(let e=0;e<i.length;e++){let t=i[e];if(t!==null&&e>C&&e<D){T.beginPath();var l=t.color||a.color;var n=t.x0;T.setFillStyle(l);T.moveTo(n,t.y-t.width/2);T.fillRect(n,t.y-t.width/2,t.height,t.width);T.closePath();T.fill()}};break}});if(v.dataLabel!==false&&b===1){y.forEach(function(t,e){let a,i,r;a=[].concat(v.chartData.xAxisData.ranges);r=a.pop();i=a.shift();var o=t.data;switch(A.type){case"group":var n=getBarDataPoints(o,i,r,S,w,v,m,b);n=fixBarData(n,w,y.length,e,m,v);drawBarPointText(n,t,m,T,v);break;case"stack":var n=getBarStackDataPoints(o,i,r,S,w,v,m,e,y,b);drawBarPointText(n,t,m,T,v);break}})}return{yAxisPoints:S,calPoints:P,eachSpacing:w}}function drawCandleDataPoints(e,t,h,c,d){var g=arguments.length>5&&arguments[5]!==undefined?arguments[5]:1;var s=assign({},{color:{},average:{}},h.extra.candle);s.color=assign({},{upLine:"#f04864",upFill:"#f04864",downLine:"#2fc25b",downFill:"#2fc25b"},s.color);s.average=assign({},{show:false,name:[],day:[],color:c.color},s.average);h.extra.candle=s;let a=h.chartData.xAxisData,x=a.xAxisPoints,f=a.eachSpacing;let y=[];d.save();let p=-2;let v=x.length+2;let u=0;let m=h.width+f;if(h._scrollDistance_&&h._scrollDistance_!==0&&h.enableScroll===true){d.translate(h._scrollDistance_,0);p=Math.floor(-h._scrollDistance_/f)-2;v=p+h.xAxis.itemCount+4;u=-h._scrollDistance_-f*2+h.area[3];m=u+(h.xAxis.itemCount+4)*f}if(s.average.show||t){t.forEach(function(e,t){let a,i,r;a=[].concat(h.chartData.yAxisData.ranges[e.index]);i=a.pop();r=a.shift();var o=e.data;var n=getDataPoints(o,i,r,x,f,h,c,g);var l=splitPoints(n,e);for(let t=0;t<l.length;t++){let i=l[t];d.beginPath();d.setStrokeStyle(e.color);d.setLineWidth(1);if(i.length===1){d.moveTo(i[0].x,i[0].y);d.arc(i[0].x,i[0].y,1,0,2*Math.PI)}else{d.moveTo(i[0].x,i[0].y);let a=0;for(let e=0;e<i.length;e++){let t=i[e];if(a==0&&t.x>u){d.moveTo(t.x,t.y);a=1}if(e>0&&t.x>u&&t.x<m){var s=createCurveControlPoints(i,e-1);d.bezierCurveTo(s.ctrA.x,s.ctrA.y,s.ctrB.x,s.ctrB.y,t.x,t.y)}}d.moveTo(i[0].x,i[0].y)}d.closePath();d.stroke()}})}e.forEach(function(t,e){let a,i,r;a=[].concat(h.chartData.yAxisData.ranges[t.index]);i=a.pop();r=a.shift();var o=t.data;var n=getCandleDataPoints(o,i,r,x,f,h,c,g);y.push(n);var l=splitPoints(n,t);for(let e=0;e<l[0].length;e++){if(e>p&&e<v){let t=l[0][e];d.beginPath();if(o[e][1]-o[e][0]>0){d.setStrokeStyle(s.color.upLine);d.setFillStyle(s.color.upFill);d.setLineWidth(1*h.pix);d.moveTo(t[3].x,t[3].y);d.lineTo(t[1].x,t[1].y);d.lineTo(t[1].x-f/4,t[1].y);d.lineTo(t[0].x-f/4,t[0].y);d.lineTo(t[0].x,t[0].y);d.lineTo(t[2].x,t[2].y);d.lineTo(t[0].x,t[0].y);d.lineTo(t[0].x+f/4,t[0].y);d.lineTo(t[1].x+f/4,t[1].y);d.lineTo(t[1].x,t[1].y);d.moveTo(t[3].x,t[3].y)}else{d.setStrokeStyle(s.color.downLine);d.setFillStyle(s.color.downFill);d.setLineWidth(1*h.pix);d.moveTo(t[3].x,t[3].y);d.lineTo(t[0].x,t[0].y);d.lineTo(t[0].x-f/4,t[0].y);d.lineTo(t[1].x-f/4,t[1].y);d.lineTo(t[1].x,t[1].y);d.lineTo(t[2].x,t[2].y);d.lineTo(t[1].x,t[1].y);d.lineTo(t[1].x+f/4,t[1].y);d.lineTo(t[0].x+f/4,t[0].y);d.lineTo(t[0].x,t[0].y);d.moveTo(t[3].x,t[3].y)}d.closePath();d.fill();d.stroke()}}});d.restore();return{xAxisPoints:x,calPoints:y,eachSpacing:f}}function drawAreaDataPoints(t,s,h,c){var d=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;var x=assign({},{type:"straight",opacity:.2,addLine:false,width:2,gradient:false,activeType:"none"},s.extra.area);let e=s.chartData.xAxisData,f=e.xAxisPoints,p=e.eachSpacing;let y=s.height-s.area[2];let v=[];c.save();let u=0;let g=s.width+p;if(s._scrollDistance_&&s._scrollDistance_!==0&&s.enableScroll===true){c.translate(s._scrollDistance_,0);u=-s._scrollDistance_-p*2+s.area[3];g=u+(s.xAxis.itemCount+4)*p}t.forEach(function(e,t){let a,i,r;a=[].concat(s.chartData.yAxisData.ranges[e.index]);i=a.pop();r=a.shift();let o=e.data;let n=getDataPoints(o,i,r,f,p,s,h,d);v.push(n);let l=splitPoints(n,e);for(let t=0;t<l.length;t++){let r=l[t];c.beginPath();c.setStrokeStyle(hexToRgb(e.color,x.opacity));if(x.gradient){let t=c.createLinearGradient(0,s.area[0],0,s.height-s.area[2]);t.addColorStop("0",hexToRgb(e.color,x.opacity));t.addColorStop("1.0",hexToRgb("#FFFFFF",.1));c.setFillStyle(t)}else{c.setFillStyle(hexToRgb(e.color,x.opacity))}c.setLineWidth(x.width*s.pix);if(r.length>1){let t=r[0];let e=r[r.length-1];c.moveTo(t.x,t.y);let i=0;if(x.type==="curve"){for(let a=0;a<r.length;a++){let e=r[a];if(i==0&&e.x>u){c.moveTo(e.x,e.y);i=1}if(a>0&&e.x>u&&e.x<g){let t=createCurveControlPoints(r,a-1);c.bezierCurveTo(t.ctrA.x,t.ctrA.y,t.ctrB.x,t.ctrB.y,e.x,e.y)}}}if(x.type==="straight"){for(let e=0;e<r.length;e++){let t=r[e];if(i==0&&t.x>u){c.moveTo(t.x,t.y);i=1}if(e>0&&t.x>u&&t.x<g){c.lineTo(t.x,t.y)}}}if(x.type==="step"){for(let e=0;e<r.length;e++){let t=r[e];if(i==0&&t.x>u){c.moveTo(t.x,t.y);i=1}if(e>0&&t.x>u&&t.x<g){c.lineTo(t.x,r[e-1].y);c.lineTo(t.x,t.y)}}}c.lineTo(e.x,y);c.lineTo(t.x,y);c.lineTo(t.x,t.y)}else{let t=r[0];c.moveTo(t.x-p/2,t.y)}c.closePath();c.fill();if(x.addLine){if(e.lineType=="dash"){let t=e.dashLength?e.dashLength:8;t*=s.pix;c.setLineDash([t,t])}c.beginPath();c.setStrokeStyle(e.color);c.setLineWidth(x.width*s.pix);if(r.length===1){c.moveTo(r[0].x,r[0].y)}else{c.moveTo(r[0].x,r[0].y);let i=0;if(x.type==="curve"){for(let a=0;a<r.length;a++){let e=r[a];if(i==0&&e.x>u){c.moveTo(e.x,e.y);i=1}if(a>0&&e.x>u&&e.x<g){let t=createCurveControlPoints(r,a-1);c.bezierCurveTo(t.ctrA.x,t.ctrA.y,t.ctrB.x,t.ctrB.y,e.x,e.y)}}}if(x.type==="straight"){for(let e=0;e<r.length;e++){let t=r[e];if(i==0&&t.x>u){c.moveTo(t.x,t.y);i=1}if(e>0&&t.x>u&&t.x<g){c.lineTo(t.x,t.y)}}}if(x.type==="step"){for(let e=0;e<r.length;e++){let t=r[e];if(i==0&&t.x>u){c.moveTo(t.x,t.y);i=1}if(e>0&&t.x>u&&t.x<g){c.lineTo(t.x,r[e-1].y);c.lineTo(t.x,t.y)}}}c.moveTo(r[0].x,r[0].y)}c.stroke();c.setLineDash([])}}if(s.dataPointShape!==false){drawPointShape(n,e.color,e.pointShape,c,s)}drawActivePoint(n,e.color,e.pointShape,c,s,x,t)});if(s.dataLabel!==false&&d===1){t.forEach(function(t,e){let a,i,r;a=[].concat(s.chartData.yAxisData.ranges[t.index]);i=a.pop();r=a.shift();var o=t.data;var n=getDataPoints(o,i,r,f,p,s,h,d);drawPointText(n,t,h,c,s)})}c.restore();return{xAxisPoints:f,calPoints:v,eachSpacing:p}}function drawScatterDataPoints(t,s,h,c){var d=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;var i=assign({},{type:"circle"},s.extra.scatter);let e=s.chartData.xAxisData,x=e.xAxisPoints,f=e.eachSpacing;var r=[];c.save();let a=0;let o=s.width+f;if(s._scrollDistance_&&s._scrollDistance_!==0&&s.enableScroll===true){c.translate(s._scrollDistance_,0);a=-s._scrollDistance_-f*2+s.area[3];o=a+(s.xAxis.itemCount+4)*f}t.forEach(function(t,e){let a,i,r;a=[].concat(s.chartData.yAxisData.ranges[t.index]);i=a.pop();r=a.shift();var o=t.data;var n=getDataPoints(o,i,r,x,f,s,h,d);c.beginPath();c.setStrokeStyle(t.color);c.setFillStyle(t.color);c.setLineWidth(1*s.pix);var l=t.pointShape;if(l==="diamond"){n.forEach(function(t,e){if(t!==null){c.moveTo(t.x,t.y-4.5);c.lineTo(t.x-4.5,t.y);c.lineTo(t.x,t.y+4.5);c.lineTo(t.x+4.5,t.y);c.lineTo(t.x,t.y-4.5)}})}else if(l==="circle"){n.forEach(function(t,e){if(t!==null){c.moveTo(t.x+2.5*s.pix,t.y);c.arc(t.x,t.y,3*s.pix,0,2*Math.PI,false)}})}else if(l==="square"){n.forEach(function(t,e){if(t!==null){c.moveTo(t.x-3.5,t.y-3.5);c.rect(t.x-3.5,t.y-3.5,7,7)}})}else if(l==="triangle"){n.forEach(function(t,e){if(t!==null){c.moveTo(t.x,t.y-4.5);c.lineTo(t.x-4.5,t.y+4.5);c.lineTo(t.x+4.5,t.y+4.5);c.lineTo(t.x,t.y-4.5)}})}else if(l==="triangle"){return}c.closePath();c.fill();c.stroke()});if(s.dataLabel!==false&&d===1){t.forEach(function(t,e){let a,i,r;a=[].concat(s.chartData.yAxisData.ranges[t.index]);i=a.pop();r=a.shift();var o=t.data;var n=getDataPoints(o,i,r,x,f,s,h,d);drawPointText(n,t,h,c,s)})}c.restore();return{xAxisPoints:x,calPoints:r,eachSpacing:f}}function drawBubbleDataPoints(a,l,s,h){var c=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;var d=assign({},{opacity:1,border:2},l.extra.bubble);let t=l.chartData.xAxisData,x=t.xAxisPoints,f=t.eachSpacing;var i=[];h.save();let e=0;let r=l.width+f;if(l._scrollDistance_&&l._scrollDistance_!==0&&l.enableScroll===true){h.translate(l._scrollDistance_,0);e=-l._scrollDistance_-f*2+l.area[3];r=e+(l.xAxis.itemCount+4)*f}a.forEach(function(i,t){let e,a,r;e=[].concat(l.chartData.yAxisData.ranges[i.index]);a=e.pop();r=e.shift();var o=i.data;var n=getDataPoints(o,a,r,x,f,l,s,c);h.beginPath();h.setStrokeStyle(i.color);h.setLineWidth(d.border*l.pix);h.setFillStyle(hexToRgb(i.color,d.opacity));n.forEach(function(t,e){h.moveTo(t.x+t.r,t.y);h.arc(t.x,t.y,t.r*l.pix,0,2*Math.PI,false)});h.closePath();h.fill();h.stroke();if(l.dataLabel!==false&&c===1){n.forEach(function(t,e){h.beginPath();var a=i.textSize*l.pix||s.fontSize;h.setFontSize(a);h.setFillStyle(i.textColor||"#FFFFFF");h.setTextAlign("center");h.fillText(String(t.t),t.x,t.y+a/2);h.closePath();h.stroke();h.setTextAlign("left")})}});h.restore();return{xAxisPoints:x,calPoints:i,eachSpacing:f}}function drawLineDataPoints(t,d,x,f){var p=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;var u=assign({},{type:"straight",width:2,activeType:"none",linearType:"none",onShadow:false,animation:"vertical"},d.extra.line);u.width*=d.pix;let e=d.chartData.xAxisData,g=e.xAxisPoints,y=e.eachSpacing;var T=[];f.save();let v=0;let m=d.width+y;if(d._scrollDistance_&&d._scrollDistance_!==0&&d.enableScroll===true){f.translate(d._scrollDistance_,0);v=-d._scrollDistance_-y*2+d.area[3];m=v+(d.xAxis.itemCount+4)*y}t.forEach(function(e,c){f.beginPath();f.setStrokeStyle(e.color);f.moveTo(-1e4,-1e4);f.lineTo(-10001,-10001);f.stroke();let t,a,i;t=[].concat(d.chartData.yAxisData.ranges[e.index]);a=t.pop();i=t.shift();var r=e.data;var o=getLineDataPoints(r,a,i,g,y,d,x,u,p);T.push(o);var n=splitPoints(o,e);if(e.lineType=="dash"){let t=e.dashLength?e.dashLength:8;t*=d.pix;f.setLineDash([t,t])}f.beginPath();var l=e.color;if(u.linearType!=="none"&&e.linearColor&&e.linearColor.length>0){var s=f.createLinearGradient(d.chartData.xAxisData.startX,d.height/2,d.chartData.xAxisData.endX,d.height/2);for(var h=0;h<e.linearColor.length;h++){s.addColorStop(e.linearColor[h][0],hexToRgb(e.linearColor[h][1],1))}l=s}f.setStrokeStyle(l);if(u.onShadow==true&&e.setShadow&&e.setShadow.length>0){f.setShadow(e.setShadow[0],e.setShadow[1],e.setShadow[2],e.setShadow[3])}else{f.setShadow(0,0,0,"rgba(0,0,0,0)")}f.setLineWidth(u.width);n.forEach(function(i,t){if(i.length===1){f.moveTo(i[0].x,i[0].y)}else{f.moveTo(i[0].x,i[0].y);let a=0;if(u.type==="curve"){for(let e=0;e<i.length;e++){let t=i[e];if(a==0&&t.x>v){f.moveTo(t.x,t.y);a=1}if(e>0&&t.x>v&&t.x<m){var r=createCurveControlPoints(i,e-1);f.bezierCurveTo(r.ctrA.x,r.ctrA.y,r.ctrB.x,r.ctrB.y,t.x,t.y)}}}if(u.type==="straight"){for(let e=0;e<i.length;e++){let t=i[e];if(a==0&&t.x>v){f.moveTo(t.x,t.y);a=1}if(e>0&&t.x>v&&t.x<m){f.lineTo(t.x,t.y)}}}if(u.type==="step"){for(let e=0;e<i.length;e++){let t=i[e];if(a==0&&t.x>v){f.moveTo(t.x,t.y);a=1}if(e>0&&t.x>v&&t.x<m){f.lineTo(t.x,i[e-1].y);f.lineTo(t.x,t.y)}}}f.moveTo(i[0].x,i[0].y)}});f.stroke();f.setLineDash([]);if(d.dataPointShape!==false){drawPointShape(o,e.color,e.pointShape,f,d)}drawActivePoint(o,e.color,e.pointShape,f,d,u)});if(d.dataLabel!==false&&p===1){t.forEach(function(t,e){let a,i,r;a=[].concat(d.chartData.yAxisData.ranges[t.index]);i=a.pop();r=a.shift();var o=t.data;var n=getDataPoints(o,i,r,g,y,d,x,p);drawPointText(n,t,x,f,d)})}f.restore();return{xAxisPoints:g,calPoints:T,eachSpacing:y}}function drawMixDataPoints(t,v,m,T){let D=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;let e=v.chartData.xAxisData,b=e.xAxisPoints,S=e.eachSpacing;let w=assign({},{width:S/2,barBorderCircle:false,barBorderRadius:[],seriesGap:2,linearType:"none",linearOpacity:1,customColor:[],colorStop:0},v.extra.mix.column);let A=assign({},{opacity:.2,gradient:false},v.extra.mix.area);let M=assign({},{width:2},v.extra.mix.line);let L=v.height-v.area[2];let F=[];var _=0;var k=0;t.forEach(function(t,e){if(t.type=="column"){k+=1}});T.save();let R=-2;let I=b.length+2;let P=0;let C=v.width+S;if(v._scrollDistance_&&v._scrollDistance_!==0&&v.enableScroll===true){T.translate(v._scrollDistance_,0);R=Math.floor(-v._scrollDistance_/S)-2;I=R+v.xAxis.itemCount+4;P=-v._scrollDistance_-S*2+v.area[3];C=P+(v.xAxis.itemCount+4)*S}w.customColor=fillCustomColor(w.linearType,w.customColor,t,m);t.forEach(function(n,t){let o,x,f;o=[].concat(v.chartData.yAxisData.ranges[n.index]);x=o.pop();f=o.shift();var p=n.data;var a=getDataPoints(p,x,f,b,S,v,m,D);F.push(a);if(n.type=="column"){a=fixColumeData(a,S,k,_,m,v);for(let t=0;t<a.length;t++){let o=a[t];if(o!==null&&t>R&&t<I){var l=o.x-o.width/2;var s=v.height-o.y-v.area[2];T.beginPath();var e=o.color||n.color;var u=o.color||n.color;if(w.linearType!=="none"){var i=T.createLinearGradient(l,o.y,l,v.height-v.area[2]);if(w.linearType=="opacity"){i.addColorStop(0,hexToRgb(e,w.linearOpacity));i.addColorStop(1,hexToRgb(e,1))}else{i.addColorStop(0,hexToRgb(w.customColor[n.linearIndex],w.linearOpacity));i.addColorStop(w.colorStop,hexToRgb(w.customColor[n.linearIndex],w.linearOpacity));i.addColorStop(1,hexToRgb(e,1))}e=i}if(w.barBorderRadius&&w.barBorderRadius.length===4||w.barBorderCircle){const h=l;const c=o.y;const d=o.width;const s=v.height-v.area[2]-o.y;if(w.barBorderCircle){w.barBorderRadius=[d/2,d/2,0,0]}let[t,e,a,i]=w.barBorderRadius;let r=Math.min(d/2,s/2);t=t>r?r:t;e=e>r?r:e;a=a>r?r:a;i=i>r?r:i;t=t<0?0:t;e=e<0?0:e;a=a<0?0:a;i=i<0?0:i;T.arc(h+t,c+t,t,-Math.PI,-Math.PI/2);T.arc(h+d-e,c+e,e,-Math.PI/2,0);T.arc(h+d-a,c+s-a,a,0,Math.PI/2);T.arc(h+i,c+s-i,i,Math.PI/2,Math.PI)}else{T.moveTo(l,o.y);T.lineTo(l+o.width,o.y);T.lineTo(l+o.width,v.height-v.area[2]);T.lineTo(l,v.height-v.area[2]);T.lineTo(l,o.y);T.setLineWidth(1);T.setStrokeStyle(u)}T.setFillStyle(e);T.closePath();T.fill()}}_+=1}if(n.type=="area"){let e=splitPoints(a,n);for(let t=0;t<e.length;t++){let i=e[t];T.beginPath();T.setStrokeStyle(n.color);T.setStrokeStyle(hexToRgb(n.color,A.opacity));if(A.gradient){let t=T.createLinearGradient(0,v.area[0],0,v.height-v.area[2]);t.addColorStop("0",hexToRgb(n.color,A.opacity));t.addColorStop("1.0",hexToRgb("#FFFFFF",.1));T.setFillStyle(t)}else{T.setFillStyle(hexToRgb(n.color,A.opacity))}T.setLineWidth(2*v.pix);if(i.length>1){var r=i[0];let t=i[i.length-1];T.moveTo(r.x,r.y);let a=0;if(n.style==="curve"){for(let e=0;e<i.length;e++){let t=i[e];if(a==0&&t.x>P){T.moveTo(t.x,t.y);a=1}if(e>0&&t.x>P&&t.x<C){var g=createCurveControlPoints(i,e-1);T.bezierCurveTo(g.ctrA.x,g.ctrA.y,g.ctrB.x,g.ctrB.y,t.x,t.y)}}}else{for(let e=0;e<i.length;e++){let t=i[e];if(a==0&&t.x>P){T.moveTo(t.x,t.y);a=1}if(e>0&&t.x>P&&t.x<C){T.lineTo(t.x,t.y)}}}T.lineTo(t.x,L);T.lineTo(r.x,L);T.lineTo(r.x,r.y)}else{let t=i[0];T.moveTo(t.x-S/2,t.y)}T.closePath();T.fill()}}if(n.type=="line"){var y=splitPoints(a,n);y.forEach(function(i,t){if(n.lineType=="dash"){let t=n.dashLength?n.dashLength:8;t*=v.pix;T.setLineDash([t,t])}T.beginPath();T.setStrokeStyle(n.color);T.setLineWidth(M.width*v.pix);if(i.length===1){T.moveTo(i[0].x,i[0].y)}else{T.moveTo(i[0].x,i[0].y);let a=0;if(n.style=="curve"){for(let e=0;e<i.length;e++){let t=i[e];if(a==0&&t.x>P){T.moveTo(t.x,t.y);a=1}if(e>0&&t.x>P&&t.x<C){var r=createCurveControlPoints(i,e-1);T.bezierCurveTo(r.ctrA.x,r.ctrA.y,r.ctrB.x,r.ctrB.y,t.x,t.y)}}}else{for(let e=0;e<i.length;e++){let t=i[e];if(a==0&&t.x>P){T.moveTo(t.x,t.y);a=1}if(e>0&&t.x>P&&t.x<C){T.lineTo(t.x,t.y)}}}T.moveTo(i[0].x,i[0].y)}T.stroke();T.setLineDash([])})}if(n.type=="point"){n.addPoint=true}if(n.addPoint==true&&n.type!=="column"){drawPointShape(a,n.color,n.pointShape,T,v)}});if(v.dataLabel!==false&&D===1){var _=0;t.forEach(function(t,e){let a,i,r;a=[].concat(v.chartData.yAxisData.ranges[t.index]);i=a.pop();r=a.shift();var o=t.data;var n=getDataPoints(o,i,r,b,S,v,m,D);if(t.type!=="column"){drawPointText(n,t,m,T,v)}else{n=fixColumeData(n,S,k,_,m,v);drawPointText(n,t,m,T,v);_+=1}})}T.restore();return{xAxisPoints:b,calPoints:F,eachSpacing:S}}function drawToolTipBridge(t,e,a,i,r,o){var n=t.extra.tooltip||{};if(n.horizentalLine&&t.tooltip&&i===1&&(t.type=="line"||t.type=="area"||t.type=="column"||t.type=="mount"||t.type=="candle"||t.type=="mix")){drawToolTipHorizentalLine(t,e,a,r,o)}a.save();if(t._scrollDistance_&&t._scrollDistance_!==0&&t.enableScroll===true){a.translate(t._scrollDistance_,0)}if(t.tooltip&&t.tooltip.textList&&t.tooltip.textList.length&&i===1){drawToolTip(t.tooltip.textList,t.tooltip.offset,t,e,a,r,o)}a.restore()}function drawXAxis(r,h,c,d){let e=h.chartData.xAxisData,x=e.xAxisPoints,t=e.startX,a=e.endX,f=e.eachSpacing;var p="center";if(h.type=="bar"||h.type=="line"||h.type=="area"||h.type=="scatter"||h.type=="bubble"){p=h.xAxis.boundaryGap}var u=h.height-h.area[2];var i=h.area[0];if(h.enableScroll&&h.xAxis.scrollShow){var o=h.height-h.area[2]+c.xAxisHeight;var n=a-t;var l=f*(x.length-1);if(h.type=="mount"&&h.extra&&h.extra.mount&&h.extra.mount.widthRatio&&h.extra.mount.widthRatio>1){if(h.extra.mount.widthRatio>2)h.extra.mount.widthRatio=2;l+=(h.extra.mount.widthRatio-1)*f}var s=n*n/l;var y=0;if(h._scrollDistance_){y=-h._scrollDistance_*n/l}d.beginPath();d.setLineCap("round");d.setLineWidth(6*h.pix);d.setStrokeStyle(h.xAxis.scrollBackgroundColor||"#EFEBEF");d.moveTo(t,o);d.lineTo(a,o);d.stroke();d.closePath();d.beginPath();d.setLineCap("round");d.setLineWidth(6*h.pix);d.setStrokeStyle(h.xAxis.scrollColor||"#A6A6A6");d.moveTo(t+y,o);d.lineTo(t+y+s,o);d.stroke();d.closePath();d.setLineCap("butt")}d.save();if(h._scrollDistance_&&h._scrollDistance_!==0){d.translate(h._scrollDistance_,0)}if(h.xAxis.calibration===true){d.setStrokeStyle(h.xAxis.gridColor||"#cccccc");d.setLineCap("butt");d.setLineWidth(1*h.pix);x.forEach(function(t,e){if(e>0){d.beginPath();d.moveTo(t-f/2,u);d.lineTo(t-f/2,u+3*h.pix);d.closePath();d.stroke()}})}if(h.xAxis.disableGrid!==true){d.setStrokeStyle(h.xAxis.gridColor||"#cccccc");d.setLineCap("butt");d.setLineWidth(1*h.pix);if(h.xAxis.gridType=="dash"){d.setLineDash([h.xAxis.dashLength*h.pix,h.xAxis.dashLength*h.pix])}h.xAxis.gridEval=h.xAxis.gridEval||1;x.forEach(function(t,e){if(e%h.xAxis.gridEval==0){d.beginPath();d.moveTo(t,u);d.lineTo(t,i);d.stroke()}});d.setLineDash([])}if(h.xAxis.disabled!==true){let t=r.length;if(h.xAxis.labelCount){if(h.xAxis.itemCount){t=Math.ceil(r.length/h.xAxis.itemCount*h.xAxis.labelCount)}else{t=h.xAxis.labelCount}t-=1}let e=Math.ceil(r.length/t);let a=[];let i=r.length;for(let t=0;t<i;t++){if(t%e!==0){a.push("")}else{a.push(r[t])}}a[i-1]=r[i-1];var g=h.xAxis.fontSize*h.pix||c.fontSize;if(c._xAxisTextAngle_===0){a.forEach(function(t,e){var a=h.xAxis.formatter?h.xAxis.formatter(t,e,h):t;var i=-measureText(String(a),g,d)/2;if(p=="center"){i+=f/2}var r=0;if(h.xAxis.scrollShow){r=6*h.pix}var o=h._scrollDistance_||0;var n=p=="center"?x[e]+f/2:x[e];if(n-Math.abs(o)>=h.area[3]-1&&n-Math.abs(o)<=h.width-h.area[1]+1){d.beginPath();d.setFontSize(g);d.setFillStyle(h.xAxis.fontColor||h.fontColor);d.fillText(String(a),x[e]+i,u+h.xAxis.marginTop*h.pix+(h.xAxis.lineHeight-h.xAxis.fontSize)*h.pix/2+h.xAxis.fontSize*h.pix);d.closePath();d.stroke()}})}else{a.forEach(function(t,e){var a=h.xAxis.formatter?h.xAxis.formatter(t):t;var i=h._scrollDistance_||0;var r=p=="center"?x[e]+f/2:x[e];if(r-Math.abs(i)>=h.area[3]-1&&r-Math.abs(i)<=h.width-h.area[1]+1){d.save();d.beginPath();d.setFontSize(g);d.setFillStyle(h.xAxis.fontColor||h.fontColor);var o=measureText(String(a),g,d);var n=x[e];if(p=="center"){n=x[e]+f/2}var l=0;if(h.xAxis.scrollShow){l=6*h.pix}var s=u+h.xAxis.marginTop*h.pix+g-g*Math.abs(Math.sin(c._xAxisTextAngle_));if(h.xAxis.rotateAngle<0){n-=g/2;o=0}else{n+=g/2;o=-o}d.translate(n,s);d.rotate(-1*c._xAxisTextAngle_);d.fillText(String(a),o,0);d.closePath();d.stroke();d.restore()}})}}d.restore();if(h.xAxis.title){d.beginPath();d.setFontSize(h.xAxis.titleFontSize*h.pix);d.setFillStyle(h.xAxis.titleFontColor);d.fillText(String(h.xAxis.title),h.width-h.area[1]+h.xAxis.titleOffsetX*h.pix,h.height-h.area[2]+h.xAxis.marginTop*h.pix+(h.xAxis.lineHeight-h.xAxis.titleFontSize)*h.pix/2+(h.xAxis.titleFontSize+h.xAxis.titleOffsetY)*h.pix);d.closePath();d.stroke()}if(h.xAxis.axisLine){d.beginPath();d.setStrokeStyle(h.xAxis.axisLineColor);d.setLineWidth(1*h.pix);d.moveTo(t,h.height-h.area[2]);d.lineTo(a,h.height-h.area[2]);d.stroke()}}function drawYAxisGrid(c,e,d,a){if(e.yAxis.disableGrid===true){return}let t=e.height-e.area[0]-e.area[2];let i=t/e.yAxis.splitNumber;let r=e.area[3];let o=e.chartData.xAxisData.xAxisPoints,n=e.chartData.xAxisData.eachSpacing;let l=n*(o.length-1);if(e.type=="mount"&&e.extra&&e.extra.mount&&e.extra.mount.widthRatio&&e.extra.mount.widthRatio>1){if(e.extra.mount.widthRatio>2)e.extra.mount.widthRatio=2;l+=(e.extra.mount.widthRatio-1)*n}let x=r+l;let s=[];let h=1;if(e.xAxis.axisLine===false){h=0}for(let t=h;t<e.yAxis.splitNumber+1;t++){s.push(e.height-e.area[2]-i*t)}a.save();if(e._scrollDistance_&&e._scrollDistance_!==0){a.translate(e._scrollDistance_,0)}if(e.yAxis.gridType=="dash"){a.setLineDash([e.yAxis.dashLength*e.pix,e.yAxis.dashLength*e.pix])}a.setStrokeStyle(e.yAxis.gridColor);a.setLineWidth(1*e.pix);s.forEach(function(t,e){a.beginPath();a.moveTo(r,t);a.lineTo(x,t);a.stroke()});a.setLineDash([]);a.restore()}function drawYAxis(e,h,a,c){if(h.yAxis.disabled===true){return}var i=h.height-h.area[0]-h.area[2];var r=i/h.yAxis.splitNumber;var o=h.area[3];var n=h.width-h.area[1];var t=h.height-h.area[2];c.beginPath();c.setFillStyle(h.background);if(h.enableScroll==true&&h.xAxis.scrollPosition&&h.xAxis.scrollPosition!=="left"){c.fillRect(0,0,o,t+2*h.pix)}if(h.enableScroll==true&&h.xAxis.scrollPosition&&h.xAxis.scrollPosition!=="right"){c.fillRect(n,0,h.width,t+2*h.pix)}c.closePath();c.stroke();let d=h.area[3];let x=h.width-h.area[1];let f=h.area[3]+(h.width-h.area[1]-h.area[3])/2;if(h.yAxis.data){for(let e=0;e<h.yAxis.data.length;e++){let s=h.yAxis.data[e];var p=[];if(s.type==="categories"){for(let t=0;t<=s.categories.length;t++){p.push(h.area[0]+i/s.categories.length/2+i/s.categories.length*t)}}else{for(let t=0;t<=h.yAxis.splitNumber;t++){p.push(h.area[0]+r*t)}}if(s.disabled!==true){let t=h.chartData.yAxisData.rangesFormat[e];let o=s.fontSize?s.fontSize*h.pix:a.fontSize;let n=h.chartData.yAxisData.yAxisWidth[e];let l=s.textAlign||"right";t.forEach(function(t,e){var a=p[e];c.beginPath();c.setFontSize(o);c.setLineWidth(1*h.pix);c.setStrokeStyle(s.axisLineColor||"#cccccc");c.setFillStyle(s.fontColor||h.fontColor);let i=0;let r=4*h.pix;if(n.position=="left"){if(s.calibration==true){c.moveTo(d,a);c.lineTo(d-3*h.pix,a);r+=3*h.pix}switch(l){case"left":c.setTextAlign("left");i=d-n.width;break;case"right":c.setTextAlign("right");i=d-r;break;default:c.setTextAlign("center");i=d-n.width/2}c.fillText(String(t),i,a+o/2-3*h.pix)}else if(n.position=="right"){if(s.calibration==true){c.moveTo(x,a);c.lineTo(x+3*h.pix,a);r+=3*h.pix}switch(l){case"left":c.setTextAlign("left");i=x+r;break;case"right":c.setTextAlign("right");i=x+n.width;break;default:c.setTextAlign("center");i=x+n.width/2}c.fillText(String(t),i,a+o/2-3*h.pix)}else if(n.position=="center"){if(s.calibration==true){c.moveTo(f,a);c.lineTo(f-3*h.pix,a);r+=3*h.pix}switch(l){case"left":c.setTextAlign("left");i=f-n.width;break;case"right":c.setTextAlign("right");i=f-r;break;default:c.setTextAlign("center");i=f-n.width/2}c.fillText(String(t),i,a+o/2-3*h.pix)}c.closePath();c.stroke();c.setTextAlign("left")});if(s.axisLine!==false){c.beginPath();c.setStrokeStyle(s.axisLineColor||"#cccccc");c.setLineWidth(1*h.pix);if(n.position=="left"){c.moveTo(d,h.height-h.area[2]);c.lineTo(d,h.area[0])}else if(n.position=="right"){c.moveTo(x,h.height-h.area[2]);c.lineTo(x,h.area[0])}else if(n.position=="center"){c.moveTo(f,h.height-h.area[2]);c.lineTo(f,h.area[0])}c.stroke()}if(h.yAxis.showTitle){let t=s.titleFontSize*h.pix||a.fontSize;let e=s.title;c.beginPath();c.setFontSize(t);c.setFillStyle(s.titleFontColor||h.fontColor);if(n.position=="left"){c.fillText(e,d-measureText(e,t,c)/2+(s.titleOffsetX||0),h.area[0]-(10-(s.titleOffsetY||0))*h.pix)}else if(n.position=="right"){c.fillText(e,x-measureText(e,t,c)/2+(s.titleOffsetX||0),h.area[0]-(10-(s.titleOffsetY||0))*h.pix)}else if(n.position=="center"){c.fillText(e,f-measureText(e,t,c)/2+(s.titleOffsetX||0),h.area[0]-(10-(s.titleOffsetY||0))*h.pix)}c.closePath();c.stroke()}if(n.position=="left"){d-=n.width+h.yAxis.padding*h.pix}else{x+=n.width+h.yAxis.padding*h.pix}}}}}function drawLegend(t,l,y,s,e){if(l.legend.show===false){return}let h=e.legendData;let a=h.points;let c=h.area;let d=l.legend.padding*l.pix;let x=l.legend.fontSize*l.pix;let f=15*l.pix;let p=5*l.pix;let u=l.legend.itemGap*l.pix;let g=Math.max(l.legend.lineHeight*l.pix,x);s.beginPath();s.setLineWidth(l.legend.borderWidth*l.pix);s.setStrokeStyle(l.legend.borderColor);s.setFillStyle(l.legend.backgroundColor);s.moveTo(c.start.x,c.start.y);s.rect(c.start.x,c.start.y,c.width,c.height);s.closePath();s.fill();s.stroke();a.forEach(function(i,t){let e=0;let a=0;e=h.widthArr[t];a=h.heightArr[t];let r=0;let o=0;if(l.legend.position=="top"||l.legend.position=="bottom"){switch(l.legend.float){case"left":r=c.start.x+d;break;case"right":r=c.start.x+c.width-e;break;default:r=c.start.x+(c.width-e)/2}o=c.start.y+d+t*g}else{if(t==0){e=0}else{e=h.widthArr[t-1]}r=c.start.x+d+e;o=c.start.y+d+(c.height-a)/2}s.setFontSize(y.fontSize);for(let a=0;a<i.length;a++){let t=i[a];t.area=[0,0,0,0];t.area[0]=r;t.area[1]=o;t.area[3]=o+g;s.beginPath();s.setLineWidth(1*l.pix);s.setStrokeStyle(t.show?t.color:l.legend.hiddenColor);s.setFillStyle(t.show?t.color:l.legend.hiddenColor);switch(t.legendShape){case"line":s.moveTo(r,o+.5*g-2*l.pix);s.fillRect(r,o+.5*g-2*l.pix,15*l.pix,4*l.pix);break;case"triangle":s.moveTo(r+7.5*l.pix,o+.5*g-5*l.pix);s.lineTo(r+2.5*l.pix,o+.5*g+5*l.pix);s.lineTo(r+12.5*l.pix,o+.5*g+5*l.pix);s.lineTo(r+7.5*l.pix,o+.5*g-5*l.pix);break;case"diamond":s.moveTo(r+7.5*l.pix,o+.5*g-5*l.pix);s.lineTo(r+2.5*l.pix,o+.5*g);s.lineTo(r+7.5*l.pix,o+.5*g+5*l.pix);s.lineTo(r+12.5*l.pix,o+.5*g);s.lineTo(r+7.5*l.pix,o+.5*g-5*l.pix);break;case"circle":s.moveTo(r+7.5*l.pix,o+.5*g);s.arc(r+7.5*l.pix,o+.5*g,5*l.pix,0,2*Math.PI);break;case"rect":s.moveTo(r,o+.5*g-5*l.pix);s.fillRect(r,o+.5*g-5*l.pix,15*l.pix,10*l.pix);break;case"square":s.moveTo(r+5*l.pix,o+.5*g-5*l.pix);s.fillRect(r+5*l.pix,o+.5*g-5*l.pix,10*l.pix,10*l.pix);break;case"none":break;default:s.moveTo(r,o+.5*g-5*l.pix);s.fillRect(r,o+.5*g-5*l.pix,15*l.pix,10*l.pix)}s.closePath();s.fill();s.stroke();r+=f+p;let e=.5*g+.5*x-2;const n=t.legendText?t.legendText:t.name;s.beginPath();s.setFontSize(x);s.setFillStyle(t.show?l.legend.fontColor:l.legend.hiddenColor);s.fillText(n,r,o+e);s.closePath();s.stroke();if(l.legend.position=="top"||l.legend.position=="bottom"){r+=measureText(n,x,s)+u;t.area[2]=r}else{t.area[2]=r+measureText(n,x,s)+u;r-=f+p;o+=g}}})}function drawPieDataPoints(t,r,e,o){var a=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;var n=assign({},{activeOpacity:.5,activeRadius:10,offsetAngle:0,labelWidth:15,ringWidth:30,customRadius:0,border:false,borderWidth:2,borderColor:"#FFFFFF",centerColor:"#FFFFFF",linearType:"none",customColor:[]},r.type=="pie"?r.extra.pie:r.extra.ring);var l={x:r.area[3]+(r.width-r.area[1]-r.area[3])/2,y:r.area[0]+(r.height-r.area[0]-r.area[2])/2};if(e.pieChartLinePadding==0){e.pieChartLinePadding=n.activeRadius*r.pix}var i=Math.min((r.width-r.area[1]-r.area[3])/2-e.pieChartLinePadding-e.pieChartTextPadding-e._pieTextMaxLength_,(r.height-r.area[0]-r.area[2])/2-e.pieChartLinePadding-e.pieChartTextPadding);i=i<10?10:i;if(n.customRadius>0){i=n.customRadius*r.pix}t=getPieDataPoints(t,i,a);var h=n.activeRadius*r.pix;n.customColor=fillCustomColor(n.linearType,n.customColor,t,e);t=t.map(function(t){t._start_+=n.offsetAngle*Math.PI/180;return t});t.forEach(function(t,e){if(r.tooltip){if(r.tooltip.index==e){o.beginPath();o.setFillStyle(hexToRgb(t.color,n.activeOpacity||.5));o.moveTo(l.x,l.y);o.arc(l.x,l.y,t._radius_+h,t._start_,t._start_+2*t._proportion_*Math.PI);o.closePath();o.fill()}}o.beginPath();o.setLineWidth(n.borderWidth*r.pix);o.lineJoin="round";o.setStrokeStyle(n.borderColor);var a=t.color;if(n.linearType=="custom"){var i;if(o.createCircularGradient){i=o.createCircularGradient(l.x,l.y,t._radius_)}else{i=o.createRadialGradient(l.x,l.y,0,l.x,l.y,t._radius_)}i.addColorStop(0,hexToRgb(n.customColor[t.linearIndex],1));i.addColorStop(1,hexToRgb(t.color,1));a=i}o.setFillStyle(a);o.moveTo(l.x,l.y);o.arc(l.x,l.y,t._radius_,t._start_,t._start_+2*t._proportion_*Math.PI);o.closePath();o.fill();if(n.border==true){o.stroke()}});if(r.type==="ring"){var s=i*.6;if(typeof n.ringWidth==="number"&&n.ringWidth>0){s=Math.max(0,i-n.ringWidth*r.pix)}o.beginPath();o.setFillStyle(n.centerColor);o.moveTo(l.x,l.y);o.arc(l.x,l.y,s,0,2*Math.PI);o.closePath();o.fill()}if(r.dataLabel!==false&&a===1){drawPieText(t,r,e,o,i,l)}if(a===1&&r.type==="ring"){drawRingTitle(r,e,o,l)}return{center:l,radius:i,series:t}}function drawRoseDataPoints(t,r,e,o){var a=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;var n=assign({},{type:"area",activeOpacity:.5,activeRadius:10,offsetAngle:0,labelWidth:15,border:false,borderWidth:2,borderColor:"#FFFFFF",linearType:"none",customColor:[]},r.extra.rose);if(e.pieChartLinePadding==0){e.pieChartLinePadding=n.activeRadius*r.pix}var l={x:r.area[3]+(r.width-r.area[1]-r.area[3])/2,y:r.area[0]+(r.height-r.area[0]-r.area[2])/2};var i=Math.min((r.width-r.area[1]-r.area[3])/2-e.pieChartLinePadding-e.pieChartTextPadding-e._pieTextMaxLength_,(r.height-r.area[0]-r.area[2])/2-e.pieChartLinePadding-e.pieChartTextPadding);i=i<10?10:i;var s=n.minRadius||i*.5;if(i<s){i=s+10}t=getRoseDataPoints(t,n.type,s,i,a);var h=n.activeRadius*r.pix;n.customColor=fillCustomColor(n.linearType,n.customColor,t,e);t=t.map(function(t){t._start_+=(n.offsetAngle||0)*Math.PI/180;return t});t.forEach(function(t,e){if(r.tooltip){if(r.tooltip.index==e){o.beginPath();o.setFillStyle(hexToRgb(t.color,n.activeOpacity||.5));o.moveTo(l.x,l.y);o.arc(l.x,l.y,h+t._radius_,t._start_,t._start_+2*t._rose_proportion_*Math.PI);o.closePath();o.fill()}}o.beginPath();o.setLineWidth(n.borderWidth*r.pix);o.lineJoin="round";o.setStrokeStyle(n.borderColor);var a=t.color;if(n.linearType=="custom"){var i;if(o.createCircularGradient){i=o.createCircularGradient(l.x,l.y,t._radius_)}else{i=o.createRadialGradient(l.x,l.y,0,l.x,l.y,t._radius_)}i.addColorStop(0,hexToRgb(n.customColor[t.linearIndex],1));i.addColorStop(1,hexToRgb(t.color,1));a=i}o.setFillStyle(a);o.moveTo(l.x,l.y);o.arc(l.x,l.y,t._radius_,t._start_,t._start_+2*t._rose_proportion_*Math.PI);o.closePath();o.fill();if(n.border==true){o.stroke()}});if(r.dataLabel!==false&&a===1){drawPieText(t,r,e,o,i,l)}return{center:l,radius:i,series:t}}function drawArcbarDataPoints(a,i,t,r){var e=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;var o=assign({},{startAngle:.75,endAngle:.25,type:"default",direction:"cw",lineCap:"round",width:12,gap:2,linearType:"none",customColor:[]},i.extra.arcbar);a=getArcbarDataPoints(a,o,e);var n;if(o.centerX||o.centerY){n={x:o.centerX?o.centerX:i.width/2,y:o.centerY?o.centerY:i.height/2}}else{n={x:i.width/2,y:i.height/2}}var l;if(o.radius){l=o.radius}else{l=Math.min(n.x,n.y);l-=5*i.pix;l-=o.width/2}l=l<10?10:l;o.customColor=fillCustomColor(o.linearType,o.customColor,a,t);for(let e=0;e<a.length;e++){let t=a[e];r.setLineWidth(o.width*i.pix);r.setStrokeStyle(o.backgroundColor||"#E9E9E9");r.setLineCap(o.lineCap);r.beginPath();if(o.type=="default"){r.arc(n.x,n.y,l-(o.width*i.pix+o.gap*i.pix)*e,o.startAngle*Math.PI,o.endAngle*Math.PI,o.direction=="ccw")}else{r.arc(n.x,n.y,l-(o.width*i.pix+o.gap*i.pix)*e,0,2*Math.PI,o.direction=="ccw")}r.stroke();var s=t.color;if(o.linearType=="custom"){var h=r.createLinearGradient(n.x-l,n.y,n.x+l,n.y);h.addColorStop(1,hexToRgb(o.customColor[t.linearIndex],1));h.addColorStop(0,hexToRgb(t.color,1));s=h}r.setLineWidth(o.width*i.pix);r.setStrokeStyle(s);r.setLineCap(o.lineCap);r.beginPath();r.arc(n.x,n.y,l-(o.width*i.pix+o.gap*i.pix)*e,o.startAngle*Math.PI,t._proportion_*Math.PI,o.direction=="ccw");r.stroke()}drawRingTitle(i,t,r,n);return{center:n,radius:l,series:a}}function drawGaugeDataPoints(n,h,c,t,d){var x=arguments.length>5&&arguments[5]!==undefined?arguments[5]:1;var f=assign({},{type:"default",startAngle:.75,endAngle:.25,width:15,labelOffset:13,splitLine:{fixRadius:0,splitNumber:10,width:15,color:"#FFFFFF",childNumber:5,childWidth:5},pointer:{width:15,color:"auto"}},c.extra.gauge);if(f.oldAngle==undefined){f.oldAngle=f.startAngle}if(f.oldData==undefined){f.oldData=0}n=getGaugeAxisPoints(n,f.startAngle,f.endAngle);var p={x:c.width/2,y:c.height/2};var u=Math.min(p.x,p.y);u-=5*c.pix;u-=f.width/2;u=u<10?10:u;var g=u-f.width;var y=0;if(f.type=="progress"){var v=u-f.width*3;d.beginPath();let t=d.createLinearGradient(p.x,p.y-v,p.x,p.y+v);t.addColorStop("0",hexToRgb(h[0].color,.3));t.addColorStop("1.0",hexToRgb("#FFFFFF",.1));d.setFillStyle(t);d.arc(p.x,p.y,v,0,2*Math.PI,false);d.fill();d.setLineWidth(f.width);d.setStrokeStyle(hexToRgb(h[0].color,.3));d.setLineCap("round");d.beginPath();d.arc(p.x,p.y,g,f.startAngle*Math.PI,f.endAngle*Math.PI,false);d.stroke();if(f.endAngle<f.startAngle){y=2+f.endAngle-f.startAngle}else{y=f.startAngle-f.endAngle}let e=y/f.splitLine.splitNumber;let a=y/f.splitLine.splitNumber/f.splitLine.childNumber;let i=-u-f.width*.5-f.splitLine.fixRadius;let r=-u-f.width-f.splitLine.fixRadius+f.splitLine.width;d.save();d.translate(p.x,p.y);d.rotate((f.startAngle-1)*Math.PI);let o=f.splitLine.splitNumber*f.splitLine.childNumber+1;let n=h[0].data*x;for(let t=0;t<o;t++){d.beginPath();if(n>t/o){d.setStrokeStyle(hexToRgb(h[0].color,1))}else{d.setStrokeStyle(hexToRgb(h[0].color,.3))}d.setLineWidth(3*c.pix);d.moveTo(i,0);d.lineTo(r,0);d.stroke();d.rotate(a*Math.PI)}d.restore();h=getGaugeArcbarDataPoints(h,f,x);d.setLineWidth(f.width);d.setStrokeStyle(h[0].color);d.setLineCap("round");d.beginPath();d.arc(p.x,p.y,g,f.startAngle*Math.PI,h[0]._proportion_*Math.PI,false);d.stroke();let l=u-f.width*2.5;d.save();d.translate(p.x,p.y);d.rotate((h[0]._proportion_-1)*Math.PI);d.beginPath();d.setLineWidth(f.width/3);let s=d.createLinearGradient(0,-l*.6,0,l*.6);s.addColorStop("0",hexToRgb("#FFFFFF",0));s.addColorStop("0.5",hexToRgb(h[0].color,1));s.addColorStop("1.0",hexToRgb("#FFFFFF",0));d.setStrokeStyle(s);d.arc(0,0,l,.85*Math.PI,1.15*Math.PI,false);d.stroke();d.beginPath();d.setLineWidth(1);d.setStrokeStyle(h[0].color);d.setFillStyle(h[0].color);d.moveTo(-l-f.width/3/2,-4);d.lineTo(-l-f.width/3/2-4,0);d.lineTo(-l-f.width/3/2,4);d.lineTo(-l-f.width/3/2,-4);d.stroke();d.fill();d.restore()}else{d.setLineWidth(f.width);d.setLineCap("butt");for(let e=0;e<n.length;e++){let t=n[e];d.beginPath();d.setStrokeStyle(t.color);d.arc(p.x,p.y,u,t._startAngle_*Math.PI,t._endAngle_*Math.PI,false);d.stroke()}d.save();if(f.endAngle<f.startAngle){y=2+f.endAngle-f.startAngle}else{y=f.startAngle-f.endAngle}let e=y/f.splitLine.splitNumber;let a=y/f.splitLine.splitNumber/f.splitLine.childNumber;let i=-u-f.width*.5-f.splitLine.fixRadius;let r=-u-f.width*.5-f.splitLine.fixRadius+f.splitLine.width;let o=-u-f.width*.5-f.splitLine.fixRadius+f.splitLine.childWidth;d.translate(p.x,p.y);d.rotate((f.startAngle-1)*Math.PI);for(let t=0;t<f.splitLine.splitNumber+1;t++){d.beginPath();d.setStrokeStyle(f.splitLine.color);d.setLineWidth(2*c.pix);d.moveTo(i,0);d.lineTo(r,0);d.stroke();d.rotate(e*Math.PI)}d.restore();d.save();d.translate(p.x,p.y);d.rotate((f.startAngle-1)*Math.PI);for(let t=0;t<f.splitLine.splitNumber*f.splitLine.childNumber+1;t++){d.beginPath();d.setStrokeStyle(f.splitLine.color);d.setLineWidth(1*c.pix);d.moveTo(i,0);d.lineTo(o,0);d.stroke();d.rotate(a*Math.PI)}d.restore();h=getGaugeDataPoints(h,n,f,x);for(let e=0;e<h.length;e++){let t=h[e];d.save();d.translate(p.x,p.y);d.rotate((t._proportion_-1)*Math.PI);d.beginPath();d.setFillStyle(t.color);d.moveTo(f.pointer.width,0);d.lineTo(0,-f.pointer.width/2);d.lineTo(-g,0);d.lineTo(0,f.pointer.width/2);d.lineTo(f.pointer.width,0);d.closePath();d.fill();d.beginPath();d.setFillStyle("#FFFFFF");d.arc(0,0,f.pointer.width/6,0,2*Math.PI,false);d.fill();d.restore()}if(c.dataLabel!==false){drawGaugeLabel(f,u,p,c,t,d)}}drawRingTitle(c,t,d,p);if(x===1&&c.type==="gauge"){c.extra.gauge.oldAngle=h[0]._proportion_;c.extra.gauge.oldData=h[0].data}return{center:p,radius:u,innerRadius:g,categories:n,totalAngle:y}}function drawRadarDataPoints(o,n,i,l){var t=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;var s=assign({},{gridColor:"#cccccc",gridType:"radar",gridEval:1,axisLabel:false,axisLabelTofix:0,labelShow:true,labelColor:"#666666",labelPointShow:false,labelPointRadius:3,labelPointColor:"#cccccc",opacity:.2,gridCount:3,border:false,borderWidth:2,linearType:"none",customColor:[]},n.extra.radar);var a=getRadarCoordinateSeries(n.categories.length);var h={x:n.area[3]+(n.width-n.area[1]-n.area[3])/2,y:n.area[0]+(n.height-n.area[0]-n.area[2])/2};var r=(n.width-n.area[1]-n.area[3])/2;var d=(n.height-n.area[0]-n.area[2])/2;var c=Math.min(r-(getMaxTextListLength(n.categories,i.fontSize,l)+i.radarLabelTextMargin),d-i.radarLabelTextMargin);c-=i.radarLabelTextMargin*n.pix;c=c<10?10:c;c=s.radius?s.radius:c;l.beginPath();l.setLineWidth(1*n.pix);l.setStrokeStyle(s.gridColor);a.forEach(function(t,e){var a=convertCoordinateOrigin(c*Math.cos(t),c*Math.sin(t),h);l.moveTo(h.x,h.y);if(e%s.gridEval==0){l.lineTo(a.x,a.y)}});l.stroke();l.closePath();var x=function t(i){var r={};l.beginPath();l.setLineWidth(1*n.pix);l.setStrokeStyle(s.gridColor);if(s.gridType=="radar"){a.forEach(function(t,e){var a=convertCoordinateOrigin(c/s.gridCount*i*Math.cos(t),c/s.gridCount*i*Math.sin(t),h);if(e===0){r=a;l.moveTo(a.x,a.y)}else{l.lineTo(a.x,a.y)}});l.lineTo(r.x,r.y)}else{var e=convertCoordinateOrigin(c/s.gridCount*i*Math.cos(1.5),c/s.gridCount*i*Math.sin(1.5),h);l.arc(h.x,h.y,h.y-e.y,0,2*Math.PI,false)}l.stroke();l.closePath()};for(var e=1;e<=s.gridCount;e++){x(e)}s.customColor=fillCustomColor(s.linearType,s.customColor,o,i);var f=getRadarDataPoints(a,h,c,o,n,t);f.forEach(function(t,e){l.beginPath();l.setLineWidth(s.borderWidth*n.pix);l.setStrokeStyle(t.color);var a=hexToRgb(t.color,s.opacity);if(s.linearType=="custom"){var i;if(l.createCircularGradient){i=l.createCircularGradient(h.x,h.y,c)}else{i=l.createRadialGradient(h.x,h.y,0,h.x,h.y,c)}i.addColorStop(0,hexToRgb(s.customColor[o[e].linearIndex],s.opacity));i.addColorStop(1,hexToRgb(t.color,s.opacity));a=i}l.setFillStyle(a);t.data.forEach(function(t,e){if(e===0){l.moveTo(t.position.x,t.position.y)}else{l.lineTo(t.position.x,t.position.y)}});l.closePath();l.fill();if(s.border===true){l.stroke()}l.closePath();if(n.dataPointShape!==false){var r=t.data.map(function(t){return t.position});drawPointShape(r,t.color,t.pointShape,l,n)}});if(s.axisLabel===true){const p=Math.max(s.max,Math.max.apply(null,dataCombine(o)));const u=c/s.gridCount;const g=n.fontSize*n.pix;l.setFontSize(g);l.setFillStyle(n.fontColor);l.setTextAlign("left");for(var e=0;e<s.gridCount+1;e++){let t=e*p/s.gridCount;t=t.toFixed(s.axisLabelTofix);l.fillText(String(t),h.x+3*n.pix,h.y-e*u+g/2)}}drawRadarLabel(a,c,h,n,i,l);if(n.dataLabel!==false&&t===1){f.forEach(function(t,e){l.beginPath();var a=t.textSize*n.pix||i.fontSize;l.setFontSize(a);l.setFillStyle(t.textColor||n.fontColor);t.data.forEach(function(t,e){if(Math.abs(t.position.x-h.x)<2){if(t.position.y<h.y){l.setTextAlign("center");l.fillText(t.value,t.position.x,t.position.y-4)}else{l.setTextAlign("center");l.fillText(t.value,t.position.x,t.position.y+a+2)}}else{if(t.position.x<h.x){l.setTextAlign("right");l.fillText(t.value,t.position.x-4,t.position.y+a/2-2)}else{l.setTextAlign("left");l.fillText(t.value,t.position.x+4,t.position.y+a/2-2)}}});l.closePath();l.stroke()});l.setTextAlign("left")}return{center:h,radius:c,angleList:a}}function lonlat2mercator(t,e){var a=Array(2);var i=t*20037508.34/180;var r=Math.log(Math.tan((90+e)*Math.PI/360))/(Math.PI/180);r=r*20037508.34/180;a[0]=i;a[1]=r;return a}function mercator2lonlat(t,e){var a=Array(2);var i=t/20037508.34*180;var r=e/20037508.34*180;r=180/Math.PI*(2*Math.atan(Math.exp(r*Math.PI/180))-Math.PI/2);a[0]=i;a[1]=r;return a}function getBoundingBox(t){var e={},a;e.xMin=180;e.xMax=0;e.yMin=90;e.yMax=0;for(var i=0;i<t.length;i++){var r=t[i].geometry.coordinates;for(var o=0;o<r.length;o++){a=r[o];if(a.length==1){a=a[0]}for(var n=0;n<a.length;n++){var l=a[n][0];var s=a[n][1];var h={x:l,y:s};e.xMin=e.xMin<h.x?e.xMin:h.x;e.xMax=e.xMax>h.x?e.xMax:h.x;e.yMin=e.yMin<h.y?e.yMin:h.y;e.yMax=e.yMax>h.y?e.yMax:h.y}}}return e}function coordinateToPoint(t,e,a,i,r,o){return{x:(e-a.xMin)*i+r,y:(a.yMax-t)*i+o}}function pointToCoordinate(t,e,a,i,r,o){return{x:(e-r)/i+a.xMin,y:a.yMax-(t-o)/i}}function isRayIntersectsSegment(t,e,a){if(e[1]==a[1]){return false}if(e[1]>t[1]&&a[1]>t[1]){return false}if(e[1]<t[1]&&a[1]<t[1]){return false}if(e[1]==t[1]&&a[1]>t[1]){return false}if(a[1]==t[1]&&e[1]>t[1]){return false}if(e[0]<t[0]&&a[1]<t[1]){return false}let i=a[0]-(a[0]-e[0])*(a[1]-t[1])/(a[1]-e[1]);if(i<t[0]){return false}else{return true}}function isPoiWithinPoly(r,e,o){let n=0;for(let t=0;t<e.length;t++){let i=e[t][0];if(e.length==1){i=e[t][0]}for(let a=0;a<i.length-1;a++){let t=i[a];let e=i[a+1];if(o){t=lonlat2mercator(i[a][0],i[a][1]);e=lonlat2mercator(i[a+1][0],i[a+1][1])}if(isRayIntersectsSegment(r,t,e)){n+=1}}}if(n%2==1){return true}else{return false}}function drawMapDataPoints(a,i,d,r){var o=assign({},{border:true,mercator:false,borderWidth:1,active:true,borderColor:"#666666",fillOpacity:.6,activeBorderColor:"#f04864",activeFillColor:"#facc14",activeFillOpacity:1},i.extra.map);var t,n;var l=a;var s=getBoundingBox(l);if(o.mercator){var x=lonlat2mercator(s.xMax,s.yMax);var f=lonlat2mercator(s.xMin,s.yMin);s.xMax=x[0];s.yMax=x[1];s.xMin=f[0];s.yMin=f[1]}var p=i.width/Math.abs(s.xMax-s.xMin);var u=i.height/Math.abs(s.yMax-s.yMin);var h=p<u?p:u;var g=i.width/2-Math.abs(s.xMax-s.xMin)/2*h;var y=i.height/2-Math.abs(s.yMax-s.yMin)/2*h;for(var c=0;c<l.length;c++){r.beginPath();r.setLineWidth(o.borderWidth*i.pix);r.setStrokeStyle(o.borderColor);r.setFillStyle(hexToRgb(a[c].color,a[c].fillOpacity||o.fillOpacity));if(o.active==true&&i.tooltip){if(i.tooltip.index==c){r.setStrokeStyle(o.activeBorderColor);r.setFillStyle(hexToRgb(o.activeFillColor,o.activeFillOpacity))}}var v=l[c].geometry.coordinates;for(var m=0;m<v.length;m++){t=v[m];if(t.length==1){t=t[0]}for(var e=0;e<t.length;e++){var T=Array(2);if(o.mercator){T=lonlat2mercator(t[e][0],t[e][1])}else{T=t[e]}n=coordinateToPoint(T[1],T[0],s,h,g,y);if(e===0){r.beginPath();r.moveTo(n.x,n.y)}else{r.lineTo(n.x,n.y)}}r.fill();if(o.border==true){r.stroke()}}}if(i.dataLabel==true){for(var c=0;c<l.length;c++){var b=l[c].properties.centroid;if(b){if(o.mercator){b=lonlat2mercator(l[c].properties.centroid[0],l[c].properties.centroid[1])}n=coordinateToPoint(b[1],b[0],s,h,g,y);let t=l[c].textSize*i.pix||d.fontSize;let e=l[c].textColor||i.fontColor;if(o.active&&o.activeTextColor&&i.tooltip&&i.tooltip.index==c){e=o.activeTextColor}let a=l[c].properties.name;r.beginPath();r.setFontSize(t);r.setFillStyle(e);r.fillText(a,n.x-measureText(a,t,r)/2,n.y+t/2);r.closePath();r.stroke()}}}i.chartData.mapData={bounds:s,scale:h,xoffset:g,yoffset:y,mercator:o.mercator};drawToolTipBridge(i,d,r,1);r.draw()}function normalInt(t,e,a){a=a==0?1:a;var i=[];for(var r=0;r<a;r++){i[r]=Math.random()}return Math.floor(i.reduce(function(t,e){return t+e})/a*(e-t))+t}function collisionNew(e,a,i,r){var o=false;for(let t=0;t<a.length;t++){if(a[t].area){if(e[3]<a[t].area[1]||e[0]>a[t].area[2]||e[1]>a[t].area[3]||e[2]<a[t].area[0]){if(e[0]<0||e[1]<0||e[2]>i||e[3]>r){o=true;break}else{o=false}}else{o=true;break}}}return o}function getWordCloudPoint(c,t,d){let x=c.series;switch(t){case"normal":for(let l=0;l<x.length;l++){let t=x[l].name;let e=x[l].textSize*c.pix;let a=measureText(t,e,d);let i,r;let o;let n=0;while(true){n++;i=normalInt(-c.width/2,c.width/2,5)-a/2;r=normalInt(-c.height/2,c.height/2,5)+e/2;o=[i-5+c.width/2,r-5-e+c.height/2,i+a+5+c.width/2,r+5+c.height/2];let t=collisionNew(o,x,c.width,c.height);if(!t)break;if(n==1e3){o=[-100,-100,-100,-100];break}}x[l].area=o}break;case"vertical":function f(){if(Math.random()>.7){return true}else{return false}};for(let h=0;h<x.length;h++){let t=x[h].name;let e=x[h].textSize*c.pix;let a=measureText(t,e,d);let i=f();let r,o,n,l;let s=0;while(true){s++;let t;if(i){r=normalInt(-c.width/2,c.width/2,5)-a/2;o=normalInt(-c.height/2,c.height/2,5)+e/2;n=[o-5-a+c.width/2,-r-5+c.height/2,o+5+c.width/2,-r+e+5+c.height/2];l=[c.width-(c.width/2-c.height/2)-(-r+e+5+c.height/2)-5,c.height/2-c.width/2+(o-5-a+c.width/2)-5,c.width-(c.width/2-c.height/2)-(-r+e+5+c.height/2)+e,c.height/2-c.width/2+(o-5-a+c.width/2)+a+5];t=collisionNew(l,x,c.height,c.width)}else{r=normalInt(-c.width/2,c.width/2,5)-a/2;o=normalInt(-c.height/2,c.height/2,5)+e/2;n=[r-5+c.width/2,o-5-e+c.height/2,r+a+5+c.width/2,o+5+c.height/2];t=collisionNew(n,x,c.width,c.height)}if(!t)break;if(s==1e3){n=[-1e3,-1e3,-1e3,-1e3];break}}if(i){x[h].area=l;x[h].areav=n}else{x[h].area=n}x[h].rotate=i};break}return x}function drawWordCloudDataPoints(t,r,e,o){let n=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;let a=assign({},{type:"normal",autoColors:true},r.extra.word);if(!r.chartData.wordCloudData){r.chartData.wordCloudData=getWordCloudPoint(r,a.type,o)}o.beginPath();o.setFillStyle(r.background);o.rect(0,0,r.width,r.height);o.fill();o.save();let l=r.chartData.wordCloudData;o.translate(r.width/2,r.height/2);for(let i=0;i<l.length;i++){o.save();if(l[i].rotate){o.rotate(90*Math.PI/180)}let t=l[i].name;let e=l[i].textSize*r.pix;let a=measureText(t,e,o);o.beginPath();o.setStrokeStyle(l[i].color);o.setFillStyle(l[i].color);o.setFontSize(e);if(l[i].rotate){if(l[i].areav[0]>0){if(r.tooltip){if(r.tooltip.index==i){o.strokeText(t,(l[i].areav[0]+5-r.width/2)*n-a*(1-n)/2,(l[i].areav[1]+5+e-r.height/2)*n)}else{o.fillText(t,(l[i].areav[0]+5-r.width/2)*n-a*(1-n)/2,(l[i].areav[1]+5+e-r.height/2)*n)}}else{o.fillText(t,(l[i].areav[0]+5-r.width/2)*n-a*(1-n)/2,(l[i].areav[1]+5+e-r.height/2)*n)}}}else{if(l[i].area[0]>0){if(r.tooltip){if(r.tooltip.index==i){o.strokeText(t,(l[i].area[0]+5-r.width/2)*n-a*(1-n)/2,(l[i].area[1]+5+e-r.height/2)*n)}else{o.fillText(t,(l[i].area[0]+5-r.width/2)*n-a*(1-n)/2,(l[i].area[1]+5+e-r.height/2)*n)}}else{o.fillText(t,(l[i].area[0]+5-r.width/2)*n-a*(1-n)/2,(l[i].area[1]+5+e-r.height/2)*n)}}}o.stroke();o.restore()}o.restore()}function drawFunnelDataPoints(t,e,c,a){let d=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;let i=assign({},{type:"funnel",activeWidth:10,activeOpacity:.3,border:false,borderWidth:2,borderColor:"#FFFFFF",fillOpacity:1,minSize:0,labelAlign:"right",linearType:"none",customColor:[]},e.extra.funnel);let r=(e.height-e.area[0]-e.area[2])/t.length;let o={x:e.area[3]+(e.width-e.area[1]-e.area[3])/2,y:e.height-e.area[2]};let n=i.activeWidth*e.pix;let x=Math.min((e.width-e.area[1]-e.area[3])/2-n,(e.height-e.area[0]-e.area[2])/2-n);let l=getFunnelDataPoints(t,x,i,r,d);a.save();a.translate(o.x,o.y);i.customColor=fillCustomColor(i.linearType,i.customColor,t,c);if(i.type=="pyramid"){for(let t=0;t<l.length;t++){if(t==l.length-1){if(e.tooltip){if(e.tooltip.index==t){a.beginPath();a.setFillStyle(hexToRgb(l[t].color,i.activeOpacity));a.moveTo(-n,-r);a.lineTo(-l[t].radius-n,0);a.lineTo(l[t].radius+n,0);a.lineTo(n,-r);a.lineTo(-n,-r);a.closePath();a.fill()}}l[t].funnelArea=[o.x-l[t].radius,o.y-r*(t+1),o.x+l[t].radius,o.y-r*t];a.beginPath();a.setLineWidth(i.borderWidth*e.pix);a.setStrokeStyle(i.borderColor);var s=hexToRgb(l[t].color,i.fillOpacity);if(i.linearType=="custom"){var h=a.createLinearGradient(l[t].radius,-r,-l[t].radius,-r);h.addColorStop(0,hexToRgb(l[t].color,i.fillOpacity));h.addColorStop(.5,hexToRgb(i.customColor[l[t].linearIndex],i.fillOpacity));h.addColorStop(1,hexToRgb(l[t].color,i.fillOpacity));s=h}a.setFillStyle(s);a.moveTo(0,-r);a.lineTo(-l[t].radius,0);a.lineTo(l[t].radius,0);a.lineTo(0,-r);a.closePath();a.fill();if(i.border==true){a.stroke()}}else{if(e.tooltip){if(e.tooltip.index==t){a.beginPath();a.setFillStyle(hexToRgb(l[t].color,i.activeOpacity));a.moveTo(0,0);a.lineTo(-l[t].radius-n,0);a.lineTo(-l[t+1].radius-n,-r);a.lineTo(l[t+1].radius+n,-r);a.lineTo(l[t].radius+n,0);a.lineTo(0,0);a.closePath();a.fill()}}l[t].funnelArea=[o.x-l[t].radius,o.y-r*(t+1),o.x+l[t].radius,o.y-r*t];a.beginPath();a.setLineWidth(i.borderWidth*e.pix);a.setStrokeStyle(i.borderColor);var s=hexToRgb(l[t].color,i.fillOpacity);if(i.linearType=="custom"){var h=a.createLinearGradient(l[t].radius,-r,-l[t].radius,-r);h.addColorStop(0,hexToRgb(l[t].color,i.fillOpacity));h.addColorStop(.5,hexToRgb(i.customColor[l[t].linearIndex],i.fillOpacity));h.addColorStop(1,hexToRgb(l[t].color,i.fillOpacity));s=h}a.setFillStyle(s);a.moveTo(0,0);a.lineTo(-l[t].radius,0);a.lineTo(-l[t+1].radius,-r);a.lineTo(l[t+1].radius,-r);a.lineTo(l[t].radius,0);a.lineTo(0,0);a.closePath();a.fill();if(i.border==true){a.stroke()}}a.translate(0,-r)}}else{a.translate(0,-(l.length-1)*r);for(let t=0;t<l.length;t++){if(t==l.length-1){if(e.tooltip){if(e.tooltip.index==t){a.beginPath();a.setFillStyle(hexToRgb(l[t].color,i.activeOpacity));a.moveTo(-n-i.minSize/2,0);a.lineTo(-l[t].radius-n,-r);a.lineTo(l[t].radius+n,-r);a.lineTo(n+i.minSize/2,0);a.lineTo(-n-i.minSize/2,0);a.closePath();a.fill()}}l[t].funnelArea=[o.x-l[t].radius,o.y-r,o.x+l[t].radius,o.y];a.beginPath();a.setLineWidth(i.borderWidth*e.pix);a.setStrokeStyle(i.borderColor);var s=hexToRgb(l[t].color,i.fillOpacity);if(i.linearType=="custom"){var h=a.createLinearGradient(l[t].radius,-r,-l[t].radius,-r);h.addColorStop(0,hexToRgb(l[t].color,i.fillOpacity));h.addColorStop(.5,hexToRgb(i.customColor[l[t].linearIndex],i.fillOpacity));h.addColorStop(1,hexToRgb(l[t].color,i.fillOpacity));s=h}a.setFillStyle(s);a.moveTo(0,0);a.lineTo(-i.minSize/2,0);a.lineTo(-l[t].radius,-r);a.lineTo(l[t].radius,-r);a.lineTo(i.minSize/2,0);a.lineTo(0,0);a.closePath();a.fill();if(i.border==true){a.stroke()}}else{if(e.tooltip){if(e.tooltip.index==t){a.beginPath();a.setFillStyle(hexToRgb(l[t].color,i.activeOpacity));a.moveTo(0,0);a.lineTo(-l[t+1].radius-n,0);a.lineTo(-l[t].radius-n,-r);a.lineTo(l[t].radius+n,-r);a.lineTo(l[t+1].radius+n,0);a.lineTo(0,0);a.closePath();a.fill()}}l[t].funnelArea=[o.x-l[t].radius,o.y-r*(l.length-t),o.x+l[t].radius,o.y-r*(l.length-t-1)];a.beginPath();a.setLineWidth(i.borderWidth*e.pix);a.setStrokeStyle(i.borderColor);var s=hexToRgb(l[t].color,i.fillOpacity);if(i.linearType=="custom"){var h=a.createLinearGradient(l[t].radius,-r,-l[t].radius,-r);h.addColorStop(0,hexToRgb(l[t].color,i.fillOpacity));h.addColorStop(.5,hexToRgb(i.customColor[l[t].linearIndex],i.fillOpacity));h.addColorStop(1,hexToRgb(l[t].color,i.fillOpacity));s=h}a.setFillStyle(s);a.moveTo(0,0);a.lineTo(-l[t+1].radius,0);a.lineTo(-l[t].radius,-r);a.lineTo(l[t].radius,-r);a.lineTo(l[t+1].radius,0);a.lineTo(0,0);a.closePath();a.fill();if(i.border==true){a.stroke()}}a.translate(0,r)}}a.restore();if(e.dataLabel!==false&&d===1){drawFunnelText(l,e,a,r,i.labelAlign,n,o)}if(d===1){drawFunnelCenterText(l,e,a,r,i.labelAlign,n,o)}return{center:o,radius:x,series:l}}function drawFunnelText(l,s,h,c,d,x,f){for(let n=0;n<l.length;n++){let t=l[n];if(t.labelShow===false){continue}let e,a,i,r;let o=t.formatter?t.formatter(t,n,l,s):util.toFixed(t._proportion_*100)+"%";o=t.labelText?t.labelText:o;if(d=="right"){if(n==l.length-1){e=(t.funnelArea[2]+f.x)/2}else{e=(t.funnelArea[2]+l[n+1].funnelArea[2])/2}a=e+x*2;i=t.funnelArea[1]+c/2;r=t.textSize*s.pix||s.fontSize*s.pix;h.setLineWidth(1*s.pix);h.setStrokeStyle(t.color);h.setFillStyle(t.color);h.beginPath();h.moveTo(e,i);h.lineTo(a,i);h.stroke();h.closePath();h.beginPath();h.moveTo(a,i);h.arc(a,i,2*s.pix,0,2*Math.PI);h.closePath();h.fill();h.beginPath();h.setFontSize(r);h.setFillStyle(t.textColor||s.fontColor);h.fillText(o,a+5,i+r/2-2);h.closePath();h.stroke();h.closePath()}if(d=="left"){if(n==l.length-1){e=(t.funnelArea[0]+f.x)/2}else{e=(t.funnelArea[0]+l[n+1].funnelArea[0])/2}a=e-x*2;i=t.funnelArea[1]+c/2;r=t.textSize*s.pix||s.fontSize*s.pix;h.setLineWidth(1*s.pix);h.setStrokeStyle(t.color);h.setFillStyle(t.color);h.beginPath();h.moveTo(e,i);h.lineTo(a,i);h.stroke();h.closePath();h.beginPath();h.moveTo(a,i);h.arc(a,i,2,0,2*Math.PI);h.closePath();h.fill();h.beginPath();h.setFontSize(r);h.setFillStyle(t.textColor||s.fontColor);h.fillText(o,a-5-measureText(o,r,h),i+r/2-2);h.closePath();h.stroke();h.closePath()}}}function drawFunnelCenterText(r,o,n,l,t,e,s){for(let i=0;i<r.length;i++){let t=r[i];let e,a;if(t.centerText){e=t.funnelArea[1]+l/2;a=t.centerTextSize*o.pix||o.fontSize*o.pix;n.beginPath();n.setFontSize(a);n.setFillStyle(t.centerTextColor||"#FFFFFF");n.fillText(t.centerText,s.x-measureText(t.centerText,a,n)/2,e+a/2-2);n.closePath();n.stroke();n.closePath()}}}function drawCanvas(t,e){e.save();e.translate(0,.5);e.restore();e.draw()}var Timing={easeIn:function t(e){return Math.pow(e,3)},easeOut:function t(e){return Math.pow(e-1,3)+1},easeInOut:function t(e){if((e/=.5)<1){return.5*Math.pow(e,3)}else{return.5*(Math.pow(e-2,3)+2)}},linear:function t(e){return e}};function Animation(r){this.isStop=false;r.duration=typeof r.duration==="undefined"?1e3:r.duration;r.timing=r.timing||"easeInOut";var o=17;function t(){if(typeof setTimeout!=="undefined"){return function(e,t){setTimeout(function(){var t=+new Date;e(t)},t)}}else if(typeof requestAnimationFrame!=="undefined"){return requestAnimationFrame}else{return function(t){t(null)}}}var n=t();var l=null;var s=function t(e){if(e===null||this.isStop===true){r.onProcess&&r.onProcess(1);r.onAnimationFinish&&r.onAnimationFinish();return}if(l===null){l=e}if(e-l<r.duration){var a=(e-l)/r.duration;var i=Timing[r.timing];a=i(a);r.onProcess&&r.onProcess(a);n(s,o)}else{r.onProcess&&r.onProcess(1);r.onAnimationFinish&&r.onAnimationFinish()}};s=s.bind(this);n(s,o)}Animation.prototype.stop=function(){this.isStop=true};function drawCharts(t,l,n,s){var h=this;var c=l.series;if(t==="pie"||t==="ring"||t==="mount"||t==="rose"||t==="funnel"){c=fixPieSeries(c,l,n)}var d=l.categories;if(t==="mount"){d=[];for(let t=0;t<c.length;t++){if(c[t].show!==false)d.push(c[t].name)}l.categories=d}c=fillSeries(c,l,n);var e=l.animation?l.duration:0;h.animationInstance&&h.animationInstance.stop();var x=null;if(t=="candle"){let t=assign({},l.extra.candle.average);if(t.show){x=calCandleMA(t.day,t.name,t.color,c[0].data);x=fillSeries(x,l,n);l.seriesMA=x}else if(l.seriesMA){x=l.seriesMA=fillSeries(l.seriesMA,l,n)}else{x=c}}else{x=c}l._series_=c=filterSeries(c);l.area=new Array(4);for(let t=0;t<4;t++){l.area[t]=l.padding[t]*l.pix}var a=calLegendData(x,l,n,l.chartData,s),r=a.area.wholeHeight,o=a.area.wholeWidth;switch(l.legend.position){case"top":l.area[0]+=r;break;case"bottom":l.area[2]+=r;break;case"left":l.area[3]+=o;break;case"right":l.area[1]+=o;break}let f={},i=0;if(l.type==="line"||l.type==="column"||l.type==="mount"||l.type==="area"||l.type==="mix"||l.type==="candle"||l.type==="scatter"||l.type==="bubble"||l.type==="bar"){f=calYAxisData(c,l,n,s);i=f.yAxisWidth;if(l.yAxis.showTitle){let e=0;for(let t=0;t<l.yAxis.data.length;t++){e=Math.max(e,l.yAxis.data[t].titleFontSize?l.yAxis.data[t].titleFontSize*l.pix:n.fontSize)}l.area[0]+=e}let e=0,a=0;for(let t=0;t<i.length;t++){if(i[t].position=="left"){if(a>0){l.area[3]+=i[t].width+l.yAxis.padding*l.pix}else{l.area[3]+=i[t].width}a+=1}else if(i[t].position=="right"){if(e>0){l.area[1]+=i[t].width+l.yAxis.padding*l.pix}else{l.area[1]+=i[t].width}e+=1}}}else{n.yAxisWidth=i}l.chartData.yAxisData=f;if(l.categories&&l.categories.length&&l.type!=="radar"&&l.type!=="gauge"&&l.type!=="bar"){l.chartData.xAxisData=getXAxisPoints(l.categories,l,n);let t=calCategoriesData(l.categories,l,n,l.chartData.xAxisData.eachSpacing,s),e=t.xAxisHeight,a=t.angle;n.xAxisHeight=e;n._xAxisTextAngle_=a;l.area[2]+=e;l.chartData.categoriesData=t}else{if(l.type==="line"||l.type==="area"||l.type==="scatter"||l.type==="bubble"||l.type==="bar"){l.chartData.xAxisData=calXAxisData(c,l,n,s);d=l.chartData.xAxisData.rangesFormat;let t=calCategoriesData(d,l,n,l.chartData.xAxisData.eachSpacing,s),e=t.xAxisHeight,a=t.angle;n.xAxisHeight=e;n._xAxisTextAngle_=a;l.area[2]+=e;l.chartData.categoriesData=t}else{l.chartData.xAxisData={xAxisPoints:[]}}}if(l.enableScroll&&l.xAxis.scrollAlign=="right"&&l._scrollDistance_===undefined){let t=0,e=l.chartData.xAxisData.xAxisPoints,a=l.chartData.xAxisData.startX,i=l.chartData.xAxisData.endX,r=l.chartData.xAxisData.eachSpacing;let o=r*(e.length-1);let n=i-a;t=n-o;h.scrollOption.currentOffset=t;h.scrollOption.startTouchX=t;h.scrollOption.distance=0;h.scrollOption.lastMoveTime=0;l._scrollDistance_=t}if(t==="pie"||t==="ring"||t==="rose"){n._pieTextMaxLength_=l.dataLabel===false?0:getPieTextMaxLength(x,n,s,l)}switch(t){case"word":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function(t){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}drawWordCloudDataPoints(c,l,n,s,t);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"map":s.clearRect(0,0,l.width,l.height);drawMapDataPoints(c,l,n,s);setTimeout(()=>{this.uevent.trigger("renderComplete")},50);break;case"funnel":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function(t){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}l.chartData.funnelData=drawFunnelDataPoints(c,l,n,s,t);drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,t);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"line":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}drawYAxisGrid(d,l,n,s);drawXAxis(d,l,n,s);var a=drawLineDataPoints(c,l,n,s,e),i=a.xAxisPoints,r=a.calPoints,o=a.eachSpacing;l.chartData.xAxisPoints=i;l.chartData.calPoints=r;l.chartData.eachSpacing=o;drawYAxis(c,l,n,s);if(l.enableMarkLine!==false&&e===1){drawMarkLine(l,n,s)}drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,e,o,i);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"scatter":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}drawYAxisGrid(d,l,n,s);drawXAxis(d,l,n,s);var a=drawScatterDataPoints(c,l,n,s,e),i=a.xAxisPoints,r=a.calPoints,o=a.eachSpacing;l.chartData.xAxisPoints=i;l.chartData.calPoints=r;l.chartData.eachSpacing=o;drawYAxis(c,l,n,s);if(l.enableMarkLine!==false&&e===1){drawMarkLine(l,n,s)}drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,e,o,i);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"bubble":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}drawYAxisGrid(d,l,n,s);drawXAxis(d,l,n,s);var a=drawBubbleDataPoints(c,l,n,s,e),i=a.xAxisPoints,r=a.calPoints,o=a.eachSpacing;l.chartData.xAxisPoints=i;l.chartData.calPoints=r;l.chartData.eachSpacing=o;drawYAxis(c,l,n,s);if(l.enableMarkLine!==false&&e===1){drawMarkLine(l,n,s)}drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,e,o,i);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"mix":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}drawYAxisGrid(d,l,n,s);drawXAxis(d,l,n,s);var a=drawMixDataPoints(c,l,n,s,e),i=a.xAxisPoints,r=a.calPoints,o=a.eachSpacing;l.chartData.xAxisPoints=i;l.chartData.calPoints=r;l.chartData.eachSpacing=o;drawYAxis(c,l,n,s);if(l.enableMarkLine!==false&&e===1){drawMarkLine(l,n,s)}drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,e,o,i);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"column":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}drawYAxisGrid(d,l,n,s);drawXAxis(d,l,n,s);var a=drawColumnDataPoints(c,l,n,s,e),i=a.xAxisPoints,r=a.calPoints,o=a.eachSpacing;l.chartData.xAxisPoints=i;l.chartData.calPoints=r;l.chartData.eachSpacing=o;drawYAxis(c,l,n,s);if(l.enableMarkLine!==false&&e===1){drawMarkLine(l,n,s)}drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,e,o,i);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"mount":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}drawYAxisGrid(d,l,n,s);drawXAxis(d,l,n,s);var a=drawMountDataPoints(c,l,n,s,e),i=a.xAxisPoints,r=a.calPoints,o=a.eachSpacing;l.chartData.xAxisPoints=i;l.chartData.calPoints=r;l.chartData.eachSpacing=o;drawYAxis(c,l,n,s);if(l.enableMarkLine!==false&&e===1){drawMarkLine(l,n,s)}drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,e,o,i);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"bar":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}drawXAxis(d,l,n,s);var a=drawBarDataPoints(c,l,n,s,e),i=a.yAxisPoints,r=a.calPoints,o=a.eachSpacing;l.chartData.yAxisPoints=i;l.chartData.xAxisPoints=l.chartData.xAxisData.xAxisPoints;l.chartData.calPoints=r;l.chartData.eachSpacing=o;drawYAxis(c,l,n,s);if(l.enableMarkLine!==false&&e===1){drawMarkLine(l,n,s)}drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,e,o,i);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"area":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}drawYAxisGrid(d,l,n,s);drawXAxis(d,l,n,s);var a=drawAreaDataPoints(c,l,n,s,e),i=a.xAxisPoints,r=a.calPoints,o=a.eachSpacing;l.chartData.xAxisPoints=i;l.chartData.calPoints=r;l.chartData.eachSpacing=o;drawYAxis(c,l,n,s);if(l.enableMarkLine!==false&&e===1){drawMarkLine(l,n,s)}drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,e,o,i);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"ring":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}l.chartData.pieData=drawPieDataPoints(c,l,n,s,e);drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,e);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"pie":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}l.chartData.pieData=drawPieDataPoints(c,l,n,s,e);drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,e);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"rose":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}l.chartData.pieData=drawRoseDataPoints(c,l,n,s,e);drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,e);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"radar":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}l.chartData.radarData=drawRadarDataPoints(c,l,n,s,e);drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,e);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"arcbar":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}l.chartData.arcbarData=drawArcbarDataPoints(c,l,n,s,e);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"gauge":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}l.chartData.gaugeData=drawGaugeDataPoints(d,c,l,n,s,e);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"candle":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}drawYAxisGrid(d,l,n,s);drawXAxis(d,l,n,s);var a=drawCandleDataPoints(c,x,l,n,s,e),i=a.xAxisPoints,r=a.calPoints,o=a.eachSpacing;l.chartData.xAxisPoints=i;l.chartData.calPoints=r;l.chartData.eachSpacing=o;drawYAxis(c,l,n,s);if(l.enableMarkLine!==false&&e===1){drawMarkLine(l,n,s)}if(x){drawLegend(x,l,n,s,l.chartData)}else{drawLegend(l.series,l,n,s,l.chartData)}drawToolTipBridge(l,n,s,e,o,i);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break}}function uChartsEvent(){this.events={}}uChartsEvent.prototype.addEventListener=function(t,e){this.events[t]=this.events[t]||[];this.events[t].push(e)};uChartsEvent.prototype.delEventListener=function(t){this.events[t]=[]};uChartsEvent.prototype.trigger=function(){for(var t=arguments.length,e=Array(t),a=0;a<t;a++){e[a]=arguments[a]}var i=e[0];var r=e.slice(1);if(!!this.events[i]){this.events[i].forEach(function(t){try{t.apply(null,r)}catch(t){}})}};var uCharts=function t(a){a.pix=a.pixelRatio?a.pixelRatio:1;a.fontSize=a.fontSize?a.fontSize:13;a.fontColor=a.fontColor?a.fontColor:config.fontColor;if(a.background==""||a.background=="none"){a.background="#FFFFFF"}a.title=assign({},a.title);a.subtitle=assign({},a.subtitle);a.duration=a.duration?a.duration:1e3;a.yAxis=assign({},{data:[],showTitle:false,disabled:false,disableGrid:false,gridSet:"number",splitNumber:5,gridType:"solid",dashLength:4*a.pix,gridColor:"#cccccc",padding:10,fontColor:"#666666"},a.yAxis);a.xAxis=assign({},{rotateLabel:false,rotateAngle:45,disabled:false,disableGrid:false,splitNumber:5,calibration:false,fontColor:"#666666",fontSize:13,lineHeight:20,marginTop:0,gridType:"solid",dashLength:4,scrollAlign:"left",boundaryGap:"center",axisLine:true,axisLineColor:"#cccccc",titleFontSize:13,titleOffsetY:0,titleOffsetX:0,titleFontColor:"#666666"},a.xAxis);a.xAxis.scrollPosition=a.xAxis.scrollAlign;a.legend=assign({},{show:true,position:"bottom",float:"center",backgroundColor:"rgba(0,0,0,0)",borderColor:"rgba(0,0,0,0)",borderWidth:0,padding:5,margin:5,itemGap:10,fontSize:a.fontSize,lineHeight:a.fontSize,fontColor:a.fontColor,formatter:{},hiddenColor:"#CECECE"},a.legend);a.extra=assign({tooltip:{legendShape:"auto"}},a.extra);a.rotate=a.rotate?true:false;a.animation=a.animation?true:false;a.rotate=a.rotate?true:false;a.canvas2d=a.canvas2d?true:false;let e=assign({},config);e.color=a.color?a.color:e.color;if(a.type=="pie"){e.pieChartLinePadding=a.dataLabel===false?0:a.extra.pie.labelWidth*a.pix||e.pieChartLinePadding*a.pix}if(a.type=="ring"){e.pieChartLinePadding=a.dataLabel===false?0:a.extra.ring.labelWidth*a.pix||e.pieChartLinePadding*a.pix}if(a.type=="rose"){e.pieChartLinePadding=a.dataLabel===false?0:a.extra.rose.labelWidth*a.pix||e.pieChartLinePadding*a.pix}e.pieChartTextPadding=a.dataLabel===false?0:e.pieChartTextPadding*a.pix;e.rotate=a.rotate;if(a.rotate){let t=a.width;let e=a.height;a.width=e;a.height=t}a.padding=a.padding?a.padding:e.padding;e.yAxisWidth=config.yAxisWidth*a.pix;e.fontSize=a.fontSize*a.pix;e.titleFontSize=config.titleFontSize*a.pix;e.subtitleFontSize=config.subtitleFontSize*a.pix;if(!a.context){throw new Error("[uCharts] 未获取到context！注意：v2.0版本后，需要自行获取canvas的绘图上下文并传入opts.context！")}this.context=a.context;if(!this.context.setTextAlign){this.context.setStrokeStyle=function(t){return this.strokeStyle=t};this.context.setLineWidth=function(t){return this.lineWidth=t};this.context.setLineCap=function(t){return this.lineCap=t};this.context.setFontSize=function(t){return this.font=t+"px sans-serif"};this.context.setFillStyle=function(t){return this.fillStyle=t};this.context.setTextAlign=function(t){return this.textAlign=t};this.context.setTextBaseline=function(t){return this.textBaseline=t};this.context.setShadow=function(t,e,a,i){this.shadowColor=i;this.shadowOffsetX=t;this.shadowOffsetY=e;this.shadowBlur=a};this.context.draw=function(){}}if(!this.context.setLineDash){this.context.setLineDash=function(t){}}a.chartData={};this.uevent=new uChartsEvent;this.scrollOption={currentOffset:0,startTouchX:0,distance:0,lastMoveTime:0};this.opts=a;this.config=e;drawCharts.call(this,a.type,a,e,this.context)};uCharts.prototype.updateData=function(){let t=arguments.length>0&&arguments[0]!==undefined?arguments[0]:{};this.opts=assign({},this.opts,t);this.opts.updateData=true;let c=t.scrollPosition||"current";switch(c){case"current":this.opts._scrollDistance_=this.scrollOption.currentOffset;break;case"left":this.opts._scrollDistance_=0;this.scrollOption={currentOffset:0,startTouchX:0,distance:0,lastMoveTime:0};break;case"right":let t=calYAxisData(this.opts.series,this.opts,this.config,this.context),e=t.yAxisWidth;this.config.yAxisWidth=e;let a=0;let i=getXAxisPoints(this.opts.categories,this.opts,this.config),r=i.xAxisPoints,o=i.startX,n=i.endX,l=i.eachSpacing;let s=l*(r.length-1);let h=n-o;a=h-s;this.scrollOption={currentOffset:a,startTouchX:a,distance:0,lastMoveTime:0};this.opts._scrollDistance_=a;break}drawCharts.call(this,this.opts.type,this.opts,this.config,this.context)};uCharts.prototype.zoom=function(){var t=arguments.length>0&&arguments[0]!==undefined?arguments[0]:this.opts.xAxis.itemCount;if(this.opts.enableScroll!==true){console.log("[uCharts] 请启用滚动条后使用");return}let e=Math.round(Math.abs(this.scrollOption.currentOffset)/this.opts.chartData.eachSpacing)+Math.round(this.opts.xAxis.itemCount/2);this.opts.animation=false;this.opts.xAxis.itemCount=t.itemCount;let a=calYAxisData(this.opts.series,this.opts,this.config,this.context),i=a.yAxisWidth;this.config.yAxisWidth=i;let r=0;let o=getXAxisPoints(this.opts.categories,this.opts,this.config),h=o.xAxisPoints,c=o.startX,d=o.endX,n=o.eachSpacing;let x=n*e;let l=d-c;let s=l-n*(h.length-1);r=l/2-x;if(r>0){r=0}if(r<s){r=s}this.scrollOption={currentOffset:r,startTouchX:0,distance:0,lastMoveTime:0};calValidDistance(this,r,this.opts.chartData,this.config,this.opts);this.opts._scrollDistance_=r;drawCharts.call(this,this.opts.type,this.opts,this.config,this.context)};uCharts.prototype.dobuleZoom=function(t){if(this.opts.enableScroll!==true){console.log("[uCharts] 请启用滚动条后使用");return}const a=t.changedTouches;if(a.length<2){return}for(var e=0;e<a.length;e++){a[e].x=a[e].x?a[e].x:a[e].clientX;a[e].y=a[e].y?a[e].y:a[e].clientY}const i=[getTouches(a[0],this.opts,t),getTouches(a[1],this.opts,t)];const c=Math.abs(i[0].x-i[1].x);if(!this.scrollOption.moveCount){let t={changedTouches:[{x:a[0].x,y:this.opts.area[0]/this.opts.pix+2}]};let e={changedTouches:[{x:a[1].x,y:this.opts.area[0]/this.opts.pix+2}]};if(this.opts.rotate){t={changedTouches:[{x:this.opts.height/this.opts.pix-this.opts.area[0]/this.opts.pix-2,y:a[0].y}]};e={changedTouches:[{x:this.opts.height/this.opts.pix-this.opts.area[0]/this.opts.pix-2,y:a[1].y}]}}const s=this.getCurrentDataIndex(t).index;const h=this.getCurrentDataIndex(e).index;const v=Math.abs(s-h);this.scrollOption.moveCount=v;this.scrollOption.moveCurrent1=Math.min(s,h);this.scrollOption.moveCurrent2=Math.max(s,h);return}let d=c/this.scrollOption.moveCount;let r=(this.opts.width-this.opts.area[1]-this.opts.area[3])/d;r=r<=2?2:r;r=r>=this.opts.categories.length?this.opts.categories.length:r;this.opts.animation=false;this.opts.xAxis.itemCount=r;let o=0;let n=getXAxisPoints(this.opts.categories,this.opts,this.config),x=n.xAxisPoints,f=n.startX,p=n.endX,l=n.eachSpacing;let u=l*this.scrollOption.moveCurrent1;let g=p-f;let y=g-l*(x.length-1);o=-u+Math.min(i[0].x,i[1].x)-this.opts.area[3]-l;if(o>0){o=0}if(o<y){o=y}this.scrollOption.currentOffset=o;this.scrollOption.startTouchX=0;this.scrollOption.distance=0;calValidDistance(this,o,this.opts.chartData,this.config,this.opts);this.opts._scrollDistance_=o;drawCharts.call(this,this.opts.type,this.opts,this.config,this.context)};uCharts.prototype.stopAnimation=function(){this.animationInstance&&this.animationInstance.stop()};uCharts.prototype.addEventListener=function(t,e){this.uevent.addEventListener(t,e)};uCharts.prototype.delEventListener=function(t){this.uevent.delEventListener(t)};uCharts.prototype.getCurrentDataIndex=function(e){var a=null;if(e.changedTouches){a=e.changedTouches[0]}else{a=e.mp.changedTouches[0]}if(a){let t=getTouches(a,this.opts,e);if(this.opts.type==="pie"||this.opts.type==="ring"){return findPieChartCurrentIndex({x:t.x,y:t.y},this.opts.chartData.pieData,this.opts)}else if(this.opts.type==="rose"){return findRoseChartCurrentIndex({x:t.x,y:t.y},this.opts.chartData.pieData,this.opts)}else if(this.opts.type==="radar"){return findRadarChartCurrentIndex({x:t.x,y:t.y},this.opts.chartData.radarData,this.opts.categories.length)}else if(this.opts.type==="funnel"){return findFunnelChartCurrentIndex({x:t.x,y:t.y},this.opts.chartData.funnelData)}else if(this.opts.type==="map"){return findMapChartCurrentIndex({x:t.x,y:t.y},this.opts)}else if(this.opts.type==="word"){return findWordChartCurrentIndex({x:t.x,y:t.y},this.opts.chartData.wordCloudData)}else if(this.opts.type==="bar"){return findBarChartCurrentIndex({x:t.x,y:t.y},this.opts.chartData.calPoints,this.opts,this.config,Math.abs(this.scrollOption.currentOffset))}else{return findCurrentIndex({x:t.x,y:t.y},this.opts.chartData.calPoints,this.opts,this.config,Math.abs(this.scrollOption.currentOffset))}}return-1};uCharts.prototype.getLegendDataIndex=function(e){var a=null;if(e.changedTouches){a=e.changedTouches[0]}else{a=e.mp.changedTouches[0]}if(a){let t=getTouches(a,this.opts,e);return findLegendIndex({x:t.x,y:t.y},this.opts.chartData.legendData)}return-1};uCharts.prototype.touchLegend=function(t){var e=arguments.length>1&&arguments[1]!==undefined?arguments[1]:{};var a=null;if(t.changedTouches){a=t.changedTouches[0]}else{a=t.mp.changedTouches[0]}if(a){var i=getTouches(a,this.opts,t);var r=this.getLegendDataIndex(t);if(r>=0){if(this.opts.type=="candle"){this.opts.seriesMA[r].show=!this.opts.seriesMA[r].show}else{this.opts.series[r].show=!this.opts.series[r].show}this.opts.animation=e.animation?true:false;this.opts._scrollDistance_=this.scrollOption.currentOffset;drawCharts.call(this,this.opts.type,this.opts,this.config,this.context)}}};uCharts.prototype.showToolTip=function(t){var e=arguments.length>1&&arguments[1]!==undefined?arguments[1]:{};var c=null;if(t.changedTouches){c=t.changedTouches[0]}else{c=t.mp.changedTouches[0]}if(!c){console.log("[uCharts] 未获取到event坐标信息")}var a=getTouches(c,this.opts,t);var d=this.scrollOption.currentOffset;var i=assign({},this.opts,{_scrollDistance_:d,animation:false});if(this.opts.type==="line"||this.opts.type==="area"||this.opts.type==="column"||this.opts.type==="scatter"||this.opts.type==="bubble"){var r=this.getCurrentDataIndex(t);var o=e.index==undefined?r.index:e.index;if(o>-1||o.length>0){var n=getSeriesDataItem(this.opts.series,o,r.group);if(n.length!==0){var l=getToolTipData(n,this.opts,o,r.group,this.opts.categories,e),s=l.textList,h=l.offset;h.y=a.y;i.tooltip={textList:e.textList!==undefined?e.textList:s,offset:e.offset!==undefined?e.offset:h,option:e,index:o,group:r.group}}}drawCharts.call(this,i.type,i,this.config,this.context)}if(this.opts.type==="mount"){var o=e.index==undefined?this.getCurrentDataIndex(t).index:e.index;if(o>-1){var i=assign({},this.opts,{animation:false});var n=assign({},i._series_[o]);var s=[{text:e.formatter?e.formatter(n,undefined,o,i):n.name+": "+n.data,color:n.color,legendShape:this.opts.extra.tooltip.legendShape=="auto"?n.legendShape:this.opts.extra.tooltip.legendShape}];var h={x:i.chartData.calPoints[o].x,y:a.y};i.tooltip={textList:e.textList?e.textList:s,offset:e.offset!==undefined?e.offset:h,option:e,index:o}}drawCharts.call(this,i.type,i,this.config,this.context)}if(this.opts.type==="bar"){var r=this.getCurrentDataIndex(t);var o=e.index==undefined?r.index:e.index;if(o>-1||o.length>0){var n=getSeriesDataItem(this.opts.series,o,r.group);if(n.length!==0){var l=getToolTipData(n,this.opts,o,r.group,this.opts.categories,e),s=l.textList,h=l.offset;h.x=a.x;i.tooltip={textList:e.textList!==undefined?e.textList:s,offset:e.offset!==undefined?e.offset:h,option:e,index:o}}}drawCharts.call(this,i.type,i,this.config,this.context)}if(this.opts.type==="mix"){var r=this.getCurrentDataIndex(t);var o=e.index==undefined?r.index:e.index;if(o>-1){var d=this.scrollOption.currentOffset;var i=assign({},this.opts,{_scrollDistance_:d,animation:false});var n=getSeriesDataItem(this.opts.series,o);if(n.length!==0){var x=getMixToolTipData(n,this.opts,o,this.opts.categories,e),s=x.textList,h=x.offset;h.y=a.y;i.tooltip={textList:e.textList?e.textList:s,offset:e.offset!==undefined?e.offset:h,option:e,index:o}}}drawCharts.call(this,i.type,i,this.config,this.context)}if(this.opts.type==="candle"){var r=this.getCurrentDataIndex(t);var o=e.index==undefined?r.index:e.index;if(o>-1){var d=this.scrollOption.currentOffset;var i=assign({},this.opts,{_scrollDistance_:d,animation:false});var n=getSeriesDataItem(this.opts.series,o);if(n.length!==0){var l=getCandleToolTipData(this.opts.series[0].data,n,this.opts,o,this.opts.categories,this.opts.extra.candle,e),s=l.textList,h=l.offset;h.y=a.y;i.tooltip={textList:e.textList?e.textList:s,offset:e.offset!==undefined?e.offset:h,option:e,index:o}}}drawCharts.call(this,i.type,i,this.config,this.context)}if(this.opts.type==="pie"||this.opts.type==="ring"||this.opts.type==="rose"||this.opts.type==="funnel"){var o=e.index==undefined?this.getCurrentDataIndex(t):e.index;if(o>-1){var i=assign({},this.opts,{animation:false});var n=assign({},i._series_[o]);var s=[{text:e.formatter?e.formatter(n,undefined,o,i):n.name+": "+n.data,color:n.color,legendShape:this.opts.extra.tooltip.legendShape=="auto"?n.legendShape:this.opts.extra.tooltip.legendShape}];var h={x:a.x,y:a.y};i.tooltip={textList:e.textList?e.textList:s,offset:e.offset!==undefined?e.offset:h,option:e,index:o}}drawCharts.call(this,i.type,i,this.config,this.context)}if(this.opts.type==="map"){var o=e.index==undefined?this.getCurrentDataIndex(t):e.index;if(o>-1){var i=assign({},this.opts,{animation:false});var n=assign({},this.opts.series[o]);n.name=n.properties.name;var s=[{text:e.formatter?e.formatter(n,undefined,o,this.opts):n.name,color:n.color,legendShape:this.opts.extra.tooltip.legendShape=="auto"?n.legendShape:this.opts.extra.tooltip.legendShape}];var h={x:a.x,y:a.y};i.tooltip={textList:e.textList?e.textList:s,offset:e.offset!==undefined?e.offset:h,option:e,index:o}}i.updateData=false;drawCharts.call(this,i.type,i,this.config,this.context)}if(this.opts.type==="word"){var o=e.index==undefined?this.getCurrentDataIndex(t):e.index;if(o>-1){var i=assign({},this.opts,{animation:false});var n=assign({},this.opts.series[o]);var s=[{text:e.formatter?e.formatter(n,undefined,o,this.opts):n.name,color:n.color,legendShape:this.opts.extra.tooltip.legendShape=="auto"?n.legendShape:this.opts.extra.tooltip.legendShape}];var h={x:a.x,y:a.y};i.tooltip={textList:e.textList?e.textList:s,offset:e.offset!==undefined?e.offset:h,option:e,index:o}}i.updateData=false;drawCharts.call(this,i.type,i,this.config,this.context)}if(this.opts.type==="radar"){var o=e.index==undefined?this.getCurrentDataIndex(t):e.index;if(o>-1){var i=assign({},this.opts,{animation:false});var n=getSeriesDataItem(this.opts.series,o);if(n.length!==0){var s=n.map(t=>{return{text:e.formatter?e.formatter(t,this.opts.categories[o],o,this.opts):t.name+": "+t.data,color:t.color,legendShape:this.opts.extra.tooltip.legendShape=="auto"?t.legendShape:this.opts.extra.tooltip.legendShape}});var h={x:a.x,y:a.y};i.tooltip={textList:e.textList?e.textList:s,offset:e.offset!==undefined?e.offset:h,option:e,index:o}}}drawCharts.call(this,i.type,i,this.config,this.context)}};uCharts.prototype.translate=function(t){this.scrollOption={currentOffset:t,startTouchX:t,distance:0,lastMoveTime:0};let e=assign({},this.opts,{_scrollDistance_:t,animation:false});drawCharts.call(this,this.opts.type,e,this.config,this.context)};uCharts.prototype.scrollStart=function(t){var e=null;if(t.changedTouches){e=t.changedTouches[0]}else{e=t.mp.changedTouches[0]}var a=getTouches(e,this.opts,t);if(e&&this.opts.enableScroll===true){this.scrollOption.startTouchX=a.x}};uCharts.prototype.scroll=function(t){if(this.scrollOption.lastMoveTime===0){this.scrollOption.lastMoveTime=Date.now()}let e=this.opts.touchMoveLimit||60;let a=Date.now();let i=a-this.scrollOption.lastMoveTime;if(i<Math.floor(1e3/e))return;if(this.scrollOption.startTouchX==0)return;this.scrollOption.lastMoveTime=a;var r=null;if(t.changedTouches){r=t.changedTouches[0]}else{r=t.mp.changedTouches[0]}if(r&&this.opts.enableScroll===true){var o=getTouches(r,this.opts,t);var n;n=o.x-this.scrollOption.startTouchX;var l=this.scrollOption.currentOffset;var s=calValidDistance(this,l+n,this.opts.chartData,this.config,this.opts);this.scrollOption.distance=n=s-l;var h=assign({},this.opts,{_scrollDistance_:l+n,animation:false});this.opts=h;drawCharts.call(this,h.type,h,this.config,this.context);return l+n}};uCharts.prototype.scrollEnd=function(t){if(this.opts.enableScroll===true){var e=this.scrollOption,a=e.currentOffset,i=e.distance;this.scrollOption.currentOffset=a+i;this.scrollOption.distance=0;this.scrollOption.moveCount=0}};export default uCharts;
\ No newline at end of file
+"use strict";
+var config = {
+	version: "v2.5.0-20230101",
+	yAxisWidth: 15,
+	xAxisHeight: 22,
+	padding: [10, 10, 10, 10],
+	rotate: false,
+	fontSize: 13,
+	fontColor: "#666666",
+	dataPointShape: ["circle", "circle", "circle", "circle"],
+	color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", "#ea7ccc"],
+	linearColor: ["#0EE2F8", "#2BDCA8", "#FA7D8D", "#EB88E2", "#2AE3A0", "#0EE2F8", "#EB88E2", "#6773E3", "#F78A85"],
+	pieChartLinePadding: 15,
+	pieChartTextPadding: 5,
+	titleFontSize: 20,
+	subtitleFontSize: 15,
+	radarLabelTextMargin: 13
+};
+var assign = function(e, ...t) {
+	if (e == null) {
+		throw new TypeError("[uCharts] Cannot convert undefined or null to object")
+	}
+	if (!t || t.length <= 0) {
+		return e
+	}
+
+	function i(e, a) {
+		for (let t in a) {
+			e[t] = e[t] && e[t].toString() === "[object Object]" ? i(e[t], a[t]) : e[t] = a[t]
+		}
+		return e
+	}
+	t.forEach(t => {
+		e = i(e, t)
+	});
+	return e
+};
+var util = {
+	toFixed: function t(e, a) {
+		a = a || 2;
+		if (this.isFloat(e)) {
+			e = e.toFixed(a)
+		}
+		return e
+	},
+	isFloat: function t(e) {
+		return e % 1 !== 0
+	},
+	approximatelyEqual: function t(e, a) {
+		return Math.abs(e - a) < 1e-10
+	},
+	isSameSign: function t(e, a) {
+		return Math.abs(e) === e && Math.abs(a) === a || Math.abs(e) !== e && Math.abs(a) !== a
+	},
+	isSameXCoordinateArea: function t(e, a) {
+		return this.isSameSign(e.x, a.x)
+	},
+	isCollision: function t(e, a) {
+		e.end = {};
+		e.end.x = e.start.x + e.width;
+		e.end.y = e.start.y - e.height;
+		a.end = {};
+		a.end.x = a.start.x + a.width;
+		a.end.y = a.start.y - a.height;
+		var i = a.start.x > e.end.x || a.end.x < e.start.x || a.end.y > e.start.y || a.start.y < e.end.y;
+		return !i
+	}
+};
+
+function getH5Offset(t) {
+	t.mp = {
+		changedTouches: []
+	};
+	t.mp.changedTouches.push({
+		x: t.offsetX,
+		y: t.offsetY
+	});
+	return t
+}
+
+function hexToRgb(t, e) {
+	var a = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
+	var i = t.replace(a, function(t, e, a, i) {
+		return e + e + a + a + i + i
+	});
+	var r = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(i);
+	var o = parseInt(r[1], 16);
+	var n = parseInt(r[2], 16);
+	var l = parseInt(r[3], 16);
+	return "rgba(" + o + "," + n + "," + l + "," + e + ")"
+}
+
+function findRange(t, e, a) {
+	if (isNaN(t)) {
+		throw new Error("[uCharts] series数据需为Number格式")
+	}
+	a = a || 10;
+	e = e ? e : "upper";
+	var i = 1;
+	while (a < 1) {
+		a *= 10;
+		i *= 10
+	}
+	if (e === "upper") {
+		t = Math.ceil(t * i)
+	} else {
+		t = Math.floor(t * i)
+	}
+	while (t % a !== 0) {
+		if (e === "upper") {
+			if (t == t + 1) {
+				break
+			}
+			t++
+		} else {
+			t--
+		}
+	}
+	return t / i
+}
+
+function calCandleMA(o, t, e, n) {
+	let a = [];
+	for (let r = 0; r < o.length; r++) {
+		let i = {
+			data: [],
+			name: t[r],
+			color: e[r]
+		};
+		for (let a = 0, t = n.length; a < t; a++) {
+			if (a < o[r]) {
+				i.data.push(null);
+				continue
+			}
+			let e = 0;
+			for (let t = 0; t < o[r]; t++) {
+				e += n[a - t][1]
+			}
+			i.data.push(+(e / o[r]).toFixed(3))
+		}
+		a.push(i)
+	}
+	return a
+}
+
+function calValidDistance(t, e, a, i, r) {
+	var o = r.width - r.area[1] - r.area[3];
+	var n = a.eachSpacing * (r.chartData.xAxisData.xAxisPoints.length - 1);
+	if (r.type == "mount" && r.extra && r.extra.mount && r.extra.mount.widthRatio && r.extra.mount.widthRatio > 1) {
+		if (r.extra.mount.widthRatio > 2) r.extra.mount.widthRatio = 2;
+		n += (r.extra.mount.widthRatio - 1) * a.eachSpacing
+	}
+	var l = e;
+	if (e >= 0) {
+		l = 0;
+		t.uevent.trigger("scrollLeft");
+		t.scrollOption.position = "left";
+		r.xAxis.scrollPosition = "left"
+	} else if (Math.abs(e) >= n - o) {
+		l = o - n;
+		t.uevent.trigger("scrollRight");
+		t.scrollOption.position = "right";
+		r.xAxis.scrollPosition = "right"
+	} else {
+		t.scrollOption.position = e;
+		r.xAxis.scrollPosition = e
+	}
+	return l
+}
+
+function isInAngleRange(t, e, a) {
+	function i(t) {
+		while (t < 0) {
+			t += 2 * Math.PI
+		}
+		while (t > 2 * Math.PI) {
+			t -= 2 * Math.PI
+		}
+		return t
+	}
+	t = i(t);
+	e = i(e);
+	a = i(a);
+	if (e > a) {
+		a += 2 * Math.PI;
+		if (t < e) {
+			t += 2 * Math.PI
+		}
+	}
+	return t >= e && t <= a
+}
+
+function createCurveControlPoints(t, e) {
+	function a(t, e) {
+		if (t[e - 1] && t[e + 1]) {
+			return t[e].y >= Math.max(t[e - 1].y, t[e + 1].y) || t[e].y <= Math.min(t[e - 1].y, t[e + 1].y)
+		} else {
+			return false
+		}
+	}
+
+	function c(t, e) {
+		if (t[e - 1] && t[e + 1]) {
+			return t[e].x >= Math.max(t[e - 1].x, t[e + 1].x) || t[e].x <= Math.min(t[e - 1].x, t[e + 1].x)
+		} else {
+			return false
+		}
+	}
+	var i = .2;
+	var r = .2;
+	var o = null;
+	var n = null;
+	var l = null;
+	var s = null;
+	if (e < 1) {
+		o = t[0].x + (t[1].x - t[0].x) * i;
+		n = t[0].y + (t[1].y - t[0].y) * i
+	} else {
+		o = t[e].x + (t[e + 1].x - t[e - 1].x) * i;
+		n = t[e].y + (t[e + 1].y - t[e - 1].y) * i
+	}
+	if (e > t.length - 3) {
+		var h = t.length - 1;
+		l = t[h].x - (t[h].x - t[h - 1].x) * r;
+		s = t[h].y - (t[h].y - t[h - 1].y) * r
+	} else {
+		l = t[e + 1].x - (t[e + 2].x - t[e].x) * r;
+		s = t[e + 1].y - (t[e + 2].y - t[e].y) * r
+	}
+	if (a(t, e + 1)) {
+		s = t[e + 1].y
+	}
+	if (a(t, e)) {
+		n = t[e].y
+	}
+	if (c(t, e + 1)) {
+		l = t[e + 1].x
+	}
+	if (c(t, e)) {
+		o = t[e].x
+	}
+	if (n >= Math.max(t[e].y, t[e + 1].y) || n <= Math.min(t[e].y, t[e + 1].y)) {
+		n = t[e].y
+	}
+	if (s >= Math.max(t[e].y, t[e + 1].y) || s <= Math.min(t[e].y, t[e + 1].y)) {
+		s = t[e + 1].y
+	}
+	if (o >= Math.max(t[e].x, t[e + 1].x) || o <= Math.min(t[e].x, t[e + 1].x)) {
+		o = t[e].x
+	}
+	if (l >= Math.max(t[e].x, t[e + 1].x) || l <= Math.min(t[e].x, t[e + 1].x)) {
+		l = t[e + 1].x
+	}
+	return {
+		ctrA: {
+			x: o,
+			y: n
+		},
+		ctrB: {
+			x: l,
+			y: s
+		}
+	}
+}
+
+function convertCoordinateOrigin(t, e, a) {
+	return {
+		x: a.x + t,
+		y: a.y - e
+	}
+}
+
+function avoidCollision(t, e) {
+	if (e) {
+		while (util.isCollision(t, e)) {
+			if (t.start.x > 0) {
+				t.start.y--
+			} else if (t.start.x < 0) {
+				t.start.y++
+			} else {
+				if (t.start.y > 0) {
+					t.start.y++
+				} else {
+					t.start.y--
+				}
+			}
+		}
+	}
+	return t
+}
+
+function fixPieSeries(e, a, t) {
+	let i = [];
+	if (e.length > 0 && e[0].data.constructor.toString().indexOf("Array") > -1) {
+		a._pieSeries_ = e;
+		let t = e[0].data;
+		for (var r = 0; r < t.length; r++) {
+			t[r].formatter = e[0].formatter;
+			t[r].data = t[r].value;
+			i.push(t[r])
+		}
+		a.series = i
+	} else {
+		i = e
+	}
+	return i
+}
+
+function fillSeries(e, a, i) {
+	var r = 0;
+	for (var o = 0; o < e.length; o++) {
+		let t = e[o];
+		if (!t.color) {
+			t.color = i.color[r];
+			r = (r + 1) % i.color.length
+		}
+		if (!t.linearIndex) {
+			t.linearIndex = o
+		}
+		if (!t.index) {
+			t.index = 0
+		}
+		if (!t.type) {
+			t.type = a.type
+		}
+		if (typeof t.show == "undefined") {
+			t.show = true
+		}
+		if (!t.type) {
+			t.type = a.type
+		}
+		if (!t.pointShape) {
+			t.pointShape = "circle"
+		}
+		if (!t.legendShape) {
+			switch (t.type) {
+				case "line":
+					t.legendShape = "line";
+					break;
+				case "column":
+				case "bar":
+					t.legendShape = "rect";
+					break;
+				case "area":
+				case "mount":
+					t.legendShape = "triangle";
+					break;
+				default:
+					t.legendShape = "circle"
+			}
+		}
+	}
+	return e
+}
+
+function fillCustomColor(t, e, a, i) {
+	var r = e || [];
+	if (t == "custom" && r.length == 0) {
+		r = i.linearColor
+	}
+	if (t == "custom" && r.length < a.length) {
+		let t = a.length - r.length;
+		for (var o = 0; o < t; o++) {
+			r.push(i.linearColor[(o + 1) % i.linearColor.length])
+		}
+	}
+	return r
+}
+
+function getDataRange(t, e) {
+	var a = 0;
+	var i = e - t;
+	if (i >= 1e4) {
+		a = 1e3
+	} else if (i >= 1e3) {
+		a = 100
+	} else if (i >= 100) {
+		a = 10
+	} else if (i >= 10) {
+		a = 5
+	} else if (i >= 1) {
+		a = 1
+	} else if (i >= .1) {
+		a = .1
+	} else if (i >= .01) {
+		a = .01
+	} else if (i >= .001) {
+		a = .001
+	} else if (i >= 1e-4) {
+		a = 1e-4
+	} else if (i >= 1e-5) {
+		a = 1e-5
+	} else {
+		a = 1e-6
+	}
+	return {
+		minRange: findRange(t, "lower", a),
+		maxRange: findRange(e, "upper", a)
+	}
+}
+
+function measureText(a, t, e) {
+	var i = 0;
+	a = String(a);
+	e = false;
+	if (e !== false && e !== undefined && e.setFontSize && e.measureText) {
+		e.setFontSize(t);
+		return e.measureText(a).width
+	} else {
+		var a = a.split("");
+		for (let e = 0; e < a.length; e++) {
+			let t = a[e];
+			if (/[a-zA-Z]/.test(t)) {
+				i += 7
+			} else if (/[0-9]/.test(t)) {
+				i += 5.5
+			} else if (/\./.test(t)) {
+				i += 2.7
+			} else if (/-/.test(t)) {
+				i += 3.25
+			} else if (/:/.test(t)) {
+				i += 2.5
+			} else if (/[\u4e00-\u9fa5]/.test(t)) {
+				i += 10
+			} else if (/\(|\)/.test(t)) {
+				i += 3.73
+			} else if (/\s/.test(t)) {
+				i += 2.5
+			} else if (/%/.test(t)) {
+				i += 8
+			} else {
+				i += 10
+			}
+		}
+		return i * t / 10
+	}
+}
+
+function dataCombine(t) {
+	return t.reduce(function(t, e) {
+		return (t.data ? t.data : t).concat(e.data)
+	}, [])
+}
+
+function dataCombineStack(t, e) {
+	var a = new Array(e);
+	for (var i = 0; i < a.length; i++) {
+		a[i] = 0
+	}
+	for (var r = 0; r < t.length; r++) {
+		for (var i = 0; i < a.length; i++) {
+			a[i] += t[r].data[i]
+		}
+	}
+	return t.reduce(function(t, e) {
+		return (t.data ? t.data : t).concat(e.data).concat(a)
+	}, [])
+}
+
+function getTouches(t, e, a) {
+	let i, r;
+	if (t.clientX) {
+		if (e.rotate) {
+			r = e.height - t.clientX * e.pix;
+			i = (t.pageY - a.currentTarget.offsetTop - e.height / e.pix / 2 * (e.pix - 1)) * e.pix
+		} else {
+			i = t.clientX * e.pix;
+			r = (t.pageY - a.currentTarget.offsetTop - e.height / e.pix / 2 * (e.pix - 1)) * e.pix
+		}
+	} else {
+		if (e.rotate) {
+			r = e.height - t.x * e.pix;
+			i = t.y * e.pix
+		} else {
+			i = t.x * e.pix;
+			r = t.y * e.pix
+		}
+	}
+	return {
+		x: i,
+		y: r
+	}
+}
+
+function getSeriesDataItem(e, i, a) {
+	var r = [];
+	var o = [];
+	var n = i.constructor.toString().indexOf("Array") > -1;
+	if (n) {
+		let t = filterSeries(e);
+		for (var l = 0; l < a.length; l++) {
+			o.push(t[a[l]])
+		}
+	} else {
+		o = e
+	}
+	for (let t = 0; t < o.length; t++) {
+		let e = o[t];
+		let a = -1;
+		if (n) {
+			a = i[t]
+		} else {
+			a = i
+		}
+		if (e.data[a] !== null && typeof e.data[a] !== "undefined" && e.show) {
+			let t = {};
+			t.color = e.color;
+			t.type = e.type;
+			t.style = e.style;
+			t.pointShape = e.pointShape;
+			t.disableLegend = e.disableLegend;
+			t.legendShape = e.legendShape;
+			t.name = e.name;
+			t.show = e.show;
+			t.data = e.formatter ? e.formatter(e.data[a]) : e.data[a];
+			r.push(t)
+		}
+	}
+	return r
+}
+
+function getMaxTextListLength(t, e, a) {
+	var i = t.map(function(t) {
+		return measureText(t, e, a)
+	});
+	return Math.max.apply(null, i)
+}
+
+function getRadarCoordinateSeries(t) {
+	var e = 2 * Math.PI / t;
+	var a = [];
+	for (var i = 0; i < t; i++) {
+		a.push(e * i)
+	}
+	return a.map(function(t) {
+		return -1 * t + Math.PI / 2
+	})
+}
+
+function getToolTipData(t, a, i, r, o) {
+	var n = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
+	var l = a.chartData.calPoints ? a.chartData.calPoints : [];
+	let s = {};
+	if (r.length > 0) {
+		let e = [];
+		for (let t = 0; t < r.length; t++) {
+			e.push(l[r[t]])
+		}
+		s = e[0][i[0]]
+	} else {
+		for (let t = 0; t < l.length; t++) {
+			if (l[t][i]) {
+				s = l[t][i];
+				break
+			}
+		}
+	}
+	var e = t.map(function(t) {
+		let e = null;
+		if (a.categories && a.categories.length > 0) {
+			e = o[i]
+		}
+		return {
+			text: n.formatter ? n.formatter(t, e, i, a) : t.name + ": " + t.data,
+			color: t.color,
+			legendShape: a.extra.tooltip.legendShape == "auto" ? t.legendShape : a.extra.tooltip.legendShape
+		}
+	});
+	var h = {
+		x: Math.round(s.x),
+		y: Math.round(s.y)
+	};
+	return {
+		textList: e,
+		offset: h
+	}
+}
+
+function getMixToolTipData(t, e, a, i) {
+	var r = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+	var o = e.chartData.xAxisPoints[a] + e.chartData.eachSpacing / 2;
+	var n = t.map(function(t) {
+		return {
+			text: r.formatter ? r.formatter(t, i[a], a, e) : t.name + ": " + t.data,
+			color: t.color,
+			disableLegend: t.disableLegend ? true : false,
+			legendShape: e.extra.tooltip.legendShape == "auto" ? t.legendShape : e.extra.tooltip.legendShape
+		}
+	});
+	n = n.filter(function(t) {
+		if (t.disableLegend !== true) {
+			return t
+		}
+	});
+	var l = {
+		x: Math.round(o),
+		y: 0
+	};
+	return {
+		textList: n,
+		offset: l
+	}
+}
+
+function getCandleToolTipData(o, e, n, l, i, t) {
+	var r = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : {};
+	var a = n.chartData.calPoints;
+	let s = t.color.upFill;
+	let h = t.color.downFill;
+	let c = [s, s, h, s];
+	var d = [];
+	e.map(function(t) {
+		if (l == 0) {
+			if (t.data[1] - t.data[0] < 0) {
+				c[1] = h
+			} else {
+				c[1] = s
+			}
+		} else {
+			if (t.data[0] < o[l - 1][1]) {
+				c[0] = h
+			}
+			if (t.data[1] < t.data[0]) {
+				c[1] = h
+			}
+			if (t.data[2] > o[l - 1][1]) {
+				c[2] = s
+			}
+			if (t.data[3] < o[l - 1][1]) {
+				c[3] = h
+			}
+		}
+		let e = {
+			text: "开盘：" + t.data[0],
+			color: c[0],
+			legendShape: n.extra.tooltip.legendShape == "auto" ? t.legendShape : n.extra.tooltip.legendShape
+		};
+		let a = {
+			text: "收盘：" + t.data[1],
+			color: c[1],
+			legendShape: n.extra.tooltip.legendShape == "auto" ? t.legendShape : n.extra.tooltip.legendShape
+		};
+		let i = {
+			text: "最低：" + t.data[2],
+			color: c[2],
+			legendShape: n.extra.tooltip.legendShape == "auto" ? t.legendShape : n.extra.tooltip.legendShape
+		};
+		let r = {
+			text: "最高：" + t.data[3],
+			color: c[3],
+			legendShape: n.extra.tooltip.legendShape == "auto" ? t.legendShape : n.extra.tooltip.legendShape
+		};
+		d.push(e, a, i, r)
+	});
+	var x = [];
+	var f = {
+		x: 0,
+		y: 0
+	};
+	for (let e = 0; e < a.length; e++) {
+		let t = a[e];
+		if (typeof t[l] !== "undefined" && t[l] !== null) {
+			x.push(t[l])
+		}
+	}
+	f.x = Math.round(x[0][0].x);
+	return {
+		textList: d,
+		offset: f
+	}
+}
+
+function filterSeries(e) {
+	let a = [];
+	for (let t = 0; t < e.length; t++) {
+		if (e[t].show == true) {
+			a.push(e[t])
+		}
+	}
+	return a
+}
+
+function findCurrentIndex(o, n, e, t) {
+	var a = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+	var l = {
+		index: -1,
+		group: []
+	};
+	var i = e.chartData.eachSpacing / 2;
+	let r = [];
+	if (n && n.length > 0) {
+		if (!e.categories) {
+			i = 0
+		} else {
+			for (let t = 1; t < e.chartData.xAxisPoints.length; t++) {
+				r.push(e.chartData.xAxisPoints[t] - i)
+			}
+			if ((e.type == "line" || e.type == "area") && e.xAxis.boundaryGap == "justify") {
+				r = e.chartData.xAxisPoints
+			}
+		}
+		if (isInExactChartArea(o, e, t)) {
+			if (!e.categories) {
+				let a = Array(n.length);
+				for (let e = 0; e < n.length; e++) {
+					a[e] = Array(n[e].length);
+					for (let t = 0; t < n[e].length; t++) {
+						a[e][t] = Math.abs(n[e][t].x - o.x)
+					}
+				}
+				let e = Array(a.length);
+				let i = Array(a.length);
+				for (let t = 0; t < a.length; t++) {
+					e[t] = Math.min.apply(null, a[t]);
+					i[t] = a[t].indexOf(e[t])
+				}
+				let r = Math.min.apply(null, e);
+				l.index = [];
+				for (let t = 0; t < e.length; t++) {
+					if (e[t] == r) {
+						l.group.push(t);
+						l.index.push(i[t])
+					}
+				}
+			} else {
+				r.forEach(function(t, e) {
+					if (o.x + a + i > t) {
+						l.index = e
+					}
+				})
+			}
+		}
+	}
+	return l
+}
+
+function findBarChartCurrentIndex(a, t, e, i) {
+	var r = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+	var o = {
+		index: -1,
+		group: []
+	};
+	var n = e.chartData.eachSpacing / 2;
+	let l = e.chartData.yAxisPoints;
+	if (t && t.length > 0) {
+		if (isInExactChartArea(a, e, i)) {
+			l.forEach(function(t, e) {
+				if (a.y + r + n > t) {
+					o.index = e
+				}
+			})
+		}
+	}
+	return o
+}
+
+function findLegendIndex(o, t, e) {
+	let n = -1;
+	let l = 0;
+	if (isInExactLegendArea(o, t.area)) {
+		let i = t.points;
+		let r = -1;
+		for (let t = 0, e = i.length; t < e; t++) {
+			let a = i[t];
+			for (let e = 0; e < a.length; e++) {
+				r += 1;
+				let t = a[e]["area"];
+				if (t && o.x > t[0] - l && o.x < t[2] + l && o.y > t[1] - l && o.y < t[3] + l) {
+					n = r;
+					break
+				}
+			}
+		}
+		return n
+	}
+	return n
+}
+
+function isInExactLegendArea(t, e) {
+	return t.x > e.start.x && t.x < e.end.x && t.y > e.start.y && t.y < e.end.y
+}
+
+function isInExactChartArea(t, e, a) {
+	return t.x <= e.width - e.area[1] + 10 && t.x >= e.area[3] - 10 && t.y >= e.area[0] && t.y <= e.height - e.area[2]
+}
+
+function findRadarChartCurrentIndex(t, e, a) {
+	var r = 2 * Math.PI / a;
+	var o = -1;
+	if (isInExactPieChartArea(t, e.center, e.radius)) {
+		var n = function t(e) {
+			if (e < 0) {
+				e += 2 * Math.PI
+			}
+			if (e > 2 * Math.PI) {
+				e -= 2 * Math.PI
+			}
+			return e
+		};
+		var l = Math.atan2(e.center.y - t.y, t.x - e.center.x);
+		l = -1 * l;
+		if (l < 0) {
+			l += 2 * Math.PI
+		}
+		var i = e.angleList.map(function(t) {
+			t = n(-1 * t);
+			return t
+		});
+		i.forEach(function(t, e) {
+			var a = n(t - r / 2);
+			var i = n(t + r / 2);
+			if (i < a) {
+				i += 2 * Math.PI
+			}
+			if (l >= a && l <= i || l + 2 * Math.PI >= a && l + 2 * Math.PI <= i) {
+				o = e
+			}
+		})
+	}
+	return o
+}
+
+function findFunnelChartCurrentIndex(t, e) {
+	var a = -1;
+	for (var i = 0, r = e.series.length; i < r; i++) {
+		var o = e.series[i];
+		if (t.x > o.funnelArea[0] && t.x < o.funnelArea[2] && t.y > o.funnelArea[1] && t.y < o.funnelArea[3]) {
+			a = i;
+			break
+		}
+	}
+	return a
+}
+
+function findWordChartCurrentIndex(t, e) {
+	var a = -1;
+	for (var i = 0, r = e.length; i < r; i++) {
+		var o = e[i];
+		if (t.x > o.area[0] && t.x < o.area[2] && t.y > o.area[1] && t.y < o.area[3]) {
+			a = i;
+			break
+		}
+	}
+	return a
+}
+
+function findMapChartCurrentIndex(t, e) {
+	var a = -1;
+	var i = e.chartData.mapData;
+	var r = e.series;
+	var o = pointToCoordinate(t.y, t.x, i.bounds, i.scale, i.xoffset, i.yoffset);
+	var n = [o.x, o.y];
+	for (var l = 0, s = r.length; l < s; l++) {
+		var h = r[l].geometry.coordinates;
+		if (isPoiWithinPoly(n, h, e.chartData.mapData.mercator)) {
+			a = l;
+			break
+		}
+	}
+	return a
+}
+
+function findRoseChartCurrentIndex(t, e, a) {
+	var i = -1;
+	var r = getRoseDataPoints(a._series_, a.extra.rose.type, e.radius, e.radius);
+	if (e && e.center && isInExactPieChartArea(t, e.center, e.radius)) {
+		var o = Math.atan2(e.center.y - t.y, t.x - e.center.x);
+		o = -o;
+		if (a.extra.rose && a.extra.rose.offsetAngle) {
+			o = o - a.extra.rose.offsetAngle * Math.PI / 180
+		}
+		for (var n = 0, l = r.length; n < l; n++) {
+			if (isInAngleRange(o, r[n]._start_, r[n]._start_ + r[n]._rose_proportion_ * 2 * Math.PI)) {
+				i = n;
+				break
+			}
+		}
+	}
+	return i
+}
+
+function findPieChartCurrentIndex(t, e, a) {
+	var i = -1;
+	var r = getPieDataPoints(e.series);
+	if (e && e.center && isInExactPieChartArea(t, e.center, e.radius)) {
+		var o = Math.atan2(e.center.y - t.y, t.x - e.center.x);
+		o = -o;
+		if (a.extra.pie && a.extra.pie.offsetAngle) {
+			o = o - a.extra.pie.offsetAngle * Math.PI / 180
+		}
+		if (a.extra.ring && a.extra.ring.offsetAngle) {
+			o = o - a.extra.ring.offsetAngle * Math.PI / 180
+		}
+		for (var n = 0, l = r.length; n < l; n++) {
+			if (isInAngleRange(o, r[n]._start_, r[n]._start_ + r[n]._proportion_ * 2 * Math.PI)) {
+				i = n;
+				break
+			}
+		}
+	}
+	return i
+}
+
+function isInExactPieChartArea(t, e, a) {
+	return Math.pow(t.x - e.x, 2) + Math.pow(t.y - e.y, 2) <= Math.pow(a, 2)
+}
+
+function splitPoints(t, a) {
+	var i = [];
+	var r = [];
+	t.forEach(function(t, e) {
+		if (a.connectNulls) {
+			if (t !== null) {
+				r.push(t)
+			}
+		} else {
+			if (t !== null) {
+				r.push(t)
+			} else {
+				if (r.length) {
+					i.push(r)
+				}
+				r = []
+			}
+		}
+	});
+	if (r.length) {
+		i.push(r)
+	}
+	return i
+}
+
+function calLegendData(l, s, e, t, h) {
+	let c = {
+		area: {
+			start: {
+				x: 0,
+				y: 0
+			},
+			end: {
+				x: 0,
+				y: 0
+			},
+			width: 0,
+			height: 0,
+			wholeWidth: 0,
+			wholeHeight: 0
+		},
+		points: [],
+		widthArr: [],
+		heightArr: []
+	};
+	if (s.legend.show === false) {
+		t.legendData = c;
+		return c
+	}
+	let d = s.legend.padding * s.pix;
+	let x = s.legend.margin * s.pix;
+	let f = s.legend.fontSize ? s.legend.fontSize * s.pix : e.fontSize;
+	let p = 15 * s.pix;
+	let g = 5 * s.pix;
+	let u = Math.max(s.legend.lineHeight * s.pix, f);
+	if (s.legend.position == "top" || s.legend.position == "bottom") {
+		let i = [];
+		let r = 0;
+		let o = [];
+		let n = [];
+		for (let a = 0; a < l.length; a++) {
+			let t = l[a];
+			const y = t.legendText ? t.legendText : t.name;
+			let e = p + g + measureText(y || "undefined", f, h) + s.legend.itemGap * s.pix;
+			if (r + e > s.width - s.area[1] - s.area[3]) {
+				i.push(n);
+				o.push(r - s.legend.itemGap * s.pix);
+				r = e;
+				n = [t]
+			} else {
+				r += e;
+				n.push(t)
+			}
+		}
+		if (n.length) {
+			i.push(n);
+			o.push(r - s.legend.itemGap * s.pix);
+			c.widthArr = o;
+			let t = Math.max.apply(null, o);
+			switch (s.legend.float) {
+				case "left":
+					c.area.start.x = s.area[3];
+					c.area.end.x = s.area[3] + t + 2 * d;
+					break;
+				case "right":
+					c.area.start.x = s.width - s.area[1] - t - 2 * d;
+					c.area.end.x = s.width - s.area[1];
+					break;
+				default:
+					c.area.start.x = (s.width - t) / 2 - d;
+					c.area.end.x = (s.width + t) / 2 + d
+			}
+			c.area.width = t + 2 * d;
+			c.area.wholeWidth = t + 2 * d;
+			c.area.height = i.length * u + 2 * d;
+			c.area.wholeHeight = i.length * u + 2 * d + 2 * x;
+			c.points = i
+		}
+	} else {
+		let t = l.length;
+		let e = s.height - s.area[0] - s.area[2] - 2 * x - 2 * d;
+		let a = Math.min(Math.floor(e / u), t);
+		c.area.height = a * u + d * 2;
+		c.area.wholeHeight = a * u + d * 2;
+		switch (s.legend.float) {
+			case "top":
+				c.area.start.y = s.area[0] + x;
+				c.area.end.y = s.area[0] + x + c.area.height;
+				break;
+			case "bottom":
+				c.area.start.y = s.height - s.area[2] - x - c.area.height;
+				c.area.end.y = s.height - s.area[2] - x;
+				break;
+			default:
+				c.area.start.y = (s.height - c.area.height) / 2;
+				c.area.end.y = (s.height + c.area.height) / 2
+		}
+		let i = t % a === 0 ? t / a : Math.floor(t / a + 1);
+		let r = [];
+		for (let e = 0; e < i; e++) {
+			let t = l.slice(e * a, e * a + a);
+			r.push(t)
+		}
+		c.points = r;
+		if (r.length) {
+			for (let t = 0; t < r.length; t++) {
+				let a = r[t];
+				let i = 0;
+				for (let e = 0; e < a.length; e++) {
+					let t = p + g + measureText(a[e].name || "undefined", f, h) + s.legend.itemGap * s.pix;
+					if (t > i) {
+						i = t
+					}
+				}
+				c.widthArr.push(i);
+				c.heightArr.push(a.length * u + d * 2)
+			}
+			let e = 0;
+			for (let t = 0; t < c.widthArr.length; t++) {
+				e += c.widthArr[t]
+			}
+			c.area.width = e - s.legend.itemGap * s.pix + 2 * d;
+			c.area.wholeWidth = c.area.width + d
+		}
+	}
+	switch (s.legend.position) {
+		case "top":
+			c.area.start.y = s.area[0] + x;
+			c.area.end.y = s.area[0] + x + c.area.height;
+			break;
+		case "bottom":
+			c.area.start.y = s.height - s.area[2] - c.area.height - x;
+			c.area.end.y = s.height - s.area[2] - x;
+			break;
+		case "left":
+			c.area.start.x = s.area[3];
+			c.area.end.x = s.area[3] + c.area.width;
+			break;
+		case "right":
+			c.area.start.x = s.width - s.area[1] - c.area.width;
+			c.area.end.x = s.width - s.area[1];
+			break
+	}
+	t.legendData = c;
+	return c
+}
+
+function calCategoriesData(t, i, e, a, r) {
+	var o = {
+		angle: 0,
+		xAxisHeight: i.xAxis.lineHeight * i.pix + i.xAxis.marginTop * i.pix
+	};
+	var n = i.xAxis.fontSize * i.pix;
+	var l = t.map(function(t, e) {
+		var a = i.xAxis.formatter ? i.xAxis.formatter(t, e, i) : t;
+		return measureText(String(a), n, r)
+	});
+	var s = Math.max.apply(this, l);
+	if (i.xAxis.rotateLabel == true) {
+		o.angle = i.xAxis.rotateAngle * Math.PI / 180;
+		let t = i.xAxis.marginTop * i.pix * 2 + Math.abs(s * Math.sin(o.angle));
+		t = t < n + i.xAxis.marginTop * i.pix * 2 ? t + i.xAxis.marginTop * i.pix * 2 : t;
+		o.xAxisHeight = t
+	}
+	if (i.enableScroll && i.xAxis.scrollShow) {
+		o.xAxisHeight += 6 * i.pix
+	}
+	if (i.xAxis.disabled) {
+		o.xAxisHeight = 0
+	}
+	return o
+}
+
+function getXAxisTextList(t, e, h, c) {
+	var a = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : -1;
+	var i;
+	if (c == "stack") {
+		i = dataCombineStack(t, e.categories.length)
+	} else {
+		i = dataCombine(t)
+	}
+	var r = [];
+	i = i.filter(function(t) {
+		if (typeof t === "object" && t !== null) {
+			if (t.constructor.toString().indexOf("Array") > -1) {
+				return t !== null
+			} else {
+				return t.value !== null
+			}
+		} else {
+			return t !== null
+		}
+	});
+	i.map(function(t) {
+		if (typeof t === "object") {
+			if (t.constructor.toString().indexOf("Array") > -1) {
+				if (e.type == "candle") {
+					t.map(function(t) {
+						r.push(t)
+					})
+				} else {
+					r.push(t[0])
+				}
+			} else {
+				r.push(t.value)
+			}
+		} else {
+			r.push(t)
+		}
+	});
+	var o = 0;
+	var n = 0;
+	if (r.length > 0) {
+		o = Math.min.apply(this, r);
+		n = Math.max.apply(this, r)
+	}
+	if (a > -1) {
+		if (typeof e.xAxis.data[a].min === "number") {
+			o = Math.min(e.xAxis.data[a].min, o)
+		}
+		if (typeof e.xAxis.data[a].max === "number") {
+			n = Math.max(e.xAxis.data[a].max, n)
+		}
+	} else {
+		if (typeof e.xAxis.min === "number") {
+			o = Math.min(e.xAxis.min, o)
+		}
+		if (typeof e.xAxis.max === "number") {
+			n = Math.max(e.xAxis.max, n)
+		}
+	}
+	if (o === n) {
+		var d = n || 10;
+		n += d
+	}
+	var l = o;
+	var x = n;
+	var f = [];
+	var p = (x - l) / e.xAxis.splitNumber;
+	for (var s = 0; s <= e.xAxis.splitNumber; s++) {
+		f.push(l + p * s)
+	}
+	return f
+}
+
+function calXAxisData(t, e, a, i) {
+	var r = assign({}, {
+		type: ""
+	}, e.extra.bar);
+	var o = {
+		angle: 0,
+		xAxisHeight: e.xAxis.lineHeight * e.pix + e.xAxis.marginTop * e.pix
+	};
+	o.ranges = getXAxisTextList(t, e, a, r.type);
+	o.rangesFormat = o.ranges.map(function(t) {
+		t = util.toFixed(t, 2);
+		return t
+	});
+	var n = o.ranges.map(function(t) {
+		t = util.toFixed(t, 2);
+		return t
+	});
+	o = Object.assign(o, getXAxisPoints(n, e, a));
+	var l = o.eachSpacing;
+	var s = n.map(function(t) {
+		return measureText(t, e.xAxis.fontSize * e.pix, i)
+	});
+	if (e.xAxis.disabled === true) {
+		o.xAxisHeight = 0
+	}
+	return o
+}
+
+function getRadarDataPoints(r, o, n, a, t) {
+	var l = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
+	var e = t.extra.radar || {};
+	e.max = e.max || 0;
+	var s = Math.max(e.max, Math.max.apply(null, dataCombine(a)));
+	var h = [];
+	for (let e = 0; e < a.length; e++) {
+		let t = a[e];
+		let i = {};
+		i.color = t.color;
+		i.legendShape = t.legendShape;
+		i.pointShape = t.pointShape;
+		i.data = [];
+		t.data.forEach(function(t, e) {
+			let a = {};
+			a.angle = r[e];
+			a.proportion = t / s;
+			a.value = t;
+			a.position = convertCoordinateOrigin(n * a.proportion * l * Math.cos(a.angle), n * a.proportion * l * Math
+				.sin(a.angle), o);
+			i.data.push(a)
+		});
+		h.push(i)
+	}
+	return h
+}
+
+function getPieDataPoints(a, i) {
+	var r = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+	var o = 0;
+	var n = 0;
+	for (let e = 0; e < a.length; e++) {
+		let t = a[e];
+		t.data = t.data === null ? 0 : t.data;
+		o += t.data
+	}
+	for (let e = 0; e < a.length; e++) {
+		let t = a[e];
+		t.data = t.data === null ? 0 : t.data;
+		if (o === 0) {
+			t._proportion_ = 1 / a.length * r
+		} else {
+			t._proportion_ = t.data / o * r
+		}
+		t._radius_ = i
+	}
+	for (let e = 0; e < a.length; e++) {
+		let t = a[e];
+		t._start_ = n;
+		n += 2 * t._proportion_ * Math.PI
+	}
+	return a
+}
+
+function getFunnelDataPoints(e, a, i, r) {
+	var o = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	for (let t = 0; t < e.length; t++) {
+		if (i.type == "funnel") {
+			e[t].radius = e[t].data / e[0].data * a * o
+		} else {
+			e[t].radius = r * (e.length - t) / (r * e.length) * a * o
+		}
+		e[t]._proportion_ = e[t].data / e[0].data
+	}
+	return e
+}
+
+function getRoseDataPoints(a, i, r, o) {
+	var n = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	var l = 0;
+	var s = 0;
+	var h = [];
+	for (let e = 0; e < a.length; e++) {
+		let t = a[e];
+		t.data = t.data === null ? 0 : t.data;
+		l += t.data;
+		h.push(t.data)
+	}
+	var c = Math.min.apply(null, h);
+	var d = Math.max.apply(null, h);
+	var x = o - r;
+	for (let e = 0; e < a.length; e++) {
+		let t = a[e];
+		t.data = t.data === null ? 0 : t.data;
+		if (l === 0) {
+			t._proportion_ = 1 / a.length * n;
+			t._rose_proportion_ = 1 / a.length * n
+		} else {
+			t._proportion_ = t.data / l * n;
+			if (i == "area") {
+				t._rose_proportion_ = 1 / a.length * n
+			} else {
+				t._rose_proportion_ = t.data / l * n
+			}
+		}
+		t._radius_ = r + x * ((t.data - c) / (d - c)) || o
+	}
+	for (let e = 0; e < a.length; e++) {
+		let t = a[e];
+		t._start_ = s;
+		s += 2 * t._rose_proportion_ * Math.PI
+	}
+	return a
+}
+
+function getArcbarDataPoints(i, r) {
+	var o = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+	if (o == 1) {
+		o = .999999
+	}
+	for (let a = 0; a < i.length; a++) {
+		let t = i[a];
+		t.data = t.data === null ? 0 : t.data;
+		let e;
+		if (r.type == "circle") {
+			e = 2
+		} else {
+			if (r.direction == "ccw") {
+				if (r.startAngle < r.endAngle) {
+					e = 2 + r.startAngle - r.endAngle
+				} else {
+					e = r.startAngle - r.endAngle
+				}
+			} else {
+				if (r.endAngle < r.startAngle) {
+					e = 2 + r.endAngle - r.startAngle
+				} else {
+					e = r.startAngle - r.endAngle
+				}
+			}
+		}
+		t._proportion_ = e * t.data * o + r.startAngle;
+		if (r.direction == "ccw") {
+			t._proportion_ = r.startAngle - e * t.data * o
+		}
+		if (t._proportion_ >= 2) {
+			t._proportion_ = t._proportion_ % 2
+		}
+	}
+	return i
+}
+
+function getGaugeArcbarDataPoints(i, r) {
+	var o = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+	if (o == 1) {
+		o = .999999
+	}
+	for (let a = 0; a < i.length; a++) {
+		let t = i[a];
+		t.data = t.data === null ? 0 : t.data;
+		let e;
+		if (r.type == "circle") {
+			e = 2
+		} else {
+			if (r.endAngle < r.startAngle) {
+				e = 2 + r.endAngle - r.startAngle
+			} else {
+				e = r.startAngle - r.endAngle
+			}
+		}
+		t._proportion_ = e * t.data * o + r.startAngle;
+		if (t._proportion_ >= 2) {
+			t._proportion_ = t._proportion_ % 2
+		}
+	}
+	return i
+}
+
+function getGaugeAxisPoints(e, a, t) {
+	let i;
+	if (t < a) {
+		i = 2 + t - a
+	} else {
+		i = a - t
+	}
+	let r = a;
+	for (let t = 0; t < e.length; t++) {
+		e[t].value = e[t].value === null ? 0 : e[t].value;
+		e[t]._startAngle_ = r;
+		e[t]._endAngle_ = i * e[t].value + a;
+		if (e[t]._endAngle_ >= 2) {
+			e[t]._endAngle_ = e[t]._endAngle_ % 2
+		}
+		r = e[t]._endAngle_
+	}
+	return e
+}
+
+function getGaugeDataPoints(i, r, o) {
+	let n = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 1;
+	for (let a = 0; a < i.length; a++) {
+		let e = i[a];
+		e.data = e.data === null ? 0 : e.data;
+		if (o.pointer.color == "auto") {
+			for (let t = 0; t < r.length; t++) {
+				if (e.data <= r[t].value) {
+					e.color = r[t].color;
+					break
+				}
+			}
+		} else {
+			e.color = o.pointer.color
+		}
+		let t;
+		if (o.endAngle < o.startAngle) {
+			t = 2 + o.endAngle - o.startAngle
+		} else {
+			t = o.startAngle - o.endAngle
+		}
+		e._endAngle_ = t * e.data + o.startAngle;
+		e._oldAngle_ = o.oldAngle;
+		if (o.oldAngle < o.endAngle) {
+			e._oldAngle_ += 2
+		}
+		if (e.data >= o.oldData) {
+			e._proportion_ = (e._endAngle_ - e._oldAngle_) * n + o.oldAngle
+		} else {
+			e._proportion_ = e._oldAngle_ - (e._oldAngle_ - e._endAngle_) * n
+		}
+		if (e._proportion_ >= 2) {
+			e._proportion_ = e._proportion_ % 2
+		}
+	}
+	return i
+}
+
+function getPieTextMaxLength(i, r, o, n) {
+	i = getPieDataPoints(i);
+	let l = 0;
+	for (let a = 0; a < i.length; a++) {
+		let t = i[a];
+		let e = t.formatter ? t.formatter(+t._proportion_.toFixed(2)) : util.toFixed(t._proportion_ * 100) + "%";
+		l = Math.max(l, measureText(e, t.textSize * n.pix || r.fontSize, o))
+	}
+	return l
+}
+
+function fixColumeData(t, i, r, o, e, n) {
+	return t.map(function(t) {
+		if (t === null) {
+			return null
+		}
+		var e = 0;
+		var a = 0;
+		if (n.type == "mix") {
+			e = n.extra.mix.column.seriesGap * n.pix || 0;
+			a = n.extra.mix.column.categoryGap * n.pix || 0
+		} else {
+			e = n.extra.column.seriesGap * n.pix || 0;
+			a = n.extra.column.categoryGap * n.pix || 0
+		}
+		e = Math.min(e, i / r);
+		a = Math.min(a, i / r);
+		t.width = Math.ceil((i - 2 * a - e * (r - 1)) / r);
+		if (n.extra.mix && n.extra.mix.column.width && +n.extra.mix.column.width > 0) {
+			t.width = Math.min(t.width, +n.extra.mix.column.width * n.pix)
+		}
+		if (n.extra.column && n.extra.column.width && +n.extra.column.width > 0) {
+			t.width = Math.min(t.width, +n.extra.column.width * n.pix)
+		}
+		if (t.width <= 0) {
+			t.width = 1
+		}
+		t.x += (o + .5 - r / 2) * (t.width + e);
+		return t
+	})
+}
+
+function fixBarData(t, i, r, o, e, n) {
+	return t.map(function(t) {
+		if (t === null) {
+			return null
+		}
+		var e = 0;
+		var a = 0;
+		e = n.extra.bar.seriesGap * n.pix || 0;
+		a = n.extra.bar.categoryGap * n.pix || 0;
+		e = Math.min(e, i / r);
+		a = Math.min(a, i / r);
+		t.width = Math.ceil((i - 2 * a - e * (r - 1)) / r);
+		if (n.extra.bar && n.extra.bar.width && +n.extra.bar.width > 0) {
+			t.width = Math.min(t.width, +n.extra.bar.width * n.pix)
+		}
+		if (t.width <= 0) {
+			t.width = 1
+		}
+		t.y += (o + .5 - r / 2) * (t.width + e);
+		return t
+	})
+}
+
+function fixColumeMeterData(t, e, a, i, r, o, n) {
+	var l = o.extra.column.categoryGap * o.pix || 0;
+	return t.map(function(t) {
+		if (t === null) {
+			return null
+		}
+		t.width = e - 2 * l;
+		if (o.extra.column && o.extra.column.width && +o.extra.column.width > 0) {
+			t.width = Math.min(t.width, +o.extra.column.width * o.pix)
+		}
+		if (i > 0) {
+			t.width -= n
+		}
+		return t
+	})
+}
+
+function fixColumeStackData(t, a, e, i, r, o, n) {
+	var l = o.extra.column.categoryGap * o.pix || 0;
+	return t.map(function(t, e) {
+		if (t === null) {
+			return null
+		}
+		t.width = Math.ceil(a - 2 * l);
+		if (o.extra.column && o.extra.column.width && +o.extra.column.width > 0) {
+			t.width = Math.min(t.width, +o.extra.column.width * o.pix)
+		}
+		if (t.width <= 0) {
+			t.width = 1
+		}
+		return t
+	})
+}
+
+function fixBarStackData(t, a, e, i, r, o, n) {
+	var l = o.extra.bar.categoryGap * o.pix || 0;
+	return t.map(function(t, e) {
+		if (t === null) {
+			return null
+		}
+		t.width = Math.ceil(a - 2 * l);
+		if (o.extra.bar && o.extra.bar.width && +o.extra.bar.width > 0) {
+			t.width = Math.min(t.width, +o.extra.bar.width * o.pix)
+		}
+		if (t.width <= 0) {
+			t.width = 1
+		}
+		return t
+	})
+}
+
+function getXAxisPoints(t, e, h) {
+	var a = e.width - e.area[1] - e.area[3];
+	var i = e.enableScroll ? Math.min(e.xAxis.itemCount, t.length) : t.length;
+	if ((e.type == "line" || e.type == "area" || e.type == "scatter" || e.type == "bubble" || e.type == "bar") && i > 1 &&
+		e.xAxis.boundaryGap == "justify") {
+		i -= 1
+	}
+	var r = 0;
+	if (e.type == "mount" && e.extra && e.extra.mount && e.extra.mount.widthRatio && e.extra.mount.widthRatio > 1) {
+		if (e.extra.mount.widthRatio > 2) e.extra.mount.widthRatio = 2;
+		r = e.extra.mount.widthRatio - 1;
+		i += r
+	}
+	var o = a / i;
+	var n = [];
+	var l = e.area[3];
+	var s = e.width - e.area[1];
+	t.forEach(function(t, e) {
+		n.push(l + r / 2 * o + e * o)
+	});
+	if (e.xAxis.boundaryGap !== "justify") {
+		if (e.enableScroll === true) {
+			n.push(l + r * o + t.length * o)
+		} else {
+			n.push(s)
+		}
+	}
+	return {
+		xAxisPoints: n,
+		startX: l,
+		endX: s,
+		eachSpacing: o
+	}
+}
+
+function getCandleDataPoints(t, l, s, h, c, d, a) {
+	var x = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
+	var e = [];
+	var f = d.height - d.area[0] - d.area[2];
+	t.forEach(function(t, o) {
+		if (t === null) {
+			e.push(null)
+		} else {
+			var n = [];
+			t.forEach(function(t, e) {
+				var a = {};
+				a.x = h[o] + Math.round(c / 2);
+				var i = t.value || t;
+				var r = f * (i - l) / (s - l);
+				r *= x;
+				a.y = d.height - Math.round(r) - d.area[2];
+				n.push(a)
+			});
+			e.push(n)
+		}
+	});
+	return e
+}
+
+function getDataPoints(t, a, n, l, s, h, e) {
+	var c = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
+	var d = "center";
+	if (h.type == "line" || h.type == "area" || h.type == "scatter" || h.type == "bubble") {
+		d = h.xAxis.boundaryGap
+	}
+	var x = [];
+	var f = h.height - h.area[0] - h.area[2];
+	var p = h.width - h.area[1] - h.area[3];
+	t.forEach(function(i, t) {
+		if (i === null) {
+			x.push(null)
+		} else {
+			var r = {};
+			r.color = i.color;
+			r.x = l[t];
+			var o = i;
+			if (typeof i === "object" && i !== null) {
+				if (i.constructor.toString().indexOf("Array") > -1) {
+					let t, e, a;
+					t = [].concat(h.chartData.xAxisData.ranges);
+					e = t.shift();
+					a = t.pop();
+					o = i[1];
+					r.x = h.area[3] + p * (i[0] - e) / (a - e);
+					if (h.type == "bubble") {
+						r.r = i[2];
+						r.t = i[3]
+					}
+				} else {
+					o = i.value
+				}
+			}
+			if (d == "center") {
+				r.x += s / 2
+			}
+			var e = f * (o - a) / (n - a);
+			e *= c;
+			r.y = h.height - e - h.area[2];
+			x.push(r)
+		}
+	});
+	return x
+}
+
+function getLineDataPoints(t, a, n, l, s, h, e, p, c) {
+	var c = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : 1;
+	var d = h.xAxis.boundaryGap;
+	var x = [];
+	var f = h.height - h.area[0] - h.area[2];
+	var u = h.width - h.area[1] - h.area[3];
+	t.forEach(function(i, t) {
+		if (i === null) {
+			x.push(null)
+		} else {
+			var r = {};
+			r.color = i.color;
+			if (p.animation == "vertical") {
+				r.x = l[t];
+				var o = i;
+				if (typeof i === "object" && i !== null) {
+					if (i.constructor.toString().indexOf("Array") > -1) {
+						let t, e, a;
+						t = [].concat(h.chartData.xAxisData.ranges);
+						e = t.shift();
+						a = t.pop();
+						o = i[1];
+						r.x = h.area[3] + u * (i[0] - e) / (a - e)
+					} else {
+						o = i.value
+					}
+				}
+				if (d == "center") {
+					r.x += s / 2
+				}
+				var e = f * (o - a) / (n - a);
+				e *= c;
+				r.y = h.height - e - h.area[2];
+				x.push(r)
+			} else {
+				r.x = l[0] + s * t * c;
+				var o = i;
+				if (d == "center") {
+					r.x += s / 2
+				}
+				var e = f * (o - a) / (n - a);
+				r.y = h.height - e - h.area[2];
+				x.push(r)
+			}
+		}
+	});
+	return x
+}
+
+function getColumnDataPoints(t, a, n, l, s, h, e, i, c) {
+	var c = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : 1;
+	var d = [];
+	var x = h.height - h.area[0] - h.area[2];
+	var f = h.width - h.area[1] - h.area[3];
+	t.forEach(function(i, t) {
+		if (i === null) {
+			d.push(null)
+		} else {
+			var r = {};
+			r.color = i.color;
+			r.x = l[t];
+			var o = i;
+			if (typeof i === "object" && i !== null) {
+				if (i.constructor.toString().indexOf("Array") > -1) {
+					let t, e, a;
+					t = [].concat(h.chartData.xAxisData.ranges);
+					e = t.shift();
+					a = t.pop();
+					o = i[1];
+					r.x = h.area[3] + f * (i[0] - e) / (a - e)
+				} else {
+					o = i.value
+				}
+			}
+			r.x += s / 2;
+			var e = x * (o * c - a) / (n - a);
+			r.y = h.height - e - h.area[2];
+			d.push(r)
+		}
+	});
+	return d
+}
+
+function getMountDataPoints(t, o, n, l, s, h, e, a) {
+	var c = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : 1;
+	var d = [];
+	var x = h.height - h.area[0] - h.area[2];
+	var i = h.width - h.area[1] - h.area[3];
+	var f = s * e.widthRatio;
+	t.forEach(function(t, e) {
+		if (t === null) {
+			d.push(null)
+		} else {
+			var a = {};
+			a.color = t.color;
+			a.x = l[e];
+			a.x += s / 2;
+			var i = t.data;
+			var r = x * (i * c - o) / (n - o);
+			a.y = h.height - r - h.area[2];
+			a.value = i;
+			a.width = f;
+			d.push(a)
+		}
+	});
+	return d
+}
+
+function getBarDataPoints(t, o, n, l, e, s, a) {
+	var h = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
+	var c = [];
+	var i = s.height - s.area[0] - s.area[2];
+	var d = s.width - s.area[1] - s.area[3];
+	t.forEach(function(t, e) {
+		if (t === null) {
+			c.push(null)
+		} else {
+			var a = {};
+			a.color = t.color;
+			a.y = l[e];
+			var i = t;
+			if (typeof t === "object" && t !== null) {
+				i = t.value
+			}
+			var r = d * (i - o) / (n - o);
+			r *= h;
+			a.height = r;
+			a.value = i;
+			a.x = r + s.area[3];
+			c.push(a)
+		}
+	});
+	return c
+}
+
+function getStackDataPoints(t, s, h, c, g, d, e, x, y) {
+	var f = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : 1;
+	var p = [];
+	var u = d.height - d.area[0] - d.area[2];
+	t.forEach(function(t, e) {
+		if (t === null) {
+			p.push(null)
+		} else {
+			var a = {};
+			a.color = t.color;
+			a.x = c[e] + Math.round(g / 2);
+			if (x > 0) {
+				var i = 0;
+				for (let t = 0; t <= x; t++) {
+					i += y[t].data[e]
+				}
+				var r = i - t;
+				var o = u * (i - s) / (h - s);
+				var n = u * (r - s) / (h - s)
+			} else {
+				var i = t;
+				if (typeof t === "object" && t !== null) {
+					i = t.value
+				}
+				var o = u * (i - s) / (h - s);
+				var n = 0
+			}
+			var l = n;
+			o *= f;
+			l *= f;
+			a.y = d.height - Math.round(o) - d.area[2];
+			a.y0 = d.height - Math.round(l) - d.area[2];
+			p.push(a)
+		}
+	});
+	return p
+}
+
+function getBarStackDataPoints(t, s, h, c, e, d, a, x, g) {
+	var f = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : 1;
+	var p = [];
+	var u = d.width - d.area[1] - d.area[3];
+	t.forEach(function(t, e) {
+		if (t === null) {
+			p.push(null)
+		} else {
+			var a = {};
+			a.color = t.color;
+			a.y = c[e];
+			if (x > 0) {
+				var i = 0;
+				for (let t = 0; t <= x; t++) {
+					i += g[t].data[e]
+				}
+				var r = i - t;
+				var o = u * (i - s) / (h - s);
+				var n = u * (r - s) / (h - s)
+			} else {
+				var i = t;
+				if (typeof t === "object" && t !== null) {
+					i = t.value
+				}
+				var o = u * (i - s) / (h - s);
+				var n = 0
+			}
+			var l = n;
+			o *= f;
+			l *= f;
+			a.height = o - l;
+			a.x = d.area[3] + o;
+			a.x0 = d.area[3] + l;
+			p.push(a)
+		}
+	});
+	return p
+}
+
+function getYAxisTextList(t, e, h, c, a) {
+	var d = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : -1;
+	var i;
+	if (c == "stack") {
+		i = dataCombineStack(t, e.categories.length)
+	} else {
+		i = dataCombine(t)
+	}
+	var r = [];
+	i = i.filter(function(t) {
+		if (typeof t === "object" && t !== null) {
+			if (t.constructor.toString().indexOf("Array") > -1) {
+				return t !== null
+			} else {
+				return t.value !== null
+			}
+		} else {
+			return t !== null
+		}
+	});
+	i.map(function(t) {
+		if (typeof t === "object") {
+			if (t.constructor.toString().indexOf("Array") > -1) {
+				if (e.type == "candle") {
+					t.map(function(t) {
+						r.push(t)
+					})
+				} else {
+					r.push(t[1])
+				}
+			} else {
+				r.push(t.value)
+			}
+		} else {
+			r.push(t)
+		}
+	});
+	var o = a.min || 0;
+	var n = a.max || 0;
+	if (r.length > 0) {
+		o = Math.min.apply(this, r);
+		n = Math.max.apply(this, r)
+	}
+	if (o === n) {
+		if (n == 0) {
+			n = 10
+		} else {
+			o = 0
+		}
+	}
+	var l = getDataRange(o, n);
+	var x = a.min === undefined || a.min === null ? l.minRange : a.min;
+	var f = a.max === undefined || a.max === null ? l.maxRange : a.max;
+	var p = (f - x) / e.yAxis.splitNumber;
+	var u = [];
+	for (var s = 0; s <= e.yAxis.splitNumber; s++) {
+		u.push(x + p * s)
+	}
+	return u.reverse()
+}
+
+function calYAxisData(a, o, e, n) {
+	var l = assign({}, {
+		type: ""
+	}, o.extra.column);
+	var t = o.yAxis.data.length;
+	var s = new Array(t);
+	if (t > 0) {
+		for (let e = 0; e < t; e++) {
+			s[e] = [];
+			for (let t = 0; t < a.length; t++) {
+				if (a[t].index == e) {
+					s[e].push(a[t])
+				}
+			}
+		}
+		var h = new Array(t);
+		var c = new Array(t);
+		var d = new Array(t);
+		for (let r = 0; r < t; r++) {
+			let i = o.yAxis.data[r];
+			if (o.yAxis.disabled == true) {
+				i.disabled = true
+			}
+			if (i.type === "categories") {
+				if (!i.formatter) {
+					i.formatter = (t, e, a) => {
+						return t + (i.unit || "")
+					}
+				}
+				i.categories = i.categories || o.categories;
+				h[r] = i.categories
+			} else {
+				if (!i.formatter) {
+					i.formatter = (t, e, a) => {
+						return util.toFixed(t, i.tofix || 0) + (i.unit || "")
+					}
+				}
+				h[r] = getYAxisTextList(s[r], o, e, l.type, i, r)
+			}
+			let a = i.fontSize * o.pix || e.fontSize;
+			d[r] = {
+				position: i.position ? i.position : "left",
+				width: 0
+			};
+			c[r] = h[r].map(function(t, e) {
+				t = i.formatter(t, e, o);
+				d[r].width = Math.max(d[r].width, measureText(t, a, n) + 5);
+				return t
+			});
+			let t = i.calibration ? 4 * o.pix : 0;
+			d[r].width += t + 3 * o.pix;
+			if (i.disabled === true) {
+				d[r].width = 0
+			}
+		}
+	} else {
+		var h = new Array(1);
+		var c = new Array(1);
+		var d = new Array(1);
+		if (o.type === "bar") {
+			h[0] = o.categories;
+			if (!o.yAxis.formatter) {
+				o.yAxis.formatter = (t, e, a) => {
+					return t + (a.yAxis.unit || "")
+				}
+			}
+		} else {
+			if (!o.yAxis.formatter) {
+				o.yAxis.formatter = (t, e, a) => {
+					return t.toFixed(a.yAxis.tofix) + (a.yAxis.unit || "")
+				}
+			}
+			h[0] = getYAxisTextList(a, o, e, l.type, {})
+		}
+		d[0] = {
+			position: "left",
+			width: 0
+		};
+		var i = o.yAxis.fontSize * o.pix || e.fontSize;
+		c[0] = h[0].map(function(t, e) {
+			t = o.yAxis.formatter(t, e, o);
+			d[0].width = Math.max(d[0].width, measureText(t, i, n) + 5);
+			return t
+		});
+		d[0].width += 3 * o.pix;
+		if (o.yAxis.disabled === true) {
+			d[0] = {
+				position: "left",
+				width: 0
+			};
+			o.yAxis.data[0] = {
+				disabled: true
+			}
+		} else {
+			o.yAxis.data[0] = {
+				disabled: false,
+				position: "left",
+				max: o.yAxis.max,
+				min: o.yAxis.min,
+				formatter: o.yAxis.formatter
+			};
+			if (o.type === "bar") {
+				o.yAxis.data[0].categories = o.categories;
+				o.yAxis.data[0].type = "categories"
+			}
+		}
+	}
+	return {
+		rangesFormat: c,
+		ranges: h,
+		yAxisWidth: d
+	}
+}
+
+function calTooltipYAxisData(r, t, o, e, a) {
+	let n = [].concat(o.chartData.yAxisData.ranges);
+	let l = o.height - o.area[0] - o.area[2];
+	let s = o.area[0];
+	let h = [];
+	for (let i = 0; i < n.length; i++) {
+		let t = Math.max.apply(this, n[i]);
+		let e = Math.min.apply(this, n[i]);
+		let a = t - (t - e) * (r - s) / l;
+		a = o.yAxis.data && o.yAxis.data[i].formatter ? o.yAxis.data[i].formatter(a, i, o) : a.toFixed(0);
+		h.push(String(a))
+	}
+	return h
+}
+
+function calMarkLineData(i, r) {
+	let o, n;
+	let l = r.height - r.area[0] - r.area[2];
+	for (let a = 0; a < i.length; a++) {
+		i[a].yAxisIndex = i[a].yAxisIndex ? i[a].yAxisIndex : 0;
+		let t = [].concat(r.chartData.yAxisData.ranges[i[a].yAxisIndex]);
+		o = t.pop();
+		n = t.shift();
+		let e = l * (i[a].value - o) / (n - o);
+		i[a].y = r.height - Math.round(e) - r.area[2]
+	}
+	return i
+}
+
+function contextRotate(t, e) {
+	if (e.rotateLock !== true) {
+		t.translate(e.height, 0);
+		t.rotate(90 * Math.PI / 180)
+	} else if (e._rotate_ !== true) {
+		t.translate(e.height, 0);
+		t.rotate(90 * Math.PI / 180);
+		e._rotate_ = true
+	}
+}
+
+function drawPointShape(t, e, a, i, r) {
+	i.beginPath();
+	if (r.dataPointShapeType == "hollow") {
+		i.setStrokeStyle(e);
+		i.setFillStyle(r.background);
+		i.setLineWidth(2 * r.pix)
+	} else {
+		i.setStrokeStyle("#ffffff");
+		i.setFillStyle(e);
+		i.setLineWidth(1 * r.pix)
+	}
+	if (a === "diamond") {
+		t.forEach(function(t, e) {
+			if (t !== null) {
+				i.moveTo(t.x, t.y - 4.5);
+				i.lineTo(t.x - 4.5, t.y);
+				i.lineTo(t.x, t.y + 4.5);
+				i.lineTo(t.x + 4.5, t.y);
+				i.lineTo(t.x, t.y - 4.5)
+			}
+		})
+	} else if (a === "circle") {
+		t.forEach(function(t, e) {
+			if (t !== null) {
+				i.moveTo(t.x + 2.5 * r.pix, t.y);
+				i.arc(t.x, t.y, 3 * r.pix, 0, 2 * Math.PI, false)
+			}
+		})
+	} else if (a === "square") {
+		t.forEach(function(t, e) {
+			if (t !== null) {
+				i.moveTo(t.x - 3.5, t.y - 3.5);
+				i.rect(t.x - 3.5, t.y - 3.5, 7, 7)
+			}
+		})
+	} else if (a === "triangle") {
+		t.forEach(function(t, e) {
+			if (t !== null) {
+				i.moveTo(t.x, t.y - 4.5);
+				i.lineTo(t.x - 4.5, t.y + 4.5);
+				i.lineTo(t.x + 4.5, t.y + 4.5);
+				i.lineTo(t.x, t.y - 4.5)
+			}
+		})
+	} else if (a === "none") {
+		return
+	}
+	i.closePath();
+	i.fill();
+	i.stroke()
+}
+
+function drawActivePoint(t, e, a, i, r, o, n) {
+	if (!r.tooltip) {
+		return
+	}
+	if (r.tooltip.group.length > 0 && r.tooltip.group.includes(n) == false) {
+		return
+	}
+	var l = typeof r.tooltip.index === "number" ? r.tooltip.index : r.tooltip.index[r.tooltip.group.indexOf(n)];
+	i.beginPath();
+	if (o.activeType == "hollow") {
+		i.setStrokeStyle(e);
+		i.setFillStyle(r.background);
+		i.setLineWidth(2 * r.pix)
+	} else {
+		i.setStrokeStyle("#ffffff");
+		i.setFillStyle(e);
+		i.setLineWidth(1 * r.pix)
+	}
+	if (a === "diamond") {
+		t.forEach(function(t, e) {
+			if (t !== null && l == e) {
+				i.moveTo(t.x, t.y - 4.5);
+				i.lineTo(t.x - 4.5, t.y);
+				i.lineTo(t.x, t.y + 4.5);
+				i.lineTo(t.x + 4.5, t.y);
+				i.lineTo(t.x, t.y - 4.5)
+			}
+		})
+	} else if (a === "circle") {
+		t.forEach(function(t, e) {
+			if (t !== null && l == e) {
+				i.moveTo(t.x + 2.5 * r.pix, t.y);
+				i.arc(t.x, t.y, 3 * r.pix, 0, 2 * Math.PI, false)
+			}
+		})
+	} else if (a === "square") {
+		t.forEach(function(t, e) {
+			if (t !== null && l == e) {
+				i.moveTo(t.x - 3.5, t.y - 3.5);
+				i.rect(t.x - 3.5, t.y - 3.5, 7, 7)
+			}
+		})
+	} else if (a === "triangle") {
+		t.forEach(function(t, e) {
+			if (t !== null && l == e) {
+				i.moveTo(t.x, t.y - 4.5);
+				i.lineTo(t.x - 4.5, t.y + 4.5);
+				i.lineTo(t.x + 4.5, t.y + 4.5);
+				i.lineTo(t.x, t.y - 4.5)
+			}
+		})
+	} else if (a === "none") {
+		return
+	}
+	i.closePath();
+	i.fill();
+	i.stroke()
+}
+
+function drawRingTitle(t, e, a, i) {
+	var r = t.title.fontSize || e.titleFontSize;
+	var o = t.subtitle.fontSize || e.subtitleFontSize;
+	var n = t.title.name || "";
+	var l = t.subtitle.name || "";
+	var c = t.title.color || t.fontColor;
+	var d = t.subtitle.color || t.fontColor;
+	var x = n ? r : 0;
+	var f = l ? o : 0;
+	var s = 5;
+	if (l) {
+		var p = measureText(l, o * t.pix, a);
+		var u = i.x - p / 2 + (t.subtitle.offsetX || 0) * t.pix;
+		var h = i.y + o * t.pix / 2 + (t.subtitle.offsetY || 0) * t.pix;
+		if (n) {
+			h += (x * t.pix + s) / 2
+		}
+		a.beginPath();
+		a.setFontSize(o * t.pix);
+		a.setFillStyle(d);
+		a.fillText(l, u, h);
+		a.closePath();
+		a.stroke()
+	}
+	if (n) {
+		var g = measureText(n, r * t.pix, a);
+		var y = i.x - g / 2 + (t.title.offsetX || 0);
+		var v = i.y + r * t.pix / 2 + (t.title.offsetY || 0) * t.pix;
+		if (l) {
+			v -= (f * t.pix + s) / 2
+		}
+		a.beginPath();
+		a.setFontSize(r * t.pix);
+		a.setFillStyle(c);
+		a.fillText(n, y, v);
+		a.closePath();
+		a.stroke()
+	}
+}
+
+function drawPointText(t, o, n, l, s) {
+	var h = o.data;
+	var c = o.textOffset ? o.textOffset : 0;
+	t.forEach(function(t, e) {
+		if (t !== null) {
+			l.beginPath();
+			var a = o.textSize ? o.textSize * s.pix : n.fontSize;
+			l.setFontSize(a);
+			l.setFillStyle(o.textColor || s.fontColor);
+			var i = h[e];
+			if (typeof h[e] === "object" && h[e] !== null) {
+				if (h[e].constructor.toString().indexOf("Array") > -1) {
+					i = h[e][1]
+				} else {
+					i = h[e].value
+				}
+			}
+			var r = o.formatter ? o.formatter(i, e, o, s) : i;
+			l.setTextAlign("center");
+			l.fillText(String(r), t.x, t.y - 4 + c * s.pix);
+			l.closePath();
+			l.stroke();
+			l.setTextAlign("left")
+		}
+	})
+}
+
+function drawColumePointText(t, n, l, s, h) {
+	var c = n.data;
+	var d = n.textOffset ? n.textOffset : 0;
+	var x = h.extra.column.labelPosition;
+	t.forEach(function(t, e) {
+		if (t !== null) {
+			s.beginPath();
+			var a = n.textSize ? n.textSize * h.pix : l.fontSize;
+			s.setFontSize(a);
+			s.setFillStyle(n.textColor || h.fontColor);
+			var i = c[e];
+			if (typeof c[e] === "object" && c[e] !== null) {
+				if (c[e].constructor.toString().indexOf("Array") > -1) {
+					i = c[e][1]
+				} else {
+					i = c[e].value
+				}
+			}
+			var r = n.formatter ? n.formatter(i, e, n, h) : i;
+			s.setTextAlign("center");
+			var o = t.y - 4 * h.pix + d * h.pix;
+			if (t.y > n.zeroPoints) {
+				o = t.y + d * h.pix + a
+			}
+			if (x == "insideTop") {
+				o = t.y + a + d * h.pix;
+				if (t.y > n.zeroPoints) {
+					o = t.y - d * h.pix - 4 * h.pix
+				}
+			}
+			if (x == "center") {
+				o = t.y + d * h.pix + (h.height - h.area[2] - t.y + a) / 2;
+				if (n.zeroPoints < h.height - h.area[2]) {
+					o = t.y + d * h.pix + (n.zeroPoints - t.y + a) / 2
+				}
+				if (t.y > n.zeroPoints) {
+					o = t.y - d * h.pix - (t.y - n.zeroPoints - a) / 2
+				}
+				if (h.extra.column.type == "stack") {
+					o = t.y + d * h.pix + (t.y0 - t.y + a) / 2
+				}
+			}
+			if (x == "bottom") {
+				o = h.height - h.area[2] + d * h.pix - 4 * h.pix;
+				if (n.zeroPoints < h.height - h.area[2]) {
+					o = n.zeroPoints + d * h.pix - 4 * h.pix
+				}
+				if (t.y > n.zeroPoints) {
+					o = n.zeroPoints - d * h.pix + a + 2 * h.pix
+				}
+				if (h.extra.column.type == "stack") {
+					o = t.y0 + d * h.pix - 4 * h.pix
+				}
+			}
+			s.fillText(String(r), t.x, o);
+			s.closePath();
+			s.stroke();
+			s.setTextAlign("left")
+		}
+	})
+}
+
+function drawMountPointText(t, n, l, s, h, c) {
+	var e = n.data;
+	var d = n.textOffset ? n.textOffset : 0;
+	var a = h.extra.mount.labelPosition;
+	t.forEach(function(t, e) {
+		if (t !== null) {
+			s.beginPath();
+			var a = n[e].textSize ? n[e].textSize * h.pix : l.fontSize;
+			s.setFontSize(a);
+			s.setFillStyle(n[e].textColor || h.fontColor);
+			var i = t.value;
+			var r = n[e].formatter ? n[e].formatter(i, e, n, h) : i;
+			s.setTextAlign("center");
+			var o = t.y - 4 * h.pix + d * h.pix;
+			if (t.y > c) {
+				o = t.y + d * h.pix + a
+			}
+			s.fillText(String(r), t.x, o);
+			s.closePath();
+			s.stroke();
+			s.setTextAlign("left")
+		}
+	})
+}
+
+function drawBarPointText(t, o, n, l, s) {
+	var h = o.data;
+	var e = o.textOffset ? o.textOffset : 0;
+	t.forEach(function(t, e) {
+		if (t !== null) {
+			l.beginPath();
+			var a = o.textSize ? o.textSize * s.pix : n.fontSize;
+			l.setFontSize(a);
+			l.setFillStyle(o.textColor || s.fontColor);
+			var i = h[e];
+			if (typeof h[e] === "object" && h[e] !== null) {
+				i = h[e].value
+			}
+			var r = o.formatter ? o.formatter(i, e, o, s) : i;
+			l.setTextAlign("left");
+			l.fillText(String(r), t.x + 4 * s.pix, t.y + a / 2 - 3);
+			l.closePath();
+			l.stroke()
+		}
+	})
+}
+
+function drawGaugeLabel(e, a, i, r, o, n) {
+	a -= e.width / 2 + e.labelOffset * r.pix;
+	a = a < 10 ? 10 : a;
+	let t;
+	if (e.endAngle < e.startAngle) {
+		t = 2 + e.endAngle - e.startAngle
+	} else {
+		t = e.startAngle - e.endAngle
+	}
+	let c = t / e.splitLine.splitNumber;
+	let d = e.endNumber - e.startNumber;
+	let x = d / e.splitLine.splitNumber;
+	let l = e.startAngle;
+	let s = e.startNumber;
+	for (let t = 0; t < e.splitLine.splitNumber + 1; t++) {
+		var h = {
+			x: a * Math.cos(l * Math.PI),
+			y: a * Math.sin(l * Math.PI)
+		};
+		var f = e.formatter ? e.formatter(s, t, r) : s;
+		h.x += i.x - measureText(f, o.fontSize, n) / 2;
+		h.y += i.y;
+		var p = h.x;
+		var u = h.y;
+		n.beginPath();
+		n.setFontSize(o.fontSize);
+		n.setFillStyle(e.labelColor || r.fontColor);
+		n.fillText(f, p, u + o.fontSize / 2);
+		n.closePath();
+		n.stroke();
+		l += c;
+		if (l >= 2) {
+			l = l % 2
+		}
+		s += x
+	}
+}
+
+function drawRadarLabel(t, s, h, c, d, x) {
+	var f = c.extra.radar || {};
+	t.forEach(function(t, e) {
+		if (f.labelPointShow === true && c.categories[e] !== "") {
+			var a = {
+				x: s * Math.cos(t),
+				y: s * Math.sin(t)
+			};
+			var i = convertCoordinateOrigin(a.x, a.y, h);
+			x.setFillStyle(f.labelPointColor);
+			x.beginPath();
+			x.arc(i.x, i.y, f.labelPointRadius * c.pix, 0, 2 * Math.PI, false);
+			x.closePath();
+			x.fill()
+		}
+		if (f.labelShow === true) {
+			var r = {
+				x: (s + d.radarLabelTextMargin * c.pix) * Math.cos(t),
+				y: (s + d.radarLabelTextMargin * c.pix) * Math.sin(t)
+			};
+			var o = convertCoordinateOrigin(r.x, r.y, h);
+			var n = o.x;
+			var l = o.y;
+			if (util.approximatelyEqual(r.x, 0)) {
+				n -= measureText(c.categories[e] || "", d.fontSize, x) / 2
+			} else if (r.x < 0) {
+				n -= measureText(c.categories[e] || "", d.fontSize, x)
+			}
+			x.beginPath();
+			x.setFontSize(d.fontSize);
+			x.setFillStyle(f.labelColor || c.fontColor);
+			x.fillText(c.categories[e] || "", n, l + d.fontSize / 2);
+			x.closePath();
+			x.stroke()
+		}
+	})
+}
+
+function drawPieText(n, d, x, f, t, l) {
+	var p = x.pieChartLinePadding;
+	var u = [];
+	var g = null;
+	var y = n.map(function(t, e) {
+		var a = t.formatter ? t.formatter(t, e, n, d) : util.toFixed(t._proportion_.toFixed(4) * 100) + "%";
+		a = t.labelText ? t.labelText : a;
+		var i = 2 * Math.PI - (t._start_ + 2 * Math.PI * t._proportion_ / 2);
+		if (t._rose_proportion_) {
+			i = 2 * Math.PI - (t._start_ + 2 * Math.PI * t._rose_proportion_ / 2)
+		}
+		var r = t.color;
+		var o = t._radius_;
+		return {
+			arc: i,
+			text: a,
+			color: r,
+			radius: o,
+			textColor: t.textColor,
+			textSize: t.textSize,
+			labelShow: t.labelShow
+		}
+	});
+	for (let c = 0; c < y.length; c++) {
+		let t = y[c];
+		let e = Math.cos(t.arc) * (t.radius + p);
+		let a = Math.sin(t.arc) * (t.radius + p);
+		let i = Math.cos(t.arc) * t.radius;
+		let r = Math.sin(t.arc) * t.radius;
+		let o = e >= 0 ? e + x.pieChartTextPadding : e - x.pieChartTextPadding;
+		let n = a;
+		let l = measureText(t.text, t.textSize * d.pix || x.fontSize, f);
+		let s = n;
+		if (g && util.isSameXCoordinateArea(g.start, {
+				x: o
+			})) {
+			if (o > 0) {
+				s = Math.min(n, g.start.y)
+			} else if (e < 0) {
+				s = Math.max(n, g.start.y)
+			} else {
+				if (n > 0) {
+					s = Math.max(n, g.start.y)
+				} else {
+					s = Math.min(n, g.start.y)
+				}
+			}
+		}
+		if (o < 0) {
+			o -= l
+		}
+		let h = {
+			lineStart: {
+				x: i,
+				y: r
+			},
+			lineEnd: {
+				x: e,
+				y: a
+			},
+			start: {
+				x: o,
+				y: s
+			},
+			width: l,
+			height: x.fontSize,
+			text: t.text,
+			color: t.color,
+			textColor: t.textColor,
+			textSize: t.textSize
+		};
+		g = avoidCollision(h, g);
+		u.push(g)
+	}
+	for (let n = 0; n < u.length; n++) {
+		if (y[n].labelShow === false) {
+			continue
+		}
+		let t = u[n];
+		let e = convertCoordinateOrigin(t.lineStart.x, t.lineStart.y, l);
+		let a = convertCoordinateOrigin(t.lineEnd.x, t.lineEnd.y, l);
+		let i = convertCoordinateOrigin(t.start.x, t.start.y, l);
+		f.setLineWidth(1 * d.pix);
+		f.setFontSize(t.textSize * d.pix || x.fontSize);
+		f.beginPath();
+		f.setStrokeStyle(t.color);
+		f.setFillStyle(t.color);
+		f.moveTo(e.x, e.y);
+		let r = t.start.x < 0 ? i.x + t.width : i.x;
+		let o = t.start.x < 0 ? i.x - 5 : i.x + 5;
+		f.quadraticCurveTo(a.x, a.y, r, i.y);
+		f.moveTo(e.x, e.y);
+		f.stroke();
+		f.closePath();
+		f.beginPath();
+		f.moveTo(i.x + t.width, i.y);
+		f.arc(r, i.y, 2 * d.pix, 0, 2 * Math.PI);
+		f.closePath();
+		f.fill();
+		f.beginPath();
+		f.setFontSize(t.textSize * d.pix || x.fontSize);
+		f.setFillStyle(t.textColor || d.fontColor);
+		f.fillText(t.text, o, i.y + 3);
+		f.closePath();
+		f.stroke();
+		f.closePath()
+	}
+}
+
+function drawToolTipSplitLine(r, o, n, l) {
+	var s = o.extra.tooltip || {};
+	s.gridType = s.gridType == undefined ? "solid" : s.gridType;
+	s.dashLength = s.dashLength == undefined ? 4 : s.dashLength;
+	var t = o.area[0];
+	var h = o.height - o.area[2];
+	if (s.gridType == "dash") {
+		l.setLineDash([s.dashLength, s.dashLength])
+	}
+	l.setStrokeStyle(s.gridColor || "#cccccc");
+	l.setLineWidth(1 * o.pix);
+	l.beginPath();
+	l.moveTo(r, t);
+	l.lineTo(r, h);
+	l.stroke();
+	l.setLineDash([]);
+	if (s.xAxisLabel) {
+		let t = o.categories[o.tooltip.index];
+		l.setFontSize(n.fontSize);
+		let e = measureText(t, n.fontSize, l);
+		let a = r - .5 * e;
+		let i = h + 2 * o.pix;
+		l.beginPath();
+		l.setFillStyle(hexToRgb(s.labelBgColor || n.toolTipBackground, s.labelBgOpacity || n.toolTipOpacity));
+		l.setStrokeStyle(s.labelBgColor || n.toolTipBackground);
+		l.setLineWidth(1 * o.pix);
+		l.rect(a - s.boxPadding * o.pix, i, e + 2 * s.boxPadding * o.pix, n.fontSize + 2 * s.boxPadding * o.pix);
+		l.closePath();
+		l.stroke();
+		l.fill();
+		l.beginPath();
+		l.setFontSize(n.fontSize);
+		l.setFillStyle(s.labelFontColor || o.fontColor);
+		l.fillText(String(t), a, i + s.boxPadding * o.pix + n.fontSize);
+		l.closePath();
+		l.stroke()
+	}
+}
+
+function drawMarkLine(h, t, c) {
+	let e = assign({}, {
+		type: "solid",
+		dashLength: 4,
+		data: []
+	}, h.extra.markLine);
+	let a = h.area[3];
+	let i = h.width - h.area[1];
+	let r = calMarkLineData(e.data, h);
+	for (let t = 0; t < r.length; t++) {
+		let s = assign({}, {
+			lineColor: "#DE4A42",
+			showLabel: false,
+			labelFontSize: 13,
+			labelPadding: 6,
+			labelFontColor: "#666666",
+			labelBgColor: "#DFE8FF",
+			labelBgOpacity: .8,
+			labelAlign: "left",
+			labelOffsetX: 0,
+			labelOffsetY: 0
+		}, r[t]);
+		if (e.type == "dash") {
+			c.setLineDash([e.dashLength, e.dashLength])
+		}
+		c.setStrokeStyle(s.lineColor);
+		c.setLineWidth(1 * h.pix);
+		c.beginPath();
+		c.moveTo(a, s.y);
+		c.lineTo(i, s.y);
+		c.stroke();
+		c.setLineDash([]);
+		if (s.showLabel) {
+			let t = s.labelFontSize * h.pix;
+			let e = s.labelText ? s.labelText : s.value;
+			c.setFontSize(t);
+			let a = measureText(e, t, c);
+			let i = a + s.labelPadding * h.pix * 2;
+			let r = s.labelAlign == "left" ? h.area[3] - i : h.width - h.area[1];
+			r += s.labelOffsetX;
+			let o = s.y - .5 * t - s.labelPadding * h.pix;
+			o += s.labelOffsetY;
+			let n = r + s.labelPadding * h.pix;
+			let l = s.y;
+			c.setFillStyle(hexToRgb(s.labelBgColor, s.labelBgOpacity));
+			c.setStrokeStyle(s.labelBgColor);
+			c.setLineWidth(1 * h.pix);
+			c.beginPath();
+			c.rect(r, o, i, t + 2 * s.labelPadding * h.pix);
+			c.closePath();
+			c.stroke();
+			c.fill();
+			c.setFontSize(t);
+			c.setTextAlign("left");
+			c.setFillStyle(s.labelFontColor);
+			c.fillText(String(e), n, o + t + s.labelPadding * h.pix / 2);
+			c.stroke();
+			c.setTextAlign("left")
+		}
+	}
+}
+
+function drawToolTipHorizentalLine(x, f, p, t, e) {
+	var u = assign({}, {
+		gridType: "solid",
+		dashLength: 4
+	}, x.extra.tooltip);
+	var a = x.area[3];
+	var i = x.width - x.area[1];
+	if (u.gridType == "dash") {
+		p.setLineDash([u.dashLength, u.dashLength])
+	}
+	p.setStrokeStyle(u.gridColor || "#cccccc");
+	p.setLineWidth(1 * x.pix);
+	p.beginPath();
+	p.moveTo(a, x.tooltip.offset.y);
+	p.lineTo(i, x.tooltip.offset.y);
+	p.stroke();
+	p.setLineDash([]);
+	if (u.yAxisLabel) {
+		let l = u.boxPadding * x.pix;
+		let s = calTooltipYAxisData(x.tooltip.offset.y, x.series, x, f, t);
+		let h = x.chartData.yAxisData.yAxisWidth;
+		let c = x.area[3];
+		let d = x.width - x.area[1];
+		for (let n = 0; n < s.length; n++) {
+			p.setFontSize(u.fontSize * x.pix);
+			let t = measureText(s[n], u.fontSize * x.pix, p);
+			let e, a, i;
+			if (h[n].position == "left") {
+				e = c - (t + l * 2) - 2 * x.pix;
+				a = Math.max(e, e + t + l * 2)
+			} else {
+				e = d + 2 * x.pix;
+				a = Math.max(e + h[n].width, e + t + l * 2)
+			}
+			i = a - e;
+			let r = e + (i - t) / 2;
+			let o = x.tooltip.offset.y;
+			p.beginPath();
+			p.setFillStyle(hexToRgb(u.labelBgColor || f.toolTipBackground, u.labelBgOpacity || f.toolTipOpacity));
+			p.setStrokeStyle(u.labelBgColor || f.toolTipBackground);
+			p.setLineWidth(1 * x.pix);
+			p.rect(e, o - .5 * f.fontSize - l, i, f.fontSize + 2 * l);
+			p.closePath();
+			p.stroke();
+			p.fill();
+			p.beginPath();
+			p.setFontSize(f.fontSize);
+			p.setFillStyle(u.labelFontColor || x.fontColor);
+			p.fillText(s[n], r, o + .5 * f.fontSize);
+			p.closePath();
+			p.stroke();
+			if (h[n].position == "left") {
+				c -= h[n].width + x.yAxis.padding * x.pix
+			} else {
+				d += h[n].width + x.yAxis.padding * x.pix
+			}
+		}
+	}
+}
+
+function drawToolTipSplitArea(t, e, a, i, r) {
+	var o = assign({}, {
+		activeBgColor: "#000000",
+		activeBgOpacity: .08,
+		activeWidth: r
+	}, e.extra.column);
+	o.activeWidth = o.activeWidth > r ? r : o.activeWidth;
+	var n = e.area[0];
+	var l = e.height - e.area[2];
+	i.beginPath();
+	i.setFillStyle(hexToRgb(o.activeBgColor, o.activeBgOpacity));
+	i.rect(t - o.activeWidth / 2, n, o.activeWidth, l - n);
+	i.closePath();
+	i.fill();
+	i.setFillStyle("#FFFFFF")
+}
+
+function drawBarToolTipSplitArea(t, e, a, i, r) {
+	var o = assign({}, {
+		activeBgColor: "#000000",
+		activeBgOpacity: .08
+	}, e.extra.bar);
+	var n = e.area[3];
+	var l = e.width - e.area[1];
+	i.beginPath();
+	i.setFillStyle(hexToRgb(o.activeBgColor, o.activeBgOpacity));
+	i.rect(n, t - r / 2, l - n, r);
+	i.closePath();
+	i.fill();
+	i.setFillStyle("#FFFFFF")
+}
+
+function drawToolTip(e, r, o, a, n, i, f) {
+	var l = assign({}, {
+		showBox: true,
+		showArrow: true,
+		showCategory: false,
+		bgColor: "#000000",
+		bgOpacity: .7,
+		borderColor: "#000000",
+		borderWidth: 0,
+		borderRadius: 0,
+		borderOpacity: .7,
+		boxPadding: 3,
+		fontColor: "#FFFFFF",
+		fontSize: 13,
+		lineHeight: 20,
+		legendShow: true,
+		legendShape: "auto",
+		splitLine: true
+	}, o.extra.tooltip);
+	if (l.showCategory == true && o.categories) {
+		e.unshift({
+			text: o.categories[o.tooltip.index],
+			color: null
+		})
+	}
+	var s = l.fontSize * o.pix;
+	var p = l.lineHeight * o.pix;
+	var h = l.boxPadding * o.pix;
+	var c = s;
+	var u = 5 * o.pix;
+	if (l.legendShow == false) {
+		c = 0;
+		u = 0
+	}
+	var d = l.showArrow ? 8 * o.pix : 0;
+	var g = false;
+	if (o.type == "line" || o.type == "mount" || o.type == "area" || o.type == "candle" || o.type == "mix") {
+		if (l.splitLine == true) {
+			drawToolTipSplitLine(o.tooltip.offset.x, o, a, n)
+		}
+	}
+	r = assign({
+		x: 0,
+		y: 0
+	}, r);
+	r.y -= 8 * o.pix;
+	var y = e.map(function(t) {
+		return measureText(t.text, s, n)
+	});
+	var x = c + u + 4 * h + Math.max.apply(null, y);
+	var v = 2 * h + e.length * p;
+	if (l.showBox == false) {
+		return
+	}
+	if (r.x - Math.abs(o._scrollDistance_ || 0) + d + x > o.width) {
+		g = true
+	}
+	if (v + r.y > o.height) {
+		r.y = o.height - v
+	}
+	n.beginPath();
+	n.setFillStyle(hexToRgb(l.bgColor, l.bgOpacity));
+	n.setLineWidth(l.borderWidth * o.pix);
+	n.setStrokeStyle(hexToRgb(l.borderColor, l.borderOpacity));
+	var t = l.borderRadius;
+	if (g) {
+		if (x + d > o.width) {
+			r.x = o.width + Math.abs(o._scrollDistance_ || 0) + d + (x - o.width)
+		}
+		if (x > r.x) {
+			r.x = o.width + Math.abs(o._scrollDistance_ || 0) + d + (x - o.width)
+		}
+		if (l.showArrow) {
+			n.moveTo(r.x, r.y + 10 * o.pix);
+			n.lineTo(r.x - d, r.y + 10 * o.pix + 5 * o.pix)
+		}
+		n.arc(r.x - d - t, r.y + v - t, t, 0, Math.PI / 2, false);
+		n.arc(r.x - d - Math.round(x) + t, r.y + v - t, t, Math.PI / 2, Math.PI, false);
+		n.arc(r.x - d - Math.round(x) + t, r.y + t, t, -Math.PI, -Math.PI / 2, false);
+		n.arc(r.x - d - t, r.y + t, t, -Math.PI / 2, 0, false);
+		if (l.showArrow) {
+			n.lineTo(r.x - d, r.y + 10 * o.pix - 5 * o.pix);
+			n.lineTo(r.x, r.y + 10 * o.pix)
+		}
+	} else {
+		if (l.showArrow) {
+			n.moveTo(r.x, r.y + 10 * o.pix);
+			n.lineTo(r.x + d, r.y + 10 * o.pix - 5 * o.pix)
+		}
+		n.arc(r.x + d + t, r.y + t, t, -Math.PI, -Math.PI / 2, false);
+		n.arc(r.x + d + Math.round(x) - t, r.y + t, t, -Math.PI / 2, 0, false);
+		n.arc(r.x + d + Math.round(x) - t, r.y + v - t, t, 0, Math.PI / 2, false);
+		n.arc(r.x + d + t, r.y + v - t, t, Math.PI / 2, Math.PI, false);
+		if (l.showArrow) {
+			n.lineTo(r.x + d, r.y + 10 * o.pix + 5 * o.pix);
+			n.lineTo(r.x, r.y + 10 * o.pix)
+		}
+	}
+	n.closePath();
+	n.fill();
+	if (l.borderWidth > 0) {
+		n.stroke()
+	}
+	if (l.legendShow) {
+		e.forEach(function(t, e) {
+			if (t.color !== null) {
+				n.beginPath();
+				n.setFillStyle(t.color);
+				var a = r.x + d + 2 * h;
+				var i = r.y + (p - s) / 2 + p * e + h + 1;
+				if (g) {
+					a = r.x - x - d + 2 * h
+				}
+				switch (t.legendShape) {
+					case "line":
+						n.moveTo(a, i + .5 * c - 2 * o.pix);
+						n.fillRect(a, i + .5 * c - 2 * o.pix, c, 4 * o.pix);
+						break;
+					case "triangle":
+						n.moveTo(a + 7.5 * o.pix, i + .5 * c - 5 * o.pix);
+						n.lineTo(a + 2.5 * o.pix, i + .5 * c + 5 * o.pix);
+						n.lineTo(a + 12.5 * o.pix, i + .5 * c + 5 * o.pix);
+						n.lineTo(a + 7.5 * o.pix, i + .5 * c - 5 * o.pix);
+						break;
+					case "diamond":
+						n.moveTo(a + 7.5 * o.pix, i + .5 * c - 5 * o.pix);
+						n.lineTo(a + 2.5 * o.pix, i + .5 * c);
+						n.lineTo(a + 7.5 * o.pix, i + .5 * c + 5 * o.pix);
+						n.lineTo(a + 12.5 * o.pix, i + .5 * c);
+						n.lineTo(a + 7.5 * o.pix, i + .5 * c - 5 * o.pix);
+						break;
+					case "circle":
+						n.moveTo(a + 7.5 * o.pix, i + .5 * c);
+						n.arc(a + 7.5 * o.pix, i + .5 * c, 5 * o.pix, 0, 2 * Math.PI);
+						break;
+					case "rect":
+						n.moveTo(a, i + .5 * c - 5 * o.pix);
+						n.fillRect(a, i + .5 * c - 5 * o.pix, 15 * o.pix, 10 * o.pix);
+						break;
+					case "square":
+						n.moveTo(a + 2 * o.pix, i + .5 * c - 5 * o.pix);
+						n.fillRect(a + 2 * o.pix, i + .5 * c - 5 * o.pix, 10 * o.pix, 10 * o.pix);
+						break;
+					default:
+						n.moveTo(a, i + .5 * c - 5 * o.pix);
+						n.fillRect(a, i + .5 * c - 5 * o.pix, 15 * o.pix, 10 * o.pix)
+				}
+				n.closePath();
+				n.fill()
+			}
+		})
+	}
+	e.forEach(function(t, e) {
+		var a = r.x + d + 2 * h + c + u;
+		if (g) {
+			a = r.x - x - d + 2 * h + c + u
+		}
+		var i = r.y + p * e + (p - s) / 2 - 1 + h + s;
+		n.beginPath();
+		n.setFontSize(s);
+		n.setTextBaseline("normal");
+		n.setFillStyle(l.fontColor);
+		n.fillText(t.text, a, i);
+		n.closePath();
+		n.stroke()
+	})
+}
+
+function drawColumnDataPoints(T, b, S, w) {
+	let A = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	let t = b.chartData.xAxisData,
+		P = t.xAxisPoints,
+		C = t.eachSpacing;
+	let D = assign({}, {
+		type: "group",
+		width: C / 2,
+		meterBorder: 4,
+		meterFillColor: "#FFFFFF",
+		barBorderCircle: false,
+		barBorderRadius: [],
+		seriesGap: 2,
+		linearType: "none",
+		linearOpacity: 1,
+		customColor: [],
+		colorStop: 0,
+		labelPosition: "outside"
+	}, b.extra.column);
+	let M = [];
+	w.save();
+	let L = -2;
+	let F = P.length + 2;
+	if (b._scrollDistance_ && b._scrollDistance_ !== 0 && b.enableScroll === true) {
+		w.translate(b._scrollDistance_, 0);
+		L = Math.floor(-b._scrollDistance_ / C) - 2;
+		F = L + b.xAxis.itemCount + 4
+	}
+	if (b.tooltip && b.tooltip.textList && b.tooltip.textList.length && A === 1) {
+		drawToolTipSplitArea(b.tooltip.offset.x, b, S, w, C)
+	}
+	D.customColor = fillCustomColor(D.linearType, D.customColor, T, S);
+	T.forEach(function(a, i) {
+		let e, t, o;
+		e = [].concat(b.chartData.yAxisData.ranges[a.index]);
+		t = e.pop();
+		o = e.shift();
+		let x = b.height - b.area[0] - b.area[2];
+		let f = x * (0 - t) / (o - t);
+		let n = b.height - Math.round(f) - b.area[2];
+		a.zeroPoints = n;
+		var p = a.data;
+		switch (D.type) {
+			case "group":
+				var r = getColumnDataPoints(p, t, o, P, C, b, S, n, A);
+				var u = getStackDataPoints(p, t, o, P, C, b, S, i, T, A);
+				M.push(u);
+				r = fixColumeData(r, C, T.length, i, S, b);
+				for (let t = 0; t < r.length; t++) {
+					let o = r[t];
+					if (o !== null && t > L && t < F) {
+						var l = o.x - o.width / 2;
+						var s = b.height - o.y - b.area[2];
+						w.beginPath();
+						var g = o.color || a.color;
+						var y = o.color || a.color;
+						if (D.linearType !== "none") {
+							var v = w.createLinearGradient(l, o.y, l, n);
+							if (D.linearType == "opacity") {
+								v.addColorStop(0, hexToRgb(g, D.linearOpacity));
+								v.addColorStop(1, hexToRgb(g, 1))
+							} else {
+								v.addColorStop(0, hexToRgb(D.customColor[a.linearIndex], D.linearOpacity));
+								v.addColorStop(D.colorStop, hexToRgb(D.customColor[a.linearIndex], D.linearOpacity));
+								v.addColorStop(1, hexToRgb(g, 1))
+							}
+							g = v
+						}
+						if (D.barBorderRadius && D.barBorderRadius.length === 4 || D.barBorderCircle === true) {
+							const h = l;
+							const c = o.y > n ? n : o.y;
+							const d = o.width;
+							const s = Math.abs(n - o.y);
+							if (D.barBorderCircle) {
+								D.barBorderRadius = [d / 2, d / 2, 0, 0]
+							}
+							if (o.y > n) {
+								D.barBorderRadius = [0, 0, d / 2, d / 2]
+							}
+							let [t, e, a, i] = D.barBorderRadius;
+							let r = Math.min(d / 2, s / 2);
+							t = t > r ? r : t;
+							e = e > r ? r : e;
+							a = a > r ? r : a;
+							i = i > r ? r : i;
+							t = t < 0 ? 0 : t;
+							e = e < 0 ? 0 : e;
+							a = a < 0 ? 0 : a;
+							i = i < 0 ? 0 : i;
+							w.arc(h + t, c + t, t, -Math.PI, -Math.PI / 2);
+							w.arc(h + d - e, c + e, e, -Math.PI / 2, 0);
+							w.arc(h + d - a, c + s - a, a, 0, Math.PI / 2);
+							w.arc(h + i, c + s - i, i, Math.PI / 2, Math.PI)
+						} else {
+							w.moveTo(l, o.y);
+							w.lineTo(l + o.width, o.y);
+							w.lineTo(l + o.width, n);
+							w.lineTo(l, n);
+							w.lineTo(l, o.y);
+							w.setLineWidth(1);
+							w.setStrokeStyle(y)
+						}
+						w.setFillStyle(g);
+						w.closePath();
+						w.fill()
+					}
+				};
+				break;
+			case "stack":
+				var r = getStackDataPoints(p, t, o, P, C, b, S, i, T, A);
+				M.push(r);
+				r = fixColumeStackData(r, C, T.length, i, S, b, T);
+				for (let e = 0; e < r.length; e++) {
+					let t = r[e];
+					if (t !== null && e > L && e < F) {
+						w.beginPath();
+						var g = t.color || a.color;
+						var l = t.x - t.width / 2 + 1;
+						var s = b.height - t.y - b.area[2];
+						var m = b.height - t.y0 - b.area[2];
+						if (i > 0) {
+							s -= m
+						}
+						w.setFillStyle(g);
+						w.moveTo(l, t.y);
+						w.fillRect(l, t.y, t.width, s);
+						w.closePath();
+						w.fill()
+					}
+				};
+				break;
+			case "meter":
+				var r = getDataPoints(p, t, o, P, C, b, S, A);
+				M.push(r);
+				r = fixColumeMeterData(r, C, T.length, i, S, b, D.meterBorder);
+				for (let t = 0; t < r.length; t++) {
+					let o = r[t];
+					if (o !== null && t > L && t < F) {
+						w.beginPath();
+						if (i == 0 && D.meterBorder > 0) {
+							w.setStrokeStyle(a.color);
+							w.setLineWidth(D.meterBorder * b.pix)
+						}
+						if (i == 0) {
+							w.setFillStyle(D.meterFillColor)
+						} else {
+							w.setFillStyle(o.color || a.color)
+						}
+						var l = o.x - o.width / 2;
+						var s = b.height - o.y - b.area[2];
+						if (D.barBorderRadius && D.barBorderRadius.length === 4 || D.barBorderCircle === true) {
+							const h = l;
+							const c = o.y;
+							const d = o.width;
+							const s = n - o.y;
+							if (D.barBorderCircle) {
+								D.barBorderRadius = [d / 2, d / 2, 0, 0]
+							}
+							let [t, e, a, i] = D.barBorderRadius;
+							let r = Math.min(d / 2, s / 2);
+							t = t > r ? r : t;
+							e = e > r ? r : e;
+							a = a > r ? r : a;
+							i = i > r ? r : i;
+							t = t < 0 ? 0 : t;
+							e = e < 0 ? 0 : e;
+							a = a < 0 ? 0 : a;
+							i = i < 0 ? 0 : i;
+							w.arc(h + t, c + t, t, -Math.PI, -Math.PI / 2);
+							w.arc(h + d - e, c + e, e, -Math.PI / 2, 0);
+							w.arc(h + d - a, c + s - a, a, 0, Math.PI / 2);
+							w.arc(h + i, c + s - i, i, Math.PI / 2, Math.PI);
+							w.fill()
+						} else {
+							w.moveTo(l, o.y);
+							w.lineTo(l + o.width, o.y);
+							w.lineTo(l + o.width, n);
+							w.lineTo(l, n);
+							w.lineTo(l, o.y);
+							w.fill()
+						}
+						if (i == 0 && D.meterBorder > 0) {
+							w.closePath();
+							w.stroke()
+						}
+					}
+				}
+				break
+		}
+	});
+	if (b.dataLabel !== false && A === 1) {
+		T.forEach(function(t, e) {
+			let a, i, r;
+			a = [].concat(b.chartData.yAxisData.ranges[t.index]);
+			i = a.pop();
+			r = a.shift();
+			var o = t.data;
+			switch (D.type) {
+				case "group":
+					var n = getColumnDataPoints(o, i, r, P, C, b, S, A);
+					n = fixColumeData(n, C, T.length, e, S, b);
+					drawColumePointText(n, t, S, w, b);
+					break;
+				case "stack":
+					var n = getStackDataPoints(o, i, r, P, C, b, S, e, T, A);
+					drawColumePointText(n, t, S, w, b);
+					break;
+				case "meter":
+					var n = getDataPoints(o, i, r, P, C, b, S, A);
+					drawColumePointText(n, t, S, w, b);
+					break
+			}
+		})
+	}
+	w.restore();
+	return {
+		xAxisPoints: P,
+		calPoints: M,
+		eachSpacing: C
+	}
+}
+
+function drawMountDataPoints(i, r, o, n) {
+	let f = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	let t = r.chartData.xAxisData,
+		p = t.xAxisPoints,
+		l = t.eachSpacing;
+	let s = assign({}, {
+		type: "mount",
+		widthRatio: 1,
+		borderWidth: 1,
+		barBorderCircle: false,
+		barBorderRadius: [],
+		linearType: "none",
+		linearOpacity: 1,
+		customColor: [],
+		colorStop: 0
+	}, r.extra.mount);
+	s.widthRatio = s.widthRatio <= 0 ? 0 : s.widthRatio;
+	s.widthRatio = s.widthRatio >= 2 ? 2 : s.widthRatio;
+	let e = [];
+	n.save();
+	let u = -2;
+	let g = p.length + 2;
+	if (r._scrollDistance_ && r._scrollDistance_ !== 0 && r.enableScroll === true) {
+		n.translate(r._scrollDistance_, 0);
+		u = Math.floor(-r._scrollDistance_ / l) - 2;
+		g = u + r.xAxis.itemCount + 4
+	}
+	s.customColor = fillCustomColor(s.linearType, s.customColor, i, o);
+	let y, v, m;
+	y = [].concat(r.chartData.yAxisData.ranges[0]);
+	v = y.pop();
+	m = y.shift();
+	let T = r.height - r.area[0] - r.area[2];
+	let b = T * (0 - v) / (m - v);
+	let h = r.height - Math.round(b) - r.area[2];
+	var c = getMountDataPoints(i, v, m, p, l, r, s, h, f);
+	switch (s.type) {
+		case "bar":
+			for (let t = 0; t < c.length; t++) {
+				let o = c[t];
+				if (o !== null && t > u && t < g) {
+					var d = o.x - l * s.widthRatio / 2;
+					var S = r.height - o.y - r.area[2];
+					n.beginPath();
+					var a = o.color || i[t].color;
+					var w = o.color || i[t].color;
+					if (s.linearType !== "none") {
+						var x = n.createLinearGradient(d, o.y, d, h);
+						if (s.linearType == "opacity") {
+							x.addColorStop(0, hexToRgb(a, s.linearOpacity));
+							x.addColorStop(1, hexToRgb(a, 1))
+						} else {
+							x.addColorStop(0, hexToRgb(s.customColor[i[t].linearIndex], s.linearOpacity));
+							x.addColorStop(s.colorStop, hexToRgb(s.customColor[i[t].linearIndex], s.linearOpacity));
+							x.addColorStop(1, hexToRgb(a, 1))
+						}
+						a = x
+					}
+					if (s.barBorderRadius && s.barBorderRadius.length === 4 || s.barBorderCircle === true) {
+						const A = d;
+						const P = o.y > h ? h : o.y;
+						const C = o.width;
+						const S = Math.abs(h - o.y);
+						if (s.barBorderCircle) {
+							s.barBorderRadius = [C / 2, C / 2, 0, 0]
+						}
+						if (o.y > h) {
+							s.barBorderRadius = [0, 0, C / 2, C / 2]
+						}
+						let [t, e, a, i] = s.barBorderRadius;
+						let r = Math.min(C / 2, S / 2);
+						t = t > r ? r : t;
+						e = e > r ? r : e;
+						a = a > r ? r : a;
+						i = i > r ? r : i;
+						t = t < 0 ? 0 : t;
+						e = e < 0 ? 0 : e;
+						a = a < 0 ? 0 : a;
+						i = i < 0 ? 0 : i;
+						n.arc(A + t, P + t, t, -Math.PI, -Math.PI / 2);
+						n.arc(A + C - e, P + e, e, -Math.PI / 2, 0);
+						n.arc(A + C - a, P + S - a, a, 0, Math.PI / 2);
+						n.arc(A + i, P + S - i, i, Math.PI / 2, Math.PI)
+					} else {
+						n.moveTo(d, o.y);
+						n.lineTo(d + o.width, o.y);
+						n.lineTo(d + o.width, h);
+						n.lineTo(d, h);
+						n.lineTo(d, o.y)
+					}
+					n.setStrokeStyle(w);
+					n.setFillStyle(a);
+					if (s.borderWidth > 0) {
+						n.setLineWidth(s.borderWidth * r.pix);
+						n.closePath();
+						n.stroke()
+					}
+					n.fill()
+				}
+			};
+			break;
+		case "triangle":
+			for (let e = 0; e < c.length; e++) {
+				let t = c[e];
+				if (t !== null && e > u && e < g) {
+					var d = t.x - l * s.widthRatio / 2;
+					var S = r.height - t.y - r.area[2];
+					n.beginPath();
+					var a = t.color || i[e].color;
+					var w = t.color || i[e].color;
+					if (s.linearType !== "none") {
+						var x = n.createLinearGradient(d, t.y, d, h);
+						if (s.linearType == "opacity") {
+							x.addColorStop(0, hexToRgb(a, s.linearOpacity));
+							x.addColorStop(1, hexToRgb(a, 1))
+						} else {
+							x.addColorStop(0, hexToRgb(s.customColor[i[e].linearIndex], s.linearOpacity));
+							x.addColorStop(s.colorStop, hexToRgb(s.customColor[i[e].linearIndex], s.linearOpacity));
+							x.addColorStop(1, hexToRgb(a, 1))
+						}
+						a = x
+					}
+					n.moveTo(d, h);
+					n.lineTo(t.x, t.y);
+					n.lineTo(d + t.width, h);
+					n.setStrokeStyle(w);
+					n.setFillStyle(a);
+					if (s.borderWidth > 0) {
+						n.setLineWidth(s.borderWidth * r.pix);
+						n.stroke()
+					}
+					n.fill()
+				}
+			};
+			break;
+		case "mount":
+			for (let e = 0; e < c.length; e++) {
+				let t = c[e];
+				if (t !== null && e > u && e < g) {
+					var d = t.x - l * s.widthRatio / 2;
+					var S = r.height - t.y - r.area[2];
+					n.beginPath();
+					var a = t.color || i[e].color;
+					var w = t.color || i[e].color;
+					if (s.linearType !== "none") {
+						var x = n.createLinearGradient(d, t.y, d, h);
+						if (s.linearType == "opacity") {
+							x.addColorStop(0, hexToRgb(a, s.linearOpacity));
+							x.addColorStop(1, hexToRgb(a, 1))
+						} else {
+							x.addColorStop(0, hexToRgb(s.customColor[i[e].linearIndex], s.linearOpacity));
+							x.addColorStop(s.colorStop, hexToRgb(s.customColor[i[e].linearIndex], s.linearOpacity));
+							x.addColorStop(1, hexToRgb(a, 1))
+						}
+						a = x
+					}
+					n.moveTo(d, h);
+					n.bezierCurveTo(t.x - t.width / 4, h, t.x - t.width / 4, t.y, t.x, t.y);
+					n.bezierCurveTo(t.x + t.width / 4, t.y, t.x + t.width / 4, h, d + t.width, h);
+					n.setStrokeStyle(w);
+					n.setFillStyle(a);
+					if (s.borderWidth > 0) {
+						n.setLineWidth(s.borderWidth * r.pix);
+						n.stroke()
+					}
+					n.fill()
+				}
+			};
+			break;
+		case "sharp":
+			for (let e = 0; e < c.length; e++) {
+				let t = c[e];
+				if (t !== null && e > u && e < g) {
+					var d = t.x - l * s.widthRatio / 2;
+					var S = r.height - t.y - r.area[2];
+					n.beginPath();
+					var a = t.color || i[e].color;
+					var w = t.color || i[e].color;
+					if (s.linearType !== "none") {
+						var x = n.createLinearGradient(d, t.y, d, h);
+						if (s.linearType == "opacity") {
+							x.addColorStop(0, hexToRgb(a, s.linearOpacity));
+							x.addColorStop(1, hexToRgb(a, 1))
+						} else {
+							x.addColorStop(0, hexToRgb(s.customColor[i[e].linearIndex], s.linearOpacity));
+							x.addColorStop(s.colorStop, hexToRgb(s.customColor[i[e].linearIndex], s.linearOpacity));
+							x.addColorStop(1, hexToRgb(a, 1))
+						}
+						a = x
+					}
+					n.moveTo(d, h);
+					n.quadraticCurveTo(t.x - 0, h - S / 4, t.x, t.y);
+					n.quadraticCurveTo(t.x + 0, h - S / 4, d + t.width, h);
+					n.setStrokeStyle(w);
+					n.setFillStyle(a);
+					if (s.borderWidth > 0) {
+						n.setLineWidth(s.borderWidth * r.pix);
+						n.stroke()
+					}
+					n.fill()
+				}
+			};
+			break
+	}
+	if (r.dataLabel !== false && f === 1) {
+		let t, e, a;
+		t = [].concat(r.chartData.yAxisData.ranges[0]);
+		e = t.pop();
+		a = t.shift();
+		var c = getMountDataPoints(i, e, a, p, l, r, s, h, f);
+		drawMountPointText(c, i, o, n, r, h)
+	}
+	n.restore();
+	return {
+		xAxisPoints: p,
+		calPoints: c,
+		eachSpacing: l
+	}
+}
+
+function drawBarDataPoints(y, v, m, T) {
+	let b = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	let S = [];
+	let w = (v.height - v.area[0] - v.area[2]) / v.categories.length;
+	for (let t = 0; t < v.categories.length; t++) {
+		S.push(v.area[0] + w / 2 + w * t)
+	}
+	let A = assign({}, {
+		type: "group",
+		width: w / 2,
+		meterBorder: 4,
+		meterFillColor: "#FFFFFF",
+		barBorderCircle: false,
+		barBorderRadius: [],
+		seriesGap: 2,
+		linearType: "none",
+		linearOpacity: 1,
+		customColor: [],
+		colorStop: 0
+	}, v.extra.bar);
+	let P = [];
+	T.save();
+	let C = -2;
+	let D = S.length + 2;
+	if (v.tooltip && v.tooltip.textList && v.tooltip.textList.length && b === 1) {
+		drawBarToolTipSplitArea(v.tooltip.offset.y, v, m, T, w)
+	}
+	A.customColor = fillCustomColor(A.linearType, A.customColor, y, m);
+	y.forEach(function(a, t) {
+		let o, e, d;
+		o = [].concat(v.chartData.xAxisData.ranges);
+		d = o.pop();
+		e = o.shift();
+		var x = a.data;
+		switch (A.type) {
+			case "group":
+				var i = getBarDataPoints(x, e, d, S, w, v, m, b);
+				var f = getBarStackDataPoints(x, e, d, S, w, v, m, t, y, b);
+				P.push(f);
+				i = fixBarData(i, w, y.length, t, m, v);
+				for (let t = 0; t < i.length; t++) {
+					let o = i[t];
+					if (o !== null && t > C && t < D) {
+						var n = v.area[3];
+						var r = o.y - o.width / 2;
+						var p = o.height;
+						T.beginPath();
+						var l = o.color || a.color;
+						var u = o.color || a.color;
+						if (A.linearType !== "none") {
+							var s = T.createLinearGradient(n, o.y, o.x, o.y);
+							if (A.linearType == "opacity") {
+								s.addColorStop(0, hexToRgb(l, A.linearOpacity));
+								s.addColorStop(1, hexToRgb(l, 1))
+							} else {
+								s.addColorStop(0, hexToRgb(A.customColor[a.linearIndex], A.linearOpacity));
+								s.addColorStop(A.colorStop, hexToRgb(A.customColor[a.linearIndex], A.linearOpacity));
+								s.addColorStop(1, hexToRgb(l, 1))
+							}
+							l = s
+						}
+						if (A.barBorderRadius && A.barBorderRadius.length === 4 || A.barBorderCircle === true) {
+							const g = n;
+							const h = o.width;
+							const c = o.y - o.width / 2;
+							const p = o.height;
+							if (A.barBorderCircle) {
+								A.barBorderRadius = [h / 2, h / 2, 0, 0]
+							}
+							let [t, e, a, i] = A.barBorderRadius;
+							let r = Math.min(h / 2, p / 2);
+							t = t > r ? r : t;
+							e = e > r ? r : e;
+							a = a > r ? r : a;
+							i = i > r ? r : i;
+							t = t < 0 ? 0 : t;
+							e = e < 0 ? 0 : e;
+							a = a < 0 ? 0 : a;
+							i = i < 0 ? 0 : i;
+							T.arc(g + i, c + i, i, -Math.PI, -Math.PI / 2);
+							T.arc(o.x - t, c + t, t, -Math.PI / 2, 0);
+							T.arc(o.x - e, c + h - e, e, 0, Math.PI / 2);
+							T.arc(g + a, c + h - a, a, Math.PI / 2, Math.PI)
+						} else {
+							T.moveTo(n, r);
+							T.lineTo(o.x, r);
+							T.lineTo(o.x, r + o.width);
+							T.lineTo(n, r + o.width);
+							T.lineTo(n, r);
+							T.setLineWidth(1);
+							T.setStrokeStyle(u)
+						}
+						T.setFillStyle(l);
+						T.closePath();
+						T.fill()
+					}
+				};
+				break;
+			case "stack":
+				var i = getBarStackDataPoints(x, e, d, S, w, v, m, t, y, b);
+				P.push(i);
+				i = fixBarStackData(i, w, y.length, t, m, v, y);
+				for (let e = 0; e < i.length; e++) {
+					let t = i[e];
+					if (t !== null && e > C && e < D) {
+						T.beginPath();
+						var l = t.color || a.color;
+						var n = t.x0;
+						T.setFillStyle(l);
+						T.moveTo(n, t.y - t.width / 2);
+						T.fillRect(n, t.y - t.width / 2, t.height, t.width);
+						T.closePath();
+						T.fill()
+					}
+				};
+				break
+		}
+	});
+	if (v.dataLabel !== false && b === 1) {
+		y.forEach(function(t, e) {
+			let a, i, r;
+			a = [].concat(v.chartData.xAxisData.ranges);
+			r = a.pop();
+			i = a.shift();
+			var o = t.data;
+			switch (A.type) {
+				case "group":
+					var n = getBarDataPoints(o, i, r, S, w, v, m, b);
+					n = fixBarData(n, w, y.length, e, m, v);
+					drawBarPointText(n, t, m, T, v);
+					break;
+				case "stack":
+					var n = getBarStackDataPoints(o, i, r, S, w, v, m, e, y, b);
+					drawBarPointText(n, t, m, T, v);
+					break
+			}
+		})
+	}
+	return {
+		yAxisPoints: S,
+		calPoints: P,
+		eachSpacing: w
+	}
+}
+
+function drawCandleDataPoints(e, t, h, c, d) {
+	var g = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
+	var s = assign({}, {
+		color: {},
+		average: {}
+	}, h.extra.candle);
+	s.color = assign({}, {
+		upLine: "#f04864",
+		upFill: "#f04864",
+		downLine: "#2fc25b",
+		downFill: "#2fc25b"
+	}, s.color);
+	s.average = assign({}, {
+		show: false,
+		name: [],
+		day: [],
+		color: c.color
+	}, s.average);
+	h.extra.candle = s;
+	let a = h.chartData.xAxisData,
+		x = a.xAxisPoints,
+		f = a.eachSpacing;
+	let y = [];
+	d.save();
+	let p = -2;
+	let v = x.length + 2;
+	let u = 0;
+	let m = h.width + f;
+	if (h._scrollDistance_ && h._scrollDistance_ !== 0 && h.enableScroll === true) {
+		d.translate(h._scrollDistance_, 0);
+		p = Math.floor(-h._scrollDistance_ / f) - 2;
+		v = p + h.xAxis.itemCount + 4;
+		u = -h._scrollDistance_ - f * 2 + h.area[3];
+		m = u + (h.xAxis.itemCount + 4) * f
+	}
+	if (s.average.show || t) {
+		t.forEach(function(e, t) {
+			let a, i, r;
+			a = [].concat(h.chartData.yAxisData.ranges[e.index]);
+			i = a.pop();
+			r = a.shift();
+			var o = e.data;
+			var n = getDataPoints(o, i, r, x, f, h, c, g);
+			var l = splitPoints(n, e);
+			for (let t = 0; t < l.length; t++) {
+				let i = l[t];
+				d.beginPath();
+				d.setStrokeStyle(e.color);
+				d.setLineWidth(1);
+				if (i.length === 1) {
+					d.moveTo(i[0].x, i[0].y);
+					d.arc(i[0].x, i[0].y, 1, 0, 2 * Math.PI)
+				} else {
+					d.moveTo(i[0].x, i[0].y);
+					let a = 0;
+					for (let e = 0; e < i.length; e++) {
+						let t = i[e];
+						if (a == 0 && t.x > u) {
+							d.moveTo(t.x, t.y);
+							a = 1
+						}
+						if (e > 0 && t.x > u && t.x < m) {
+							var s = createCurveControlPoints(i, e - 1);
+							d.bezierCurveTo(s.ctrA.x, s.ctrA.y, s.ctrB.x, s.ctrB.y, t.x, t.y)
+						}
+					}
+					d.moveTo(i[0].x, i[0].y)
+				}
+				d.closePath();
+				d.stroke()
+			}
+		})
+	}
+	e.forEach(function(t, e) {
+		let a, i, r;
+		a = [].concat(h.chartData.yAxisData.ranges[t.index]);
+		i = a.pop();
+		r = a.shift();
+		var o = t.data;
+		var n = getCandleDataPoints(o, i, r, x, f, h, c, g);
+		y.push(n);
+		var l = splitPoints(n, t);
+		for (let e = 0; e < l[0].length; e++) {
+			if (e > p && e < v) {
+				let t = l[0][e];
+				d.beginPath();
+				if (o[e][1] - o[e][0] > 0) {
+					d.setStrokeStyle(s.color.upLine);
+					d.setFillStyle(s.color.upFill);
+					d.setLineWidth(1 * h.pix);
+					d.moveTo(t[3].x, t[3].y);
+					d.lineTo(t[1].x, t[1].y);
+					d.lineTo(t[1].x - f / 4, t[1].y);
+					d.lineTo(t[0].x - f / 4, t[0].y);
+					d.lineTo(t[0].x, t[0].y);
+					d.lineTo(t[2].x, t[2].y);
+					d.lineTo(t[0].x, t[0].y);
+					d.lineTo(t[0].x + f / 4, t[0].y);
+					d.lineTo(t[1].x + f / 4, t[1].y);
+					d.lineTo(t[1].x, t[1].y);
+					d.moveTo(t[3].x, t[3].y)
+				} else {
+					d.setStrokeStyle(s.color.downLine);
+					d.setFillStyle(s.color.downFill);
+					d.setLineWidth(1 * h.pix);
+					d.moveTo(t[3].x, t[3].y);
+					d.lineTo(t[0].x, t[0].y);
+					d.lineTo(t[0].x - f / 4, t[0].y);
+					d.lineTo(t[1].x - f / 4, t[1].y);
+					d.lineTo(t[1].x, t[1].y);
+					d.lineTo(t[2].x, t[2].y);
+					d.lineTo(t[1].x, t[1].y);
+					d.lineTo(t[1].x + f / 4, t[1].y);
+					d.lineTo(t[0].x + f / 4, t[0].y);
+					d.lineTo(t[0].x, t[0].y);
+					d.moveTo(t[3].x, t[3].y)
+				}
+				d.closePath();
+				d.fill();
+				d.stroke()
+			}
+		}
+	});
+	d.restore();
+	return {
+		xAxisPoints: x,
+		calPoints: y,
+		eachSpacing: f
+	}
+}
+
+function drawAreaDataPoints(t, s, h, c) {
+	var d = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	var x = assign({}, {
+		type: "straight",
+		opacity: .2,
+		addLine: false,
+		width: 2,
+		gradient: false,
+		activeType: "none"
+	}, s.extra.area);
+	let e = s.chartData.xAxisData,
+		f = e.xAxisPoints,
+		p = e.eachSpacing;
+	let y = s.height - s.area[2];
+	let v = [];
+	c.save();
+	let u = 0;
+	let g = s.width + p;
+	if (s._scrollDistance_ && s._scrollDistance_ !== 0 && s.enableScroll === true) {
+		c.translate(s._scrollDistance_, 0);
+		u = -s._scrollDistance_ - p * 2 + s.area[3];
+		g = u + (s.xAxis.itemCount + 4) * p
+	}
+	t.forEach(function(e, t) {
+		let a, i, r;
+		a = [].concat(s.chartData.yAxisData.ranges[e.index]);
+		i = a.pop();
+		r = a.shift();
+		let o = e.data;
+		let n = getDataPoints(o, i, r, f, p, s, h, d);
+		v.push(n);
+		let l = splitPoints(n, e);
+		for (let t = 0; t < l.length; t++) {
+			let r = l[t];
+			c.beginPath();
+			c.setStrokeStyle(hexToRgb(e.color, x.opacity));
+			if (x.gradient) {
+				let t = c.createLinearGradient(0, s.area[0], 0, s.height - s.area[2]);
+				t.addColorStop("0", hexToRgb(e.color, x.opacity));
+				t.addColorStop("1.0", hexToRgb("#FFFFFF", .1));
+				c.setFillStyle(t)
+			} else {
+				c.setFillStyle(hexToRgb(e.color, x.opacity))
+			}
+			c.setLineWidth(x.width * s.pix);
+			if (r.length > 1) {
+				let t = r[0];
+				let e = r[r.length - 1];
+				c.moveTo(t.x, t.y);
+				let i = 0;
+				if (x.type === "curve") {
+					for (let a = 0; a < r.length; a++) {
+						let e = r[a];
+						if (i == 0 && e.x > u) {
+							c.moveTo(e.x, e.y);
+							i = 1
+						}
+						if (a > 0 && e.x > u && e.x < g) {
+							let t = createCurveControlPoints(r, a - 1);
+							c.bezierCurveTo(t.ctrA.x, t.ctrA.y, t.ctrB.x, t.ctrB.y, e.x, e.y)
+						}
+					}
+				}
+				if (x.type === "straight") {
+					for (let e = 0; e < r.length; e++) {
+						let t = r[e];
+						if (i == 0 && t.x > u) {
+							c.moveTo(t.x, t.y);
+							i = 1
+						}
+						if (e > 0 && t.x > u && t.x < g) {
+							c.lineTo(t.x, t.y)
+						}
+					}
+				}
+				if (x.type === "step") {
+					for (let e = 0; e < r.length; e++) {
+						let t = r[e];
+						if (i == 0 && t.x > u) {
+							c.moveTo(t.x, t.y);
+							i = 1
+						}
+						if (e > 0 && t.x > u && t.x < g) {
+							c.lineTo(t.x, r[e - 1].y);
+							c.lineTo(t.x, t.y)
+						}
+					}
+				}
+				c.lineTo(e.x, y);
+				c.lineTo(t.x, y);
+				c.lineTo(t.x, t.y)
+			} else {
+				let t = r[0];
+				c.moveTo(t.x - p / 2, t.y)
+			}
+			c.closePath();
+			c.fill();
+			if (x.addLine) {
+				if (e.lineType == "dash") {
+					let t = e.dashLength ? e.dashLength : 8;
+					t *= s.pix;
+					c.setLineDash([t, t])
+				}
+				c.beginPath();
+				c.setStrokeStyle(e.color);
+				c.setLineWidth(x.width * s.pix);
+				if (r.length === 1) {
+					c.moveTo(r[0].x, r[0].y)
+				} else {
+					c.moveTo(r[0].x, r[0].y);
+					let i = 0;
+					if (x.type === "curve") {
+						for (let a = 0; a < r.length; a++) {
+							let e = r[a];
+							if (i == 0 && e.x > u) {
+								c.moveTo(e.x, e.y);
+								i = 1
+							}
+							if (a > 0 && e.x > u && e.x < g) {
+								let t = createCurveControlPoints(r, a - 1);
+								c.bezierCurveTo(t.ctrA.x, t.ctrA.y, t.ctrB.x, t.ctrB.y, e.x, e.y)
+							}
+						}
+					}
+					if (x.type === "straight") {
+						for (let e = 0; e < r.length; e++) {
+							let t = r[e];
+							if (i == 0 && t.x > u) {
+								c.moveTo(t.x, t.y);
+								i = 1
+							}
+							if (e > 0 && t.x > u && t.x < g) {
+								c.lineTo(t.x, t.y)
+							}
+						}
+					}
+					if (x.type === "step") {
+						for (let e = 0; e < r.length; e++) {
+							let t = r[e];
+							if (i == 0 && t.x > u) {
+								c.moveTo(t.x, t.y);
+								i = 1
+							}
+							if (e > 0 && t.x > u && t.x < g) {
+								c.lineTo(t.x, r[e - 1].y);
+								c.lineTo(t.x, t.y)
+							}
+						}
+					}
+					c.moveTo(r[0].x, r[0].y)
+				}
+				c.stroke();
+				c.setLineDash([])
+			}
+		}
+		if (s.dataPointShape !== false) {
+			drawPointShape(n, e.color, e.pointShape, c, s)
+		}
+		drawActivePoint(n, e.color, e.pointShape, c, s, x, t)
+	});
+	if (s.dataLabel !== false && d === 1) {
+		t.forEach(function(t, e) {
+			let a, i, r;
+			a = [].concat(s.chartData.yAxisData.ranges[t.index]);
+			i = a.pop();
+			r = a.shift();
+			var o = t.data;
+			var n = getDataPoints(o, i, r, f, p, s, h, d);
+			drawPointText(n, t, h, c, s)
+		})
+	}
+	c.restore();
+	return {
+		xAxisPoints: f,
+		calPoints: v,
+		eachSpacing: p
+	}
+}
+
+function drawScatterDataPoints(t, s, h, c) {
+	var d = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	var i = assign({}, {
+		type: "circle"
+	}, s.extra.scatter);
+	let e = s.chartData.xAxisData,
+		x = e.xAxisPoints,
+		f = e.eachSpacing;
+	var r = [];
+	c.save();
+	let a = 0;
+	let o = s.width + f;
+	if (s._scrollDistance_ && s._scrollDistance_ !== 0 && s.enableScroll === true) {
+		c.translate(s._scrollDistance_, 0);
+		a = -s._scrollDistance_ - f * 2 + s.area[3];
+		o = a + (s.xAxis.itemCount + 4) * f
+	}
+	t.forEach(function(t, e) {
+		let a, i, r;
+		a = [].concat(s.chartData.yAxisData.ranges[t.index]);
+		i = a.pop();
+		r = a.shift();
+		var o = t.data;
+		var n = getDataPoints(o, i, r, x, f, s, h, d);
+		c.beginPath();
+		c.setStrokeStyle(t.color);
+		c.setFillStyle(t.color);
+		c.setLineWidth(1 * s.pix);
+		var l = t.pointShape;
+		if (l === "diamond") {
+			n.forEach(function(t, e) {
+				if (t !== null) {
+					c.moveTo(t.x, t.y - 4.5);
+					c.lineTo(t.x - 4.5, t.y);
+					c.lineTo(t.x, t.y + 4.5);
+					c.lineTo(t.x + 4.5, t.y);
+					c.lineTo(t.x, t.y - 4.5)
+				}
+			})
+		} else if (l === "circle") {
+			n.forEach(function(t, e) {
+				if (t !== null) {
+					c.moveTo(t.x + 2.5 * s.pix, t.y);
+					c.arc(t.x, t.y, 3 * s.pix, 0, 2 * Math.PI, false)
+				}
+			})
+		} else if (l === "square") {
+			n.forEach(function(t, e) {
+				if (t !== null) {
+					c.moveTo(t.x - 3.5, t.y - 3.5);
+					c.rect(t.x - 3.5, t.y - 3.5, 7, 7)
+				}
+			})
+		} else if (l === "triangle") {
+			n.forEach(function(t, e) {
+				if (t !== null) {
+					c.moveTo(t.x, t.y - 4.5);
+					c.lineTo(t.x - 4.5, t.y + 4.5);
+					c.lineTo(t.x + 4.5, t.y + 4.5);
+					c.lineTo(t.x, t.y - 4.5)
+				}
+			})
+		} else if (l === "triangle") {
+			return
+		}
+		c.closePath();
+		c.fill();
+		c.stroke()
+	});
+	if (s.dataLabel !== false && d === 1) {
+		t.forEach(function(t, e) {
+			let a, i, r;
+			a = [].concat(s.chartData.yAxisData.ranges[t.index]);
+			i = a.pop();
+			r = a.shift();
+			var o = t.data;
+			var n = getDataPoints(o, i, r, x, f, s, h, d);
+			drawPointText(n, t, h, c, s)
+		})
+	}
+	c.restore();
+	return {
+		xAxisPoints: x,
+		calPoints: r,
+		eachSpacing: f
+	}
+}
+
+function drawBubbleDataPoints(a, l, s, h) {
+	var c = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	var d = assign({}, {
+		opacity: 1,
+		border: 2
+	}, l.extra.bubble);
+	let t = l.chartData.xAxisData,
+		x = t.xAxisPoints,
+		f = t.eachSpacing;
+	var i = [];
+	h.save();
+	let e = 0;
+	let r = l.width + f;
+	if (l._scrollDistance_ && l._scrollDistance_ !== 0 && l.enableScroll === true) {
+		h.translate(l._scrollDistance_, 0);
+		e = -l._scrollDistance_ - f * 2 + l.area[3];
+		r = e + (l.xAxis.itemCount + 4) * f
+	}
+	a.forEach(function(i, t) {
+		let e, a, r;
+		e = [].concat(l.chartData.yAxisData.ranges[i.index]);
+		a = e.pop();
+		r = e.shift();
+		var o = i.data;
+		var n = getDataPoints(o, a, r, x, f, l, s, c);
+		h.beginPath();
+		h.setStrokeStyle(i.color);
+		h.setLineWidth(d.border * l.pix);
+		h.setFillStyle(hexToRgb(i.color, d.opacity));
+		n.forEach(function(t, e) {
+			h.moveTo(t.x + t.r, t.y);
+			h.arc(t.x, t.y, t.r * l.pix, 0, 2 * Math.PI, false)
+		});
+		h.closePath();
+		h.fill();
+		h.stroke();
+		if (l.dataLabel !== false && c === 1) {
+			n.forEach(function(t, e) {
+				h.beginPath();
+				var a = i.textSize * l.pix || s.fontSize;
+				h.setFontSize(a);
+				h.setFillStyle(i.textColor || "#FFFFFF");
+				h.setTextAlign("center");
+				h.fillText(String(t.t), t.x, t.y + a / 2);
+				h.closePath();
+				h.stroke();
+				h.setTextAlign("left")
+			})
+		}
+	});
+	h.restore();
+	return {
+		xAxisPoints: x,
+		calPoints: i,
+		eachSpacing: f
+	}
+}
+
+function drawLineDataPoints(t, d, x, f) {
+	var p = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	var u = assign({}, {
+		type: "straight",
+		width: 2,
+		activeType: "none",
+		linearType: "none",
+		onShadow: false,
+		animation: "vertical"
+	}, d.extra.line);
+	u.width *= d.pix;
+	let e = d.chartData.xAxisData,
+		g = e.xAxisPoints,
+		y = e.eachSpacing;
+	var T = [];
+	f.save();
+	let v = 0;
+	let m = d.width + y;
+	if (d._scrollDistance_ && d._scrollDistance_ !== 0 && d.enableScroll === true) {
+		f.translate(d._scrollDistance_, 0);
+		v = -d._scrollDistance_ - y * 2 + d.area[3];
+		m = v + (d.xAxis.itemCount + 4) * y
+	}
+	t.forEach(function(e, c) {
+		f.beginPath();
+		f.setStrokeStyle(e.color);
+		f.moveTo(-1e4, -1e4);
+		f.lineTo(-10001, -10001);
+		f.stroke();
+		let t, a, i;
+		t = [].concat(d.chartData.yAxisData.ranges[e.index]);
+		a = t.pop();
+		i = t.shift();
+		var r = e.data;
+		var o = getLineDataPoints(r, a, i, g, y, d, x, u, p);
+		T.push(o);
+		var n = splitPoints(o, e);
+		if (e.lineType == "dash") {
+			let t = e.dashLength ? e.dashLength : 8;
+			t *= d.pix;
+			f.setLineDash([t, t])
+		}
+		f.beginPath();
+		var l = e.color;
+		if (u.linearType !== "none" && e.linearColor && e.linearColor.length > 0) {
+			var s = f.createLinearGradient(d.chartData.xAxisData.startX, d.height / 2, d.chartData.xAxisData.endX, d
+				.height / 2);
+			for (var h = 0; h < e.linearColor.length; h++) {
+				s.addColorStop(e.linearColor[h][0], hexToRgb(e.linearColor[h][1], 1))
+			}
+			l = s
+		}
+		f.setStrokeStyle(l);
+		if (u.onShadow == true && e.setShadow && e.setShadow.length > 0) {
+			f.setShadow(e.setShadow[0], e.setShadow[1], e.setShadow[2], e.setShadow[3])
+		} else {
+			f.setShadow(0, 0, 0, "rgba(0,0,0,0)")
+		}
+		f.setLineWidth(u.width);
+		n.forEach(function(i, t) {
+			if (i.length === 1) {
+				f.moveTo(i[0].x, i[0].y)
+			} else {
+				f.moveTo(i[0].x, i[0].y);
+				let a = 0;
+				if (u.type === "curve") {
+					for (let e = 0; e < i.length; e++) {
+						let t = i[e];
+						if (a == 0 && t.x > v) {
+							f.moveTo(t.x, t.y);
+							a = 1
+						}
+						if (e > 0 && t.x > v && t.x < m) {
+							var r = createCurveControlPoints(i, e - 1);
+							f.bezierCurveTo(r.ctrA.x, r.ctrA.y, r.ctrB.x, r.ctrB.y, t.x, t.y)
+						}
+					}
+				}
+				if (u.type === "straight") {
+					for (let e = 0; e < i.length; e++) {
+						let t = i[e];
+						if (a == 0 && t.x > v) {
+							f.moveTo(t.x, t.y);
+							a = 1
+						}
+						if (e > 0 && t.x > v && t.x < m) {
+							f.lineTo(t.x, t.y)
+						}
+					}
+				}
+				if (u.type === "step") {
+					for (let e = 0; e < i.length; e++) {
+						let t = i[e];
+						if (a == 0 && t.x > v) {
+							f.moveTo(t.x, t.y);
+							a = 1
+						}
+						if (e > 0 && t.x > v && t.x < m) {
+							f.lineTo(t.x, i[e - 1].y);
+							f.lineTo(t.x, t.y)
+						}
+					}
+				}
+				f.moveTo(i[0].x, i[0].y)
+			}
+		});
+		f.stroke();
+		f.setLineDash([]);
+		if (d.dataPointShape !== false) {
+			drawPointShape(o, e.color, e.pointShape, f, d)
+		}
+		drawActivePoint(o, e.color, e.pointShape, f, d, u)
+	});
+	if (d.dataLabel !== false && p === 1) {
+		t.forEach(function(t, e) {
+			let a, i, r;
+			a = [].concat(d.chartData.yAxisData.ranges[t.index]);
+			i = a.pop();
+			r = a.shift();
+			var o = t.data;
+			var n = getDataPoints(o, i, r, g, y, d, x, p);
+			drawPointText(n, t, x, f, d)
+		})
+	}
+	f.restore();
+	return {
+		xAxisPoints: g,
+		calPoints: T,
+		eachSpacing: y
+	}
+}
+
+function drawMixDataPoints(t, v, m, T) {
+	let D = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	let e = v.chartData.xAxisData,
+		b = e.xAxisPoints,
+		S = e.eachSpacing;
+	let w = assign({}, {
+		width: S / 2,
+		barBorderCircle: false,
+		barBorderRadius: [],
+		seriesGap: 2,
+		linearType: "none",
+		linearOpacity: 1,
+		customColor: [],
+		colorStop: 0
+	}, v.extra.mix.column);
+	let A = assign({}, {
+		opacity: .2,
+		gradient: false
+	}, v.extra.mix.area);
+	let M = assign({}, {
+		width: 2
+	}, v.extra.mix.line);
+	let L = v.height - v.area[2];
+	let F = [];
+	var _ = 0;
+	var k = 0;
+	t.forEach(function(t, e) {
+		if (t.type == "column") {
+			k += 1
+		}
+	});
+	T.save();
+	let R = -2;
+	let I = b.length + 2;
+	let P = 0;
+	let C = v.width + S;
+	if (v._scrollDistance_ && v._scrollDistance_ !== 0 && v.enableScroll === true) {
+		T.translate(v._scrollDistance_, 0);
+		R = Math.floor(-v._scrollDistance_ / S) - 2;
+		I = R + v.xAxis.itemCount + 4;
+		P = -v._scrollDistance_ - S * 2 + v.area[3];
+		C = P + (v.xAxis.itemCount + 4) * S
+	}
+	w.customColor = fillCustomColor(w.linearType, w.customColor, t, m);
+	t.forEach(function(n, t) {
+		let o, x, f;
+		o = [].concat(v.chartData.yAxisData.ranges[n.index]);
+		x = o.pop();
+		f = o.shift();
+		var p = n.data;
+		var a = getDataPoints(p, x, f, b, S, v, m, D);
+		F.push(a);
+		if (n.type == "column") {
+			a = fixColumeData(a, S, k, _, m, v);
+			for (let t = 0; t < a.length; t++) {
+				let o = a[t];
+				if (o !== null && t > R && t < I) {
+					var l = o.x - o.width / 2;
+					var s = v.height - o.y - v.area[2];
+					T.beginPath();
+					var e = o.color || n.color;
+					var u = o.color || n.color;
+					if (w.linearType !== "none") {
+						var i = T.createLinearGradient(l, o.y, l, v.height - v.area[2]);
+						if (w.linearType == "opacity") {
+							i.addColorStop(0, hexToRgb(e, w.linearOpacity));
+							i.addColorStop(1, hexToRgb(e, 1))
+						} else {
+							i.addColorStop(0, hexToRgb(w.customColor[n.linearIndex], w.linearOpacity));
+							i.addColorStop(w.colorStop, hexToRgb(w.customColor[n.linearIndex], w.linearOpacity));
+							i.addColorStop(1, hexToRgb(e, 1))
+						}
+						e = i
+					}
+					if (w.barBorderRadius && w.barBorderRadius.length === 4 || w.barBorderCircle) {
+						const h = l;
+						const c = o.y;
+						const d = o.width;
+						const s = v.height - v.area[2] - o.y;
+						if (w.barBorderCircle) {
+							w.barBorderRadius = [d / 2, d / 2, 0, 0]
+						}
+						let [t, e, a, i] = w.barBorderRadius;
+						let r = Math.min(d / 2, s / 2);
+						t = t > r ? r : t;
+						e = e > r ? r : e;
+						a = a > r ? r : a;
+						i = i > r ? r : i;
+						t = t < 0 ? 0 : t;
+						e = e < 0 ? 0 : e;
+						a = a < 0 ? 0 : a;
+						i = i < 0 ? 0 : i;
+						T.arc(h + t, c + t, t, -Math.PI, -Math.PI / 2);
+						T.arc(h + d - e, c + e, e, -Math.PI / 2, 0);
+						T.arc(h + d - a, c + s - a, a, 0, Math.PI / 2);
+						T.arc(h + i, c + s - i, i, Math.PI / 2, Math.PI)
+					} else {
+						T.moveTo(l, o.y);
+						T.lineTo(l + o.width, o.y);
+						T.lineTo(l + o.width, v.height - v.area[2]);
+						T.lineTo(l, v.height - v.area[2]);
+						T.lineTo(l, o.y);
+						T.setLineWidth(1);
+						T.setStrokeStyle(u)
+					}
+					T.setFillStyle(e);
+					T.closePath();
+					T.fill()
+				}
+			}
+			_ += 1
+		}
+		if (n.type == "area") {
+			let e = splitPoints(a, n);
+			for (let t = 0; t < e.length; t++) {
+				let i = e[t];
+				T.beginPath();
+				T.setStrokeStyle(n.color);
+				T.setStrokeStyle(hexToRgb(n.color, A.opacity));
+				if (A.gradient) {
+					let t = T.createLinearGradient(0, v.area[0], 0, v.height - v.area[2]);
+					t.addColorStop("0", hexToRgb(n.color, A.opacity));
+					t.addColorStop("1.0", hexToRgb("#FFFFFF", .1));
+					T.setFillStyle(t)
+				} else {
+					T.setFillStyle(hexToRgb(n.color, A.opacity))
+				}
+				T.setLineWidth(2 * v.pix);
+				if (i.length > 1) {
+					var r = i[0];
+					let t = i[i.length - 1];
+					T.moveTo(r.x, r.y);
+					let a = 0;
+					if (n.style === "curve") {
+						for (let e = 0; e < i.length; e++) {
+							let t = i[e];
+							if (a == 0 && t.x > P) {
+								T.moveTo(t.x, t.y);
+								a = 1
+							}
+							if (e > 0 && t.x > P && t.x < C) {
+								var g = createCurveControlPoints(i, e - 1);
+								T.bezierCurveTo(g.ctrA.x, g.ctrA.y, g.ctrB.x, g.ctrB.y, t.x, t.y)
+							}
+						}
+					} else {
+						for (let e = 0; e < i.length; e++) {
+							let t = i[e];
+							if (a == 0 && t.x > P) {
+								T.moveTo(t.x, t.y);
+								a = 1
+							}
+							if (e > 0 && t.x > P && t.x < C) {
+								T.lineTo(t.x, t.y)
+							}
+						}
+					}
+					T.lineTo(t.x, L);
+					T.lineTo(r.x, L);
+					T.lineTo(r.x, r.y)
+				} else {
+					let t = i[0];
+					T.moveTo(t.x - S / 2, t.y)
+				}
+				T.closePath();
+				T.fill()
+			}
+		}
+		if (n.type == "line") {
+			var y = splitPoints(a, n);
+			y.forEach(function(i, t) {
+				if (n.lineType == "dash") {
+					let t = n.dashLength ? n.dashLength : 8;
+					t *= v.pix;
+					T.setLineDash([t, t])
+				}
+				T.beginPath();
+				T.setStrokeStyle(n.color);
+				T.setLineWidth(M.width * v.pix);
+				if (i.length === 1) {
+					T.moveTo(i[0].x, i[0].y)
+				} else {
+					T.moveTo(i[0].x, i[0].y);
+					let a = 0;
+					if (n.style == "curve") {
+						for (let e = 0; e < i.length; e++) {
+							let t = i[e];
+							if (a == 0 && t.x > P) {
+								T.moveTo(t.x, t.y);
+								a = 1
+							}
+							if (e > 0 && t.x > P && t.x < C) {
+								var r = createCurveControlPoints(i, e - 1);
+								T.bezierCurveTo(r.ctrA.x, r.ctrA.y, r.ctrB.x, r.ctrB.y, t.x, t.y)
+							}
+						}
+					} else {
+						for (let e = 0; e < i.length; e++) {
+							let t = i[e];
+							if (a == 0 && t.x > P) {
+								T.moveTo(t.x, t.y);
+								a = 1
+							}
+							if (e > 0 && t.x > P && t.x < C) {
+								T.lineTo(t.x, t.y)
+							}
+						}
+					}
+					T.moveTo(i[0].x, i[0].y)
+				}
+				T.stroke();
+				T.setLineDash([])
+			})
+		}
+		if (n.type == "point") {
+			n.addPoint = true
+		}
+		if (n.addPoint == true && n.type !== "column") {
+			drawPointShape(a, n.color, n.pointShape, T, v)
+		}
+	});
+	if (v.dataLabel !== false && D === 1) {
+		var _ = 0;
+		t.forEach(function(t, e) {
+			let a, i, r;
+			a = [].concat(v.chartData.yAxisData.ranges[t.index]);
+			i = a.pop();
+			r = a.shift();
+			var o = t.data;
+			var n = getDataPoints(o, i, r, b, S, v, m, D);
+			if (t.type !== "column") {
+				drawPointText(n, t, m, T, v)
+			} else {
+				n = fixColumeData(n, S, k, _, m, v);
+				drawPointText(n, t, m, T, v);
+				_ += 1
+			}
+		})
+	}
+	T.restore();
+	return {
+		xAxisPoints: b,
+		calPoints: F,
+		eachSpacing: S
+	}
+}
+
+function drawToolTipBridge(t, e, a, i, r, o) {
+	var n = t.extra.tooltip || {};
+	if (n.horizentalLine && t.tooltip && i === 1 && (t.type == "line" || t.type == "area" || t.type == "column" || t
+			.type == "mount" || t.type == "candle" || t.type == "mix")) {
+		drawToolTipHorizentalLine(t, e, a, r, o)
+	}
+	a.save();
+	if (t._scrollDistance_ && t._scrollDistance_ !== 0 && t.enableScroll === true) {
+		a.translate(t._scrollDistance_, 0)
+	}
+	if (t.tooltip && t.tooltip.textList && t.tooltip.textList.length && i === 1) {
+		drawToolTip(t.tooltip.textList, t.tooltip.offset, t, e, a, r, o)
+	}
+	a.restore()
+}
+
+function drawXAxis(r, h, c, d) {
+	let e = h.chartData.xAxisData,
+		x = e.xAxisPoints,
+		t = e.startX,
+		a = e.endX,
+		f = e.eachSpacing;
+	var p = "center";
+	if (h.type == "bar" || h.type == "line" || h.type == "area" || h.type == "scatter" || h.type == "bubble") {
+		p = h.xAxis.boundaryGap
+	}
+	var u = h.height - h.area[2];
+	var i = h.area[0];
+	if (h.enableScroll && h.xAxis.scrollShow) {
+		var o = h.height - h.area[2] + c.xAxisHeight;
+		var n = a - t;
+		var l = f * (x.length - 1);
+		if (h.type == "mount" && h.extra && h.extra.mount && h.extra.mount.widthRatio && h.extra.mount.widthRatio > 1) {
+			if (h.extra.mount.widthRatio > 2) h.extra.mount.widthRatio = 2;
+			l += (h.extra.mount.widthRatio - 1) * f
+		}
+		var s = n * n / l;
+		var y = 0;
+		if (h._scrollDistance_) {
+			y = -h._scrollDistance_ * n / l
+		}
+		d.beginPath();
+		d.setLineCap("round");
+		d.setLineWidth(6 * h.pix);
+		d.setStrokeStyle(h.xAxis.scrollBackgroundColor || "#EFEBEF");
+		d.moveTo(t, o);
+		d.lineTo(a, o);
+		d.stroke();
+		d.closePath();
+		d.beginPath();
+		d.setLineCap("round");
+		d.setLineWidth(6 * h.pix);
+		d.setStrokeStyle(h.xAxis.scrollColor || "#A6A6A6");
+		d.moveTo(t + y, o);
+		d.lineTo(t + y + s, o);
+		d.stroke();
+		d.closePath();
+		d.setLineCap("butt")
+	}
+	d.save();
+	if (h._scrollDistance_ && h._scrollDistance_ !== 0) {
+		d.translate(h._scrollDistance_, 0)
+	}
+	if (h.xAxis.calibration === true) {
+		d.setStrokeStyle(h.xAxis.gridColor || "#cccccc");
+		d.setLineCap("butt");
+		d.setLineWidth(1 * h.pix);
+		x.forEach(function(t, e) {
+			if (e > 0) {
+				d.beginPath();
+				d.moveTo(t - f / 2, u);
+				d.lineTo(t - f / 2, u + 3 * h.pix);
+				d.closePath();
+				d.stroke()
+			}
+		})
+	}
+	if (h.xAxis.disableGrid !== true) {
+		d.setStrokeStyle(h.xAxis.gridColor || "#cccccc");
+		d.setLineCap("butt");
+		d.setLineWidth(1 * h.pix);
+		if (h.xAxis.gridType == "dash") {
+			d.setLineDash([h.xAxis.dashLength * h.pix, h.xAxis.dashLength * h.pix])
+		}
+		h.xAxis.gridEval = h.xAxis.gridEval || 1;
+		x.forEach(function(t, e) {
+			if (e % h.xAxis.gridEval == 0) {
+				d.beginPath();
+				d.moveTo(t, u);
+				d.lineTo(t, i);
+				d.stroke()
+			}
+		});
+		d.setLineDash([])
+	}
+	if (h.xAxis.disabled !== true) {
+		let t = r.length;
+		if (h.xAxis.labelCount) {
+			if (h.xAxis.itemCount) {
+				t = Math.ceil(r.length / h.xAxis.itemCount * h.xAxis.labelCount)
+			} else {
+				t = h.xAxis.labelCount
+			}
+			t -= 1
+		}
+		let e = Math.ceil(r.length / t);
+		let a = [];
+		let i = r.length;
+		for (let t = 0; t < i; t++) {
+			if (t % e !== 0) {
+				a.push("")
+			} else {
+				a.push(r[t])
+			}
+		}
+		a[i - 1] = r[i - 1];
+		var g = h.xAxis.fontSize * h.pix || c.fontSize;
+		if (c._xAxisTextAngle_ === 0) {
+			a.forEach(function(t, e) {
+				var a = h.xAxis.formatter ? h.xAxis.formatter(t, e, h) : t;
+				var i = -measureText(String(a), g, d) / 2;
+				if (p == "center") {
+					i += f / 2
+				}
+				var r = 0;
+				if (h.xAxis.scrollShow) {
+					r = 6 * h.pix
+				}
+				var o = h._scrollDistance_ || 0;
+				var n = p == "center" ? x[e] + f / 2 : x[e];
+				if (n - Math.abs(o) >= h.area[3] - 1 && n - Math.abs(o) <= h.width - h.area[1] + 1) {
+					d.beginPath();
+					d.setFontSize(g);
+					d.setFillStyle(h.xAxis.fontColor || h.fontColor);
+					d.fillText(String(a), x[e] + i, u + h.xAxis.marginTop * h.pix + (h.xAxis.lineHeight - h.xAxis.fontSize) *
+						h.pix / 2 + h.xAxis.fontSize * h.pix);
+					d.closePath();
+					d.stroke()
+				}
+			})
+		} else {
+			a.forEach(function(t, e) {
+				var a = h.xAxis.formatter ? h.xAxis.formatter(t) : t;
+				var i = h._scrollDistance_ || 0;
+				var r = p == "center" ? x[e] + f / 2 : x[e];
+				if (r - Math.abs(i) >= h.area[3] - 1 && r - Math.abs(i) <= h.width - h.area[1] + 1) {
+					d.save();
+					d.beginPath();
+					d.setFontSize(g);
+					d.setFillStyle(h.xAxis.fontColor || h.fontColor);
+					var o = measureText(String(a), g, d);
+					var n = x[e];
+					if (p == "center") {
+						n = x[e] + f / 2
+					}
+					var l = 0;
+					if (h.xAxis.scrollShow) {
+						l = 6 * h.pix
+					}
+					var s = u + h.xAxis.marginTop * h.pix + g - g * Math.abs(Math.sin(c._xAxisTextAngle_));
+					if (h.xAxis.rotateAngle < 0) {
+						n -= g / 2;
+						o = 0
+					} else {
+						n += g / 2;
+						o = -o
+					}
+					d.translate(n, s);
+					d.rotate(-1 * c._xAxisTextAngle_);
+					d.fillText(String(a), o, 0);
+					d.closePath();
+					d.stroke();
+					d.restore()
+				}
+			})
+		}
+	}
+	d.restore();
+	if (h.xAxis.title) {
+		d.beginPath();
+		d.setFontSize(h.xAxis.titleFontSize * h.pix);
+		d.setFillStyle(h.xAxis.titleFontColor);
+		d.fillText(String(h.xAxis.title), h.width - h.area[1] + h.xAxis.titleOffsetX * h.pix, h.height - h.area[2] + h.xAxis
+			.marginTop * h.pix + (h.xAxis.lineHeight - h.xAxis.titleFontSize) * h.pix / 2 + (h.xAxis.titleFontSize + h.xAxis
+				.titleOffsetY) * h.pix);
+		d.closePath();
+		d.stroke()
+	}
+	if (h.xAxis.axisLine) {
+		d.beginPath();
+		d.setStrokeStyle(h.xAxis.axisLineColor);
+		d.setLineWidth(1 * h.pix);
+		d.moveTo(t, h.height - h.area[2]);
+		d.lineTo(a, h.height - h.area[2]);
+		d.stroke()
+	}
+}
+
+function drawYAxisGrid(c, e, d, a) {
+	if (e.yAxis.disableGrid === true) {
+		return
+	}
+	let t = e.height - e.area[0] - e.area[2];
+	let i = t / e.yAxis.splitNumber;
+	let r = e.area[3];
+	let o = e.chartData.xAxisData.xAxisPoints,
+		n = e.chartData.xAxisData.eachSpacing;
+	let l = n * (o.length - 1);
+	if (e.type == "mount" && e.extra && e.extra.mount && e.extra.mount.widthRatio && e.extra.mount.widthRatio > 1) {
+		if (e.extra.mount.widthRatio > 2) e.extra.mount.widthRatio = 2;
+		l += (e.extra.mount.widthRatio - 1) * n
+	}
+	let x = r + l;
+	let s = [];
+	let h = 1;
+	if (e.xAxis.axisLine === false) {
+		h = 0
+	}
+	for (let t = h; t < e.yAxis.splitNumber + 1; t++) {
+		s.push(e.height - e.area[2] - i * t)
+	}
+	a.save();
+	if (e._scrollDistance_ && e._scrollDistance_ !== 0) {
+		a.translate(e._scrollDistance_, 0)
+	}
+	if (e.yAxis.gridType == "dash") {
+		a.setLineDash([e.yAxis.dashLength * e.pix, e.yAxis.dashLength * e.pix])
+	}
+	a.setStrokeStyle(e.yAxis.gridColor);
+	a.setLineWidth(1 * e.pix);
+	s.forEach(function(t, e) {
+		a.beginPath();
+		a.moveTo(r, t);
+		a.lineTo(x, t);
+		a.stroke()
+	});
+	a.setLineDash([]);
+	a.restore()
+}
+
+function drawYAxis(e, h, a, c) {
+	if (h.yAxis.disabled === true) {
+		return
+	}
+	var i = h.height - h.area[0] - h.area[2];
+	var r = i / h.yAxis.splitNumber;
+	var o = h.area[3];
+	var n = h.width - h.area[1];
+	var t = h.height - h.area[2];
+	c.beginPath();
+	c.setFillStyle(h.background);
+	if (h.enableScroll == true && h.xAxis.scrollPosition && h.xAxis.scrollPosition !== "left") {
+		c.fillRect(0, 0, o, t + 2 * h.pix)
+	}
+	if (h.enableScroll == true && h.xAxis.scrollPosition && h.xAxis.scrollPosition !== "right") {
+		c.fillRect(n, 0, h.width, t + 2 * h.pix)
+	}
+	c.closePath();
+	c.stroke();
+	let d = h.area[3];
+	let x = h.width - h.area[1];
+	let f = h.area[3] + (h.width - h.area[1] - h.area[3]) / 2;
+	if (h.yAxis.data) {
+		for (let e = 0; e < h.yAxis.data.length; e++) {
+			let s = h.yAxis.data[e];
+			var p = [];
+			if (s.type === "categories") {
+				for (let t = 0; t <= s.categories.length; t++) {
+					p.push(h.area[0] + i / s.categories.length / 2 + i / s.categories.length * t)
+				}
+			} else {
+				for (let t = 0; t <= h.yAxis.splitNumber; t++) {
+					p.push(h.area[0] + r * t)
+				}
+			}
+			if (s.disabled !== true) {
+				let t = h.chartData.yAxisData.rangesFormat[e];
+				let o = s.fontSize ? s.fontSize * h.pix : a.fontSize;
+				let n = h.chartData.yAxisData.yAxisWidth[e];
+				let l = s.textAlign || "right";
+				t.forEach(function(t, e) {
+					var a = p[e];
+					c.beginPath();
+					c.setFontSize(o);
+					c.setLineWidth(1 * h.pix);
+					c.setStrokeStyle(s.axisLineColor || "#cccccc");
+					c.setFillStyle(s.fontColor || h.fontColor);
+					let i = 0;
+					let r = 4 * h.pix;
+					if (n.position == "left") {
+						if (s.calibration == true) {
+							c.moveTo(d, a);
+							c.lineTo(d - 3 * h.pix, a);
+							r += 3 * h.pix
+						}
+						switch (l) {
+							case "left":
+								c.setTextAlign("left");
+								i = d - n.width;
+								break;
+							case "right":
+								c.setTextAlign("right");
+								i = d - r;
+								break;
+							default:
+								c.setTextAlign("center");
+								i = d - n.width / 2
+						}
+						c.fillText(String(t), i, a + o / 2 - 3 * h.pix)
+					} else if (n.position == "right") {
+						if (s.calibration == true) {
+							c.moveTo(x, a);
+							c.lineTo(x + 3 * h.pix, a);
+							r += 3 * h.pix
+						}
+						switch (l) {
+							case "left":
+								c.setTextAlign("left");
+								i = x + r;
+								break;
+							case "right":
+								c.setTextAlign("right");
+								i = x + n.width;
+								break;
+							default:
+								c.setTextAlign("center");
+								i = x + n.width / 2
+						}
+						c.fillText(String(t), i, a + o / 2 - 3 * h.pix)
+					} else if (n.position == "center") {
+						if (s.calibration == true) {
+							c.moveTo(f, a);
+							c.lineTo(f - 3 * h.pix, a);
+							r += 3 * h.pix
+						}
+						switch (l) {
+							case "left":
+								c.setTextAlign("left");
+								i = f - n.width;
+								break;
+							case "right":
+								c.setTextAlign("right");
+								i = f - r;
+								break;
+							default:
+								c.setTextAlign("center");
+								i = f - n.width / 2
+						}
+						c.fillText(String(t), i, a + o / 2 - 3 * h.pix)
+					}
+					c.closePath();
+					c.stroke();
+					c.setTextAlign("left")
+				});
+				if (s.axisLine !== false) {
+					c.beginPath();
+					c.setStrokeStyle(s.axisLineColor || "#cccccc");
+					c.setLineWidth(1 * h.pix);
+					if (n.position == "left") {
+						c.moveTo(d, h.height - h.area[2]);
+						c.lineTo(d, h.area[0])
+					} else if (n.position == "right") {
+						c.moveTo(x, h.height - h.area[2]);
+						c.lineTo(x, h.area[0])
+					} else if (n.position == "center") {
+						c.moveTo(f, h.height - h.area[2]);
+						c.lineTo(f, h.area[0])
+					}
+					c.stroke()
+				}
+				if (h.yAxis.showTitle) {
+					let t = s.titleFontSize * h.pix || a.fontSize;
+					let e = s.title;
+					c.beginPath();
+					c.setFontSize(t);
+					c.setFillStyle(s.titleFontColor || h.fontColor);
+					if (n.position == "left") {
+						c.fillText(e, d - measureText(e, t, c) / 2 + (s.titleOffsetX || 0), h.area[0] - (10 - (s.titleOffsetY ||
+							0)) * h.pix)
+					} else if (n.position == "right") {
+						c.fillText(e, x - measureText(e, t, c) / 2 + (s.titleOffsetX || 0), h.area[0] - (10 - (s.titleOffsetY ||
+							0)) * h.pix)
+					} else if (n.position == "center") {
+						c.fillText(e, f - measureText(e, t, c) / 2 + (s.titleOffsetX || 0), h.area[0] - (10 - (s.titleOffsetY ||
+							0)) * h.pix)
+					}
+					c.closePath();
+					c.stroke()
+				}
+				if (n.position == "left") {
+					d -= n.width + h.yAxis.padding * h.pix
+				} else {
+					x += n.width + h.yAxis.padding * h.pix
+				}
+			}
+		}
+	}
+}
+
+function drawLegend(t, l, y, s, e) {
+	if (l.legend.show === false) {
+		return
+	}
+	let h = e.legendData;
+	let a = h.points;
+	let c = h.area;
+	let d = l.legend.padding * l.pix;
+	let x = l.legend.fontSize * l.pix;
+	let f = 15 * l.pix;
+	let p = 5 * l.pix;
+	let u = l.legend.itemGap * l.pix;
+	let g = Math.max(l.legend.lineHeight * l.pix, x);
+	s.beginPath();
+	s.setLineWidth(l.legend.borderWidth * l.pix);
+	s.setStrokeStyle(l.legend.borderColor);
+	s.setFillStyle(l.legend.backgroundColor);
+	s.moveTo(c.start.x, c.start.y);
+	s.rect(c.start.x, c.start.y, c.width, c.height);
+	s.closePath();
+	s.fill();
+	s.stroke();
+	a.forEach(function(i, t) {
+		let e = 0;
+		let a = 0;
+		e = h.widthArr[t];
+		a = h.heightArr[t];
+		let r = 0;
+		let o = 0;
+		if (l.legend.position == "top" || l.legend.position == "bottom") {
+			switch (l.legend.float) {
+				case "left":
+					r = c.start.x + d;
+					break;
+				case "right":
+					r = c.start.x + c.width - e;
+					break;
+				default:
+					r = c.start.x + (c.width - e) / 2
+			}
+			o = c.start.y + d + t * g
+		} else {
+			if (t == 0) {
+				e = 0
+			} else {
+				e = h.widthArr[t - 1]
+			}
+			r = c.start.x + d + e;
+			o = c.start.y + d + (c.height - a) / 2
+		}
+		s.setFontSize(y.fontSize);
+		for (let a = 0; a < i.length; a++) {
+			let t = i[a];
+			t.area = [0, 0, 0, 0];
+			t.area[0] = r;
+			t.area[1] = o;
+			t.area[3] = o + g;
+			s.beginPath();
+			s.setLineWidth(1 * l.pix);
+			s.setStrokeStyle(t.show ? t.color : l.legend.hiddenColor);
+			s.setFillStyle(t.show ? t.color : l.legend.hiddenColor);
+			switch (t.legendShape) {
+				case "line":
+					s.moveTo(r, o + .5 * g - 2 * l.pix);
+					s.fillRect(r, o + .5 * g - 2 * l.pix, 15 * l.pix, 4 * l.pix);
+					break;
+				case "triangle":
+					s.moveTo(r + 7.5 * l.pix, o + .5 * g - 5 * l.pix);
+					s.lineTo(r + 2.5 * l.pix, o + .5 * g + 5 * l.pix);
+					s.lineTo(r + 12.5 * l.pix, o + .5 * g + 5 * l.pix);
+					s.lineTo(r + 7.5 * l.pix, o + .5 * g - 5 * l.pix);
+					break;
+				case "diamond":
+					s.moveTo(r + 7.5 * l.pix, o + .5 * g - 5 * l.pix);
+					s.lineTo(r + 2.5 * l.pix, o + .5 * g);
+					s.lineTo(r + 7.5 * l.pix, o + .5 * g + 5 * l.pix);
+					s.lineTo(r + 12.5 * l.pix, o + .5 * g);
+					s.lineTo(r + 7.5 * l.pix, o + .5 * g - 5 * l.pix);
+					break;
+				case "circle":
+					s.moveTo(r + 7.5 * l.pix, o + .5 * g);
+					s.arc(r + 7.5 * l.pix, o + .5 * g, 5 * l.pix, 0, 2 * Math.PI);
+					break;
+				case "rect":
+					s.moveTo(r, o + .5 * g - 5 * l.pix);
+					s.fillRect(r, o + .5 * g - 5 * l.pix, 15 * l.pix, 10 * l.pix);
+					break;
+				case "square":
+					s.moveTo(r + 5 * l.pix, o + .5 * g - 5 * l.pix);
+					s.fillRect(r + 5 * l.pix, o + .5 * g - 5 * l.pix, 10 * l.pix, 10 * l.pix);
+					break;
+				case "none":
+					break;
+				default:
+					s.moveTo(r, o + .5 * g - 5 * l.pix);
+					s.fillRect(r, o + .5 * g - 5 * l.pix, 15 * l.pix, 10 * l.pix)
+			}
+			s.closePath();
+			s.fill();
+			s.stroke();
+			r += f + p;
+			let e = .5 * g + .5 * x - 2;
+			const n = t.legendText ? t.legendText : t.name;
+			s.beginPath();
+			s.setFontSize(x);
+			s.setFillStyle(t.show ? l.legend.fontColor : l.legend.hiddenColor);
+			s.fillText(n, r, o + e);
+			s.closePath();
+			s.stroke();
+			if (l.legend.position == "top" || l.legend.position == "bottom") {
+				r += measureText(n, x, s) + u;
+				t.area[2] = r
+			} else {
+				t.area[2] = r + measureText(n, x, s) + u;
+				r -= f + p;
+				o += g
+			}
+		}
+	})
+}
+
+function drawPieDataPoints(t, r, e, o) {
+	var a = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	var n = assign({}, {
+		activeOpacity: .5,
+		activeRadius: 10,
+		offsetAngle: 0,
+		labelWidth: 15,
+		ringWidth: 30,
+		customRadius: 0,
+		border: false,
+		borderWidth: 2,
+		borderColor: "#FFFFFF",
+		centerColor: "#FFFFFF",
+		linearType: "none",
+		customColor: []
+	}, r.type == "pie" ? r.extra.pie : r.extra.ring);
+	var l = {
+		x: r.area[3] + (r.width - r.area[1] - r.area[3]) / 2,
+		y: r.area[0] + (r.height - r.area[0] - r.area[2]) / 2
+	};
+	if (e.pieChartLinePadding == 0) {
+		e.pieChartLinePadding = n.activeRadius * r.pix
+	}
+	var i = Math.min((r.width - r.area[1] - r.area[3]) / 2 - e.pieChartLinePadding - e.pieChartTextPadding - e
+		._pieTextMaxLength_, (r.height - r.area[0] - r.area[2]) / 2 - e.pieChartLinePadding - e.pieChartTextPadding);
+	i = i < 10 ? 10 : i;
+	if (n.customRadius > 0) {
+		i = n.customRadius * r.pix
+	}
+	t = getPieDataPoints(t, i, a);
+	var h = n.activeRadius * r.pix;
+	n.customColor = fillCustomColor(n.linearType, n.customColor, t, e);
+	t = t.map(function(t) {
+		t._start_ += n.offsetAngle * Math.PI / 180;
+		return t
+	});
+	t.forEach(function(t, e) {
+		if (r.tooltip) {
+			if (r.tooltip.index == e) {
+				o.beginPath();
+				o.setFillStyle(hexToRgb(t.color, n.activeOpacity || .5));
+				o.moveTo(l.x, l.y);
+				o.arc(l.x, l.y, t._radius_ + h, t._start_, t._start_ + 2 * t._proportion_ * Math.PI);
+				o.closePath();
+				o.fill()
+			}
+		}
+		o.beginPath();
+		o.setLineWidth(n.borderWidth * r.pix);
+		o.lineJoin = "round";
+		o.setStrokeStyle(n.borderColor);
+		var a = t.color;
+		if (n.linearType == "custom") {
+			var i;
+			if (o.createCircularGradient) {
+				i = o.createCircularGradient(l.x, l.y, t._radius_)
+			} else {
+				i = o.createRadialGradient(l.x, l.y, 0, l.x, l.y, t._radius_)
+			}
+			i.addColorStop(0, hexToRgb(n.customColor[t.linearIndex], 1));
+			i.addColorStop(1, hexToRgb(t.color, 1));
+			a = i
+		}
+		o.setFillStyle(a);
+		o.moveTo(l.x, l.y);
+		o.arc(l.x, l.y, t._radius_, t._start_, t._start_ + 2 * t._proportion_ * Math.PI);
+		o.closePath();
+		o.fill();
+		if (n.border == true) {
+			o.stroke()
+		}
+	});
+	if (r.type === "ring") {
+		var s = i * .6;
+		if (typeof n.ringWidth === "number" && n.ringWidth > 0) {
+			s = Math.max(0, i - n.ringWidth * r.pix)
+		}
+		o.beginPath();
+		o.setFillStyle(n.centerColor);
+		o.moveTo(l.x, l.y);
+		o.arc(l.x, l.y, s, 0, 2 * Math.PI);
+		o.closePath();
+		o.fill()
+	}
+	if (r.dataLabel !== false && a === 1) {
+		drawPieText(t, r, e, o, i, l)
+	}
+	if (a === 1 && r.type === "ring") {
+		drawRingTitle(r, e, o, l)
+	}
+	return {
+		center: l,
+		radius: i,
+		series: t
+	}
+}
+
+function drawRoseDataPoints(t, r, e, o) {
+	var a = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	var n = assign({}, {
+		type: "area",
+		activeOpacity: .5,
+		activeRadius: 10,
+		offsetAngle: 0,
+		labelWidth: 15,
+		border: false,
+		borderWidth: 2,
+		borderColor: "#FFFFFF",
+		linearType: "none",
+		customColor: []
+	}, r.extra.rose);
+	if (e.pieChartLinePadding == 0) {
+		e.pieChartLinePadding = n.activeRadius * r.pix
+	}
+	var l = {
+		x: r.area[3] + (r.width - r.area[1] - r.area[3]) / 2,
+		y: r.area[0] + (r.height - r.area[0] - r.area[2]) / 2
+	};
+	var i = Math.min((r.width - r.area[1] - r.area[3]) / 2 - e.pieChartLinePadding - e.pieChartTextPadding - e
+		._pieTextMaxLength_, (r.height - r.area[0] - r.area[2]) / 2 - e.pieChartLinePadding - e.pieChartTextPadding);
+	i = i < 10 ? 10 : i;
+	var s = n.minRadius || i * .5;
+	if (i < s) {
+		i = s + 10
+	}
+	t = getRoseDataPoints(t, n.type, s, i, a);
+	var h = n.activeRadius * r.pix;
+	n.customColor = fillCustomColor(n.linearType, n.customColor, t, e);
+	t = t.map(function(t) {
+		t._start_ += (n.offsetAngle || 0) * Math.PI / 180;
+		return t
+	});
+	t.forEach(function(t, e) {
+		if (r.tooltip) {
+			if (r.tooltip.index == e) {
+				o.beginPath();
+				o.setFillStyle(hexToRgb(t.color, n.activeOpacity || .5));
+				o.moveTo(l.x, l.y);
+				o.arc(l.x, l.y, h + t._radius_, t._start_, t._start_ + 2 * t._rose_proportion_ * Math.PI);
+				o.closePath();
+				o.fill()
+			}
+		}
+		o.beginPath();
+		o.setLineWidth(n.borderWidth * r.pix);
+		o.lineJoin = "round";
+		o.setStrokeStyle(n.borderColor);
+		var a = t.color;
+		if (n.linearType == "custom") {
+			var i;
+			if (o.createCircularGradient) {
+				i = o.createCircularGradient(l.x, l.y, t._radius_)
+			} else {
+				i = o.createRadialGradient(l.x, l.y, 0, l.x, l.y, t._radius_)
+			}
+			i.addColorStop(0, hexToRgb(n.customColor[t.linearIndex], 1));
+			i.addColorStop(1, hexToRgb(t.color, 1));
+			a = i
+		}
+		o.setFillStyle(a);
+		o.moveTo(l.x, l.y);
+		o.arc(l.x, l.y, t._radius_, t._start_, t._start_ + 2 * t._rose_proportion_ * Math.PI);
+		o.closePath();
+		o.fill();
+		if (n.border == true) {
+			o.stroke()
+		}
+	});
+	if (r.dataLabel !== false && a === 1) {
+		drawPieText(t, r, e, o, i, l)
+	}
+	return {
+		center: l,
+		radius: i,
+		series: t
+	}
+}
+
+function drawArcbarDataPoints(a, i, t, r) {
+	var e = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	var o = assign({}, {
+		startAngle: .75,
+		endAngle: .25,
+		type: "default",
+		direction: "cw",
+		lineCap: "round",
+		width: 12,
+		gap: 2,
+		linearType: "none",
+		customColor: []
+	}, i.extra.arcbar);
+	a = getArcbarDataPoints(a, o, e);
+	var n;
+	if (o.centerX || o.centerY) {
+		n = {
+			x: o.centerX ? o.centerX : i.width / 2,
+			y: o.centerY ? o.centerY : i.height / 2
+		}
+	} else {
+		n = {
+			x: i.width / 2,
+			y: i.height / 2
+		}
+	}
+	var l;
+	if (o.radius) {
+		l = o.radius
+	} else {
+		l = Math.min(n.x, n.y);
+		l -= 5 * i.pix;
+		l -= o.width / 2
+	}
+	l = l < 10 ? 10 : l;
+	o.customColor = fillCustomColor(o.linearType, o.customColor, a, t);
+	for (let e = 0; e < a.length; e++) {
+		let t = a[e];
+		r.setLineWidth(o.width * i.pix);
+		r.setStrokeStyle(o.backgroundColor || "#E9E9E9");
+		r.setLineCap(o.lineCap);
+		r.beginPath();
+		if (o.type == "default") {
+			r.arc(n.x, n.y, l - (o.width * i.pix + o.gap * i.pix) * e, o.startAngle * Math.PI, o.endAngle * Math.PI, o
+				.direction == "ccw")
+		} else {
+			r.arc(n.x, n.y, l - (o.width * i.pix + o.gap * i.pix) * e, 0, 2 * Math.PI, o.direction == "ccw")
+		}
+		r.stroke();
+		var s = t.color;
+		if (o.linearType == "custom") {
+			var h = r.createLinearGradient(n.x - l, n.y, n.x + l, n.y);
+			h.addColorStop(1, hexToRgb(o.customColor[t.linearIndex], 1));
+			h.addColorStop(0, hexToRgb(t.color, 1));
+			s = h
+		}
+		r.setLineWidth(o.width * i.pix);
+		r.setStrokeStyle(s);
+		r.setLineCap(o.lineCap);
+		r.beginPath();
+		r.arc(n.x, n.y, l - (o.width * i.pix + o.gap * i.pix) * e, o.startAngle * Math.PI, t._proportion_ * Math.PI, o
+			.direction == "ccw");
+		r.stroke()
+	}
+	drawRingTitle(i, t, r, n);
+	return {
+		center: n,
+		radius: l,
+		series: a
+	}
+}
+
+function drawGaugeDataPoints(n, h, c, t, d) {
+	var x = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
+	var f = assign({}, {
+		type: "default",
+		startAngle: .75,
+		endAngle: .25,
+		width: 15,
+		labelOffset: 13,
+		splitLine: {
+			fixRadius: 0,
+			splitNumber: 10,
+			width: 15,
+			color: "#FFFFFF",
+			childNumber: 5,
+			childWidth: 5
+		},
+		pointer: {
+			width: 15,
+			color: "auto"
+		}
+	}, c.extra.gauge);
+	if (f.oldAngle == undefined) {
+		f.oldAngle = f.startAngle
+	}
+	if (f.oldData == undefined) {
+		f.oldData = 0
+	}
+	n = getGaugeAxisPoints(n, f.startAngle, f.endAngle);
+	var p = {
+		x: c.width / 2,
+		y: c.height / 2
+	};
+	var u = Math.min(p.x, p.y);
+	u -= 5 * c.pix;
+	u -= f.width / 2;
+	u = u < 10 ? 10 : u;
+	var g = u - f.width;
+	var y = 0;
+	if (f.type == "progress") {
+		var v = u - f.width * 3;
+		d.beginPath();
+		let t = d.createLinearGradient(p.x, p.y - v, p.x, p.y + v);
+		t.addColorStop("0", hexToRgb(h[0].color, .3));
+		t.addColorStop("1.0", hexToRgb("#FFFFFF", .1));
+		d.setFillStyle(t);
+		d.arc(p.x, p.y, v, 0, 2 * Math.PI, false);
+		d.fill();
+		d.setLineWidth(f.width);
+		d.setStrokeStyle(hexToRgb(h[0].color, .3));
+		d.setLineCap("round");
+		d.beginPath();
+		d.arc(p.x, p.y, g, f.startAngle * Math.PI, f.endAngle * Math.PI, false);
+		d.stroke();
+		if (f.endAngle < f.startAngle) {
+			y = 2 + f.endAngle - f.startAngle
+		} else {
+			y = f.startAngle - f.endAngle
+		}
+		let e = y / f.splitLine.splitNumber;
+		let a = y / f.splitLine.splitNumber / f.splitLine.childNumber;
+		let i = -u - f.width * .5 - f.splitLine.fixRadius;
+		let r = -u - f.width - f.splitLine.fixRadius + f.splitLine.width;
+		d.save();
+		d.translate(p.x, p.y);
+		d.rotate((f.startAngle - 1) * Math.PI);
+		let o = f.splitLine.splitNumber * f.splitLine.childNumber + 1;
+		let n = h[0].data * x;
+		for (let t = 0; t < o; t++) {
+			d.beginPath();
+			if (n > t / o) {
+				d.setStrokeStyle(hexToRgb(h[0].color, 1))
+			} else {
+				d.setStrokeStyle(hexToRgb(h[0].color, .3))
+			}
+			d.setLineWidth(3 * c.pix);
+			d.moveTo(i, 0);
+			d.lineTo(r, 0);
+			d.stroke();
+			d.rotate(a * Math.PI)
+		}
+		d.restore();
+		h = getGaugeArcbarDataPoints(h, f, x);
+		d.setLineWidth(f.width);
+		d.setStrokeStyle(h[0].color);
+		d.setLineCap("round");
+		d.beginPath();
+		d.arc(p.x, p.y, g, f.startAngle * Math.PI, h[0]._proportion_ * Math.PI, false);
+		d.stroke();
+		let l = u - f.width * 2.5;
+		d.save();
+		d.translate(p.x, p.y);
+		d.rotate((h[0]._proportion_ - 1) * Math.PI);
+		d.beginPath();
+		d.setLineWidth(f.width / 3);
+		let s = d.createLinearGradient(0, -l * .6, 0, l * .6);
+		s.addColorStop("0", hexToRgb("#FFFFFF", 0));
+		s.addColorStop("0.5", hexToRgb(h[0].color, 1));
+		s.addColorStop("1.0", hexToRgb("#FFFFFF", 0));
+		d.setStrokeStyle(s);
+		d.arc(0, 0, l, .85 * Math.PI, 1.15 * Math.PI, false);
+		d.stroke();
+		d.beginPath();
+		d.setLineWidth(1);
+		d.setStrokeStyle(h[0].color);
+		d.setFillStyle(h[0].color);
+		d.moveTo(-l - f.width / 3 / 2, -4);
+		d.lineTo(-l - f.width / 3 / 2 - 4, 0);
+		d.lineTo(-l - f.width / 3 / 2, 4);
+		d.lineTo(-l - f.width / 3 / 2, -4);
+		d.stroke();
+		d.fill();
+		d.restore()
+	} else {
+		d.setLineWidth(f.width);
+		d.setLineCap("butt");
+		for (let e = 0; e < n.length; e++) {
+			let t = n[e];
+			d.beginPath();
+			d.setStrokeStyle(t.color);
+			d.arc(p.x, p.y, u, t._startAngle_ * Math.PI, t._endAngle_ * Math.PI, false);
+			d.stroke()
+		}
+		d.save();
+		if (f.endAngle < f.startAngle) {
+			y = 2 + f.endAngle - f.startAngle
+		} else {
+			y = f.startAngle - f.endAngle
+		}
+		let e = y / f.splitLine.splitNumber;
+		let a = y / f.splitLine.splitNumber / f.splitLine.childNumber;
+		let i = -u - f.width * .5 - f.splitLine.fixRadius;
+		let r = -u - f.width * .5 - f.splitLine.fixRadius + f.splitLine.width;
+		let o = -u - f.width * .5 - f.splitLine.fixRadius + f.splitLine.childWidth;
+		d.translate(p.x, p.y);
+		d.rotate((f.startAngle - 1) * Math.PI);
+		for (let t = 0; t < f.splitLine.splitNumber + 1; t++) {
+			d.beginPath();
+			d.setStrokeStyle(f.splitLine.color);
+			d.setLineWidth(2 * c.pix);
+			d.moveTo(i, 0);
+			d.lineTo(r, 0);
+			d.stroke();
+			d.rotate(e * Math.PI)
+		}
+		d.restore();
+		d.save();
+		d.translate(p.x, p.y);
+		d.rotate((f.startAngle - 1) * Math.PI);
+		for (let t = 0; t < f.splitLine.splitNumber * f.splitLine.childNumber + 1; t++) {
+			d.beginPath();
+			d.setStrokeStyle(f.splitLine.color);
+			d.setLineWidth(1 * c.pix);
+			d.moveTo(i, 0);
+			d.lineTo(o, 0);
+			d.stroke();
+			d.rotate(a * Math.PI)
+		}
+		d.restore();
+		h = getGaugeDataPoints(h, n, f, x);
+		for (let e = 0; e < h.length; e++) {
+			let t = h[e];
+			d.save();
+			d.translate(p.x, p.y);
+			d.rotate((t._proportion_ - 1) * Math.PI);
+			d.beginPath();
+			d.setFillStyle(t.color);
+			d.moveTo(f.pointer.width, 0);
+			d.lineTo(0, -f.pointer.width / 2);
+			d.lineTo(-g, 0);
+			d.lineTo(0, f.pointer.width / 2);
+			d.lineTo(f.pointer.width, 0);
+			d.closePath();
+			d.fill();
+			d.beginPath();
+			d.setFillStyle("#FFFFFF");
+			d.arc(0, 0, f.pointer.width / 6, 0, 2 * Math.PI, false);
+			d.fill();
+			d.restore()
+		}
+		if (c.dataLabel !== false) {
+			drawGaugeLabel(f, u, p, c, t, d)
+		}
+	}
+	drawRingTitle(c, t, d, p);
+	if (x === 1 && c.type === "gauge") {
+		c.extra.gauge.oldAngle = h[0]._proportion_;
+		c.extra.gauge.oldData = h[0].data
+	}
+	return {
+		center: p,
+		radius: u,
+		innerRadius: g,
+		categories: n,
+		totalAngle: y
+	}
+}
+
+function drawRadarDataPoints(o, n, i, l) {
+	var t = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	var s = assign({}, {
+		gridColor: "#cccccc",
+		gridType: "radar",
+		gridEval: 1,
+		axisLabel: false,
+		axisLabelTofix: 0,
+		labelShow: true,
+		labelColor: "#666666",
+		labelPointShow: false,
+		labelPointRadius: 3,
+		labelPointColor: "#cccccc",
+		opacity: .2,
+		gridCount: 3,
+		border: false,
+		borderWidth: 2,
+		linearType: "none",
+		customColor: []
+	}, n.extra.radar);
+	var a = getRadarCoordinateSeries(n.categories.length);
+	var h = {
+		x: n.area[3] + (n.width - n.area[1] - n.area[3]) / 2,
+		y: n.area[0] + (n.height - n.area[0] - n.area[2]) / 2
+	};
+	var r = (n.width - n.area[1] - n.area[3]) / 2;
+	var d = (n.height - n.area[0] - n.area[2]) / 2;
+	var c = Math.min(r - (getMaxTextListLength(n.categories, i.fontSize, l) + i.radarLabelTextMargin), d - i
+		.radarLabelTextMargin);
+	c -= i.radarLabelTextMargin * n.pix;
+	c = c < 10 ? 10 : c;
+	c = s.radius ? s.radius : c;
+	l.beginPath();
+	l.setLineWidth(1 * n.pix);
+	l.setStrokeStyle(s.gridColor);
+	a.forEach(function(t, e) {
+		var a = convertCoordinateOrigin(c * Math.cos(t), c * Math.sin(t), h);
+		l.moveTo(h.x, h.y);
+		if (e % s.gridEval == 0) {
+			l.lineTo(a.x, a.y)
+		}
+	});
+	l.stroke();
+	l.closePath();
+	var x = function t(i) {
+		var r = {};
+		l.beginPath();
+		l.setLineWidth(1 * n.pix);
+		l.setStrokeStyle(s.gridColor);
+		if (s.gridType == "radar") {
+			a.forEach(function(t, e) {
+				var a = convertCoordinateOrigin(c / s.gridCount * i * Math.cos(t), c / s.gridCount * i * Math.sin(t), h);
+				if (e === 0) {
+					r = a;
+					l.moveTo(a.x, a.y)
+				} else {
+					l.lineTo(a.x, a.y)
+				}
+			});
+			l.lineTo(r.x, r.y)
+		} else {
+			var e = convertCoordinateOrigin(c / s.gridCount * i * Math.cos(1.5), c / s.gridCount * i * Math.sin(1.5), h);
+			l.arc(h.x, h.y, h.y - e.y, 0, 2 * Math.PI, false)
+		}
+		l.stroke();
+		l.closePath()
+	};
+	for (var e = 1; e <= s.gridCount; e++) {
+		x(e)
+	}
+	s.customColor = fillCustomColor(s.linearType, s.customColor, o, i);
+	var f = getRadarDataPoints(a, h, c, o, n, t);
+	f.forEach(function(t, e) {
+		l.beginPath();
+		l.setLineWidth(s.borderWidth * n.pix);
+		l.setStrokeStyle(t.color);
+		var a = hexToRgb(t.color, s.opacity);
+		if (s.linearType == "custom") {
+			var i;
+			if (l.createCircularGradient) {
+				i = l.createCircularGradient(h.x, h.y, c)
+			} else {
+				i = l.createRadialGradient(h.x, h.y, 0, h.x, h.y, c)
+			}
+			i.addColorStop(0, hexToRgb(s.customColor[o[e].linearIndex], s.opacity));
+			i.addColorStop(1, hexToRgb(t.color, s.opacity));
+			a = i
+		}
+		l.setFillStyle(a);
+		t.data.forEach(function(t, e) {
+			if (e === 0) {
+				l.moveTo(t.position.x, t.position.y)
+			} else {
+				l.lineTo(t.position.x, t.position.y)
+			}
+		});
+		l.closePath();
+		l.fill();
+		if (s.border === true) {
+			l.stroke()
+		}
+		l.closePath();
+		if (n.dataPointShape !== false) {
+			var r = t.data.map(function(t) {
+				return t.position
+			});
+			drawPointShape(r, t.color, t.pointShape, l, n)
+		}
+	});
+	if (s.axisLabel === true) {
+		const p = Math.max(s.max, Math.max.apply(null, dataCombine(o)));
+		const u = c / s.gridCount;
+		const g = n.fontSize * n.pix;
+		l.setFontSize(g);
+		l.setFillStyle(n.fontColor);
+		l.setTextAlign("left");
+		for (var e = 0; e < s.gridCount + 1; e++) {
+			let t = e * p / s.gridCount;
+			t = t.toFixed(s.axisLabelTofix);
+			l.fillText(String(t), h.x + 3 * n.pix, h.y - e * u + g / 2)
+		}
+	}
+	drawRadarLabel(a, c, h, n, i, l);
+	if (n.dataLabel !== false && t === 1) {
+		f.forEach(function(t, e) {
+			l.beginPath();
+			var a = t.textSize * n.pix || i.fontSize;
+			l.setFontSize(a);
+			l.setFillStyle(t.textColor || n.fontColor);
+			t.data.forEach(function(t, e) {
+				if (Math.abs(t.position.x - h.x) < 2) {
+					if (t.position.y < h.y) {
+						l.setTextAlign("center");
+						l.fillText(t.value, t.position.x, t.position.y - 4)
+					} else {
+						l.setTextAlign("center");
+						l.fillText(t.value, t.position.x, t.position.y + a + 2)
+					}
+				} else {
+					if (t.position.x < h.x) {
+						l.setTextAlign("right");
+						l.fillText(t.value, t.position.x - 4, t.position.y + a / 2 - 2)
+					} else {
+						l.setTextAlign("left");
+						l.fillText(t.value, t.position.x + 4, t.position.y + a / 2 - 2)
+					}
+				}
+			});
+			l.closePath();
+			l.stroke()
+		});
+		l.setTextAlign("left")
+	}
+	return {
+		center: h,
+		radius: c,
+		angleList: a
+	}
+}
+
+function lonlat2mercator(t, e) {
+	var a = Array(2);
+	var i = t * 20037508.34 / 180;
+	var r = Math.log(Math.tan((90 + e) * Math.PI / 360)) / (Math.PI / 180);
+	r = r * 20037508.34 / 180;
+	a[0] = i;
+	a[1] = r;
+	return a
+}
+
+function mercator2lonlat(t, e) {
+	var a = Array(2);
+	var i = t / 20037508.34 * 180;
+	var r = e / 20037508.34 * 180;
+	r = 180 / Math.PI * (2 * Math.atan(Math.exp(r * Math.PI / 180)) - Math.PI / 2);
+	a[0] = i;
+	a[1] = r;
+	return a
+}
+
+function getBoundingBox(t) {
+	var e = {},
+		a;
+	e.xMin = 180;
+	e.xMax = 0;
+	e.yMin = 90;
+	e.yMax = 0;
+	for (var i = 0; i < t.length; i++) {
+		var r = t[i].geometry.coordinates;
+		for (var o = 0; o < r.length; o++) {
+			a = r[o];
+			if (a.length == 1) {
+				a = a[0]
+			}
+			for (var n = 0; n < a.length; n++) {
+				var l = a[n][0];
+				var s = a[n][1];
+				var h = {
+					x: l,
+					y: s
+				};
+				e.xMin = e.xMin < h.x ? e.xMin : h.x;
+				e.xMax = e.xMax > h.x ? e.xMax : h.x;
+				e.yMin = e.yMin < h.y ? e.yMin : h.y;
+				e.yMax = e.yMax > h.y ? e.yMax : h.y
+			}
+		}
+	}
+	return e
+}
+
+function coordinateToPoint(t, e, a, i, r, o) {
+	return {
+		x: (e - a.xMin) * i + r,
+		y: (a.yMax - t) * i + o
+	}
+}
+
+function pointToCoordinate(t, e, a, i, r, o) {
+	return {
+		x: (e - r) / i + a.xMin,
+		y: a.yMax - (t - o) / i
+	}
+}
+
+function isRayIntersectsSegment(t, e, a) {
+	if (e[1] == a[1]) {
+		return false
+	}
+	if (e[1] > t[1] && a[1] > t[1]) {
+		return false
+	}
+	if (e[1] < t[1] && a[1] < t[1]) {
+		return false
+	}
+	if (e[1] == t[1] && a[1] > t[1]) {
+		return false
+	}
+	if (a[1] == t[1] && e[1] > t[1]) {
+		return false
+	}
+	if (e[0] < t[0] && a[1] < t[1]) {
+		return false
+	}
+	let i = a[0] - (a[0] - e[0]) * (a[1] - t[1]) / (a[1] - e[1]);
+	if (i < t[0]) {
+		return false
+	} else {
+		return true
+	}
+}
+
+function isPoiWithinPoly(r, e, o) {
+	let n = 0;
+	for (let t = 0; t < e.length; t++) {
+		let i = e[t][0];
+		if (e.length == 1) {
+			i = e[t][0]
+		}
+		for (let a = 0; a < i.length - 1; a++) {
+			let t = i[a];
+			let e = i[a + 1];
+			if (o) {
+				t = lonlat2mercator(i[a][0], i[a][1]);
+				e = lonlat2mercator(i[a + 1][0], i[a + 1][1])
+			}
+			if (isRayIntersectsSegment(r, t, e)) {
+				n += 1
+			}
+		}
+	}
+	if (n % 2 == 1) {
+		return true
+	} else {
+		return false
+	}
+}
+
+function drawMapDataPoints(a, i, d, r) {
+	var o = assign({}, {
+		border: true,
+		mercator: false,
+		borderWidth: 1,
+		active: true,
+		borderColor: "#666666",
+		fillOpacity: .6,
+		activeBorderColor: "#f04864",
+		activeFillColor: "#facc14",
+		activeFillOpacity: 1
+	}, i.extra.map);
+	var t, n;
+	var l = a;
+	var s = getBoundingBox(l);
+	if (o.mercator) {
+		var x = lonlat2mercator(s.xMax, s.yMax);
+		var f = lonlat2mercator(s.xMin, s.yMin);
+		s.xMax = x[0];
+		s.yMax = x[1];
+		s.xMin = f[0];
+		s.yMin = f[1]
+	}
+	var p = i.width / Math.abs(s.xMax - s.xMin);
+	var u = i.height / Math.abs(s.yMax - s.yMin);
+	var h = p < u ? p : u;
+	var g = i.width / 2 - Math.abs(s.xMax - s.xMin) / 2 * h;
+	var y = i.height / 2 - Math.abs(s.yMax - s.yMin) / 2 * h;
+	for (var c = 0; c < l.length; c++) {
+		r.beginPath();
+		r.setLineWidth(o.borderWidth * i.pix);
+		r.setStrokeStyle(o.borderColor);
+		r.setFillStyle(hexToRgb(a[c].color, a[c].fillOpacity || o.fillOpacity));
+		if (o.active == true && i.tooltip) {
+			if (i.tooltip.index == c) {
+				r.setStrokeStyle(o.activeBorderColor);
+				r.setFillStyle(hexToRgb(o.activeFillColor, o.activeFillOpacity))
+			}
+		}
+		var v = l[c].geometry.coordinates;
+		for (var m = 0; m < v.length; m++) {
+			t = v[m];
+			if (t.length == 1) {
+				t = t[0]
+			}
+			for (var e = 0; e < t.length; e++) {
+				var T = Array(2);
+				if (o.mercator) {
+					T = lonlat2mercator(t[e][0], t[e][1])
+				} else {
+					T = t[e]
+				}
+				n = coordinateToPoint(T[1], T[0], s, h, g, y);
+				if (e === 0) {
+					r.beginPath();
+					r.moveTo(n.x, n.y)
+				} else {
+					r.lineTo(n.x, n.y)
+				}
+			}
+			r.fill();
+			if (o.border == true) {
+				r.stroke()
+			}
+		}
+	}
+	if (i.dataLabel == true) {
+		for (var c = 0; c < l.length; c++) {
+			var b = l[c].properties.centroid;
+			if (b) {
+				if (o.mercator) {
+					b = lonlat2mercator(l[c].properties.centroid[0], l[c].properties.centroid[1])
+				}
+				n = coordinateToPoint(b[1], b[0], s, h, g, y);
+				let t = l[c].textSize * i.pix || d.fontSize;
+				let e = l[c].textColor || i.fontColor;
+				if (o.active && o.activeTextColor && i.tooltip && i.tooltip.index == c) {
+					e = o.activeTextColor
+				}
+				let a = l[c].properties.name;
+				r.beginPath();
+				r.setFontSize(t);
+				r.setFillStyle(e);
+				r.fillText(a, n.x - measureText(a, t, r) / 2, n.y + t / 2);
+				r.closePath();
+				r.stroke()
+			}
+		}
+	}
+	i.chartData.mapData = {
+		bounds: s,
+		scale: h,
+		xoffset: g,
+		yoffset: y,
+		mercator: o.mercator
+	};
+	drawToolTipBridge(i, d, r, 1);
+	r.draw()
+}
+
+function normalInt(t, e, a) {
+	a = a == 0 ? 1 : a;
+	var i = [];
+	for (var r = 0; r < a; r++) {
+		i[r] = Math.random()
+	}
+	return Math.floor(i.reduce(function(t, e) {
+		return t + e
+	}) / a * (e - t)) + t
+}
+
+function collisionNew(e, a, i, r) {
+	var o = false;
+	for (let t = 0; t < a.length; t++) {
+		if (a[t].area) {
+			if (e[3] < a[t].area[1] || e[0] > a[t].area[2] || e[1] > a[t].area[3] || e[2] < a[t].area[0]) {
+				if (e[0] < 0 || e[1] < 0 || e[2] > i || e[3] > r) {
+					o = true;
+					break
+				} else {
+					o = false
+				}
+			} else {
+				o = true;
+				break
+			}
+		}
+	}
+	return o
+}
+
+function getWordCloudPoint(c, t, d) {
+	let x = c.series;
+	switch (t) {
+		case "normal":
+			for (let l = 0; l < x.length; l++) {
+				let t = x[l].name;
+				let e = x[l].textSize * c.pix;
+				let a = measureText(t, e, d);
+				let i, r;
+				let o;
+				let n = 0;
+				while (true) {
+					n++;
+					i = normalInt(-c.width / 2, c.width / 2, 5) - a / 2;
+					r = normalInt(-c.height / 2, c.height / 2, 5) + e / 2;
+					o = [i - 5 + c.width / 2, r - 5 - e + c.height / 2, i + a + 5 + c.width / 2, r + 5 + c.height / 2];
+					let t = collisionNew(o, x, c.width, c.height);
+					if (!t) break;
+					if (n == 1e3) {
+						o = [-100, -100, -100, -100];
+						break
+					}
+				}
+				x[l].area = o
+			}
+			break;
+		case "vertical":
+			function f() {
+				if (Math.random() > .7) {
+					return true
+				} else {
+					return false
+				}
+			};
+			for (let h = 0; h < x.length; h++) {
+				let t = x[h].name;
+				let e = x[h].textSize * c.pix;
+				let a = measureText(t, e, d);
+				let i = f();
+				let r, o, n, l;
+				let s = 0;
+				while (true) {
+					s++;
+					let t;
+					if (i) {
+						r = normalInt(-c.width / 2, c.width / 2, 5) - a / 2;
+						o = normalInt(-c.height / 2, c.height / 2, 5) + e / 2;
+						n = [o - 5 - a + c.width / 2, -r - 5 + c.height / 2, o + 5 + c.width / 2, -r + e + 5 + c.height / 2];
+						l = [c.width - (c.width / 2 - c.height / 2) - (-r + e + 5 + c.height / 2) - 5, c.height / 2 - c.width / 2 +
+							(o - 5 - a + c.width / 2) - 5, c.width - (c.width / 2 - c.height / 2) - (-r + e + 5 + c.height / 2) + e,
+							c.height / 2 - c.width / 2 + (o - 5 - a + c.width / 2) + a + 5
+						];
+						t = collisionNew(l, x, c.height, c.width)
+					} else {
+						r = normalInt(-c.width / 2, c.width / 2, 5) - a / 2;
+						o = normalInt(-c.height / 2, c.height / 2, 5) + e / 2;
+						n = [r - 5 + c.width / 2, o - 5 - e + c.height / 2, r + a + 5 + c.width / 2, o + 5 + c.height / 2];
+						t = collisionNew(n, x, c.width, c.height)
+					}
+					if (!t) break;
+					if (s == 1e3) {
+						n = [-1e3, -1e3, -1e3, -1e3];
+						break
+					}
+				}
+				if (i) {
+					x[h].area = l;
+					x[h].areav = n
+				} else {
+					x[h].area = n
+				}
+				x[h].rotate = i
+			};
+			break
+	}
+	return x
+}
+
+function drawWordCloudDataPoints(t, r, e, o) {
+	let n = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	let a = assign({}, {
+		type: "normal",
+		autoColors: true
+	}, r.extra.word);
+	if (!r.chartData.wordCloudData) {
+		r.chartData.wordCloudData = getWordCloudPoint(r, a.type, o)
+	}
+	o.beginPath();
+	o.setFillStyle(r.background);
+	o.rect(0, 0, r.width, r.height);
+	o.fill();
+	o.save();
+	let l = r.chartData.wordCloudData;
+	o.translate(r.width / 2, r.height / 2);
+	for (let i = 0; i < l.length; i++) {
+		o.save();
+		if (l[i].rotate) {
+			o.rotate(90 * Math.PI / 180)
+		}
+		let t = l[i].name;
+		let e = l[i].textSize * r.pix;
+		let a = measureText(t, e, o);
+		o.beginPath();
+		o.setStrokeStyle(l[i].color);
+		o.setFillStyle(l[i].color);
+		o.setFontSize(e);
+		if (l[i].rotate) {
+			if (l[i].areav[0] > 0) {
+				if (r.tooltip) {
+					if (r.tooltip.index == i) {
+						o.strokeText(t, (l[i].areav[0] + 5 - r.width / 2) * n - a * (1 - n) / 2, (l[i].areav[1] + 5 + e - r.height /
+							2) * n)
+					} else {
+						o.fillText(t, (l[i].areav[0] + 5 - r.width / 2) * n - a * (1 - n) / 2, (l[i].areav[1] + 5 + e - r.height /
+							2) * n)
+					}
+				} else {
+					o.fillText(t, (l[i].areav[0] + 5 - r.width / 2) * n - a * (1 - n) / 2, (l[i].areav[1] + 5 + e - r.height /
+						2) * n)
+				}
+			}
+		} else {
+			if (l[i].area[0] > 0) {
+				if (r.tooltip) {
+					if (r.tooltip.index == i) {
+						o.strokeText(t, (l[i].area[0] + 5 - r.width / 2) * n - a * (1 - n) / 2, (l[i].area[1] + 5 + e - r.height /
+							2) * n)
+					} else {
+						o.fillText(t, (l[i].area[0] + 5 - r.width / 2) * n - a * (1 - n) / 2, (l[i].area[1] + 5 + e - r.height /
+							2) * n)
+					}
+				} else {
+					o.fillText(t, (l[i].area[0] + 5 - r.width / 2) * n - a * (1 - n) / 2, (l[i].area[1] + 5 + e - r.height / 2) *
+						n)
+				}
+			}
+		}
+		o.stroke();
+		o.restore()
+	}
+	o.restore()
+}
+
+function drawFunnelDataPoints(t, e, c, a) {
+	let d = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+	let i = assign({}, {
+		type: "funnel",
+		activeWidth: 10,
+		activeOpacity: .3,
+		border: false,
+		borderWidth: 2,
+		borderColor: "#FFFFFF",
+		fillOpacity: 1,
+		minSize: 0,
+		labelAlign: "right",
+		linearType: "none",
+		customColor: []
+	}, e.extra.funnel);
+	let r = (e.height - e.area[0] - e.area[2]) / t.length;
+	let o = {
+		x: e.area[3] + (e.width - e.area[1] - e.area[3]) / 2,
+		y: e.height - e.area[2]
+	};
+	let n = i.activeWidth * e.pix;
+	let x = Math.min((e.width - e.area[1] - e.area[3]) / 2 - n, (e.height - e.area[0] - e.area[2]) / 2 - n);
+	let l = getFunnelDataPoints(t, x, i, r, d);
+	a.save();
+	a.translate(o.x, o.y);
+	i.customColor = fillCustomColor(i.linearType, i.customColor, t, c);
+	if (i.type == "pyramid") {
+		for (let t = 0; t < l.length; t++) {
+			if (t == l.length - 1) {
+				if (e.tooltip) {
+					if (e.tooltip.index == t) {
+						a.beginPath();
+						a.setFillStyle(hexToRgb(l[t].color, i.activeOpacity));
+						a.moveTo(-n, -r);
+						a.lineTo(-l[t].radius - n, 0);
+						a.lineTo(l[t].radius + n, 0);
+						a.lineTo(n, -r);
+						a.lineTo(-n, -r);
+						a.closePath();
+						a.fill()
+					}
+				}
+				l[t].funnelArea = [o.x - l[t].radius, o.y - r * (t + 1), o.x + l[t].radius, o.y - r * t];
+				a.beginPath();
+				a.setLineWidth(i.borderWidth * e.pix);
+				a.setStrokeStyle(i.borderColor);
+				var s = hexToRgb(l[t].color, i.fillOpacity);
+				if (i.linearType == "custom") {
+					var h = a.createLinearGradient(l[t].radius, -r, -l[t].radius, -r);
+					h.addColorStop(0, hexToRgb(l[t].color, i.fillOpacity));
+					h.addColorStop(.5, hexToRgb(i.customColor[l[t].linearIndex], i.fillOpacity));
+					h.addColorStop(1, hexToRgb(l[t].color, i.fillOpacity));
+					s = h
+				}
+				a.setFillStyle(s);
+				a.moveTo(0, -r);
+				a.lineTo(-l[t].radius, 0);
+				a.lineTo(l[t].radius, 0);
+				a.lineTo(0, -r);
+				a.closePath();
+				a.fill();
+				if (i.border == true) {
+					a.stroke()
+				}
+			} else {
+				if (e.tooltip) {
+					if (e.tooltip.index == t) {
+						a.beginPath();
+						a.setFillStyle(hexToRgb(l[t].color, i.activeOpacity));
+						a.moveTo(0, 0);
+						a.lineTo(-l[t].radius - n, 0);
+						a.lineTo(-l[t + 1].radius - n, -r);
+						a.lineTo(l[t + 1].radius + n, -r);
+						a.lineTo(l[t].radius + n, 0);
+						a.lineTo(0, 0);
+						a.closePath();
+						a.fill()
+					}
+				}
+				l[t].funnelArea = [o.x - l[t].radius, o.y - r * (t + 1), o.x + l[t].radius, o.y - r * t];
+				a.beginPath();
+				a.setLineWidth(i.borderWidth * e.pix);
+				a.setStrokeStyle(i.borderColor);
+				var s = hexToRgb(l[t].color, i.fillOpacity);
+				if (i.linearType == "custom") {
+					var h = a.createLinearGradient(l[t].radius, -r, -l[t].radius, -r);
+					h.addColorStop(0, hexToRgb(l[t].color, i.fillOpacity));
+					h.addColorStop(.5, hexToRgb(i.customColor[l[t].linearIndex], i.fillOpacity));
+					h.addColorStop(1, hexToRgb(l[t].color, i.fillOpacity));
+					s = h
+				}
+				a.setFillStyle(s);
+				a.moveTo(0, 0);
+				a.lineTo(-l[t].radius, 0);
+				a.lineTo(-l[t + 1].radius, -r);
+				a.lineTo(l[t + 1].radius, -r);
+				a.lineTo(l[t].radius, 0);
+				a.lineTo(0, 0);
+				a.closePath();
+				a.fill();
+				if (i.border == true) {
+					a.stroke()
+				}
+			}
+			a.translate(0, -r)
+		}
+	} else {
+		a.translate(0, -(l.length - 1) * r);
+		for (let t = 0; t < l.length; t++) {
+			if (t == l.length - 1) {
+				if (e.tooltip) {
+					if (e.tooltip.index == t) {
+						a.beginPath();
+						a.setFillStyle(hexToRgb(l[t].color, i.activeOpacity));
+						a.moveTo(-n - i.minSize / 2, 0);
+						a.lineTo(-l[t].radius - n, -r);
+						a.lineTo(l[t].radius + n, -r);
+						a.lineTo(n + i.minSize / 2, 0);
+						a.lineTo(-n - i.minSize / 2, 0);
+						a.closePath();
+						a.fill()
+					}
+				}
+				l[t].funnelArea = [o.x - l[t].radius, o.y - r, o.x + l[t].radius, o.y];
+				a.beginPath();
+				a.setLineWidth(i.borderWidth * e.pix);
+				a.setStrokeStyle(i.borderColor);
+				var s = hexToRgb(l[t].color, i.fillOpacity);
+				if (i.linearType == "custom") {
+					var h = a.createLinearGradient(l[t].radius, -r, -l[t].radius, -r);
+					h.addColorStop(0, hexToRgb(l[t].color, i.fillOpacity));
+					h.addColorStop(.5, hexToRgb(i.customColor[l[t].linearIndex], i.fillOpacity));
+					h.addColorStop(1, hexToRgb(l[t].color, i.fillOpacity));
+					s = h
+				}
+				a.setFillStyle(s);
+				a.moveTo(0, 0);
+				a.lineTo(-i.minSize / 2, 0);
+				a.lineTo(-l[t].radius, -r);
+				a.lineTo(l[t].radius, -r);
+				a.lineTo(i.minSize / 2, 0);
+				a.lineTo(0, 0);
+				a.closePath();
+				a.fill();
+				if (i.border == true) {
+					a.stroke()
+				}
+			} else {
+				if (e.tooltip) {
+					if (e.tooltip.index == t) {
+						a.beginPath();
+						a.setFillStyle(hexToRgb(l[t].color, i.activeOpacity));
+						a.moveTo(0, 0);
+						a.lineTo(-l[t + 1].radius - n, 0);
+						a.lineTo(-l[t].radius - n, -r);
+						a.lineTo(l[t].radius + n, -r);
+						a.lineTo(l[t + 1].radius + n, 0);
+						a.lineTo(0, 0);
+						a.closePath();
+						a.fill()
+					}
+				}
+				l[t].funnelArea = [o.x - l[t].radius, o.y - r * (l.length - t), o.x + l[t].radius, o.y - r * (l.length - t -
+					1)];
+				a.beginPath();
+				a.setLineWidth(i.borderWidth * e.pix);
+				a.setStrokeStyle(i.borderColor);
+				var s = hexToRgb(l[t].color, i.fillOpacity);
+				if (i.linearType == "custom") {
+					var h = a.createLinearGradient(l[t].radius, -r, -l[t].radius, -r);
+					h.addColorStop(0, hexToRgb(l[t].color, i.fillOpacity));
+					h.addColorStop(.5, hexToRgb(i.customColor[l[t].linearIndex], i.fillOpacity));
+					h.addColorStop(1, hexToRgb(l[t].color, i.fillOpacity));
+					s = h
+				}
+				a.setFillStyle(s);
+				a.moveTo(0, 0);
+				a.lineTo(-l[t + 1].radius, 0);
+				a.lineTo(-l[t].radius, -r);
+				a.lineTo(l[t].radius, -r);
+				a.lineTo(l[t + 1].radius, 0);
+				a.lineTo(0, 0);
+				a.closePath();
+				a.fill();
+				if (i.border == true) {
+					a.stroke()
+				}
+			}
+			a.translate(0, r)
+		}
+	}
+	a.restore();
+	if (e.dataLabel !== false && d === 1) {
+		drawFunnelText(l, e, a, r, i.labelAlign, n, o)
+	}
+	if (d === 1) {
+		drawFunnelCenterText(l, e, a, r, i.labelAlign, n, o)
+	}
+	return {
+		center: o,
+		radius: x,
+		series: l
+	}
+}
+
+function drawFunnelText(l, s, h, c, d, x, f) {
+	for (let n = 0; n < l.length; n++) {
+		let t = l[n];
+		if (t.labelShow === false) {
+			continue
+		}
+		let e, a, i, r;
+		let o = t.formatter ? t.formatter(t, n, l, s) : util.toFixed(t._proportion_ * 100) + "%";
+		o = t.labelText ? t.labelText : o;
+		if (d == "right") {
+			if (n == l.length - 1) {
+				e = (t.funnelArea[2] + f.x) / 2
+			} else {
+				e = (t.funnelArea[2] + l[n + 1].funnelArea[2]) / 2
+			}
+			a = e + x * 2;
+			i = t.funnelArea[1] + c / 2;
+			r = t.textSize * s.pix || s.fontSize * s.pix;
+			h.setLineWidth(1 * s.pix);
+			h.setStrokeStyle(t.color);
+			h.setFillStyle(t.color);
+			h.beginPath();
+			h.moveTo(e, i);
+			h.lineTo(a, i);
+			h.stroke();
+			h.closePath();
+			h.beginPath();
+			h.moveTo(a, i);
+			h.arc(a, i, 2 * s.pix, 0, 2 * Math.PI);
+			h.closePath();
+			h.fill();
+			h.beginPath();
+			h.setFontSize(r);
+			h.setFillStyle(t.textColor || s.fontColor);
+			h.fillText(o, a + 5, i + r / 2 - 2);
+			h.closePath();
+			h.stroke();
+			h.closePath()
+		}
+		if (d == "left") {
+			if (n == l.length - 1) {
+				e = (t.funnelArea[0] + f.x) / 2
+			} else {
+				e = (t.funnelArea[0] + l[n + 1].funnelArea[0]) / 2
+			}
+			a = e - x * 2;
+			i = t.funnelArea[1] + c / 2;
+			r = t.textSize * s.pix || s.fontSize * s.pix;
+			h.setLineWidth(1 * s.pix);
+			h.setStrokeStyle(t.color);
+			h.setFillStyle(t.color);
+			h.beginPath();
+			h.moveTo(e, i);
+			h.lineTo(a, i);
+			h.stroke();
+			h.closePath();
+			h.beginPath();
+			h.moveTo(a, i);
+			h.arc(a, i, 2, 0, 2 * Math.PI);
+			h.closePath();
+			h.fill();
+			h.beginPath();
+			h.setFontSize(r);
+			h.setFillStyle(t.textColor || s.fontColor);
+			h.fillText(o, a - 5 - measureText(o, r, h), i + r / 2 - 2);
+			h.closePath();
+			h.stroke();
+			h.closePath()
+		}
+	}
+}
+
+function drawFunnelCenterText(r, o, n, l, t, e, s) {
+	for (let i = 0; i < r.length; i++) {
+		let t = r[i];
+		let e, a;
+		if (t.centerText) {
+			e = t.funnelArea[1] + l / 2;
+			a = t.centerTextSize * o.pix || o.fontSize * o.pix;
+			n.beginPath();
+			n.setFontSize(a);
+			n.setFillStyle(t.centerTextColor || "#FFFFFF");
+			n.fillText(t.centerText, s.x - measureText(t.centerText, a, n) / 2, e + a / 2 - 2);
+			n.closePath();
+			n.stroke();
+			n.closePath()
+		}
+	}
+}
+
+function drawCanvas(t, e) {
+	e.save();
+	e.translate(0, .5);
+	e.restore();
+	e.draw()
+}
+var Timing = {
+	easeIn: function t(e) {
+		return Math.pow(e, 3)
+	},
+	easeOut: function t(e) {
+		return Math.pow(e - 1, 3) + 1
+	},
+	easeInOut: function t(e) {
+		if ((e /= .5) < 1) {
+			return .5 * Math.pow(e, 3)
+		} else {
+			return .5 * (Math.pow(e - 2, 3) + 2)
+		}
+	},
+	linear: function t(e) {
+		return e
+	}
+};
+
+function Animation(r) {
+	this.isStop = false;
+	r.duration = typeof r.duration === "undefined" ? 1e3 : r.duration;
+	r.timing = r.timing || "easeInOut";
+	var o = 17;
+
+	function t() {
+		if (typeof setTimeout !== "undefined") {
+			return function(e, t) {
+				setTimeout(function() {
+					var t = +new Date;
+					e(t)
+				}, t)
+			}
+		} else if (typeof requestAnimationFrame !== "undefined") {
+			return requestAnimationFrame
+		} else {
+			return function(t) {
+				t(null)
+			}
+		}
+	}
+	var n = t();
+	var l = null;
+	var s = function t(e) {
+		if (e === null || this.isStop === true) {
+			r.onProcess && r.onProcess(1);
+			r.onAnimationFinish && r.onAnimationFinish();
+			return
+		}
+		if (l === null) {
+			l = e
+		}
+		if (e - l < r.duration) {
+			var a = (e - l) / r.duration;
+			var i = Timing[r.timing];
+			a = i(a);
+			r.onProcess && r.onProcess(a);
+			n(s, o)
+		} else {
+			r.onProcess && r.onProcess(1);
+			r.onAnimationFinish && r.onAnimationFinish()
+		}
+	};
+	s = s.bind(this);
+	n(s, o)
+}
+Animation.prototype.stop = function() {
+	this.isStop = true
+};
+
+function drawCharts(t, l, n, s) {
+	var h = this;
+	var c = l.series;
+	if (t === "pie" || t === "ring" || t === "mount" || t === "rose" || t === "funnel") {
+		c = fixPieSeries(c, l, n)
+	}
+	var d = l.categories;
+	if (t === "mount") {
+		d = [];
+		for (let t = 0; t < c.length; t++) {
+			if (c[t].show !== false) d.push(c[t].name)
+		}
+		l.categories = d
+	}
+	c = fillSeries(c, l, n);
+	var e = l.animation ? l.duration : 0;
+	h.animationInstance && h.animationInstance.stop();
+	var x = null;
+	if (t == "candle") {
+		let t = assign({}, l.extra.candle.average);
+		if (t.show) {
+			x = calCandleMA(t.day, t.name, t.color, c[0].data);
+			x = fillSeries(x, l, n);
+			l.seriesMA = x
+		} else if (l.seriesMA) {
+			x = l.seriesMA = fillSeries(l.seriesMA, l, n)
+		} else {
+			x = c
+		}
+	} else {
+		x = c
+	}
+	l._series_ = c = filterSeries(c);
+	l.area = new Array(4);
+	for (let t = 0; t < 4; t++) {
+		l.area[t] = l.padding[t] * l.pix
+	}
+	var a = calLegendData(x, l, n, l.chartData, s),
+		r = a.area.wholeHeight,
+		o = a.area.wholeWidth;
+	switch (l.legend.position) {
+		case "top":
+			l.area[0] += r;
+			break;
+		case "bottom":
+			l.area[2] += r;
+			break;
+		case "left":
+			l.area[3] += o;
+			break;
+		case "right":
+			l.area[1] += o;
+			break
+	}
+	let f = {},
+		i = 0;
+	if (l.type === "line" || l.type === "column" || l.type === "mount" || l.type === "area" || l.type === "mix" || l
+		.type === "candle" || l.type === "scatter" || l.type === "bubble" || l.type === "bar") {
+		f = calYAxisData(c, l, n, s);
+		i = f.yAxisWidth;
+		if (l.yAxis.showTitle) {
+			let e = 0;
+			for (let t = 0; t < l.yAxis.data.length; t++) {
+				e = Math.max(e, l.yAxis.data[t].titleFontSize ? l.yAxis.data[t].titleFontSize * l.pix : n.fontSize)
+			}
+			l.area[0] += e
+		}
+		let e = 0,
+			a = 0;
+		for (let t = 0; t < i.length; t++) {
+			if (i[t].position == "left") {
+				if (a > 0) {
+					l.area[3] += i[t].width + l.yAxis.padding * l.pix
+				} else {
+					l.area[3] += i[t].width
+				}
+				a += 1
+			} else if (i[t].position == "right") {
+				if (e > 0) {
+					l.area[1] += i[t].width + l.yAxis.padding * l.pix
+				} else {
+					l.area[1] += i[t].width
+				}
+				e += 1
+			}
+		}
+	} else {
+		n.yAxisWidth = i
+	}
+	l.chartData.yAxisData = f;
+	if (l.categories && l.categories.length && l.type !== "radar" && l.type !== "gauge" && l.type !== "bar") {
+		l.chartData.xAxisData = getXAxisPoints(l.categories, l, n);
+		let t = calCategoriesData(l.categories, l, n, l.chartData.xAxisData.eachSpacing, s),
+			e = t.xAxisHeight,
+			a = t.angle;
+		n.xAxisHeight = e;
+		n._xAxisTextAngle_ = a;
+		l.area[2] += e;
+		l.chartData.categoriesData = t
+	} else {
+		if (l.type === "line" || l.type === "area" || l.type === "scatter" || l.type === "bubble" || l.type === "bar") {
+			l.chartData.xAxisData = calXAxisData(c, l, n, s);
+			d = l.chartData.xAxisData.rangesFormat;
+			let t = calCategoriesData(d, l, n, l.chartData.xAxisData.eachSpacing, s),
+				e = t.xAxisHeight,
+				a = t.angle;
+			n.xAxisHeight = e;
+			n._xAxisTextAngle_ = a;
+			l.area[2] += e;
+			l.chartData.categoriesData = t
+		} else {
+			l.chartData.xAxisData = {
+				xAxisPoints: []
+			}
+		}
+	}
+	if (l.enableScroll && l.xAxis.scrollAlign == "right" && l._scrollDistance_ === undefined) {
+		let t = 0,
+			e = l.chartData.xAxisData.xAxisPoints,
+			a = l.chartData.xAxisData.startX,
+			i = l.chartData.xAxisData.endX,
+			r = l.chartData.xAxisData.eachSpacing;
+		let o = r * (e.length - 1);
+		let n = i - a;
+		t = n - o;
+		h.scrollOption.currentOffset = t;
+		h.scrollOption.startTouchX = t;
+		h.scrollOption.distance = 0;
+		h.scrollOption.lastMoveTime = 0;
+		l._scrollDistance_ = t
+	}
+	if (t === "pie" || t === "ring" || t === "rose") {
+		n._pieTextMaxLength_ = l.dataLabel === false ? 0 : getPieTextMaxLength(x, n, s, l)
+	}
+	switch (t) {
+		case "word":
+			this.animationInstance = new Animation({
+				timing: l.timing,
+				duration: e,
+				onProcess: function(t) {
+					s.clearRect(0, 0, l.width, l.height);
+					if (l.rotate) {
+						contextRotate(s, l)
+					}
+					drawWordCloudDataPoints(c, l, n, s, t);
+					drawCanvas(l, s)
+				},
+				onAnimationFinish: function t() {
+					h.uevent.trigger("renderComplete")
+				}
+			});
+			break;
+		case "map":
+			s.clearRect(0, 0, l.width, l.height);
+			drawMapDataPoints(c, l, n, s);
+			setTimeout(() => {
+				this.uevent.trigger("renderComplete")
+			}, 50);
+			break;
+		case "funnel":
+			this.animationInstance = new Animation({
+				timing: l.timing,
+				duration: e,
+				onProcess: function(t) {
+					s.clearRect(0, 0, l.width, l.height);
+					if (l.rotate) {
+						contextRotate(s, l)
+					}
+					l.chartData.funnelData = drawFunnelDataPoints(c, l, n, s, t);
+					drawLegend(l.series, l, n, s, l.chartData);
+					drawToolTipBridge(l, n, s, t);
+					drawCanvas(l, s)
+				},
+				onAnimationFinish: function t() {
+					h.uevent.trigger("renderComplete")
+				}
+			});
+			break;
+		case "line":
+			this.animationInstance = new Animation({
+				timing: l.timing,
+				duration: e,
+				onProcess: function t(e) {
+					s.clearRect(0, 0, l.width, l.height);
+					if (l.rotate) {
+						contextRotate(s, l)
+					}
+					drawYAxisGrid(d, l, n, s);
+					drawXAxis(d, l, n, s);
+					var a = drawLineDataPoints(c, l, n, s, e),
+						i = a.xAxisPoints,
+						r = a.calPoints,
+						o = a.eachSpacing;
+					l.chartData.xAxisPoints = i;
+					l.chartData.calPoints = r;
+					l.chartData.eachSpacing = o;
+					drawYAxis(c, l, n, s);
+					if (l.enableMarkLine !== false && e === 1) {
+						drawMarkLine(l, n, s)
+					}
+					drawLegend(l.series, l, n, s, l.chartData);
+					drawToolTipBridge(l, n, s, e, o, i);
+					drawCanvas(l, s)
+				},
+				onAnimationFinish: function t() {
+					h.uevent.trigger("renderComplete")
+				}
+			});
+			break;
+		case "scatter":
+			this.animationInstance = new Animation({
+				timing: l.timing,
+				duration: e,
+				onProcess: function t(e) {
+					s.clearRect(0, 0, l.width, l.height);
+					if (l.rotate) {
+						contextRotate(s, l)
+					}
+					drawYAxisGrid(d, l, n, s);
+					drawXAxis(d, l, n, s);
+					var a = drawScatterDataPoints(c, l, n, s, e),
+						i = a.xAxisPoints,
+						r = a.calPoints,
+						o = a.eachSpacing;
+					l.chartData.xAxisPoints = i;
+					l.chartData.calPoints = r;
+					l.chartData.eachSpacing = o;
+					drawYAxis(c, l, n, s);
+					if (l.enableMarkLine !== false && e === 1) {
+						drawMarkLine(l, n, s)
+					}
+					drawLegend(l.series, l, n, s, l.chartData);
+					drawToolTipBridge(l, n, s, e, o, i);
+					drawCanvas(l, s)
+				},
+				onAnimationFinish: function t() {
+					h.uevent.trigger("renderComplete")
+				}
+			});
+			break;
+		case "bubble":
+			this.animationInstance = new Animation({
+				timing: l.timing,
+				duration: e,
+				onProcess: function t(e) {
+					s.clearRect(0, 0, l.width, l.height);
+					if (l.rotate) {
+						contextRotate(s, l)
+					}
+					drawYAxisGrid(d, l, n, s);
+					drawXAxis(d, l, n, s);
+					var a = drawBubbleDataPoints(c, l, n, s, e),
+						i = a.xAxisPoints,
+						r = a.calPoints,
+						o = a.eachSpacing;
+					l.chartData.xAxisPoints = i;
+					l.chartData.calPoints = r;
+					l.chartData.eachSpacing = o;
+					drawYAxis(c, l, n, s);
+					if (l.enableMarkLine !== false && e === 1) {
+						drawMarkLine(l, n, s)
+					}
+					drawLegend(l.series, l, n, s, l.chartData);
+					drawToolTipBridge(l, n, s, e, o, i);
+					drawCanvas(l, s)
+				},
+				onAnimationFinish: function t() {
+					h.uevent.trigger("renderComplete")
+				}
+			});
+			break;
+		case "mix":
+			this.animationInstance = new Animation({
+				timing: l.timing,
+				duration: e,
+				onProcess: function t(e) {
+					s.clearRect(0, 0, l.width, l.height);
+					if (l.rotate) {
+						contextRotate(s, l)
+					}
+					drawYAxisGrid(d, l, n, s);
+					drawXAxis(d, l, n, s);
+					var a = drawMixDataPoints(c, l, n, s, e),
+						i = a.xAxisPoints,
+						r = a.calPoints,
+						o = a.eachSpacing;
+					l.chartData.xAxisPoints = i;
+					l.chartData.calPoints = r;
+					l.chartData.eachSpacing = o;
+					drawYAxis(c, l, n, s);
+					if (l.enableMarkLine !== false && e === 1) {
+						drawMarkLine(l, n, s)
+					}
+					drawLegend(l.series, l, n, s, l.chartData);
+					drawToolTipBridge(l, n, s, e, o, i);
+					drawCanvas(l, s)
+				},
+				onAnimationFinish: function t() {
+					h.uevent.trigger("renderComplete")
+				}
+			});
+			break;
+		case "column":
+			this.animationInstance = new Animation({
+				timing: l.timing,
+				duration: e,
+				onProcess: function t(e) {
+					s.clearRect(0, 0, l.width, l.height);
+					if (l.rotate) {
+						contextRotate(s, l)
+					}
+					drawYAxisGrid(d, l, n, s);
+					drawXAxis(d, l, n, s);
+					var a = drawColumnDataPoints(c, l, n, s, e),
+						i = a.xAxisPoints,
+						r = a.calPoints,
+						o = a.eachSpacing;
+					l.chartData.xAxisPoints = i;
+					l.chartData.calPoints = r;
+					l.chartData.eachSpacing = o;
+					drawYAxis(c, l, n, s);
+					if (l.enableMarkLine !== false && e === 1) {
+						drawMarkLine(l, n, s)
+					}
+					drawLegend(l.series, l, n, s, l.chartData);
+					drawToolTipBridge(l, n, s, e, o, i);
+					drawCanvas(l, s)
+				},
+				onAnimationFinish: function t() {
+					h.uevent.trigger("renderComplete")
+				}
+			});
+			break;
+		case "mount":
+			this.animationInstance = new Animation({
+				timing: l.timing,
+				duration: e,
+				onProcess: function t(e) {
+					s.clearRect(0, 0, l.width, l.height);
+					if (l.rotate) {
+						contextRotate(s, l)
+					}
+					drawYAxisGrid(d, l, n, s);
+					drawXAxis(d, l, n, s);
+					var a = drawMountDataPoints(c, l, n, s, e),
+						i = a.xAxisPoints,
+						r = a.calPoints,
+						o = a.eachSpacing;
+					l.chartData.xAxisPoints = i;
+					l.chartData.calPoints = r;
+					l.chartData.eachSpacing = o;
+					drawYAxis(c, l, n, s);
+					if (l.enableMarkLine !== false && e === 1) {
+						drawMarkLine(l, n, s)
+					}
+					drawLegend(l.series, l, n, s, l.chartData);
+					drawToolTipBridge(l, n, s, e, o, i);
+					drawCanvas(l, s)
+				},
+				onAnimationFinish: function t() {
+					h.uevent.trigger("renderComplete")
+				}
+			});
+			break;
+		case "bar":
+			this.animationInstance = new Animation({
+				timing: l.timing,
+				duration: e,
+				onProcess: function t(e) {
+					s.clearRect(0, 0, l.width, l.height);
+					if (l.rotate) {
+						contextRotate(s, l)
+					}
+					drawXAxis(d, l, n, s);
+					var a = drawBarDataPoints(c, l, n, s, e),
+						i = a.yAxisPoints,
+						r = a.calPoints,
+						o = a.eachSpacing;
+					l.chartData.yAxisPoints = i;
+					l.chartData.xAxisPoints = l.chartData.xAxisData.xAxisPoints;
+					l.chartData.calPoints = r;
+					l.chartData.eachSpacing = o;
+					drawYAxis(c, l, n, s);
+					if (l.enableMarkLine !== false && e === 1) {
+						drawMarkLine(l, n, s)
+					}
+					drawLegend(l.series, l, n, s, l.chartData);
+					drawToolTipBridge(l, n, s, e, o, i);
+					drawCanvas(l, s)
+				},
+				onAnimationFinish: function t() {
+					h.uevent.trigger("renderComplete")
+				}
+			});
+			break;
+		case "area":
+			this.animationInstance = new Animation({
+				timing: l.timing,
+				duration: e,
+				onProcess: function t(e) {
+					s.clearRect(0, 0, l.width, l.height);
+					if (l.rotate) {
+						contextRotate(s, l)
+					}
+					drawYAxisGrid(d, l, n, s);
+					drawXAxis(d, l, n, s);
+					var a = drawAreaDataPoints(c, l, n, s, e),
+						i = a.xAxisPoints,
+						r = a.calPoints,
+						o = a.eachSpacing;
+					l.chartData.xAxisPoints = i;
+					l.chartData.calPoints = r;
+					l.chartData.eachSpacing = o;
+					drawYAxis(c, l, n, s);
+					if (l.enableMarkLine !== false && e === 1) {
+						drawMarkLine(l, n, s)
+					}
+					drawLegend(l.series, l, n, s, l.chartData);
+					drawToolTipBridge(l, n, s, e, o, i);
+					drawCanvas(l, s)
+				},
+				onAnimationFinish: function t() {
+					h.uevent.trigger("renderComplete")
+				}
+			});
+			break;
+		case "ring":
+			this.animationInstance = new Animation({
+				timing: l.timing,
+				duration: e,
+				onProcess: function t(e) {
+					s.clearRect(0, 0, l.width, l.height);
+					if (l.rotate) {
+						contextRotate(s, l)
+					}
+					l.chartData.pieData = drawPieDataPoints(c, l, n, s, e);
+					drawLegend(l.series, l, n, s, l.chartData);
+					drawToolTipBridge(l, n, s, e);
+					drawCanvas(l, s)
+				},
+				onAnimationFinish: function t() {
+					h.uevent.trigger("renderComplete")
+				}
+			});
+			break;
+		case "pie":
+			this.animationInstance = new Animation({
+				timing: l.timing,
+				duration: e,
+				onProcess: function t(e) {
+					s.clearRect(0, 0, l.width, l.height);
+					if (l.rotate) {
+						contextRotate(s, l)
+					}
+					l.chartData.pieData = drawPieDataPoints(c, l, n, s, e);
+					drawLegend(l.series, l, n, s, l.chartData);
+					drawToolTipBridge(l, n, s, e);
+					drawCanvas(l, s)
+				},
+				onAnimationFinish: function t() {
+					h.uevent.trigger("renderComplete")
+				}
+			});
+			break;
+		case "rose":
+			this.animationInstance = new Animation({
+				timing: l.timing,
+				duration: e,
+				onProcess: function t(e) {
+					s.clearRect(0, 0, l.width, l.height);
+					if (l.rotate) {
+						contextRotate(s, l)
+					}
+					l.chartData.pieData = drawRoseDataPoints(c, l, n, s, e);
+					drawLegend(l.series, l, n, s, l.chartData);
+					drawToolTipBridge(l, n, s, e);
+					drawCanvas(l, s)
+				},
+				onAnimationFinish: function t() {
+					h.uevent.trigger("renderComplete")
+				}
+			});
+			break;
+		case "radar":
+			this.animationInstance = new Animation({
+				timing: l.timing,
+				duration: e,
+				onProcess: function t(e) {
+					s.clearRect(0, 0, l.width, l.height);
+					if (l.rotate) {
+						contextRotate(s, l)
+					}
+					l.chartData.radarData = drawRadarDataPoints(c, l, n, s, e);
+					drawLegend(l.series, l, n, s, l.chartData);
+					drawToolTipBridge(l, n, s, e);
+					drawCanvas(l, s)
+				},
+				onAnimationFinish: function t() {
+					h.uevent.trigger("renderComplete")
+				}
+			});
+			break;
+		case "arcbar":
+			this.animationInstance = new Animation({
+				timing: l.timing,
+				duration: e,
+				onProcess: function t(e) {
+					s.clearRect(0, 0, l.width, l.height);
+					if (l.rotate) {
+						contextRotate(s, l)
+					}
+					l.chartData.arcbarData = drawArcbarDataPoints(c, l, n, s, e);
+					drawCanvas(l, s)
+				},
+				onAnimationFinish: function t() {
+					h.uevent.trigger("renderComplete")
+				}
+			});
+			break;
+		case "gauge":
+			this.animationInstance = new Animation({
+				timing: l.timing,
+				duration: e,
+				onProcess: function t(e) {
+					s.clearRect(0, 0, l.width, l.height);
+					if (l.rotate) {
+						contextRotate(s, l)
+					}
+					l.chartData.gaugeData = drawGaugeDataPoints(d, c, l, n, s, e);
+					drawCanvas(l, s)
+				},
+				onAnimationFinish: function t() {
+					h.uevent.trigger("renderComplete")
+				}
+			});
+			break;
+		case "candle":
+			this.animationInstance = new Animation({
+				timing: l.timing,
+				duration: e,
+				onProcess: function t(e) {
+					s.clearRect(0, 0, l.width, l.height);
+					if (l.rotate) {
+						contextRotate(s, l)
+					}
+					drawYAxisGrid(d, l, n, s);
+					drawXAxis(d, l, n, s);
+					var a = drawCandleDataPoints(c, x, l, n, s, e),
+						i = a.xAxisPoints,
+						r = a.calPoints,
+						o = a.eachSpacing;
+					l.chartData.xAxisPoints = i;
+					l.chartData.calPoints = r;
+					l.chartData.eachSpacing = o;
+					drawYAxis(c, l, n, s);
+					if (l.enableMarkLine !== false && e === 1) {
+						drawMarkLine(l, n, s)
+					}
+					if (x) {
+						drawLegend(x, l, n, s, l.chartData)
+					} else {
+						drawLegend(l.series, l, n, s, l.chartData)
+					}
+					drawToolTipBridge(l, n, s, e, o, i);
+					drawCanvas(l, s)
+				},
+				onAnimationFinish: function t() {
+					h.uevent.trigger("renderComplete")
+				}
+			});
+			break
+	}
+}
+
+function uChartsEvent() {
+	this.events = {}
+}
+uChartsEvent.prototype.addEventListener = function(t, e) {
+	this.events[t] = this.events[t] || [];
+	this.events[t].push(e)
+};
+uChartsEvent.prototype.delEventListener = function(t) {
+	this.events[t] = []
+};
+uChartsEvent.prototype.trigger = function() {
+	for (var t = arguments.length, e = Array(t), a = 0; a < t; a++) {
+		e[a] = arguments[a]
+	}
+	var i = e[0];
+	var r = e.slice(1);
+	if (!!this.events[i]) {
+		this.events[i].forEach(function(t) {
+			try {
+				t.apply(null, r)
+			} catch (t) {}
+		})
+	}
+};
+var uCharts = function t(a) {
+	a.pix = a.pixelRatio ? a.pixelRatio : 1;
+	a.fontSize = a.fontSize ? a.fontSize : 13;
+	a.fontColor = a.fontColor ? a.fontColor : config.fontColor;
+	if (a.background == "" || a.background == "none") {
+		a.background = "#FFFFFF"
+	}
+	a.title = assign({}, a.title);
+	a.subtitle = assign({}, a.subtitle);
+	a.duration = a.duration ? a.duration : 1e3;
+	a.yAxis = assign({}, {
+		data: [],
+		showTitle: false,
+		disabled: false,
+		disableGrid: false,
+		gridSet: "number",
+		splitNumber: 5,
+		gridType: "solid",
+		dashLength: 4 * a.pix,
+		gridColor: "#cccccc",
+		padding: 10,
+		fontColor: "#666666"
+	}, a.yAxis);
+	a.xAxis = assign({}, {
+		rotateLabel: false,
+		rotateAngle: 45,
+		disabled: false,
+		disableGrid: false,
+		splitNumber: 5,
+		calibration: false,
+		fontColor: "#666666",
+		fontSize: 13,
+		lineHeight: 20,
+		marginTop: 0,
+		gridType: "solid",
+		dashLength: 4,
+		scrollAlign: "left",
+		boundaryGap: "center",
+		axisLine: true,
+		axisLineColor: "#cccccc",
+		titleFontSize: 13,
+		titleOffsetY: 0,
+		titleOffsetX: 0,
+		titleFontColor: "#666666"
+	}, a.xAxis);
+	a.xAxis.scrollPosition = a.xAxis.scrollAlign;
+	a.legend = assign({}, {
+		show: true,
+		position: "bottom",
+		float: "center",
+		backgroundColor: "rgba(0,0,0,0)",
+		borderColor: "rgba(0,0,0,0)",
+		borderWidth: 0,
+		padding: 5,
+		margin: 5,
+		itemGap: 10,
+		fontSize: a.fontSize,
+		lineHeight: a.fontSize,
+		fontColor: a.fontColor,
+		formatter: {},
+		hiddenColor: "#CECECE"
+	}, a.legend);
+	a.extra = assign({
+		tooltip: {
+			legendShape: "auto"
+		}
+	}, a.extra);
+	a.rotate = a.rotate ? true : false;
+	a.animation = a.animation ? true : false;
+	a.rotate = a.rotate ? true : false;
+	a.canvas2d = a.canvas2d ? true : false;
+	let e = assign({}, config);
+	e.color = a.color ? a.color : e.color;
+	if (a.type == "pie") {
+		e.pieChartLinePadding = a.dataLabel === false ? 0 : a.extra.pie.labelWidth * a.pix || e.pieChartLinePadding * a
+			.pix
+	}
+	if (a.type == "ring") {
+		e.pieChartLinePadding = a.dataLabel === false ? 0 : a.extra.ring.labelWidth * a.pix || e.pieChartLinePadding * a
+			.pix
+	}
+	if (a.type == "rose") {
+		e.pieChartLinePadding = a.dataLabel === false ? 0 : a.extra.rose.labelWidth * a.pix || e.pieChartLinePadding * a
+			.pix
+	}
+	e.pieChartTextPadding = a.dataLabel === false ? 0 : e.pieChartTextPadding * a.pix;
+	e.rotate = a.rotate;
+	if (a.rotate) {
+		let t = a.width;
+		let e = a.height;
+		a.width = e;
+		a.height = t
+	}
+	a.padding = a.padding ? a.padding : e.padding;
+	e.yAxisWidth = config.yAxisWidth * a.pix;
+	e.fontSize = a.fontSize * a.pix;
+	e.titleFontSize = config.titleFontSize * a.pix;
+	e.subtitleFontSize = config.subtitleFontSize * a.pix;
+	if (!a.context) {
+		throw new Error("[uCharts] 未获取到context！注意：v2.0版本后，需要自行获取canvas的绘图上下文并传入opts.context！")
+	}
+	this.context = a.context;
+	if (!this.context.setTextAlign) {
+		this.context.setStrokeStyle = function(t) {
+			return this.strokeStyle = t
+		};
+		this.context.setLineWidth = function(t) {
+			return this.lineWidth = t
+		};
+		this.context.setLineCap = function(t) {
+			return this.lineCap = t
+		};
+		this.context.setFontSize = function(t) {
+			return this.font = t + "px sans-serif"
+		};
+		this.context.setFillStyle = function(t) {
+			return this.fillStyle = t
+		};
+		this.context.setTextAlign = function(t) {
+			return this.textAlign = t
+		};
+		this.context.setTextBaseline = function(t) {
+			return this.textBaseline = t
+		};
+		this.context.setShadow = function(t, e, a, i) {
+			this.shadowColor = i;
+			this.shadowOffsetX = t;
+			this.shadowOffsetY = e;
+			this.shadowBlur = a
+		};
+		this.context.draw = function() {}
+	}
+	if (!this.context.setLineDash) {
+		this.context.setLineDash = function(t) {}
+	}
+	a.chartData = {};
+	this.uevent = new uChartsEvent;
+	this.scrollOption = {
+		currentOffset: 0,
+		startTouchX: 0,
+		distance: 0,
+		lastMoveTime: 0
+	};
+	this.opts = a;
+	this.config = e;
+	drawCharts.call(this, a.type, a, e, this.context)
+};
+uCharts.prototype.updateData = function() {
+	let t = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+	this.opts = assign({}, this.opts, t);
+	this.opts.updateData = true;
+	let c = t.scrollPosition || "current";
+	switch (c) {
+		case "current":
+			this.opts._scrollDistance_ = this.scrollOption.currentOffset;
+			break;
+		case "left":
+			this.opts._scrollDistance_ = 0;
+			this.scrollOption = {
+				currentOffset: 0,
+				startTouchX: 0,
+				distance: 0,
+				lastMoveTime: 0
+			};
+			break;
+		case "right":
+			let t = calYAxisData(this.opts.series, this.opts, this.config, this.context),
+				e = t.yAxisWidth;
+			this.config.yAxisWidth = e;
+			let a = 0;
+			let i = getXAxisPoints(this.opts.categories, this.opts, this.config),
+				r = i.xAxisPoints,
+				o = i.startX,
+				n = i.endX,
+				l = i.eachSpacing;
+			let s = l * (r.length - 1);
+			let h = n - o;
+			a = h - s;
+			this.scrollOption = {
+				currentOffset: a,
+				startTouchX: a,
+				distance: 0,
+				lastMoveTime: 0
+			};
+			this.opts._scrollDistance_ = a;
+			break
+	}
+	drawCharts.call(this, this.opts.type, this.opts, this.config, this.context)
+};
+uCharts.prototype.zoom = function() {
+	var t = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.opts.xAxis.itemCount;
+	if (this.opts.enableScroll !== true) {
+		console.log("[uCharts] 请启用滚动条后使用");
+		return
+	}
+	let e = Math.round(Math.abs(this.scrollOption.currentOffset) / this.opts.chartData.eachSpacing) + Math.round(this
+		.opts.xAxis.itemCount / 2);
+	this.opts.animation = false;
+	this.opts.xAxis.itemCount = t.itemCount;
+	let a = calYAxisData(this.opts.series, this.opts, this.config, this.context),
+		i = a.yAxisWidth;
+	this.config.yAxisWidth = i;
+	let r = 0;
+	let o = getXAxisPoints(this.opts.categories, this.opts, this.config),
+		h = o.xAxisPoints,
+		c = o.startX,
+		d = o.endX,
+		n = o.eachSpacing;
+	let x = n * e;
+	let l = d - c;
+	let s = l - n * (h.length - 1);
+	r = l / 2 - x;
+	if (r > 0) {
+		r = 0
+	}
+	if (r < s) {
+		r = s
+	}
+	this.scrollOption = {
+		currentOffset: r,
+		startTouchX: 0,
+		distance: 0,
+		lastMoveTime: 0
+	};
+	calValidDistance(this, r, this.opts.chartData, this.config, this.opts);
+	this.opts._scrollDistance_ = r;
+	drawCharts.call(this, this.opts.type, this.opts, this.config, this.context)
+};
+uCharts.prototype.dobuleZoom = function(t) {
+	if (this.opts.enableScroll !== true) {
+		console.log("[uCharts] 请启用滚动条后使用");
+		return
+	}
+	const a = t.changedTouches;
+	if (a.length < 2) {
+		return
+	}
+	for (var e = 0; e < a.length; e++) {
+		a[e].x = a[e].x ? a[e].x : a[e].clientX;
+		a[e].y = a[e].y ? a[e].y : a[e].clientY
+	}
+	const i = [getTouches(a[0], this.opts, t), getTouches(a[1], this.opts, t)];
+	const c = Math.abs(i[0].x - i[1].x);
+	if (!this.scrollOption.moveCount) {
+		let t = {
+			changedTouches: [{
+				x: a[0].x,
+				y: this.opts.area[0] / this.opts.pix + 2
+			}]
+		};
+		let e = {
+			changedTouches: [{
+				x: a[1].x,
+				y: this.opts.area[0] / this.opts.pix + 2
+			}]
+		};
+		if (this.opts.rotate) {
+			t = {
+				changedTouches: [{
+					x: this.opts.height / this.opts.pix - this.opts.area[0] / this.opts.pix - 2,
+					y: a[0].y
+				}]
+			};
+			e = {
+				changedTouches: [{
+					x: this.opts.height / this.opts.pix - this.opts.area[0] / this.opts.pix - 2,
+					y: a[1].y
+				}]
+			}
+		}
+		const s = this.getCurrentDataIndex(t).index;
+		const h = this.getCurrentDataIndex(e).index;
+		const v = Math.abs(s - h);
+		this.scrollOption.moveCount = v;
+		this.scrollOption.moveCurrent1 = Math.min(s, h);
+		this.scrollOption.moveCurrent2 = Math.max(s, h);
+		return
+	}
+	let d = c / this.scrollOption.moveCount;
+	let r = (this.opts.width - this.opts.area[1] - this.opts.area[3]) / d;
+	r = r <= 2 ? 2 : r;
+	r = r >= this.opts.categories.length ? this.opts.categories.length : r;
+	this.opts.animation = false;
+	this.opts.xAxis.itemCount = r;
+	let o = 0;
+	let n = getXAxisPoints(this.opts.categories, this.opts, this.config),
+		x = n.xAxisPoints,
+		f = n.startX,
+		p = n.endX,
+		l = n.eachSpacing;
+	let u = l * this.scrollOption.moveCurrent1;
+	let g = p - f;
+	let y = g - l * (x.length - 1);
+	o = -u + Math.min(i[0].x, i[1].x) - this.opts.area[3] - l;
+	if (o > 0) {
+		o = 0
+	}
+	if (o < y) {
+		o = y
+	}
+	this.scrollOption.currentOffset = o;
+	this.scrollOption.startTouchX = 0;
+	this.scrollOption.distance = 0;
+	calValidDistance(this, o, this.opts.chartData, this.config, this.opts);
+	this.opts._scrollDistance_ = o;
+	drawCharts.call(this, this.opts.type, this.opts, this.config, this.context)
+};
+uCharts.prototype.stopAnimation = function() {
+	this.animationInstance && this.animationInstance.stop()
+};
+uCharts.prototype.addEventListener = function(t, e) {
+	this.uevent.addEventListener(t, e)
+};
+uCharts.prototype.delEventListener = function(t) {
+	this.uevent.delEventListener(t)
+};
+uCharts.prototype.getCurrentDataIndex = function(e) {
+	var a = null;
+	if (e.changedTouches) {
+		a = e.changedTouches[0]
+	} else {
+		a = e.mp.changedTouches[0]
+	}
+	if (a) {
+		let t = getTouches(a, this.opts, e);
+		if (this.opts.type === "pie" || this.opts.type === "ring") {
+			return findPieChartCurrentIndex({
+				x: t.x,
+				y: t.y
+			}, this.opts.chartData.pieData, this.opts)
+		} else if (this.opts.type === "rose") {
+			return findRoseChartCurrentIndex({
+				x: t.x,
+				y: t.y
+			}, this.opts.chartData.pieData, this.opts)
+		} else if (this.opts.type === "radar") {
+			return findRadarChartCurrentIndex({
+				x: t.x,
+				y: t.y
+			}, this.opts.chartData.radarData, this.opts.categories.length)
+		} else if (this.opts.type === "funnel") {
+			return findFunnelChartCurrentIndex({
+				x: t.x,
+				y: t.y
+			}, this.opts.chartData.funnelData)
+		} else if (this.opts.type === "map") {
+			return findMapChartCurrentIndex({
+				x: t.x,
+				y: t.y
+			}, this.opts)
+		} else if (this.opts.type === "word") {
+			return findWordChartCurrentIndex({
+				x: t.x,
+				y: t.y
+			}, this.opts.chartData.wordCloudData)
+		} else if (this.opts.type === "bar") {
+			return findBarChartCurrentIndex({
+				x: t.x,
+				y: t.y
+			}, this.opts.chartData.calPoints, this.opts, this.config, Math.abs(this.scrollOption.currentOffset))
+		} else {
+			return findCurrentIndex({
+				x: t.x,
+				y: t.y
+			}, this.opts.chartData.calPoints, this.opts, this.config, Math.abs(this.scrollOption.currentOffset))
+		}
+	}
+	return -1
+};
+uCharts.prototype.getLegendDataIndex = function(e) {
+	var a = null;
+	if (e.changedTouches) {
+		a = e.changedTouches[0]
+	} else {
+		a = e.mp.changedTouches[0]
+	}
+	if (a) {
+		let t = getTouches(a, this.opts, e);
+		return findLegendIndex({
+			x: t.x,
+			y: t.y
+		}, this.opts.chartData.legendData)
+	}
+	return -1
+};
+uCharts.prototype.touchLegend = function(t) {
+	var e = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+	var a = null;
+	if (t.changedTouches) {
+		a = t.changedTouches[0]
+	} else {
+		a = t.mp.changedTouches[0]
+	}
+	if (a) {
+		var i = getTouches(a, this.opts, t);
+		var r = this.getLegendDataIndex(t);
+		if (r >= 0) {
+			if (this.opts.type == "candle") {
+				this.opts.seriesMA[r].show = !this.opts.seriesMA[r].show
+			} else {
+				this.opts.series[r].show = !this.opts.series[r].show
+			}
+			this.opts.animation = e.animation ? true : false;
+			this.opts._scrollDistance_ = this.scrollOption.currentOffset;
+			drawCharts.call(this, this.opts.type, this.opts, this.config, this.context)
+		}
+	}
+};
+uCharts.prototype.showToolTip = function(t) {
+	var e = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+	var c = null;
+	if (t.changedTouches) {
+		c = t.changedTouches[0]
+	} else {
+		c = t.mp.changedTouches[0]
+	}
+	if (!c) {
+		console.log("[uCharts] 未获取到event坐标信息")
+	}
+	var a = getTouches(c, this.opts, t);
+	var d = this.scrollOption.currentOffset;
+	var i = assign({}, this.opts, {
+		_scrollDistance_: d,
+		animation: false
+	});
+	if (this.opts.type === "line" || this.opts.type === "area" || this.opts.type === "column" || this.opts.type ===
+		"scatter" || this.opts.type === "bubble") {
+		var r = this.getCurrentDataIndex(t);
+		var o = e.index == undefined ? r.index : e.index;
+		if (o > -1 || o.length > 0) {
+			var n = getSeriesDataItem(this.opts.series, o, r.group);
+			if (n.length !== 0) {
+				var l = getToolTipData(n, this.opts, o, r.group, this.opts.categories, e),
+					s = l.textList,
+					h = l.offset;
+				h.y = a.y;
+				i.tooltip = {
+					textList: e.textList !== undefined ? e.textList : s,
+					offset: e.offset !== undefined ? e.offset : h,
+					option: e,
+					index: o,
+					group: r.group
+				}
+			}
+		}
+		drawCharts.call(this, i.type, i, this.config, this.context)
+	}
+	if (this.opts.type === "mount") {
+		var o = e.index == undefined ? this.getCurrentDataIndex(t).index : e.index;
+		if (o > -1) {
+			var i = assign({}, this.opts, {
+				animation: false
+			});
+			var n = assign({}, i._series_[o]);
+			var s = [{
+				text: e.formatter ? e.formatter(n, undefined, o, i) : n.name + ": " + n.data,
+				color: n.color,
+				legendShape: this.opts.extra.tooltip.legendShape == "auto" ? n.legendShape : this.opts.extra.tooltip
+					.legendShape
+			}];
+			var h = {
+				x: i.chartData.calPoints[o].x,
+				y: a.y
+			};
+			i.tooltip = {
+				textList: e.textList ? e.textList : s,
+				offset: e.offset !== undefined ? e.offset : h,
+				option: e,
+				index: o
+			}
+		}
+		drawCharts.call(this, i.type, i, this.config, this.context)
+	}
+	if (this.opts.type === "bar") {
+		var r = this.getCurrentDataIndex(t);
+		var o = e.index == undefined ? r.index : e.index;
+		if (o > -1 || o.length > 0) {
+			var n = getSeriesDataItem(this.opts.series, o, r.group);
+			if (n.length !== 0) {
+				var l = getToolTipData(n, this.opts, o, r.group, this.opts.categories, e),
+					s = l.textList,
+					h = l.offset;
+				h.x = a.x;
+				i.tooltip = {
+					textList: e.textList !== undefined ? e.textList : s,
+					offset: e.offset !== undefined ? e.offset : h,
+					option: e,
+					index: o
+				}
+			}
+		}
+		drawCharts.call(this, i.type, i, this.config, this.context)
+	}
+	if (this.opts.type === "mix") {
+		var r = this.getCurrentDataIndex(t);
+		var o = e.index == undefined ? r.index : e.index;
+		if (o > -1) {
+			var d = this.scrollOption.currentOffset;
+			var i = assign({}, this.opts, {
+				_scrollDistance_: d,
+				animation: false
+			});
+			var n = getSeriesDataItem(this.opts.series, o);
+			if (n.length !== 0) {
+				var x = getMixToolTipData(n, this.opts, o, this.opts.categories, e),
+					s = x.textList,
+					h = x.offset;
+				h.y = a.y;
+				i.tooltip = {
+					textList: e.textList ? e.textList : s,
+					offset: e.offset !== undefined ? e.offset : h,
+					option: e,
+					index: o
+				}
+			}
+		}
+		drawCharts.call(this, i.type, i, this.config, this.context)
+	}
+	if (this.opts.type === "candle") {
+		var r = this.getCurrentDataIndex(t);
+		var o = e.index == undefined ? r.index : e.index;
+		if (o > -1) {
+			var d = this.scrollOption.currentOffset;
+			var i = assign({}, this.opts, {
+				_scrollDistance_: d,
+				animation: false
+			});
+			var n = getSeriesDataItem(this.opts.series, o);
+			if (n.length !== 0) {
+				var l = getCandleToolTipData(this.opts.series[0].data, n, this.opts, o, this.opts.categories, this.opts.extra
+						.candle, e),
+					s = l.textList,
+					h = l.offset;
+				h.y = a.y;
+				i.tooltip = {
+					textList: e.textList ? e.textList : s,
+					offset: e.offset !== undefined ? e.offset : h,
+					option: e,
+					index: o
+				}
+			}
+		}
+		drawCharts.call(this, i.type, i, this.config, this.context)
+	}
+	if (this.opts.type === "pie" || this.opts.type === "ring" || this.opts.type === "rose" || this.opts.type ===
+		"funnel") {
+		var o = e.index == undefined ? this.getCurrentDataIndex(t) : e.index;
+		if (o > -1) {
+			var i = assign({}, this.opts, {
+				animation: false
+			});
+			var n = assign({}, i._series_[o]);
+			var s = [{
+				text: e.formatter ? e.formatter(n, undefined, o, i) : n.name + ": " + n.data,
+				color: n.color,
+				legendShape: this.opts.extra.tooltip.legendShape == "auto" ? n.legendShape : this.opts.extra.tooltip
+					.legendShape
+			}];
+			var h = {
+				x: a.x,
+				y: a.y
+			};
+			i.tooltip = {
+				textList: e.textList ? e.textList : s,
+				offset: e.offset !== undefined ? e.offset : h,
+				option: e,
+				index: o
+			}
+		}
+		drawCharts.call(this, i.type, i, this.config, this.context)
+	}
+	if (this.opts.type === "map") {
+		var o = e.index == undefined ? this.getCurrentDataIndex(t) : e.index;
+		if (o > -1) {
+			var i = assign({}, this.opts, {
+				animation: false
+			});
+			var n = assign({}, this.opts.series[o]);
+			n.name = n.properties.name;
+			var s = [{
+				text: e.formatter ? e.formatter(n, undefined, o, this.opts) : n.name,
+				color: n.color,
+				legendShape: this.opts.extra.tooltip.legendShape == "auto" ? n.legendShape : this.opts.extra.tooltip
+					.legendShape
+			}];
+			var h = {
+				x: a.x,
+				y: a.y
+			};
+			i.tooltip = {
+				textList: e.textList ? e.textList : s,
+				offset: e.offset !== undefined ? e.offset : h,
+				option: e,
+				index: o
+			}
+		}
+		i.updateData = false;
+		drawCharts.call(this, i.type, i, this.config, this.context)
+	}
+	if (this.opts.type === "word") {
+		var o = e.index == undefined ? this.getCurrentDataIndex(t) : e.index;
+		if (o > -1) {
+			var i = assign({}, this.opts, {
+				animation: false
+			});
+			var n = assign({}, this.opts.series[o]);
+			var s = [{
+				text: e.formatter ? e.formatter(n, undefined, o, this.opts) : n.name,
+				color: n.color,
+				legendShape: this.opts.extra.tooltip.legendShape == "auto" ? n.legendShape : this.opts.extra.tooltip
+					.legendShape
+			}];
+			var h = {
+				x: a.x,
+				y: a.y
+			};
+			i.tooltip = {
+				textList: e.textList ? e.textList : s,
+				offset: e.offset !== undefined ? e.offset : h,
+				option: e,
+				index: o
+			}
+		}
+		i.updateData = false;
+		drawCharts.call(this, i.type, i, this.config, this.context)
+	}
+	if (this.opts.type === "radar") {
+		var o = e.index == undefined ? this.getCurrentDataIndex(t) : e.index;
+		if (o > -1) {
+			var i = assign({}, this.opts, {
+				animation: false
+			});
+			var n = getSeriesDataItem(this.opts.series, o);
+			if (n.length !== 0) {
+				var s = n.map(t => {
+					return {
+						text: e.formatter ? e.formatter(t, this.opts.categories[o], o, this.opts) : t.name + ": " + t.data,
+						color: t.color,
+						legendShape: this.opts.extra.tooltip.legendShape == "auto" ? t.legendShape : this.opts.extra.tooltip
+							.legendShape
+					}
+				});
+				var h = {
+					x: a.x,
+					y: a.y
+				};
+				i.tooltip = {
+					textList: e.textList ? e.textList : s,
+					offset: e.offset !== undefined ? e.offset : h,
+					option: e,
+					index: o
+				}
+			}
+		}
+		drawCharts.call(this, i.type, i, this.config, this.context)
+	}
+};
+uCharts.prototype.translate = function(t) {
+	this.scrollOption = {
+		currentOffset: t,
+		startTouchX: t,
+		distance: 0,
+		lastMoveTime: 0
+	};
+	let e = assign({}, this.opts, {
+		_scrollDistance_: t,
+		animation: false
+	});
+	drawCharts.call(this, this.opts.type, e, this.config, this.context)
+};
+uCharts.prototype.scrollStart = function(t) {
+	var e = null;
+	if (t.changedTouches) {
+		e = t.changedTouches[0]
+	} else {
+		e = t.mp.changedTouches[0]
+	}
+	var a = getTouches(e, this.opts, t);
+	if (e && this.opts.enableScroll === true) {
+		this.scrollOption.startTouchX = a.x
+	}
+};
+uCharts.prototype.scroll = function(t) {
+	if (this.scrollOption.lastMoveTime === 0) {
+		this.scrollOption.lastMoveTime = Date.now()
+	}
+	let e = this.opts.touchMoveLimit || 60;
+	let a = Date.now();
+	let i = a - this.scrollOption.lastMoveTime;
+	if (i < Math.floor(1e3 / e)) return;
+	if (this.scrollOption.startTouchX == 0) return;
+	this.scrollOption.lastMoveTime = a;
+	var r = null;
+	if (t.changedTouches) {
+		r = t.changedTouches[0]
+	} else {
+		r = t.mp.changedTouches[0]
+	}
+	if (r && this.opts.enableScroll === true) {
+		var o = getTouches(r, this.opts, t);
+		var n;
+		n = o.x - this.scrollOption.startTouchX;
+		var l = this.scrollOption.currentOffset;
+		var s = calValidDistance(this, l + n, this.opts.chartData, this.config, this.opts);
+		this.scrollOption.distance = n = s - l;
+		var h = assign({}, this.opts, {
+			_scrollDistance_: l + n,
+			animation: false
+		});
+		this.opts = h;
+		drawCharts.call(this, h.type, h, this.config, this.context);
+		return l + n
+	}
+};
+uCharts.prototype.scrollEnd = function(t) {
+	if (this.opts.enableScroll === true) {
+		var e = this.scrollOption,
+			a = e.currentOffset,
+			i = e.distance;
+		this.scrollOption.currentOffset = a + i;
+		this.scrollOption.distance = 0;
+		this.scrollOption.moveCount = 0
+	}
+};
+export default uCharts;
\ No newline at end of file
diff --git a/uni_modules/s-components/s-header/index.vue b/uni_modules/s-components/s-header/index.vue
index 5abb1f9..941b577 100644
--- a/uni_modules/s-components/s-header/index.vue
+++ b/uni_modules/s-components/s-header/index.vue
@@ -1,34 +1,18 @@
 <template>
   <view class="container">
-    <view class="fit-content"></view>
+    <!-- <view class="fit-content"></view> -->
     <view class="operation" v-if="isCustom">
       <slot></slot>
     </view>
     <view v-else>
       <view class="operation" v-if="isTab">
-        <view
-          class="wd-flex wd-items-center"
-          style="gap: 10px; padding: 4px 12px"
-        >
-          <u--image
-            src="/static/favicon.png"
-            width="24px"
-            height="24px"
-            mode="aspectFit"
-          ></u--image>
-          <text class="title">{{ title }}</text>
-        </view>
-      </view>
-      <view
-        class="operation wd-flex wd-flex-row wd-items-center"
-        style="gap: 10px; padding: 4px 12px"
-        v-else
-        @tap="goback"
-      >
-        <view class="icon-box">
-          <u-icon name="arrow-left" size="12"></u-icon>
-        </view>
-        <text class="title wd-text-16 wd-font-800">{{ title }}</text>
+        <u--image
+          src="/static/images/tabbers/logo.png"
+          width="48rpx"
+          height="48rpx"
+          mode="aspectFit"
+        ></u--image>
+        <text class="title">{{ title }}</text>
       </view>
     </view>
   </view>
@@ -63,18 +47,23 @@ export default {
 .container {
   background-color: #fff;
   z-index: 1;
-  .fit-content {
-    height: 6vh;
-  }
+  height: 176rpx;
+  position: relative;
   .operation {
-    padding: 12px 4px;
+    position: absolute;
+    bottom: 14rpx;
+    padding: 8rpx 24rpx;
+    display: flex;
+    flex-flow: row nowrap;
+    align-items: center;
+    gap: 8rpx;
     .title {
-      color: #000;
-      font-size: 16px;
+      color: #071437;
+      font-size: 32rpx;
       font-weight: bold;
     }
     .icon-box {
-      padding: 5px;
+      padding: 10rpx;
       border-radius: 50%;
     }
   }
diff --git a/uni_modules/s-components/s-tabber/index.vue b/uni_modules/s-components/s-tabber/index.vue
index bbb5c49..49de782 100644
--- a/uni_modules/s-components/s-tabber/index.vue
+++ b/uni_modules/s-components/s-tabber/index.vue
@@ -19,12 +19,12 @@
           height="24"
           v-else
         ></u--image>
-        <view class="name">
+        <view :class="[tab.code == selected ? 'isActive' : 'name']">
           {{ tab.name }}
         </view>
       </view>
     </view>
-    <view :style="{ height: isFit ? '50rpx' : '24rpx' }"></view>
+    <view :style="{ height: isFit ? '68rpx' : '24rpx' }"></view>
   </view>
 </template>
 
@@ -81,7 +81,7 @@ export default {
   },
   computed: {
     setClass() {
-      return this.$props.isTab ? 'container' : 'noTab'
+      return this.$props.isTab ? 'cs-tabber-container' : 'noTab'
     },
     isFit() {
       return uni.getStorageSync('SYSTEM').includes('iOS')
@@ -101,7 +101,7 @@ export default {
 </script>
 
 <style lang="scss">
-.container {
+.cs-tabber-container {
   background-color: #fff;
 }
 .noTab {
@@ -109,10 +109,10 @@ export default {
 .tabber {
   display: flex;
   flex-flow: row nowrap;
-  justify-content: space-around;
   align-items: center;
+  justify-content: space-around;
   border-top: 2rpx solid #f1f1f4;
-  padding: 24rpx 64rpx 0px 64rpx;
+  padding: 24rpx 48rpx 0px 48rpx;
   .tab {
     display: flex;
     flex-flow: column nowrap;
@@ -123,6 +123,11 @@ export default {
   }
   .isActive {
     color: #22c55e;
+    font-weight: 500;
+  }
+  .name {
+    color: #99a1b7;
+    font-weight: 400;
   }
 }
 </style>
diff --git a/uni_modules/uview-ui/components/u-count-to/u-count-to.vue b/uni_modules/uview-ui/components/u-count-to/u-count-to.vue
index 417b732..5050b27 100644
--- a/uni_modules/uview-ui/components/u-count-to/u-count-to.vue
+++ b/uni_modules/uview-ui/components/u-count-to/u-count-to.vue
@@ -1,16 +1,18 @@
 <template>
-	<text
-		class="u-count-num"
-		:style="{
-			fontSize: $u.addUnit(fontSize),
-			fontWeight: bold ? 'bold' : 'normal',
-			color: color
-		}"
-	>{{ displayValue }}</text>
+  <text
+    class="u-count-num"
+    :style="{
+      fontSize: $u.addUnit(fontSize),
+      fontWeight: bold ? bold : 'normal',
+      color: color
+    }"
+  >
+    {{ displayValue }}
+  </text>
 </template>
 
 <script>
-	import props from './props.js';
+import props from './props.js'
 /**
  * countTo 数字滚动
  * @description 该组件一般用于需要滚动数字到某一个值的场景，目标要求是一个递增的值。
@@ -30,155 +32,175 @@
  * @example <u-count-to ref="uCountTo" :end-val="endVal" :autoplay="autoplay"></u-count-to>
  */
 export default {
-	name: 'u-count-to',
-	data() {
-		return {
-			localStartVal: this.startVal,
-			displayValue: this.formatNumber(this.startVal),
-			printVal: null,
-			paused: false, // 是否暂停
-			localDuration: Number(this.duration),
-			startTime: null, // 开始的时间
-			timestamp: null, // 时间戳
-			remaining: null, // 停留的时间
-			rAF: null,
-			lastTime: 0 // 上一次的时间
-		};
-	},
-	mixins: [uni.$u.mpMixin, uni.$u.mixin,props],
-	computed: {
-		countDown() {
-			return this.startVal > this.endVal;
-		}
-	},
-	watch: {
-		startVal() {
-			this.autoplay && this.start();
-		},
-		endVal() {
-			this.autoplay && this.start();
-		}
-	},
-	mounted() {
-		this.autoplay && this.start();
-	},
-	methods: {
-		easingFn(t, b, c, d) {
-			return (c * (-Math.pow(2, (-10 * t) / d) + 1) * 1024) / 1023 + b;
-		},
-		requestAnimationFrame(callback) {
-			const currTime = new Date().getTime();
-			// 为了使setTimteout的尽可能的接近每秒60帧的效果
-			const timeToCall = Math.max(0, 16 - (currTime - this.lastTime));
-			const id = setTimeout(() => {
-				callback(currTime + timeToCall);
-			}, timeToCall);
-			this.lastTime = currTime + timeToCall;
-			return id;
-		},
-		cancelAnimationFrame(id) {
-			clearTimeout(id);
-		},
-		// 开始滚动数字
-		start() {
-			this.localStartVal = this.startVal;
-			this.startTime = null;
-			this.localDuration = this.duration;
-			this.paused = false;
-			this.rAF = this.requestAnimationFrame(this.count);
-		},
-		// 暂定状态，重新再开始滚动；或者滚动状态下，暂停
-		reStart() {
-			if (this.paused) {
-				this.resume();
-				this.paused = false;
-			} else {
-				this.stop();
-				this.paused = true;
-			}
-		},
-		// 暂停
-		stop() {
-			this.cancelAnimationFrame(this.rAF);
-		},
-		// 重新开始(暂停的情况下)
-		resume() {
-			if (!this.remaining) return
-			this.startTime = 0;
-			this.localDuration = this.remaining;
-			this.localStartVal = this.printVal;
-			this.requestAnimationFrame(this.count);
-		},
-		// 重置
-		reset() {
-			this.startTime = null;
-			this.cancelAnimationFrame(this.rAF);
-			this.displayValue = this.formatNumber(this.startVal);
-		},
-		count(timestamp) {
-			if (!this.startTime) this.startTime = timestamp;
-			this.timestamp = timestamp;
-			const progress = timestamp - this.startTime;
-			this.remaining = this.localDuration - progress;
-			if (this.useEasing) {
-				if (this.countDown) {
-					this.printVal = this.localStartVal - this.easingFn(progress, 0, this.localStartVal - this.endVal, this.localDuration);
-				} else {
-					this.printVal = this.easingFn(progress, this.localStartVal, this.endVal - this.localStartVal, this.localDuration);
-				}
-			} else {
-				if (this.countDown) {
-					this.printVal = this.localStartVal - (this.localStartVal - this.endVal) * (progress / this.localDuration);
-				} else {
-					this.printVal = this.localStartVal + (this.endVal - this.localStartVal) * (progress / this.localDuration);
-				}
-			}
-			if (this.countDown) {
-				this.printVal = this.printVal < this.endVal ? this.endVal : this.printVal;
-			} else {
-				this.printVal = this.printVal > this.endVal ? this.endVal : this.printVal;
-			}
-			this.displayValue = this.formatNumber(this.printVal) || 0;
-			if (progress < this.localDuration) {
-				this.rAF = this.requestAnimationFrame(this.count);
-			} else {
-				this.$emit('end');
-			}
-		},
-		// 判断是否数字
-		isNumber(val) {
-			return !isNaN(parseFloat(val));
-		},
-		formatNumber(num) {
-			// 将num转为Number类型，因为其值可能为字符串数值，调用toFixed会报错
-			num = Number(num);
-			num = num.toFixed(Number(this.decimals));
-			num += '';
-			const x = num.split('.');
-			let x1 = x[0];
-			const x2 = x.length > 1 ? this.decimal + x[1] : '';
-			const rgx = /(\d+)(\d{3})/;
-			if (this.separator && !this.isNumber(this.separator)) {
-				while (rgx.test(x1)) {
-					x1 = x1.replace(rgx, '$1' + this.separator + '$2');
-				}
-			}
-			return x1 + x2;
-		},
-		destroyed() {
-			this.cancelAnimationFrame(this.rAF);
-		}
-	}
-};
+  name: 'u-count-to',
+  data() {
+    return {
+      localStartVal: this.startVal,
+      displayValue: this.formatNumber(this.startVal),
+      printVal: null,
+      paused: false, // 是否暂停
+      localDuration: Number(this.duration),
+      startTime: null, // 开始的时间
+      timestamp: null, // 时间戳
+      remaining: null, // 停留的时间
+      rAF: null,
+      lastTime: 0 // 上一次的时间
+    }
+  },
+  mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
+  computed: {
+    countDown() {
+      return this.startVal > this.endVal
+    }
+  },
+  watch: {
+    startVal() {
+      this.autoplay && this.start()
+    },
+    endVal() {
+      this.autoplay && this.start()
+    }
+  },
+  mounted() {
+    this.autoplay && this.start()
+  },
+  methods: {
+    easingFn(t, b, c, d) {
+      return (c * (-Math.pow(2, (-10 * t) / d) + 1) * 1024) / 1023 + b
+    },
+    requestAnimationFrame(callback) {
+      const currTime = new Date().getTime()
+      // 为了使setTimteout的尽可能的接近每秒60帧的效果
+      const timeToCall = Math.max(0, 16 - (currTime - this.lastTime))
+      const id = setTimeout(() => {
+        callback(currTime + timeToCall)
+      }, timeToCall)
+      this.lastTime = currTime + timeToCall
+      return id
+    },
+    cancelAnimationFrame(id) {
+      clearTimeout(id)
+    },
+    // 开始滚动数字
+    start() {
+      this.localStartVal = this.startVal
+      this.startTime = null
+      this.localDuration = this.duration
+      this.paused = false
+      this.rAF = this.requestAnimationFrame(this.count)
+    },
+    // 暂定状态，重新再开始滚动；或者滚动状态下，暂停
+    reStart() {
+      if (this.paused) {
+        this.resume()
+        this.paused = false
+      } else {
+        this.stop()
+        this.paused = true
+      }
+    },
+    // 暂停
+    stop() {
+      this.cancelAnimationFrame(this.rAF)
+    },
+    // 重新开始(暂停的情况下)
+    resume() {
+      if (!this.remaining) return
+      this.startTime = 0
+      this.localDuration = this.remaining
+      this.localStartVal = this.printVal
+      this.requestAnimationFrame(this.count)
+    },
+    // 重置
+    reset() {
+      this.startTime = null
+      this.cancelAnimationFrame(this.rAF)
+      this.displayValue = this.formatNumber(this.startVal)
+    },
+    count(timestamp) {
+      if (!this.startTime) this.startTime = timestamp
+      this.timestamp = timestamp
+      const progress = timestamp - this.startTime
+      this.remaining = this.localDuration - progress
+      if (this.useEasing) {
+        if (this.countDown) {
+          this.printVal =
+            this.localStartVal -
+            this.easingFn(
+              progress,
+              0,
+              this.localStartVal - this.endVal,
+              this.localDuration
+            )
+        } else {
+          this.printVal = this.easingFn(
+            progress,
+            this.localStartVal,
+            this.endVal - this.localStartVal,
+            this.localDuration
+          )
+        }
+      } else {
+        if (this.countDown) {
+          this.printVal =
+            this.localStartVal -
+            (this.localStartVal - this.endVal) *
+              (progress / this.localDuration)
+        } else {
+          this.printVal =
+            this.localStartVal +
+            (this.endVal - this.localStartVal) *
+              (progress / this.localDuration)
+        }
+      }
+      if (this.countDown) {
+        this.printVal =
+          this.printVal < this.endVal ? this.endVal : this.printVal
+      } else {
+        this.printVal =
+          this.printVal > this.endVal ? this.endVal : this.printVal
+      }
+      this.displayValue = this.formatNumber(this.printVal) || 0
+      if (progress < this.localDuration) {
+        this.rAF = this.requestAnimationFrame(this.count)
+      } else {
+        this.$emit('end')
+      }
+    },
+    // 判断是否数字
+    isNumber(val) {
+      return !isNaN(parseFloat(val))
+    },
+    formatNumber(num) {
+      // 将num转为Number类型，因为其值可能为字符串数值，调用toFixed会报错
+      num = Number(num)
+      num = num.toFixed(Number(this.decimals))
+      num += ''
+      const x = num.split('.')
+      let x1 = x[0]
+      const x2 = x.length > 1 ? this.decimal + x[1] : ''
+      const rgx = /(\d+)(\d{3})/
+      if (this.separator && !this.isNumber(this.separator)) {
+        while (rgx.test(x1)) {
+          x1 = x1.replace(rgx, '$1' + this.separator + '$2')
+        }
+      }
+      return x1 + x2
+    },
+    destroyed() {
+      this.cancelAnimationFrame(this.rAF)
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/components.scss";
+@import '../../libs/css/components.scss';
 
 .u-count-num {
-	/* #ifndef APP-NVUE */
-	display: inline-flex;
-	/* #endif */
-	text-align: center;
+  /* #ifndef APP-NVUE */
+  display: inline-flex;
+  /* #endif */
+  text-align: center;
 }
 </style>
diff --git a/uni_modules/uview-ui/components/u-upload/u-upload.vue b/uni_modules/uview-ui/components/u-upload/u-upload.vue
index 1dac8a7..a770ce7 100644
--- a/uni_modules/uview-ui/components/u-upload/u-upload.vue
+++ b/uni_modules/uview-ui/components/u-upload/u-upload.vue
@@ -1,558 +1,571 @@
 <template>
-	<view class="u-upload" :style="[$u.addStyle(customStyle)]">
-		<view class="u-upload__wrap" >
-			<template v-if="previewImage">
-				<view
-				    class="u-upload__wrap__preview"
-				    v-for="(item, index) in lists"
-				    :key="index"
-				>
-					<image
-					    v-if="item.isImage || (item.type && item.type === 'image')"
-					    :src="item.thumb || item.url"
-					    :mode="imageMode"
-					    class="u-upload__wrap__preview__image"
-					    @tap="onPreviewImage(item)"
-						:style="[{
-							width: $u.addUnit(width),
-							height: $u.addUnit(height)
-						}]"
-					/>
-					<view
-					    v-else
-					    class="u-upload__wrap__preview__other"
-					>
-						<u-icon
-						    color="#80CBF9"
-						    size="26"
-						    :name="item.isVideo || (item.type && item.type === 'video') ? 'movie' : 'folder'"
-						></u-icon>
-						<text class="u-upload__wrap__preview__other__text">{{item.isVideo || (item.type && item.type === 'video') ? '视频' : '文件'}}</text>
-					</view>
-					<view
-					    class="u-upload__status"
-					    v-if="item.status === 'uploading' || item.status === 'failed'"
-					>
-						<view class="u-upload__status__icon">
-							<u-icon
-							    v-if="item.status === 'failed'"
-							    name="close-circle"
-							    color="#ffffff"
-							    size="25"
-							/>
-							<u-loading-icon
-							    size="22"
-							    mode="circle"
-							    color="#ffffff"
-							    v-else
-							/>
-						</view>
-						<text
-						    v-if="item.message"
-						    class="u-upload__status__message"
-						>{{ item.message }}</text>
-					</view>
-					<view
-					    class="u-upload__deletable"
-					    v-if="item.status !== 'uploading' && (deletable || item.deletable)"
-					    @tap.stop="deleteItem(index)"
-					>
-						<view class="u-upload__deletable__icon">
-							<u-icon
-							    name="close"
-							    color="#ffffff"
-							    size="10"
-							></u-icon>
-						</view>
-					</view>
-					<view
-					    class="u-upload__success"
-					    v-if="item.status === 'success'"
-					>
-						<!-- #ifdef APP-NVUE -->
-						<image
-						    :src="successIcon"
-						    class="u-upload__success__icon"
-						></image>
-						<!-- #endif -->
-						<!-- #ifndef APP-NVUE -->
-						<view class="u-upload__success__icon">
-							<u-icon
-							    name="checkmark"
-							    color="#ffffff"
-							    size="12"
-							></u-icon>
-						</view>
-						<!-- #endif -->
-					</view>
-				</view>
-				
-			</template>
-			
-			<template v-if="isInCount">
-				<view
-				    v-if="$slots.default || $slots.$default"
-				    @tap="chooseFile"
-				>
-					<slot />
-				</view>
-				<view
-				    v-else
-				    class="u-upload__button"
-				    :hover-class="!disabled ? 'u-upload__button--hover' : ''"
-				    hover-stay-time="150"
-				    @tap="chooseFile"
-				    :class="[disabled && 'u-upload__button--disabled']"
-					:style="[{
-						width: $u.addUnit(width),
-						height: $u.addUnit(height)
-					}]"
-				>
-					<u-icon
-					    :name="uploadIcon"
-					    size="26"
-					    :color="uploadIconColor"
-					></u-icon>
-					<text
-					    v-if="uploadText"
-					    class="u-upload__button__text"
-					>{{ uploadText }}</text>
-				</view>
-			</template>
-		</view>
+  <view class="u-upload" :style="[$u.addStyle(customStyle)]">
+    <view class="u-upload__wrap">
+      <template v-if="previewImage">
+        <view
+          class="u-upload__wrap__preview"
+          v-for="(item, index) in lists"
+          :key="index"
+        >
+          <image
+            v-if="item.isImage || (item.type && item.type === 'image')"
+            :src="item.thumb || item.url"
+            :mode="imageMode"
+            class="u-upload__wrap__preview__image"
+            @tap="onPreviewImage(item)"
+            :style="[
+              {
+                width: $u.addUnit(width),
+                height: $u.addUnit(height)
+              }
+            ]"
+          />
+          <view v-else class="u-upload__wrap__preview__other">
+            <u-icon
+              color="#80CBF9"
+              size="26"
+              :name="
+                item.isVideo || (item.type && item.type === 'video')
+                  ? 'movie'
+                  : 'folder'
+              "
+            ></u-icon>
+            <text class="u-upload__wrap__preview__other__text">
+              {{
+                item.isVideo || (item.type && item.type === 'video')
+                  ? '视频'
+                  : '文件'
+              }}
+            </text>
+          </view>
+          <view
+            class="u-upload__status"
+            v-if="item.status === 'uploading' || item.status === 'failed'"
+          >
+            <view class="u-upload__status__icon">
+              <u-icon
+                v-if="item.status === 'failed'"
+                name="close-circle"
+                color="#ffffff"
+                size="25"
+              />
+              <u-loading-icon
+                size="22"
+                mode="circle"
+                color="#ffffff"
+                v-else
+              />
+            </view>
+            <text v-if="item.message" class="u-upload__status__message">
+              {{ item.message }}
+            </text>
+          </view>
+          <view
+            class="u-upload__deletable"
+            v-if="
+              item.status !== 'uploading' && (deletable || item.deletable)
+            "
+            @tap.stop="deleteItem(index)"
+          >
+            <view class="u-upload__deletable__icon">
+              <u-icon
+                name="close-circle-fill"
+                color="#f8285a"
+                size="48rpx"
+              ></u-icon>
+            </view>
+          </view>
+          <view class="u-upload__success" v-if="item.status === 'success'">
+            <!-- #ifdef APP-NVUE -->
+            <image
+              :src="successIcon"
+              class="u-upload__success__icon"
+            ></image>
+            <!-- #endif -->
+            <!-- #ifndef APP-NVUE -->
+            <view class="u-upload__success__icon">
+              <u-icon name="checkmark" color="#ffffff" size="12"></u-icon>
+            </view>
+            <!-- #endif -->
+          </view>
+        </view>
+      </template>
 
-	</view>
+      <template v-if="isInCount">
+        <view v-if="$slots.default || $slots.$default" @tap="chooseFile">
+          <slot />
+        </view>
+        <view
+          v-else
+          class="u-upload__button"
+          :hover-class="!disabled ? 'u-upload__button--hover' : ''"
+          hover-stay-time="150"
+          @tap="chooseFile"
+          :class="[disabled && 'u-upload__button--disabled']"
+          :style="[
+            {
+              width: $u.addUnit(width),
+              height: $u.addUnit(height)
+            }
+          ]"
+        >
+          <u-icon
+            :name="uploadIcon"
+            size="26"
+            :color="uploadIconColor"
+          ></u-icon>
+          <text v-if="uploadText" class="u-upload__button__text">
+            {{ uploadText }}
+          </text>
+        </view>
+      </template>
+    </view>
+  </view>
 </template>
 
 <script>
-	import {
-		chooseFile
-	} from './utils';
-	import mixin from './mixin.js';
-	import props from './props.js';
+import { chooseFile } from './utils'
+import mixin from './mixin.js'
+import props from './props.js'
 
-	/**
-	 * upload 上传
-	 * @description 该组件用于上传图片场景
-	 * @tutorial https://uviewui.com/components/upload.html
-	 * @property {String}			accept				接受的文件类型, 可选值为all media image file video （默认 'image' ）
-	 * @property {String | Array}	capture				图片或视频拾取模式，当accept为image类型时设置capture可选额外camera可以直接调起摄像头（默认 ['album', 'camera'] ）
-	 * @property {Boolean}			compressed			当accept为video时生效，是否压缩视频，默认为true（默认 true ）
-	 * @property {String}			camera				当accept为video时生效，可选值为back或front（默认 'back' ）
-	 * @property {Number}			maxDuration			当accept为video时生效，拍摄视频最长拍摄时间，单位秒（默认 60 ）
-	 * @property {String}			uploadIcon			上传区域的图标，只能内置图标（默认 'camera-fill' ）
-	 * @property {String}			uploadIconColor		上传区域的图标的字体颜色，只能内置图标（默认 #D3D4D6 ）
-	 * @property {Boolean}			useBeforeRead		是否开启文件读取前事件（默认 false ）
-	 * @property {Boolean}			previewFullImage	是否显示组件自带的图片预览功能（默认 true ）
-	 * @property {String | Number}	maxCount			最大上传数量（默认 52 ）
-	 * @property {Boolean}			disabled			是否启用（默认 false ）
-	 * @property {String}			imageMode			预览上传的图片时的裁剪模式，和image组件mode属性一致（默认 'aspectFill' ）
-	 * @property {String}			name				标识符，可以在回调函数的第二项参数中获取
-	 * @property {Array}			sizeType			所选的图片的尺寸, 可选值为original compressed（默认 ['original', 'compressed'] ）
-	 * @property {Boolean}			multiple			是否开启图片多选，部分安卓机型不支持 （默认 false ）
-	 * @property {Boolean}			deletable			是否展示删除按钮（默认 true ）
-	 * @property {String | Number}	maxSize				文件大小限制，单位为byte （默认 Number.MAX_VALUE ）
-	 * @property {Array}			fileList			显示已上传的文件列表
-	 * @property {String}			uploadText			上传区域的提示文字
-	 * @property {String | Number}	width				内部预览图片区域和选择图片按钮的区域宽度（默认 80 ）
-	 * @property {String | Number}	height				内部预览图片区域和选择图片按钮的区域高度（默认 80 ）
-	 * @property {Object}			customStyle			组件的样式，对象形式
-	 * @event {Function} afterRead		读取后的处理函数
-	 * @event {Function} beforeRead		读取前的处理函数
-	 * @event {Function} oversize		文件超出大小限制
-	 * @event {Function} clickPreview	点击预览图片
-	 * @event {Function} delete 		删除图片
-	 * @example <u-upload :action="action" :fileList="fileList" ></u-upload>
-	 */
-	export default {
-		name: "u-upload",
-		mixins: [uni.$u.mpMixin, uni.$u.mixin, mixin,props],
-		data() {
-			return {
-				// #ifdef APP-NVUE
-				successIcon: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAKKADAAQAAAABAAAAKAAAAAB65masAAACP0lEQVRYCc3YXygsURwH8K/dpcWyG3LF5u/6/+dKVylSypuUl6uUPMifKMWL8oKEB1EUT1KeUPdR3uTNUsSLxb2udG/cbvInNuvf2rVnazZ/ZndmZ87snjM1Z+Z3zpzfp9+Z5mEAhlvjRtZgCKs+gnPAOcAkkMOR4jEHfItjDvgRxxSQD8cM0BuOCaAvXNCBQrigAsXgggYUiwsK0B9cwIH+4gIKlIILGFAqLiBAOTjFgXJxigJp4BQD0sIpAqSJow6kjSNAFTnRaHJwLenD6Mud52VQAcrBfTd2oyq+HtGaGGWAcnAVcXWoM3bCZrdi+ncPfaAcXE5UKVpdW/vitGPqqAtn98d0gXJwX7Qp6MmegUYVhvmTIezdmHlxJCjpHRTCFerLkRRu4k0aqdajN3sWOo0BK//msHa+xDuPC/oNFMKRhTtM4xjIX0SCNpXL4+7VIaHuyiWEp2L7ahWLf8fejfPdqPmC3mJicORZUp1CQzm+GiphvljGk+PBvWRbxii+xVTj5M6CiZ/tsDufvaXyxEUDxeLIyvu3m0iOyEFWVAkydcVYdyFrE9tQk9iMq6f/GNlvwt3LjQfh60LUrw9/cFyyMJUW/XkLSNMV4Mi6C5ML+ui4x5ClAX9sB9w0wV6wglJwJCv5fOxcr6EstgbGiEw4XcfUry4cWrcEUW8n+ARKxXEJHhw2WG43UKSvwI/TSZgvl7kh0b3XLZaLEy0QmMgLZAVH7J+ALOE+AVnDvQOyiPMAWcW5gSzjCPAV+78S5WE0GrQAAAAASUVORK5CYII=',
-				// #endif
-				lists: [],
-				isInCount: true,
-			}
-		},
-		watch: {
-			// 监听文件列表的变化，重新整理内部数据
-			fileList: {
-				immediate: true,
-				handler() {
-					this.formatFileList()
-				}
-			},
-		},
-		methods: {
-			formatFileList() {
-				const {
-					fileList = [], maxCount
-				} = this;
-				const lists = fileList.map((item) =>
-					Object.assign(Object.assign({}, item), {
-						// 如果item.url为本地选择的blob文件的话，无法判断其为video还是image，此处优先通过accept做判断处理
-						isImage: this.accept === 'image' || uni.$u.test.image(item.url || item.thumb),
-						isVideo: this.accept === 'video' || uni.$u.test.video(item.url || item.thumb),
-						deletable: typeof(item.deletable) === 'boolean' ? item.deletable : this.deletable,
-					})
-				);
-				this.lists = lists
-				this.isInCount = lists.length < maxCount
-			},
-			chooseFile() {
-				const {
-					maxCount,
-					multiple,
-					lists,
-					disabled
-				} = this;
-				if (disabled) return;
-				// 如果用户传入的是字符串，需要格式化成数组
-				let capture;
-				try {
-					capture = uni.$u.test.array(this.capture) ? this.capture : this.capture.split(',');
-				}catch(e) {
-					capture = [];
-				}
-				chooseFile(
-						Object.assign({
-							accept: this.accept,
-							multiple: this.multiple,
-							capture: capture,
-							compressed: this.compressed,
-							maxDuration: this.maxDuration,
-							sizeType: this.sizeType,
-							camera: this.camera,
-						}, {
-							maxCount: maxCount - lists.length,
-						})
-					)
-					.then((res) => {
-						this.onBeforeRead(multiple ? res : res[0]);
-					})
-					.catch((error) => {
-						this.$emit('error', error);
-					});
-			},
-			// 文件读取之前
-			onBeforeRead(file) {
-				const {
-					beforeRead,
-					useBeforeRead,
-				} = this;
-				let res = true
-				// beforeRead是否为一个方法
-				if (uni.$u.test.func(beforeRead)) {
-					// 如果用户定义了此方法，则去执行此方法，并传入读取的文件回调
-					res = beforeRead(file, this.getDetail());
-				}
-				if (useBeforeRead) {
-					res = new Promise((resolve, reject) => {
-						this.$emit(
-							'beforeRead',
-							Object.assign(Object.assign({
-								file
-							}, this.getDetail()), {
-								callback: (ok) => {
-									ok ? resolve() : reject();
-								},
-							})
-						);
-					});
-				}
-				if (!res) {
-					return;
-				}
-				if (uni.$u.test.promise(res)) {
-					res.then((data) => this.onAfterRead(data || file));
-				} else {
-					this.onAfterRead(file);
-				}
-			},
-			getDetail(index) {
-				return {
-					name: this.name,
-					index: index == null ? this.fileList.length : index,
-				};
-			},
-			onAfterRead(file) {
-				const {
-					maxSize,
-					afterRead
-				} = this;
-				const oversize = Array.isArray(file) ?
-					file.some((item) => item.size > maxSize) :
-					file.size > maxSize;
-				if (oversize) {
-					this.$emit('oversize', Object.assign({
-						file
-					}, this.getDetail()));
-					return;
-				}
-				if (typeof afterRead === 'function') {
-					afterRead(file, this.getDetail());
-				}
-				this.$emit('afterRead', Object.assign({
-					file
-				}, this.getDetail()));
-			},
-			deleteItem(index) {
-				this.$emit(
-					'delete',
-					Object.assign(Object.assign({}, this.getDetail(index)), {
-						file: this.fileList[index],
-					})
-				);
-			},
-			// 预览图片
-			onPreviewImage(item) {
-				if (!item.isImage || !this.previewFullImage) return
-				uni.previewImage({
-					// 先filter找出为图片的item，再返回filter结果中的图片url
-					urls: this.lists.filter((item) => this.accept === 'image' || uni.$u.test.image(item.url || item.thumb)).map((item) => item.url || item.thumb),
-					current: item.url || item.thumb,
-					fail() {
-						uni.$u.toast('预览图片失败')
-					},
-				});
-			},
-			onPreviewVideo(event) {
-				if (!this.data.previewFullImage) return;
-				const {
-					index
-				} = event.currentTarget.dataset;
-				const {
-					lists
-				} = this.data;
-				wx.previewMedia({
-					sources: lists
-						.filter((item) => isVideoFile(item))
-						.map((item) =>
-							Object.assign(Object.assign({}, item), {
-								type: 'video'
-							})
-						),
-					current: index,
-					fail() {
-						uni.$u.toast('预览视频失败')
-					},
-				});
-			},
-			onClickPreview(event) {
-				const {
-					index
-				} = event.currentTarget.dataset;
-				const item = this.data.lists[index];
-				this.$emit(
-					'clickPreview',
-					Object.assign(Object.assign({}, item), this.getDetail(index))
-				);
-			}
-		}
-	}
+/**
+ * upload 上传
+ * @description 该组件用于上传图片场景
+ * @tutorial https://uviewui.com/components/upload.html
+ * @property {String}			accept				接受的文件类型, 可选值为all media image file video （默认 'image' ）
+ * @property {String | Array}	capture				图片或视频拾取模式，当accept为image类型时设置capture可选额外camera可以直接调起摄像头（默认 ['album', 'camera'] ）
+ * @property {Boolean}			compressed			当accept为video时生效，是否压缩视频，默认为true（默认 true ）
+ * @property {String}			camera				当accept为video时生效，可选值为back或front（默认 'back' ）
+ * @property {Number}			maxDuration			当accept为video时生效，拍摄视频最长拍摄时间，单位秒（默认 60 ）
+ * @property {String}			uploadIcon			上传区域的图标，只能内置图标（默认 'camera-fill' ）
+ * @property {String}			uploadIconColor		上传区域的图标的字体颜色，只能内置图标（默认 #D3D4D6 ）
+ * @property {Boolean}			useBeforeRead		是否开启文件读取前事件（默认 false ）
+ * @property {Boolean}			previewFullImage	是否显示组件自带的图片预览功能（默认 true ）
+ * @property {String | Number}	maxCount			最大上传数量（默认 52 ）
+ * @property {Boolean}			disabled			是否启用（默认 false ）
+ * @property {String}			imageMode			预览上传的图片时的裁剪模式，和image组件mode属性一致（默认 'aspectFill' ）
+ * @property {String}			name				标识符，可以在回调函数的第二项参数中获取
+ * @property {Array}			sizeType			所选的图片的尺寸, 可选值为original compressed（默认 ['original', 'compressed'] ）
+ * @property {Boolean}			multiple			是否开启图片多选，部分安卓机型不支持 （默认 false ）
+ * @property {Boolean}			deletable			是否展示删除按钮（默认 true ）
+ * @property {String | Number}	maxSize				文件大小限制，单位为byte （默认 Number.MAX_VALUE ）
+ * @property {Array}			fileList			显示已上传的文件列表
+ * @property {String}			uploadText			上传区域的提示文字
+ * @property {String | Number}	width				内部预览图片区域和选择图片按钮的区域宽度（默认 80 ）
+ * @property {String | Number}	height				内部预览图片区域和选择图片按钮的区域高度（默认 80 ）
+ * @property {Object}			customStyle			组件的样式，对象形式
+ * @event {Function} afterRead		读取后的处理函数
+ * @event {Function} beforeRead		读取前的处理函数
+ * @event {Function} oversize		文件超出大小限制
+ * @event {Function} clickPreview	点击预览图片
+ * @event {Function} delete 		删除图片
+ * @example <u-upload :action="action" :fileList="fileList" ></u-upload>
+ */
+export default {
+  name: 'u-upload',
+  mixins: [uni.$u.mpMixin, uni.$u.mixin, mixin, props],
+  data() {
+    return {
+      // #ifdef APP-NVUE
+      successIcon:
+        'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAKKADAAQAAAABAAAAKAAAAAB65masAAACP0lEQVRYCc3YXygsURwH8K/dpcWyG3LF5u/6/+dKVylSypuUl6uUPMifKMWL8oKEB1EUT1KeUPdR3uTNUsSLxb2udG/cbvInNuvf2rVnazZ/ZndmZ87snjM1Z+Z3zpzfp9+Z5mEAhlvjRtZgCKs+gnPAOcAkkMOR4jEHfItjDvgRxxSQD8cM0BuOCaAvXNCBQrigAsXgggYUiwsK0B9cwIH+4gIKlIILGFAqLiBAOTjFgXJxigJp4BQD0sIpAqSJow6kjSNAFTnRaHJwLenD6Mud52VQAcrBfTd2oyq+HtGaGGWAcnAVcXWoM3bCZrdi+ncPfaAcXE5UKVpdW/vitGPqqAtn98d0gXJwX7Qp6MmegUYVhvmTIezdmHlxJCjpHRTCFerLkRRu4k0aqdajN3sWOo0BK//msHa+xDuPC/oNFMKRhTtM4xjIX0SCNpXL4+7VIaHuyiWEp2L7ahWLf8fejfPdqPmC3mJicORZUp1CQzm+GiphvljGk+PBvWRbxii+xVTj5M6CiZ/tsDufvaXyxEUDxeLIyvu3m0iOyEFWVAkydcVYdyFrE9tQk9iMq6f/GNlvwt3LjQfh60LUrw9/cFyyMJUW/XkLSNMV4Mi6C5ML+ui4x5ClAX9sB9w0wV6wglJwJCv5fOxcr6EstgbGiEw4XcfUry4cWrcEUW8n+ARKxXEJHhw2WG43UKSvwI/TSZgvl7kh0b3XLZaLEy0QmMgLZAVH7J+ALOE+AVnDvQOyiPMAWcW5gSzjCPAV+78S5WE0GrQAAAAASUVORK5CYII=',
+      // #endif
+      lists: [],
+      isInCount: true
+    }
+  },
+  watch: {
+    // 监听文件列表的变化，重新整理内部数据
+    fileList: {
+      immediate: true,
+      handler() {
+        this.formatFileList()
+      }
+    }
+  },
+  methods: {
+    formatFileList() {
+      const { fileList = [], maxCount } = this
+      const lists = fileList.map(item =>
+        Object.assign(Object.assign({}, item), {
+          // 如果item.url为本地选择的blob文件的话，无法判断其为video还是image，此处优先通过accept做判断处理
+          isImage:
+            this.accept === 'image' ||
+            uni.$u.test.image(item.url || item.thumb),
+          isVideo:
+            this.accept === 'video' ||
+            uni.$u.test.video(item.url || item.thumb),
+          deletable:
+            typeof item.deletable === 'boolean'
+              ? item.deletable
+              : this.deletable
+        })
+      )
+      this.lists = lists
+      this.isInCount = lists.length < maxCount
+    },
+    chooseFile() {
+      const { maxCount, multiple, lists, disabled } = this
+      if (disabled) return
+      // 如果用户传入的是字符串，需要格式化成数组
+      let capture
+      try {
+        capture = uni.$u.test.array(this.capture)
+          ? this.capture
+          : this.capture.split(',')
+      } catch (e) {
+        capture = []
+      }
+      chooseFile(
+        Object.assign(
+          {
+            accept: this.accept,
+            multiple: this.multiple,
+            capture: capture,
+            compressed: this.compressed,
+            maxDuration: this.maxDuration,
+            sizeType: this.sizeType,
+            camera: this.camera
+          },
+          {
+            maxCount: maxCount - lists.length
+          }
+        )
+      )
+        .then(res => {
+          this.onBeforeRead(multiple ? res : res[0])
+        })
+        .catch(error => {
+          this.$emit('error', error)
+        })
+    },
+    // 文件读取之前
+    onBeforeRead(file) {
+      const { beforeRead, useBeforeRead } = this
+      let res = true
+      // beforeRead是否为一个方法
+      if (uni.$u.test.func(beforeRead)) {
+        // 如果用户定义了此方法，则去执行此方法，并传入读取的文件回调
+        res = beforeRead(file, this.getDetail())
+      }
+      if (useBeforeRead) {
+        res = new Promise((resolve, reject) => {
+          this.$emit(
+            'beforeRead',
+            Object.assign(
+              Object.assign(
+                {
+                  file
+                },
+                this.getDetail()
+              ),
+              {
+                callback: ok => {
+                  ok ? resolve() : reject()
+                }
+              }
+            )
+          )
+        })
+      }
+      if (!res) {
+        return
+      }
+      if (uni.$u.test.promise(res)) {
+        res.then(data => this.onAfterRead(data || file))
+      } else {
+        this.onAfterRead(file)
+      }
+    },
+    getDetail(index) {
+      return {
+        name: this.name,
+        index: index == null ? this.fileList.length : index
+      }
+    },
+    onAfterRead(file) {
+      const { maxSize, afterRead } = this
+      const oversize = Array.isArray(file)
+        ? file.some(item => item.size > maxSize)
+        : file.size > maxSize
+      if (oversize) {
+        this.$emit(
+          'oversize',
+          Object.assign(
+            {
+              file
+            },
+            this.getDetail()
+          )
+        )
+        return
+      }
+      if (typeof afterRead === 'function') {
+        afterRead(file, this.getDetail())
+      }
+      this.$emit(
+        'afterRead',
+        Object.assign(
+          {
+            file
+          },
+          this.getDetail()
+        )
+      )
+    },
+    deleteItem(index) {
+      this.$emit(
+        'delete',
+        Object.assign(Object.assign({}, this.getDetail(index)), {
+          file: this.fileList[index]
+        })
+      )
+    },
+    // 预览图片
+    onPreviewImage(item) {
+      if (!item.isImage || !this.previewFullImage) return
+      uni.previewImage({
+        // 先filter找出为图片的item，再返回filter结果中的图片url
+        urls: this.lists
+          .filter(
+            item =>
+              this.accept === 'image' ||
+              uni.$u.test.image(item.url || item.thumb)
+          )
+          .map(item => item.url || item.thumb),
+        current: item.url || item.thumb,
+        fail() {
+          uni.$u.toast('预览图片失败')
+        }
+      })
+    },
+    onPreviewVideo(event) {
+      if (!this.data.previewFullImage) return
+      const { index } = event.currentTarget.dataset
+      const { lists } = this.data
+      wx.previewMedia({
+        sources: lists
+          .filter(item => isVideoFile(item))
+          .map(item =>
+            Object.assign(Object.assign({}, item), {
+              type: 'video'
+            })
+          ),
+        current: index,
+        fail() {
+          uni.$u.toast('预览视频失败')
+        }
+      })
+    },
+    onClickPreview(event) {
+      const { index } = event.currentTarget.dataset
+      const item = this.data.lists[index]
+      this.$emit(
+        'clickPreview',
+        Object.assign(Object.assign({}, item), this.getDetail(index))
+      )
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
-	@import '../../libs/css/components.scss';
-	$u-upload-preview-border-radius: 2px !default;
-	$u-upload-preview-margin: 0 8px 8px 0 !default;
-	$u-upload-image-width:80px !default;
-	$u-upload-image-height:$u-upload-image-width;
-	$u-upload-other-bgColor: rgb(242, 242, 242) !default;
-	$u-upload-other-flex:1 !default;
-	$u-upload-text-font-size:11px !default;
-	$u-upload-text-color:$u-tips-color !default;
-	$u-upload-text-margin-top:2px !default;
-	$u-upload-deletable-right:0 !default;
-	$u-upload-deletable-top:0 !default;
-	$u-upload-deletable-bgColor:rgb(55, 55, 55) !default;
-	$u-upload-deletable-height:14px !default;
-	$u-upload-deletable-width:$u-upload-deletable-height;
-	$u-upload-deletable-boder-bottom-left-radius:100px !default;
-	$u-upload-deletable-zIndex:3 !default;
-	$u-upload-success-bottom:0 !default;
-	$u-upload-success-right:0 !default;
-	$u-upload-success-border-style:solid !default;
-	$u-upload-success-border-top-color:transparent !default;
-	$u-upload-success-border-left-color:transparent !default;
-	$u-upload-success-border-bottom-color: $u-success !default;
-	$u-upload-success-border-right-color:$u-upload-success-border-bottom-color;
-	$u-upload-success-border-width:9px !default;
-	$u-upload-icon-top:0px !default;
-	$u-upload-icon-right:0px !default;
-	$u-upload-icon-h5-top:1px !default;
-	$u-upload-icon-h5-right:0 !default;
-	$u-upload-icon-width:16px !default;
-	$u-upload-icon-height:$u-upload-icon-width;
-	$u-upload-success-icon-bottom:-10px !default;
-	$u-upload-success-icon-right:-10px !default;
-	$u-upload-status-right:0 !default;
-	$u-upload-status-left:0 !default;
-	$u-upload-status-bottom:0 !default;
-	$u-upload-status-top:0 !default;
-	$u-upload-status-bgColor:rgba(0, 0, 0, 0.5) !default;
-	$u-upload-status-icon-Zindex:1 !default;
-	$u-upload-message-font-size:12px !default;
-	$u-upload-message-color:#FFFFFF !default;
-	$u-upload-message-margin-top:5px !default;
-	$u-upload-button-width:80px !default;
-	$u-upload-button-height:$u-upload-button-width;
-	$u-upload-button-bgColor:rgb(244, 245, 247) !default;
-	$u-upload-button-border-radius:2px !default;
-	$u-upload-botton-margin: 0 8px 8px 0 !default;
-	$u-upload-text-font-size:11px !default;
-	$u-upload-text-color:$u-tips-color !default;
-	$u-upload-text-margin-top: 2px !default;
-	$u-upload-hover-bgColor:rgb(230, 231, 233) !default;
-	$u-upload-disabled-opacity:.5 !default;
+@import '../../libs/css/components.scss';
+$u-upload-preview-border-radius: 2px !default;
+$u-upload-preview-margin: 0 8px 8px 0 !default;
+$u-upload-image-width: 80px !default;
+$u-upload-image-height: $u-upload-image-width;
+$u-upload-other-bgColor: rgb(242, 242, 242) !default;
+$u-upload-other-flex: 1 !default;
+$u-upload-text-font-size: 11px !default;
+$u-upload-text-color: $u-tips-color !default;
+$u-upload-text-margin-top: 2px !default;
+$u-upload-deletable-right: 0 !default;
+$u-upload-deletable-top: 0 !default;
+$u-upload-deletable-bgColor: rgb(55, 55, 55) !default;
+$u-upload-deletable-height: 14px !default;
+$u-upload-deletable-width: $u-upload-deletable-height;
+$u-upload-deletable-boder-bottom-left-radius: 100px !default;
+$u-upload-deletable-zIndex: 3 !default;
+$u-upload-success-bottom: 0 !default;
+$u-upload-success-right: 0 !default;
+$u-upload-success-border-style: solid !default;
+$u-upload-success-border-top-color: transparent !default;
+$u-upload-success-border-left-color: transparent !default;
+$u-upload-success-border-bottom-color: $u-success !default;
+$u-upload-success-border-right-color: $u-upload-success-border-bottom-color;
+$u-upload-success-border-width: 9px !default;
+$u-upload-icon-top: 0px !default;
+$u-upload-icon-right: 0px !default;
+$u-upload-icon-h5-top: 1px !default;
+$u-upload-icon-h5-right: 0 !default;
+$u-upload-icon-width: 16px !default;
+$u-upload-icon-height: $u-upload-icon-width;
+$u-upload-success-icon-bottom: -10px !default;
+$u-upload-success-icon-right: -10px !default;
+$u-upload-status-right: 0 !default;
+$u-upload-status-left: 0 !default;
+$u-upload-status-bottom: 0 !default;
+$u-upload-status-top: 0 !default;
+$u-upload-status-bgColor: rgba(0, 0, 0, 0.5) !default;
+$u-upload-status-icon-Zindex: 1 !default;
+$u-upload-message-font-size: 12px !default;
+$u-upload-message-color: #ffffff !default;
+$u-upload-message-margin-top: 5px !default;
+$u-upload-button-width: 80px !default;
+$u-upload-button-height: $u-upload-button-width;
+$u-upload-button-bgColor: rgb(244, 245, 247) !default;
+$u-upload-button-border-radius: 2px !default;
+$u-upload-botton-margin: 0 8px 8px 0 !default;
+$u-upload-text-font-size: 11px !default;
+$u-upload-text-color: $u-tips-color !default;
+$u-upload-text-margin-top: 2px !default;
+$u-upload-hover-bgColor: rgb(230, 231, 233) !default;
+$u-upload-disabled-opacity: 0.5 !default;
 
-	.u-upload {
-		@include flex(column);
-		flex: 1;
+.u-upload {
+  @include flex(column);
+  flex: 1;
 
-		&__wrap {
-			@include flex;
-			flex-wrap: wrap;
-			flex: 1;
+  &__wrap {
+    @include flex;
+    flex-wrap: wrap;
+    flex: row;
+    flex: 1;
+    gap: 30rpx;
+    &__preview {
+      border-radius: 16rpx;
+      position: relative;
+      @include flex;
 
-			&__preview {
-				border-radius: $u-upload-preview-border-radius;
-				margin: $u-upload-preview-margin;
-				position: relative;
-				overflow: hidden;
-				@include flex;
+      &__image {
+        width: $u-upload-image-width;
+        height: $u-upload-image-height;
+        border-radius: 16rpx;
+      }
 
-				&__image {
-					width: $u-upload-image-width;
-					height: $u-upload-image-height;
-				}
+      &__other {
+        width: $u-upload-image-width;
+        height: $u-upload-image-height;
+        background-color: $u-upload-other-bgColor;
+        flex: $u-upload-other-flex;
+        @include flex(column);
+        justify-content: center;
+        align-items: center;
 
-				&__other {
-					width: $u-upload-image-width;
-					height: $u-upload-image-height;
-					background-color: $u-upload-other-bgColor;
-					flex: $u-upload-other-flex;
-					@include flex(column);
-					justify-content: center;
-					align-items: center;
+        &__text {
+          font-size: $u-upload-text-font-size;
+          color: $u-upload-text-color;
+          margin-top: $u-upload-text-margin-top;
+        }
+      }
+    }
+  }
 
-					&__text {
-						font-size: $u-upload-text-font-size;
-						color: $u-upload-text-color;
-						margin-top: $u-upload-text-margin-top;
-					}
-				}
-			}
-		}
+  &__deletable {
+    position: absolute;
+    // top: $u-upload-deletable-top;
+    // right: $u-upload-deletable-right;
+    // background-color: $u-upload-deletable-bgColor;
+    top: 0;
+    right: 0;
+    border-radius: 999px;
+    transform: translateX(50%) translateY(-50%);
+    // height: $u-upload-deletable-height;
+    // width: $u-upload-deletable-width;
+    @include flex;
+    // border-bottom-left-radius: $u-upload-deletable-boder-bottom-left-radius;
+    align-items: center;
+    justify-content: center;
+    z-index: $u-upload-deletable-zIndex;
+    &__icon {
+      transform: scale(0.7);
+    }
+  }
 
-		&__deletable {
-			position: absolute;
-			top: $u-upload-deletable-top;
-			right: $u-upload-deletable-right;
-			background-color: $u-upload-deletable-bgColor;
-			height: $u-upload-deletable-height;
-			width: $u-upload-deletable-width;
-			@include flex;
-			border-bottom-left-radius: $u-upload-deletable-boder-bottom-left-radius;
-			align-items: center;
-			justify-content: center;
-			z-index: $u-upload-deletable-zIndex;
+  &__success {
+    opacity: 0;
+    position: absolute;
+    bottom: $u-upload-success-bottom;
+    right: $u-upload-success-right;
+    @include flex;
+    // 由于weex(nvue)为阿里巴巴的KPI(部门业绩考核)的laji产物，不支持css绘制三角形
+    // 所以在nvue下使用图片，非nvue下使用css实现
+    /* #ifndef APP-NVUE */
+    border-style: $u-upload-success-border-style;
+    border-top-color: $u-upload-success-border-top-color;
+    border-left-color: $u-upload-success-border-left-color;
+    border-bottom-color: $u-upload-success-border-bottom-color;
+    border-right-color: $u-upload-success-border-right-color;
+    border-width: $u-upload-success-border-width;
+    align-items: center;
+    justify-content: center;
+    /* #endif */
 
-			&__icon {
-				position: absolute;
-				transform: scale(0.7);
-				top: $u-upload-icon-top;
-				right: $u-upload-icon-right;
-				/* #ifdef H5 */
-				top: $u-upload-icon-h5-top;
-				right: $u-upload-icon-h5-right;
-				/* #endif */
-			}
-		}
+    &__icon {
+      /* #ifndef APP-NVUE */
+      position: absolute;
+      transform: scale(0.7);
+      bottom: $u-upload-success-icon-bottom;
+      right: $u-upload-success-icon-right;
+      /* #endif */
+      /* #ifdef APP-NVUE */
+      width: $u-upload-icon-width;
+      height: $u-upload-icon-height;
+      /* #endif */
+    }
+  }
 
-		&__success {
-			position: absolute;
-			bottom: $u-upload-success-bottom;
-			right: $u-upload-success-right;
-			@include flex;
-			// 由于weex(nvue)为阿里巴巴的KPI(部门业绩考核)的laji产物，不支持css绘制三角形
-			// 所以在nvue下使用图片，非nvue下使用css实现
-			/* #ifndef APP-NVUE */
-			border-style: $u-upload-success-border-style;
-			border-top-color: $u-upload-success-border-top-color;
-			border-left-color: $u-upload-success-border-left-color;
-			border-bottom-color: $u-upload-success-border-bottom-color;
-			border-right-color: $u-upload-success-border-right-color;
-			border-width: $u-upload-success-border-width;
-			align-items: center;
-			justify-content: center;
-			/* #endif */
+  &__status {
+    position: absolute;
+    top: $u-upload-status-top;
+    bottom: $u-upload-status-bottom;
+    left: $u-upload-status-left;
+    right: $u-upload-status-right;
+    background-color: $u-upload-status-bgColor;
+    @include flex(column);
+    align-items: center;
+    justify-content: center;
 
-			&__icon {
-				/* #ifndef APP-NVUE */
-				position: absolute;
-				transform: scale(0.7);
-				bottom: $u-upload-success-icon-bottom;
-				right: $u-upload-success-icon-right;
-				/* #endif */
-				/* #ifdef APP-NVUE */
-				width: $u-upload-icon-width;
-				height: $u-upload-icon-height;
-				/* #endif */
-			}
-		}
+    &__icon {
+      position: relative;
+      z-index: $u-upload-status-icon-Zindex;
+    }
 
-		&__status {
-			position: absolute;
-			top: $u-upload-status-top;
-			bottom: $u-upload-status-bottom;
-			left: $u-upload-status-left;
-			right: $u-upload-status-right;
-			background-color: $u-upload-status-bgColor;
-			@include flex(column);
-			align-items: center;
-			justify-content: center;
+    &__message {
+      font-size: $u-upload-message-font-size;
+      color: $u-upload-message-color;
+      margin-top: $u-upload-message-margin-top;
+    }
+  }
 
-			&__icon {
-				position: relative;
-				z-index: $u-upload-status-icon-Zindex;
-			}
+  &__button {
+    @include flex(column);
+    align-items: center;
+    justify-content: center;
+    width: $u-upload-button-width;
+    height: $u-upload-button-height;
+    background-color: $u-upload-button-bgColor;
+    // border-radius: $u-upload-button-border-radius;
+    margin: $u-upload-botton-margin;
+    border-radius: 16rpx;
+    /* #ifndef APP-NVUE */
+    box-sizing: border-box;
+    /* #endif */
 
-			&__message {
-				font-size: $u-upload-message-font-size;
-				color: $u-upload-message-color;
-				margin-top: $u-upload-message-margin-top;
-			}
-		}
+    &__text {
+      font-size: $u-upload-text-font-size;
+      color: $u-upload-text-color;
+      margin-top: $u-upload-text-margin-top;
+    }
 
-		&__button {
-			@include flex(column);
-			align-items: center;
-			justify-content: center;
-			width: $u-upload-button-width;
-			height: $u-upload-button-height;
-			background-color: $u-upload-button-bgColor;
-			border-radius: $u-upload-button-border-radius;
-			margin: $u-upload-botton-margin;
-			/* #ifndef APP-NVUE */
-			box-sizing: border-box;
-			/* #endif */
+    &--hover {
+      background-color: $u-upload-hover-bgColor;
+    }
 
-			&__text {
-				font-size: $u-upload-text-font-size;
-				color: $u-upload-text-color;
-				margin-top: $u-upload-text-margin-top;
-			}
-
-			&--hover {
-				background-color: $u-upload-hover-bgColor;
-			}
-
-			&--disabled {
-				opacity: $u-upload-disabled-opacity;
-			}
-		}
-	}
+    &--disabled {
+      opacity: $u-upload-disabled-opacity;
+    }
+  }
+}
 </style>
diff --git a/utils/request.js b/utils/request.js
index 983fdeb..aa1878d 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -60,7 +60,6 @@ const request = config => {
 							})
 						}, 500)
 					}
-
 					reject('无效的会话，或者会话已过期，请重新登录。')
 				} else if (code === 500) {
 					toast(msg)
diff --git a/wxcomponents/vant/dropdown-item/index.wxss b/wxcomponents/vant/dropdown-item/index.wxss
index 80505e9..d234c59 100644
--- a/wxcomponents/vant/dropdown-item/index.wxss
+++ b/wxcomponents/vant/dropdown-item/index.wxss
@@ -1 +1,32 @@
-@import '../common/index.wxss';.van-dropdown-item{left:0;overflow:hidden;position:fixed;right:0}.van-dropdown-item__option{text-align:left}.van-dropdown-item__option--active .van-dropdown-item__icon,.van-dropdown-item__option--active .van-dropdown-item__title{color:var(--dropdown-menu-option-active-color,#ee0a24)}.van-dropdown-item--up{top:0}.van-dropdown-item--down{bottom:0}.van-dropdown-item__icon{display:block;line-height:inherit}
\ No newline at end of file
+@import '../common/index.wxss';
+
+.van-dropdown-item {
+	left: 0;
+	overflow: hidden;
+	position: fixed;
+	right: 0
+}
+
+.van-dropdown-item__option {
+	text-align: left
+}
+
+.van-dropdown-item__option--active .van-dropdown-item__icon,
+.van-dropdown-item__option--active .van-dropdown-item__title {
+	color: var(--dropdown-menu-option-active-color, #ee0a24)
+}
+
+.van-dropdown-item--up {
+	top: 0
+}
+
+.van-dropdown-item--down {
+	/* bottom: 48rpx */
+	bottom: 0;
+	margin-bottom: 48rpx;
+}
+
+.van-dropdown-item__icon {
+	display: block;
+	line-height: inherit
+}
\ No newline at end of file
diff --git a/wxcomponents/vant/dropdown-menu/index.wxml b/wxcomponents/vant/dropdown-menu/index.wxml
index 5b5ee6f..68b523f 100644
--- a/wxcomponents/vant/dropdown-menu/index.wxml
+++ b/wxcomponents/vant/dropdown-menu/index.wxml
@@ -14,6 +14,7 @@
       style="{{ item.showPopup ? 'color:' + activeColor : '' }}"
     >
       <view class="van-ellipsis">
+				<text class='preffix'>{{item.title}}</text>
 				<text class="select-title" style="color:{{computed.setTitleColor(item)}}"> {{ computed.displayTitle(item) }}</text>
 				<text class='arrow' style="border-color:#17c653"></text>
       </view>
diff --git a/wxcomponents/vant/dropdown-menu/index.wxs b/wxcomponents/vant/dropdown-menu/index.wxs
index 2b000f2..2d23ca0 100644
--- a/wxcomponents/vant/dropdown-menu/index.wxs
+++ b/wxcomponents/vant/dropdown-menu/index.wxs
@@ -1,9 +1,8 @@
 /* eslint-disable */
 function displayTitle(item) {
-	if (item.title) {
-		return item.title;
-	}
-
+	// if (!item.value) {
+	// 	return item.title;
+	// }
 	var match = item.options.filter(function(option) {
 		return option.value === item.value;
 	});
diff --git a/wxcomponents/vant/dropdown-menu/index.wxss b/wxcomponents/vant/dropdown-menu/index.wxss
index be43ef7..87021fa 100644
--- a/wxcomponents/vant/dropdown-menu/index.wxss
+++ b/wxcomponents/vant/dropdown-menu/index.wxss
@@ -1,8 +1,6 @@
 @import '../common/index.wxss';
 
 .van-dropdown-menu {
-	background-color: var(--dropdown-menu-background-color, #fff);
-	box-shadow: var(--dropdown-menu-box-shadow, 0 2px 12px hsla(210, 1%, 40%, .12));
 	display: flex;
 	height: var(--dropdown-menu-height, 50px);
 	-webkit-user-select: none;
@@ -61,15 +59,15 @@
 	flex: row nowrap;
 	justify-content: center;
 	align-items: center;
-	gap: 4px;
+	gap: 8rpx;
 }
 
 .select-title {
-	font-weight: 600;
+	font-weight: bold;
 	transition: .2s all;
+	color: #071437;
 }
 
-
 .van-dropdown-menu__title .arrow {
 	border-style: solid;
 	border-color: #000;