Merging in latest from upstream (FUI/fineui:refs/heads/master)

* commit '1691b078daf64f6f183409fc7efd82970fd93a92':
  update
  update
  update
  update
  update
  update
  update

Gruntfile.js

@@ -26,6 +26,7 @@ module.exports = function (grunt) {
                     "src/core/utils/*.js",
                     "src/core/behavior/behavior.js",
                     "src/core/wrapper/layout.js",
+                    "src/core/plugin.js",
                     "src/core/**/*.js",
 
                     "src/data/data.js",

dist/base.css

@@ -1115,6 +1115,9 @@ body .bi-button.button-ignore.disabled.clear:active,
 .bi-textarea-editor .textarea-editor-content {
   border: none;
 }
+.x-icon.b-font {
+  margin: auto;
+}
 .bi-file {
   opacity: 0;
   filter: alpha(opacity=0);

dist/bundle.css

@@ -264,11 +264,6 @@ textarea {
   margin: 0;
   padding: 0;
   outline: none;
-  border: 1px solid #d4dadd;
-}
-.bi-theme-dark input,
-.bi-theme-dark textarea {
-  border: 1px solid #525466;
 }
 ul {
   list-style: disc;
@@ -281,6 +276,14 @@ i {
   -webkit-text-stroke-width: 0.2px;
   -moz-osx-font-smoothing: grayscale;
 }
+input,
+textarea {
+  border: 1px solid #d4dadd;
+}
+.bi-theme-dark input,
+.bi-theme-dark textarea {
+  border: 1px solid #525466;
+}
 .base-disabled {
   cursor: default !important;
   color: #9ea6b2 !important;
@@ -1320,9 +1323,6 @@ i {
   -o-align-items: center;
   align-items: center;
 }
-.bi-flex-center-layout > * {
-  margin: auto;
-}
 .bi-flex-center-layout {
   display: box;
   /* OLD - Android 4.4- */
@@ -1363,9 +1363,6 @@ i {
   -o-align-items: center;
   align-items: center;
 }
-.bi-flex-center-layout > * {
-  margin: auto;
-}
 
 .bi-flex-horizontal-layout {
   display: box;
@@ -1437,9 +1434,6 @@ i {
   -o-align-items: flex-end;
   align-items: flex-end;
 }
-.bi-flex-horizontal-layout > * {
-  margin: auto;
-}
 
 .bi-flex-vertical-center {
   display: box;
@@ -1517,9 +1511,6 @@ i {
   -o-align-items: stretch;
   align-items: stretch;
 }
-.bi-flex-vertical-center > * {
-  margin: auto;
-}
 
 .bi-flex-wrapper-center-layout .flex-wrapper-center-layout-wrapper {
   display: box;
@@ -1564,9 +1555,6 @@ i {
   min-height: 100%;
   float: left;
 }
-.bi-flex-wrapper-center-layout > * {
-  margin: auto;
-}
 
 .bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper {
   display: box;
@@ -1637,9 +1625,6 @@ i {
   -o-align-items: flex-end;
   align-items: flex-end;
 }
-.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper > * {
-  margin: auto;
-}
 
 .bi-flex-wrapper-vertical-center .flex-wrapper-vertical-center-wrapper {
   display: box;
@@ -1718,9 +1703,6 @@ i {
   -o-align-items: stretch;
   align-items: stretch;
 }
-.bi-flex-wrapper-vertical-center .flex-wrapper-vertical-center-wrapper > * {
-  margin: auto;
-}
 .bi-flex-horizontal-layout {
   display: box;
   /* OLD - Android 4.4- */
@@ -1791,9 +1773,6 @@ i {
   -o-align-items: flex-end;
   align-items: flex-end;
 }
-.bi-flex-horizontal-layout > * {
-  margin: auto;
-}
 .bi-flex-vertical-center {
   display: box;
   /* OLD - Android 4.4- */
@@ -1870,9 +1849,6 @@ i {
   -o-align-items: stretch;
   align-items: stretch;
 }
-.bi-flex-vertical-center > * {
-  margin: auto;
-}
 .bi-flex-wrapper-center-layout .flex-wrapper-center-layout-wrapper {
   display: box;
   /* OLD - Android 4.4- */
@@ -1916,9 +1892,6 @@ i {
   min-height: 100%;
   float: left;
 }
-.bi-flex-wrapper-center-layout > * {
-  margin: auto;
-}
 .bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper {
   display: box;
   /* OLD - Android 4.4- */
@@ -1988,9 +1961,6 @@ i {
   -o-align-items: flex-end;
   align-items: flex-end;
 }
-.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper > * {
-  margin: auto;
-}
 .bi-flex-wrapper-vertical-center .flex-wrapper-vertical-center-wrapper {
   display: box;
   /* OLD - Android 4.4- */
@@ -2068,38 +2038,6 @@ i {
   -o-align-items: stretch;
   align-items: stretch;
 }
-.bi-flex-wrapper-vertical-center .flex-wrapper-vertical-center-wrapper > * {
-  margin: auto;
-}
-.bi-inline-center-adapt-layout:after {
-  display: inline-block;
-  width: 0;
-  min-height: 100%;
-  vertical-align: middle;
-  content: ' ';
-}
-.bi-inline-center-adapt-layout:after {
-  display: inline-block;
-  width: 0;
-  min-height: 100%;
-  vertical-align: middle;
-  content: ' ';
-}
-
-.bi-inline-vertical-adapt-layout:after {
-  display: inline-block;
-  width: 0;
-  min-height: 100%;
-  vertical-align: middle;
-  content: ' ';
-}
-.bi-inline-vertical-adapt-layout:after {
-  display: inline-block;
-  width: 0;
-  min-height: 100%;
-  vertical-align: middle;
-  content: ' ';
-}
 .bi-theme-dark {
   background-color: #191B2B;
   color: #cccccc;
@@ -3224,6 +3162,9 @@ body .bi-button.button-ignore.disabled.clear:active,
 .bi-textarea-editor .textarea-editor-content {
   border: none;
 }
+.x-icon.b-font {
+  margin: auto;
+}
 .bi-file {
   opacity: 0;
   filter: alpha(opacity=0);

dist/bundle.js

@@ -17102,7 +17102,63 @@ BI.Layout = BI.inherit(BI.Widget, {
 
     }
 });
-BI.shortcut("bi.layout", BI.Layout);/**
+BI.shortcut("bi.layout", BI.Layout);BI.Plugin = BI.Plugin || {};
+!(function () {
+    var _WidgetsPlugin = {};
+    var _ObjectPlugin = {};
+    BI.extend(BI.Plugin, {
+
+        getWidget: function (type, options) {
+            if (_WidgetsPlugin[type]) {
+                var res;
+                for (var i = _WidgetsPlugin[type].length - 1; i >= 0; i--) {
+                    if (res = _WidgetsPlugin[type][i](options)) {
+                        return res;
+                    }
+                }
+            }
+            return options;
+        },
+
+        registerWidget: function (type, fn) {
+            if (!_WidgetsPlugin[type]) {
+                _WidgetsPlugin[type] = [];
+            }
+            if (_WidgetsPlugin[type].length > 0) {
+                console.log("组件已经注册过了!");
+            }
+            _WidgetsPlugin[type].push(fn);
+        },
+
+        relieveWidget: function (type) {
+            delete _WidgetsPlugin[type];
+        },
+
+        getObject: function (type, object) {
+            if (_ObjectPlugin[type]) {
+                var res;
+                for (var i = 0, len = _ObjectPlugin[type].length; i < len; i++) {
+                    res = _ObjectPlugin[type][i](object);
+                }
+            }
+            return res || object;
+        },
+
+        registerObject: function (type, fn) {
+            if (!_ObjectPlugin[type]) {
+                _ObjectPlugin[type] = [];
+            }
+            if (_ObjectPlugin[type].length > 0) {
+                console.log("对象已经注册过了!");
+            }
+            _ObjectPlugin[type].push(fn);
+        },
+
+        relieveObject: function (type) {
+            delete _ObjectPlugin[type];
+        }
+    });
+})();/**
  * guy
  * 由一个元素切换到另一个元素的行为
  * @class BI.Action
@@ -17952,7 +18008,102 @@ BI.RedMarkBehavior = BI.inherit(BI.Behavior, {
             }
         });
     }
-});/**
+});// 工程配置
+(function () {
+    // 注册布局
+    var isSupportFlex = BI.isSupportCss3("flex");
+    BI.Plugin.registerWidget("bi.horizontal", function (ob) {
+        if (isSupportFlex) {
+            return BI.extend(ob, {type: "bi.flex_horizontal"});
+        }
+        return ob;
+        
+    });
+    BI.Plugin.registerWidget("bi.center_adapt", function (ob) {
+        if (isSupportFlex && ob.items && ob.items.length <= 1) {
+            // 有滚动条的情况下需要用到flex_wrapper_center布局
+            if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
+                // 不是IE用flex_wrapper_center布局
+                if (!BI.isIE()) {
+                    return BI.extend(ob, {type: "bi.flex_wrapper_center"});
+                }
+                return ob;
+            }
+            return BI.extend(ob, {type: "bi.flex_center"});
+        }
+        return ob;
+        
+    });
+    BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) {
+        if (isSupportFlex) {
+            // 有滚动条的情况下需要用到flex_wrapper_center布局
+            if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
+                // 不是IE用flex_wrapper_center布局
+                if (!BI.isIE()) {
+                    return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"});
+                }
+                return ob;
+            }
+            return BI.extend(ob, {type: "bi.flex_vertical_center"});
+        }
+        return ob;
+        
+    });
+    BI.Plugin.registerWidget("bi.float_center_adapt", function (ob) {
+        if (isSupportFlex) {
+            // 有滚动条的情况下需要用到flex_wrapper_center布局
+            if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
+                // 不是IE用flex_wrapper_center布局
+                if (!BI.isIE()) {
+                    return BI.extend({}, ob, {type: "bi.flex_wrapper_center"});
+                }
+                return ob;
+            }
+            return BI.extend(ob, {type: "bi.flex_center"});
+        }
+        return ob;
+        
+    });
+    // 注册滚动条
+    BI.Plugin.registerWidget("bi.grid_table_scrollbar", function (ob) {
+        if (BI.isIE9Below()) {
+            return BI.extend(ob, {type: "bi.native_table_scrollbar"});
+        }
+        return ob;
+        
+    });
+    BI.Plugin.registerWidget("bi.grid_table_horizontal_scrollbar", function (ob) {
+        if (BI.isIE9Below()) {
+            return BI.extend(ob, {type: "bi.native_table_horizontal_scrollbar"});
+        }
+        return ob;
+        
+    });
+
+    // 注册控件
+    BI.Plugin.registerWidget("bi.grid_table", function (ob) {
+        // 非chrome下滚动条滑动效果不好，禁止掉
+        if (!(BI.isChrome() && BI.isWindows() && !BI.isEdge())) {
+            return BI.extend(ob, {type: "bi.quick_grid_table"});
+        }
+        return ob;
+        
+    });
+    BI.Plugin.registerWidget("bi.collection_table", function (ob) {
+        // 非chrome下滚动条滑动效果不好，禁止掉
+        if (!(BI.isChrome() && BI.isWindows() && !BI.isEdge())) {
+            return BI.extend(ob, {type: "bi.quick_collection_table"});
+        }
+        return ob;
+        
+    });
+    // IE8下滚动条用原生的
+    $(function () {
+        if (BI.isIE9Below()) {
+            BI.GridTableScrollbar.SIZE = 18;
+        }
+    });
+}());/**
  * guy
  * 控制器
  * Controller层超类
@@ -20588,63 +20739,7 @@ BI.HorizontalFillLayoutLogic = BI.inherit(BI.Logic, {
     _init: function () {
         BI.HorizontalFillLayoutLogic.superclass._init.apply(this, arguments);
     }
-});BI.Plugin = BI.Plugin || {};
-!(function () {
-    var _WidgetsPlugin = {};
-    var _ObjectPlugin = {};
-    BI.extend(BI.Plugin, {
-
-        getWidget: function (type, options) {
-            if (_WidgetsPlugin[type]) {
-                var res;
-                for (var i = _WidgetsPlugin[type].length - 1; i >= 0; i--) {
-                    if (res = _WidgetsPlugin[type][i](options)) {
-                        return res;
-                    }
-                }
-            }
-            return options;
-        },
-
-        registerWidget: function (type, fn) {
-            if (!_WidgetsPlugin[type]) {
-                _WidgetsPlugin[type] = [];
-            }
-            if (_WidgetsPlugin[type].length > 0) {
-                console.log("组件已经注册过了!");
-            }
-            _WidgetsPlugin[type].push(fn);
-        },
-
-        relieveWidget: function (type) {
-            delete _WidgetsPlugin[type];
-        },
-
-        getObject: function (type, object) {
-            if (_ObjectPlugin[type]) {
-                var res;
-                for (var i = 0, len = _ObjectPlugin[type].length; i < len; i++) {
-                    res = _ObjectPlugin[type][i](object);
-                }
-            }
-            return res || object;
-        },
-
-        registerObject: function (type, fn) {
-            if (!_ObjectPlugin[type]) {
-                _ObjectPlugin[type] = [];
-            }
-            if (_ObjectPlugin[type].length > 0) {
-                console.log("对象已经注册过了!");
-            }
-            _ObjectPlugin[type].push(fn);
-        },
-
-        relieveObject: function (type) {
-            delete _ObjectPlugin[type];
-        }
-    });
-})();/**
+});/**
  * 对数组对象的扩展
  * @class Array
  */

dist/core.css

@@ -264,11 +264,6 @@ textarea {
   margin: 0;
   padding: 0;
   outline: none;
-  border: 1px solid #d4dadd;
-}
-.bi-theme-dark input,
-.bi-theme-dark textarea {
-  border: 1px solid #525466;
 }
 ul {
   list-style: disc;
@@ -281,6 +276,14 @@ i {
   -webkit-text-stroke-width: 0.2px;
   -moz-osx-font-smoothing: grayscale;
 }
+input,
+textarea {
+  border: 1px solid #d4dadd;
+}
+.bi-theme-dark input,
+.bi-theme-dark textarea {
+  border: 1px solid #525466;
+}
 .base-disabled {
   cursor: default !important;
   color: #9ea6b2 !important;
@@ -1320,9 +1323,6 @@ i {
   -o-align-items: center;
   align-items: center;
 }
-.bi-flex-center-layout > * {
-  margin: auto;
-}
 .bi-flex-center-layout {
   display: box;
   /* OLD - Android 4.4- */
@@ -1363,9 +1363,6 @@ i {
   -o-align-items: center;
   align-items: center;
 }
-.bi-flex-center-layout > * {
-  margin: auto;
-}
 
 .bi-flex-horizontal-layout {
   display: box;
@@ -1437,9 +1434,6 @@ i {
   -o-align-items: flex-end;
   align-items: flex-end;
 }
-.bi-flex-horizontal-layout > * {
-  margin: auto;
-}
 
 .bi-flex-vertical-center {
   display: box;
@@ -1517,9 +1511,6 @@ i {
   -o-align-items: stretch;
   align-items: stretch;
 }
-.bi-flex-vertical-center > * {
-  margin: auto;
-}
 
 .bi-flex-wrapper-center-layout .flex-wrapper-center-layout-wrapper {
   display: box;
@@ -1564,9 +1555,6 @@ i {
   min-height: 100%;
   float: left;
 }
-.bi-flex-wrapper-center-layout > * {
-  margin: auto;
-}
 
 .bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper {
   display: box;
@@ -1637,9 +1625,6 @@ i {
   -o-align-items: flex-end;
   align-items: flex-end;
 }
-.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper > * {
-  margin: auto;
-}
 
 .bi-flex-wrapper-vertical-center .flex-wrapper-vertical-center-wrapper {
   display: box;
@@ -1718,9 +1703,6 @@ i {
   -o-align-items: stretch;
   align-items: stretch;
 }
-.bi-flex-wrapper-vertical-center .flex-wrapper-vertical-center-wrapper > * {
-  margin: auto;
-}
 .bi-flex-horizontal-layout {
   display: box;
   /* OLD - Android 4.4- */
@@ -1791,9 +1773,6 @@ i {
   -o-align-items: flex-end;
   align-items: flex-end;
 }
-.bi-flex-horizontal-layout > * {
-  margin: auto;
-}
 .bi-flex-vertical-center {
   display: box;
   /* OLD - Android 4.4- */
@@ -1870,9 +1849,6 @@ i {
   -o-align-items: stretch;
   align-items: stretch;
 }
-.bi-flex-vertical-center > * {
-  margin: auto;
-}
 .bi-flex-wrapper-center-layout .flex-wrapper-center-layout-wrapper {
   display: box;
   /* OLD - Android 4.4- */
@@ -1916,9 +1892,6 @@ i {
   min-height: 100%;
   float: left;
 }
-.bi-flex-wrapper-center-layout > * {
-  margin: auto;
-}
 .bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper {
   display: box;
   /* OLD - Android 4.4- */
@@ -1988,9 +1961,6 @@ i {
   -o-align-items: flex-end;
   align-items: flex-end;
 }
-.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper > * {
-  margin: auto;
-}
 .bi-flex-wrapper-vertical-center .flex-wrapper-vertical-center-wrapper {
   display: box;
   /* OLD - Android 4.4- */
@@ -2068,38 +2038,6 @@ i {
   -o-align-items: stretch;
   align-items: stretch;
 }
-.bi-flex-wrapper-vertical-center .flex-wrapper-vertical-center-wrapper > * {
-  margin: auto;
-}
-.bi-inline-center-adapt-layout:after {
-  display: inline-block;
-  width: 0;
-  min-height: 100%;
-  vertical-align: middle;
-  content: ' ';
-}
-.bi-inline-center-adapt-layout:after {
-  display: inline-block;
-  width: 0;
-  min-height: 100%;
-  vertical-align: middle;
-  content: ' ';
-}
-
-.bi-inline-vertical-adapt-layout:after {
-  display: inline-block;
-  width: 0;
-  min-height: 100%;
-  vertical-align: middle;
-  content: ' ';
-}
-.bi-inline-vertical-adapt-layout:after {
-  display: inline-block;
-  width: 0;
-  min-height: 100%;
-  vertical-align: middle;
-  content: ' ';
-}
 .bi-theme-dark {
   background-color: #191B2B;
   color: #cccccc;

dist/core.js

@@ -17102,7 +17102,63 @@ BI.Layout = BI.inherit(BI.Widget, {
 
     }
 });
-BI.shortcut("bi.layout", BI.Layout);/**
+BI.shortcut("bi.layout", BI.Layout);BI.Plugin = BI.Plugin || {};
+!(function () {
+    var _WidgetsPlugin = {};
+    var _ObjectPlugin = {};
+    BI.extend(BI.Plugin, {
+
+        getWidget: function (type, options) {
+            if (_WidgetsPlugin[type]) {
+                var res;
+                for (var i = _WidgetsPlugin[type].length - 1; i >= 0; i--) {
+                    if (res = _WidgetsPlugin[type][i](options)) {
+                        return res;
+                    }
+                }
+            }
+            return options;
+        },
+
+        registerWidget: function (type, fn) {
+            if (!_WidgetsPlugin[type]) {
+                _WidgetsPlugin[type] = [];
+            }
+            if (_WidgetsPlugin[type].length > 0) {
+                console.log("组件已经注册过了!");
+            }
+            _WidgetsPlugin[type].push(fn);
+        },
+
+        relieveWidget: function (type) {
+            delete _WidgetsPlugin[type];
+        },
+
+        getObject: function (type, object) {
+            if (_ObjectPlugin[type]) {
+                var res;
+                for (var i = 0, len = _ObjectPlugin[type].length; i < len; i++) {
+                    res = _ObjectPlugin[type][i](object);
+                }
+            }
+            return res || object;
+        },
+
+        registerObject: function (type, fn) {
+            if (!_ObjectPlugin[type]) {
+                _ObjectPlugin[type] = [];
+            }
+            if (_ObjectPlugin[type].length > 0) {
+                console.log("对象已经注册过了!");
+            }
+            _ObjectPlugin[type].push(fn);
+        },
+
+        relieveObject: function (type) {
+            delete _ObjectPlugin[type];
+        }
+    });
+})();/**
  * guy
  * 由一个元素切换到另一个元素的行为
  * @class BI.Action
@@ -17952,7 +18008,102 @@ BI.RedMarkBehavior = BI.inherit(BI.Behavior, {
             }
         });
     }
-});/**
+});// 工程配置
+(function () {
+    // 注册布局
+    var isSupportFlex = BI.isSupportCss3("flex");
+    BI.Plugin.registerWidget("bi.horizontal", function (ob) {
+        if (isSupportFlex) {
+            return BI.extend(ob, {type: "bi.flex_horizontal"});
+        }
+        return ob;
+        
+    });
+    BI.Plugin.registerWidget("bi.center_adapt", function (ob) {
+        if (isSupportFlex && ob.items && ob.items.length <= 1) {
+            // 有滚动条的情况下需要用到flex_wrapper_center布局
+            if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
+                // 不是IE用flex_wrapper_center布局
+                if (!BI.isIE()) {
+                    return BI.extend(ob, {type: "bi.flex_wrapper_center"});
+                }
+                return ob;
+            }
+            return BI.extend(ob, {type: "bi.flex_center"});
+        }
+        return ob;
+        
+    });
+    BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) {
+        if (isSupportFlex) {
+            // 有滚动条的情况下需要用到flex_wrapper_center布局
+            if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
+                // 不是IE用flex_wrapper_center布局
+                if (!BI.isIE()) {
+                    return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"});
+                }
+                return ob;
+            }
+            return BI.extend(ob, {type: "bi.flex_vertical_center"});
+        }
+        return ob;
+        
+    });
+    BI.Plugin.registerWidget("bi.float_center_adapt", function (ob) {
+        if (isSupportFlex) {
+            // 有滚动条的情况下需要用到flex_wrapper_center布局
+            if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
+                // 不是IE用flex_wrapper_center布局
+                if (!BI.isIE()) {
+                    return BI.extend({}, ob, {type: "bi.flex_wrapper_center"});
+                }
+                return ob;
+            }
+            return BI.extend(ob, {type: "bi.flex_center"});
+        }
+        return ob;
+        
+    });
+    // 注册滚动条
+    BI.Plugin.registerWidget("bi.grid_table_scrollbar", function (ob) {
+        if (BI.isIE9Below()) {
+            return BI.extend(ob, {type: "bi.native_table_scrollbar"});
+        }
+        return ob;
+        
+    });
+    BI.Plugin.registerWidget("bi.grid_table_horizontal_scrollbar", function (ob) {
+        if (BI.isIE9Below()) {
+            return BI.extend(ob, {type: "bi.native_table_horizontal_scrollbar"});
+        }
+        return ob;
+        
+    });
+
+    // 注册控件
+    BI.Plugin.registerWidget("bi.grid_table", function (ob) {
+        // 非chrome下滚动条滑动效果不好，禁止掉
+        if (!(BI.isChrome() && BI.isWindows() && !BI.isEdge())) {
+            return BI.extend(ob, {type: "bi.quick_grid_table"});
+        }
+        return ob;
+        
+    });
+    BI.Plugin.registerWidget("bi.collection_table", function (ob) {
+        // 非chrome下滚动条滑动效果不好，禁止掉
+        if (!(BI.isChrome() && BI.isWindows() && !BI.isEdge())) {
+            return BI.extend(ob, {type: "bi.quick_collection_table"});
+        }
+        return ob;
+        
+    });
+    // IE8下滚动条用原生的
+    $(function () {
+        if (BI.isIE9Below()) {
+            BI.GridTableScrollbar.SIZE = 18;
+        }
+    });
+}());/**
  * guy
  * 控制器
  * Controller层超类
@@ -20588,63 +20739,7 @@ BI.HorizontalFillLayoutLogic = BI.inherit(BI.Logic, {
     _init: function () {
         BI.HorizontalFillLayoutLogic.superclass._init.apply(this, arguments);
     }
-});BI.Plugin = BI.Plugin || {};
-!(function () {
-    var _WidgetsPlugin = {};
-    var _ObjectPlugin = {};
-    BI.extend(BI.Plugin, {
-
-        getWidget: function (type, options) {
-            if (_WidgetsPlugin[type]) {
-                var res;
-                for (var i = _WidgetsPlugin[type].length - 1; i >= 0; i--) {
-                    if (res = _WidgetsPlugin[type][i](options)) {
-                        return res;
-                    }
-                }
-            }
-            return options;
-        },
-
-        registerWidget: function (type, fn) {
-            if (!_WidgetsPlugin[type]) {
-                _WidgetsPlugin[type] = [];
-            }
-            if (_WidgetsPlugin[type].length > 0) {
-                console.log("组件已经注册过了!");
-            }
-            _WidgetsPlugin[type].push(fn);
-        },
-
-        relieveWidget: function (type) {
-            delete _WidgetsPlugin[type];
-        },
-
-        getObject: function (type, object) {
-            if (_ObjectPlugin[type]) {
-                var res;
-                for (var i = 0, len = _ObjectPlugin[type].length; i < len; i++) {
-                    res = _ObjectPlugin[type][i](object);
-                }
-            }
-            return res || object;
-        },
-
-        registerObject: function (type, fn) {
-            if (!_ObjectPlugin[type]) {
-                _ObjectPlugin[type] = [];
-            }
-            if (_ObjectPlugin[type].length > 0) {
-                console.log("对象已经注册过了!");
-            }
-            _ObjectPlugin[type].push(fn);
-        },
-
-        relieveObject: function (type) {
-            delete _ObjectPlugin[type];
-        }
-    });
-})();/**
+});/**
  * 对数组对象的扩展
  * @class Array
  */

dist/core_without_normalize.css

@@ -1,3 +1,11 @@
+input,
+textarea {
+  border: 1px solid #d4dadd;
+}
+.bi-theme-dark input,
+.bi-theme-dark textarea {
+  border: 1px solid #525466;
+}
 .base-disabled {
   cursor: default !important;
   color: #9ea6b2 !important;
@@ -1037,9 +1045,6 @@
   -o-align-items: center;
   align-items: center;
 }
-.bi-flex-center-layout > * {
-  margin: auto;
-}
 .bi-flex-center-layout {
   display: box;
   /* OLD - Android 4.4- */
@@ -1080,9 +1085,6 @@
   -o-align-items: center;
   align-items: center;
 }
-.bi-flex-center-layout > * {
-  margin: auto;
-}
 
 .bi-flex-horizontal-layout {
   display: box;
@@ -1154,9 +1156,6 @@
   -o-align-items: flex-end;
   align-items: flex-end;
 }
-.bi-flex-horizontal-layout > * {
-  margin: auto;
-}
 
 .bi-flex-vertical-center {
   display: box;
@@ -1234,9 +1233,6 @@
   -o-align-items: stretch;
   align-items: stretch;
 }
-.bi-flex-vertical-center > * {
-  margin: auto;
-}
 
 .bi-flex-wrapper-center-layout .flex-wrapper-center-layout-wrapper {
   display: box;
@@ -1281,9 +1277,6 @@
   min-height: 100%;
   float: left;
 }
-.bi-flex-wrapper-center-layout > * {
-  margin: auto;
-}
 
 .bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper {
   display: box;
@@ -1354,9 +1347,6 @@
   -o-align-items: flex-end;
   align-items: flex-end;
 }
-.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper > * {
-  margin: auto;
-}
 
 .bi-flex-wrapper-vertical-center .flex-wrapper-vertical-center-wrapper {
   display: box;
@@ -1435,9 +1425,6 @@
   -o-align-items: stretch;
   align-items: stretch;
 }
-.bi-flex-wrapper-vertical-center .flex-wrapper-vertical-center-wrapper > * {
-  margin: auto;
-}
 .bi-flex-horizontal-layout {
   display: box;
   /* OLD - Android 4.4- */
@@ -1508,9 +1495,6 @@
   -o-align-items: flex-end;
   align-items: flex-end;
 }
-.bi-flex-horizontal-layout > * {
-  margin: auto;
-}
 .bi-flex-vertical-center {
   display: box;
   /* OLD - Android 4.4- */
@@ -1587,9 +1571,6 @@
   -o-align-items: stretch;
   align-items: stretch;
 }
-.bi-flex-vertical-center > * {
-  margin: auto;
-}
 .bi-flex-wrapper-center-layout .flex-wrapper-center-layout-wrapper {
   display: box;
   /* OLD - Android 4.4- */
@@ -1633,9 +1614,6 @@
   min-height: 100%;
   float: left;
 }
-.bi-flex-wrapper-center-layout > * {
-  margin: auto;
-}
 .bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper {
   display: box;
   /* OLD - Android 4.4- */
@@ -1705,9 +1683,6 @@
   -o-align-items: flex-end;
   align-items: flex-end;
 }
-.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper > * {
-  margin: auto;
-}
 .bi-flex-wrapper-vertical-center .flex-wrapper-vertical-center-wrapper {
   display: box;
   /* OLD - Android 4.4- */
@@ -1785,38 +1760,6 @@
   -o-align-items: stretch;
   align-items: stretch;
 }
-.bi-flex-wrapper-vertical-center .flex-wrapper-vertical-center-wrapper > * {
-  margin: auto;
-}
-.bi-inline-center-adapt-layout:after {
-  display: inline-block;
-  width: 0;
-  min-height: 100%;
-  vertical-align: middle;
-  content: ' ';
-}
-.bi-inline-center-adapt-layout:after {
-  display: inline-block;
-  width: 0;
-  min-height: 100%;
-  vertical-align: middle;
-  content: ' ';
-}
-
-.bi-inline-vertical-adapt-layout:after {
-  display: inline-block;
-  width: 0;
-  min-height: 100%;
-  vertical-align: middle;
-  content: ' ';
-}
-.bi-inline-vertical-adapt-layout:after {
-  display: inline-block;
-  width: 0;
-  min-height: 100%;
-  vertical-align: middle;
-  content: ' ';
-}
 .bi-theme-dark {
   background-color: #191B2B;
   color: #cccccc;

dist/fineui.css

@@ -264,11 +264,6 @@ textarea {
   margin: 0;
   padding: 0;
   outline: none;
-  border: 1px solid #d4dadd;
-}
-.bi-theme-dark input,
-.bi-theme-dark textarea {
-  border: 1px solid #525466;
 }
 ul {
   list-style: disc;
@@ -281,6 +276,14 @@ i {
   -webkit-text-stroke-width: 0.2px;
   -moz-osx-font-smoothing: grayscale;
 }
+input,
+textarea {
+  border: 1px solid #d4dadd;
+}
+.bi-theme-dark input,
+.bi-theme-dark textarea {
+  border: 1px solid #525466;
+}
 .base-disabled {
   cursor: default !important;
   color: #9ea6b2 !important;
@@ -1320,9 +1323,6 @@ i {
   -o-align-items: center;
   align-items: center;
 }
-.bi-flex-center-layout > * {
-  margin: auto;
-}
 .bi-flex-center-layout {
   display: box;
   /* OLD - Android 4.4- */
@@ -1363,9 +1363,6 @@ i {
   -o-align-items: center;
   align-items: center;
 }
-.bi-flex-center-layout > * {
-  margin: auto;
-}
 
 .bi-flex-horizontal-layout {
   display: box;
@@ -1437,9 +1434,6 @@ i {
   -o-align-items: flex-end;
   align-items: flex-end;
 }
-.bi-flex-horizontal-layout > * {
-  margin: auto;
-}
 
 .bi-flex-vertical-center {
   display: box;
@@ -1517,9 +1511,6 @@ i {
   -o-align-items: stretch;
   align-items: stretch;
 }
-.bi-flex-vertical-center > * {
-  margin: auto;
-}
 
 .bi-flex-wrapper-center-layout .flex-wrapper-center-layout-wrapper {
   display: box;
@@ -1564,9 +1555,6 @@ i {
   min-height: 100%;
   float: left;
 }
-.bi-flex-wrapper-center-layout > * {
-  margin: auto;
-}
 
 .bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper {
   display: box;
@@ -1637,9 +1625,6 @@ i {
   -o-align-items: flex-end;
   align-items: flex-end;
 }
-.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper > * {
-  margin: auto;
-}
 
 .bi-flex-wrapper-vertical-center .flex-wrapper-vertical-center-wrapper {
   display: box;
@@ -1718,9 +1703,6 @@ i {
   -o-align-items: stretch;
   align-items: stretch;
 }
-.bi-flex-wrapper-vertical-center .flex-wrapper-vertical-center-wrapper > * {
-  margin: auto;
-}
 .bi-flex-horizontal-layout {
   display: box;
   /* OLD - Android 4.4- */
@@ -1791,9 +1773,6 @@ i {
   -o-align-items: flex-end;
   align-items: flex-end;
 }
-.bi-flex-horizontal-layout > * {
-  margin: auto;
-}
 .bi-flex-vertical-center {
   display: box;
   /* OLD - Android 4.4- */
@@ -1870,9 +1849,6 @@ i {
   -o-align-items: stretch;
   align-items: stretch;
 }
-.bi-flex-vertical-center > * {
-  margin: auto;
-}
 .bi-flex-wrapper-center-layout .flex-wrapper-center-layout-wrapper {
   display: box;
   /* OLD - Android 4.4- */
@@ -1916,9 +1892,6 @@ i {
   min-height: 100%;
   float: left;
 }
-.bi-flex-wrapper-center-layout > * {
-  margin: auto;
-}
 .bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper {
   display: box;
   /* OLD - Android 4.4- */
@@ -1988,9 +1961,6 @@ i {
   -o-align-items: flex-end;
   align-items: flex-end;
 }
-.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper > * {
-  margin: auto;
-}
 .bi-flex-wrapper-vertical-center .flex-wrapper-vertical-center-wrapper {
   display: box;
   /* OLD - Android 4.4- */
@@ -2068,38 +2038,6 @@ i {
   -o-align-items: stretch;
   align-items: stretch;
 }
-.bi-flex-wrapper-vertical-center .flex-wrapper-vertical-center-wrapper > * {
-  margin: auto;
-}
-.bi-inline-center-adapt-layout:after {
-  display: inline-block;
-  width: 0;
-  min-height: 100%;
-  vertical-align: middle;
-  content: ' ';
-}
-.bi-inline-center-adapt-layout:after {
-  display: inline-block;
-  width: 0;
-  min-height: 100%;
-  vertical-align: middle;
-  content: ' ';
-}
-
-.bi-inline-vertical-adapt-layout:after {
-  display: inline-block;
-  width: 0;
-  min-height: 100%;
-  vertical-align: middle;
-  content: ' ';
-}
-.bi-inline-vertical-adapt-layout:after {
-  display: inline-block;
-  width: 0;
-  min-height: 100%;
-  vertical-align: middle;
-  content: ' ';
-}
 .bi-theme-dark {
   background-color: #191B2B;
   color: #cccccc;
@@ -3224,6 +3162,9 @@ body .bi-button.button-ignore.disabled.clear:active,
 .bi-textarea-editor .textarea-editor-content {
   border: none;
 }
+.x-icon.b-font {
+  margin: auto;
+}
 .bi-file {
   opacity: 0;
   filter: alpha(opacity=0);

dist/fineui.js

@@ -17275,7 +17275,63 @@ BI.Layout = BI.inherit(BI.Widget, {
 
     }
 });
-BI.shortcut("bi.layout", BI.Layout);/**
+BI.shortcut("bi.layout", BI.Layout);BI.Plugin = BI.Plugin || {};
+!(function () {
+    var _WidgetsPlugin = {};
+    var _ObjectPlugin = {};
+    BI.extend(BI.Plugin, {
+
+        getWidget: function (type, options) {
+            if (_WidgetsPlugin[type]) {
+                var res;
+                for (var i = _WidgetsPlugin[type].length - 1; i >= 0; i--) {
+                    if (res = _WidgetsPlugin[type][i](options)) {
+                        return res;
+                    }
+                }
+            }
+            return options;
+        },
+
+        registerWidget: function (type, fn) {
+            if (!_WidgetsPlugin[type]) {
+                _WidgetsPlugin[type] = [];
+            }
+            if (_WidgetsPlugin[type].length > 0) {
+                console.log("组件已经注册过了!");
+            }
+            _WidgetsPlugin[type].push(fn);
+        },
+
+        relieveWidget: function (type) {
+            delete _WidgetsPlugin[type];
+        },
+
+        getObject: function (type, object) {
+            if (_ObjectPlugin[type]) {
+                var res;
+                for (var i = 0, len = _ObjectPlugin[type].length; i < len; i++) {
+                    res = _ObjectPlugin[type][i](object);
+                }
+            }
+            return res || object;
+        },
+
+        registerObject: function (type, fn) {
+            if (!_ObjectPlugin[type]) {
+                _ObjectPlugin[type] = [];
+            }
+            if (_ObjectPlugin[type].length > 0) {
+                console.log("对象已经注册过了!");
+            }
+            _ObjectPlugin[type].push(fn);
+        },
+
+        relieveObject: function (type) {
+            delete _ObjectPlugin[type];
+        }
+    });
+})();/**
  * guy
  * 由一个元素切换到另一个元素的行为
  * @class BI.Action
@@ -18125,7 +18181,102 @@ BI.RedMarkBehavior = BI.inherit(BI.Behavior, {
             }
         });
     }
-});/**
+});// 工程配置
+(function () {
+    // 注册布局
+    var isSupportFlex = BI.isSupportCss3("flex");
+    BI.Plugin.registerWidget("bi.horizontal", function (ob) {
+        if (isSupportFlex) {
+            return BI.extend(ob, {type: "bi.flex_horizontal"});
+        }
+        return ob;
+        
+    });
+    BI.Plugin.registerWidget("bi.center_adapt", function (ob) {
+        if (isSupportFlex && ob.items && ob.items.length <= 1) {
+            // 有滚动条的情况下需要用到flex_wrapper_center布局
+            if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
+                // 不是IE用flex_wrapper_center布局
+                if (!BI.isIE()) {
+                    return BI.extend(ob, {type: "bi.flex_wrapper_center"});
+                }
+                return ob;
+            }
+            return BI.extend(ob, {type: "bi.flex_center"});
+        }
+        return ob;
+        
+    });
+    BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) {
+        if (isSupportFlex) {
+            // 有滚动条的情况下需要用到flex_wrapper_center布局
+            if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
+                // 不是IE用flex_wrapper_center布局
+                if (!BI.isIE()) {
+                    return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"});
+                }
+                return ob;
+            }
+            return BI.extend(ob, {type: "bi.flex_vertical_center"});
+        }
+        return ob;
+        
+    });
+    BI.Plugin.registerWidget("bi.float_center_adapt", function (ob) {
+        if (isSupportFlex) {
+            // 有滚动条的情况下需要用到flex_wrapper_center布局
+            if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
+                // 不是IE用flex_wrapper_center布局
+                if (!BI.isIE()) {
+                    return BI.extend({}, ob, {type: "bi.flex_wrapper_center"});
+                }
+                return ob;
+            }
+            return BI.extend(ob, {type: "bi.flex_center"});
+        }
+        return ob;
+        
+    });
+    // 注册滚动条
+    BI.Plugin.registerWidget("bi.grid_table_scrollbar", function (ob) {
+        if (BI.isIE9Below()) {
+            return BI.extend(ob, {type: "bi.native_table_scrollbar"});
+        }
+        return ob;
+        
+    });
+    BI.Plugin.registerWidget("bi.grid_table_horizontal_scrollbar", function (ob) {
+        if (BI.isIE9Below()) {
+            return BI.extend(ob, {type: "bi.native_table_horizontal_scrollbar"});
+        }
+        return ob;
+        
+    });
+
+    // 注册控件
+    BI.Plugin.registerWidget("bi.grid_table", function (ob) {
+        // 非chrome下滚动条滑动效果不好，禁止掉
+        if (!(BI.isChrome() && BI.isWindows() && !BI.isEdge())) {
+            return BI.extend(ob, {type: "bi.quick_grid_table"});
+        }
+        return ob;
+        
+    });
+    BI.Plugin.registerWidget("bi.collection_table", function (ob) {
+        // 非chrome下滚动条滑动效果不好，禁止掉
+        if (!(BI.isChrome() && BI.isWindows() && !BI.isEdge())) {
+            return BI.extend(ob, {type: "bi.quick_collection_table"});
+        }
+        return ob;
+        
+    });
+    // IE8下滚动条用原生的
+    $(function () {
+        if (BI.isIE9Below()) {
+            BI.GridTableScrollbar.SIZE = 18;
+        }
+    });
+}());/**
  * guy
  * 控制器
  * Controller层超类
@@ -20761,63 +20912,7 @@ BI.HorizontalFillLayoutLogic = BI.inherit(BI.Logic, {
     _init: function () {
         BI.HorizontalFillLayoutLogic.superclass._init.apply(this, arguments);
     }
-});BI.Plugin = BI.Plugin || {};
-!(function () {
-    var _WidgetsPlugin = {};
-    var _ObjectPlugin = {};
-    BI.extend(BI.Plugin, {
-
-        getWidget: function (type, options) {
-            if (_WidgetsPlugin[type]) {
-                var res;
-                for (var i = _WidgetsPlugin[type].length - 1; i >= 0; i--) {
-                    if (res = _WidgetsPlugin[type][i](options)) {
-                        return res;
-                    }
-                }
-            }
-            return options;
-        },
-
-        registerWidget: function (type, fn) {
-            if (!_WidgetsPlugin[type]) {
-                _WidgetsPlugin[type] = [];
-            }
-            if (_WidgetsPlugin[type].length > 0) {
-                console.log("组件已经注册过了!");
-            }
-            _WidgetsPlugin[type].push(fn);
-        },
-
-        relieveWidget: function (type) {
-            delete _WidgetsPlugin[type];
-        },
-
-        getObject: function (type, object) {
-            if (_ObjectPlugin[type]) {
-                var res;
-                for (var i = 0, len = _ObjectPlugin[type].length; i < len; i++) {
-                    res = _ObjectPlugin[type][i](object);
-                }
-            }
-            return res || object;
-        },
-
-        registerObject: function (type, fn) {
-            if (!_ObjectPlugin[type]) {
-                _ObjectPlugin[type] = [];
-            }
-            if (_ObjectPlugin[type].length > 0) {
-                console.log("对象已经注册过了!");
-            }
-            _ObjectPlugin[type].push(fn);
-        },
-
-        relieveObject: function (type) {
-            delete _ObjectPlugin[type];
-        }
-    });
-})();/**
+});/**
  * 对数组对象的扩展
  * @class Array
  */

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "fineui",
   "main": "index.js",
   "dependencies": {},

src/css/base/single/icon.css

@@ -0,0 +1,3 @@
+.x-icon.b-font {
+  margin: auto;
+}

src/css/core/normalize2.css

@@ -34,11 +34,6 @@ textarea {
   margin: 0;
   padding: 0;
   outline: none;
-  border: 1px solid #d4dadd;
-}
-.bi-theme-dark input,
-.bi-theme-dark textarea {
-  border: 1px solid #525466;
 }
 ul {
   list-style: disc;

src/css/core/utils/common.css

@@ -1,3 +1,11 @@
+input,
+textarea {
+  border: 1px solid #d4dadd;
+}
+.bi-theme-dark input,
+.bi-theme-dark textarea {
+  border: 1px solid #525466;
+}
 .base-disabled {
   cursor: default !important;
   color: #9ea6b2 !important;

src/css/core/wrapper/flex.center.css

@@ -38,6 +38,3 @@
   -o-align-items: center;
   align-items: center;
 }
-.bi-flex-center-layout > * {
-  margin: auto;
-}

src/css/core/wrapper/flex.css

@@ -38,9 +38,6 @@
   -o-align-items: center;
   align-items: center;
 }
-.bi-flex-center-layout > * {
-  margin: auto;
-}
 
 .bi-flex-horizontal-layout {
   display: box;
@@ -112,9 +109,6 @@
   -o-align-items: flex-end;
   align-items: flex-end;
 }
-.bi-flex-horizontal-layout > * {
-  margin: auto;
-}
 
 .bi-flex-vertical-center {
   display: box;
@@ -192,9 +186,6 @@
   -o-align-items: stretch;
   align-items: stretch;
 }
-.bi-flex-vertical-center > * {
-  margin: auto;
-}
 
 .bi-flex-wrapper-center-layout .flex-wrapper-center-layout-wrapper {
   display: box;
@@ -239,9 +230,6 @@
   min-height: 100%;
   float: left;
 }
-.bi-flex-wrapper-center-layout > * {
-  margin: auto;
-}
 
 .bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper {
   display: box;
@@ -312,9 +300,6 @@
   -o-align-items: flex-end;
   align-items: flex-end;
 }
-.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper > * {
-  margin: auto;
-}
 
 .bi-flex-wrapper-vertical-center .flex-wrapper-vertical-center-wrapper {
   display: box;
@@ -393,6 +378,3 @@
   -o-align-items: stretch;
   align-items: stretch;
 }
-.bi-flex-wrapper-vertical-center .flex-wrapper-vertical-center-wrapper > * {
-  margin: auto;
-}

src/css/core/wrapper/flex.horizontal.css

@@ -68,6 +68,3 @@
   -o-align-items: flex-end;
   align-items: flex-end;
 }
-.bi-flex-horizontal-layout > * {
-  margin: auto;
-}

src/css/core/wrapper/flex.vertical.center.css

@@ -74,6 +74,3 @@
   -o-align-items: stretch;
   align-items: stretch;
 }
-.bi-flex-vertical-center > * {
-  margin: auto;
-}

src/css/core/wrapper/flex.wrapper.center.css

@@ -41,6 +41,3 @@
   min-height: 100%;
   float: left;
 }
-.bi-flex-wrapper-center-layout > * {
-  margin: auto;
-}

src/css/core/wrapper/flex.wrapper.horizontal.css

@@ -67,6 +67,3 @@
   -o-align-items: flex-end;
   align-items: flex-end;
 }
-.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper > * {
-  margin: auto;
-}

src/css/core/wrapper/flex.wrapper.vertical.center.css

@@ -75,6 +75,3 @@
   -o-align-items: stretch;
   align-items: stretch;
 }
-.bi-flex-wrapper-vertical-center .flex-wrapper-vertical-center-wrapper > * {
-  margin: auto;
-}

src/css/core/wrapper/inline.center.css

@@ -1,7 +0,0 @@
-.bi-inline-center-adapt-layout:after {
-  display: inline-block;
-  width: 0;
-  min-height: 100%;
-  vertical-align: middle;
-  content: ' ';
-}

src/css/core/wrapper/inline.css

@@ -1,15 +0,0 @@
-.bi-inline-center-adapt-layout:after {
-  display: inline-block;
-  width: 0;
-  min-height: 100%;
-  vertical-align: middle;
-  content: ' ';
-}
-
-.bi-inline-vertical-adapt-layout:after {
-  display: inline-block;
-  width: 0;
-  min-height: 100%;
-  vertical-align: middle;
-  content: ' ';
-}

src/css/core/wrapper/inline.vertical.css

@@ -1,7 +0,0 @@
-.bi-inline-vertical-adapt-layout:after {
-  display: inline-block;
-  width: 0;
-  min-height: 100%;
-  vertical-align: middle;
-  content: ' ';
-}

src/less/base/single/icon.less

@@ -0,0 +1,3 @@
+.x-icon.b-font {
+  margin: auto;
+}

src/less/core/normalize2.less

@@ -1,6 +1,16 @@
 @import "../index";
 
-html, body, div, ul, ol, li, img, a, span, p, * {
+html,
+body,
+div,
+ul,
+ol,
+li,
+img,
+a,
+span,
+p,
+* {
   margin: 0;
   padding: 0;
 }
@@ -32,14 +42,6 @@ textarea {
   margin: 0;
   padding: 0;
   outline: none;
-  border: 1px solid @color-bi-border-line;
-}
-
-.bi-theme-dark {
-  input,
-  textarea {
-    border: 1px solid @color-bi-border-line-theme-dark;
-  }
 }
 
 ul {

src/less/core/utils/common.less

@@ -1,5 +1,17 @@
 @import "../../index";
 
+input,
+textarea {
+  border: 1px solid @color-bi-border-line;
+}
+
+.bi-theme-dark {
+  input,
+  textarea {
+    border: 1px solid @color-bi-border-line-theme-dark;
+  }
+}
+
 .base-disabled {
   cursor: default !important;
   color: @color-bi-text-disabled !important;

src/less/core/wrapper/flex.center.less

@@ -34,7 +34,4 @@
   -ms-align-items: center;
   -o-align-items: center;
   align-items: center;
-  > * {
-    margin: auto;
-  }
 }

src/less/core/wrapper/flex.horizontal.less

@@ -66,7 +66,4 @@
     -o-align-items: flex-end;
     align-items: flex-end;
   }
-  > * {
-    margin: auto;
-  }
 }

src/less/core/wrapper/flex.vertical.center.less

@@ -73,7 +73,4 @@
     -o-align-items: stretch;
     align-items: stretch;
   }
-  > * {
-    margin: auto;
-  }
 }

src/less/core/wrapper/flex.wrapper.center.less

@@ -39,7 +39,4 @@
     min-height: 100%;
     float: left;
   }
-  > * {
-    margin: auto;
-  }
 }

src/less/core/wrapper/flex.wrapper.horizontal.less

@@ -66,8 +66,5 @@
       -o-align-items: flex-end;
       align-items: flex-end;
     }
-    > * {
-      margin: auto;
-    }
   }
 }

src/less/core/wrapper/flex.wrapper.vertical.center.less

@@ -76,8 +76,5 @@
       -o-align-items: stretch;
       align-items: stretch;
     }
-    > * {
-      margin: auto;
-    }
   }
 }

src/less/core/wrapper/inline.center.less

@@ -1,11 +0,0 @@
-@import "../../index";
-
-.bi-inline-center-adapt-layout{
-  &:after{
-    display:inline-block;
-    width:0;
-    min-height:100%;
-    vertical-align:middle;
-    content:' ';
-  }
-}

src/less/core/wrapper/inline.vertical.less

@@ -1,11 +0,0 @@
-@import "../../index";
-
-.bi-inline-vertical-adapt-layout{
-  &:after{
-    display:inline-block;
-    width:0;
-    min-height:100%;
-    vertical-align:middle;
-    content:' ';
-  }
-}

src/less/image.less

@@ -340,7 +340,7 @@
   }
 }
 
-.icon_custom_select(@class, @iconPath, @hoverPath:none, @selectPath) {
+.icon_custom_select(@class, @iconPath, @hoverPath:none, @activePath, @selectPath) {
   .@{class} {
     & .x-icon {
       display: block;