Merge pull request #54 in FUI/fineui from ~GUY/fineui:master to master

* commit '51def4d312e347a5e6811e7c95cbbc31072eb61d':
  平台用
  树控件
  树控件
  用到codemirrior的editor可配置行高
  codemirror line-height
  add
  add
  add
  codeeditor加个focus方法
  add
  add
  add
  整理
  add
  update

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 */
@@ -444,13 +424,18 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
   margin: 0;
   white-space: pre;
   word-wrap: normal;
-  line-height: 2em;
   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;
@@ -582,8 +567,6 @@ li.CodeMirror-hint-active {
   background: #08f;
   color: white;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-message-title {
   font-size: 16px;
   cursor: pointer;
@@ -603,14 +586,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 +599,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 +618,6 @@ li.CodeMirror-hint-active {
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-segment > .center-element {
   overflow: hidden;
   overflow-x: hidden;
@@ -681,8 +652,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 +805,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 +815,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 +834,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 +845,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 +868,6 @@ li.CodeMirror-hint-active {
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-text {
   text-overflow: ellipsis;
   overflow-x: hidden;
@@ -924,8 +875,6 @@ li.CodeMirror-hint-active {
   white-space: nowrap;
   word-break: break-word;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-bubble {
   font-size: 14px;
 }
@@ -936,13 +885,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 +902,6 @@ li.CodeMirror-hint-active {
   background: #fddddd;
   color: #e85050;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-tooltip {
   max-width: 250px;
   -webkit-border-radius: 2px;
@@ -976,8 +919,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 +941,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 +1024,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 +1046,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 +1159,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 +1170,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 +1188,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 +1198,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 +1210,6 @@ li.CodeMirror-hint-active {
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 /**********BI.BIListView*************/
 .bi-popup-view {
   position: fixed !important;

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");
@@ -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
                     });
@@ -14258,7 +14260,8 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
             watermark: '',
             value: '',
             fieldTextValueMap: {},
-            showHint: true
+            showHint: true,
+            lineHeight: 2
         });
     },
     _init: function () {
@@ -14270,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) {
@@ -14800,10 +14804,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 +14827,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
                         });
@@ -17708,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 () {
@@ -17719,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)
@@ -17841,6 +17849,10 @@ BI.CodeEditor = BI.inherit(BI.Single, {
         this.editor.focus();
     },
     
+    blur: function () {
+        this.editor.getInputField().blur();
+    },
+
     setStyle: function (style) {
         this.style = style;
         this.element.css(style);
@@ -32485,10 +32497,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 +32520,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 +32771,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 +32801,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 +32812,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)
                                 };

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]
         })
     },

bi/core.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;
 }
@@ -2950,8 +2944,6 @@ i {
   -webkit-animation-name: slideOutUp;
   animation-name: slideOutUp;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .base-disabled {
   cursor: default !important;
   color: #cccccc !important;
@@ -3503,8 +3495,6 @@ i {
   cursor: move;
 }
 /*****************cursor*****************/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .y-overflow-auto {
   overflow-y: auto;
   overflow-x: hidden;
@@ -3543,8 +3533,6 @@ i {
   overflow-y: hidden;
   white-space: nowrap;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .display-block {
   display: block;
 }
@@ -3566,8 +3554,6 @@ i {
 .horizon-left {
   text-align: left;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 /*类似ie6的盒子模型 可以在有百分比的时候加border 支持到ie8*/
 .border-sizing {
   -webkit-box-sizing: border-box;
@@ -3895,8 +3881,6 @@ i {
   min-height: 100%;
   float: left;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-inline-center-adapt-layout:after {
   display: inline-block;
   width: 0;
@@ -3904,8 +3888,6 @@ i {
   vertical-align: middle;
   content: ' ';
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-inline-vertical-adapt-layout:after {
   display: inline-block;
   width: 0;
@@ -3913,8 +3895,6 @@ i {
   vertical-align: middle;
   content: ' ';
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-theme-dark {
   background-color: #191b2b;
   color: #cccccc;

bi/core.js

@@ -4168,7 +4168,7 @@ _.extend(BI, {
         Horizontal: "horizontal"
     },
     Selection: {
-        Default: -999,
+        Default: -2,
         None: -1,
         Single: 0,
         Multi: 1,

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;

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,
@@ -11826,18 +11828,18 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
             if (isSearching()) {
                 self.trigger.stopEditing();
                 self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
-                return;
-            }
+            }else{
                 if (isPopupView()) {
                     self.trigger.stopEditing();
                     self.storeValue = {value: self.combo.getValue()};
                     if (clear === true) {
                         self.storeValue = {value: {}};
-                    clear = false;
-                    change = false;
                     }
                     self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
                 }
+            }
+            clear = false;
+            change = false;
         });
 
         var triggerBtn = BI.createWidget({
@@ -17420,23 +17422,42 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree
 
         function expandSelectedValue(selectedValues, parents, notSelectedValue) {
             var next = selectedValues;
+            var childrenCount = [];
+            var path = [];
             //去掉点击的节点之后的结果集
-            BI.each(parents, function (i, v) {
+            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);
+                        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;
+                                }
+                            }
+                        } else {
                             BI.each(expanded, function (m, child) {
                                 if (i === parents.length - 1 && child.value === notSelectedValue) {
                                     return true;
                                 }
                                 next[child.value] = {};
                             });
+                        }
                         next = next[v];
                     } else {
-                        next = {};
-                        next[v] = {};
+                        return true;
+                        // next = {};
+                        // next[v] = {};
                     }
                 } else {
                     next = t;

demo/css/face.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .demo-face .face-config .config-label {
   font-size: 14px;
 }

demo/css/index.css

@@ -1,2 +0,0 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/

demo/css/main.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .layout-bg-white {
   background-color: #ffffff;
 }

demo/css/north.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .demo-north {
   background-color: #3c8dbc;
 }

demo/css/preview.css

@@ -1,2 +0,0 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/

demo/css/west.css

@@ -1,2 +0,0 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/

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
                 }

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);

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"
 }];

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 */
@@ -444,13 +424,18 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
   margin: 0;
   white-space: pre;
   word-wrap: normal;
-  line-height: 2em;
   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;
@@ -582,8 +567,6 @@ li.CodeMirror-hint-active {
   background: #08f;
   color: white;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-message-title {
   font-size: 16px;
   cursor: pointer;
@@ -603,14 +586,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 +599,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 +618,6 @@ li.CodeMirror-hint-active {
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-segment > .center-element {
   overflow: hidden;
   overflow-x: hidden;
@@ -681,8 +652,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 +805,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 +815,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 +834,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 +845,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 +868,6 @@ li.CodeMirror-hint-active {
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-text {
   text-overflow: ellipsis;
   overflow-x: hidden;
@@ -924,8 +875,6 @@ li.CodeMirror-hint-active {
   white-space: nowrap;
   word-break: break-word;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-bubble {
   font-size: 14px;
 }
@@ -936,13 +885,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 +902,6 @@ li.CodeMirror-hint-active {
   background: #fddddd;
   color: #e85050;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-tooltip {
   max-width: 250px;
   -webkit-border-radius: 2px;
@@ -976,8 +919,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 +941,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 +1024,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 +1046,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 +1159,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 +1170,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 +1188,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 +1198,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 +1210,6 @@ li.CodeMirror-hint-active {
 }
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 /**********BI.BIListView*************/
 .bi-popup-view {
   position: fixed !important;

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");
@@ -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
                     });
@@ -14258,7 +14260,8 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
             watermark: '',
             value: '',
             fieldTextValueMap: {},
-            showHint: true
+            showHint: true,
+            lineHeight: 2
         });
     },
     _init: function () {
@@ -14270,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) {
@@ -14800,10 +14804,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 +14827,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
                         });
@@ -17708,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 () {
@@ -17719,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)
@@ -17841,6 +17849,10 @@ BI.CodeEditor = BI.inherit(BI.Single, {
         this.editor.focus();
     },
     
+    blur: function () {
+        this.editor.getInputField().blur();
+    },
+
     setStyle: function (style) {
         this.style = style;
         this.element.css(style);
@@ -32485,10 +32497,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 +32520,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 +32771,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 +32801,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 +32812,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)
                                 };

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]
         })
     },

docs/core.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;
 }
@@ -2950,8 +2944,6 @@ i {
   -webkit-animation-name: slideOutUp;
   animation-name: slideOutUp;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .base-disabled {
   cursor: default !important;
   color: #cccccc !important;
@@ -3503,8 +3495,6 @@ i {
   cursor: move;
 }
 /*****************cursor*****************/
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .y-overflow-auto {
   overflow-y: auto;
   overflow-x: hidden;
@@ -3543,8 +3533,6 @@ i {
   overflow-y: hidden;
   white-space: nowrap;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .display-block {
   display: block;
 }
@@ -3566,8 +3554,6 @@ i {
 .horizon-left {
   text-align: left;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 /*类似ie6的盒子模型 可以在有百分比的时候加border 支持到ie8*/
 .border-sizing {
   -webkit-box-sizing: border-box;
@@ -3895,8 +3881,6 @@ i {
   min-height: 100%;
   float: left;
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-inline-center-adapt-layout:after {
   display: inline-block;
   width: 0;
@@ -3904,8 +3888,6 @@ i {
   vertical-align: middle;
   content: ' ';
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-inline-vertical-adapt-layout:after {
   display: inline-block;
   width: 0;
@@ -3913,8 +3895,6 @@ i {
   vertical-align: middle;
   content: ' ';
 }
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-theme-dark {
   background-color: #191b2b;
   color: #cccccc;

docs/core.js

@@ -24992,7 +24992,7 @@ _.extend(BI, {
         Horizontal: "horizontal"
     },
     Selection: {
-        Default: -999,
+        Default: -2,
         None: -1,
         Single: 0,
         Multi: 1,

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(自定义颜色,用于特定场景) ****/

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
                 }
@@ -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: "核心控件",

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;

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;

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,
@@ -11826,18 +11828,18 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
             if (isSearching()) {
                 self.trigger.stopEditing();
                 self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
-                return;
-            }
+            }else{
                 if (isPopupView()) {
                     self.trigger.stopEditing();
                     self.storeValue = {value: self.combo.getValue()};
                     if (clear === true) {
                         self.storeValue = {value: {}};
-                    clear = false;
-                    change = false;
                     }
                     self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
                 }
+            }
+            clear = false;
+            change = false;
         });
 
         var triggerBtn = BI.createWidget({
@@ -17420,23 +17422,42 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree
 
         function expandSelectedValue(selectedValues, parents, notSelectedValue) {
             var next = selectedValues;
+            var childrenCount = [];
+            var path = [];
             //去掉点击的节点之后的结果集
-            BI.each(parents, function (i, v) {
+            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);
+                        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;
+                                }
+                            }
+                        } else {
                             BI.each(expanded, function (m, child) {
                                 if (i === parents.length - 1 && child.value === notSelectedValue) {
                                     return true;
                                 }
                                 next[child.value] = {};
                             });
+                        }
                         next = next[v];
                     } else {
-                        next = {};
-                        next[v] = {};
+                        return true;
+                        // next = {};
+                        // next[v] = {};
                     }
                 } else {
                     next = t;

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
                     });

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) {

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
                         });

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");

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)
@@ -142,6 +144,10 @@ BI.CodeEditor = BI.inherit(BI.Single, {
         this.editor.focus();
     },
     
+    blur: function () {
+        this.editor.getInputField().blur();
+    },
+
     setStyle: function (style) {
         this.style = style;
         this.element.css(style);

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({

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)
                                 };

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]
         })
     },

src/component/treevaluechooser/abstract.treevaluechooser.js

@@ -181,23 +181,42 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
 
         function expandSelectedValue(selectedValues, parents, notSelectedValue) {
             var next = selectedValues;
+            var childrenCount = [];
+            var path = [];
             //去掉点击的节点之后的结果集
-            BI.each(parents, function (i, v) {
+            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);
+                        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;
+                                }
+                            }
+                        } else {
                             BI.each(expanded, function (m, child) {
                                 if (i === parents.length - 1 && child.value === notSelectedValue) {
                                     return true;
                                 }
                                 next[child.value] = {};
                             });
+                        }
                         next = next[v];
                     } else {
-                        next = {};
-                        next[v] = {};
+                        return true;
+                        // next = {};
+                        // next[v] = {};
                     }
                 } else {
                     next = t;

src/core/var.js

@@ -62,7 +62,7 @@ _.extend(BI, {
         Horizontal: "horizontal"
     },
     Selection: {
-        Default: -999,
+        Default: -2,
         None: -1,
         Single: 0,
         Multi: 1,

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;

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;
 }

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;

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;
 }

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);

src/css/base/editor/editor.adapt.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-adapt-editor .adapt-editor-text {
   font-size: 14px;
 }

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;

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;

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;
 }

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 */
@@ -333,13 +331,18 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
   margin: 0;
   white-space: pre;
   word-wrap: normal;
-  line-height: 2em;
   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;

src/css/base/foundation/bi.message.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-message-title {
   font-size: 16px;
   cursor: pointer;

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);

src/css/base/layer/panel.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-panel {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;

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;
 }

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;

src/css/base/pager/pager.direction.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-direction-pager .direction-pager-prev {
   font-size: 16px;
 }

src/css/base/segment/segment.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-segment > .center-element {
   overflow: hidden;
   overflow-x: hidden;

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;

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;

src/css/base/single/editor/editor.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-editor {
   font-size: 12px;
 }

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;

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;
 }

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;
 }

src/css/base/single/editor/editor.textarea.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-textarea-editor {
   overflow: hidden;
   overflow-x: hidden;

src/css/base/single/input/file.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-file {
   opacity: 0;
   filter: alpha(opacity=0);

src/css/base/single/input/input.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-input {
   border: none;
   outline: none;

src/css/base/single/text.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-text {
   text-overflow: ellipsis;
   overflow-x: hidden;

src/css/base/single/tip/tip.bubble.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-bubble {
   font-size: 14px;
 }

src/css/base/single/tip/tip.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-tip {
   position: fixed !important;
 }

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;

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;

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+*/

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;

src/css/base/table/table.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-table > .first-col {
   border-left: none;
 }

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+*/

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;

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;

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;

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;
 }

src/css/base/trigger/trigger.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-trigger .bi-trigger-icon-button {
   font-size: 16px;
 }

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;

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;

src/css/base/view/popupview.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 /**********BI.BIListView*************/
 .bi-popup-view {
   position: fixed !important;

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;
 }

src/css/core/utils/common.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .base-disabled {
   cursor: default !important;
   color: #cccccc !important;

src/css/core/utils/overflow.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .y-overflow-auto {
   overflow-y: auto;
   overflow-x: hidden;

src/css/core/utils/pos.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .display-block {
   display: block;
 }

src/css/core/utils/sizing.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 /*类似ie6的盒子模型 可以在有百分比的时候加border 支持到ie8*/
 .border-sizing {
   -webkit-box-sizing: border-box;

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;

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;

src/css/resource/app.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 html,
 button,
 input,

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');

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;
 }

src/css/resource/third/ztree/display.tree.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-display-tree .ztree * {
   color: #999999;
 }

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;

src/css/theme/dark.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-theme-dark {
   background-color: #191b2b;
   color: #cccccc;

src/css/widget/arrangement/arrangement.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-arrangement .arrangement-helper {
   background: #3f8ce8;
   z-index: 1000000000;

src/css/widget/arrangement/arrangement.droppable.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-arrangement-droppable {
   z-index: 100000;
 }

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;

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;
 }

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;
 }

src/css/widget/exceltable/exceltable.header.cell.css

@@ -1,5 +1,3 @@
-/****** common color(常用颜色,可用于普遍场景) *****/
-/**** custom color(自定义颜色,用于特定场景) ****/
 .bi-excel-table-header-cell {
   font-weight: bold;
 }

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;
 }

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;