update

Gruntfile.js

@@ -26,10 +26,11 @@ 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",
-                    "src/data/**/*.js"
+                    "src/data/**/*.js",
                 ],
                 dest: "dist/core.js"
             },

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

src/css/resource/font.css

@@ -1,7 +1,6 @@
 @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');
-  
   /*  iOS 4.1- */
 }
 .b-font {