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

Merging in latest from upstream (VISUAL/fineui:refs/heads/master) 

* commit '833e15d309c2a043a51603eb888807ac3f38c7ac':
  update
  update
  Revert "update"
  Revert "update"
  Revert "update"
  Revert "Revert "update""
  Revert "update"
  Revert "Revert "update""
  Revert "update"
  update
  Revert "update"
  update
  build
  无JIRA任务,isParent 用 parent
  update
  update
es6
Frank.Qiu 6 years ago
parent
ae1b6062e7 833e15d309
commit
a11cb2723f
20 changed files with 213 additions and 146 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. 10
      demo/config.js
  2. 28
      dist/bundle.ie.js
  3. 36
      dist/bundle.ie.min.js
  4. 28
      dist/bundle.js
  5. 36
      dist/bundle.min.js
  6. 22
      dist/case.js
  7. 10
      dist/demo.js
  8. 28
      dist/fineui.ie.js
  9. 36
      dist/fineui.ie.min.js
  10. 28
      dist/fineui.js
  11. 36
      dist/fineui.min.js
  12. 25
      dist/fineui_without_jquery_polyfill.js
  13. 2
      dist/utils.min.js
  14. 6
      dist/widget.js
  15. 17
      src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js
  16. 2
      src/case/tree/tree.level.js
  17. 3
      src/case/tree/ztree/tree.display.js
  18. 2
      src/widget/multilayerselecttree/multilayerselecttree.leveltree.js
  19. 2
      src/widget/multilayersingletree/multilayersingletree.leveltree.js
  20. 2
      src/widget/selecttree/selecttree.popup.js

10
demo/config.js
Unescape View File

@ -1524,13 +1524,19 @@ Demo.CONSTANTS = {
{id: 121, pId: 12, value: "第三级目录1", text: "第三级目录1"},
{id: 122, pId: 12, value: "第三级文件1", text: "第三级文件1"},
{id: 1211, pId: 121, value: "第四级目录1", text: "第四级目录1"},
{id: 12111, pId: 1211, value: "第五级文件1", text: "第五级文件111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"},
{
id: 12111,
pId: 1211,
value: "第五级文件1",
text: "第五级文件111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"
},
{id: 2, pId: -1, value: "第一级目录2", text: "第一级目录2"},
{id: 21, pId: 2, value: "第二级目录3", text: "第二级目录3"},
{id: 22, pId: 2, value: "第二级文件2", text: "第二级文件2"},
{id: 211, pId: 21, value: "第三级目录2", text: "第三级目录2"},
{id: 212, pId: 21, value: "第三级文件2", text: "第三级文件2"},
{id: 2111, pId: 211, value: "第四级文件1", text: "第四级文件1"}],
{id: 2111, pId: 211, value: "第四级文件1", text: "第四级文件1"},
{id: 3, pId: -1, value: "第一级目录3", text: "第一级目录3", isParent: true}],
LEVELTREE: [{
id: 1,
text: "第一项",

28
dist/bundle.ie.js vendored
Unescape View File

@ -53789,7 +53789,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
this._createValueMap();
var value;
if(BI.isNotNull(o.value)){
if(BI.isNotNull(o.value)) {
value = this._digest(o.value);
}
this.trigger = BI.createWidget({
@ -53813,13 +53813,19 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
});
this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () {
self.setValue(self.combo.getValue()[0].value);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
var currentVal = self.combo.getValue()[0].value;
if (currentVal !== self.value) {
self.setValue(currentVal);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
}
});
this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () {
self.setValue(self.combo.getValue()[0].childValue);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
var currentVal = self.combo.getValue()[0].childValue;
if (currentVal !== self.value) {
self.setValue(currentVal);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
}
});
},
@ -53838,6 +53844,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
},
_digest: function (v) {
this.value = v;
return this.valueMap[v];
},
@ -57327,7 +57334,7 @@ BI.LevelTree = BI.inherit(BI.Widget, {
node.id = BI.UUID();
}
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.last_plus_group_node";
@ -57469,7 +57476,7 @@ BI.DisplayTree = BI.inherit(BI.TreeView, {
}
};
function beforeCollapse (treeId, treeNode) {
function beforeCollapse(treeId, treeNode) {
return false;
}
@ -57480,6 +57487,7 @@ BI.DisplayTree = BI.inherit(BI.TreeView, {
nodes = BI.DisplayTree.superclass._dealWidthNodes.apply(this, arguments);
var self = this, o = this.options;
BI.each(nodes, function (i, node) {
node.isParent = node.isParent || node.parent;
if (node.text == null) {
if (node.count > 0) {
node.text = node.value + "(" + BI.i18nText("BI-Basic_Altogether") + node.count + BI.i18nText("BI-Basic_Count") + ")";
@ -64857,7 +64865,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
node.id = BI.UUID();
}
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.multilayer_select_tree_mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.multilayer_select_tree_last_plus_group_node";
@ -65548,7 +65556,7 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
node.id = BI.UUID();
}
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.multilayer_single_tree_mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.multilayer_single_tree_last_plus_group_node";
@ -74163,7 +74171,7 @@ BI.SelectTreePopup = BI.inherit(BI.Pane, {
var extend = {layer: layer};
node.id = node.id || BI.UUID();
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.select_tree_mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.select_tree_last_plus_group_node";

36
dist/bundle.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

28
dist/bundle.js vendored
Unescape View File

@ -54328,7 +54328,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
this._createValueMap();
var value;
if(BI.isNotNull(o.value)){
if(BI.isNotNull(o.value)) {
value = this._digest(o.value);
}
this.trigger = BI.createWidget({
@ -54352,13 +54352,19 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
});
this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () {
self.setValue(self.combo.getValue()[0].value);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
var currentVal = self.combo.getValue()[0].value;
if (currentVal !== self.value) {
self.setValue(currentVal);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
}
});
this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () {
self.setValue(self.combo.getValue()[0].childValue);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
var currentVal = self.combo.getValue()[0].childValue;
if (currentVal !== self.value) {
self.setValue(currentVal);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
}
});
},
@ -54377,6 +54383,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
},
_digest: function (v) {
this.value = v;
return this.valueMap[v];
},
@ -57866,7 +57873,7 @@ BI.LevelTree = BI.inherit(BI.Widget, {
node.id = BI.UUID();
}
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.last_plus_group_node";
@ -58008,7 +58015,7 @@ BI.DisplayTree = BI.inherit(BI.TreeView, {
}
};
function beforeCollapse (treeId, treeNode) {
function beforeCollapse(treeId, treeNode) {
return false;
}
@ -58019,6 +58026,7 @@ BI.DisplayTree = BI.inherit(BI.TreeView, {
nodes = BI.DisplayTree.superclass._dealWidthNodes.apply(this, arguments);
var self = this, o = this.options;
BI.each(nodes, function (i, node) {
node.isParent = node.isParent || node.parent;
if (node.text == null) {
if (node.count > 0) {
node.text = node.value + "(" + BI.i18nText("BI-Basic_Altogether") + node.count + BI.i18nText("BI-Basic_Count") + ")";
@ -65396,7 +65404,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
node.id = BI.UUID();
}
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.multilayer_select_tree_mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.multilayer_select_tree_last_plus_group_node";
@ -66087,7 +66095,7 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
node.id = BI.UUID();
}
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.multilayer_single_tree_mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.multilayer_single_tree_last_plus_group_node";
@ -74702,7 +74710,7 @@ BI.SelectTreePopup = BI.inherit(BI.Pane, {
var extend = {layer: layer};
node.id = node.id || BI.UUID();
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.select_tree_mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.select_tree_last_plus_group_node";

36
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

22
dist/case.js vendored
Unescape View File

@ -5466,7 +5466,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
this._createValueMap();
var value;
if(BI.isNotNull(o.value)){
if(BI.isNotNull(o.value)) {
value = this._digest(o.value);
}
this.trigger = BI.createWidget({
@ -5490,13 +5490,19 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
});
this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () {
self.setValue(self.combo.getValue()[0].value);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
var currentVal = self.combo.getValue()[0].value;
if (currentVal !== self.value) {
self.setValue(currentVal);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
}
});
this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () {
self.setValue(self.combo.getValue()[0].childValue);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
var currentVal = self.combo.getValue()[0].childValue;
if (currentVal !== self.value) {
self.setValue(currentVal);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
}
});
},
@ -5515,6 +5521,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
},
_digest: function (v) {
this.value = v;
return this.valueMap[v];
},
@ -9004,7 +9011,7 @@ BI.LevelTree = BI.inherit(BI.Widget, {
node.id = BI.UUID();
}
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.last_plus_group_node";
@ -9146,7 +9153,7 @@ BI.DisplayTree = BI.inherit(BI.TreeView, {
}
};
function beforeCollapse (treeId, treeNode) {
function beforeCollapse(treeId, treeNode) {
return false;
}
@ -9157,6 +9164,7 @@ BI.DisplayTree = BI.inherit(BI.TreeView, {
nodes = BI.DisplayTree.superclass._dealWidthNodes.apply(this, arguments);
var self = this, o = this.options;
BI.each(nodes, function (i, node) {
node.isParent = node.isParent || node.parent;
if (node.text == null) {
if (node.count > 0) {
node.text = node.value + "(" + BI.i18nText("BI-Basic_Altogether") + node.count + BI.i18nText("BI-Basic_Count") + ")";

10
dist/demo.js vendored
Unescape View File

@ -13263,13 +13263,19 @@ Demo.CONSTANTS = {
{id: 121, pId: 12, value: "第三级目录1", text: "第三级目录1"},
{id: 122, pId: 12, value: "第三级文件1", text: "第三级文件1"},
{id: 1211, pId: 121, value: "第四级目录1", text: "第四级目录1"},
{id: 12111, pId: 1211, value: "第五级文件1", text: "第五级文件111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"},
{
id: 12111,
pId: 1211,
value: "第五级文件1",
text: "第五级文件111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"
},
{id: 2, pId: -1, value: "第一级目录2", text: "第一级目录2"},
{id: 21, pId: 2, value: "第二级目录3", text: "第二级目录3"},
{id: 22, pId: 2, value: "第二级文件2", text: "第二级文件2"},
{id: 211, pId: 21, value: "第三级目录2", text: "第三级目录2"},
{id: 212, pId: 21, value: "第三级文件2", text: "第三级文件2"},
{id: 2111, pId: 211, value: "第四级文件1", text: "第四级文件1"}],
{id: 2111, pId: 211, value: "第四级文件1", text: "第四级文件1"},
{id: 3, pId: -1, value: "第一级目录3", text: "第一级目录3", isParent: true}],
LEVELTREE: [{
id: 1,
text: "第一项",

28
dist/fineui.ie.js vendored
Unescape View File

@ -54031,7 +54031,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
this._createValueMap();
var value;
if(BI.isNotNull(o.value)){
if(BI.isNotNull(o.value)) {
value = this._digest(o.value);
}
this.trigger = BI.createWidget({
@ -54055,13 +54055,19 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
});
this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () {
self.setValue(self.combo.getValue()[0].value);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
var currentVal = self.combo.getValue()[0].value;
if (currentVal !== self.value) {
self.setValue(currentVal);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
}
});
this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () {
self.setValue(self.combo.getValue()[0].childValue);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
var currentVal = self.combo.getValue()[0].childValue;
if (currentVal !== self.value) {
self.setValue(currentVal);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
}
});
},
@ -54080,6 +54086,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
},
_digest: function (v) {
this.value = v;
return this.valueMap[v];
},
@ -57569,7 +57576,7 @@ BI.LevelTree = BI.inherit(BI.Widget, {
node.id = BI.UUID();
}
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.last_plus_group_node";
@ -57711,7 +57718,7 @@ BI.DisplayTree = BI.inherit(BI.TreeView, {
}
};
function beforeCollapse (treeId, treeNode) {
function beforeCollapse(treeId, treeNode) {
return false;
}
@ -57722,6 +57729,7 @@ BI.DisplayTree = BI.inherit(BI.TreeView, {
nodes = BI.DisplayTree.superclass._dealWidthNodes.apply(this, arguments);
var self = this, o = this.options;
BI.each(nodes, function (i, node) {
node.isParent = node.isParent || node.parent;
if (node.text == null) {
if (node.count > 0) {
node.text = node.value + "(" + BI.i18nText("BI-Basic_Altogether") + node.count + BI.i18nText("BI-Basic_Count") + ")";
@ -65099,7 +65107,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
node.id = BI.UUID();
}
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.multilayer_select_tree_mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.multilayer_select_tree_last_plus_group_node";
@ -65790,7 +65798,7 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
node.id = BI.UUID();
}
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.multilayer_single_tree_mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.multilayer_single_tree_last_plus_group_node";
@ -74405,7 +74413,7 @@ BI.SelectTreePopup = BI.inherit(BI.Pane, {
var extend = {layer: layer};
node.id = node.id || BI.UUID();
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.select_tree_mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.select_tree_last_plus_group_node";

36
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

28
dist/fineui.js vendored
Unescape View File

@ -54570,7 +54570,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
this._createValueMap();
var value;
if(BI.isNotNull(o.value)){
if(BI.isNotNull(o.value)) {
value = this._digest(o.value);
}
this.trigger = BI.createWidget({
@ -54594,13 +54594,19 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
});
this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () {
self.setValue(self.combo.getValue()[0].value);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
var currentVal = self.combo.getValue()[0].value;
if (currentVal !== self.value) {
self.setValue(currentVal);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
}
});
this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () {
self.setValue(self.combo.getValue()[0].childValue);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
var currentVal = self.combo.getValue()[0].childValue;
if (currentVal !== self.value) {
self.setValue(currentVal);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
}
});
},
@ -54619,6 +54625,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
},
_digest: function (v) {
this.value = v;
return this.valueMap[v];
},
@ -58108,7 +58115,7 @@ BI.LevelTree = BI.inherit(BI.Widget, {
node.id = BI.UUID();
}
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.last_plus_group_node";
@ -58250,7 +58257,7 @@ BI.DisplayTree = BI.inherit(BI.TreeView, {
}
};
function beforeCollapse (treeId, treeNode) {
function beforeCollapse(treeId, treeNode) {
return false;
}
@ -58261,6 +58268,7 @@ BI.DisplayTree = BI.inherit(BI.TreeView, {
nodes = BI.DisplayTree.superclass._dealWidthNodes.apply(this, arguments);
var self = this, o = this.options;
BI.each(nodes, function (i, node) {
node.isParent = node.isParent || node.parent;
if (node.text == null) {
if (node.count > 0) {
node.text = node.value + "(" + BI.i18nText("BI-Basic_Altogether") + node.count + BI.i18nText("BI-Basic_Count") + ")";
@ -65638,7 +65646,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
node.id = BI.UUID();
}
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.multilayer_select_tree_mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.multilayer_select_tree_last_plus_group_node";
@ -66329,7 +66337,7 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
node.id = BI.UUID();
}
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.multilayer_single_tree_mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.multilayer_single_tree_last_plus_group_node";
@ -74944,7 +74952,7 @@ BI.SelectTreePopup = BI.inherit(BI.Pane, {
var extend = {layer: layer};
node.id = node.id || BI.UUID();
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.select_tree_mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.select_tree_last_plus_group_node";

36
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

25
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -37651,7 +37651,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
this._createValueMap();
var value;
if(BI.isNotNull(o.value)){
if(BI.isNotNull(o.value)) {
value = this._digest(o.value);
}
this.trigger = BI.createWidget({
@ -37675,13 +37675,19 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
});
this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () {
self.setValue(self.combo.getValue()[0].value);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
var currentVal = self.combo.getValue()[0].value;
if (currentVal !== self.value) {
self.setValue(currentVal);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
}
});
this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () {
self.setValue(self.combo.getValue()[0].childValue);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
var currentVal = self.combo.getValue()[0].childValue;
if (currentVal !== self.value) {
self.setValue(currentVal);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
}
});
},
@ -37700,6 +37706,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
},
_digest: function (v) {
this.value = v;
return this.valueMap[v];
},
@ -41189,7 +41196,7 @@ BI.LevelTree = BI.inherit(BI.Widget, {
node.id = BI.UUID();
}
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.last_plus_group_node";
@ -48521,7 +48528,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
node.id = BI.UUID();
}
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.multilayer_select_tree_mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.multilayer_select_tree_last_plus_group_node";
@ -49212,7 +49219,7 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
node.id = BI.UUID();
}
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.multilayer_single_tree_mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.multilayer_single_tree_last_plus_group_node";
@ -57827,7 +57834,7 @@ BI.SelectTreePopup = BI.inherit(BI.Pane, {
var extend = {layer: layer};
node.id = node.id || BI.UUID();
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.select_tree_mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.select_tree_last_plus_group_node";

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
dist/widget.js vendored
Unescape View File

@ -6713,7 +6713,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
node.id = BI.UUID();
}
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.multilayer_select_tree_mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.multilayer_select_tree_last_plus_group_node";
@ -7404,7 +7404,7 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
node.id = BI.UUID();
}
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.multilayer_single_tree_mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.multilayer_single_tree_last_plus_group_node";
@ -16019,7 +16019,7 @@ BI.SelectTreePopup = BI.inherit(BI.Pane, {
var extend = {layer: layer};
node.id = node.id || BI.UUID();
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.select_tree_mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.select_tree_last_plus_group_node";

17
src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js
Unescape View File

@ -20,7 +20,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
this._createValueMap();
var value;
if(BI.isNotNull(o.value)){
if(BI.isNotNull(o.value)) {
value = this._digest(o.value);
}
this.trigger = BI.createWidget({
@ -44,13 +44,19 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
});
this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () {
self.setValue(self.combo.getValue()[0].value);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
var currentVal = self.combo.getValue()[0].value;
if (currentVal !== self.value) {
self.setValue(currentVal);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
}
});
this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () {
self.setValue(self.combo.getValue()[0].childValue);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
var currentVal = self.combo.getValue()[0].childValue;
if (currentVal !== self.value) {
self.setValue(currentVal);
self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
}
});
},
@ -69,6 +75,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
},
_digest: function (v) {
this.value = v;
return this.valueMap[v];
},

2
src/case/tree/tree.level.js
Unescape View File

@ -31,7 +31,7 @@ BI.LevelTree = BI.inherit(BI.Widget, {
node.id = BI.UUID();
}
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.last_plus_group_node";

3
src/case/tree/ztree/tree.display.js
Unescape View File

@ -38,7 +38,7 @@ BI.DisplayTree = BI.inherit(BI.TreeView, {
}
};
function beforeCollapse (treeId, treeNode) {
function beforeCollapse(treeId, treeNode) {
return false;
}
@ -49,6 +49,7 @@ BI.DisplayTree = BI.inherit(BI.TreeView, {
nodes = BI.DisplayTree.superclass._dealWidthNodes.apply(this, arguments);
var self = this, o = this.options;
BI.each(nodes, function (i, node) {
node.isParent = node.isParent || node.parent;
if (node.text == null) {
if (node.count > 0) {
node.text = node.value + "(" + BI.i18nText("BI-Basic_Altogether") + node.count + BI.i18nText("BI-Basic_Count") + ")";

2
src/widget/multilayerselecttree/multilayerselecttree.leveltree.js
Unescape View File

@ -30,7 +30,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
node.id = BI.UUID();
}
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.multilayer_select_tree_mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.multilayer_select_tree_last_plus_group_node";

2
src/widget/multilayersingletree/multilayersingletree.leveltree.js
Unescape View File

@ -30,7 +30,7 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
node.id = BI.UUID();
}
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.multilayer_single_tree_mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.multilayer_single_tree_last_plus_group_node";

2
src/widget/selecttree/selecttree.popup.js
Unescape View File

@ -20,7 +20,7 @@ BI.SelectTreePopup = BI.inherit(BI.Pane, {
var extend = {layer: layer};
node.id = node.id || BI.UUID();
extend.pNode = pNode;
if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
extend.type = "bi.select_tree_mid_plus_group_node";
if (i === nodes.length - 1) {
extend.type = "bi.select_tree_last_plus_group_node";

Write Preview
Loading…
Cancel
Save