Browse Source

Merge pull request #27690 in DEC/fineui from master to feature/x

* commit 'c35411ba81b2f60308b5f42d63a30d9616dd4fcd':
  multi_select_lev的plus_button系统参数常量设置
  BI-105186:复选下拉框全选逻辑判断错误,type:2设置全选时,判断全选按钮选择状态需考虑选项
es6
superman 3 years ago
parent
commit
73c16a12ac
  1. 4
      src/case/checkbox/check.first.treenode.js
  2. 4
      src/case/checkbox/check.last.treenode.js
  3. 4
      src/case/checkbox/check.mid.treenode.js
  4. 4
      src/case/checkbox/check.treenode.js
  5. 2
      src/case/list/list.select.js

4
src/case/checkbox/check.first.treenode.js

@ -7,8 +7,8 @@ BI.FirstTreeNodeCheckbox = BI.inherit(BI.IconButton, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend( BI.FirstTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { return BI.extend( BI.FirstTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
extraCls: BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-solid-collapse-icon-type2" : "tree-collapse-icon-type2", extraCls: BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-solid-collapse-icon-type2" : "tree-collapse-icon-type2",
iconWidth: 24, iconWidth: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
iconHeight: 24 iconHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT
}); });
}, },

4
src/case/checkbox/check.last.treenode.js

@ -7,8 +7,8 @@ BI.LastTreeNodeCheckbox = BI.inherit(BI.IconButton, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.LastTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.LastTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
extraCls: BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-solid-collapse-icon-type4" : "tree-collapse-icon-type4", extraCls: BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-solid-collapse-icon-type4" : "tree-collapse-icon-type4",
iconWidth: 24, iconWidth: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
iconHeight: 24 iconHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT
}); });
}, },

4
src/case/checkbox/check.mid.treenode.js

@ -7,8 +7,8 @@ BI.MidTreeNodeCheckbox = BI.inherit(BI.IconButton, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend( BI.MidTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { return BI.extend( BI.MidTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
extraCls: BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-solid-collapse-icon-type3" : "tree-collapse-icon-type3", extraCls: BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-solid-collapse-icon-type3" : "tree-collapse-icon-type3",
iconWidth: 24, iconWidth: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
iconHeight: 24 iconHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT
}); });
}, },

4
src/case/checkbox/check.treenode.js

@ -7,8 +7,8 @@ BI.TreeNodeCheckbox = BI.inherit(BI.IconButton, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend( BI.TreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { return BI.extend( BI.TreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
extraCls: BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-solid-collapse-icon-type1" : "tree-collapse-icon-type1", extraCls: BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-solid-collapse-icon-type1" : "tree-collapse-icon-type1",
iconWidth: 24, iconWidth: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
iconHeight: 24 iconHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT
}); });
}, },

2
src/case/list/list.select.js

@ -94,7 +94,7 @@ BI.SelectList = BI.inherit(BI.Widget, {
var hasNext = this.list.hasNext(); var hasNext = this.list.hasNext();
var isAlreadyAllSelected = this.toolbar.isSelected(); var isAlreadyAllSelected = this.toolbar.isSelected();
var isHalf = selectLength > 0 && notSelectLength > 0; var isHalf = selectLength > 0 && notSelectLength > 0;
var allSelected = isAlreadyAllSelected; var allSelected = selectLength > 0 && notSelectLength <= 0 && (!hasNext || isAlreadyAllSelected);
if (this.isAllSelected() === false) { if (this.isAllSelected() === false) {
hasNext && (isHalf = selectLength > 0); hasNext && (isHalf = selectLength > 0);

Loading…
Cancel
Save