fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

add

es6
guy 7 years ago
parent
462a3c546f
commit
818595a6a5
7 changed files with 52 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      bi/base.js
  2. 15
      bi/widget.js
  3. 4
      docs/base.js
  4. 10
      docs/resource.css
  5. 15
      docs/widget.js
  6. 4
      src/base/table/native.scrollbar.js
  7. 15
      src/widget/arrangement/arrangement.js

4
bi/base.js
Unescape View File

@ -28705,7 +28705,7 @@ BI.NativeTableScrollbar = BI.inherit(BI.Widget, {
render: function () {
var self = this, o = this.options;
//把滚动台size改掉
BI.GridTableScrollbar.SIZE = 16;
this.element.width(36);
var throttle = BI.throttle(function () {
self.fireEvent(BI.NativeTableScrollbar.EVENT_SCROLL, self.element.scrollTop());
@ -28781,7 +28781,7 @@ BI.NativeTableHorizontalScrollbar = BI.inherit(BI.Widget, {
render: function () {
var self = this, o = this.options;
//把滚动台size改掉
BI.GridTableScrollbar.SIZE = 16;
this.element.height(36);
var throttle = BI.throttle(function () {
self.fireEvent(BI.NativeTableScrollbar.EVENT_SCROLL, self.element.scrollLeft());

15
bi/widget.js
Unescape View File

@ -983,9 +983,9 @@ BI.Arrangement = BI.inherit(BI.Widget, {
case BI.Arrangement.LAYOUT_TYPE.FREE:
return true;
case BI.Arrangement.LAYOUT_TYPE.GRID:
if (this._isRegionOverlay()) {
return false;
}
// if (this._isRegionOverlay()) {
// return false;
// }
}
return true;
},
@ -1719,6 +1719,15 @@ BI.Arrangement = BI.inherit(BI.Widget, {
region.width = region.width * xRatio;
region.top = region.top * yRatio;
region.height = region.height * yRatio;
//做一下自适应布局到网格布局的兼容
var perWidth = this._getOneWidthPortion();
var widthPortion = Math.round(region.width / perWidth);
var leftPortion = Math.round(region.left / perWidth);
var comparePortion = Math.round((region.width + region.left) / perWidth);
if (leftPortion + widthPortion !== comparePortion) {
region.left = leftPortion * perWidth;
region.width = comparePortion * perWidth - region.left;
}
});
if (this._test(regions)) {
var layout = this._getLayoutsByRegions(regions);

4
docs/base.js
Unescape View File

@ -28705,7 +28705,7 @@ BI.NativeTableScrollbar = BI.inherit(BI.Widget, {
render: function () {
var self = this, o = this.options;
//把滚动台size改掉
BI.GridTableScrollbar.SIZE = 16;
this.element.width(36);
var throttle = BI.throttle(function () {
self.fireEvent(BI.NativeTableScrollbar.EVENT_SCROLL, self.element.scrollTop());
@ -28781,7 +28781,7 @@ BI.NativeTableHorizontalScrollbar = BI.inherit(BI.Widget, {
render: function () {
var self = this, o = this.options;
//把滚动台size改掉
BI.GridTableScrollbar.SIZE = 16;
this.element.height(36);
var throttle = BI.throttle(function () {
self.fireEvent(BI.NativeTableScrollbar.EVENT_SCROLL, self.element.scrollLeft());

10
docs/resource.css
Unescape View File

@ -122,6 +122,16 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/loading.gif');
_background: none;
}
.auto-color-background {
background: url('background/auto-color.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='background/auto-color.png');
_background: none;
}
.trans-color-background {
background: url('background/trans-color.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='background/trans-color.png');
_background: none;
}
@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');

15
docs/widget.js
Unescape View File

@ -983,9 +983,9 @@ BI.Arrangement = BI.inherit(BI.Widget, {
case BI.Arrangement.LAYOUT_TYPE.FREE:
return true;
case BI.Arrangement.LAYOUT_TYPE.GRID:
if (this._isRegionOverlay()) {
return false;
}
// if (this._isRegionOverlay()) {
// return false;
// }
}
return true;
},
@ -1719,6 +1719,15 @@ BI.Arrangement = BI.inherit(BI.Widget, {
region.width = region.width * xRatio;
region.top = region.top * yRatio;
region.height = region.height * yRatio;
//做一下自适应布局到网格布局的兼容
var perWidth = this._getOneWidthPortion();
var widthPortion = Math.round(region.width / perWidth);
var leftPortion = Math.round(region.left / perWidth);
var comparePortion = Math.round((region.width + region.left) / perWidth);
if (leftPortion + widthPortion !== comparePortion) {
region.left = leftPortion * perWidth;
region.width = comparePortion * perWidth - region.left;
}
});
if (this._test(regions)) {
var layout = this._getLayoutsByRegions(regions);

4
src/base/table/native.scrollbar.js
Unescape View File

@ -22,7 +22,7 @@ BI.NativeTableScrollbar = BI.inherit(BI.Widget, {
render: function () {
var self = this, o = this.options;
//把滚动台size改掉
BI.GridTableScrollbar.SIZE = 16;
this.element.width(36);
var throttle = BI.throttle(function () {
self.fireEvent(BI.NativeTableScrollbar.EVENT_SCROLL, self.element.scrollTop());
@ -98,7 +98,7 @@ BI.NativeTableHorizontalScrollbar = BI.inherit(BI.Widget, {
render: function () {
var self = this, o = this.options;
//把滚动台size改掉
BI.GridTableScrollbar.SIZE = 16;
this.element.height(36);
var throttle = BI.throttle(function () {
self.fireEvent(BI.NativeTableScrollbar.EVENT_SCROLL, self.element.scrollLeft());

15
src/widget/arrangement/arrangement.js
Unescape View File

@ -189,9 +189,9 @@ BI.Arrangement = BI.inherit(BI.Widget, {
case BI.Arrangement.LAYOUT_TYPE.FREE:
return true;
case BI.Arrangement.LAYOUT_TYPE.GRID:
if (this._isRegionOverlay()) {
return false;
}
// if (this._isRegionOverlay()) {
// return false;
// }
}
return true;
},
@ -925,6 +925,15 @@ BI.Arrangement = BI.inherit(BI.Widget, {
region.width = region.width * xRatio;
region.top = region.top * yRatio;
region.height = region.height * yRatio;
//做一下自适应布局到网格布局的兼容
var perWidth = this._getOneWidthPortion();
var widthPortion = Math.round(region.width / perWidth);
var leftPortion = Math.round(region.left / perWidth);
var comparePortion = Math.round((region.width + region.left) / perWidth);
if (leftPortion + widthPortion !== comparePortion) {
region.left = leftPortion * perWidth;
region.width = comparePortion * perWidth - region.left;
}
});
if (this._test(regions)) {
var layout = this._getLayoutsByRegions(regions);

Write Preview
Loading…
Cancel
Save