From 8b53b9111807c0c26b9bb9c66695027dea254d7d Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Thu, 15 Jun 2017 21:51:00 +0800
Subject: [PATCH 01/15] update

---
 bi/base.js                             | 40 +++++++++++++++-----------
 docs/base.js                           | 40 +++++++++++++++-----------
 src/base/collection/collection.js      |  6 ++--
 src/base/grid/grid.js                  |  6 ++--
 src/base/table/table.resizable.cell.js |  5 ++--
 src/base/table/table.resizable.js      | 23 ++++++++-------
 6 files changed, 69 insertions(+), 51 deletions(-)

diff --git a/bi/base.js b/bi/base.js
index 7d9636626..54edcd7ed 100644
--- a/bi/base.js
+++ b/bi/base.js
@@ -2684,10 +2684,10 @@ BI.CollectionView = BI.inherit(BI.Widget, {
                         this.renderedCells[index]._height = datum.height;
                         this.renderedCells[index].el.setHeight(datum.height);
                     }
-                    if (this.renderedCells[index].left !== datum.x) {
+                    if (this.renderedCells[index]._left !== datum.x) {
                         this.renderedCells[index].el.element.css("left", datum.x + "px");
                     }
-                    if (this.renderedCells[index].top !== datum.y) {
+                    if (this.renderedCells[index]._top !== datum.y) {
                         this.renderedCells[index].el.element.css("top", datum.y + "px");
                     }
                     renderedCells.push(child = this.renderedCells[index]);
@@ -2705,6 +2705,8 @@ BI.CollectionView = BI.inherit(BI.Widget, {
                         el: child,
                         left: datum.x,
                         top: datum.y,
+                        _left: datum.x,
+                        _top: datum.y,
                         _width: datum.width,
                         _height: datum.height
                     });
@@ -14800,10 +14802,10 @@ BI.GridView = BI.inherit(BI.Widget, {
                             this.renderedCells[index]._height = rowDatum.size;
                             this.renderedCells[index].el.setHeight(rowDatum.size);
                         }
-                        if (this.renderedCells[index].left !== columnDatum.offset + horizontalOffsetAdjustment) {
+                        if (this.renderedCells[index]._left !== columnDatum.offset + horizontalOffsetAdjustment) {
                             this.renderedCells[index].el.element.css("left", (columnDatum.offset + horizontalOffsetAdjustment) + "px");
                         }
-                        if (this.renderedCells[index].top !== rowDatum.offset + verticalOffsetAdjustment) {
+                        if (this.renderedCells[index]._top !== rowDatum.offset + verticalOffsetAdjustment) {
                             this.renderedCells[index].el.element.css("top", (rowDatum.offset + verticalOffsetAdjustment) + "px");
                         }
                         renderedCells.push(child = this.renderedCells[index]);
@@ -14823,6 +14825,8 @@ BI.GridView = BI.inherit(BI.Widget, {
                             el: child,
                             left: columnDatum.offset + horizontalOffsetAdjustment,
                             top: rowDatum.offset + verticalOffsetAdjustment,
+                            _left: columnDatum.offset + horizontalOffsetAdjustment,
+                            _top: rowDatum.offset + verticalOffsetAdjustment,
                             _width: columnDatum.size,
                             _height: rowDatum.size
                         });
@@ -32485,10 +32489,10 @@ BI.ResizableTableCell = BI.inherit(BI.Widget, {
                 size = 0;
                 offset = 0;
                 defaultSize = o.width;
-                self.handler.element.removeClass("dragging");
-                self.handler.element.removeClass("suitable");
                 startDrag = false;
             }
+            self.handler.element.removeClass("dragging");
+            self.handler.element.removeClass("suitable");
             mouseMoveTracker.releaseMouseMoves();
         }, document);
         this.handler = BI.createWidget({
@@ -32508,6 +32512,7 @@ BI.ResizableTableCell = BI.inherit(BI.Widget, {
         });
         this.handler.element.on("mousedown", function (event) {
             defaultSize = o.width;
+            optimizeSize(defaultSize);
             mouseMoveTracker.captureMouseMoves(event);
         });
         BI.createWidget({
@@ -32758,13 +32763,14 @@ BI.ResizableTable = BI.inherit(BI.Widget, {
             self.resizer.setVisible(true);
             var height = o.headerRowSize + self._getRegionRowSize()[1];
             self.resizer.setHeight(height);
-            if (o.minColumnSize[j]) {
-                if (size === o.minColumnSize[j]) {
-                    self.resizer.element.addClass("suitable");
-                } else {
-                    self.resizer.element.removeClass("suitable");
-                }
-            }
+            //TODO 不知道为什么加入这段代码会使得列宽调整出问题
+            // if (o.minColumnSize[j]) {
+            //     if (size === o.minColumnSize[j]) {
+            //         self.resizer.element.addClass("suitable");
+            //     } else {
+            //         self.resizer.element.removeClass("suitable");
+            //     }
+            // }
             self._setResizerPosition(self._getResizerLeft(j) + size, (o.header.length - 1) * o.headerRowSize);
         };
         var stop = function (j, size) {
@@ -32787,8 +32793,8 @@ BI.ResizableTable = BI.inherit(BI.Widget, {
                         result[i][j] = {
                             type: "bi.resizable_table_cell",
                             cell: col,
-                            suitableSize: o.minColumnSize[i],
-                            maxSize: o.maxColumnSize[i],
+                            suitableSize: o.minColumnSize[j],
+                            maxSize: o.maxColumnSize[j],
                             resize: BI.bind(resize, null, j),
                             stop: BI.bind(stop, null, j)
                         };
@@ -32798,8 +32804,8 @@ BI.ResizableTable = BI.inherit(BI.Widget, {
                                 result[r - 1][j] = {
                                     type: "bi.resizable_table_cell",
                                     cell: result[r - 1][j],
-                                    suitableSize: o.minColumnSize[i],
-                                    maxSize: o.maxColumnSize[i],
+                                    suitableSize: o.minColumnSize[j],
+                                    maxSize: o.maxColumnSize[j],
                                     resize: BI.bind(resize, null, j),
                                     stop: BI.bind(stop, null, j)
                                 };
diff --git a/docs/base.js b/docs/base.js
index 7d9636626..54edcd7ed 100644
--- a/docs/base.js
+++ b/docs/base.js
@@ -2684,10 +2684,10 @@ BI.CollectionView = BI.inherit(BI.Widget, {
                         this.renderedCells[index]._height = datum.height;
                         this.renderedCells[index].el.setHeight(datum.height);
                     }
-                    if (this.renderedCells[index].left !== datum.x) {
+                    if (this.renderedCells[index]._left !== datum.x) {
                         this.renderedCells[index].el.element.css("left", datum.x + "px");
                     }
-                    if (this.renderedCells[index].top !== datum.y) {
+                    if (this.renderedCells[index]._top !== datum.y) {
                         this.renderedCells[index].el.element.css("top", datum.y + "px");
                     }
                     renderedCells.push(child = this.renderedCells[index]);
@@ -2705,6 +2705,8 @@ BI.CollectionView = BI.inherit(BI.Widget, {
                         el: child,
                         left: datum.x,
                         top: datum.y,
+                        _left: datum.x,
+                        _top: datum.y,
                         _width: datum.width,
                         _height: datum.height
                     });
@@ -14800,10 +14802,10 @@ BI.GridView = BI.inherit(BI.Widget, {
                             this.renderedCells[index]._height = rowDatum.size;
                             this.renderedCells[index].el.setHeight(rowDatum.size);
                         }
-                        if (this.renderedCells[index].left !== columnDatum.offset + horizontalOffsetAdjustment) {
+                        if (this.renderedCells[index]._left !== columnDatum.offset + horizontalOffsetAdjustment) {
                             this.renderedCells[index].el.element.css("left", (columnDatum.offset + horizontalOffsetAdjustment) + "px");
                         }
-                        if (this.renderedCells[index].top !== rowDatum.offset + verticalOffsetAdjustment) {
+                        if (this.renderedCells[index]._top !== rowDatum.offset + verticalOffsetAdjustment) {
                             this.renderedCells[index].el.element.css("top", (rowDatum.offset + verticalOffsetAdjustment) + "px");
                         }
                         renderedCells.push(child = this.renderedCells[index]);
@@ -14823,6 +14825,8 @@ BI.GridView = BI.inherit(BI.Widget, {
                             el: child,
                             left: columnDatum.offset + horizontalOffsetAdjustment,
                             top: rowDatum.offset + verticalOffsetAdjustment,
+                            _left: columnDatum.offset + horizontalOffsetAdjustment,
+                            _top: rowDatum.offset + verticalOffsetAdjustment,
                             _width: columnDatum.size,
                             _height: rowDatum.size
                         });
@@ -32485,10 +32489,10 @@ BI.ResizableTableCell = BI.inherit(BI.Widget, {
                 size = 0;
                 offset = 0;
                 defaultSize = o.width;
-                self.handler.element.removeClass("dragging");
-                self.handler.element.removeClass("suitable");
                 startDrag = false;
             }
+            self.handler.element.removeClass("dragging");
+            self.handler.element.removeClass("suitable");
             mouseMoveTracker.releaseMouseMoves();
         }, document);
         this.handler = BI.createWidget({
@@ -32508,6 +32512,7 @@ BI.ResizableTableCell = BI.inherit(BI.Widget, {
         });
         this.handler.element.on("mousedown", function (event) {
             defaultSize = o.width;
+            optimizeSize(defaultSize);
             mouseMoveTracker.captureMouseMoves(event);
         });
         BI.createWidget({
@@ -32758,13 +32763,14 @@ BI.ResizableTable = BI.inherit(BI.Widget, {
             self.resizer.setVisible(true);
             var height = o.headerRowSize + self._getRegionRowSize()[1];
             self.resizer.setHeight(height);
-            if (o.minColumnSize[j]) {
-                if (size === o.minColumnSize[j]) {
-                    self.resizer.element.addClass("suitable");
-                } else {
-                    self.resizer.element.removeClass("suitable");
-                }
-            }
+            //TODO 不知道为什么加入这段代码会使得列宽调整出问题
+            // if (o.minColumnSize[j]) {
+            //     if (size === o.minColumnSize[j]) {
+            //         self.resizer.element.addClass("suitable");
+            //     } else {
+            //         self.resizer.element.removeClass("suitable");
+            //     }
+            // }
             self._setResizerPosition(self._getResizerLeft(j) + size, (o.header.length - 1) * o.headerRowSize);
         };
         var stop = function (j, size) {
@@ -32787,8 +32793,8 @@ BI.ResizableTable = BI.inherit(BI.Widget, {
                         result[i][j] = {
                             type: "bi.resizable_table_cell",
                             cell: col,
-                            suitableSize: o.minColumnSize[i],
-                            maxSize: o.maxColumnSize[i],
+                            suitableSize: o.minColumnSize[j],
+                            maxSize: o.maxColumnSize[j],
                             resize: BI.bind(resize, null, j),
                             stop: BI.bind(stop, null, j)
                         };
@@ -32798,8 +32804,8 @@ BI.ResizableTable = BI.inherit(BI.Widget, {
                                 result[r - 1][j] = {
                                     type: "bi.resizable_table_cell",
                                     cell: result[r - 1][j],
-                                    suitableSize: o.minColumnSize[i],
-                                    maxSize: o.maxColumnSize[i],
+                                    suitableSize: o.minColumnSize[j],
+                                    maxSize: o.maxColumnSize[j],
                                     resize: BI.bind(resize, null, j),
                                     stop: BI.bind(stop, null, j)
                                 };
diff --git a/src/base/collection/collection.js b/src/base/collection/collection.js
index 039b02ca4..3bb97c82d 100644
--- a/src/base/collection/collection.js
+++ b/src/base/collection/collection.js
@@ -166,10 +166,10 @@ BI.CollectionView = BI.inherit(BI.Widget, {
                         this.renderedCells[index]._height = datum.height;
                         this.renderedCells[index].el.setHeight(datum.height);
                     }
-                    if (this.renderedCells[index].left !== datum.x) {
+                    if (this.renderedCells[index]._left !== datum.x) {
                         this.renderedCells[index].el.element.css("left", datum.x + "px");
                     }
-                    if (this.renderedCells[index].top !== datum.y) {
+                    if (this.renderedCells[index]._top !== datum.y) {
                         this.renderedCells[index].el.element.css("top", datum.y + "px");
                     }
                     renderedCells.push(child = this.renderedCells[index]);
@@ -187,6 +187,8 @@ BI.CollectionView = BI.inherit(BI.Widget, {
                         el: child,
                         left: datum.x,
                         top: datum.y,
+                        _left: datum.x,
+                        _top: datum.y,
                         _width: datum.width,
                         _height: datum.height
                     });
diff --git a/src/base/grid/grid.js b/src/base/grid/grid.js
index 556040c04..1f09df86a 100644
--- a/src/base/grid/grid.js
+++ b/src/base/grid/grid.js
@@ -142,10 +142,10 @@ BI.GridView = BI.inherit(BI.Widget, {
                             this.renderedCells[index]._height = rowDatum.size;
                             this.renderedCells[index].el.setHeight(rowDatum.size);
                         }
-                        if (this.renderedCells[index].left !== columnDatum.offset + horizontalOffsetAdjustment) {
+                        if (this.renderedCells[index]._left !== columnDatum.offset + horizontalOffsetAdjustment) {
                             this.renderedCells[index].el.element.css("left", (columnDatum.offset + horizontalOffsetAdjustment) + "px");
                         }
-                        if (this.renderedCells[index].top !== rowDatum.offset + verticalOffsetAdjustment) {
+                        if (this.renderedCells[index]._top !== rowDatum.offset + verticalOffsetAdjustment) {
                             this.renderedCells[index].el.element.css("top", (rowDatum.offset + verticalOffsetAdjustment) + "px");
                         }
                         renderedCells.push(child = this.renderedCells[index]);
@@ -165,6 +165,8 @@ BI.GridView = BI.inherit(BI.Widget, {
                             el: child,
                             left: columnDatum.offset + horizontalOffsetAdjustment,
                             top: rowDatum.offset + verticalOffsetAdjustment,
+                            _left: columnDatum.offset + horizontalOffsetAdjustment,
+                            _top: rowDatum.offset + verticalOffsetAdjustment,
                             _width: columnDatum.size,
                             _height: rowDatum.size
                         });
diff --git a/src/base/table/table.resizable.cell.js b/src/base/table/table.resizable.cell.js
index cd1d565c8..f0bdaff98 100644
--- a/src/base/table/table.resizable.cell.js
+++ b/src/base/table/table.resizable.cell.js
@@ -56,10 +56,10 @@ BI.ResizableTableCell = BI.inherit(BI.Widget, {
                 size = 0;
                 offset = 0;
                 defaultSize = o.width;
-                self.handler.element.removeClass("dragging");
-                self.handler.element.removeClass("suitable");
                 startDrag = false;
             }
+            self.handler.element.removeClass("dragging");
+            self.handler.element.removeClass("suitable");
             mouseMoveTracker.releaseMouseMoves();
         }, document);
         this.handler = BI.createWidget({
@@ -79,6 +79,7 @@ BI.ResizableTableCell = BI.inherit(BI.Widget, {
         });
         this.handler.element.on("mousedown", function (event) {
             defaultSize = o.width;
+            optimizeSize(defaultSize);
             mouseMoveTracker.captureMouseMoves(event);
         });
         BI.createWidget({
diff --git a/src/base/table/table.resizable.js b/src/base/table/table.resizable.js
index bca89e215..1c0160380 100644
--- a/src/base/table/table.resizable.js
+++ b/src/base/table/table.resizable.js
@@ -216,13 +216,14 @@ BI.ResizableTable = BI.inherit(BI.Widget, {
             self.resizer.setVisible(true);
             var height = o.headerRowSize + self._getRegionRowSize()[1];
             self.resizer.setHeight(height);
-            if (o.minColumnSize[j]) {
-                if (size === o.minColumnSize[j]) {
-                    self.resizer.element.addClass("suitable");
-                } else {
-                    self.resizer.element.removeClass("suitable");
-                }
-            }
+            //TODO 不知道为什么加入这段代码会使得列宽调整出问题
+            // if (o.minColumnSize[j]) {
+            //     if (size === o.minColumnSize[j]) {
+            //         self.resizer.element.addClass("suitable");
+            //     } else {
+            //         self.resizer.element.removeClass("suitable");
+            //     }
+            // }
             self._setResizerPosition(self._getResizerLeft(j) + size, (o.header.length - 1) * o.headerRowSize);
         };
         var stop = function (j, size) {
@@ -245,8 +246,8 @@ BI.ResizableTable = BI.inherit(BI.Widget, {
                         result[i][j] = {
                             type: "bi.resizable_table_cell",
                             cell: col,
-                            suitableSize: o.minColumnSize[i],
-                            maxSize: o.maxColumnSize[i],
+                            suitableSize: o.minColumnSize[j],
+                            maxSize: o.maxColumnSize[j],
                             resize: BI.bind(resize, null, j),
                             stop: BI.bind(stop, null, j)
                         };
@@ -256,8 +257,8 @@ BI.ResizableTable = BI.inherit(BI.Widget, {
                                 result[r - 1][j] = {
                                     type: "bi.resizable_table_cell",
                                     cell: result[r - 1][j],
-                                    suitableSize: o.minColumnSize[i],
-                                    maxSize: o.maxColumnSize[i],
+                                    suitableSize: o.minColumnSize[j],
+                                    maxSize: o.maxColumnSize[j],
                                     resize: BI.bind(resize, null, j),
                                     stop: BI.bind(stop, null, j)
                                 };

From f56542cb065c8ff929e8e4a7cbb308acc2cd3d01 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Fri, 16 Jun 2017 12:11:39 +0800
Subject: [PATCH 02/15] add

---
 demo/js/base/button/demo.icon_button.js | 2 +-
 docs/demo.js                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/demo/js/base/button/demo.icon_button.js b/demo/js/base/button/demo.icon_button.js
index 1b4e5a650..c88ef31cb 100644
--- a/demo/js/base/button/demo.icon_button.js
+++ b/demo/js/base/button/demo.icon_button.js
@@ -7,7 +7,7 @@ Demo.Button = BI.inherit(BI.Widget, {
             {
                 el: {
                     type: 'bi.icon_button',
-                    cls: "rename-font",
+                    cls: "close-ha-font",
                     width: 20,
                     height: 20
                 }
diff --git a/docs/demo.js b/docs/demo.js
index 0faea58a3..2f11c0973 100644
--- a/docs/demo.js
+++ b/docs/demo.js
@@ -222,7 +222,7 @@ BI.shortcut("demo.button", Demo.Button);Demo.Button = BI.inherit(BI.Widget, {
             {
                 el: {
                     type: 'bi.icon_button',
-                    cls: "rename-font",
+                    cls: "close-ha-font",
                     width: 20,
                     height: 20
                 }

From 62cb33f97d933c3e6bd6775151a85b0baaa7d826 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Fri, 16 Jun 2017 20:18:10 +0800
Subject: [PATCH 03/15] =?UTF-8?q?=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bi/core.css                                               | 6 +-----
 docs/core.css                                             | 6 +-----
 src/css/base/colorchooser/colorchooser.trigger.css        | 2 --
 .../base/colorchooser/colorpicker/button.colorpicker.css  | 2 --
 .../base/colorchooser/colorpicker/editor.colorpicker.css  | 2 --
 src/css/base/combo/combo.bubble.css                       | 2 --
 src/css/base/combo/popup.bubble.css                       | 2 --
 src/css/base/editor/editor.adapt.css                      | 2 --
 src/css/base/editor/editor.search.css                     | 2 --
 src/css/base/editor/editor.search.small.css               | 2 --
 src/css/base/editor/editor.sign.initial.css               | 2 --
 src/css/base/formula/codemirror.css                       | 2 --
 src/css/base/foundation/bi.message.css                    | 2 --
 src/css/base/layer/layer.multiselect.css                  | 2 --
 src/css/base/layer/panel.css                              | 2 --
 src/css/base/pager/pager.all.count.css                    | 2 --
 src/css/base/pager/pager.css                              | 2 --
 src/css/base/pager/pager.direction.css                    | 2 --
 src/css/base/segment/segment.css                          | 2 --
 src/css/base/single/button/button.css                     | 2 --
 src/css/base/single/button/item.singleselect.icontext.css | 2 --
 src/css/base/single/editor/editor.css                     | 2 --
 src/css/base/single/editor/editor.multifile.css           | 2 --
 src/css/base/single/editor/editor.shelter.css             | 2 --
 src/css/base/single/editor/editor.sign.css                | 2 --
 src/css/base/single/editor/editor.textarea.css            | 2 --
 src/css/base/single/input/file.css                        | 2 --
 src/css/base/single/input/input.css                       | 2 --
 src/css/base/single/text.css                              | 2 --
 src/css/base/single/tip/tip.bubble.css                    | 2 --
 src/css/base/single/tip/tip.css                           | 2 --
 src/css/base/single/tip/tip.toast.css                     | 2 --
 src/css/base/single/tip/tip.tooltip.css                   | 2 --
 src/css/base/table/table.collection.cell.css              | 2 --
 src/css/base/table/table.collection.quick.css             | 2 --
 src/css/base/table/table.css                              | 2 --
 src/css/base/table/table.grid.cell.css                    | 2 --
 src/css/base/table/table.grid.scrollbar.css               | 2 --
 src/css/base/table/table.resizable.cell.css               | 2 --
 src/css/base/table/table.resizable.css                    | 2 --
 src/css/base/tree/branch.tree.css                         | 2 --
 src/css/base/trigger/trigger.css                          | 2 --
 src/css/base/trigger/trigger.selecttext.css               | 2 --
 src/css/base/trigger/trigger.selecttextsmall.css          | 2 --
 src/css/base/view/popupview.css                           | 2 --
 src/css/core/normal.css                                   | 8 +-------
 src/css/core/utils/common.css                             | 2 --
 src/css/core/utils/overflow.css                           | 2 --
 src/css/core/utils/pos.css                                | 2 --
 src/css/core/utils/sizing.css                             | 2 --
 src/css/core/wrapper/inline.center.css                    | 2 --
 src/css/core/wrapper/inline.vertical.css                  | 2 --
 src/css/resource/app.css                                  | 2 --
 src/css/resource/font.css                                 | 2 --
 src/css/resource/third/farbtastic/farbtastic.css          | 2 --
 src/css/resource/third/ztree/display.tree.css             | 2 --
 src/css/resource/third/ztree/zTreeStyle.css               | 2 --
 src/css/theme/dark.css                                    | 2 --
 src/css/widget/arrangement/arrangement.css                | 2 --
 src/css/widget/arrangement/arrangement.droppable.css      | 2 --
 src/css/widget/date/trigger.date.css                      | 2 --
 src/css/widget/downlist/popup.downlist.css                | 2 --
 src/css/widget/exceltable/exceltable.css                  | 2 --
 src/css/widget/exceltable/exceltable.header.cell.css      | 2 --
 .../filemanager/nav/button/button.nav.filemanager.css     | 2 --
 .../finetuningnumbereditor/finetuning.number.editor.css   | 2 --
 .../interactivearrangement/interactivearrangement.css     | 2 --
 src/css/widget/month/trigger.month.css                    | 2 --
 .../widget/multiselect/check/multiselect.check.pane.css   | 2 --
 src/css/widget/multiselect/multiselect.combo.css          | 2 --
 src/css/widget/multiselect/multiselect.trigger.css        | 2 --
 .../widget/multiselect/search/multiselect.search.pane.css | 2 --
 .../widget/multiselect/trigger/button.checkselected.css   | 2 --
 src/css/widget/multitree/check/multi.tree.check.pane.css  | 2 --
 src/css/widget/multitree/multi.tree.combo.css             | 2 --
 src/css/widget/multitree/popup.multi.tree.css             | 2 --
 .../multitree/trigger/multi.tree.button.checkselected.css | 2 --
 src/css/widget/numericalinterval/numericalinterval.css    | 2 --
 src/css/widget/pagetable/pagetable.cell.css               | 2 --
 src/css/widget/pathchooser/pathchooser.css                | 2 --
 src/css/widget/pathchooser/pathregion.css                 | 2 --
 src/css/widget/previewtable/previewtable.cell.css         | 2 --
 src/css/widget/previewtable/previewtable.css              | 2 --
 src/css/widget/previewtable/previewtable.header.cell.css  | 2 --
 src/css/widget/quarter/trigger.quarter.css                | 2 --
 src/css/widget/relationview/relationview.region.css       | 2 --
 .../widget/sequencetable/dynamicnumber.sequencetable.css  | 2 --
 src/css/widget/sequencetable/listnumber.sequencetable.css | 2 --
 src/css/widget/sequencetable/treenumber.sequencetable.css | 2 --
 src/css/widget/year/popup.year.css                        | 2 --
 src/css/widget/year/trigger.year.css                      | 2 --
 src/less/core/normal.less                                 | 8 +-------
 src/less/lib/colors.less                                  | 2 --
 93 files changed, 4 insertions(+), 202 deletions(-)

diff --git a/bi/core.css b/bi/core.css
index 0ca0bec5d..74a771271 100644
--- a/bi/core.css
+++ b/bi/core.css
@@ -4,6 +4,7 @@ html,
 body,
 div,
 ul,
+ol,
 li,
 img,
 a,
@@ -31,11 +32,6 @@ textarea {
 .bi-theme-dark textarea {
   border: 1px solid #525466;
 }
-ul,
-ol {
-  margin: 0;
-  padding: 0;
-}
 ul {
   list-style: disc;
 }
diff --git a/docs/core.css b/docs/core.css
index 0ca0bec5d..74a771271 100644
--- a/docs/core.css
+++ b/docs/core.css
@@ -4,6 +4,7 @@ html,
 body,
 div,
 ul,
+ol,
 li,
 img,
 a,
@@ -31,11 +32,6 @@ textarea {
 .bi-theme-dark textarea {
   border: 1px solid #525466;
 }
-ul,
-ol {
-  margin: 0;
-  padding: 0;
-}
 ul {
   list-style: disc;
 }
diff --git a/src/css/base/colorchooser/colorchooser.trigger.css b/src/css/base/colorchooser/colorchooser.trigger.css
index ce43156fa..7e07cb515 100644
--- a/src/css/base/colorchooser/colorchooser.trigger.css
+++ b/src/css/base/colorchooser/colorchooser.trigger.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-color-chooser-trigger {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
diff --git a/src/css/base/colorchooser/colorpicker/button.colorpicker.css b/src/css/base/colorchooser/colorpicker/button.colorpicker.css
index 47deb8dcc..87f55f5da 100644
--- a/src/css/base/colorchooser/colorpicker/button.colorpicker.css
+++ b/src/css/base/colorchooser/colorpicker/button.colorpicker.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-color-picker-button .color-picker-button-mask {
   border: 1px solid #1a1a1a;
 }
diff --git a/src/css/base/colorchooser/colorpicker/editor.colorpicker.css b/src/css/base/colorchooser/colorpicker/editor.colorpicker.css
index 780132508..c5e9ea70c 100644
--- a/src/css/base/colorchooser/colorpicker/editor.colorpicker.css
+++ b/src/css/base/colorchooser/colorpicker/editor.colorpicker.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-color-picker-editor .color-picker-editor-display {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
diff --git a/src/css/base/combo/combo.bubble.css b/src/css/base/combo/combo.bubble.css
index e787b253e..563755f01 100644
--- a/src/css/base/combo/combo.bubble.css
+++ b/src/css/base/combo/combo.bubble.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-bubble-combo .button-combo-triangle-wrapper {
   position: fixed !important;
 }
diff --git a/src/css/base/combo/popup.bubble.css b/src/css/base/combo/popup.bubble.css
index 51a6bd22c..ffb39a2c8 100644
--- a/src/css/base/combo/popup.bubble.css
+++ b/src/css/base/combo/popup.bubble.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-bubble-popup-view {
   -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
   -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
diff --git a/src/css/base/editor/editor.adapt.css b/src/css/base/editor/editor.adapt.css
index 7d4f14538..59725a1e3 100644
--- a/src/css/base/editor/editor.adapt.css
+++ b/src/css/base/editor/editor.adapt.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-adapt-editor .adapt-editor-text {
   font-size: 14px;
 }
diff --git a/src/css/base/editor/editor.search.css b/src/css/base/editor/editor.search.css
index d429e6f7d..d88e2e7a6 100644
--- a/src/css/base/editor/editor.search.css
+++ b/src/css/base/editor/editor.search.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 /*************BI.SearchEditor******************/
 .bi-search-editor .close-font {
   font-size: 20px;
diff --git a/src/css/base/editor/editor.search.small.css b/src/css/base/editor/editor.search.small.css
index 1bc1fc606..4dcd6010c 100644
--- a/src/css/base/editor/editor.search.small.css
+++ b/src/css/base/editor/editor.search.small.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 /*************BI.SearchEditor******************/
 .bi-small-search-editor .bi-editor {
   font-size: 12px;
diff --git a/src/css/base/editor/editor.sign.initial.css b/src/css/base/editor/editor.sign.initial.css
index ba088ee8a..6dea846a9 100644
--- a/src/css/base/editor/editor.sign.initial.css
+++ b/src/css/base/editor/editor.sign.initial.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-sign-initial-editor .sign-initial-editor-text {
   font-size: 14px;
 }
diff --git a/src/css/base/formula/codemirror.css b/src/css/base/formula/codemirror.css
index 574fdbd13..337579273 100644
--- a/src/css/base/formula/codemirror.css
+++ b/src/css/base/formula/codemirror.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 /* BASICS */
 .CodeMirror {
   /* Set height, width, borders, and global font properties here */
diff --git a/src/css/base/foundation/bi.message.css b/src/css/base/foundation/bi.message.css
index 30e9fb8f1..173116c05 100644
--- a/src/css/base/foundation/bi.message.css
+++ b/src/css/base/foundation/bi.message.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-message-title {
   font-size: 16px;
   cursor: pointer;
diff --git a/src/css/base/layer/layer.multiselect.css b/src/css/base/layer/layer.multiselect.css
index d42f65ad2..e30f78d82 100644
--- a/src/css/base/layer/layer.multiselect.css
+++ b/src/css/base/layer/layer.multiselect.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-list-view .bi-button-mask {
   opacity: 0.1;
   filter: alpha(opacity=10);
diff --git a/src/css/base/layer/panel.css b/src/css/base/layer/panel.css
index 614afdc65..5a0c74f55 100644
--- a/src/css/base/layer/panel.css
+++ b/src/css/base/layer/panel.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-panel {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
diff --git a/src/css/base/pager/pager.all.count.css b/src/css/base/pager/pager.all.count.css
index 06af92b86..ef5e6f63c 100644
--- a/src/css/base/pager/pager.all.count.css
+++ b/src/css/base/pager/pager.all.count.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-all-count-pager .all-pager-prev {
   font-size: 16px;
 }
diff --git a/src/css/base/pager/pager.css b/src/css/base/pager/pager.css
index ec2224d60..585c51289 100644
--- a/src/css/base/pager/pager.css
+++ b/src/css/base/pager/pager.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-pager .page-item {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
diff --git a/src/css/base/pager/pager.direction.css b/src/css/base/pager/pager.direction.css
index b456a19d4..15f1686ab 100644
--- a/src/css/base/pager/pager.direction.css
+++ b/src/css/base/pager/pager.direction.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-direction-pager .direction-pager-prev {
   font-size: 16px;
 }
diff --git a/src/css/base/segment/segment.css b/src/css/base/segment/segment.css
index 4a342dd22..be61364e4 100644
--- a/src/css/base/segment/segment.css
+++ b/src/css/base/segment/segment.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-segment > .center-element {
   overflow: hidden;
   overflow-x: hidden;
diff --git a/src/css/base/single/button/button.css b/src/css/base/single/button/button.css
index fd579d710..09c648782 100644
--- a/src/css/base/single/button/button.css
+++ b/src/css/base/single/button/button.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-button {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
diff --git a/src/css/base/single/button/item.singleselect.icontext.css b/src/css/base/single/button/item.singleselect.icontext.css
index 4f897ffb2..b446c5eaf 100644
--- a/src/css/base/single/button/item.singleselect.icontext.css
+++ b/src/css/base/single/button/item.singleselect.icontext.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-single-select-icon-text-item:active .b-font:before,
 .bi-single-select-icon-text-item.active .b-font:before {
   color: #3f8ce8;
diff --git a/src/css/base/single/editor/editor.css b/src/css/base/single/editor/editor.css
index b3752482a..dd76bd5ab 100644
--- a/src/css/base/single/editor/editor.css
+++ b/src/css/base/single/editor/editor.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-editor {
   font-size: 12px;
 }
diff --git a/src/css/base/single/editor/editor.multifile.css b/src/css/base/single/editor/editor.multifile.css
index 4dc8a0e6c..a9bb78621 100644
--- a/src/css/base/single/editor/editor.multifile.css
+++ b/src/css/base/single/editor/editor.multifile.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multifile-editor .multifile-editor {
   text-align: right;
   cursor: pointer;
diff --git a/src/css/base/single/editor/editor.shelter.css b/src/css/base/single/editor/editor.shelter.css
index f8413c9cd..aa6b9b2a1 100644
--- a/src/css/base/single/editor/editor.shelter.css
+++ b/src/css/base/single/editor/editor.shelter.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-shelter-editor .shelter-editor-text {
   font-size: 12px;
 }
diff --git a/src/css/base/single/editor/editor.sign.css b/src/css/base/single/editor/editor.sign.css
index d25096214..5012db867 100644
--- a/src/css/base/single/editor/editor.sign.css
+++ b/src/css/base/single/editor/editor.sign.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-sign-editor .sign-editor-text {
   font-size: 12px;
 }
diff --git a/src/css/base/single/editor/editor.textarea.css b/src/css/base/single/editor/editor.textarea.css
index a2ead3d4b..b9816a85f 100644
--- a/src/css/base/single/editor/editor.textarea.css
+++ b/src/css/base/single/editor/editor.textarea.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-textarea-editor {
   overflow: hidden;
   overflow-x: hidden;
diff --git a/src/css/base/single/input/file.css b/src/css/base/single/input/file.css
index 8b414d1f3..82aa8303f 100644
--- a/src/css/base/single/input/file.css
+++ b/src/css/base/single/input/file.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-file {
   opacity: 0;
   filter: alpha(opacity=0);
diff --git a/src/css/base/single/input/input.css b/src/css/base/single/input/input.css
index 1edaa2c7d..5bce1012b 100644
--- a/src/css/base/single/input/input.css
+++ b/src/css/base/single/input/input.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-input {
   border: none;
   outline: none;
diff --git a/src/css/base/single/text.css b/src/css/base/single/text.css
index d07bf58c9..69603a5a6 100644
--- a/src/css/base/single/text.css
+++ b/src/css/base/single/text.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-text {
   text-overflow: ellipsis;
   overflow-x: hidden;
diff --git a/src/css/base/single/tip/tip.bubble.css b/src/css/base/single/tip/tip.bubble.css
index 68f478310..c1149da83 100644
--- a/src/css/base/single/tip/tip.bubble.css
+++ b/src/css/base/single/tip/tip.bubble.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-bubble {
   font-size: 14px;
 }
diff --git a/src/css/base/single/tip/tip.css b/src/css/base/single/tip/tip.css
index d62f2f503..bc771b53d 100644
--- a/src/css/base/single/tip/tip.css
+++ b/src/css/base/single/tip/tip.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-tip {
   position: fixed !important;
 }
diff --git a/src/css/base/single/tip/tip.toast.css b/src/css/base/single/tip/tip.toast.css
index f2ec5102e..28b7bbbeb 100644
--- a/src/css/base/single/tip/tip.toast.css
+++ b/src/css/base/single/tip/tip.toast.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-toast {
   font-size: 14px;
   -webkit-border-radius: 2px;
diff --git a/src/css/base/single/tip/tip.tooltip.css b/src/css/base/single/tip/tip.tooltip.css
index 3902d6780..97e57e50e 100644
--- a/src/css/base/single/tip/tip.tooltip.css
+++ b/src/css/base/single/tip/tip.tooltip.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-tooltip {
   max-width: 250px;
   -webkit-border-radius: 2px;
diff --git a/src/css/base/table/table.collection.cell.css b/src/css/base/table/table.collection.cell.css
index 560bd3418..f630fb3ed 100644
--- a/src/css/base/table/table.collection.cell.css
+++ b/src/css/base/table/table.collection.cell.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-collection-table-cell {
   -webkit-box-sizing: border-box;
   /*Safari3.2+*/
diff --git a/src/css/base/table/table.collection.quick.css b/src/css/base/table/table.collection.quick.css
index b10f62061..f1249ba83 100644
--- a/src/css/base/table/table.collection.quick.css
+++ b/src/css/base/table/table.collection.quick.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-quick-collection-table > div > .bi-collection {
   overflow: hidden !important;
   overflow-x: hidden !important;
diff --git a/src/css/base/table/table.css b/src/css/base/table/table.css
index 8c983972e..abfd5a942 100644
--- a/src/css/base/table/table.css
+++ b/src/css/base/table/table.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-table > .first-col {
   border-left: none;
 }
diff --git a/src/css/base/table/table.grid.cell.css b/src/css/base/table/table.grid.cell.css
index 06c918d1f..10fab44a8 100644
--- a/src/css/base/table/table.grid.cell.css
+++ b/src/css/base/table/table.grid.cell.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-grid-table-cell {
   -webkit-box-sizing: border-box;
   /*Safari3.2+*/
diff --git a/src/css/base/table/table.grid.scrollbar.css b/src/css/base/table/table.grid.scrollbar.css
index c5afd5c08..111b2f877 100644
--- a/src/css/base/table/table.grid.scrollbar.css
+++ b/src/css/base/table/table.grid.scrollbar.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .scrollbar-layout-main {
   box-sizing: border-box;
   outline: none;
diff --git a/src/css/base/table/table.resizable.cell.css b/src/css/base/table/table.resizable.cell.css
index d06885623..bd1c75358 100644
--- a/src/css/base/table/table.resizable.cell.css
+++ b/src/css/base/table/table.resizable.cell.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-resizable-table-cell .resizable-table-cell-resizer-container {
   cursor: ew-resize;
   z-index: 1;
diff --git a/src/css/base/table/table.resizable.css b/src/css/base/table/table.resizable.css
index c49afd3fb..cc4c9b86b 100644
--- a/src/css/base/table/table.resizable.css
+++ b/src/css/base/table/table.resizable.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-resizable-table .resizable-table-resizer {
   cursor: ew-resize;
   z-index: 1;
diff --git a/src/css/base/tree/branch.tree.css b/src/css/base/tree/branch.tree.css
index 68f22306a..3d6d38e25 100644
--- a/src/css/base/tree/branch.tree.css
+++ b/src/css/base/tree/branch.tree.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-branch-tree .bi-branch-tree-view {
   min-width: 300px;
 }
diff --git a/src/css/base/trigger/trigger.css b/src/css/base/trigger/trigger.css
index cb974136a..51c60b492 100644
--- a/src/css/base/trigger/trigger.css
+++ b/src/css/base/trigger/trigger.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-trigger .bi-trigger-icon-button {
   font-size: 16px;
 }
diff --git a/src/css/base/trigger/trigger.selecttext.css b/src/css/base/trigger/trigger.selecttext.css
index 7e3adadc1..0f5ff3f24 100644
--- a/src/css/base/trigger/trigger.selecttext.css
+++ b/src/css/base/trigger/trigger.selecttext.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-select-text-trigger {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
diff --git a/src/css/base/trigger/trigger.selecttextsmall.css b/src/css/base/trigger/trigger.selecttextsmall.css
index a0993e840..bd464915d 100644
--- a/src/css/base/trigger/trigger.selecttextsmall.css
+++ b/src/css/base/trigger/trigger.selecttextsmall.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-small-select-text-trigger {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
diff --git a/src/css/base/view/popupview.css b/src/css/base/view/popupview.css
index 76d80e817..142b2c7a7 100644
--- a/src/css/base/view/popupview.css
+++ b/src/css/base/view/popupview.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 /**********BI.BIListView*************/
 .bi-popup-view {
   position: fixed !important;
diff --git a/src/css/core/normal.css b/src/css/core/normal.css
index 330984f77..f0f651d4e 100644
--- a/src/css/core/normal.css
+++ b/src/css/core/normal.css
@@ -1,9 +1,8 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 html,
 body,
 div,
 ul,
+ol,
 li,
 img,
 a,
@@ -31,11 +30,6 @@ textarea {
 .bi-theme-dark textarea {
   border: 1px solid #525466;
 }
-ul,
-ol {
-  margin: 0;
-  padding: 0;
-}
 ul {
   list-style: disc;
 }
diff --git a/src/css/core/utils/common.css b/src/css/core/utils/common.css
index d00ff860a..c94dd5a88 100644
--- a/src/css/core/utils/common.css
+++ b/src/css/core/utils/common.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .base-disabled {
   cursor: default !important;
   color: #cccccc !important;
diff --git a/src/css/core/utils/overflow.css b/src/css/core/utils/overflow.css
index 54507c5d3..0376a1ee1 100644
--- a/src/css/core/utils/overflow.css
+++ b/src/css/core/utils/overflow.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .y-overflow-auto {
   overflow-y: auto;
   overflow-x: hidden;
diff --git a/src/css/core/utils/pos.css b/src/css/core/utils/pos.css
index 89e984e5b..4744c1549 100644
--- a/src/css/core/utils/pos.css
+++ b/src/css/core/utils/pos.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .display-block {
   display: block;
 }
diff --git a/src/css/core/utils/sizing.css b/src/css/core/utils/sizing.css
index 67a1f6476..65ec7a96f 100644
--- a/src/css/core/utils/sizing.css
+++ b/src/css/core/utils/sizing.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 /*类似ie6的盒子模型 可以在有百分比的时候加border 支持到ie8*/
 .border-sizing {
   -webkit-box-sizing: border-box;
diff --git a/src/css/core/wrapper/inline.center.css b/src/css/core/wrapper/inline.center.css
index ed70149fa..1337d3841 100644
--- a/src/css/core/wrapper/inline.center.css
+++ b/src/css/core/wrapper/inline.center.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-inline-center-adapt-layout:after {
   display: inline-block;
   width: 0;
diff --git a/src/css/core/wrapper/inline.vertical.css b/src/css/core/wrapper/inline.vertical.css
index 183754a10..23d94c971 100644
--- a/src/css/core/wrapper/inline.vertical.css
+++ b/src/css/core/wrapper/inline.vertical.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-inline-vertical-adapt-layout:after {
   display: inline-block;
   width: 0;
diff --git a/src/css/resource/app.css b/src/css/resource/app.css
index 434165158..a84c8542b 100644
--- a/src/css/resource/app.css
+++ b/src/css/resource/app.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 html,
 button,
 input,
diff --git a/src/css/resource/font.css b/src/css/resource/font.css
index 27409046b..ee9d61c35 100644
--- a/src/css/resource/font.css
+++ b/src/css/resource/font.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 @font-face {
   font-family: 'bi';
   src: url('font/iconfont.eot'), /* 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');
diff --git a/src/css/resource/third/farbtastic/farbtastic.css b/src/css/resource/third/farbtastic/farbtastic.css
index c5c0e692b..e91f29f67 100644
--- a/src/css/resource/third/farbtastic/farbtastic.css
+++ b/src/css/resource/third/farbtastic/farbtastic.css
@@ -16,8 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .farbtastic {
   position: relative;
 }
diff --git a/src/css/resource/third/ztree/display.tree.css b/src/css/resource/third/ztree/display.tree.css
index b3131157e..6d79da8c5 100644
--- a/src/css/resource/third/ztree/display.tree.css
+++ b/src/css/resource/third/ztree/display.tree.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-display-tree .ztree * {
   color: #999999;
 }
diff --git a/src/css/resource/third/ztree/zTreeStyle.css b/src/css/resource/third/ztree/zTreeStyle.css
index d39416c76..d9f4caf12 100644
--- a/src/css/resource/third/ztree/zTreeStyle.css
+++ b/src/css/resource/third/ztree/zTreeStyle.css
@@ -7,8 +7,6 @@ email:		hunter.z@263.net
 website:	http://code.google.com/p/jquerytree/
 
 -------------------------------------*/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .ztree * {
   padding: 0;
   margin: 0;
diff --git a/src/css/theme/dark.css b/src/css/theme/dark.css
index 484459e4b..7349cdeef 100644
--- a/src/css/theme/dark.css
+++ b/src/css/theme/dark.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-theme-dark {
   background-color: #191b2b;
   color: #cccccc;
diff --git a/src/css/widget/arrangement/arrangement.css b/src/css/widget/arrangement/arrangement.css
index 6974ec944..a42351a6d 100644
--- a/src/css/widget/arrangement/arrangement.css
+++ b/src/css/widget/arrangement/arrangement.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-arrangement .arrangement-helper {
   background: #3f8ce8;
   z-index: 1000000000;
diff --git a/src/css/widget/arrangement/arrangement.droppable.css b/src/css/widget/arrangement/arrangement.droppable.css
index 0ce46cb82..003a55bb1 100644
--- a/src/css/widget/arrangement/arrangement.droppable.css
+++ b/src/css/widget/arrangement/arrangement.droppable.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-arrangement-droppable {
   z-index: 100000;
 }
diff --git a/src/css/widget/date/trigger.date.css b/src/css/widget/date/trigger.date.css
index beec6fb76..94c2071ef 100644
--- a/src/css/widget/date/trigger.date.css
+++ b/src/css/widget/date/trigger.date.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-date-trigger {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
diff --git a/src/css/widget/downlist/popup.downlist.css b/src/css/widget/downlist/popup.downlist.css
index 7a6c5ee1f..36a3223e8 100644
--- a/src/css/widget/downlist/popup.downlist.css
+++ b/src/css/widget/downlist/popup.downlist.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-down-list-popup .bi-down-list-item .list-item-text {
   max-width: 203px;
 }
diff --git a/src/css/widget/exceltable/exceltable.css b/src/css/widget/exceltable/exceltable.css
index 118b42cbe..4f6dc3b7a 100644
--- a/src/css/widget/exceltable/exceltable.css
+++ b/src/css/widget/exceltable/exceltable.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-excel-table > div.bottom-right > div > div > table {
   border-right: 1px solid #d4dadd;
 }
diff --git a/src/css/widget/exceltable/exceltable.header.cell.css b/src/css/widget/exceltable/exceltable.header.cell.css
index ff64e9da1..36056b262 100644
--- a/src/css/widget/exceltable/exceltable.header.cell.css
+++ b/src/css/widget/exceltable/exceltable.header.cell.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-excel-table-header-cell {
   font-weight: bold;
 }
diff --git a/src/css/widget/filemanager/nav/button/button.nav.filemanager.css b/src/css/widget/filemanager/nav/button/button.nav.filemanager.css
index 76c979412..973b3c1c1 100644
--- a/src/css/widget/filemanager/nav/button/button.nav.filemanager.css
+++ b/src/css/widget/filemanager/nav/button/button.nav.filemanager.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-file-manager-nav-button .file-manager-nav-button-text {
   max-width: 200px;
 }
diff --git a/src/css/widget/finetuningnumbereditor/finetuning.number.editor.css b/src/css/widget/finetuningnumbereditor/finetuning.number.editor.css
index 3a5738157..1e2690fcd 100644
--- a/src/css/widget/finetuningnumbereditor/finetuning.number.editor.css
+++ b/src/css/widget/finetuningnumbereditor/finetuning.number.editor.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-fine-tuning-number-editor {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
diff --git a/src/css/widget/interactivearrangement/interactivearrangement.css b/src/css/widget/interactivearrangement/interactivearrangement.css
index 265625ccc..f52a2e3b9 100644
--- a/src/css/widget/interactivearrangement/interactivearrangement.css
+++ b/src/css/widget/interactivearrangement/interactivearrangement.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-interactive-arrangement .interactive-arrangement-dragtag-line {
   z-index: 1000000000;
   background-color: #f07d0a;
diff --git a/src/css/widget/month/trigger.month.css b/src/css/widget/month/trigger.month.css
index c706915fa..047ce2087 100644
--- a/src/css/widget/month/trigger.month.css
+++ b/src/css/widget/month/trigger.month.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-month-trigger {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
diff --git a/src/css/widget/multiselect/check/multiselect.check.pane.css b/src/css/widget/multiselect/check/multiselect.check.pane.css
index aa0164de2..cf9105e46 100644
--- a/src/css/widget/multiselect/check/multiselect.check.pane.css
+++ b/src/css/widget/multiselect/check/multiselect.check.pane.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-select-check-pane .multi-select-check-selected {
   text-decoration: underline;
 }
diff --git a/src/css/widget/multiselect/multiselect.combo.css b/src/css/widget/multiselect/multiselect.combo.css
index 90ba9ba3e..7e76ec81c 100644
--- a/src/css/widget/multiselect/multiselect.combo.css
+++ b/src/css/widget/multiselect/multiselect.combo.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-select-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
diff --git a/src/css/widget/multiselect/multiselect.trigger.css b/src/css/widget/multiselect/multiselect.trigger.css
index 5c2866e08..31e53166c 100644
--- a/src/css/widget/multiselect/multiselect.trigger.css
+++ b/src/css/widget/multiselect/multiselect.trigger.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-select-trigger {
   -webkit-border-radius: 2px 2px 2px 2px;
   -moz-border-radius: 2px 2px 2px 2px;
diff --git a/src/css/widget/multiselect/search/multiselect.search.pane.css b/src/css/widget/multiselect/search/multiselect.search.pane.css
index 75228fd4d..88e22218d 100644
--- a/src/css/widget/multiselect/search/multiselect.search.pane.css
+++ b/src/css/widget/multiselect/search/multiselect.search.pane.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-select-search-pane .multi-select-toolbar {
   color: #e85050;
 }
diff --git a/src/css/widget/multiselect/trigger/button.checkselected.css b/src/css/widget/multiselect/trigger/button.checkselected.css
index 0f2617a98..135ecbc99 100644
--- a/src/css/widget/multiselect/trigger/button.checkselected.css
+++ b/src/css/widget/multiselect/trigger/button.checkselected.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-select-check-selected-button {
   z-index: 1;
 }
diff --git a/src/css/widget/multitree/check/multi.tree.check.pane.css b/src/css/widget/multitree/check/multi.tree.check.pane.css
index f184e254f..64572cfb5 100644
--- a/src/css/widget/multitree/check/multi.tree.check.pane.css
+++ b/src/css/widget/multitree/check/multi.tree.check.pane.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-tree-check-pane .multi-tree-check-selected {
   color: #3f8ce8;
 }
diff --git a/src/css/widget/multitree/multi.tree.combo.css b/src/css/widget/multitree/multi.tree.combo.css
index 3ed3318b3..4a6251195 100644
--- a/src/css/widget/multitree/multi.tree.combo.css
+++ b/src/css/widget/multitree/multi.tree.combo.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-tree-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
diff --git a/src/css/widget/multitree/popup.multi.tree.css b/src/css/widget/multitree/popup.multi.tree.css
index 8fd35668f..9c1ddb078 100644
--- a/src/css/widget/multitree/popup.multi.tree.css
+++ b/src/css/widget/multitree/popup.multi.tree.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-tree-popup .popup-view-tree {
   min-height: 170px;
 }
diff --git a/src/css/widget/multitree/trigger/multi.tree.button.checkselected.css b/src/css/widget/multitree/trigger/multi.tree.button.checkselected.css
index 96e43b8b9..0716e0c16 100644
--- a/src/css/widget/multitree/trigger/multi.tree.button.checkselected.css
+++ b/src/css/widget/multitree/trigger/multi.tree.button.checkselected.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-tree-check-selected-button .trigger-check-selected {
   color: #3f8ce8;
   z-index: 1;
diff --git a/src/css/widget/numericalinterval/numericalinterval.css b/src/css/widget/numericalinterval/numericalinterval.css
index 9367fa1c7..a980ddbc9 100644
--- a/src/css/widget/numericalinterval/numericalinterval.css
+++ b/src/css/widget/numericalinterval/numericalinterval.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-numerical-interval .numerical-interval-small-editor {
   -moz-border-radius-topleft: 2px;
   -webkit-border-top-left-radius: 2px;
diff --git a/src/css/widget/pagetable/pagetable.cell.css b/src/css/widget/pagetable/pagetable.cell.css
index 462fc3e58..19a8914b6 100644
--- a/src/css/widget/pagetable/pagetable.cell.css
+++ b/src/css/widget/pagetable/pagetable.cell.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-page-table-cell {
   -webkit-user-select: initial;
   -khtml-user-select: initial;
diff --git a/src/css/widget/pathchooser/pathchooser.css b/src/css/widget/pathchooser/pathchooser.css
index e66595c26..42c933495 100644
--- a/src/css/widget/pathchooser/pathchooser.css
+++ b/src/css/widget/pathchooser/pathchooser.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-path-chooser .path-chooser-radio {
   z-index: 1;
 }
diff --git a/src/css/widget/pathchooser/pathregion.css b/src/css/widget/pathchooser/pathregion.css
index f03f4af61..749779632 100644
--- a/src/css/widget/pathchooser/pathregion.css
+++ b/src/css/widget/pathchooser/pathregion.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-path-region .path-region-label {
   z-index: 1;
 }
diff --git a/src/css/widget/previewtable/previewtable.cell.css b/src/css/widget/previewtable/previewtable.cell.css
index 1b02d1f7a..053899e31 100644
--- a/src/css/widget/previewtable/previewtable.cell.css
+++ b/src/css/widget/previewtable/previewtable.cell.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-preview-table-cell {
   min-height: 25px;
   min-width: 80px;
diff --git a/src/css/widget/previewtable/previewtable.css b/src/css/widget/previewtable/previewtable.css
index 558935f75..a829e78c0 100644
--- a/src/css/widget/previewtable/previewtable.css
+++ b/src/css/widget/previewtable/previewtable.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-preview-table {
   -webkit-user-select: initial;
   -khtml-user-select: initial;
diff --git a/src/css/widget/previewtable/previewtable.header.cell.css b/src/css/widget/previewtable/previewtable.header.cell.css
index 53f719b2b..04025668d 100644
--- a/src/css/widget/previewtable/previewtable.header.cell.css
+++ b/src/css/widget/previewtable/previewtable.header.cell.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-preview-table-header-cell {
   font-weight: bold;
   min-height: 25px;
diff --git a/src/css/widget/quarter/trigger.quarter.css b/src/css/widget/quarter/trigger.quarter.css
index 98ff5fc99..190dfff6d 100644
--- a/src/css/widget/quarter/trigger.quarter.css
+++ b/src/css/widget/quarter/trigger.quarter.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-quarter-trigger {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
diff --git a/src/css/widget/relationview/relationview.region.css b/src/css/widget/relationview/relationview.region.css
index 4fe1f498c..66700cd65 100644
--- a/src/css/widget/relationview/relationview.region.css
+++ b/src/css/widget/relationview/relationview.region.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-relation-view-region .relation-view-region-container {
   z-index: 1;
   -webkit-border-radius: 2px;
diff --git a/src/css/widget/sequencetable/dynamicnumber.sequencetable.css b/src/css/widget/sequencetable/dynamicnumber.sequencetable.css
index 8ae9b91c6..1a92f05fc 100644
--- a/src/css/widget/sequencetable/dynamicnumber.sequencetable.css
+++ b/src/css/widget/sequencetable/dynamicnumber.sequencetable.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-sequence-table-dynamic-number .sequence-table-title-cell {
   overflow: hidden;
   overflow-x: hidden;
diff --git a/src/css/widget/sequencetable/listnumber.sequencetable.css b/src/css/widget/sequencetable/listnumber.sequencetable.css
index 25775b835..83fb91ad1 100644
--- a/src/css/widget/sequencetable/listnumber.sequencetable.css
+++ b/src/css/widget/sequencetable/listnumber.sequencetable.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-sequence-table-list-number .sequence-table-title-cell {
   overflow: hidden;
   overflow-x: hidden;
diff --git a/src/css/widget/sequencetable/treenumber.sequencetable.css b/src/css/widget/sequencetable/treenumber.sequencetable.css
index 50563c81e..907c2bf06 100644
--- a/src/css/widget/sequencetable/treenumber.sequencetable.css
+++ b/src/css/widget/sequencetable/treenumber.sequencetable.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-sequence-table-tree-number .sequence-table-title-cell {
   overflow: hidden;
   overflow-x: hidden;
diff --git a/src/css/widget/year/popup.year.css b/src/css/widget/year/popup.year.css
index 62c054205..95705e709 100644
--- a/src/css/widget/year/popup.year.css
+++ b/src/css/widget/year/popup.year.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-year-popup .year-popup-navigation {
   line-height: 30px;
 }
diff --git a/src/css/widget/year/trigger.year.css b/src/css/widget/year/trigger.year.css
index 24fa560f2..07eb6b523 100644
--- a/src/css/widget/year/trigger.year.css
+++ b/src/css/widget/year/trigger.year.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-year-trigger {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
diff --git a/src/less/core/normal.less b/src/less/core/normal.less
index 6e49bb107..bc88f2b69 100644
--- a/src/less/core/normal.less
+++ b/src/less/core/normal.less
@@ -1,6 +1,6 @@
 @import "../bibase";
 
-html, body, div, ul, li, img, a, span, p, * {
+html, body, div, ul, ol, li, img, a, span, p, * {
   margin: 0;
   padding: 0;
 }
@@ -29,12 +29,6 @@ textarea {
   }
 }
 
-ul,
-ol {
-  margin: 0;
-  padding: 0;
-}
-
 ul {
   list-style: disc;
 }
diff --git a/src/less/lib/colors.less b/src/less/lib/colors.less
index 4e7cd0b9e..10b17f78c 100644
--- a/src/less/lib/colors.less
+++ b/src/less/lib/colors.less
@@ -2,7 +2,6 @@
 
 // 色彩库,从constant.less中获取相关颜色,不要出现#xxxxxx
 
-/****** common color(常用颜色,可用于普遍场景) *****/
 //默认字体颜色
 @color-bi-text-normal: @font-color-normal;
 //黑色字体颜色
@@ -88,7 +87,6 @@
 //黑色阴影
 @color-bi-shadow-normal: @shadow-color-black;
 
-/**** custom color(自定义颜色,用于特定场景) ****/
 //bubble、toast、tooltip通用
 @color-bi-tip-warning-background: @background-color-alert;
 

From de98f39286545828342328a13e4f8ffa14aa34a8 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Sat, 17 Jun 2017 17:14:16 +0800
Subject: [PATCH 04/15] add

---
 bi/base.css          | 86 --------------------------------------------
 bi/core.css          | 16 ---------
 bi/widget.css        | 66 ----------------------------------
 demo/css/face.css    |  2 --
 demo/css/index.css   |  2 --
 demo/css/main.css    |  2 --
 demo/css/north.css   |  2 --
 demo/css/preview.css |  2 --
 demo/css/west.css    |  2 --
 docs/base.css        | 86 --------------------------------------------
 docs/core.css        | 16 ---------
 docs/demo.css        | 12 -------
 docs/resource.css    | 10 ------
 docs/widget.css      | 66 ----------------------------------
 14 files changed, 370 deletions(-)

diff --git a/bi/base.css b/bi/base.css
index 18fca5193..cd42ace5a 100644
--- a/bi/base.css
+++ b/bi/base.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-color-chooser-trigger {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
@@ -8,16 +6,12 @@
   -webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset;
   -moz-box-shadow: 0px 0px 2px 1px #d4dadd inset;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-color-picker-button .color-picker-button-mask {
   border: 1px solid #1a1a1a;
 }
 .bi-theme-dark .bi-color-picker-button .color-picker-button-mask {
   border: 1px solid #ffffff;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-color-picker-editor .color-picker-editor-display {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
@@ -26,8 +20,6 @@
   -webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset;
   -moz-box-shadow: 0px 0px 2px 1px #d4dadd inset;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-bubble-combo .button-combo-triangle-wrapper {
   position: fixed !important;
 }
@@ -63,8 +55,6 @@
   border-right: 6px solid transparent;
   border-bottom: 6px solid #3f8ce8;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-bubble-popup-view {
   -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
   -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
@@ -72,13 +62,9 @@
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-adapt-editor .adapt-editor-text {
   font-size: 14px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 /*************BI.SearchEditor******************/
 .bi-search-editor .close-font {
   font-size: 20px;
@@ -86,8 +72,6 @@
 .bi-search-editor .search-font {
   font-size: 20px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 /*************BI.SearchEditor******************/
 .bi-small-search-editor .bi-editor {
   font-size: 12px;
@@ -104,13 +88,9 @@
 .bi-small-search-editor .search-font {
   font-size: 18px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-sign-initial-editor .sign-initial-editor-text {
   font-size: 14px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 /* BASICS */
 .CodeMirror {
   /* Set height, width, borders, and global font properties here */
@@ -582,8 +562,6 @@ li.CodeMirror-hint-active {
   background: #08f;
   color: white;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-message-title {
   font-size: 16px;
   cursor: pointer;
@@ -603,14 +581,10 @@ li.CodeMirror-hint-active {
 .bi-message-close {
   font-size: 25px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-list-view .bi-button-mask {
   opacity: 0.1;
   filter: alpha(opacity=10);
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-panel {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
@@ -620,23 +594,17 @@ li.CodeMirror-hint-active {
   cursor: text;
   font-size: 14px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-all-count-pager .all-pager-prev {
   font-size: 16px;
 }
 .bi-all-count-pager .all-pager-next {
   font-size: 16px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-pager .page-item {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-direction-pager .direction-pager-prev {
   font-size: 16px;
 }
@@ -645,8 +613,6 @@ li.CodeMirror-hint-active {
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-segment > .center-element {
   overflow: hidden;
   overflow-x: hidden;
@@ -681,8 +647,6 @@ li.CodeMirror-hint-active {
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-button {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
@@ -836,8 +800,6 @@ li.CodeMirror-hint-active {
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-single-select-icon-text-item:active .b-font:before,
 .bi-single-select-icon-text-item.active .b-font:before {
   color: #3f8ce8;
@@ -848,26 +810,18 @@ li.CodeMirror-hint-active {
 /**** custom color(自定义颜色,用于特定场景) ****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-editor {
   font-size: 12px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multifile-editor .multifile-editor {
   text-align: right;
   cursor: pointer;
   font-size: 100px;
   z-index: 2;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-shelter-editor .shelter-editor-text {
   font-size: 12px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-sign-editor .sign-editor-text {
   font-size: 12px;
 }
@@ -875,8 +829,6 @@ li.CodeMirror-hint-active {
 /**** custom color(自定义颜色,用于特定场景) ****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-textarea-editor {
   overflow: hidden;
   overflow-x: hidden;
@@ -888,15 +840,11 @@ li.CodeMirror-hint-active {
 .bi-textarea-editor .textarea-editor-content {
   border: none;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-file {
   opacity: 0;
   filter: alpha(opacity=0);
   z-index: 2;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-input {
   border: none;
   outline: none;
@@ -915,8 +863,6 @@ li.CodeMirror-hint-active {
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-text {
   text-overflow: ellipsis;
   overflow-x: hidden;
@@ -924,8 +870,6 @@ li.CodeMirror-hint-active {
   white-space: nowrap;
   word-break: break-word;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-bubble {
   font-size: 14px;
 }
@@ -936,13 +880,9 @@ li.CodeMirror-hint-active {
   background: #fddddd;
   color: #e85050;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-tip {
   position: fixed !important;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-toast {
   font-size: 14px;
   -webkit-border-radius: 2px;
@@ -957,8 +897,6 @@ li.CodeMirror-hint-active {
   background: #fddddd;
   color: #e85050;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-tooltip {
   max-width: 250px;
   -webkit-border-radius: 2px;
@@ -976,8 +914,6 @@ li.CodeMirror-hint-active {
   color: #e85050;
   border: 1px solid #f4cbcb;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-collection-table-cell {
   -webkit-box-sizing: border-box;
   /*Safari3.2+*/
@@ -1000,15 +936,11 @@ li.CodeMirror-hint-active {
 .bi-theme-dark .bi-collection-table-cell.first-col {
   border-left: 1px solid #525466;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-quick-collection-table > div > .bi-collection {
   overflow: hidden !important;
   overflow-x: hidden !important;
   overflow-y: hidden !important;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-table > .first-col {
   border-left: none;
 }
@@ -1087,8 +1019,6 @@ li.CodeMirror-hint-active {
   border-top: 1px solid #525466;
   border-left: 1px solid #525466;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-grid-table-cell {
   -webkit-box-sizing: border-box;
   /*Safari3.2+*/
@@ -1111,8 +1041,6 @@ li.CodeMirror-hint-active {
 .bi-theme-dark .bi-grid-table-cell.first-col {
   border-left: 1px solid #525466;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .scrollbar-layout-main {
   box-sizing: border-box;
   outline: none;
@@ -1226,8 +1154,6 @@ li.CodeMirror-hint-active {
   bottom: 0;
   position: absolute;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-resizable-table-cell .resizable-table-cell-resizer-container {
   cursor: ew-resize;
   z-index: 1;
@@ -1239,8 +1165,6 @@ li.CodeMirror-hint-active {
 .bi-resizable-table-cell .resizable-table-cell-resizer-container.suitable .resizable-table-cell-resizer-knob {
   background-color: #58cc7d;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-resizable-table .resizable-table-resizer {
   cursor: ew-resize;
   z-index: 1;
@@ -1259,13 +1183,9 @@ li.CodeMirror-hint-active {
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-branch-tree .bi-branch-tree-view {
   min-width: 300px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-trigger .bi-trigger-icon-button {
   font-size: 16px;
 }
@@ -1273,15 +1193,11 @@ li.CodeMirror-hint-active {
 /**** custom color(自定义颜色,用于特定场景) ****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-select-text-trigger {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-small-select-text-trigger {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
@@ -1289,8 +1205,6 @@ li.CodeMirror-hint-active {
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 /**********BI.BIListView*************/
 .bi-popup-view {
   position: fixed !important;
diff --git a/bi/core.css b/bi/core.css
index 74a771271..c4a24a3ec 100644
--- a/bi/core.css
+++ b/bi/core.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 html,
 body,
 div,
@@ -2946,8 +2944,6 @@ i {
   -webkit-animation-name: slideOutUp;
   animation-name: slideOutUp;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .base-disabled {
   cursor: default !important;
   color: #cccccc !important;
@@ -3499,8 +3495,6 @@ i {
   cursor: move;
 }
 /*****************cursor*****************/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .y-overflow-auto {
   overflow-y: auto;
   overflow-x: hidden;
@@ -3539,8 +3533,6 @@ i {
   overflow-y: hidden;
   white-space: nowrap;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .display-block {
   display: block;
 }
@@ -3562,8 +3554,6 @@ i {
 .horizon-left {
   text-align: left;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 /*类似ie6的盒子模型 可以在有百分比的时候加border 支持到ie8*/
 .border-sizing {
   -webkit-box-sizing: border-box;
@@ -3891,8 +3881,6 @@ i {
   min-height: 100%;
   float: left;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-inline-center-adapt-layout:after {
   display: inline-block;
   width: 0;
@@ -3900,8 +3888,6 @@ i {
   vertical-align: middle;
   content: ' ';
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-inline-vertical-adapt-layout:after {
   display: inline-block;
   width: 0;
@@ -3909,8 +3895,6 @@ i {
   vertical-align: middle;
   content: ' ';
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-theme-dark {
   background-color: #191b2b;
   color: #cccccc;
diff --git a/bi/widget.css b/bi/widget.css
index 8d4a04925..d07adc5bf 100644
--- a/bi/widget.css
+++ b/bi/widget.css
@@ -1,7 +1,5 @@
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-arrangement .arrangement-helper {
   background: #3f8ce8;
   z-index: 1000000000;
@@ -38,8 +36,6 @@
   z-index: 1000000001;
   background: #3f8ce8;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-arrangement-droppable {
   z-index: 100000;
 }
@@ -111,8 +107,6 @@
 /*************BI.SearchEditor******************/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-date-trigger {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
@@ -120,23 +114,17 @@
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-down-list-popup .bi-down-list-item .list-item-text {
   max-width: 203px;
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-excel-table > div.bottom-right > div > div > table {
   border-right: 1px solid #d4dadd;
 }
 .bi-theme-dark .bi-excel-table > div.bottom-right > div > div > table {
   border-right: 1px solid #525466;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-excel-table-header-cell {
   font-weight: bold;
 }
@@ -146,8 +134,6 @@
 /**** custom color(自定义颜色,用于特定场景) ****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-file-manager-nav-button .file-manager-nav-button-text {
   max-width: 200px;
 }
@@ -164,15 +150,11 @@
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-fine-tuning-number-editor {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-interactive-arrangement .interactive-arrangement-dragtag-line {
   z-index: 1000000000;
   background-color: #f07d0a;
@@ -184,75 +166,53 @@
 /**** custom color(自定义颜色,用于特定场景) ****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-month-trigger {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-select-check-pane .multi-select-check-selected {
   text-decoration: underline;
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-select-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-select-trigger {
   -webkit-border-radius: 2px 2px 2px 2px;
   -moz-border-radius: 2px 2px 2px 2px;
   border-radius: 2px 2px 2px 2px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-select-search-pane .multi-select-toolbar {
   color: #e85050;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-select-check-selected-button {
   z-index: 1;
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-tree-check-pane .multi-tree-check-selected {
   color: #3f8ce8;
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-tree-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-tree-popup .popup-view-tree {
   min-height: 170px;
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-tree-check-selected-button .trigger-check-selected {
   color: #3f8ce8;
   z-index: 1;
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-numerical-interval .numerical-interval-small-editor {
   -moz-border-radius-topleft: 2px;
   -webkit-border-top-left-radius: 2px;
@@ -296,8 +256,6 @@
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-page-table-cell {
   -webkit-user-select: initial;
   -khtml-user-select: initial;
@@ -308,25 +266,17 @@
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-path-chooser .path-chooser-radio {
   z-index: 1;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-path-region .path-region-label {
   z-index: 1;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-preview-table-cell {
   min-height: 25px;
   min-width: 80px;
   max-width: 220px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-preview-table {
   -webkit-user-select: initial;
   -khtml-user-select: initial;
@@ -343,8 +293,6 @@
 .bi-theme-dark .bi-preview-table > div > div > div > table > thead > tr.odd {
   background-color: #191b2b;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-preview-table-header-cell {
   font-weight: bold;
   min-height: 25px;
@@ -355,8 +303,6 @@
 /**** custom color(自定义颜色,用于特定场景) ****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-quarter-trigger {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
@@ -364,8 +310,6 @@
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-relation-view-region .relation-view-region-container {
   z-index: 1;
   -webkit-border-radius: 2px;
@@ -375,8 +319,6 @@
 .bi-relation-view-region .relation-view-region-container.other-package {
   border-style: dashed;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-sequence-table-dynamic-number .sequence-table-title-cell {
   overflow: hidden;
   overflow-x: hidden;
@@ -400,8 +342,6 @@
   box-sizing: border-box;
   /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-sequence-table-list-number .sequence-table-title-cell {
   overflow: hidden;
   overflow-x: hidden;
@@ -427,8 +367,6 @@
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-sequence-table-tree-number .sequence-table-title-cell {
   overflow: hidden;
   overflow-x: hidden;
@@ -456,8 +394,6 @@
 /**** custom color(自定义颜色,用于特定场景) ****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-year-popup .year-popup-navigation {
   line-height: 30px;
 }
@@ -473,8 +409,6 @@
 .bi-theme-dark .bi-year-popup .year-popup-navigation > .first-element {
   border-left: none;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-year-trigger {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
diff --git a/demo/css/face.css b/demo/css/face.css
index 2007b962c..09ada2c77 100644
--- a/demo/css/face.css
+++ b/demo/css/face.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .demo-face .face-config .config-label {
   font-size: 14px;
 }
diff --git a/demo/css/index.css b/demo/css/index.css
index 6dfa999cc..e69de29bb 100644
--- a/demo/css/index.css
+++ b/demo/css/index.css
@@ -1,2 +0,0 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
diff --git a/demo/css/main.css b/demo/css/main.css
index 72ec6f198..ab550ecc8 100644
--- a/demo/css/main.css
+++ b/demo/css/main.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .layout-bg-white {
   background-color: #ffffff;
 }
diff --git a/demo/css/north.css b/demo/css/north.css
index cb5930374..613cc6c30 100644
--- a/demo/css/north.css
+++ b/demo/css/north.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .demo-north {
   background-color: #3c8dbc;
 }
diff --git a/demo/css/preview.css b/demo/css/preview.css
index 6dfa999cc..e69de29bb 100644
--- a/demo/css/preview.css
+++ b/demo/css/preview.css
@@ -1,2 +0,0 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
diff --git a/demo/css/west.css b/demo/css/west.css
index 6dfa999cc..e69de29bb 100644
--- a/demo/css/west.css
+++ b/demo/css/west.css
@@ -1,2 +0,0 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
diff --git a/docs/base.css b/docs/base.css
index 18fca5193..cd42ace5a 100644
--- a/docs/base.css
+++ b/docs/base.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-color-chooser-trigger {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
@@ -8,16 +6,12 @@
   -webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset;
   -moz-box-shadow: 0px 0px 2px 1px #d4dadd inset;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-color-picker-button .color-picker-button-mask {
   border: 1px solid #1a1a1a;
 }
 .bi-theme-dark .bi-color-picker-button .color-picker-button-mask {
   border: 1px solid #ffffff;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-color-picker-editor .color-picker-editor-display {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
@@ -26,8 +20,6 @@
   -webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset;
   -moz-box-shadow: 0px 0px 2px 1px #d4dadd inset;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-bubble-combo .button-combo-triangle-wrapper {
   position: fixed !important;
 }
@@ -63,8 +55,6 @@
   border-right: 6px solid transparent;
   border-bottom: 6px solid #3f8ce8;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-bubble-popup-view {
   -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
   -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
@@ -72,13 +62,9 @@
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-adapt-editor .adapt-editor-text {
   font-size: 14px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 /*************BI.SearchEditor******************/
 .bi-search-editor .close-font {
   font-size: 20px;
@@ -86,8 +72,6 @@
 .bi-search-editor .search-font {
   font-size: 20px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 /*************BI.SearchEditor******************/
 .bi-small-search-editor .bi-editor {
   font-size: 12px;
@@ -104,13 +88,9 @@
 .bi-small-search-editor .search-font {
   font-size: 18px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-sign-initial-editor .sign-initial-editor-text {
   font-size: 14px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 /* BASICS */
 .CodeMirror {
   /* Set height, width, borders, and global font properties here */
@@ -582,8 +562,6 @@ li.CodeMirror-hint-active {
   background: #08f;
   color: white;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-message-title {
   font-size: 16px;
   cursor: pointer;
@@ -603,14 +581,10 @@ li.CodeMirror-hint-active {
 .bi-message-close {
   font-size: 25px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-list-view .bi-button-mask {
   opacity: 0.1;
   filter: alpha(opacity=10);
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-panel {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
@@ -620,23 +594,17 @@ li.CodeMirror-hint-active {
   cursor: text;
   font-size: 14px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-all-count-pager .all-pager-prev {
   font-size: 16px;
 }
 .bi-all-count-pager .all-pager-next {
   font-size: 16px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-pager .page-item {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-direction-pager .direction-pager-prev {
   font-size: 16px;
 }
@@ -645,8 +613,6 @@ li.CodeMirror-hint-active {
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-segment > .center-element {
   overflow: hidden;
   overflow-x: hidden;
@@ -681,8 +647,6 @@ li.CodeMirror-hint-active {
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-button {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
@@ -836,8 +800,6 @@ li.CodeMirror-hint-active {
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-single-select-icon-text-item:active .b-font:before,
 .bi-single-select-icon-text-item.active .b-font:before {
   color: #3f8ce8;
@@ -848,26 +810,18 @@ li.CodeMirror-hint-active {
 /**** custom color(自定义颜色,用于特定场景) ****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-editor {
   font-size: 12px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multifile-editor .multifile-editor {
   text-align: right;
   cursor: pointer;
   font-size: 100px;
   z-index: 2;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-shelter-editor .shelter-editor-text {
   font-size: 12px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-sign-editor .sign-editor-text {
   font-size: 12px;
 }
@@ -875,8 +829,6 @@ li.CodeMirror-hint-active {
 /**** custom color(自定义颜色,用于特定场景) ****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-textarea-editor {
   overflow: hidden;
   overflow-x: hidden;
@@ -888,15 +840,11 @@ li.CodeMirror-hint-active {
 .bi-textarea-editor .textarea-editor-content {
   border: none;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-file {
   opacity: 0;
   filter: alpha(opacity=0);
   z-index: 2;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-input {
   border: none;
   outline: none;
@@ -915,8 +863,6 @@ li.CodeMirror-hint-active {
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-text {
   text-overflow: ellipsis;
   overflow-x: hidden;
@@ -924,8 +870,6 @@ li.CodeMirror-hint-active {
   white-space: nowrap;
   word-break: break-word;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-bubble {
   font-size: 14px;
 }
@@ -936,13 +880,9 @@ li.CodeMirror-hint-active {
   background: #fddddd;
   color: #e85050;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-tip {
   position: fixed !important;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-toast {
   font-size: 14px;
   -webkit-border-radius: 2px;
@@ -957,8 +897,6 @@ li.CodeMirror-hint-active {
   background: #fddddd;
   color: #e85050;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-tooltip {
   max-width: 250px;
   -webkit-border-radius: 2px;
@@ -976,8 +914,6 @@ li.CodeMirror-hint-active {
   color: #e85050;
   border: 1px solid #f4cbcb;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-collection-table-cell {
   -webkit-box-sizing: border-box;
   /*Safari3.2+*/
@@ -1000,15 +936,11 @@ li.CodeMirror-hint-active {
 .bi-theme-dark .bi-collection-table-cell.first-col {
   border-left: 1px solid #525466;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-quick-collection-table > div > .bi-collection {
   overflow: hidden !important;
   overflow-x: hidden !important;
   overflow-y: hidden !important;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-table > .first-col {
   border-left: none;
 }
@@ -1087,8 +1019,6 @@ li.CodeMirror-hint-active {
   border-top: 1px solid #525466;
   border-left: 1px solid #525466;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-grid-table-cell {
   -webkit-box-sizing: border-box;
   /*Safari3.2+*/
@@ -1111,8 +1041,6 @@ li.CodeMirror-hint-active {
 .bi-theme-dark .bi-grid-table-cell.first-col {
   border-left: 1px solid #525466;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .scrollbar-layout-main {
   box-sizing: border-box;
   outline: none;
@@ -1226,8 +1154,6 @@ li.CodeMirror-hint-active {
   bottom: 0;
   position: absolute;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-resizable-table-cell .resizable-table-cell-resizer-container {
   cursor: ew-resize;
   z-index: 1;
@@ -1239,8 +1165,6 @@ li.CodeMirror-hint-active {
 .bi-resizable-table-cell .resizable-table-cell-resizer-container.suitable .resizable-table-cell-resizer-knob {
   background-color: #58cc7d;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-resizable-table .resizable-table-resizer {
   cursor: ew-resize;
   z-index: 1;
@@ -1259,13 +1183,9 @@ li.CodeMirror-hint-active {
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-branch-tree .bi-branch-tree-view {
   min-width: 300px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-trigger .bi-trigger-icon-button {
   font-size: 16px;
 }
@@ -1273,15 +1193,11 @@ li.CodeMirror-hint-active {
 /**** custom color(自定义颜色,用于特定场景) ****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-select-text-trigger {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-small-select-text-trigger {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
@@ -1289,8 +1205,6 @@ li.CodeMirror-hint-active {
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 /**********BI.BIListView*************/
 .bi-popup-view {
   position: fixed !important;
diff --git a/docs/core.css b/docs/core.css
index 74a771271..c4a24a3ec 100644
--- a/docs/core.css
+++ b/docs/core.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 html,
 body,
 div,
@@ -2946,8 +2944,6 @@ i {
   -webkit-animation-name: slideOutUp;
   animation-name: slideOutUp;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .base-disabled {
   cursor: default !important;
   color: #cccccc !important;
@@ -3499,8 +3495,6 @@ i {
   cursor: move;
 }
 /*****************cursor*****************/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .y-overflow-auto {
   overflow-y: auto;
   overflow-x: hidden;
@@ -3539,8 +3533,6 @@ i {
   overflow-y: hidden;
   white-space: nowrap;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .display-block {
   display: block;
 }
@@ -3562,8 +3554,6 @@ i {
 .horizon-left {
   text-align: left;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 /*类似ie6的盒子模型 可以在有百分比的时候加border 支持到ie8*/
 .border-sizing {
   -webkit-box-sizing: border-box;
@@ -3891,8 +3881,6 @@ i {
   min-height: 100%;
   float: left;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-inline-center-adapt-layout:after {
   display: inline-block;
   width: 0;
@@ -3900,8 +3888,6 @@ i {
   vertical-align: middle;
   content: ' ';
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-inline-vertical-adapt-layout:after {
   display: inline-block;
   width: 0;
@@ -3909,8 +3895,6 @@ i {
   vertical-align: middle;
   content: ' ';
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-theme-dark {
   background-color: #191b2b;
   color: #cccccc;
diff --git a/docs/demo.css b/docs/demo.css
index d822c0d6c..9b3f8c0bc 100644
--- a/docs/demo.css
+++ b/docs/demo.css
@@ -1,12 +1,6 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .demo-face .face-config .config-label {
   font-size: 14px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .layout-bg-white {
   background-color: #ffffff;
 }
@@ -54,8 +48,6 @@ body {
 .bi-theme-dark body {
   background-color: #191B2B;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .demo-north {
   background-color: #3c8dbc;
 }
@@ -66,7 +58,3 @@ body {
   font-size: 20px;
   font-weight: 300;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
diff --git a/docs/resource.css b/docs/resource.css
index a0cfd2751..394cd8231 100644
--- a/docs/resource.css
+++ b/docs/resource.css
@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 html,
 button,
 input,
@@ -124,8 +122,6 @@ textarea::-webkit-scrollbar-thumb:hover {
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/loading.gif');
   _background: none;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 @font-face {
   font-family: 'bi';
   src: url('font/iconfont.eot'), /* 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');
@@ -1245,8 +1241,6 @@ textarea::-webkit-scrollbar-thumb:hover {
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .farbtastic {
   position: relative;
 }
@@ -1281,8 +1275,6 @@ textarea::-webkit-scrollbar-thumb:hover {
   overflow: hidden;
   background: url("third/farbtastic/marker.png") no-repeat;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-display-tree .ztree * {
   color: #999999;
 }
@@ -1318,8 +1310,6 @@ email:		hunter.z@263.net
 website:	http://code.google.com/p/jquerytree/
 
 -------------------------------------*/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .ztree * {
   padding: 0;
   margin: 0;
diff --git a/docs/widget.css b/docs/widget.css
index 8d4a04925..d07adc5bf 100644
--- a/docs/widget.css
+++ b/docs/widget.css
@@ -1,7 +1,5 @@
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-arrangement .arrangement-helper {
   background: #3f8ce8;
   z-index: 1000000000;
@@ -38,8 +36,6 @@
   z-index: 1000000001;
   background: #3f8ce8;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-arrangement-droppable {
   z-index: 100000;
 }
@@ -111,8 +107,6 @@
 /*************BI.SearchEditor******************/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-date-trigger {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
@@ -120,23 +114,17 @@
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-down-list-popup .bi-down-list-item .list-item-text {
   max-width: 203px;
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-excel-table > div.bottom-right > div > div > table {
   border-right: 1px solid #d4dadd;
 }
 .bi-theme-dark .bi-excel-table > div.bottom-right > div > div > table {
   border-right: 1px solid #525466;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-excel-table-header-cell {
   font-weight: bold;
 }
@@ -146,8 +134,6 @@
 /**** custom color(自定义颜色,用于特定场景) ****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-file-manager-nav-button .file-manager-nav-button-text {
   max-width: 200px;
 }
@@ -164,15 +150,11 @@
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-fine-tuning-number-editor {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-interactive-arrangement .interactive-arrangement-dragtag-line {
   z-index: 1000000000;
   background-color: #f07d0a;
@@ -184,75 +166,53 @@
 /**** custom color(自定义颜色,用于特定场景) ****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-month-trigger {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-select-check-pane .multi-select-check-selected {
   text-decoration: underline;
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-select-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-select-trigger {
   -webkit-border-radius: 2px 2px 2px 2px;
   -moz-border-radius: 2px 2px 2px 2px;
   border-radius: 2px 2px 2px 2px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-select-search-pane .multi-select-toolbar {
   color: #e85050;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-select-check-selected-button {
   z-index: 1;
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-tree-check-pane .multi-tree-check-selected {
   color: #3f8ce8;
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-tree-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-tree-popup .popup-view-tree {
   min-height: 170px;
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-multi-tree-check-selected-button .trigger-check-selected {
   color: #3f8ce8;
   z-index: 1;
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-numerical-interval .numerical-interval-small-editor {
   -moz-border-radius-topleft: 2px;
   -webkit-border-top-left-radius: 2px;
@@ -296,8 +256,6 @@
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-page-table-cell {
   -webkit-user-select: initial;
   -khtml-user-select: initial;
@@ -308,25 +266,17 @@
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-path-chooser .path-chooser-radio {
   z-index: 1;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-path-region .path-region-label {
   z-index: 1;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-preview-table-cell {
   min-height: 25px;
   min-width: 80px;
   max-width: 220px;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-preview-table {
   -webkit-user-select: initial;
   -khtml-user-select: initial;
@@ -343,8 +293,6 @@
 .bi-theme-dark .bi-preview-table > div > div > div > table > thead > tr.odd {
   background-color: #191b2b;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-preview-table-header-cell {
   font-weight: bold;
   min-height: 25px;
@@ -355,8 +303,6 @@
 /**** custom color(自定义颜色,用于特定场景) ****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-quarter-trigger {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
@@ -364,8 +310,6 @@
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-relation-view-region .relation-view-region-container {
   z-index: 1;
   -webkit-border-radius: 2px;
@@ -375,8 +319,6 @@
 .bi-relation-view-region .relation-view-region-container.other-package {
   border-style: dashed;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-sequence-table-dynamic-number .sequence-table-title-cell {
   overflow: hidden;
   overflow-x: hidden;
@@ -400,8 +342,6 @@
   box-sizing: border-box;
   /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-sequence-table-list-number .sequence-table-title-cell {
   overflow: hidden;
   overflow-x: hidden;
@@ -427,8 +367,6 @@
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-sequence-table-tree-number .sequence-table-title-cell {
   overflow: hidden;
   overflow-x: hidden;
@@ -456,8 +394,6 @@
 /**** custom color(自定义颜色,用于特定场景) ****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-year-popup .year-popup-navigation {
   line-height: 30px;
 }
@@ -473,8 +409,6 @@
 .bi-theme-dark .bi-year-popup .year-popup-navigation > .first-element {
   border-left: none;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-year-trigger {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;

From 93ed7c7f7a69aca78036576f4e293d45bec7a8f4 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Mon, 19 Jun 2017 10:15:03 +0800
Subject: [PATCH 05/15] add

---
 bi/core.js      | 2 +-
 docs/core.js    | 2 +-
 src/core/var.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bi/core.js b/bi/core.js
index 74a546c95..9fcc4dc17 100644
--- a/bi/core.js
+++ b/bi/core.js
@@ -4168,7 +4168,7 @@ _.extend(BI, {
         Horizontal: "horizontal"
     },
     Selection: {
-        Default: -999,
+        Default: -2,
         None: -1,
         Single: 0,
         Multi: 1,
diff --git a/docs/core.js b/docs/core.js
index 43424df7d..3c57cc67c 100644
--- a/docs/core.js
+++ b/docs/core.js
@@ -24992,7 +24992,7 @@ _.extend(BI, {
         Horizontal: "horizontal"
     },
     Selection: {
-        Default: -999,
+        Default: -2,
         None: -1,
         Single: 0,
         Multi: 1,
diff --git a/src/core/var.js b/src/core/var.js
index e2f9947dd..b7a33f69a 100644
--- a/src/core/var.js
+++ b/src/core/var.js
@@ -62,7 +62,7 @@ _.extend(BI, {
         Horizontal: "horizontal"
     },
     Selection: {
-        Default: -999,
+        Default: -2,
         None: -1,
         Single: 0,
         Multi: 1,

From f7167bf7dae9e265d87285b0168e603511025a2a Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Mon, 19 Jun 2017 15:35:12 +0800
Subject: [PATCH 06/15] add

---
 bi/widget.js                                               | 7 ++++---
 docs/widget.js                                             | 7 ++++---
 .../treevaluechooser/abstract.treevaluechooser.js          | 7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/bi/widget.js b/bi/widget.js
index 65d1aa25a..2d540f509 100644
--- a/bi/widget.js
+++ b/bi/widget.js
@@ -17421,7 +17421,7 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree
         function expandSelectedValue(selectedValues, parents, notSelectedValue) {
             var next = selectedValues;
             //去掉点击的节点之后的结果集
-            BI.each(parents, function (i, v) {
+            BI.some(parents, function (i, v) {
                 var t = next[v];
                 if (t == null) {
                     if (BI.isEmpty(next)) {
@@ -17435,8 +17435,9 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree
                         });
                         next = next[v];
                     } else {
-                        next = {};
-                        next[v] = {};
+                        return true;
+                        // next = {};
+                        // next[v] = {};
                     }
                 } else {
                     next = t;
diff --git a/docs/widget.js b/docs/widget.js
index 65d1aa25a..2d540f509 100644
--- a/docs/widget.js
+++ b/docs/widget.js
@@ -17421,7 +17421,7 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree
         function expandSelectedValue(selectedValues, parents, notSelectedValue) {
             var next = selectedValues;
             //去掉点击的节点之后的结果集
-            BI.each(parents, function (i, v) {
+            BI.some(parents, function (i, v) {
                 var t = next[v];
                 if (t == null) {
                     if (BI.isEmpty(next)) {
@@ -17435,8 +17435,9 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree
                         });
                         next = next[v];
                     } else {
-                        next = {};
-                        next[v] = {};
+                        return true;
+                        // next = {};
+                        // next[v] = {};
                     }
                 } else {
                     next = t;
diff --git a/src/component/treevaluechooser/abstract.treevaluechooser.js b/src/component/treevaluechooser/abstract.treevaluechooser.js
index b600f60d6..4da592491 100644
--- a/src/component/treevaluechooser/abstract.treevaluechooser.js
+++ b/src/component/treevaluechooser/abstract.treevaluechooser.js
@@ -182,7 +182,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
         function expandSelectedValue(selectedValues, parents, notSelectedValue) {
             var next = selectedValues;
             //去掉点击的节点之后的结果集
-            BI.each(parents, function (i, v) {
+            BI.some(parents, function (i, v) {
                 var t = next[v];
                 if (t == null) {
                     if (BI.isEmpty(next)) {
@@ -196,8 +196,9 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
                         });
                         next = next[v];
                     } else {
-                        next = {};
-                        next[v] = {};
+                        return true;
+                        // next = {};
+                        // next[v] = {};
                     }
                 } else {
                     next = t;

From 49c485dc5d12584154637d466ddefd2d9adc7c80 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Tue, 20 Jun 2017 10:11:36 +0800
Subject: [PATCH 07/15] =?UTF-8?q?codeeditor=E5=8A=A0=E4=B8=AAfocus?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base/single/editor/editor.code.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/base/single/editor/editor.code.js b/src/base/single/editor/editor.code.js
index 2852399c0..997d57252 100644
--- a/src/base/single/editor/editor.code.js
+++ b/src/base/single/editor/editor.code.js
@@ -141,6 +141,10 @@ BI.CodeEditor = BI.inherit(BI.Single, {
     focus: function () {
         this.editor.focus();
     },
+    
+    blur: function () {
+        this.editor.getInputField().blur();
+    },
 
     setStyle: function (style) {
         this.style = style;

From 0a3c403486012771bcbf8712a5b796fdba73ce9a Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Tue, 20 Jun 2017 12:01:54 +0800
Subject: [PATCH 08/15] add

---
 bi/widget.js                                                | 3 +++
 docs/widget.js                                              | 3 +++
 src/component/treevaluechooser/abstract.treevaluechooser.js | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/bi/widget.js b/bi/widget.js
index 2d540f509..0b676040e 100644
--- a/bi/widget.js
+++ b/bi/widget.js
@@ -17424,6 +17424,9 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree
             BI.some(parents, function (i, v) {
                 var t = next[v];
                 if (t == null) {
+                    if (i === 0) {
+                        return true;
+                    }
                     if (BI.isEmpty(next)) {
                         var split = parents.slice(0, i);
                         var expanded = self._getChildren(split);
diff --git a/docs/widget.js b/docs/widget.js
index 2d540f509..0b676040e 100644
--- a/docs/widget.js
+++ b/docs/widget.js
@@ -17424,6 +17424,9 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree
             BI.some(parents, function (i, v) {
                 var t = next[v];
                 if (t == null) {
+                    if (i === 0) {
+                        return true;
+                    }
                     if (BI.isEmpty(next)) {
                         var split = parents.slice(0, i);
                         var expanded = self._getChildren(split);
diff --git a/src/component/treevaluechooser/abstract.treevaluechooser.js b/src/component/treevaluechooser/abstract.treevaluechooser.js
index 4da592491..d20a7c850 100644
--- a/src/component/treevaluechooser/abstract.treevaluechooser.js
+++ b/src/component/treevaluechooser/abstract.treevaluechooser.js
@@ -185,6 +185,9 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
             BI.some(parents, function (i, v) {
                 var t = next[v];
                 if (t == null) {
+                    if (i === 0) {
+                        return true;
+                    }
                     if (BI.isEmpty(next)) {
                         var split = parents.slice(0, i);
                         var expanded = self._getChildren(split);

From b9b3e8b4e8b228ecd21d54edd3e1321558fc379a Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Tue, 20 Jun 2017 20:21:11 +0800
Subject: [PATCH 09/15] add

---
 bi/case.js                        | 5 +++--
 docs/case.js                      | 5 +++--
 src/case/pager/pager.all.count.js | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/bi/case.js b/bi/case.js
index feda5e08b..ca4eca571 100644
--- a/bi/case.js
+++ b/bi/case.js
@@ -9222,9 +9222,10 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
             vgap: 0,
             value: o.curr,
             errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
-            width: 30,
+            width: 35,
             height: 20
         });
+
         this.pager = BI.createWidget({
             type: "bi.pager",
             width: 36,
@@ -9310,7 +9311,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
         BI.createWidget({
             type: "bi.center_adapt",
             element: this,
-            columnSize: ["", 30, 40, 36],
+            columnSize: ["", 35, 40, 36],
             items: [count, this.editor, this.allPages, this.pager]
         })
     },
diff --git a/docs/case.js b/docs/case.js
index feda5e08b..ca4eca571 100644
--- a/docs/case.js
+++ b/docs/case.js
@@ -9222,9 +9222,10 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
             vgap: 0,
             value: o.curr,
             errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
-            width: 30,
+            width: 35,
             height: 20
         });
+
         this.pager = BI.createWidget({
             type: "bi.pager",
             width: 36,
@@ -9310,7 +9311,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
         BI.createWidget({
             type: "bi.center_adapt",
             element: this,
-            columnSize: ["", 30, 40, 36],
+            columnSize: ["", 35, 40, 36],
             items: [count, this.editor, this.allPages, this.pager]
         })
     },
diff --git a/src/case/pager/pager.all.count.js b/src/case/pager/pager.all.count.js
index 5a029ca75..3edf00dfb 100644
--- a/src/case/pager/pager.all.count.js
+++ b/src/case/pager/pager.all.count.js
@@ -26,9 +26,10 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
             vgap: 0,
             value: o.curr,
             errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
-            width: 30,
+            width: 35,
             height: 20
         });
+
         this.pager = BI.createWidget({
             type: "bi.pager",
             width: 36,
@@ -114,7 +115,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
         BI.createWidget({
             type: "bi.center_adapt",
             element: this,
-            columnSize: ["", 30, 40, 36],
+            columnSize: ["", 35, 40, 36],
             items: [count, this.editor, this.allPages, this.pager]
         })
     },

From 7abc92d61e1886fae3dceafa3d420d11f88d7790 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Tue, 20 Jun 2017 20:21:46 +0800
Subject: [PATCH 10/15] add

---
 bi/base.js   | 4 ++++
 docs/base.js | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/bi/base.js b/bi/base.js
index 54edcd7ed..a97de0bb8 100644
--- a/bi/base.js
+++ b/bi/base.js
@@ -17844,6 +17844,10 @@ BI.CodeEditor = BI.inherit(BI.Single, {
     focus: function () {
         this.editor.focus();
     },
+    
+    blur: function () {
+        this.editor.getInputField().blur();
+    },
 
     setStyle: function (style) {
         this.style = style;
diff --git a/docs/base.js b/docs/base.js
index 54edcd7ed..a97de0bb8 100644
--- a/docs/base.js
+++ b/docs/base.js
@@ -17844,6 +17844,10 @@ BI.CodeEditor = BI.inherit(BI.Single, {
     focus: function () {
         this.editor.focus();
     },
+    
+    blur: function () {
+        this.editor.getInputField().blur();
+    },
 
     setStyle: function (style) {
         this.style = style;

From bd6333f30d81c59c254946d1652fa5a34977871f Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Wed, 21 Jun 2017 14:21:47 +0800
Subject: [PATCH 11/15] codemirror line-height

---
 bi/base.css                           | 2 +-
 docs/base.css                         | 2 +-
 src/css/base/formula/codemirror.css   | 2 +-
 src/less/base/formula/codemirror.less | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bi/base.css b/bi/base.css
index cd42ace5a..369a7c7f3 100644
--- a/bi/base.css
+++ b/bi/base.css
@@ -424,7 +424,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
   margin: 0;
   white-space: pre;
   word-wrap: normal;
-  line-height: 2em;
+  line-height: inherit;
   color: inherit;
   z-index: 2;
   position: relative;
diff --git a/docs/base.css b/docs/base.css
index cd42ace5a..369a7c7f3 100644
--- a/docs/base.css
+++ b/docs/base.css
@@ -424,7 +424,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
   margin: 0;
   white-space: pre;
   word-wrap: normal;
-  line-height: 2em;
+  line-height: inherit;
   color: inherit;
   z-index: 2;
   position: relative;
diff --git a/src/css/base/formula/codemirror.css b/src/css/base/formula/codemirror.css
index 337579273..16c4dff52 100644
--- a/src/css/base/formula/codemirror.css
+++ b/src/css/base/formula/codemirror.css
@@ -331,7 +331,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
   margin: 0;
   white-space: pre;
   word-wrap: normal;
-  line-height: 2em;
+  line-height: inherit;
   color: inherit;
   z-index: 2;
   position: relative;
diff --git a/src/less/base/formula/codemirror.less b/src/less/base/formula/codemirror.less
index 5daabc070..551883a9a 100644
--- a/src/less/base/formula/codemirror.less
+++ b/src/less/base/formula/codemirror.less
@@ -409,7 +409,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
   margin: 0;
   white-space: pre;
   word-wrap: normal;
-  line-height: 2em;
+  line-height: inherit;
   color: inherit;
   z-index: 2;
   position: relative;

From 798e17f9c313c559a987bbe569fe147e074de748 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Wed, 21 Jun 2017 15:36:35 +0800
Subject: [PATCH 12/15] =?UTF-8?q?=E7=94=A8=E5=88=B0codemirrior=E7=9A=84edi?=
 =?UTF-8?q?tor=E5=8F=AF=E9=85=8D=E7=BD=AE=E8=A1=8C=E9=AB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bi/base.css                           |  7 ++++++-
 bi/base.js                            |  8 ++++++--
 docs/base.css                         |  7 ++++++-
 docs/base.js                          |  8 ++++++--
 src/base/formula/formulaeditor.js     |  4 +++-
 src/base/single/editor/editor.code.js |  4 +++-
 src/css/base/formula/codemirror.css   |  7 ++++++-
 src/less/base/formula/codemirror.less | 10 +++++++++-
 8 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/bi/base.css b/bi/base.css
index 369a7c7f3..e30476362 100644
--- a/bi/base.css
+++ b/bi/base.css
@@ -424,13 +424,18 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
   margin: 0;
   white-space: pre;
   word-wrap: normal;
-  line-height: inherit;
   color: inherit;
   z-index: 2;
   position: relative;
   overflow: visible;
   -webkit-tap-highlight-color: transparent;
 }
+.codemirror-high-line-height {
+  line-height: 2;
+}
+.codemirror-low-line-height {
+  line-height: 1.4;
+}
 .CodeMirror-wrap pre {
   word-wrap: break-word;
   white-space: pre-wrap;
diff --git a/bi/base.js b/bi/base.js
index a97de0bb8..c64eebd0b 100644
--- a/bi/base.js
+++ b/bi/base.js
@@ -14260,7 +14260,8 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
             watermark: '',
             value: '',
             fieldTextValueMap: {},
-            showHint: true
+            showHint: true,
+            lineHeight: 2
         });
     },
     _init: function () {
@@ -14272,6 +14273,7 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
             lineNumbers: false,
             mode: 'formula'
         });
+        o.lineHeight === 1 ? this.element.addClass("codemirror-low-line-height") : this.element.addClass("codemirror-high-line-height");
         this.editor.on("change", function (cm, change) {
             self._checkWaterMark();
             if (o.showHint) {
@@ -17712,7 +17714,8 @@ BI.CodeEditor = BI.inherit(BI.Single, {
         return $.extend(BI.CodeEditor.superclass._defaultConfig.apply(), {
             baseCls: 'bi-code-editor bi-card',
             value: '',
-            watermark: ""
+            watermark: "",
+            lineHeight: 2
         });
     },
     _init: function () {
@@ -17723,6 +17726,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
             lineWrapping: true,
             lineNumbers: false
         });
+        o.lineHeight === 1 ? this.element.addClass("codemirror-low-line-height") : this.element.addClass("codemirror-high-line-height");
         this.editor.on("change", function (cm, change) {
             BI.nextTick(function () {
                 self.fireEvent(BI.CodeEditor.EVENT_CHANGE)
diff --git a/docs/base.css b/docs/base.css
index 369a7c7f3..e30476362 100644
--- a/docs/base.css
+++ b/docs/base.css
@@ -424,13 +424,18 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
   margin: 0;
   white-space: pre;
   word-wrap: normal;
-  line-height: inherit;
   color: inherit;
   z-index: 2;
   position: relative;
   overflow: visible;
   -webkit-tap-highlight-color: transparent;
 }
+.codemirror-high-line-height {
+  line-height: 2;
+}
+.codemirror-low-line-height {
+  line-height: 1.4;
+}
 .CodeMirror-wrap pre {
   word-wrap: break-word;
   white-space: pre-wrap;
diff --git a/docs/base.js b/docs/base.js
index a97de0bb8..c64eebd0b 100644
--- a/docs/base.js
+++ b/docs/base.js
@@ -14260,7 +14260,8 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
             watermark: '',
             value: '',
             fieldTextValueMap: {},
-            showHint: true
+            showHint: true,
+            lineHeight: 2
         });
     },
     _init: function () {
@@ -14272,6 +14273,7 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
             lineNumbers: false,
             mode: 'formula'
         });
+        o.lineHeight === 1 ? this.element.addClass("codemirror-low-line-height") : this.element.addClass("codemirror-high-line-height");
         this.editor.on("change", function (cm, change) {
             self._checkWaterMark();
             if (o.showHint) {
@@ -17712,7 +17714,8 @@ BI.CodeEditor = BI.inherit(BI.Single, {
         return $.extend(BI.CodeEditor.superclass._defaultConfig.apply(), {
             baseCls: 'bi-code-editor bi-card',
             value: '',
-            watermark: ""
+            watermark: "",
+            lineHeight: 2
         });
     },
     _init: function () {
@@ -17723,6 +17726,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
             lineWrapping: true,
             lineNumbers: false
         });
+        o.lineHeight === 1 ? this.element.addClass("codemirror-low-line-height") : this.element.addClass("codemirror-high-line-height");
         this.editor.on("change", function (cm, change) {
             BI.nextTick(function () {
                 self.fireEvent(BI.CodeEditor.EVENT_CHANGE)
diff --git a/src/base/formula/formulaeditor.js b/src/base/formula/formulaeditor.js
index 9d721e420..74da71433 100644
--- a/src/base/formula/formulaeditor.js
+++ b/src/base/formula/formulaeditor.js
@@ -10,7 +10,8 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
             watermark: '',
             value: '',
             fieldTextValueMap: {},
-            showHint: true
+            showHint: true,
+            lineHeight: 2
         });
     },
     _init: function () {
@@ -22,6 +23,7 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
             lineNumbers: false,
             mode: 'formula'
         });
+        o.lineHeight === 1 ? this.element.addClass("codemirror-low-line-height") : this.element.addClass("codemirror-high-line-height");
         this.editor.on("change", function (cm, change) {
             self._checkWaterMark();
             if (o.showHint) {
diff --git a/src/base/single/editor/editor.code.js b/src/base/single/editor/editor.code.js
index 997d57252..f97564f62 100644
--- a/src/base/single/editor/editor.code.js
+++ b/src/base/single/editor/editor.code.js
@@ -9,7 +9,8 @@ BI.CodeEditor = BI.inherit(BI.Single, {
         return $.extend(BI.CodeEditor.superclass._defaultConfig.apply(), {
             baseCls: 'bi-code-editor bi-card',
             value: '',
-            watermark: ""
+            watermark: "",
+            lineHeight: 2
         });
     },
     _init: function () {
@@ -20,6 +21,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
             lineWrapping: true,
             lineNumbers: false
         });
+        o.lineHeight === 1 ? this.element.addClass("codemirror-low-line-height") : this.element.addClass("codemirror-high-line-height");
         this.editor.on("change", function (cm, change) {
             BI.nextTick(function () {
                 self.fireEvent(BI.CodeEditor.EVENT_CHANGE)
diff --git a/src/css/base/formula/codemirror.css b/src/css/base/formula/codemirror.css
index 16c4dff52..c6d2a97d5 100644
--- a/src/css/base/formula/codemirror.css
+++ b/src/css/base/formula/codemirror.css
@@ -331,13 +331,18 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
   margin: 0;
   white-space: pre;
   word-wrap: normal;
-  line-height: inherit;
   color: inherit;
   z-index: 2;
   position: relative;
   overflow: visible;
   -webkit-tap-highlight-color: transparent;
 }
+.codemirror-high-line-height {
+  line-height: 2;
+}
+.codemirror-low-line-height {
+  line-height: 1.4;
+}
 .CodeMirror-wrap pre {
   word-wrap: break-word;
   white-space: pre-wrap;
diff --git a/src/less/base/formula/codemirror.less b/src/less/base/formula/codemirror.less
index 551883a9a..a7d8476f6 100644
--- a/src/less/base/formula/codemirror.less
+++ b/src/less/base/formula/codemirror.less
@@ -409,7 +409,6 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
   margin: 0;
   white-space: pre;
   word-wrap: normal;
-  line-height: inherit;
   color: inherit;
   z-index: 2;
   position: relative;
@@ -417,6 +416,15 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
   -webkit-tap-highlight-color: transparent;
 }
 
+.codemirror-high-line-height {
+  line-height: 2;
+}
+
+.codemirror-low-line-height {
+  line-height: 1.4;
+}
+
+
 .CodeMirror-wrap pre {
   word-wrap: break-word;
   white-space: pre-wrap;

From 97fe12f17dba904ef2d5c7ff25cbec9812c166ff Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Wed, 21 Jun 2017 16:00:49 +0800
Subject: [PATCH 13/15] =?UTF-8?q?=E6=A0=91=E6=8E=A7=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bi/widget.js                                  | 25 +++++++++++++++----
 docs/widget.js                                | 25 +++++++++++++++----
 .../abstract.treevaluechooser.js              | 25 +++++++++++++++----
 3 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/bi/widget.js b/bi/widget.js
index 0b676040e..9a0b7488b 100644
--- a/bi/widget.js
+++ b/bi/widget.js
@@ -17420,6 +17420,8 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree
 
         function expandSelectedValue(selectedValues, parents, notSelectedValue) {
             var next = selectedValues;
+            var childrenCount = [];
+            var path = [];
             //去掉点击的节点之后的结果集
             BI.some(parents, function (i, v) {
                 var t = next[v];
@@ -17430,12 +17432,25 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree
                     if (BI.isEmpty(next)) {
                         var split = parents.slice(0, i);
                         var expanded = self._getChildren(split);
-                        BI.each(expanded, function (m, child) {
-                            if (i === parents.length - 1 && child.value === notSelectedValue) {
-                                return true;
+                        path.push(split);
+                        childrenCount.push(expanded.length);
+                        //如果只有一个值且取消的就是这个值
+                        if (i === parents.length - 1 && expanded.length === 1 && expanded[0] === notSelectedValue) {
+                            for (var j = childrenCount.length - 1; j >= 0; j--) {
+                                if (childrenCount[j] === 1) {
+                                    self._deleteNode(selectedValues, path[j]);
+                                } else {
+                                    break;
+                                }
                             }
-                            next[child.value] = {};
-                        });
+                        } else {
+                            BI.each(expanded, function (m, child) {
+                                if (i === parents.length - 1 && child.value === notSelectedValue) {
+                                    return true;
+                                }
+                                next[child.value] = {};
+                            });
+                        }
                         next = next[v];
                     } else {
                         return true;
diff --git a/docs/widget.js b/docs/widget.js
index 0b676040e..9a0b7488b 100644
--- a/docs/widget.js
+++ b/docs/widget.js
@@ -17420,6 +17420,8 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree
 
         function expandSelectedValue(selectedValues, parents, notSelectedValue) {
             var next = selectedValues;
+            var childrenCount = [];
+            var path = [];
             //去掉点击的节点之后的结果集
             BI.some(parents, function (i, v) {
                 var t = next[v];
@@ -17430,12 +17432,25 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree
                     if (BI.isEmpty(next)) {
                         var split = parents.slice(0, i);
                         var expanded = self._getChildren(split);
-                        BI.each(expanded, function (m, child) {
-                            if (i === parents.length - 1 && child.value === notSelectedValue) {
-                                return true;
+                        path.push(split);
+                        childrenCount.push(expanded.length);
+                        //如果只有一个值且取消的就是这个值
+                        if (i === parents.length - 1 && expanded.length === 1 && expanded[0] === notSelectedValue) {
+                            for (var j = childrenCount.length - 1; j >= 0; j--) {
+                                if (childrenCount[j] === 1) {
+                                    self._deleteNode(selectedValues, path[j]);
+                                } else {
+                                    break;
+                                }
                             }
-                            next[child.value] = {};
-                        });
+                        } else {
+                            BI.each(expanded, function (m, child) {
+                                if (i === parents.length - 1 && child.value === notSelectedValue) {
+                                    return true;
+                                }
+                                next[child.value] = {};
+                            });
+                        }
                         next = next[v];
                     } else {
                         return true;
diff --git a/src/component/treevaluechooser/abstract.treevaluechooser.js b/src/component/treevaluechooser/abstract.treevaluechooser.js
index d20a7c850..1d929f65e 100644
--- a/src/component/treevaluechooser/abstract.treevaluechooser.js
+++ b/src/component/treevaluechooser/abstract.treevaluechooser.js
@@ -181,6 +181,8 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
 
         function expandSelectedValue(selectedValues, parents, notSelectedValue) {
             var next = selectedValues;
+            var childrenCount = [];
+            var path = [];
             //去掉点击的节点之后的结果集
             BI.some(parents, function (i, v) {
                 var t = next[v];
@@ -191,12 +193,25 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
                     if (BI.isEmpty(next)) {
                         var split = parents.slice(0, i);
                         var expanded = self._getChildren(split);
-                        BI.each(expanded, function (m, child) {
-                            if (i === parents.length - 1 && child.value === notSelectedValue) {
-                                return true;
+                        path.push(split);
+                        childrenCount.push(expanded.length);
+                        //如果只有一个值且取消的就是这个值
+                        if (i === parents.length - 1 && expanded.length === 1 && expanded[0] === notSelectedValue) {
+                            for (var j = childrenCount.length - 1; j >= 0; j--) {
+                                if (childrenCount[j] === 1) {
+                                    self._deleteNode(selectedValues, path[j]);
+                                } else {
+                                    break;
+                                }
                             }
-                            next[child.value] = {};
-                        });
+                        } else {
+                            BI.each(expanded, function (m, child) {
+                                if (i === parents.length - 1 && child.value === notSelectedValue) {
+                                    return true;
+                                }
+                                next[child.value] = {};
+                            });
+                        }
                         next = next[v];
                     } else {
                         return true;

From 19579f2ce83dc444c9aa6b798b815c65ea189489 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Wed, 21 Jun 2017 19:43:22 +0800
Subject: [PATCH 14/15] =?UTF-8?q?=E6=A0=91=E6=8E=A7=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bi/widget.js                             | 20 ++++++++++----------
 docs/widget.js                           | 20 ++++++++++----------
 src/widget/multitree/multi.tree.combo.js | 20 ++++++++++----------
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/bi/widget.js b/bi/widget.js
index 9a0b7488b..d6c5fca72 100644
--- a/bi/widget.js
+++ b/bi/widget.js
@@ -11826,18 +11826,18 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
             if (isSearching()) {
                 self.trigger.stopEditing();
                 self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
-                return;
-            }
-            if (isPopupView()) {
-                self.trigger.stopEditing();
-                self.storeValue = {value: self.combo.getValue()};
-                if (clear === true) {
-                    self.storeValue = {value: {}};
-                    clear = false;
-                    change = false;
+            }else{
+                if (isPopupView()) {
+                    self.trigger.stopEditing();
+                    self.storeValue = {value: self.combo.getValue()};
+                    if (clear === true) {
+                        self.storeValue = {value: {}};
+                    }
+                    self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
                 }
-                self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
             }
+            clear = false;
+            change = false;
         });
 
         var triggerBtn = BI.createWidget({
diff --git a/docs/widget.js b/docs/widget.js
index 9a0b7488b..d6c5fca72 100644
--- a/docs/widget.js
+++ b/docs/widget.js
@@ -11826,18 +11826,18 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
             if (isSearching()) {
                 self.trigger.stopEditing();
                 self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
-                return;
-            }
-            if (isPopupView()) {
-                self.trigger.stopEditing();
-                self.storeValue = {value: self.combo.getValue()};
-                if (clear === true) {
-                    self.storeValue = {value: {}};
-                    clear = false;
-                    change = false;
+            }else{
+                if (isPopupView()) {
+                    self.trigger.stopEditing();
+                    self.storeValue = {value: self.combo.getValue()};
+                    if (clear === true) {
+                        self.storeValue = {value: {}};
+                    }
+                    self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
                 }
-                self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
             }
+            clear = false;
+            change = false;
         });
 
         var triggerBtn = BI.createWidget({
diff --git a/src/widget/multitree/multi.tree.combo.js b/src/widget/multitree/multi.tree.combo.js
index fb5234f4c..37d31c82d 100644
--- a/src/widget/multitree/multi.tree.combo.js
+++ b/src/widget/multitree/multi.tree.combo.js
@@ -188,18 +188,18 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
             if (isSearching()) {
                 self.trigger.stopEditing();
                 self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
-                return;
-            }
-            if (isPopupView()) {
-                self.trigger.stopEditing();
-                self.storeValue = {value: self.combo.getValue()};
-                if (clear === true) {
-                    self.storeValue = {value: {}};
-                    clear = false;
-                    change = false;
+            }else{
+                if (isPopupView()) {
+                    self.trigger.stopEditing();
+                    self.storeValue = {value: self.combo.getValue()};
+                    if (clear === true) {
+                        self.storeValue = {value: {}};
+                    }
+                    self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
                 }
-                self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
             }
+            clear = false;
+            change = false;
         });
 
         var triggerBtn = BI.createWidget({

From 7daa9b11024b91840d876b8119aa6f8c19e6aec8 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Wed, 21 Jun 2017 21:09:20 +0800
Subject: [PATCH 15/15] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bi/base.js                                    |   2 +-
 bi/widget.js                                  |  12 +-
 .../demo.multilayerselecttree.leveltree.js    | 215 +++++++++++++++++
 demo/js/config/component.js                   |   4 +
 docs/base.js                                  |   2 +-
 docs/demo.js                                  | 220 +++++++++++++++++-
 docs/widget.js                                |  12 +-
 src/base/single/button/button.basic.js        |   2 +-
 src/widget/multiselect/multiselect.combo.js   |   5 +-
 .../search/multiselect.search.loader.js       |   3 +-
 src/widget/multiselectlist/multiselectlist.js |   4 +-
 11 files changed, 462 insertions(+), 19 deletions(-)
 create mode 100644 demo/js/component/demo.multilayerselecttree.leveltree.js

diff --git a/bi/base.js b/bi/base.js
index c64eebd0b..16c2d1714 100644
--- a/bi/base.js
+++ b/bi/base.js
@@ -857,7 +857,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
     setSelected: function (b) {
         var o = this.options;
         o.selected = b;
-        if (this.isSelected()) {
+        if (b) {
             this.handle().element.addClass("active");
         } else {
             this.handle().element.removeClass("active");
diff --git a/bi/widget.js b/bi/widget.js
index 9a0b7488b..fd9277951 100644
--- a/bi/widget.js
+++ b/bi/widget.js
@@ -9585,7 +9585,8 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
             itemsCreator: function (op, callback) {
                 o.itemsCreator(op, function (res) {
                     if (op.times === 1 && BI.isNotNull(op.keywords)) {
-                        self.trigger.setValue(self.getValue());
+                        //预防trigger内部把当前的storeValue改掉
+                        self.trigger.setValue(BI.deepClone(self.getValue()));
                     }
                     callback.apply(self, arguments);
                 });
@@ -9638,7 +9639,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                     assertShowValue();
                 });
             } else {
-                self._join(this.getValue(), function () {//安徽省 北京
+                self._join(this.getValue(), function () {
                     assertShowValue();
                 });
             }
@@ -10431,7 +10432,8 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, {
     },
 
     setValue: function (v) {
-        this.storeValue = v;
+        //暂存的值一定是新的值，不然v改掉后，storeValue也跟着改了
+        this.storeValue = BI.deepClone(v);
         this.button_group.setValue(v);
     },
 
@@ -10982,7 +10984,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
 
         var assertShowValue = function () {
             BI.isKey(self._startValue) && self.storeValue.value[self.storeValue.type === BI.Selection.All ? "remove" : "pushDistinct"](self._startValue);
-            self.trigger.setValue(self.storeValue);
+            // self.trigger.setValue(self.storeValue);
         };
 
         this.adapter = BI.createWidget({
@@ -11034,7 +11036,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
                 action: function () {
                     self._showSearcherPane();
                     self._setStartValue("");
-                    this.setValue(self.storeValue);
+                    this.setValue(BI.deepClone(self.storeValue));
                 }
             }, {
                 eventName: BI.Searcher.EVENT_STOP,
diff --git a/demo/js/component/demo.multilayerselecttree.leveltree.js b/demo/js/component/demo.multilayerselecttree.leveltree.js
new file mode 100644
index 000000000..c1a17ad95
--- /dev/null
+++ b/demo/js/component/demo.multilayerselecttree.leveltree.js
@@ -0,0 +1,215 @@
+/**
+ * guy
+ * 二级树
+ * @class BI.PlatformLevelTree
+ * @extends BI.Select
+ */
+BI.PlatformLevelTree = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "platform-level-tree",
+        itemsCreator: BI.emptyFn
+    },
+
+    render: function () {
+        var self = this, o = this.options;
+        this.tree = BI.createWidget({
+            type: "bi.custom_tree",
+            element: this,
+            expander: {
+                type: "bi.select_tree_expander",
+                isDefaultInit: false,
+                el: {},
+                popup: {
+                    type: "bi.custom_tree"
+                }
+            },
+
+            itemsCreator: function (op, callback) {
+                o.itemsCreator(op, function (items) {
+                    callback(self._formatItems(items))
+                })
+            },
+
+            el: {
+                type: "bi.loader",
+                next: false,
+                el: {
+                    type: "bi.button_tree",
+                    chooseType: 0,
+                    layouts: [{
+                        type: "bi.vertical"
+                    }]
+                }
+            }
+        });
+        this.tree.on(BI.CustomTree.EVENT_CHANGE, function () {
+            self.fireEvent(BI.PlatformLevelTree.EVENT_CHANGE, arguments);
+        })
+    },
+
+    _formatItems: function (nodes) {
+        var self = this;
+        BI.each(nodes, function (i, node) {
+            var extend = {};
+            if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
+                switch (i) {
+                    case 0 :
+                        extend.type = "bi.multilayer_select_tree_first_plus_group_node";
+                        break;
+                    case nodes.length - 1 :
+                        extend.type = "bi.multilayer_select_tree_last_plus_group_node";
+                        break;
+                    default :
+                        extend.type = "bi.multilayer_select_tree_mid_plus_group_node";
+                        break;
+                }
+                BI.defaults(node, extend);
+            } else {
+                switch (i) {
+                    case nodes.length - 1:
+                        extend.type = "bi.multilayer_single_tree_last_tree_leaf_item";
+                        break;
+                    default :
+                        extend.type = "bi.multilayer_single_tree_mid_tree_leaf_item";
+                }
+                BI.defaults(node, extend);
+            }
+        });
+        return nodes;
+    },
+
+    populate: function () {
+        this.tree.populate();
+    },
+
+    getValue: function () {
+        return this.tree.getValue();
+    }
+});
+BI.PlatformLevelTree.EVENT_CHANGE = "EVENT_CHANGE";
+BI.shortcut("bi.platform_level_tree", BI.PlatformLevelTree);
+
+
+BI.DemoLevelTree = BI.inherit(BI.Widget, {
+
+    render: function () {
+        var self = this;
+        return {
+            type: "bi.vtape",
+            items: [{
+                el: {
+                    type: "bi.platform_level_tree",
+                    ref: function () {
+                        self.tree = this;
+                    },
+                    itemsCreator: function (op, callback) {
+                        if (!op.node) {//根节点
+                            callback([{
+                                "id": 1,
+                                "pId": 0,
+                                text: "A",
+                                value: 1,
+                                isParent: true
+                            }, {
+                                "id": 2,
+                                "pId": 0,
+                                "text": "B",
+                                value: 2,
+                                isParent: true,
+                                open: true,
+                            }])
+                        } else {
+                            if (op.node.id == 1) {
+                                callback([
+                                    {
+                                        "id": 11,
+                                        "pId": 1,
+                                        "text": "test11",
+                                        value: 11,
+                                        layer: 1,
+                                        isParent: true
+                                    },
+                                    {
+                                        "id": 12,
+                                        "pId": 1,
+                                        "text": "test12",
+                                        value: 12,
+                                        layer: 1,
+                                    },
+                                    {
+                                        "id": 13,
+                                        "pId": 1,
+                                        "text": "test13",
+                                        value: 13,
+                                        layer: 1,
+                                    },
+                                    {
+                                        "id": 14,
+                                        "pId": 1,
+                                        "text": "test14",
+                                        value: 14,
+                                        layer: 1,
+                                        height: 35
+                                    },
+                                    {
+                                        "id": 15,
+                                        "pId": 1,
+                                        "text": "test15",
+                                        value: 15,
+                                        layer: 1,
+                                    },
+                                    {
+                                        "id": 16,
+                                        "pId": 1,
+                                        "text": "test16",
+                                        value: 16,
+                                        layer: 1,
+                                    },
+                                    {"id": 17, "pId": 1, "text": "test17", layer: 1, value: 17}
+                                ])
+                            } else if (op.node.id == 2) {
+                                callback([{
+                                    "id": 21,
+                                    "pId": 2,
+                                    "text": "test21",
+                                    value: 21,
+                                    layer: 1,
+                                },
+                                    {
+                                        "id": 22,
+                                        "pId": 2,
+                                        "text": "test22",
+                                        value: 22,
+                                        layer: 1,
+                                    }])
+                            } else if (op.node.id == 11) {
+                                callback([{
+                                    "id": 111,
+                                    "pId": 11,
+                                    "text": "test111",
+                                    value: 111,
+                                    layer: 2,
+                                }])
+                            }
+                        }
+                    }
+                }
+            }, {
+                el: {
+                    type: "bi.button",
+                    text: "确定",
+                    handler: function () {
+                        BI.Msg.toast(JSON.stringify(self.tree.getValue()));
+                    }
+                },
+                height: 25
+            }]
+
+        }
+    },
+
+    mounted: function () {
+
+    }
+});
+BI.shortcut("demo.platform_level_tree", BI.DemoLevelTree);
\ No newline at end of file
diff --git a/demo/js/config/component.js b/demo/js/config/component.js
index 1815ca70a..755a60f95 100644
--- a/demo/js/config/component.js
+++ b/demo/js/config/component.js
@@ -20,4 +20,8 @@ Demo.COMPONENT_CONFIG = [{
     pId: 5,
     text: "bi.tree_value_chooser_pane",
     value: "demo.tree_value_chooser_pane"
+}, {
+    pId: 5,
+    text: "平台用",
+    value: "demo.platform_level_tree"
 }];
\ No newline at end of file
diff --git a/docs/base.js b/docs/base.js
index c64eebd0b..16c2d1714 100644
--- a/docs/base.js
+++ b/docs/base.js
@@ -857,7 +857,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
     setSelected: function (b) {
         var o = this.options;
         o.selected = b;
-        if (this.isSelected()) {
+        if (b) {
             this.handle().element.addClass("active");
         } else {
             this.handle().element.removeClass("active");
diff --git a/docs/demo.js b/docs/demo.js
index 2f11c0973..abe7c4799 100644
--- a/docs/demo.js
+++ b/docs/demo.js
@@ -2618,7 +2618,221 @@ BI.shortcut("demo.center", Demo.Center);Demo.Func = BI.inherit(BI.Widget, {
     }
 });
 BI.shortcut("demo.axis_chart", Demo.Func);
-Demo.TreeValueChooser = BI.inherit(BI.Widget, {
+/**
+ * guy
+ * 二级树
+ * @class BI.PlatformLevelTree
+ * @extends BI.Select
+ */
+BI.PlatformLevelTree = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "platform-level-tree",
+        itemsCreator: BI.emptyFn
+    },
+
+    render: function () {
+        var self = this, o = this.options;
+        this.tree = BI.createWidget({
+            type: "bi.custom_tree",
+            element: this,
+            expander: {
+                type: "bi.select_tree_expander",
+                isDefaultInit: false,
+                el: {},
+                popup: {
+                    type: "bi.custom_tree"
+                }
+            },
+
+            itemsCreator: function (op, callback) {
+                o.itemsCreator(op, function (items) {
+                    callback(self._formatItems(items))
+                })
+            },
+
+            el: {
+                type: "bi.loader",
+                next: false,
+                el: {
+                    type: "bi.button_tree",
+                    chooseType: 0,
+                    layouts: [{
+                        type: "bi.vertical"
+                    }]
+                }
+            }
+        });
+        this.tree.on(BI.CustomTree.EVENT_CHANGE, function () {
+            self.fireEvent(BI.PlatformLevelTree.EVENT_CHANGE, arguments);
+        })
+    },
+
+    _formatItems: function (nodes) {
+        var self = this;
+        BI.each(nodes, function (i, node) {
+            var extend = {};
+            if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
+                switch (i) {
+                    case 0 :
+                        extend.type = "bi.multilayer_select_tree_first_plus_group_node";
+                        break;
+                    case nodes.length - 1 :
+                        extend.type = "bi.multilayer_select_tree_last_plus_group_node";
+                        break;
+                    default :
+                        extend.type = "bi.multilayer_select_tree_mid_plus_group_node";
+                        break;
+                }
+                BI.defaults(node, extend);
+            } else {
+                switch (i) {
+                    case nodes.length - 1:
+                        extend.type = "bi.multilayer_single_tree_last_tree_leaf_item";
+                        break;
+                    default :
+                        extend.type = "bi.multilayer_single_tree_mid_tree_leaf_item";
+                }
+                BI.defaults(node, extend);
+            }
+        });
+        return nodes;
+    },
+
+    populate: function () {
+        this.tree.populate();
+    },
+
+    getValue: function () {
+        return this.tree.getValue();
+    }
+});
+BI.PlatformLevelTree.EVENT_CHANGE = "EVENT_CHANGE";
+BI.shortcut("bi.platform_level_tree", BI.PlatformLevelTree);
+
+
+BI.DemoLevelTree = BI.inherit(BI.Widget, {
+
+    render: function () {
+        var self = this;
+        return {
+            type: "bi.vtape",
+            items: [{
+                el: {
+                    type: "bi.platform_level_tree",
+                    ref: function () {
+                        self.tree = this;
+                    },
+                    itemsCreator: function (op, callback) {
+                        if (!op.node) {//根节点
+                            callback([{
+                                "id": 1,
+                                "pId": 0,
+                                text: "A",
+                                value: 1,
+                                isParent: true
+                            }, {
+                                "id": 2,
+                                "pId": 0,
+                                "text": "B",
+                                value: 2,
+                                isParent: true,
+                                open: true,
+                            }])
+                        } else {
+                            if (op.node.id == 1) {
+                                callback([
+                                    {
+                                        "id": 11,
+                                        "pId": 1,
+                                        "text": "test11",
+                                        value: 11,
+                                        layer: 1,
+                                        isParent: true
+                                    },
+                                    {
+                                        "id": 12,
+                                        "pId": 1,
+                                        "text": "test12",
+                                        value: 12,
+                                        layer: 1,
+                                    },
+                                    {
+                                        "id": 13,
+                                        "pId": 1,
+                                        "text": "test13",
+                                        value: 13,
+                                        layer: 1,
+                                    },
+                                    {
+                                        "id": 14,
+                                        "pId": 1,
+                                        "text": "test14",
+                                        value: 14,
+                                        layer: 1,
+                                        height: 35
+                                    },
+                                    {
+                                        "id": 15,
+                                        "pId": 1,
+                                        "text": "test15",
+                                        value: 15,
+                                        layer: 1,
+                                    },
+                                    {
+                                        "id": 16,
+                                        "pId": 1,
+                                        "text": "test16",
+                                        value: 16,
+                                        layer: 1,
+                                    },
+                                    {"id": 17, "pId": 1, "text": "test17", layer: 1, value: 17}
+                                ])
+                            } else if (op.node.id == 2) {
+                                callback([{
+                                    "id": 21,
+                                    "pId": 2,
+                                    "text": "test21",
+                                    value: 21,
+                                    layer: 1,
+                                },
+                                    {
+                                        "id": 22,
+                                        "pId": 2,
+                                        "text": "test22",
+                                        value: 22,
+                                        layer: 1,
+                                    }])
+                            } else if (op.node.id == 11) {
+                                callback([{
+                                    "id": 111,
+                                    "pId": 11,
+                                    "text": "test111",
+                                    value: 111,
+                                    layer: 2,
+                                }])
+                            }
+                        }
+                    }
+                }
+            }, {
+                el: {
+                    type: "bi.button",
+                    text: "确定",
+                    handler: function () {
+                        BI.Msg.toast(JSON.stringify(self.tree.getValue()));
+                    }
+                },
+                height: 25
+            }]
+
+        }
+    },
+
+    mounted: function () {
+
+    }
+});
+BI.shortcut("demo.platform_level_tree", BI.DemoLevelTree);Demo.TreeValueChooser = BI.inherit(BI.Widget, {
     props: {
         baseCls: "demo-tree-value-chooser-combo"
     },
@@ -2931,6 +3145,10 @@ Demo.COMPONENT_CONFIG = [{
     pId: 5,
     text: "bi.tree_value_chooser_pane",
     value: "demo.tree_value_chooser_pane"
+}, {
+    pId: 5,
+    text: "平台用",
+    value: "demo.platform_level_tree"
 }];Demo.CORE_CONFIG = [{
     id: 1,
     text: "核心控件",
diff --git a/docs/widget.js b/docs/widget.js
index 9a0b7488b..fd9277951 100644
--- a/docs/widget.js
+++ b/docs/widget.js
@@ -9585,7 +9585,8 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
             itemsCreator: function (op, callback) {
                 o.itemsCreator(op, function (res) {
                     if (op.times === 1 && BI.isNotNull(op.keywords)) {
-                        self.trigger.setValue(self.getValue());
+                        //预防trigger内部把当前的storeValue改掉
+                        self.trigger.setValue(BI.deepClone(self.getValue()));
                     }
                     callback.apply(self, arguments);
                 });
@@ -9638,7 +9639,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                     assertShowValue();
                 });
             } else {
-                self._join(this.getValue(), function () {//安徽省 北京
+                self._join(this.getValue(), function () {
                     assertShowValue();
                 });
             }
@@ -10431,7 +10432,8 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, {
     },
 
     setValue: function (v) {
-        this.storeValue = v;
+        //暂存的值一定是新的值，不然v改掉后，storeValue也跟着改了
+        this.storeValue = BI.deepClone(v);
         this.button_group.setValue(v);
     },
 
@@ -10982,7 +10984,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
 
         var assertShowValue = function () {
             BI.isKey(self._startValue) && self.storeValue.value[self.storeValue.type === BI.Selection.All ? "remove" : "pushDistinct"](self._startValue);
-            self.trigger.setValue(self.storeValue);
+            // self.trigger.setValue(self.storeValue);
         };
 
         this.adapter = BI.createWidget({
@@ -11034,7 +11036,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
                 action: function () {
                     self._showSearcherPane();
                     self._setStartValue("");
-                    this.setValue(self.storeValue);
+                    this.setValue(BI.deepClone(self.storeValue));
                 }
             }, {
                 eventName: BI.Searcher.EVENT_STOP,
diff --git a/src/base/single/button/button.basic.js b/src/base/single/button/button.basic.js
index db0e4b3ab..919325d51 100644
--- a/src/base/single/button/button.basic.js
+++ b/src/base/single/button/button.basic.js
@@ -274,7 +274,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
     setSelected: function (b) {
         var o = this.options;
         o.selected = b;
-        if (this.isSelected()) {
+        if (b) {
             this.handle().element.addClass("active");
         } else {
             this.handle().element.removeClass("active");
diff --git a/src/widget/multiselect/multiselect.combo.js b/src/widget/multiselect/multiselect.combo.js
index d5d1e1f41..b4096e75d 100644
--- a/src/widget/multiselect/multiselect.combo.js
+++ b/src/widget/multiselect/multiselect.combo.js
@@ -41,7 +41,8 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
             itemsCreator: function (op, callback) {
                 o.itemsCreator(op, function (res) {
                     if (op.times === 1 && BI.isNotNull(op.keywords)) {
-                        self.trigger.setValue(self.getValue());
+                        //预防trigger内部把当前的storeValue改掉
+                        self.trigger.setValue(BI.deepClone(self.getValue()));
                     }
                     callback.apply(self, arguments);
                 });
@@ -94,7 +95,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                     assertShowValue();
                 });
             } else {
-                self._join(this.getValue(), function () {//安徽省 北京
+                self._join(this.getValue(), function () {
                     assertShowValue();
                 });
             }
diff --git a/src/widget/multiselect/search/multiselect.search.loader.js b/src/widget/multiselect/search/multiselect.search.loader.js
index 20c74c61a..bdb10bef2 100644
--- a/src/widget/multiselect/search/multiselect.search.loader.js
+++ b/src/widget/multiselect/search/multiselect.search.loader.js
@@ -119,7 +119,8 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, {
     },
 
     setValue: function (v) {
-        this.storeValue = v;
+        //暂存的值一定是新的值，不然v改掉后，storeValue也跟着改了
+        this.storeValue = BI.deepClone(v);
         this.button_group.setValue(v);
     },
 
diff --git a/src/widget/multiselectlist/multiselectlist.js b/src/widget/multiselectlist/multiselectlist.js
index 72e80b550..f51654e76 100644
--- a/src/widget/multiselectlist/multiselectlist.js
+++ b/src/widget/multiselectlist/multiselectlist.js
@@ -17,7 +17,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
 
         var assertShowValue = function () {
             BI.isKey(self._startValue) && self.storeValue.value[self.storeValue.type === BI.Selection.All ? "remove" : "pushDistinct"](self._startValue);
-            self.trigger.setValue(self.storeValue);
+            // self.trigger.setValue(self.storeValue);
         };
 
         this.adapter = BI.createWidget({
@@ -69,7 +69,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
                 action: function () {
                     self._showSearcherPane();
                     self._setStartValue("");
-                    this.setValue(self.storeValue);
+                    this.setValue(BI.deepClone(self.storeValue));
                 }
             }, {
                 eventName: BI.Searcher.EVENT_STOP,