diff --git a/theme/infographic.js b/theme/infographic.js
index 13a86c3dae..be5e2565a5 100644
--- a/theme/infographic.js
+++ b/theme/infographic.js
@@ -76,9 +76,7 @@
 
         toolbox: {
             iconStyle: {
-                normal: {
-                    borderColor: colorPalette[0]
-                }
+                borderColor: colorPalette[0]
             }
         },
 
@@ -152,8 +150,10 @@
                 borderColor: '#fff',
                 lineStyle: {
                     width: 3
-                },
-                emphasis: {
+                }
+            },
+            emphasis: {
+                itemStyle: {
                     borderWidth: 0
                 }
             },
diff --git a/theme/macarons.js b/theme/macarons.js
index d78f7e99d4..c771d5e844 100644
--- a/theme/macarons.js
+++ b/theme/macarons.js
@@ -82,9 +82,7 @@
 
         toolbox: {
             iconStyle: {
-                normal: {
-                    borderColor: colorPalette[0]
-                }
+                borderColor: colorPalette[0]
             }
         },
 
diff --git a/theme/macarons2.js b/theme/macarons2.js
index 3fdb4b9fbc..59cdddb6cc 100644
--- a/theme/macarons2.js
+++ b/theme/macarons2.js
@@ -88,70 +88,67 @@
             // barWidth: null,        // 默认自适应
             barGap: '30%', // 柱间距离，默认为柱形宽度的30%，可设固定值
             barCategoryGap: '20%', // 类目间柱形距离，默认为类目间距的20%，可设固定值
+            label: {
+                show: false
+                // position: 默认自适应，水平布局为'top'，垂直布局为'right'，可选为
+                //           'inside'|'left'|'right'|'top'|'bottom'
+                // textStyle: null      // 默认使用全局文本样式，详见TEXTSTYLE
+            },
             itemStyle: {
-                normal: {
-                    // color: '各异',
-                    barBorderColor: '#fff', // 柱条边线
-                    barBorderRadius: 0, // 柱条边线圆角，单位px，默认为0
-                    barBorderWidth: 1, // 柱条边线线宽，单位px，默认为1
-                    label: {
-                        show: false
-                        // position: 默认自适应，水平布局为'top'，垂直布局为'right'，可选为
-                        //           'inside'|'left'|'right'|'top'|'bottom'
-                        // textStyle: null      // 默认使用全局文本样式，详见TEXTSTYLE
-                    }
-                },
-                emphasis: {
+                // color: '各异',
+                barBorderColor: '#fff', // 柱条边线
+                barBorderRadius: 0, // 柱条边线圆角，单位px，默认为0
+                barBorderWidth: 1 // 柱条边线线宽，单位px，默认为1
+            },
+            emphasis: {
+                itemStyle: {
                     // color: '各异',
                     barBorderColor: 'rgba(0,0,0,0)', // 柱条边线
                     barBorderRadius: 0, // 柱条边线圆角，单位px，默认为0
                     barBorderWidth: 1, // 柱条边线线宽，单位px，默认为1
-                    label: {
-                        show: false
-                        // position: 默认自适应，水平布局为'top'，垂直布局为'right'，可选为
-                        //           'inside'|'left'|'right'|'top'|'bottom'
-                        // textStyle: null      // 默认使用全局文本样式，详见TEXTSTYLE
-                    }
+                },
+                label: {
+                    show: false
+                    // position: 默认自适应，水平布局为'top'，垂直布局为'right'，可选为
+                    //           'inside'|'left'|'right'|'top'|'bottom'
+                    // textStyle: null      // 默认使用全局文本样式，详见TEXTSTYLE
                 }
             }
         },
 
         line: {
+            label: {
+                show: false
+                // position: 默认自适应，水平布局为'top'，垂直布局为'right'，可选为
+                //           'inside'|'left'|'right'|'top'|'bottom'
+                // textStyle: null      // 默认使用全局文本样式，详见TEXTSTYLE
+            },
             itemStyle: {
-                normal: {
-                    // color: 各异,
-                    label: {
-                        show: false
-                        // position: 默认自适应，水平布局为'top'，垂直布局为'right'，可选为
-                        //           'inside'|'left'|'right'|'top'|'bottom'
-                        // textStyle: null      // 默认使用全局文本样式，详见TEXTSTYLE
-                    },
-                    lineStyle: {
-                        width: 2,
-                        type: 'solid',
-                        shadowColor: 'rgba(0,0,0,0)', //默认透明
-                        shadowBlur: 5,
-                        shadowOffsetX: 3,
-                        shadowOffsetY: 3
-                    }
-                },
-                emphasis: {
-                    // color: 各异,
-                    label: {
-                        show: false
-                        // position: 默认自适应，水平布局为'top'，垂直布局为'right'，可选为
-                        //           'inside'|'left'|'right'|'top'|'bottom'
-                        // textStyle: null      // 默认使用全局文本样式，详见TEXTSTYLE
-                    }
+                // color: 各异,
+            },
+            emphasis: {
+                // color: 各异,
+                label: {
+                    show: false
+                    // position: 默认自适应，水平布局为'top'，垂直布局为'right'，可选为
+                    //           'inside'|'left'|'right'|'top'|'bottom'
+                    // textStyle: null      // 默认使用全局文本样式，详见TEXTSTYLE
                 }
             },
+            lineStyle: {
+                width: 2,
+                type: 'solid',
+                shadowColor: 'rgba(0,0,0,0)', //默认透明
+                shadowBlur: 5,
+                shadowOffsetX: 3,
+                shadowOffsetY: 3
+            },
             //smooth : false,
             //symbol: null,         // 拐点图形类型
             symbolSize: 2, // 拐点图形大小
             //symbolRotate : null,  // 拐点图形旋转控制
             showAllSymbol: false // 标志图形默认只有主轴显示（随主轴标签间隔隐藏策略）
         },
-
         candlestick: {
             itemStyle: {
                 color: '#fe9778',
@@ -176,25 +173,25 @@
             startAngle: 90,
             minAngle: 0, // 最小角度改为0
             selectedOffset: 10, // 选中是扇区偏移量
+            label: {
+                show: true,
+                position: 'outer',
+                color: '#1b1b1b',
+                lineStyle: { color: '#1b1b1b' }
+                // textStyle: null      // 默认使用全局文本样式，详见TEXTSTYLE
+            },
             itemStyle: {
                 // color: 各异,
                 borderColor: '#fff',
-                borderWidth: 1,
-                label: {
-                    show: true,
-                    position: 'outer',
-                    color: '#1b1b1b',
-                    lineStyle: { color: '#1b1b1b' }
-                    // textStyle: null      // 默认使用全局文本样式，详见TEXTSTYLE
-                },
-                labelLine: {
-                    show: true,
-                    length: 20,
-                    lineStyle: {
-                        // color: 各异,
-                        width: 1,
-                        type: 'solid'
-                    }
+                borderWidth: 1
+            },
+            labelLine: {
+                show: true,
+                length: 20,
+                lineStyle: {
+                    // color: 各异,
+                    width: 1,
+                    type: 'solid'
                 }
             }
         },
diff --git a/theme/shine.js b/theme/shine.js
index e554af7683..0114f7b90b 100644
--- a/theme/shine.js
+++ b/theme/shine.js
@@ -67,9 +67,7 @@
 
         toolbox: {
             iconStyle: {
-                normal: {
-                    borderColor: '#06467c'
-                }
+                borderColor: '#06467c'
             }
         },
 
diff --git a/theme/tech-blue.js b/theme/tech-blue.js
index e5435f0e55..db05ba6355 100644
--- a/theme/tech-blue.js
+++ b/theme/tech-blue.js
@@ -105,8 +105,12 @@
                 color: '#00aecd'
             },
             controlStyle: {
-                normal: { color: '#00aecd' },
-                emphasis: { color: '#00aecd' }
+                color: '#00aecd',
+            },
+            emphasis: {
+                controlStyle: {
+                  color: '#00aecd'
+                }
             }
         },
 
diff --git a/theme/tool/option/area.js b/theme/tool/option/area.js
index 49c290b470..037db12b75 100644
--- a/theme/tool/option/area.js
+++ b/theme/tool/option/area.js
@@ -49,28 +49,28 @@ export default {
             name:'Email',
             type:'line',
             stack: '总量',
-            areaStyle: {normal: {}},
+            areaStyle: {},
             data:[120, 132, 101, 134, 90, 230, 210]
         },
         {
             name:'联盟广告',
             type:'line',
             stack: '总量',
-            areaStyle: {normal: {}},
+            areaStyle: {},
             data:[220, 182, 191, 234, 290, 330, 310]
         },
         {
             name:'视频广告',
             type:'line',
             stack: '总量',
-            areaStyle: {normal: {}},
+            areaStyle: {},
             data:[150, 232, 201, 154, 190, 330, 410]
         },
         {
             name:'直接访问',
             type:'line',
             stack: '总量',
-            areaStyle: {normal: {}},
+            areaStyle: {},
             data:[320, 332, 301, 334, 390, 330, 320]
         },
         {
@@ -78,12 +78,10 @@ export default {
             type:'line',
             stack: '总量',
             label: {
-                normal: {
-                    show: true,
-                    position: 'top'
-                }
+                show: true,
+                position: 'top'
             },
-            areaStyle: {normal: {}},
+            areaStyle: {},
             data:[820, 932, 901, 934, 1290, 1330, 1320]
         }
     ]
diff --git a/theme/tool/option/bar.js b/theme/tool/option/bar.js
index 8cb7a7ac3f..a97ea75852 100644
--- a/theme/tool/option/bar.js
+++ b/theme/tool/option/bar.js
@@ -58,10 +58,8 @@ export default {
             type:'bar',
             stack: '总量',
             label: {
-                normal: {
-                    show: true,
-                    position: 'insideRight'
-                }
+                show: true,
+                position: 'insideRight'
             },
             data:[320, 302, 301, 334, 390, 330, 320]
         },
@@ -70,10 +68,8 @@ export default {
             type:'bar',
             stack: '总量',
             label: {
-                normal: {
-                    show: true,
-                    position: 'insideRight'
-                }
+                show: true,
+                position: 'insideRight'
             },
             data:[120, 132, 101, 134, 90, 230, 210]
         },
@@ -82,10 +78,8 @@ export default {
             type:'bar',
             stack: '总量',
             label: {
-                normal: {
-                    show: true,
-                    position: 'insideRight'
-                }
+                show: true,
+                position: 'insideRight'
             },
             data:[220, 182, 191, 234, 290, 330, 310]
         },
@@ -94,10 +88,8 @@ export default {
             type:'bar',
             stack: '总量',
             label: {
-                normal: {
-                    show: true,
-                    position: 'insideRight'
-                }
+                show: true,
+                position: 'insideRight'
             },
             data:[150, 212, 201, 154, 190, 330, 410]
         },
@@ -106,12 +98,10 @@ export default {
             type:'bar',
             stack: '总量',
             label: {
-                normal: {
-                    show: true,
-                    position: 'insideRight'
-                }
+                show: true,
+                position: 'insideRight'
             },
             data:[820, 832, 901, 934, 1290, 1330, 1320]
         }
     ]
-};
\ No newline at end of file
+};
diff --git a/theme/tool/option/graph.js b/theme/tool/option/graph.js
index c10878ca22..1b714c3da4 100644
--- a/theme/tool/option/graph.js
+++ b/theme/tool/option/graph.js
@@ -28,10 +28,8 @@ export default {
           "id":"0",
           "name":"Myriel",
           "label":{
-            "normal":{
-              "formatter":"Myriel",
-              "show":false
-            }
+            "formatter":"Myriel",
+            "show":false
           },
           "symbolSize":28.685715,
           "x":-266.82776,
@@ -46,10 +44,8 @@ export default {
           "id":"1",
           "name":"Napoleon",
           "label":{
-            "normal":{
-              "formatter":"Napoleon",
-              "show":false
-            }
+            "formatter":"Napoleon",
+            "show":false
           },
           "symbolSize":4,
           "x":-418.08344,
@@ -64,10 +60,8 @@ export default {
           "id":"2",
           "name":"MlleBaptistine",
           "label":{
-            "normal":{
-              "formatter":"MlleBaptistine",
-              "show":false
-            }
+            "formatter":"MlleBaptistine",
+            "show":false
           },
           "symbolSize":9.485714,
           "x":-212.76357,
@@ -82,10 +76,8 @@ export default {
           "id":"3",
           "name":"MmeMagloire",
           "label":{
-            "normal":{
-              "formatter":"MmeMagloire",
-              "show":false
-            }
+            "formatter":"MmeMagloire",
+            "show":false
           },
           "symbolSize":9.485714,
           "x":-242.82404,
@@ -100,10 +92,8 @@ export default {
           "id":"4",
           "name":"CountessDeLo",
           "label":{
-            "normal":{
-              "formatter":"CountessDeLo",
-              "show":false
-            }
+            "formatter":"CountessDeLo",
+            "show":false
           },
           "symbolSize":4,
           "x":-379.30386,
@@ -118,10 +108,8 @@ export default {
           "id":"5",
           "name":"Geborand",
           "label":{
-            "normal":{
-              "formatter":"Geborand",
-              "show":false
-            }
+            "formatter":"Geborand",
+            "show":false
           },
           "symbolSize":4,
           "x":-417.26337,
@@ -136,10 +124,8 @@ export default {
           "id":"6",
           "name":"Champtercier",
           "label":{
-            "normal":{
-              "formatter":"Champtercier",
-              "show":false
-            }
+            "formatter":"Champtercier",
+            "show":false
           },
           "symbolSize":4,
           "x":-332.6012,
@@ -154,10 +140,8 @@ export default {
           "id":"7",
           "name":"Cravatte",
           "label":{
-            "normal":{
-              "formatter":"Cravatte",
-              "show":false
-            }
+            "formatter":"Cravatte",
+            "show":false
           },
           "symbolSize":4,
           "x":-382.69568,
@@ -172,10 +156,8 @@ export default {
           "id":"8",
           "name":"Count",
           "label":{
-            "normal":{
-              "formatter":"Count",
-              "show":false
-            }
+            "formatter":"Count",
+            "show":false
           },
           "symbolSize":4,
           "x":-320.384,
@@ -190,10 +172,8 @@ export default {
           "id":"9",
           "name":"OldMan",
           "label":{
-            "normal":{
-              "formatter":"OldMan",
-              "show":false
-            }
+            "formatter":"OldMan",
+            "show":false
           },
           "symbolSize":4,
           "x":-344.39832,
@@ -208,10 +188,8 @@ export default {
           "id":"10",
           "name":"Labarre",
           "label":{
-            "normal":{
-              "formatter":"Labarre",
-              "show":false
-            }
+            "formatter":"Labarre",
+            "show":false
           },
           "symbolSize":4,
           "x":-89.34107,
@@ -226,10 +204,8 @@ export default {
           "id":"11",
           "name":"Valjean",
           "label":{
-            "normal":{
-              "formatter":"Valjean",
-              "show":  false
-            }
+            "formatter":"Valjean",
+            "show":  false
           },
           "symbolSize":100,
           "x":-87.93029,
@@ -244,10 +220,8 @@ export default {
           "id":"12",
           "name":"Marguerite",
           "label":{
-            "normal":{
-              "formatter":"Marguerite",
-              "show":false
-            }
+            "formatter":"Marguerite",
+            "show":false
           },
           "symbolSize":6.742859,
           "x":-339.77908,
@@ -262,10 +236,8 @@ export default {
           "id":"13",
           "name":"MmeDeR",
           "label":{
-            "normal":{
-              "formatter":"MmeDeR",
-              "show":false
-            }
+            "formatter":"MmeDeR",
+            "show":false
           },
           "symbolSize":4,
           "x":-194.31313,
@@ -280,10 +252,8 @@ export default {
           "id":"14",
           "name":"Isabeau",
           "label":{
-            "normal":{
-              "formatter":"Isabeau",
-              "show":false
-            }
+            "formatter":"Isabeau",
+            "show":false
           },
           "symbolSize":4,
           "x":-158.05168,
@@ -298,10 +268,8 @@ export default {
           "id":"15",
           "name":"Gervais",
           "label":{
-            "normal":{
-              "formatter":"Gervais",
-              "show":false
-            }
+            "formatter":"Gervais",
+            "show":false
           },
           "symbolSize":4,
           "x":-127.701546,
@@ -316,10 +284,8 @@ export default {
           "id":"16",
           "name":"Tholomyes",
           "label":{
-            "normal":{
-              "formatter":"Tholomyes",
-              "show":false
-            }
+            "formatter":"Tholomyes",
+            "show":false
           },
           "symbolSize":25.942856,
           "x":-385.2226,
@@ -334,10 +300,8 @@ export default {
           "id":"17",
           "name":"Listolier",
           "label":{
-            "normal":{
-              "formatter":"Listolier",
-              "show":false
-            }
+            "formatter":"Listolier",
+            "show":false
           },
           "symbolSize":20.457146,
           "x":-516.55884,
@@ -352,10 +316,8 @@ export default {
           "id":"18",
           "name":"Fameuil",
           "label":{
-            "normal":{
-              "formatter":"Fameuil",
-              "show":false
-            }
+            "formatter":"Fameuil",
+            "show":false
           },
           "symbolSize":20.457146,
           "x":-464.79382,
@@ -370,10 +332,8 @@ export default {
           "id":"19",
           "name":"Blacheville",
           "label":{
-            "normal":{
-              "formatter":"Blacheville",
-              "show":false
-            }
+            "formatter":"Blacheville",
+            "show":false
           },
           "symbolSize":20.457146,
           "x":-515.1624,
@@ -388,10 +348,8 @@ export default {
           "id":"20",
           "name":"Favourite",
           "label":{
-            "normal":{
-              "formatter":"Favourite",
-              "show":false
-            }
+            "formatter":"Favourite",
+            "show":false
           },
           "symbolSize":20.457146,
           "x":-408.12122,
@@ -406,10 +364,8 @@ export default {
           "id":"21",
           "name":"Dahlia",
           "label":{
-            "normal":{
-              "formatter":"Dahlia",
-              "show":false
-            }
+            "formatter":"Dahlia",
+            "show":false
           },
           "symbolSize":20.457146,
           "x":-456.44113,
@@ -424,10 +380,8 @@ export default {
           "id":"22",
           "name":"Zephine",
           "label":{
-            "normal":{
-              "formatter":"Zephine",
-              "show":false
-            }
+            "formatter":"Zephine",
+            "show":false
           },
           "symbolSize":20.457146,
           "x":-459.1107,
@@ -442,10 +396,8 @@ export default {
           "id":"23",
           "name":"Fantine",
           "label":{
-            "normal":{
-              "formatter":"Fantine",
-              "show":  false
-            }
+            "formatter":"Fantine",
+            "show":  false
           },
           "symbolSize":42.4,
           "x":-313.42786,
@@ -460,10 +412,8 @@ export default {
           "id":"24",
           "name":"MmeThenardier",
           "label":{
-            "normal":{
-              "formatter":"MmeThenardier",
-              "show":  false
-            }
+            "formatter":"MmeThenardier",
+            "show":  false
           },
           "symbolSize":31.428574,
           "x":4.6313396,
@@ -478,10 +428,8 @@ export default {
           "id":"25",
           "name":"Thenardier",
           "label":{
-            "normal":{
-              "formatter":"Thenardier",
-              "show":  false
-            }
+            "formatter":"Thenardier",
+            "show":  false
           },
           "symbolSize":45.142853,
           "x":82.80825,
@@ -496,10 +444,8 @@ export default {
           "id":"26",
           "name":"Cosette",
           "label":{
-            "normal":{
-              "formatter":"Cosette",
-              "show":  false
-            }
+            "formatter":"Cosette",
+            "show":  false
           },
           "symbolSize":31.428574,
           "x":78.64646,
@@ -514,10 +460,8 @@ export default {
           "id":"27",
           "name":"Javert",
           "label":{
-            "normal":{
-              "formatter":"Javert",
-              "show":  false
-            }
+            "formatter":"Javert",
+            "show":  false
           },
           "symbolSize":47.88571,
           "x":-81.46074,
@@ -532,10 +476,8 @@ export default {
           "id":"28",
           "name":"Fauchelevent",
           "label":{
-            "normal":{
-              "formatter":"Fauchelevent",
-              "show":false
-            }
+            "formatter":"Fauchelevent",
+            "show":false
           },
           "symbolSize":12.228573,
           "x":-225.73984,
@@ -550,10 +492,8 @@ export default {
           "id":"29",
           "name":"Bamatabois",
           "label":{
-            "normal":{
-              "formatter":"Bamatabois",
-              "show":false
-            }
+            "formatter":"Bamatabois",
+            "show":false
           },
           "symbolSize":23.2,
           "x":-385.6842,
@@ -568,10 +508,8 @@ export default {
           "id":"30",
           "name":"Perpetue",
           "label":{
-            "normal":{
-              "formatter":"Perpetue",
-              "show":false
-            }
+            "formatter":"Perpetue",
+            "show":false
           },
           "symbolSize":6.742859,
           "x":-403.92447,
@@ -586,10 +524,8 @@ export default {
           "id":"31",
           "name":"Simplice",
           "label":{
-            "normal":{
-              "formatter":"Simplice",
-              "show":false
-            }
+            "formatter":"Simplice",
+            "show":false
           },
           "symbolSize":12.228573,
           "x":-281.4253,
@@ -604,10 +540,8 @@ export default {
           "id":"32",
           "name":"Scaufflaire",
           "label":{
-            "normal":{
-              "formatter":"Scaufflaire",
-              "show":false
-            }
+            "formatter":"Scaufflaire",
+            "show":false
           },
           "symbolSize":4,
           "x":-122.41348,
@@ -622,10 +556,8 @@ export default {
           "id":"33",
           "name":"Woman1",
           "label":{
-            "normal":{
-              "formatter":"Woman1",
-              "show":false
-            }
+            "formatter":"Woman1",
+            "show":false
           },
           "symbolSize":6.742859,
           "x":-234.6001,
@@ -640,10 +572,8 @@ export default {
           "id":"34",
           "name":"Judge",
           "label":{
-            "normal":{
-              "formatter":"Judge",
-              "show":false
-            }
+            "formatter":"Judge",
+            "show":false
           },
           "symbolSize":17.714287,
           "x":-387.84915,
@@ -658,10 +588,8 @@ export default {
           "id":"35",
           "name":"Champmathieu",
           "label":{
-            "normal":{
-              "formatter":"Champmathieu",
-              "show":false
-            }
+            "formatter":"Champmathieu",
+            "show":false
           },
           "symbolSize":17.714287,
           "x":-338.2307,
@@ -676,10 +604,8 @@ export default {
           "id":"36",
           "name":"Brevet",
           "label":{
-            "normal":{
-              "formatter":"Brevet",
-              "show":false
-            }
+            "formatter":"Brevet",
+            "show":false
           },
           "symbolSize":17.714287,
           "x":-453.26874,
@@ -694,10 +620,8 @@ export default {
           "id":"37",
           "name":"Chenildieu",
           "label":{
-            "normal":{
-              "formatter":"Chenildieu",
-              "show":false
-            }
+            "formatter":"Chenildieu",
+            "show":false
           },
           "symbolSize":17.714287,
           "x":-386.44904,
@@ -712,10 +636,8 @@ export default {
           "id":"38",
           "name":"Cochepaille",
           "label":{
-            "normal":{
-              "formatter":"Cochepaille",
-              "show":false
-            }
+            "formatter":"Cochepaille",
+            "show":false
           },
           "symbolSize":17.714287,
           "x":-446.7876,
@@ -730,10 +652,8 @@ export default {
           "id":"39",
           "name":"Pontmercy",
           "label":{
-            "normal":{
-              "formatter":"Pontmercy",
-              "show":false
-            }
+            "formatter":"Pontmercy",
+            "show":false
           },
           "symbolSize":9.485714,
           "x":336.49738,
@@ -748,10 +668,8 @@ export default {
           "id":"40",
           "name":"Boulatruelle",
           "label":{
-            "normal":{
-              "formatter":"Boulatruelle",
-              "show":false
-            }
+            "formatter":"Boulatruelle",
+            "show":false
           },
           "symbolSize":4,
           "x":29.187843,
@@ -766,10 +684,8 @@ export default {
           "id":"41",
           "name":"Eponine",
           "label":{
-            "normal":{
-              "formatter":"Eponine",
-              "show":  false
-            }
+            "formatter":"Eponine",
+            "show":  false
           },
           "symbolSize":31.428574,
           "x":238.36697,
@@ -784,10 +700,8 @@ export default {
           "id":"42",
           "name":"Anzelma",
           "label":{
-            "normal":{
-              "formatter":"Anzelma",
-              "show":false
-            }
+            "formatter":"Anzelma",
+            "show":false
           },
           "symbolSize":9.485714,
           "x":189.69513,
@@ -802,10 +716,8 @@ export default {
           "id":"43",
           "name":"Woman2",
           "label":{
-            "normal":{
-              "formatter":"Woman2",
-              "show":false
-            }
+            "formatter":"Woman2",
+            "show":false
           },
           "symbolSize":9.485714,
           "x":-187.00418,
@@ -820,10 +732,8 @@ export default {
           "id":"44",
           "name":"MotherInnocent",
           "label":{
-            "normal":{
-              "formatter":"MotherInnocent",
-              "show":false
-            }
+            "formatter":"MotherInnocent",
+            "show":false
           },
           "symbolSize":6.742859,
           "x":-252.99521,
@@ -838,10 +748,8 @@ export default {
           "id":"45",
           "name":"Gribier",
           "label":{
-            "normal":{
-              "formatter":"Gribier",
-              "show":false
-            }
+            "formatter":"Gribier",
+            "show":false
           },
           "symbolSize":4,
           "x":-296.07935,
@@ -856,10 +764,8 @@ export default {
           "id":"46",
           "name":"Jondrette",
           "label":{
-            "normal":{
-              "formatter":"Jondrette",
-              "show":false
-            }
+            "formatter":"Jondrette",
+            "show":false
           },
           "symbolSize":4,
           "x":550.3201,
@@ -874,10 +780,8 @@ export default {
           "id":"47",
           "name":"MmeBurgon",
           "label":{
-            "normal":{
-              "formatter":"MmeBurgon",
-              "show":false
-            }
+            "formatter":"MmeBurgon",
+            "show":false
           },
           "symbolSize":6.742859,
           "x":488.13535,
@@ -892,10 +796,8 @@ export default {
           "id":"48",
           "name":"Gavroche",
           "label":{
-            "normal":{
-              "formatter":"Gavroche",
-              "show":  false
-            }
+            "formatter":"Gavroche",
+            "show":  false
           },
           "symbolSize":61.600006,
           "x":387.89572,
@@ -910,10 +812,8 @@ export default {
           "id":"49",
           "name":"Gillenormand",
           "label":{
-            "normal":{
-              "formatter":"Gillenormand",
-              "show":false
-            }
+            "formatter":"Gillenormand",
+            "show":false
           },
           "symbolSize":20.457146,
           "x":126.4831,
@@ -928,10 +828,8 @@ export default {
           "id":"50",
           "name":"Magnon",
           "label":{
-            "normal":{
-              "formatter":"Magnon",
-              "show":false
-            }
+            "formatter":"Magnon",
+            "show":false
           },
           "symbolSize":6.742859,
           "x":127.07365,
@@ -946,10 +844,8 @@ export default {
           "id":"51",
           "name":"MlleGillenormand",
           "label":{
-            "normal":{
-              "formatter":"MlleGillenormand",
-              "show":false
-            }
+            "formatter":"MlleGillenormand",
+            "show":false
           },
           "symbolSize":20.457146,
           "x":162.63559,
@@ -964,10 +860,8 @@ export default {
           "id":"52",
           "name":"MmePontmercy",
           "label":{
-            "normal":{
-              "formatter":"MmePontmercy",
-              "show":false
-            }
+            "formatter":"MmePontmercy",
+            "show":false
           },
           "symbolSize":6.742859,
           "x":353.66415,
@@ -982,10 +876,8 @@ export default {
           "id":"53",
           "name":"MlleVaubois",
           "label":{
-            "normal":{
-              "formatter":"MlleVaubois",
-              "show":false
-            }
+            "formatter":"MlleVaubois",
+            "show":false
           },
           "symbolSize":4,
           "x":165.43939,
@@ -1000,10 +892,8 @@ export default {
           "id":"54",
           "name":"LtGillenormand",
           "label":{
-            "normal":{
-              "formatter":"LtGillenormand",
-              "show":false
-            }
+            "formatter":"LtGillenormand",
+            "show":false
           },
           "symbolSize":12.228573,
           "x":137.69348,
@@ -1018,10 +908,8 @@ export default {
           "id":"55",
           "name":"Marius",
           "label":{
-            "normal":{
-              "formatter":"Marius",
-              "show":  false
-            }
+            "formatter":"Marius",
+            "show":  false
           },
           "symbolSize":53.37143,
           "x":206.44687,
@@ -1036,10 +924,8 @@ export default {
           "id":"56",
           "name":"BaronessT",
           "label":{
-            "normal":{
-              "formatter":"BaronessT",
-              "show":false
-            }
+            "formatter":"BaronessT",
+            "show":false
           },
           "symbolSize":6.742859,
           "x":194.82993,
@@ -1054,10 +940,8 @@ export default {
           "id":"57",
           "name":"Mabeuf",
           "label":{
-            "normal":{
-              "formatter":"Mabeuf",
-              "show":  false
-            }
+            "formatter":"Mabeuf",
+            "show":  false
           },
           "symbolSize":31.428574,
           "x":597.6618,
@@ -1072,10 +956,8 @@ export default {
           "id":"58",
           "name":"Enjolras",
           "label":{
-            "normal":{
-              "formatter":"Enjolras",
-              "show":  false
-            }
+            "formatter":"Enjolras",
+            "show":  false
           },
           "symbolSize":42.4,
           "x":355.78366,
@@ -1090,10 +972,8 @@ export default {
           "id":"59",
           "name":"Combeferre",
           "label":{
-            "normal":{
-              "formatter":"Combeferre",
-              "show":  false
-            }
+            "formatter":"Combeferre",
+            "show":  false
           },
           "symbolSize":31.428574,
           "x":515.2961,
@@ -1108,10 +988,8 @@ export default {
           "id":"60",
           "name":"Prouvaire",
           "label":{
-            "normal":{
-              "formatter":"Prouvaire",
-              "show":false
-            }
+            "formatter":"Prouvaire",
+            "show":false
           },
           "symbolSize":25.942856,
           "x":614.29285,
@@ -1126,10 +1004,8 @@ export default {
           "id":"61",
           "name":"Feuilly",
           "label":{
-            "normal":{
-              "formatter":"Feuilly",
-              "show":  false
-            }
+            "formatter":"Feuilly",
+            "show":  false
           },
           "symbolSize":31.428574,
           "x":550.1917,
@@ -1144,10 +1020,8 @@ export default {
           "id":"62",
           "name":"Courfeyrac",
           "label":{
-            "normal":{
-              "formatter":"Courfeyrac",
-              "show":  false
-            }
+            "formatter":"Courfeyrac",
+            "show":  false
           },
           "symbolSize":36.91429,
           "x":436.17184,
@@ -1162,10 +1036,8 @@ export default {
           "id":"63",
           "name":"Bahorel",
           "label":{
-            "normal":{
-              "formatter":"Bahorel",
-              "show":  false
-            }
+            "formatter":"Bahorel",
+            "show":  false
           },
           "symbolSize":34.17143,
           "x":602.55225,
@@ -1180,10 +1052,8 @@ export default {
           "id":"64",
           "name":"Bossuet",
           "label":{
-            "normal":{
-              "formatter":"Bossuet",
-              "show":  false
-            }
+            "formatter":"Bossuet",
+            "show":  false
           },
           "symbolSize":36.91429,
           "x":455.81955,
@@ -1198,10 +1068,8 @@ export default {
           "id":"65",
           "name":"Joly",
           "label":{
-            "normal":{
-              "formatter":"Joly",
-              "show":  false
-            }
+            "formatter":"Joly",
+            "show":  false
           },
           "symbolSize":34.17143,
           "x":516.40784,
@@ -1216,10 +1084,8 @@ export default {
           "id":"66",
           "name":"Grantaire",
           "label":{
-            "normal":{
-              "formatter":"Grantaire",
-              "show":false
-            }
+            "formatter":"Grantaire",
+            "show":false
           },
           "symbolSize":28.685715,
           "x":646.4313,
@@ -1234,10 +1100,8 @@ export default {
           "id":"67",
           "name":"MotherPlutarch",
           "label":{
-            "normal":{
-              "formatter":"MotherPlutarch",
-              "show":false
-            }
+            "formatter":"MotherPlutarch",
+            "show":false
           },
           "symbolSize":4,
           "x":668.9568,
@@ -1252,10 +1116,8 @@ export default {
           "id":"68",
           "name":"Gueulemer",
           "label":{
-            "normal":{
-              "formatter":"Gueulemer",
-              "show":false
-            }
+            "formatter":"Gueulemer",
+            "show":false
           },
           "symbolSize":28.685715,
           "x":78.4799,
@@ -1270,10 +1132,8 @@ export default {
           "id":"69",
           "name":"Babet",
           "label":{
-            "normal":{
-              "formatter":"Babet",
-              "show":false
-            }
+            "formatter":"Babet",
+            "show":false
           },
           "symbolSize":28.685715,
           "x":150.35959,
@@ -1288,10 +1148,8 @@ export default {
           "id":"70",
           "name":"Claquesous",
           "label":{
-            "normal":{
-              "formatter":"Claquesous",
-              "show":false
-            }
+            "formatter":"Claquesous",
+            "show":false
           },
           "symbolSize":28.685715,
           "x":137.3717,
@@ -1306,10 +1164,8 @@ export default {
           "id":"71",
           "name":"Montparnasse",
           "label":{
-            "normal":{
-              "formatter":"Montparnasse",
-              "show":false
-            }
+            "formatter":"Montparnasse",
+            "show":false
           },
           "symbolSize":25.942856,
           "x":234.87747,
@@ -1324,10 +1180,8 @@ export default {
           "id":"72",
           "name":"Toussaint",
           "label":{
-            "normal":{
-              "formatter":"Toussaint",
-              "show":false
-            }
+            "formatter":"Toussaint",
+            "show":false
           },
           "symbolSize":9.485714,
           "x":40.942253,
@@ -1342,10 +1196,8 @@ export default {
           "id":"73",
           "name":"Child1",
           "label":{
-            "normal":{
-              "formatter":"Child1",
-              "show":false
-            }
+            "formatter":"Child1",
+            "show":false
           },
           "symbolSize":6.742859,
           "x":437.939,
@@ -1360,10 +1212,8 @@ export default {
           "id":"74",
           "name":"Child2",
           "label":{
-            "normal":{
-              "formatter":"Child2",
-              "show":false
-            }
+            "formatter":"Child2",
+            "show":false
           },
           "symbolSize":6.742859,
           "x":466.04922,
@@ -1378,10 +1228,8 @@ export default {
           "id":"75",
           "name":"Brujon",
           "label":{
-            "normal":{
-              "formatter":"Brujon",
-              "show":false
-            }
+            "formatter":"Brujon",
+            "show":false
           },
           "symbolSize":20.457146,
           "x":238.79364,
@@ -1396,10 +1244,8 @@ export default {
           "id":"76",
           "name":"MmeHucheloup",
           "label":{
-            "normal":{
-              "formatter":"MmeHucheloup",
-              "show":false
-            }
+            "formatter":"MmeHucheloup",
+            "show":false
           },
           "symbolSize":20.457146,
           "x":712.18353,
@@ -2968,15 +2814,11 @@ export default {
       ],
       "roam":true,
       "label":{
-        "normal":{
-          "position":"right"
-        }
+        "position":"right"
       },
       "lineStyle":{
-        "normal":{
-          "curveness":0.3
-        }
+        "curveness":0.3
       }
     }
   ]
-};
\ No newline at end of file
+};
diff --git a/theme/tool/option/map.js b/theme/tool/option/map.js
index 1cd4f4d963..3b0ce19c81 100644
--- a/theme/tool/option/map.js
+++ b/theme/tool/option/map.js
@@ -35,11 +35,11 @@ export default {
             map: 'china',
             showLegendSymbol: true,
             label: {
-                normal: {
-                    show: false
-                },
-                emphasis: {
-                    show: false
+                show: false,
+            },
+            emphasis: {
+                label: {
+                    show: false,
                 }
             },
             data:[
@@ -85,10 +85,10 @@ export default {
             mapType: 'china',
             showLegendSymbol: true,
             label: {
-                normal: {
-                    show: false
-                },
-                emphasis: {
+                show: false,
+            },
+            emphasis: {
+                label: {
                     show: false
                 }
             },
@@ -120,10 +120,10 @@ export default {
             mapType: 'china',
             showLegendSymbol: true,
             label: {
-                normal: {
-                    show: false
-                },
-                emphasis: {
+                show: false,
+            },
+            emphasis: {
+                label: {
                     show: false
                 }
             },
@@ -138,4 +138,4 @@ export default {
             ]
         }
     ]
-};
\ No newline at end of file
+};
diff --git a/theme/tool/option/pie.js b/theme/tool/option/pie.js
index c88e11ee76..1170ab1097 100644
--- a/theme/tool/option/pie.js
+++ b/theme/tool/option/pie.js
@@ -29,18 +29,16 @@ export default {
             radius : [20, 80],
             center : ['25%', 110],
             label: {
-                normal: {
-                    show: false
-                },
-                emphasis: {
-                    show: true
-                }
+                show: false,
             },
             lableLine: {
-                normal: {
-                    show: false
+                show: false,
+            },
+            emphasis: {
+                label: {
+                    show: true
                 },
-                emphasis: {
+                lableLine: {
                     show: true
                 }
             },
@@ -62,9 +60,7 @@ export default {
             center : ['75%', 110],
             roseType : 'area',
             labelLine: {
-                normal: {
-                    length: 5
-                }
+                length: 5
             },
             data:[
                 {value:10, name:'rose1'},