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

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

* commit '2f6a905355f005033589d54a8baf5896ed14d952':
  网格布局
  add
  整理
  少属性
es6
guy 8 years ago
parent
2ab32638d5 2f6a905355
commit
b6dda0048a
20 changed files with 403 additions and 51 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. 6
      bi/base.js
  2. 76
      bi/core.css
  3. 41
      bi/widget.js
  4. 6
      docs/base.js
  5. 76
      docs/core.css
  6. 41
      docs/widget.js
  7. 6
      src/base/single/editor/editor.code.js
  8. 76
      src/css/core/utils/common.css
  9. 67
      src/less/core/utils/common.less
  10. 27
      src/widget/arrangement/arrangement.js
  11. 1
      src/widget/multilayerselecttree/node/node.first.plus.js
  12. 1
      src/widget/multilayerselecttree/node/node.last.plus.js
  13. 1
      src/widget/multilayerselecttree/node/node.mid.plus.js
  14. 1
      src/widget/multilayersingletree/node/node.first.plus.js
  15. 1
      src/widget/multilayersingletree/node/node.last.plus.js
  16. 1
      src/widget/multilayersingletree/node/node.mid.plus.js
  17. 1
      src/widget/multilayersingletree/treeitem/item.first.treeleaf.js
  18. 1
      src/widget/multilayersingletree/treeitem/item.last.treeleaf.js
  19. 1
      src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js
  20. 5
      src/widget/responsivetable/responsivetable.js

6
bi/base.js
Unescape View File

@ -17715,7 +17715,8 @@ BI.CodeEditor = BI.inherit(BI.Single, {
baseCls: 'bi-code-editor bi-card',
value: '',
watermark: "",
lineHeight: 2
lineHeight: 2,
readOnly: false
});
},
_init: function () {
@ -17724,7 +17725,8 @@ BI.CodeEditor = BI.inherit(BI.Single, {
this.editor = CodeMirror(this.element[0], {
textWrapping: true,
lineWrapping: true,
lineNumbers: false
lineNumbers: false,
readOnly: o.readOnly
});
o.lineHeight === 1 ? this.element.addClass("codemirror-low-line-height") : this.element.addClass("codemirror-high-line-height");
this.editor.on("change", function (cm, change) {

76
bi/core.css
Unescape View File

@ -3484,6 +3484,82 @@ i {
.bi-theme-dark .bi-list-item-select.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-none:hover,
.bi-list-item-none.hover {
color: inherit;
background-color: inherit;
}
.bi-list-item-none:hover .bi-input,
.bi-list-item-none.hover .bi-input {
color: inherit;
}
.bi-list-item-none:active,
.bi-list-item-none.active {
color: inherit;
background-color: inherit;
}
.bi-list-item-none:active .bi-input,
.bi-list-item-none.active .bi-input {
color: inherit;
}
.bi-list-item-none:active .bi-high-light,
.bi-list-item-none.active .bi-high-light {
color: inherit;
}
.bi-list-item-none.disabled,
.bi-list-item-none.disabled:hover,
.bi-list-item-none.disabled:active {
color: #cccccc !important;
background-color: transparent !important;
}
.bi-list-item-none.disabled .bi-input,
.bi-list-item-none.disabled:hover .bi-input,
.bi-list-item-none.disabled:active .bi-input {
color: #cccccc !important;
}
.bi-list-item-none.disabled .bi-high-light,
.bi-list-item-none.disabled:hover .bi-high-light,
.bi-list-item-none.disabled:active .bi-high-light {
color: #cccccc !important;
}
.bi-theme-dark .bi-list-item-none:hover,
.bi-theme-dark .bi-list-item-none.hover {
color: inherit;
background-color: inherit;
}
.bi-theme-dark .bi-list-item-none:hover .bi-input,
.bi-theme-dark .bi-list-item-none.hover .bi-input {
color: inherit;
}
.bi-theme-dark .bi-list-item-none:active,
.bi-theme-dark .bi-list-item-none.active {
color: inherit;
background-color: inherit;
}
.bi-theme-dark .bi-list-item-none:active .bi-input,
.bi-theme-dark .bi-list-item-none.active .bi-input {
color: inherit;
}
.bi-theme-dark .bi-list-item-none:active .bi-high-light,
.bi-theme-dark .bi-list-item-none.active .bi-high-light {
color: inherit;
}
.bi-theme-dark .bi-list-item-none.disabled,
.bi-theme-dark .bi-list-item-none.disabled:hover,
.bi-theme-dark .bi-list-item-none.disabled:active {
background-color: transparent !important;
color: #666666 !important;
}
.bi-theme-dark .bi-list-item-none.disabled .bi-input,
.bi-theme-dark .bi-list-item-none.disabled:hover .bi-input,
.bi-theme-dark .bi-list-item-none.disabled:active .bi-input {
color: #666666 !important;
}
.bi-theme-dark .bi-list-item-none.disabled .bi-high-light,
.bi-theme-dark .bi-list-item-none.disabled:hover .bi-high-light,
.bi-theme-dark .bi-list-item-none.disabled:active .bi-high-light {
color: #666666 !important;
}
/*****************cursor*****************/
.cursor-pointer {
cursor: pointer;

41
bi/widget.js
Unescape View File

@ -2998,13 +2998,17 @@ BI.Arrangement = BI.inherit(BI.Widget, {
_getOneWidthPortion: function () {
return this.getClientWidth() / BI.Arrangement.PORTION;
},
_getOneHeightPortion: function () {
return this.getClientHeight() / BI.Arrangement.H_PORTION;
},
_getGridPositionAndSize: function (position) {
var perWidth = this._getOneWidthPortion();
var perHeight = this._getOneHeightPortion();
var widthPortion = Math.round(position.width / perWidth);
var leftPortion = Math.round(position.left / perWidth);
var topPortion = Math.round(position.top / BI.Arrangement.GRID_HEIGHT);
var heightPortion = Math.round(position.height / BI.Arrangement.GRID_HEIGHT);
var topPortion = Math.round(position.top / perHeight);
var heightPortion = Math.round(position.height / perHeight);
// if (leftPortion > BI.Arrangement.PORTION) {
// leftPortion = BI.Arrangement.PORTION;
// }
@ -3030,11 +3034,12 @@ BI.Arrangement = BI.inherit(BI.Widget, {
_getBlockPositionAndSize: function (position) {
var perWidth = this._getOneWidthPortion();
var perHeight = this._getOneHeightPortion();
return {
left: position.x * perWidth,
top: position.y * BI.Arrangement.GRID_HEIGHT,
top: position.y * perHeight,
width: position.w * perWidth,
height: position.h * BI.Arrangement.GRID_HEIGHT
height: position.h * perHeight
};
},
@ -3721,12 +3726,15 @@ BI.Arrangement = BI.inherit(BI.Widget, {
break;
case BI.Arrangement.LAYOUT_TYPE.GRID:
if (this._isArrangeFine()) {
var width = this.getClientWidth();
var width = this.getClientWidth(), height = this.getClientHeight();
var xRatio = (ratio.x || 1) * width / (occupied.left + occupied.width);
var yRatio = (ratio.y || 1) * height / (occupied.top + occupied.height);
var regions = this._cloneRegion();
BI.each(regions, function (i, region) {
region.left = region.left * xRatio;
region.width = region.width * xRatio;
region.top = region.top * yRatio;
region.height = region.height * yRatio;
});
if (this._test(regions)) {
var layout = this._getLayoutsByRegions(regions);
@ -3861,6 +3869,7 @@ BI.Arrangement = BI.inherit(BI.Widget, {
case BI.Arrangement.LAYOUT_TYPE.FREE:
break;
case BI.Arrangement.LAYOUT_TYPE.GRID:
var perHeight = this._getOneHeightPortion();
var width = this.getClientWidth(), height = this.getClientHeight();
var regions = this._cloneRegion();
var clone = BI.toArray(regions);
@ -3877,10 +3886,10 @@ BI.Arrangement = BI.inherit(BI.Widget, {
BI.each(clone, function (i, region) {
var row = Math.floor(i / 3), col = i % 3;
BI.extend(region, {
top: row * 380,
top: row * perHeight * 6,
left: col * w,
width: w,
height: 380
height: perHeight * 6
});
if (!store[row]) {
store[row] = {};
@ -3930,8 +3939,8 @@ BI.Arrangement = BI.inherit(BI.Widget, {
});
BI.Arrangement.EVENT_SCROLL = "EVENT_SCROLL";
BI.extend(BI.Arrangement, {
PORTION: 24,
GRID_HEIGHT: 60,
PORTION: 32,
H_PORTION: 18,
LAYOUT_TYPE: {
ADAPTIVE: 0,
FREE: 1,
@ -8302,6 +8311,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
var self = this, o = this.options;
this.node = BI.createWidget({
type: "bi.select_tree_first_plus_group_node",
cls: "bi-list-item-none",
stopPropagation: true,
logic: {
dynamic: true
@ -8395,6 +8405,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
var self = this, o = this.options;
this.node = BI.createWidget({
type: "bi.select_tree_last_plus_group_node",
cls: "bi-list-item-none",
stopPropagation: true,
logic: {
dynamic: true
@ -8484,6 +8495,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
var self = this, o = this.options;
this.node = BI.createWidget({
type: "bi.select_tree_mid_plus_group_node",
cls: "bi-list-item-none",
stopPropagation: true,
logic: {
dynamic: true
@ -8843,6 +8855,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
var self = this, o = this.options;
this.node = BI.createWidget({
type: "bi.first_plus_group_node",
cls: "bi-list-item-none",
logic: {
dynamic: true
},
@ -8925,6 +8938,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
var self = this, o = this.options;
this.node = BI.createWidget({
type: "bi.last_plus_group_node",
cls: "bi-list-item-none",
logic: {
dynamic: true
},
@ -9007,6 +9021,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
var self = this, o = this.options;
this.node = BI.createWidget({
type: "bi.mid_plus_group_node",
cls: "bi-list-item-none",
logic: {
dynamic: true
},
@ -9089,6 +9104,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, {
var self = this, o = this.options;
this.item = BI.createWidget({
type: "bi.first_tree_leaf_item",
cls: "bi-list-item-none",
logic: {
dynamic: true
},
@ -9184,6 +9200,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, {
var self = this, o = this.options;
this.item = BI.createWidget({
type: "bi.last_tree_leaf_item",
cls: "bi-list-item-none",
logic: {
dynamic: true
},
@ -9279,6 +9296,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, {
var self = this, o = this.options;
this.item = BI.createWidget({
type: "bi.mid_tree_leaf_item",
cls: "bi-list-item-none",
logic: {
dynamic: true
},
@ -15018,7 +15036,8 @@ BI.ResponisveTable = BI.inherit(BI.Widget, {
}
});
//因为有边框，所以加上数组长度的参数调整
var sumLeft = BI.sum(columnSizeLeft) + columnSizeLeft.length, sumRight = BI.sum(columnSizeRight) + columnSizeRight.length;
var sumLeft = BI.sum(columnSizeLeft) + columnSizeLeft.length,
sumRight = BI.sum(columnSizeRight) + columnSizeRight.length;
return {
sumLeft: sumLeft,
sumRight: sumRight,
@ -15222,11 +15241,9 @@ BI.ResponisveTable = BI.inherit(BI.Widget, {
this.table.populate.apply(this.table, arguments);
if (o.isNeedFreeze === true) {
BI.nextTick(function () {
if (self.element.is(":visible")) {
self._initRegionSize();
self.table.resize();
self._resizeHeader();
}
});
}
}

6
docs/base.js
Unescape View File

@ -17715,7 +17715,8 @@ BI.CodeEditor = BI.inherit(BI.Single, {
baseCls: 'bi-code-editor bi-card',
value: '',
watermark: "",
lineHeight: 2
lineHeight: 2,
readOnly: false
});
},
_init: function () {
@ -17724,7 +17725,8 @@ BI.CodeEditor = BI.inherit(BI.Single, {
this.editor = CodeMirror(this.element[0], {
textWrapping: true,
lineWrapping: true,
lineNumbers: false
lineNumbers: false,
readOnly: o.readOnly
});
o.lineHeight === 1 ? this.element.addClass("codemirror-low-line-height") : this.element.addClass("codemirror-high-line-height");
this.editor.on("change", function (cm, change) {

76
docs/core.css
Unescape View File

@ -3484,6 +3484,82 @@ i {
.bi-theme-dark .bi-list-item-select.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-none:hover,
.bi-list-item-none.hover {
color: inherit;
background-color: inherit;
}
.bi-list-item-none:hover .bi-input,
.bi-list-item-none.hover .bi-input {
color: inherit;
}
.bi-list-item-none:active,
.bi-list-item-none.active {
color: inherit;
background-color: inherit;
}
.bi-list-item-none:active .bi-input,
.bi-list-item-none.active .bi-input {
color: inherit;
}
.bi-list-item-none:active .bi-high-light,
.bi-list-item-none.active .bi-high-light {
color: inherit;
}
.bi-list-item-none.disabled,
.bi-list-item-none.disabled:hover,
.bi-list-item-none.disabled:active {
color: #cccccc !important;
background-color: transparent !important;
}
.bi-list-item-none.disabled .bi-input,
.bi-list-item-none.disabled:hover .bi-input,
.bi-list-item-none.disabled:active .bi-input {
color: #cccccc !important;
}
.bi-list-item-none.disabled .bi-high-light,
.bi-list-item-none.disabled:hover .bi-high-light,
.bi-list-item-none.disabled:active .bi-high-light {
color: #cccccc !important;
}
.bi-theme-dark .bi-list-item-none:hover,
.bi-theme-dark .bi-list-item-none.hover {
color: inherit;
background-color: inherit;
}
.bi-theme-dark .bi-list-item-none:hover .bi-input,
.bi-theme-dark .bi-list-item-none.hover .bi-input {
color: inherit;
}
.bi-theme-dark .bi-list-item-none:active,
.bi-theme-dark .bi-list-item-none.active {
color: inherit;
background-color: inherit;
}
.bi-theme-dark .bi-list-item-none:active .bi-input,
.bi-theme-dark .bi-list-item-none.active .bi-input {
color: inherit;
}
.bi-theme-dark .bi-list-item-none:active .bi-high-light,
.bi-theme-dark .bi-list-item-none.active .bi-high-light {
color: inherit;
}
.bi-theme-dark .bi-list-item-none.disabled,
.bi-theme-dark .bi-list-item-none.disabled:hover,
.bi-theme-dark .bi-list-item-none.disabled:active {
background-color: transparent !important;
color: #666666 !important;
}
.bi-theme-dark .bi-list-item-none.disabled .bi-input,
.bi-theme-dark .bi-list-item-none.disabled:hover .bi-input,
.bi-theme-dark .bi-list-item-none.disabled:active .bi-input {
color: #666666 !important;
}
.bi-theme-dark .bi-list-item-none.disabled .bi-high-light,
.bi-theme-dark .bi-list-item-none.disabled:hover .bi-high-light,
.bi-theme-dark .bi-list-item-none.disabled:active .bi-high-light {
color: #666666 !important;
}
/*****************cursor*****************/
.cursor-pointer {
cursor: pointer;

41
docs/widget.js
Unescape View File

@ -2998,13 +2998,17 @@ BI.Arrangement = BI.inherit(BI.Widget, {
_getOneWidthPortion: function () {
return this.getClientWidth() / BI.Arrangement.PORTION;
},
_getOneHeightPortion: function () {
return this.getClientHeight() / BI.Arrangement.H_PORTION;
},
_getGridPositionAndSize: function (position) {
var perWidth = this._getOneWidthPortion();
var perHeight = this._getOneHeightPortion();
var widthPortion = Math.round(position.width / perWidth);
var leftPortion = Math.round(position.left / perWidth);
var topPortion = Math.round(position.top / BI.Arrangement.GRID_HEIGHT);
var heightPortion = Math.round(position.height / BI.Arrangement.GRID_HEIGHT);
var topPortion = Math.round(position.top / perHeight);
var heightPortion = Math.round(position.height / perHeight);
// if (leftPortion > BI.Arrangement.PORTION) {
// leftPortion = BI.Arrangement.PORTION;
// }
@ -3030,11 +3034,12 @@ BI.Arrangement = BI.inherit(BI.Widget, {
_getBlockPositionAndSize: function (position) {
var perWidth = this._getOneWidthPortion();
var perHeight = this._getOneHeightPortion();
return {
left: position.x * perWidth,
top: position.y * BI.Arrangement.GRID_HEIGHT,
top: position.y * perHeight,
width: position.w * perWidth,
height: position.h * BI.Arrangement.GRID_HEIGHT
height: position.h * perHeight
};
},
@ -3721,12 +3726,15 @@ BI.Arrangement = BI.inherit(BI.Widget, {
break;
case BI.Arrangement.LAYOUT_TYPE.GRID:
if (this._isArrangeFine()) {
var width = this.getClientWidth();
var width = this.getClientWidth(), height = this.getClientHeight();
var xRatio = (ratio.x || 1) * width / (occupied.left + occupied.width);
var yRatio = (ratio.y || 1) * height / (occupied.top + occupied.height);
var regions = this._cloneRegion();
BI.each(regions, function (i, region) {
region.left = region.left * xRatio;
region.width = region.width * xRatio;
region.top = region.top * yRatio;
region.height = region.height * yRatio;
});
if (this._test(regions)) {
var layout = this._getLayoutsByRegions(regions);
@ -3861,6 +3869,7 @@ BI.Arrangement = BI.inherit(BI.Widget, {
case BI.Arrangement.LAYOUT_TYPE.FREE:
break;
case BI.Arrangement.LAYOUT_TYPE.GRID:
var perHeight = this._getOneHeightPortion();
var width = this.getClientWidth(), height = this.getClientHeight();
var regions = this._cloneRegion();
var clone = BI.toArray(regions);
@ -3877,10 +3886,10 @@ BI.Arrangement = BI.inherit(BI.Widget, {
BI.each(clone, function (i, region) {
var row = Math.floor(i / 3), col = i % 3;
BI.extend(region, {
top: row * 380,
top: row * perHeight * 6,
left: col * w,
width: w,
height: 380
height: perHeight * 6
});
if (!store[row]) {
store[row] = {};
@ -3930,8 +3939,8 @@ BI.Arrangement = BI.inherit(BI.Widget, {
});
BI.Arrangement.EVENT_SCROLL = "EVENT_SCROLL";
BI.extend(BI.Arrangement, {
PORTION: 24,
GRID_HEIGHT: 60,
PORTION: 32,
H_PORTION: 18,
LAYOUT_TYPE: {
ADAPTIVE: 0,
FREE: 1,
@ -8302,6 +8311,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
var self = this, o = this.options;
this.node = BI.createWidget({
type: "bi.select_tree_first_plus_group_node",
cls: "bi-list-item-none",
stopPropagation: true,
logic: {
dynamic: true
@ -8395,6 +8405,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
var self = this, o = this.options;
this.node = BI.createWidget({
type: "bi.select_tree_last_plus_group_node",
cls: "bi-list-item-none",
stopPropagation: true,
logic: {
dynamic: true
@ -8484,6 +8495,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
var self = this, o = this.options;
this.node = BI.createWidget({
type: "bi.select_tree_mid_plus_group_node",
cls: "bi-list-item-none",
stopPropagation: true,
logic: {
dynamic: true
@ -8843,6 +8855,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
var self = this, o = this.options;
this.node = BI.createWidget({
type: "bi.first_plus_group_node",
cls: "bi-list-item-none",
logic: {
dynamic: true
},
@ -8925,6 +8938,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
var self = this, o = this.options;
this.node = BI.createWidget({
type: "bi.last_plus_group_node",
cls: "bi-list-item-none",
logic: {
dynamic: true
},
@ -9007,6 +9021,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
var self = this, o = this.options;
this.node = BI.createWidget({
type: "bi.mid_plus_group_node",
cls: "bi-list-item-none",
logic: {
dynamic: true
},
@ -9089,6 +9104,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, {
var self = this, o = this.options;
this.item = BI.createWidget({
type: "bi.first_tree_leaf_item",
cls: "bi-list-item-none",
logic: {
dynamic: true
},
@ -9184,6 +9200,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, {
var self = this, o = this.options;
this.item = BI.createWidget({
type: "bi.last_tree_leaf_item",
cls: "bi-list-item-none",
logic: {
dynamic: true
},
@ -9279,6 +9296,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, {
var self = this, o = this.options;
this.item = BI.createWidget({
type: "bi.mid_tree_leaf_item",
cls: "bi-list-item-none",
logic: {
dynamic: true
},
@ -15018,7 +15036,8 @@ BI.ResponisveTable = BI.inherit(BI.Widget, {
}
});
//因为有边框，所以加上数组长度的参数调整
var sumLeft = BI.sum(columnSizeLeft) + columnSizeLeft.length, sumRight = BI.sum(columnSizeRight) + columnSizeRight.length;
var sumLeft = BI.sum(columnSizeLeft) + columnSizeLeft.length,
sumRight = BI.sum(columnSizeRight) + columnSizeRight.length;
return {
sumLeft: sumLeft,
sumRight: sumRight,
@ -15222,11 +15241,9 @@ BI.ResponisveTable = BI.inherit(BI.Widget, {
this.table.populate.apply(this.table, arguments);
if (o.isNeedFreeze === true) {
BI.nextTick(function () {
if (self.element.is(":visible")) {
self._initRegionSize();
self.table.resize();
self._resizeHeader();
}
});
}
}

6
src/base/single/editor/editor.code.js
Unescape View File

@ -10,7 +10,8 @@ BI.CodeEditor = BI.inherit(BI.Single, {
baseCls: 'bi-code-editor bi-card',
value: '',
watermark: "",
lineHeight: 2
lineHeight: 2,
readOnly: false
});
},
_init: function () {
@ -19,7 +20,8 @@ BI.CodeEditor = BI.inherit(BI.Single, {
this.editor = CodeMirror(this.element[0], {
textWrapping: true,
lineWrapping: true,
lineNumbers: false
lineNumbers: false,
readOnly: o.readOnly
});
o.lineHeight === 1 ? this.element.addClass("codemirror-low-line-height") : this.element.addClass("codemirror-high-line-height");
this.editor.on("change", function (cm, change) {

76
src/css/core/utils/common.css
Unescape View File

@ -538,3 +538,79 @@
.bi-theme-dark .bi-list-item-select.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-none:hover,
.bi-list-item-none.hover {
color: inherit;
background-color: inherit;
}
.bi-list-item-none:hover .bi-input,
.bi-list-item-none.hover .bi-input {
color: inherit;
}
.bi-list-item-none:active,
.bi-list-item-none.active {
color: inherit;
background-color: inherit;
}
.bi-list-item-none:active .bi-input,
.bi-list-item-none.active .bi-input {
color: inherit;
}
.bi-list-item-none:active .bi-high-light,
.bi-list-item-none.active .bi-high-light {
color: inherit;
}
.bi-list-item-none.disabled,
.bi-list-item-none.disabled:hover,
.bi-list-item-none.disabled:active {
color: #cccccc !important;
background-color: transparent !important;
}
.bi-list-item-none.disabled .bi-input,
.bi-list-item-none.disabled:hover .bi-input,
.bi-list-item-none.disabled:active .bi-input {
color: #cccccc !important;
}
.bi-list-item-none.disabled .bi-high-light,
.bi-list-item-none.disabled:hover .bi-high-light,
.bi-list-item-none.disabled:active .bi-high-light {
color: #cccccc !important;
}
.bi-theme-dark .bi-list-item-none:hover,
.bi-theme-dark .bi-list-item-none.hover {
color: inherit;
background-color: inherit;
}
.bi-theme-dark .bi-list-item-none:hover .bi-input,
.bi-theme-dark .bi-list-item-none.hover .bi-input {
color: inherit;
}
.bi-theme-dark .bi-list-item-none:active,
.bi-theme-dark .bi-list-item-none.active {
color: inherit;
background-color: inherit;
}
.bi-theme-dark .bi-list-item-none:active .bi-input,
.bi-theme-dark .bi-list-item-none.active .bi-input {
color: inherit;
}
.bi-theme-dark .bi-list-item-none:active .bi-high-light,
.bi-theme-dark .bi-list-item-none.active .bi-high-light {
color: inherit;
}
.bi-theme-dark .bi-list-item-none.disabled,
.bi-theme-dark .bi-list-item-none.disabled:hover,
.bi-theme-dark .bi-list-item-none.disabled:active {
background-color: transparent !important;
color: #666666 !important;
}
.bi-theme-dark .bi-list-item-none.disabled .bi-input,
.bi-theme-dark .bi-list-item-none.disabled:hover .bi-input,
.bi-theme-dark .bi-list-item-none.disabled:active .bi-input {
color: #666666 !important;
}
.bi-theme-dark .bi-list-item-none.disabled .bi-high-light,
.bi-theme-dark .bi-list-item-none.disabled:hover .bi-high-light,
.bi-theme-dark .bi-list-item-none.disabled:active .bi-high-light {
color: #666666 !important;
}

67
src/less/core/utils/common.less
Unescape View File

@ -551,3 +551,70 @@
}
}
}
//去掉list-item效果
.bi-list-item-none {
&:hover, &.hover {
color: inherit;
& .bi-input {
color: inherit;
}
background-color: inherit;
}
&:active, &.active {
color: inherit;
& .bi-input {
color: inherit;
}
background-color: inherit;
& .bi-high-light {
color: inherit;
}
}
&.disabled {
&, &:hover, &:active {
color: @color-bi-text-disabled !important;
& .bi-input {
color: @color-bi-text-disabled !important;
}
background-color: transparent !important;
& .bi-high-light {
color: @color-bi-text-disabled !important;
}
}
}
}
.bi-theme-dark {
.bi-list-item-none {
&:hover, &.hover {
color: inherit;
& .bi-input {
color: inherit;
}
background-color: inherit;
}
&:active, &.active {
color: inherit;
& .bi-input {
color: inherit;
}
background-color: inherit;
& .bi-high-light {
color: inherit;
}
}
&.disabled {
&, &:hover, &:active {
background-color: transparent !important;
color: @color-bi-text-disabled-theme-dark !important;
& .bi-input {
color: @color-bi-text-disabled-theme-dark !important;
}
& .bi-high-light {
color: @color-bi-text-disabled-theme-dark !important;
}
}
}
}
}

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

@ -2003,13 +2003,17 @@ BI.Arrangement = BI.inherit(BI.Widget, {
_getOneWidthPortion: function () {
return this.getClientWidth() / BI.Arrangement.PORTION;
},
_getOneHeightPortion: function () {
return this.getClientHeight() / BI.Arrangement.H_PORTION;
},
_getGridPositionAndSize: function (position) {
var perWidth = this._getOneWidthPortion();
var perHeight = this._getOneHeightPortion();
var widthPortion = Math.round(position.width / perWidth);
var leftPortion = Math.round(position.left / perWidth);
var topPortion = Math.round(position.top / BI.Arrangement.GRID_HEIGHT);
var heightPortion = Math.round(position.height / BI.Arrangement.GRID_HEIGHT);
var topPortion = Math.round(position.top / perHeight);
var heightPortion = Math.round(position.height / perHeight);
// if (leftPortion > BI.Arrangement.PORTION) {
// leftPortion = BI.Arrangement.PORTION;
// }
@ -2035,11 +2039,12 @@ BI.Arrangement = BI.inherit(BI.Widget, {
_getBlockPositionAndSize: function (position) {
var perWidth = this._getOneWidthPortion();
var perHeight = this._getOneHeightPortion();
return {
left: position.x * perWidth,
top: position.y * BI.Arrangement.GRID_HEIGHT,
top: position.y * perHeight,
width: position.w * perWidth,
height: position.h * BI.Arrangement.GRID_HEIGHT
height: position.h * perHeight
};
},
@ -2726,12 +2731,15 @@ BI.Arrangement = BI.inherit(BI.Widget, {
break;
case BI.Arrangement.LAYOUT_TYPE.GRID:
if (this._isArrangeFine()) {
var width = this.getClientWidth();
var width = this.getClientWidth(), height = this.getClientHeight();
var xRatio = (ratio.x || 1) * width / (occupied.left + occupied.width);
var yRatio = (ratio.y || 1) * height / (occupied.top + occupied.height);
var regions = this._cloneRegion();
BI.each(regions, function (i, region) {
region.left = region.left * xRatio;
region.width = region.width * xRatio;
region.top = region.top * yRatio;
region.height = region.height * yRatio;
});
if (this._test(regions)) {
var layout = this._getLayoutsByRegions(regions);
@ -2866,6 +2874,7 @@ BI.Arrangement = BI.inherit(BI.Widget, {
case BI.Arrangement.LAYOUT_TYPE.FREE:
break;
case BI.Arrangement.LAYOUT_TYPE.GRID:
var perHeight = this._getOneHeightPortion();
var width = this.getClientWidth(), height = this.getClientHeight();
var regions = this._cloneRegion();
var clone = BI.toArray(regions);
@ -2882,10 +2891,10 @@ BI.Arrangement = BI.inherit(BI.Widget, {
BI.each(clone, function (i, region) {
var row = Math.floor(i / 3), col = i % 3;
BI.extend(region, {
top: row * 380,
top: row * perHeight * 6,
left: col * w,
width: w,
height: 380
height: perHeight * 6
});
if (!store[row]) {
store[row] = {};
@ -2935,8 +2944,8 @@ BI.Arrangement = BI.inherit(BI.Widget, {
});
BI.Arrangement.EVENT_SCROLL = "EVENT_SCROLL";
BI.extend(BI.Arrangement, {
PORTION: 24,
GRID_HEIGHT: 60,
PORTION: 32,
H_PORTION: 18,
LAYOUT_TYPE: {
ADAPTIVE: 0,
FREE: 1,

1
src/widget/multilayerselecttree/node/node.first.plus.js
Unescape View File

@ -23,6 +23,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
var self = this, o = this.options;
this.node = BI.createWidget({
type: "bi.select_tree_first_plus_group_node",
cls: "bi-list-item-none",
stopPropagation: true,
logic: {
dynamic: true

1
src/widget/multilayerselecttree/node/node.last.plus.js
Unescape View File

@ -23,6 +23,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
var self = this, o = this.options;
this.node = BI.createWidget({
type: "bi.select_tree_last_plus_group_node",
cls: "bi-list-item-none",
stopPropagation: true,
logic: {
dynamic: true

1
src/widget/multilayerselecttree/node/node.mid.plus.js
Unescape View File

@ -23,6 +23,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
var self = this, o = this.options;
this.node = BI.createWidget({
type: "bi.select_tree_mid_plus_group_node",
cls: "bi-list-item-none",
stopPropagation: true,
logic: {
dynamic: true

1
src/widget/multilayersingletree/node/node.first.plus.js
Unescape View File

@ -22,6 +22,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
var self = this, o = this.options;
this.node = BI.createWidget({
type: "bi.first_plus_group_node",
cls: "bi-list-item-none",
logic: {
dynamic: true
},

1
src/widget/multilayersingletree/node/node.last.plus.js
Unescape View File

@ -22,6 +22,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
var self = this, o = this.options;
this.node = BI.createWidget({
type: "bi.last_plus_group_node",
cls: "bi-list-item-none",
logic: {
dynamic: true
},

1
src/widget/multilayersingletree/node/node.mid.plus.js
Unescape View File

@ -22,6 +22,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
var self = this, o = this.options;
this.node = BI.createWidget({
type: "bi.mid_plus_group_node",
cls: "bi-list-item-none",
logic: {
dynamic: true
},

1
src/widget/multilayersingletree/treeitem/item.first.treeleaf.js
Unescape View File

@ -22,6 +22,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, {
var self = this, o = this.options;
this.item = BI.createWidget({
type: "bi.first_tree_leaf_item",
cls: "bi-list-item-none",
logic: {
dynamic: true
},

1
src/widget/multilayersingletree/treeitem/item.last.treeleaf.js
Unescape View File

@ -22,6 +22,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, {
var self = this, o = this.options;
this.item = BI.createWidget({
type: "bi.last_tree_leaf_item",
cls: "bi-list-item-none",
logic: {
dynamic: true
},

1
src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js
Unescape View File

@ -22,6 +22,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, {
var self = this, o = this.options;
this.item = BI.createWidget({
type: "bi.mid_tree_leaf_item",
cls: "bi-list-item-none",
logic: {
dynamic: true
},

5
src/widget/responsivetable/responsivetable.js
Unescape View File

@ -147,7 +147,8 @@ BI.ResponisveTable = BI.inherit(BI.Widget, {
}
});
//因为有边框，所以加上数组长度的参数调整
var sumLeft = BI.sum(columnSizeLeft) + columnSizeLeft.length, sumRight = BI.sum(columnSizeRight) + columnSizeRight.length;
var sumLeft = BI.sum(columnSizeLeft) + columnSizeLeft.length,
sumRight = BI.sum(columnSizeRight) + columnSizeRight.length;
return {
sumLeft: sumLeft,
sumRight: sumRight,
@ -351,11 +352,9 @@ BI.ResponisveTable = BI.inherit(BI.Widget, {
this.table.populate.apply(this.table, arguments);
if (o.isNeedFreeze === true) {
BI.nextTick(function () {
if (self.element.is(":visible")) {
self._initRegionSize();
self.table.resize();
self._resizeHeader();
}
});
}
}

Write Preview
Loading…
Cancel
Save