Merge pull request #4 in FUI/fineui from ~GUY/fineui:2.0 to 2.0

* commit '06ac37382222577f40712c66d11150d0d05ff84c': add add add add update add add add add add update add 无JIRA任务整理 add update add base节点布局demo add
8 years ago · ccd4b61213
340 changed files with 38525 additions and 17884 deletions
--- a/Gruntfile.js
+++ b/Gruntfile.js
@ -40,6 +40,12 @@ module.exports = function (grunt) {
                    'src/base/single/text.js',
                    'src/base/single/button/button.basic.js',
                    'src/base/single/button/button.node.js',
+                    'src/base/combination/group.button.js',
+                    'src/base/combination/tree.button.js',
+                    'src/base/combination/map.button.js',
+                    'src/base/tree/treeview.js',
+                    'src/base/tree/synctree.js',
+                    'src/base/tree/parttree.js',
                    'src/base/**/*.js'
                ],
                dest: 'dist/base.js'
@ -56,7 +62,8 @@ module.exports = function (grunt) {
                src: [
                    'src/widget/paramsettingcombo/popup.param.js',
                    'src/widget/sequencetable/treenumber.sequencetable.js',
-                    'src/widget/**/*.js'
+                    'src/widget/**/*.js',
+                    'src/component/**/*.js'
                ],
                dest: "dist/widget.js"
            },
--- a/demo.html
+++ b/demo.html
@ -8,6 +8,8 @@
          href="./dist/core.css"/>
    <link rel="stylesheet" type="text/css"
          href="./dist/base.css"/>
+    <link rel="stylesheet" type="text/css"
+          href="./dist/widget.css"/>
    <link rel="stylesheet" type="text/css"
          href="demo/dist/demo.css"/>

@ -19,9 +21,6 @@
 </head>
 <body>
 <div id="wrapper"></div>
-<div id="container"></div>

-<link href='https://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900italic,900&subset=latin,greek,greek-ext,vietnamese,cyrillic-ext,latin-ext,cyrillic'
-      rel='stylesheet' type='text/css'>
 </body>
 </html>
--- a/demo/config.js
+++ b/demo/config.js
@ -1 +1 @@
-Demo.CONFIG = Demo.LAYOUT_CONFIG.concat(Demo.BASE_CONFIG).concat(Demo.CASE_CONFIG).concat(Demo.WIDGET_CONFIG);
+Demo.CONFIG = Demo.LAYOUT_CONFIG.concat(Demo.BASE_CONFIG).concat(Demo.CASE_CONFIG).concat(Demo.WIDGET_CONFIG).concat(Demo.COMPONENT_CONFIG);
--- a/demo/js/component/demo.treevaluechooser.js
+++ b/demo/js/component/demo.treevaluechooser.js
@ -0,0 +1,39 @@
+Demo.TreeValueChooser = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-tree-value-chooser"
+    },
+    render: function () {
+
+        var tree = [];
+        for (var i = 0; i < 21; i++) {
+            tree.push({
+                value: i + "",
+                text: i + "",
+                id: i + "",
+                pId: null
+            });
+            for (var j = 0; j < 9; j++) {
+                tree.push({
+                    value: i + "-" + j,
+                    text: j + "",
+                    id: i + "-" + j,
+                    pId: i + ""
+                })
+            }
+        }
+        var widget = BI.createWidget({
+            type: "bi.tree_value_chooser_combo",
+            items: tree,
+            itemsCreator: function (op, callback) {
+                callback(tree);
+            }
+        });
+        return {
+            type: "bi.vertical",
+            hgap: 200,
+            vgap: 10,
+            items: [widget]
+        };
+    }
+});
+$.shortcut("demo.tree_value_chooser", Demo.TreeValueChooser);
--- a/demo/js/component/demo.valuechooser.js
+++ b/demo/js/component/demo.valuechooser.js
--- a/demo/js/config/base.js
+++ b/demo/js/config/base.js
@ -3,6 +3,174 @@ Demo.BASE_CONFIG = [{
    text: "基础控件"
 }, {
    pId: 2,
-    text: "bi.center_adapt",
-    value: "demo.center_adapt"
+    id: 5,
+    text: "组合"
+}, {
+    pId: 2,
+    id: 8,
+    text: "tree"
+}, {
+    pId: 2,
+    id: 7,
+    text: "button"
+}, {
+    pId: 2,
+    id: 9,
+    text: "listitem"
+}, {
+    pId: 2,
+    id: 10,
+    text: "editor"
+}, {
+    pId: 2,
+    text: "bi.canvas",
+    value: "demo.canvas"
+}, {
+    pId: 2,
+    text: "bi.label",
+    value: "demo.label"
+}, {
+    pId: 2,
+    text: "bi.collection",
+    value: "demo.collection"
+}, {
+    pId: 2,
+    text: "bi.farbtastic",
+    value: "demo.farbtastic"
+}, {
+    pId: 2,
+    text: "bi.formulaeditor",
+    value: "demo.formulaeditor"
+}, {
+    pId: 2,
+    text: "bi.message",
+    value: "demo.message"
+}, {
+    pId: 2,
+    text: "bi.grid_view",
+    value: "demo.grid_view"
+}, {
+    pId: 2,
+    id: 6,
+    text: "弹出层"
+}, {
+    pId: 2,
+    text: "bi.pager",
+    value: "demo.pager"
+}, {
+    pId: 2,
+    text: "bi.svg",
+    value: "demo.svg"
+}, {
+    pId: 2,
+    text: "bi.table",
+    value: "demo.table"
+}, {
+    pId: 5,
+    text: "bi.combo",
+    value: "demo.combo"
+}, {
+    pId: 5,
+    text: "bi.expander",
+    value: "demo.expander"
+}, {
+    pId: 5,
+    text: "bi.group_button",
+    value: "demo.group_button"
+}, {
+    pId: 5,
+    text: "bi.group_combo",
+    value: "demo.group_combo"
+}, {
+    pId: 5,
+    text: "bi.loader",
+    value: "demo.loader"
+}, {
+    pId: 5,
+    text: "bi.navigation",
+    value: "demo.navigation"
+}, {
+    pId: 5,
+    text: "bi.searcher",
+    value: "demo.searcher"
+}, {
+    pId: 5,
+    text: "bi.switcher",
+    value: "demo.switcher"
+}, {
+    pId: 5,
+    text: "bi.tab",
+    value: "demo.tab"
+}, {
+    pId: 5,
+    text: "bi.tree_button",
+    value: "demo.tree_button"
+}, {
+    pId: 6,
+    text: "bi.layer_float_box",
+    value: "demo.layer_float_box"
+}, {
+    pId: 6,
+    text: "bi.layer_popup",
+    value: "demo.layer_popup"
+}, {
+    pId: 6,
+    text: "bi.layer_scroll",
+    value: "demo.layer_scroll"
+}, {
+    pId: 6,
+    text: "bi.layer_searcher",
+    value: "demo.layer_searcher"
+}, {
+    pId: 7,
+    text: "bi.icon_button",
+    value: "demo.icon_button"
+}, {
+    pId: 7,
+    text: "bi.image_button",
+    value: "demo.image_button"
+}, {
+    pId: 7,
+    text: "bi.button",
+    value: "demo.button"
+}, {
+    pId: 7,
+    text: "bi.text_button",
+    value: "demo.text_button"
+}, {
+    pId: 8,
+    text: "bi.treeview",
+    value: "demo.treeview"
+}, {
+    pId: 8,
+    text: "bi.synctree",
+    value: "demo.synctree"
+}, {
+    pId: 8,
+    text: "bi.parttree",
+    value: "demo.parttree"
+}, {
+    pId: 8,
+    text: "bi.customtree",
+    value: "demo.customtree"
+}, {
+    pId: 9,
+    text: "bi.list_items",
+    value: "demo.list_items"
+}, {
+    pId: 10,
+    text: "bi.code_editor",
+    value: "demo.code_editor"
+}, {
+    pId: 10,
+    text: "bi.editor",
+    value: "demo.editor"
+}, {
+    pId: 10,
+    text: "bi.multifile_editor",
+    value: "demo.multifile_editor"
+}, {
+    pId: 10,
+    text: "bi.text_area_editor",
+    value: "demo.text_area_editor"
 }];
--- a/demo/js/config/case.js
+++ b/demo/js/config/case.js
@ -1,8 +1,116 @@
 Demo.CASE_CONFIG = [{
    id: 3,
-    text: "基础控件"
+    text: "实例控件"
 }, {
    pId: 3,
-    text: "bi.center_adapt",
-    value: "demo.center_adapt"
+    text: "bi.calendar",
+    value: "demo.calendar"
+}, {
+    pId: 3,
+    text: "bi.zclip",
+    value: "demo.zclip"
+}, {
+    pId: 3,
+    text: "bi.complex_calendar",
+    value: "demo.complex_calendar"
+}, {
+    pId: 3,
+    text: "bi.calendar",
+    value: "demo.calendar"
+}, {
+    pId: 3,
+    text: "bi.colorpicker",
+    value: "demo.colorpicker"
+}, {
+    pId: 3,
+    text: "bi.bubble_combo",
+    value: "demo.bubble_combo"
+}, {
+    pId: 3,
+    id: 11,
+    text: "editors"
+}, {
+    pId: 11,
+    text: "bi.record_editor",
+    value: "demo.record_editor"
+}, {
+    pId: 11,
+    text: "bi.shelter_editor",
+    value: "demo.shelter_editor"
+}, {
+    pId: 11,
+    text: "bi.sign_editor",
+    value: "demo.sign_editor"
+}, {
+    pId: 11,
+    text: "bi.state_editor",
+    value: "demo.state_editor"
+}, {
+    pId: 3,
+    text: "各种checkbox",
+    value: "demo.checkboxes"
+}, {
+    pId: 3,
+    text: "各种tip",
+    value: "demo.tips"
+}, {
+    pId: 3,
+    text: "bi.branch_expander",
+    value: "demo.branch_expander"
+}, {
+    pId: 3,
+    text: "bi.float_box",
+    value: "demo.float_box"
+}, {
+    pId: 3,
+    text: "bi.float_box",
+    value: "demo.float_box"
+}, {
+    pId: 3,
+    text: "bi.segment",
+    value: "demo.segment"
+}, {
+    pId: 3,
+    id: 12,
+    text: "各种表格"
+}, {
+    pId: 3,
+    id: 13,
+    text: "各种tree"
+}, {
+    pId: 3,
+    text: "各种trigger",
+    value: "demo.triggers"
+}, {
+    pId: 12,
+    text: "bi.adaptive_table",
+    value: "demo.adaptive_table"
+}, {
+    pId: 12,
+    text: "bi.table_tree",
+    value: "demo.table_tree"
+}, {
+    pId: 12,
+    text: "bi.layer_tree_table",
+    value: "demo.layer_tree_table"
+}, {
+    pId: 13,
+    text: "bi.branch_tree",
+    value: "demo.branch_tree"
+}, {
+    pId: 13,
+    text: "bi.display_tree",
+    value: "demo.display_tree"
+}, {
+    pId: 13,
+    text: "bi.level_tree",
+    value: "demo.level_tree"
+}, {
+    pId: 13,
+    text: "bi.simple_tree",
+    value: "demo.simple_tree"
+}, {
+    pId: 13,
+    text: "bi.handstand_branch_tree",
+    value: "demo.handstand_branch_tree"
 }];
--- a/demo/js/config/component.js
+++ b/demo/js/config/component.js
@ -0,0 +1,15 @@
+/**
+ * Created by User on 2017/3/22.
+ */
+Demo.COMPONENT_CONFIG = [{
+    id: 15,
+    text: "部件"
+}, {
+    pId: 15,
+    text: "bi.value_chooser_combo",
+    value: "demo.value_chooser_combo"
+}, {
+    pId: 15,
+    text: "bi.tree_value_chooser_combo",
+    value: "demo.tree_value_chooser"
+}];
--- a/demo/js/config/layout.js
+++ b/demo/js/config/layout.js
@ -5,108 +5,72 @@ Demo.LAYOUT_CONFIG = [{
    pId: 1,
    text: "bi.center_adapt",
    value: "demo.center_adapt"
-}, {
-    pId: 1,
-    text: "bi.float_center_adapt",
-    value: "float_center_adapt"
-}, {
-    pId: 1,
-    text: "bi.absolute_center_adapt",
-    value: "absolute_center_adapt"
-}, {
-    pId: 1,
-    text: "bi.flex_center",
-    value: "flex_center"
-}, {
-    pId: 1,
-    text: "bi.inline_center_adapt",
-    value: "inline_center_adapt"
 }, {
    pId: 1,
    text: "bi.vertical_adapt",
-    value: "vertical_adapt"
-}, {
-    pId: 1,
-    text: "bi.inline_vertical_adapt",
-    value: "inline_vertical_adapt"
+    value: "demo.vertical_adapt"
 }, {
    pId: 1,
    text: "bi.horizontal_adapt",
-    value: "horizontal_adapt"
+    value: "demo.horizontal_adapt"
 }, {
    pId: 1,
    text: "bi.horizontal_auto",
-    value: "horizontal_auto"
+    value: "demo.horizontal_auto"
 }, {
    pId: 1,
    text: "bi.horizontal_float",
-    value: "horizontal_float"
+    value: "demo.horizontal_float"
 }, {
    pId: 1,
    text: "bi.left_right_vertical_adapt",
-    value: "left_right_vertical_adapt"
+    value: "demo.left_right_vertical_adapt"
 }, {
    pId: 1,
    text: "bi.center",
-    value: "center"
+    value: "demo.center_layout"
 }, {
    pId: 1,
    text: "bi.float_center",
-    value: "float_center"
+    value: "demo.float_center"
 }, {
    pId: 1,
    text: "bi.vertical",
-    value: "vertical"
+    value: "demo.vertical"
 }, {
    pId: 1,
    text: "bi.horizontal",
-    value: "horizontal"
+    value: "demo.horizontal"
 }, {
    pId: 1,
    text: "bi.border",
-    value: "border"
-}, {
-    pId: 1,
-    text: "bi.card",
-    value: "card"
+    value: "demo.border"
 }, {
    pId: 1,
    text: "bi.left, bi.right",
-    value: "flow"
-}, {
-    pId: 1,
-    text: "bi.lattice",
-    value: "lattice"
+    value: "demo.flow"
 }, {
    pId: 1,
    text: "bi.inline",
-    value: "inline"
+    value: "demo.inline"
 }, {
    pId: 1,
    text: "bi.htape",
-    value: "htape"
+    value: "demo.htape"
 }, {
    pId: 1,
    text: "bi.vtape",
-    value: "vtape"
+    value: "demo.vtape"
 }, {
    pId: 1,
    text: "bi.grid",
-    value: "grid"
+    value: "demo.grid"
 }, {
    pId: 1,
    text: "bi.table",
-    value: "table"
-}, {
-    pId: 1,
-    text: "bi.division",
-    value: "division"
-}, {
-    pId: 1,
-    text: "bi.window",
-    value: "window"
+    value: "demo.table_layout"
 }, {
    pId: 1,
    text: "bi.td",
-    value: "td"
+    value: "demo.td"
 }];
--- a/demo/js/config/widget.js
+++ b/demo/js/config/widget.js
@ -1,8 +1,8 @@
 Demo.WIDGET_CONFIG = [{
    id: 4,
-    text: "基础控件"
+    text: "详细控件"
 }, {
    pId: 4,
-    text: "bi.center_adapt",
-    value: "demo.center_adapt"
+    text: "bi.multi_select_combo",
+    value: "demo.multi_select_combo"
 }];
--- a/demo/js/layout/demo.border.js
+++ b/demo/js/layout/demo.border.js
@ -0,0 +1,97 @@
+/**
+ * Created by User on 2017/3/22.
+ */
+Demo.BorderLayout = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-border"
+    },
+
+    _createNorth: function(){
+        return BI.createWidget({
+            type: "bi.label",
+            text: "North",
+            cls: "layout-bg1",
+            height: 30
+        })
+    },
+
+    _createWest: function(){
+        return BI.createWidget({
+            type: "bi.center",
+            cls: "layout-bg2",
+            items:[{
+                type: "bi.label",
+                text: "West",
+                whiteSpace: "normal"
+            }]
+        })
+    },
+
+    _createCenter: function(){
+        return BI.createWidget({
+            type: "bi.center",
+            cls: "layout-bg3",
+            items: [{
+                type: "bi.label",
+                text: "Center",
+                whiteSpace: "normal"
+            }]
+        })
+    },
+
+    _createEast: function(){
+        return BI.createWidget({
+            type: "bi.center",
+            cls: "layout-bg5",
+            items: [{
+                type: "bi.label",
+                text: "East",
+                whiteSpace: "normal"
+            }]
+        })
+    },
+
+    _createSouth: function(){
+        return BI.createWidget({
+            type: "bi.label",
+            text: "South",
+            cls: "layout-bg6",
+            height: 50
+        })
+    },
+
+    render: function () {
+        return {
+            type: "bi.border",
+            cls: "",
+            items: {
+                north: {
+                    el: this._createNorth(),
+                    height: 30,
+                    top: 20,
+                    left: 20,
+                    right: 20
+                },
+                south: {
+                    el: this._createSouth(),
+                    height: 50,
+                    bottom: 20,
+                    left: 20,
+                    right: 20
+                },
+                west: {
+                    el: this._createWest(),
+                    width: 200,
+                    left: 20
+                },
+                east: {
+                    el: this._createEast(),
+                    width: 300,
+                    right: 20
+                },
+                center: this._createCenter()
+            }
+        }
+    }
+});
+$.shortcut("demo.border", Demo.BorderLayout);
--- a/demo/js/layout/demo.center.js
+++ b/demo/js/layout/demo.center.js
@ -0,0 +1,35 @@
+/**
+ * Created by User on 2017/3/22.
+ */
+Demo.CenterLayout = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-center"
+    },
+    render: function () {
+        return {
+            type: "bi.center",
+            items: [{
+                type: "bi.label",
+                text: "Center 1，这里虽然设置label的高度30，但是最终影响高度的是center布局",
+                cls: "layout-bg1",
+                whiteSpace: "normal"
+            },{
+                type: "bi.label",
+                text: "Center 2，为了演示label是占满整个的，用了一个whiteSpace:normal",
+                cls: "layout-bg2",
+                whiteSpace: "normal"
+            },{
+                type: "bi.label",
+                text: "Center 3",
+                cls: "layout-bg3"
+            },{
+                type: "bi.label",
+                text: "Center 4",
+                cls: "layout-bg5"
+            }],
+            hgap: 20,
+            vgap: 20
+        }
+    }
+});
+$.shortcut("demo.center_layout", Demo.CenterLayout);
--- a/demo/js/layout/demo.float_center.js
+++ b/demo/js/layout/demo.float_center.js
@ -0,0 +1,27 @@
+/**
+ * Created by User on 2017/3/22.
+ */
+Demo.FloatCenterLayout = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-float-center"
+    },
+    render: function () {
+        return {
+            type: "bi.float_center",
+            items: [{
+                type: "bi.label",
+                text: "floatCenter与center的不同在于，它可以控制最小宽度和最大宽度",
+                cls: "layout-bg1",
+                whiteSpace: "normal"
+            }, {
+                type: "bi.label",
+                text: "floatCenter与center的不同在于，它可以控制最小宽度和最大宽度",
+                cls: "layout-bg2",
+                whiteSpace: "normal"
+            }],
+            hgap: 20,
+            vgap: 20
+        }
+    }
+});
+$.shortcut("demo.float_center", Demo.FloatCenterLayout);
--- a/demo/js/layout/demo.flow.js
+++ b/demo/js/layout/demo.flow.js
@ -0,0 +1,85 @@
+/**
+ * Created by User on 2017/3/22.
+ */
+Demo.FlowLayout = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-flow"
+    },
+    render: function () {
+        return {
+            type: "bi.center_adapt",
+            items: [{
+                type: "bi.left",
+                items: [{
+                    type: "bi.label",
+                    height: 30,
+                    text: "Left-1",
+                    cls: "layout-bg1",
+                    hgap: 20
+                }, {
+                    type: "bi.label",
+                    height: 30,
+                    text: "Left-2",
+                    cls: "layout-bg2",
+                    hgap: 20
+                }, {
+                    type: "bi.label",
+                    height: 30,
+                    text: "Left-3",
+                    cls: "layout-bg3",
+                    hgap: 20
+                }, {
+                    type: "bi.label",
+                    height: 30,
+                    text: "Left-4",
+                    cls: "layout-bg4",
+                    hgap: 20
+                }, {
+                    type: "bi.label",
+                    height: 30,
+                    text: "Left-5",
+                    cls: "layout-bg5",
+                    hgap: 20
+                }],
+                hgap: 20,
+                vgap: 20
+            }, {
+                type: "bi.right",
+                items: [{
+                    type: "bi.label",
+                    height: 30,
+                    text: "Right-1",
+                    cls: "layout-bg1",
+                    hgap: 20
+                }, {
+                    type: "bi.label",
+                    height: 30,
+                    text: "Right-2",
+                    cls: "layout-bg2",
+                    hgap: 20
+                }, {
+                    type: "bi.label",
+                    height: 30,
+                    text: "Right-3",
+                    cls: "layout-bg3",
+                    hgap: 20
+                }, {
+                    type: "bi.label",
+                    height: 30,
+                    text: "Right-4",
+                    cls: "layout-bg4",
+                    hgap: 20
+                }, {
+                    type: "bi.label",
+                    height: 30,
+                    text: "Right-5",
+                    cls: "layout-bg5",
+                    hgap: 20
+                }],
+                hgap: 20,
+                vgap: 20
+            }]
+        }
+    }
+});
+$.shortcut("demo.flow", Demo.FlowLayout);
--- a/demo/js/layout/demo.grid.js
+++ b/demo/js/layout/demo.grid.js
@ -0,0 +1,137 @@
+/**
+ * Created by User on 2017/3/22.
+ */
+Demo.GridLayout = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-grid"
+    },
+    render: function () {
+        return {
+            type: "bi.grid",
+            columns: 5,
+            rows: 3,
+            items: [{
+                column: 0,
+                row: 0,
+                el: {
+                    type: "bi.label",
+                    text: "column-0, row-0",
+                    cls: "layout-bg1"
+                }
+            }, {
+                column: 1,
+                row: 0,
+                el: {
+                    type: "bi.label",
+                    text: "column-1, row-0",
+                    cls: "layout-bg2"
+                }
+            }, {
+                column: 2,
+                row: 0,
+                el: {
+                    type: "bi.label",
+                    text: "column-2, row-0",
+                    cls: "layout-bg6"
+                }
+            }, {
+                column: 3,
+                row: 0,
+                el: {
+                    type: "bi.label",
+                    text: "column-3, row-0",
+                    cls: "layout-bg3"
+                }
+            }, {
+                column: 4,
+                row: 0,
+                el: {
+                    type: "bi.label",
+                    text: "column-4, row-0",
+                    cls: "layout-bg4"
+                }
+            }, {
+                column: 0,
+                row: 1,
+                el: {
+                    type: "bi.label",
+                    text: "column-0, row-1",
+                    cls: "layout-bg5"
+                }
+            }, {
+                column: 1,
+                row: 1,
+                el: {
+                    type: "bi.label",
+                    text: "column-1, row-1",
+                    cls: "layout-bg6"
+                }
+            }, {
+                column: 2,
+                row: 1,
+                el: {
+                    type: "bi.label",
+                    text: "column-2, row-1",
+                    cls: "layout-bg7"
+                }
+            }, {
+                column: 3,
+                row: 1,
+                el: {
+                    type: "bi.label",
+                    text: "column-3, row-1",
+                    cls: "layout-bg1"
+                }
+            }, {
+                column: 4,
+                row: 1,
+                el: {
+                    type: "bi.label",
+                    text: "column-4, row-1",
+                    cls: "layout-bg3"
+                }
+            }, {
+                column: 0,
+                row: 2,
+                el: {
+                    type: "bi.label",
+                    text: "column-0, row-2",
+                    cls: "layout-bg2"
+                }
+            }, {
+                column: 1,
+                row: 2,
+                el: {
+                    type: "bi.label",
+                    text: "column-1, row-2",
+                    cls: "layout-bg3"
+                }
+            }, {
+                column: 2,
+                row: 2,
+                el: {
+                    type: "bi.label",
+                    text: "column-2, row-2",
+                    cls: "layout-bg4"
+                }
+            }, {
+                column: 3,
+                row: 2,
+                el: {
+                    type: "bi.label",
+                    text: "column-3, row-2",
+                    cls: "layout-bg5"
+                }
+            }, {
+                column: 4,
+                row: 2,
+                el: {
+                    type: "bi.label",
+                    text: "column-4, row-2",
+                    cls: "layout-bg6"
+                }
+            }]
+        }
+    }
+});
+$.shortcut("demo.grid", Demo.GridLayout);
--- a/demo/js/layout/demo.horizontal.js
+++ b/demo/js/layout/demo.horizontal.js
@ -0,0 +1,50 @@
+/**
+ * Created by User on 2017/3/21.
+ */
+Demo.Horizontal = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-horizontal"
+    },
+    render: function () {
+        return {
+            type: "bi.vertical",
+            items: [{
+                type: "bi.horizontal",
+                items: [{
+                    type: "bi.absolute",
+                    items: [{
+                        el: {
+                            type: "bi.text_button",
+                            cls: "layout-bg1",
+                            text: "这里设置了lgap(左边距)，rgap(右边距)，tgap(上边距)，bgap(下边距)这里设置了lgap(左边距)，rgap(右边距)，tgap(上边距)，bgap(下边距)",
+                            height: 30
+                        },
+                        left: 0,
+                        right: 0
+                    }],
+                    width: 100,
+                    height: 30
+                }, {
+                    type: "bi.absolute",
+                    items: [{
+                        el: {
+                            type: "bi.text_button",
+                            cls: "layout-bg2",
+                            text: "这里设置了lgap(左边距)，rgap(右边距)，tgap(上边距)，bgap(下边距)这里设置了lgap(左边距)，rgap(右边距)，tgap(上边距)，bgap(下边距)",
+                            height: 30
+                        },
+                        left: 0,
+                        right: 0
+                    }],
+                    width: 200,
+                    height: 30
+                }]
+            }],
+            lgap: 20,
+            rgap: 80,
+            tgap: 80,
+            bgap: 50
+        }
+    }
+});
+$.shortcut("demo.horizontal", Demo.Horizontal);
--- a/demo/js/layout/demo.horizontal_adapt.js
+++ b/demo/js/layout/demo.horizontal_adapt.js
@ -0,0 +1,42 @@
+/**
+ * Created by User on 2017/3/22.
+ */
+Demo.HorizontalAdapt = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-horizontal-adapt"
+    },
+
+    _createLayout: function () {
+        return BI.createWidget({
+            type: "bi.horizontal_adapt",
+            vgap: 10,
+            items: [{
+                type: "bi.label",
+                text: "Horizontal Adapt左右自适应",
+                cls: "layout-bg1",
+                width: 300,
+                height: 30
+            }, {
+                type: "bi.label",
+                text: "Horizontal Adapt左右自适应",
+                cls: "layout-bg2",
+                //width: 300,
+                height: 30
+            }]
+        })
+    },
+    
+    render: function () {
+        return {
+            type: "bi.grid",
+            columns: 1,
+            rows: 2,
+            items: [{
+                column: 0,
+                row: 0,
+                el: this._createLayout()
+            }]
+        }
+    }
+});
+$.shortcut("demo.horizontal_adapt", Demo.HorizontalAdapt);
--- a/demo/js/layout/demo.horizontal_auto.js
+++ b/demo/js/layout/demo.horizontal_auto.js
@ -0,0 +1,42 @@
+/**
+ * Created by User on 2017/3/22.
+ */
+Demo.HorizontalAuto = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-horizontal-auto"
+    },
+
+    _createLayout: function () {
+        return BI.createWidget({
+            type: "bi.horizontal_auto",
+            vgap: 10,
+            items: [{
+                type: "bi.label",
+                text: "Horizontal Auto左右自适应",
+                cls: "layout-bg1",
+                width: 300,
+                height: 30
+            }, {
+                type: "bi.label",
+                text: "Horizontal Auto左右自适应",
+                cls: "layout-bg2",
+                width: 300,
+                height: 30
+            }]
+        })
+    },
+    
+    render: function () {
+        return {
+            type: "bi.grid",
+            columns: 1,
+            rows: 2,
+            items: [{
+                column: 0,
+                row: 0,
+                el: this._createLayout()
+            }]
+        }
+    }
+});
+$.shortcut("demo.horizontal_auto", Demo.HorizontalAuto);
--- a/demo/js/layout/demo.horizontal_float.js
+++ b/demo/js/layout/demo.horizontal_float.js
@ -0,0 +1,35 @@
+/**
+ * Created by User on 2017/3/22.
+ */
+Demo.HorizontalFloat = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-horizontal-float"
+    },
+
+    _createLayout: function () {
+        return BI.createWidget({
+            type: "bi.horizontal_float",
+            vgap: 10,
+            items: [{
+                type: "bi.label",
+                text: "Horizontal Float左右自适应",
+                cls: "layout-bg1",
+                width: 100
+            }]
+        })
+    },
+    
+    render: function () {
+        return {
+            type: "bi.grid",
+            columns: 1,
+            rows: 2,
+            items: [{
+                column: 0,
+                row: 0,
+                el: this._createLayout()
+            }]
+        }
+    }
+});
+$.shortcut("demo.horizontal_float", Demo.HorizontalFloat);
--- a/demo/js/layout/demo.htape.js
+++ b/demo/js/layout/demo.htape.js
@ -0,0 +1,38 @@
+/**
+ * Created by User on 2017/3/22.
+ */
+Demo.HtapeLayout = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-htape"
+    },
+    render: function () {
+        return {
+            type: "bi.htape",
+            items : [
+                {
+                    width: 100,
+                    el : {
+                        type : 'bi.label',
+                        text : '1',
+                        cls: "layout-bg1"
+                    }
+                }, {
+                    width: 200,
+                    el : {
+                        type : 'bi.label',
+                        text : '2',
+                        cls: "layout-bg2"
+                    }
+                }, {
+                    width: 'fill',
+                    el : {
+                        type : 'bi.label',
+                        text : '3',
+                        cls: "layout-bg3"
+                    }
+                }
+            ]
+        }
+    }
+});
+$.shortcut("demo.htape", Demo.HtapeLayout);
--- a/demo/js/layout/demo.inline.js
+++ b/demo/js/layout/demo.inline.js
@ -0,0 +1,47 @@
+/**
+ * Created by User on 2017/3/22.
+ */
+Demo.InlineLayout = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-inline"
+    },
+    render: function () {
+        return {
+            type: "bi.inline",
+            items: [{
+                type: "bi.label",
+                height: 30,
+                text: "Left-1",
+                cls: "layout-bg1",
+                hgap: 200
+            }, {
+                type: "bi.label",
+                height: 30,
+                text: "Left-2",
+                cls: "layout-bg2",
+                hgap: 200
+            }, {
+                type: "bi.label",
+                height: 30,
+                text: "Left-3",
+                cls: "layout-bg3",
+                hgap: 200
+            }, {
+                type: "bi.label",
+                height: 30,
+                text: "Left-4",
+                cls: "layout-bg4",
+                hgap: 200
+            }, {
+                type: "bi.label",
+                height: 30,
+                text: "Left-5",
+                cls: "layout-bg5",
+                hgap: 200
+            }],
+            hgap: 20,
+            vgap: 20
+        }
+    }
+});
+$.shortcut("demo.inline", Demo.InlineLayout);
--- a/demo/js/layout/demo.left_right_vertical_adapt.js
+++ b/demo/js/layout/demo.left_right_vertical_adapt.js
@ -0,0 +1,44 @@
+/**
+ * Created by User on 2017/3/22.
+ */
+Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-left-right-vertical-adapt"
+    },
+    render: function () {
+        return {
+            type: "bi.left_right_vertical_adapt",
+            lhgap: 10,
+            rhgap: 30,
+            items: {
+                left: [{
+                    type: "bi.label",
+                    text: "左边的垂直居中",
+                    cls: "layout-bg1",
+                    width: 100,
+                    height: 30
+                }, {
+                    type: "bi.label",
+                    text: "左边的垂直居中",
+                    cls: "layout-bg2",
+                    width: 100,
+                    height: 30
+                }],
+                right: [{
+                    type: "bi.label",
+                    text: "右边的垂直居中",
+                    cls: "layout-bg1",
+                    width: 100,
+                    height: 30
+                }, {
+                    type: "bi.label",
+                    text: "右边的垂直居中",
+                    cls: "layout-bg2",
+                    width: 100,
+                    height: 30
+                }]
+            }
+        }
+    }
+});
+$.shortcut("demo.left_right_vertical_adapt", Demo.LeftRightVerticalAdaptLayout);
--- a/demo/js/layout/demo.table.js
+++ b/demo/js/layout/demo.table.js
@ -0,0 +1,162 @@
+/**
+ * Created by User on 2017/3/22.
+ */
+Demo.TableLayout = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-table-layout"
+    },
+
+    _createTable1: function () {
+        return {
+            type: "bi.table",
+            items: BI.createItems([
+                [
+                    {
+                        el: {
+                            cls: "layout-bg1"
+                        }
+                    },
+                    {
+                        el: {
+                            cls: "layout-bg2"
+                        }
+                    },
+                    {
+                        el: {
+                            cls: "layout-bg3"
+                        }
+                    }
+                ],
+                [
+                    {
+                        el: {
+                            cls: "layout-bg4"
+                        }
+                    },
+                    {
+                        el: {
+                            cls: "layout-bg5"
+                        }
+                    },
+                    {
+                        el: {
+                            cls: "layout-bg6"
+                        }
+                    }
+                ],
+                [
+                    {
+                        el: {
+                            cls: "layout-bg7"
+                        }
+                    },
+                    {
+                        el: {
+                            cls: "layout-bg8"
+                        }
+                    },
+                    {
+                        el: {
+                            cls: "layout-bg1"
+                        }
+                    }
+                ],
+                [
+                    {
+                        el: {
+                            cls: "layout-bg2"
+                        }
+                    },
+                    {
+                        el: {
+                            cls: "layout-bg3"
+                        }
+                    },
+                    {
+                        el: {
+                            cls: "layout-bg4"
+                        }
+                    }
+                ],
+                [
+                    {
+                        el: {
+                            cls: "layout-bg5"
+                        }
+                    },
+                    {
+                        el: {
+                            cls: "layout-bg6"
+                        }
+                    },
+                    {
+                        el: {
+                            cls: "layout-bg7"
+                        }
+                    }
+                ],
+                [
+                    {
+                        el: {
+                            cls: "layout-bg8"
+                        }
+                    },
+                    {
+                        el: {
+                            cls: "layout-bg1"
+                        }
+                    },
+                    {
+                        el: {
+                            cls: "layout-bg2"
+                        }
+                    }
+                ],
+                [
+                    {
+                        el: {
+                            cls: "layout-bg6"
+                        }
+                    },
+                    {
+                        el: {
+                            cls: "layout-bg7"
+                        }
+                    },
+                    {
+                        el: {
+                            cls: "layout-bg8"
+                        }
+                    }
+                ]
+            ], {
+                type: "bi.layout"
+            }),
+            columnSize: [100, "fill", 200],
+            rowSize: [10, 30, 50, 70, 90, 110, 130],
+            hgap: 20,
+            vgap: 10
+        }
+    },
+    
+    render: function () {
+        return {
+            type: "bi.grid",
+            columns: 1,
+            rows: 1,
+            items: [
+                {
+                    column: 0,
+                    row: 0,
+                    el: this._createTable1()
+                }
+                //, {
+                //    column: 0,
+                //    row: 1,
+                //    el: this._createTable2()
+                //}
+            ]
+        }
+    }
+});
+$.shortcut("demo.table_layout", Demo.TableLayout);
--- a/demo/js/layout/demo.td.js
+++ b/demo/js/layout/demo.td.js
@ -0,0 +1,59 @@
+/**
+ * Created by User on 2017/3/22.
+ */
+Demo.TdLayout = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-td"
+    },
+    render: function () {
+        return {
+            type: "bi.vertical",
+            items: [{
+                type: "bi.td",
+                columnSize: [100, 100, ""],
+                items: BI.createItems([
+                    [{
+                        el: {
+                            type: 'bi.label',
+                            text: '这是一段可以换行的文字，为了使它换行我要多写几个字，但是我又凑不够这么多的字，万般焦急下，只能随便写写',
+                            cls: "layout-bg1"
+                        }
+                    }, {
+                        el: {
+                            type: 'bi.label',
+                            text: '这是一段可以换行的文字，为了使它换行我要多写几个字，但是我又凑不够这么多的字，万般焦急下，只能随便写写',
+                            cls: "layout-bg2"
+                        }
+                    }, {
+                        el: {
+                            type: 'bi.label',
+                            text: '这是一段可以换行的文字，为了使它换行我要多写几个字，但是我又凑不够这么多的字，万般焦急下，只能随便写写',
+                            cls: "layout-bg3"
+                        }
+                    }], [{
+                        el: {
+                            type: 'bi.label',
+                            text: '这是一段可以换行的文字，为了使它换行我要多写几个字，但是我又凑不够这么多的字，万般焦急下，只能随便写写',
+                            cls: "layout-bg5"
+                        }
+                    }, {
+                        el: {
+                            type: 'bi.label',
+                            text: '这是一段可以换行的文字，为了使它换行我要多写几个字，但是我又凑不够这么多的字，万般焦急下，只能随便写写',
+                            cls: "layout-bg6"
+                        }
+                    }, {
+                        el: {
+                            type: 'bi.label',
+                            text: '这是一段可以换行的文字，为了使它换行我要多写几个字，但是我又凑不够这么多的字，万般焦急下，只能随便写写',
+                            cls: "layout-bg7"
+                        }
+                    }]
+                ], {
+                    whiteSpace: "normal"
+                })
+            }]
+        }
+    }
+});
+$.shortcut("demo.td", Demo.TdLayout);
--- a/demo/js/layout/demo.vertical.js
+++ b/demo/js/layout/demo.vertical.js
@ -0,0 +1,25 @@
+/**
+ * Created by User on 2017/3/21.
+ */
+Demo.VerticalLayout = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-vertical"
+    },
+    render: function () {
+        return {
+            type: "bi.vertical",
+            items: [{
+                type: "bi.label",
+                cls: "layout-bg1",
+                text: "这里设置了hgap(水平间距)，vgap(垂直间距)",
+                height: 30
+            }, {
+                type: "bi.label",
+                cls: "layout-bg2",
+                text: "这里设置了hgap(水平间距)，vgap(垂直间距)",
+                height: 30
+            }]
+        }
+    }
+});
+$.shortcut("demo.vertical", Demo.VerticalLayout);
--- a/demo/js/layout/demo.vertical_adapt.js
+++ b/demo/js/layout/demo.vertical_adapt.js
@ -0,0 +1,42 @@
+/**
+ * Created by User on 2017/3/22.
+ */
+Demo.VerticalAdaptLayout = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-vertical-adapt"
+    },
+
+    _createLayout: function () {
+        return BI.createWidget({
+            type: "bi.vertical_adapt",
+            vgap: 10,
+            items: [{
+                type: "bi.label",
+                text: "Vertical Adapt上下自适应",
+                cls: "layout-bg1",
+                width: 300,
+                height: 30
+            }, {
+                type: "bi.label",
+                text: "Vertical Adapt上下自适应",
+                cls: "layout-bg2",
+                width: 300,
+                height: 30
+            }]
+        })
+    },
+    
+    render: function () {
+        return {
+            type: "bi.grid",
+            columns: 2,
+            rows: 1,
+            items: [{
+                column: 0,
+                row: 0,
+                el: this._createLayout()
+            }]
+        }
+    }
+});
+$.shortcut("demo.vertical_adapt", Demo.VerticalAdaptLayout);
--- a/demo/js/layout/demo.vtape.js
+++ b/demo/js/layout/demo.vtape.js
@ -0,0 +1,38 @@
+/**
+ * Created by User on 2017/3/22.
+ */
+Demo.VtapeLayout = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-vtape"
+    },
+    render: function () {
+        return {
+            type: "bi.vtape",
+            items : [
+                {
+                    height: 100,
+                    el : {
+                        type : 'bi.label',
+                        text : '1',
+                        cls: "layout-bg1"
+                    }
+                }, {
+                    height: 200,
+                    el : {
+                        type : 'bi.label',
+                        text : '2',
+                        cls: "layout-bg2"
+                    }
+                }, {
+                    height: 'fill',
+                    el : {
+                        type : 'bi.label',
+                        text : '3',
+                        cls: "layout-bg3"
+                    }
+                }
+            ]
+        }
+    }
+});
+$.shortcut("demo.vtape", Demo.VtapeLayout);
--- a/demo/js/widget/demo.multiselectcombo.js
+++ b/demo/js/widget/demo.multiselectcombo.js
--- a/dist/base.css
+++ b/dist/base.css
--- a/dist/base.js
+++ b/dist/base.js
--- a/dist/case.js
+++ b/dist/case.js
@ -5622,9 +5622,9 @@ BI.LoginTimeOut = BI.inherit(BI.BarPopoverSection, {
            }

            //反正是登录直接用FR的登录了
-            FR.ajax({
-                url: FR.servletURL + '?op=fs_load&cmd=login',
-                data: FR.cjkEncodeDO({
+            BI.ajax({
+                url: BI.servletURL + '?op=fs_load&cmd=login',
+                data: BI.cjkEncodeDO({
                    fr_username: encodeURIComponent(userNameInput.getValue()),
                    fr_password: encodeURIComponent(passwordInput.getValue()),
                    fr_remember: self.keepLoginState.isSelected()
@ -5639,7 +5639,7 @@ BI.LoginTimeOut = BI.inherit(BI.BarPopoverSection, {
                        self._showMes(userNameMask, BI.i18nText("BI-Authentication_Failed"));
                        return;
                    }
-                    var signResult = FR.jsonDecode(res.responseText);
+                    var signResult = BI.jsonDecode(res.responseText);
                    if (signResult.fail) {
                        //用户名和密码不匹配
                        self._showMes(userNameMask, BI.i18nText("BI-Username_Password_Not_Correct"));
@ -5663,7 +5663,7 @@ BI.LoginTimeOut = BI.inherit(BI.BarPopoverSection, {
                    type: "bi.center_adapt",
                    items: [{
                        type: "bi.img",
-                        src: FR.servletURL + (logo ?
+                        src: BI.servletURL + (logo ?
                            '?op=fr_attach&cmd=ah_image&id=' + logo + '&isAdjust=false' :
                            '?op=resource&resource=/com/fr/bi/web/images/login/bi_logo.png'),
                        width: 120,
@ -9322,10 +9322,10 @@ BI.ZeroClip = BI.inherit(BI.BasicButton, {
    _init: function () {
        BI.ZeroClip.superclass._init.apply(this, arguments);
        var self = this, o = this.options;
-        FR.$defaultImport('/com/fr/bi/web/js/third/jquery.zclip.js', 'js');
+        
        BI.nextTick(function () {
            self.element.zclip({
-                path: FR.servletURL + "?op=resource&resource=/com/fr/bi/web/resources/ZeroClipboard.swf",
+                path: BI.servletURL + "?op=resource&resource=/com/fr/bi/web/resources/ZeroClipboard.swf",
                copy: o.copy,
                beforeCopy: o.beforeCopy,
                afterCopy: o.afterCopy
--- a/dist/core.css
+++ b/dist/core.css
@ -9745,6 +9745,7 @@ textarea::-webkit-scrollbar-thumb {
 .overflow-dot {
  text-overflow: ellipsis;
  overflow-x: hidden;
+  overflow-y: hidden;
  white-space: nowrap;
 }
 /****添加计算宽度的--运算符直接需要space****/
@ -9807,7 +9808,7 @@ textarea::-webkit-scrollbar-thumb {
 /**** custom color(自定义颜色,用于特定场景) ****/
@font-face {
  font-family: 'bi';
-  src: url('${servletURL}?op=resource&resource=/com/fr/bi/web/resources/fonts/iconfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('${servletURL}?op=resource&resource=/com/fr/bi/web/resources/fonts/iconfont.woff') format('woff'), /* chrome、firefox */ url('${servletURL}?op=resource&resource=/com/fr/bi/web/resources/fonts/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('${servletURL}?op=resource&resource=/com/fr/bi/web/resources/fonts/iconfont.svg#svgFontName') format('svg');
+  src: url('font/iconfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('font/iconfont.woff') format('woff'), /* chrome、firefox */ url('font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('font/iconfont.svg#svgFontName') format('svg');
  
  /*  iOS 4.1- */
 }
--- a/dist/core.js
+++ b/dist/core.js
--- a/src/less/base/third/farbtastic/marker.png
+++ b/src/less/base/third/farbtastic/marker.png
--- a/src/less/base/third/farbtastic/mask.png
+++ b/src/less/base/third/farbtastic/mask.png
--- a/src/less/base/third/farbtastic/wheel.png
+++ b/src/less/base/third/farbtastic/wheel.png
--- a/dist/icon/bubble_no_projector.png
+++ b/dist/icon/bubble_no_projector.png
--- a/dist/icon/bubble_projector.png
+++ b/dist/icon/bubble_projector.png
--- a/dist/icon/business_package.png
+++ b/dist/icon/business_package.png
--- a/dist/icon/business_package_add.png
+++ b/dist/icon/business_package_add.png
--- a/dist/icon/business_package_add_disable.png
+++ b/dist/icon/business_package_add_disable.png
--- a/dist/icon/chartsetting/address_marker_big.png
+++ b/dist/icon/chartsetting/address_marker_big.png
--- a/dist/icon/chartsetting/address_marker_small.png
+++ b/dist/icon/chartsetting/address_marker_small.png
--- a/dist/icon/chartsetting/icon_bubble_3d.png
+++ b/dist/icon/chartsetting/icon_bubble_3d.png
--- a/dist/icon/chartsetting/icon_bubble_normal.png
+++ b/dist/icon/chartsetting/icon_bubble_normal.png
--- a/dist/icon/chartsetting/icon_dashboard_1.png
+++ b/dist/icon/chartsetting/icon_dashboard_1.png
--- a/dist/icon/chartsetting/icon_dashboard_2.png
+++ b/dist/icon/chartsetting/icon_dashboard_2.png
--- a/dist/icon/chartsetting/icon_dashboard_3.png
+++ b/dist/icon/chartsetting/icon_dashboard_3.png
--- a/dist/icon/chartsetting/icon_dashboard_4.png
+++ b/dist/icon/chartsetting/icon_dashboard_4.png
--- a/dist/icon/chartsetting/icon_dashboard_5.png
+++ b/dist/icon/chartsetting/icon_dashboard_5.png
--- a/dist/icon/chartsetting/icon_dashboard_6.png
+++ b/dist/icon/chartsetting/icon_dashboard_6.png
--- a/dist/icon/chartsetting/icon_dashboard_7.png
+++ b/dist/icon/chartsetting/icon_dashboard_7.png
--- a/dist/icon/chartsetting/icon_gradual_highlight.png
+++ b/dist/icon/chartsetting/icon_gradual_highlight.png
--- a/dist/icon/chartsetting/icon_multi_pie_gradient_darker.png
+++ b/dist/icon/chartsetting/icon_multi_pie_gradient_darker.png
--- a/dist/icon/chartsetting/icon_multi_pie_gradient_lighter.png
+++ b/dist/icon/chartsetting/icon_multi_pie_gradient_lighter.png
--- a/dist/icon/chartsetting/icon_style_3d.png
+++ b/dist/icon/chartsetting/icon_style_3d.png
--- a/dist/icon/chartsetting/icon_style_acc_radar_circle.png
+++ b/dist/icon/chartsetting/icon_style_acc_radar_circle.png
--- a/dist/icon/chartsetting/icon_style_acc_radar_polygon.png
+++ b/dist/icon/chartsetting/icon_style_acc_radar_polygon.png
--- a/dist/icon/chartsetting/icon_style_area_broken.png
+++ b/dist/icon/chartsetting/icon_style_area_broken.png
--- a/dist/icon/chartsetting/icon_style_area_curve.png
+++ b/dist/icon/chartsetting/icon_style_area_curve.png
--- a/dist/icon/chartsetting/icon_style_area_vertical.png
+++ b/dist/icon/chartsetting/icon_style_area_vertical.png
--- a/dist/icon/chartsetting/icon_style_gradual.png
+++ b/dist/icon/chartsetting/icon_style_gradual.png
--- a/dist/icon/chartsetting/icon_style_line_broken.png
+++ b/dist/icon/chartsetting/icon_style_line_broken.png
--- a/dist/icon/chartsetting/icon_style_line_curve.png
+++ b/dist/icon/chartsetting/icon_style_line_curve.png
--- a/dist/icon/chartsetting/icon_style_line_vertical.png
+++ b/dist/icon/chartsetting/icon_style_line_vertical.png
--- a/dist/icon/chartsetting/icon_style_normal.png
+++ b/dist/icon/chartsetting/icon_style_normal.png
--- a/dist/icon/chartsetting/icon_style_pie_equal_arc_rose.png
+++ b/dist/icon/chartsetting/icon_style_pie_equal_arc_rose.png
--- a/dist/icon/chartsetting/icon_style_pie_normal.png
+++ b/dist/icon/chartsetting/icon_style_pie_normal.png
--- a/dist/icon/chartsetting/icon_style_pie_not_equal_arc_rose.png
+++ b/dist/icon/chartsetting/icon_style_pie_not_equal_arc_rose.png
--- a/dist/icon/chartsetting/icon_style_radar_circle.png
+++ b/dist/icon/chartsetting/icon_style_radar_circle.png
--- a/dist/icon/chartsetting/icon_style_radar_polygon.png
+++ b/dist/icon/chartsetting/icon_style_radar_polygon.png
--- a/dist/icon/chartsetting/icon_style_transparent.png
+++ b/dist/icon/chartsetting/icon_style_transparent.png
--- a/dist/icon/check-box-active.png
+++ b/dist/icon/check-box-active.png
--- a/dist/icon/check-box-disable.png
+++ b/dist/icon/check-box-disable.png
--- a/dist/icon/check-box-disable2.png
+++ b/dist/icon/check-box-disable2.png
--- a/dist/icon/check-box-normal.png
+++ b/dist/icon/check-box-normal.png
--- a/dist/icon/dots.png
+++ b/dist/icon/dots.png
--- a/dist/icon/drag/icon_area.png
+++ b/dist/icon/drag/icon_area.png
--- a/dist/icon/drag/icon_area_a.png
+++ b/dist/icon/drag/icon_area_a.png
--- a/dist/icon/drag/icon_area_c.png
+++ b/dist/icon/drag/icon_area_c.png
--- a/dist/icon/drag/icon_area_pa.png
+++ b/dist/icon/drag/icon_area_pa.png
--- a/dist/icon/drag/icon_area_r.png
+++ b/dist/icon/drag/icon_area_r.png
--- a/dist/icon/drag/icon_axis.png
+++ b/dist/icon/drag/icon_axis.png
--- a/dist/icon/drag/icon_axis_a.png
+++ b/dist/icon/drag/icon_axis_a.png
--- a/dist/icon/drag/icon_axis_c.png
+++ b/dist/icon/drag/icon_axis_c.png
--- a/dist/icon/drag/icon_axis_f.png
+++ b/dist/icon/drag/icon_axis_f.png
--- a/dist/icon/drag/icon_axis_pa.png
+++ b/dist/icon/drag/icon_axis_pa.png
--- a/dist/icon/drag/icon_bar.png
+++ b/dist/icon/drag/icon_bar.png
--- a/dist/icon/drag/icon_bar_a.png
+++ b/dist/icon/drag/icon_bar_a.png
--- a/dist/icon/drag/icon_bar_c.png
+++ b/dist/icon/drag/icon_bar_c.png
--- a/dist/icon/drag/icon_bubble.png
+++ b/dist/icon/drag/icon_bubble.png
--- a/dist/icon/drag/icon_bubble_f.png
+++ b/dist/icon/drag/icon_bubble_f.png
--- a/dist/icon/drag/icon_combine.png
+++ b/dist/icon/drag/icon_combine.png
--- a/dist/icon/drag/icon_combine_m.png
+++ b/dist/icon/drag/icon_combine_m.png
--- a/dist/icon/drag/icon_complex.png
+++ b/dist/icon/drag/icon_complex.png
--- a/dist/icon/drag/icon_cross.png
+++ b/dist/icon/drag/icon_cross.png
--- a/dist/icon/drag/icon_dashboard.png
+++ b/dist/icon/drag/icon_dashboard.png
--- a/dist/icon/drag/icon_donut.png
+++ b/dist/icon/drag/icon_donut.png
--- a/dist/icon/drag/icon_funnel.png
+++ b/dist/icon/drag/icon_funnel.png
--- a/dist/icon/drag/icon_group.png
+++ b/dist/icon/drag/icon_group.png
--- a/Show More
+++ b/Show More