guy 8 years ago
parent
commit
b130175f1a
  1. 20
      bi/core.js
  2. 20
      docs/core.js
  3. 8
      src/config.js
  4. 12
      src/core/base.js

20
bi/core.js

@ -2920,6 +2920,10 @@ if (!window.BI) {
return /(msie|trident)/i.test(navigator.userAgent.toLowerCase()); return /(msie|trident)/i.test(navigator.userAgent.toLowerCase());
}, },
isEdge: function () {
return /edge/i.test(navigator.userAgent.toLowerCase());
},
isChrome: function () { isChrome: function () {
return /chrome/i.test(navigator.userAgent.toLowerCase()); return /chrome/i.test(navigator.userAgent.toLowerCase());
}, },
@ -2940,6 +2944,14 @@ if (!window.BI) {
return /Konqueror|Safari|KHTML/i.test(navigator.userAgent); return /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
}, },
isMac: function () {
return /macintosh|mac os x/i.test(navigator.userAgent);
},
isWindows: function () {
return /windows|win32/i.test(navigator.userAgent);
},
isSupportCss3: function (style) { isSupportCss3: function (style) {
var prefix = ['webkit', 'Moz', 'ms', 'o'], var prefix = ['webkit', 'Moz', 'ms', 'o'],
i, len, i, len,
@ -17799,16 +17811,16 @@ $(function () {
//注册控件 //注册控件
BI.Plugin.registerWidget("bi.grid_table", function (ob) { BI.Plugin.registerWidget("bi.grid_table", function (ob) {
//IE下滚动条滑动效果不好,禁止掉 //非chrome下滚动条滑动效果不好,禁止掉
if (BI.isIE() || BI.isFireFox()) { if (!(BI.isChrome() && BI.isWindows())) {
return BI.extend(ob, {type: "bi.quick_grid_table"}); return BI.extend(ob, {type: "bi.quick_grid_table"});
} else { } else {
return ob; return ob;
} }
}); });
BI.Plugin.registerWidget("bi.collection_table", function (ob) { BI.Plugin.registerWidget("bi.collection_table", function (ob) {
//IE下滚动条滑动效果不好,禁止掉 //非chrome下滚动条滑动效果不好,禁止掉
if (BI.isIE() || BI.isFireFox()) { if (!(BI.isChrome() && BI.isWindows())) {
return BI.extend(ob, {type: "bi.quick_collection_table"}); return BI.extend(ob, {type: "bi.quick_collection_table"});
} else { } else {
return ob; return ob;

20
docs/core.js

@ -14062,6 +14062,10 @@ if (!window.BI) {
return /(msie|trident)/i.test(navigator.userAgent.toLowerCase()); return /(msie|trident)/i.test(navigator.userAgent.toLowerCase());
}, },
isEdge: function () {
return /edge/i.test(navigator.userAgent.toLowerCase());
},
isChrome: function () { isChrome: function () {
return /chrome/i.test(navigator.userAgent.toLowerCase()); return /chrome/i.test(navigator.userAgent.toLowerCase());
}, },
@ -14082,6 +14086,14 @@ if (!window.BI) {
return /Konqueror|Safari|KHTML/i.test(navigator.userAgent); return /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
}, },
isMac: function () {
return /macintosh|mac os x/i.test(navigator.userAgent);
},
isWindows: function () {
return /windows|win32/i.test(navigator.userAgent);
},
isSupportCss3: function (style) { isSupportCss3: function (style) {
var prefix = ['webkit', 'Moz', 'ms', 'o'], var prefix = ['webkit', 'Moz', 'ms', 'o'],
i, len, i, len,
@ -28941,16 +28953,16 @@ $(function () {
//注册控件 //注册控件
BI.Plugin.registerWidget("bi.grid_table", function (ob) { BI.Plugin.registerWidget("bi.grid_table", function (ob) {
//IE下滚动条滑动效果不好,禁止掉 //非chrome下滚动条滑动效果不好,禁止掉
if (BI.isIE() || BI.isFireFox()) { if (!(BI.isChrome() && BI.isWindows())) {
return BI.extend(ob, {type: "bi.quick_grid_table"}); return BI.extend(ob, {type: "bi.quick_grid_table"});
} else { } else {
return ob; return ob;
} }
}); });
BI.Plugin.registerWidget("bi.collection_table", function (ob) { BI.Plugin.registerWidget("bi.collection_table", function (ob) {
//IE下滚动条滑动效果不好,禁止掉 //非chrome下滚动条滑动效果不好,禁止掉
if (BI.isIE() || BI.isFireFox()) { if (!(BI.isChrome() && BI.isWindows())) {
return BI.extend(ob, {type: "bi.quick_collection_table"}); return BI.extend(ob, {type: "bi.quick_collection_table"});
} else { } else {
return ob; return ob;

8
src/config.js

@ -57,16 +57,16 @@ $(function () {
//注册控件 //注册控件
BI.Plugin.registerWidget("bi.grid_table", function (ob) { BI.Plugin.registerWidget("bi.grid_table", function (ob) {
//IE下滚动条滑动效果不好,禁止掉 //非chrome下滚动条滑动效果不好,禁止掉
if (BI.isIE() || BI.isFireFox()) { if (!(BI.isChrome() && BI.isWindows())) {
return BI.extend(ob, {type: "bi.quick_grid_table"}); return BI.extend(ob, {type: "bi.quick_grid_table"});
} else { } else {
return ob; return ob;
} }
}); });
BI.Plugin.registerWidget("bi.collection_table", function (ob) { BI.Plugin.registerWidget("bi.collection_table", function (ob) {
//IE下滚动条滑动效果不好,禁止掉 //非chrome下滚动条滑动效果不好,禁止掉
if (BI.isIE() || BI.isFireFox()) { if (!(BI.isChrome() && BI.isWindows())) {
return BI.extend(ob, {type: "bi.quick_collection_table"}); return BI.extend(ob, {type: "bi.quick_collection_table"});
} else { } else {
return ob; return ob;

12
src/core/base.js

@ -1025,6 +1025,10 @@ if (!window.BI) {
return /(msie|trident)/i.test(navigator.userAgent.toLowerCase()); return /(msie|trident)/i.test(navigator.userAgent.toLowerCase());
}, },
isEdge: function () {
return /edge/i.test(navigator.userAgent.toLowerCase());
},
isChrome: function () { isChrome: function () {
return /chrome/i.test(navigator.userAgent.toLowerCase()); return /chrome/i.test(navigator.userAgent.toLowerCase());
}, },
@ -1045,6 +1049,14 @@ if (!window.BI) {
return /Konqueror|Safari|KHTML/i.test(navigator.userAgent); return /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
}, },
isMac: function () {
return /macintosh|mac os x/i.test(navigator.userAgent);
},
isWindows: function () {
return /windows|win32/i.test(navigator.userAgent);
},
isSupportCss3: function (style) { isSupportCss3: function (style) {
var prefix = ['webkit', 'Moz', 'ms', 'o'], var prefix = ['webkit', 'Moz', 'ms', 'o'],
i, len, i, len,

Loading…
Cancel
Save