Browse Source

Merge remote-tracking branch 'origin/master'

es6
guy 7 years ago
parent
commit
136ca8bcb5
  1. 20
      dist/_fineui.min.js
  2. 33
      dist/bundle.js
  3. 36
      dist/bundle.min.js
  4. 3
      dist/case.js
  5. 20
      dist/fineui.min.js
  6. BIN
      dist/images/1x/icon/check_box_active.png
  7. BIN
      dist/images/1x/icon/check_box_disable.png
  8. BIN
      dist/images/1x/icon/check_box_disable2.png
  9. BIN
      dist/images/1x/icon/check_box_hover.png
  10. BIN
      dist/images/1x/icon/check_box_normal.png
  11. BIN
      dist/images/1x/icon/half_selected.png
  12. BIN
      dist/images/1x/icon/radio_active.png
  13. BIN
      dist/images/1x/icon/radio_disable.png
  14. BIN
      dist/images/1x/icon/radio_disable2.png
  15. BIN
      dist/images/1x/icon/radio_hover.png
  16. BIN
      dist/images/1x/icon/radio_normal.png
  17. BIN
      dist/images/2x/icon/check_box_active.png
  18. BIN
      dist/images/2x/icon/check_box_disable.png
  19. BIN
      dist/images/2x/icon/check_box_disable2.png
  20. BIN
      dist/images/2x/icon/check_box_hover.png
  21. BIN
      dist/images/2x/icon/check_box_normal.png
  22. BIN
      dist/images/2x/icon/half_selected.png
  23. BIN
      dist/images/2x/icon/radio_active.png
  24. BIN
      dist/images/2x/icon/radio_disable.png
  25. BIN
      dist/images/2x/icon/radio_disable2.png
  26. BIN
      dist/images/2x/icon/radio_hover.png
  27. BIN
      dist/images/2x/icon/radio_normal.png
  28. 30
      dist/widget.js
  29. 2
      src/case/button/item.singleselect.radio.js
  30. 1
      src/case/segment/segment.js
  31. 3
      src/component/allvaluechooser/abstract.allvaluechooser.js
  32. 13
      src/component/treevaluechooser/abstract.treevaluechooser.js
  33. 1
      src/component/treevaluechooser/combo.treevaluechooser.js
  34. 3
      src/component/valuechooser/abstract.valuechooser.js
  35. 2
      src/widget/multitree/multi.tree.combo.js
  36. 8
      src/widget/multitree/trigger/searcher.multi.tree.js

20
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

33
dist/bundle.js vendored

@ -72557,7 +72557,7 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, {
items: BI.LogicFactory.createLogicItemsByDirection("left", {
type: "bi.center_adapt",
items: [this.radio],
width: 36
width: 16
}, this.text)
}))));
},
@ -83565,6 +83565,7 @@ BI.Segment = BI.inherit(BI.Widget, {
this.buttonGroup = BI.createWidget({
element: this,
type: "bi.button_group",
value: o.value,
items: BI.createItems(o.items, {
type: "bi.segment_button",
height: o.height - 2,
@ -99730,6 +99731,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
return BI.extend(BI.MultiTreeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-tree-combo",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
height: 25
});
},
@ -99747,6 +99749,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
this.trigger = BI.createWidget({
type: "bi.multi_select_trigger",
height: o.height,
valueFormatter: o.valueFormatter,
// adapter: this.popup,
masker: {
offset: this.constants.offset
@ -100225,6 +100228,9 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
return BI.extend(BI.MultiTreeSearcher.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-tree-searcher",
itemsCreator: BI.emptyFn,
valueFormatter: function (v) {
return v;
},
popup: {},
adapter: null,
@ -100320,6 +100326,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
},
setState: function (ob) {
var o = this.options;
ob || (ob = {});
ob.value || (ob.value = {});
if (BI.isNumber(ob)) {
@ -100330,7 +100337,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
var text = "";
BI.each(ob.value, function (name, children) {
var childNodes = getChildrenNode(children);
text += name + (childNodes === "" ? "" : (":" + childNodes)) + "; ";
text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + "; ";
});
this.editor.setState(text);
}
@ -100341,7 +100348,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
BI.each(ob, function (name, children) {
index++;
var childNodes = getChildrenNode(children);
text += name + (childNodes === "" ? "" : (":" + childNodes)) + (index === size ? "" : ",");
text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + (index === size ? "" : ",");
});
return text;
}
@ -110042,7 +110049,8 @@ BI.AbstractAllValueChooser = BI.inherit(BI.Widget, {
var text = v;
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
if (item.value === v) {
// 把value都换成字符串
if (item.value + "" === v) {
text = item.text;
return true;
}
@ -110231,6 +110239,19 @@ BI.shortcut("bi.all_value_chooser_pane", BI.AllValueChooserPane);BI.AbstractTree
});
},
_valueFormatter: function (v) {
var text = v;
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
if (item.value + "" === v) {
text = item.text;
return true;
}
});
}
return text;
},
_initData: function (items) {
this.items = items;
var nodes = BI.Tree.treeFormat(items);
@ -110904,6 +110925,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
type: "bi.multi_tree_combo",
element: this,
itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width,
height: o.height
});
@ -111004,7 +111026,8 @@ BI.AbstractValueChooser = BI.inherit(BI.Widget, {
var text = v;
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
if (item.value === v) {
// 把value都换成字符串
if (item.value + "" === v) {
text = item.text;
return true;
}

36
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

3
dist/case.js vendored

@ -365,7 +365,7 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, {
items: BI.LogicFactory.createLogicItemsByDirection("left", {
type: "bi.center_adapt",
items: [this.radio],
width: 36
width: 16
}, this.text)
}))));
},
@ -11373,6 +11373,7 @@ BI.Segment = BI.inherit(BI.Widget, {
this.buttonGroup = BI.createWidget({
element: this,
type: "bi.button_group",
value: o.value,
items: BI.createItems(o.items, {
type: "bi.segment_button",
height: o.height - 2,

20
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

BIN
dist/images/1x/icon/check_box_active.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 302 B

After

Width:  |  Height:  |  Size: 353 B

BIN
dist/images/1x/icon/check_box_disable.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 196 B

After

Width:  |  Height:  |  Size: 202 B

BIN
dist/images/1x/icon/check_box_disable2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 303 B

After

Width:  |  Height:  |  Size: 341 B

BIN
dist/images/1x/icon/check_box_hover.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 205 B

BIN
dist/images/1x/icon/check_box_normal.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 198 B

After

Width:  |  Height:  |  Size: 202 B

BIN
dist/images/1x/icon/half_selected.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 228 B

BIN
dist/images/1x/icon/radio_active.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 388 B

BIN
dist/images/1x/icon/radio_disable.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 361 B

After

Width:  |  Height:  |  Size: 371 B

BIN
dist/images/1x/icon/radio_disable2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 319 B

After

Width:  |  Height:  |  Size: 398 B

BIN
dist/images/1x/icon/radio_hover.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 384 B

BIN
dist/images/1x/icon/radio_normal.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 357 B

After

Width:  |  Height:  |  Size: 382 B

BIN
dist/images/2x/icon/check_box_active.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 359 B

After

Width:  |  Height:  |  Size: 577 B

BIN
dist/images/2x/icon/check_box_disable.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 209 B

After

Width:  |  Height:  |  Size: 326 B

BIN
dist/images/2x/icon/check_box_disable2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 368 B

After

Width:  |  Height:  |  Size: 547 B

BIN
dist/images/2x/icon/check_box_hover.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 327 B

BIN
dist/images/2x/icon/check_box_normal.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 209 B

After

Width:  |  Height:  |  Size: 322 B

BIN
dist/images/2x/icon/half_selected.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 224 B

After

Width:  |  Height:  |  Size: 368 B

BIN
dist/images/2x/icon/radio_active.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 400 B

After

Width:  |  Height:  |  Size: 719 B

BIN
dist/images/2x/icon/radio_disable.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 488 B

After

Width:  |  Height:  |  Size: 750 B

BIN
dist/images/2x/icon/radio_disable2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 426 B

After

Width:  |  Height:  |  Size: 725 B

BIN
dist/images/2x/icon/radio_hover.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 789 B

BIN
dist/images/2x/icon/radio_normal.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 482 B

After

Width:  |  Height:  |  Size: 753 B

30
dist/widget.js vendored

@ -12843,6 +12843,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
return BI.extend(BI.MultiTreeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-tree-combo",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
height: 25
});
},
@ -12860,6 +12861,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
this.trigger = BI.createWidget({
type: "bi.multi_select_trigger",
height: o.height,
valueFormatter: o.valueFormatter,
// adapter: this.popup,
masker: {
offset: this.constants.offset
@ -13338,6 +13340,9 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
return BI.extend(BI.MultiTreeSearcher.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-tree-searcher",
itemsCreator: BI.emptyFn,
valueFormatter: function (v) {
return v;
},
popup: {},
adapter: null,
@ -13433,6 +13438,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
},
setState: function (ob) {
var o = this.options;
ob || (ob = {});
ob.value || (ob.value = {});
if (BI.isNumber(ob)) {
@ -13443,7 +13449,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
var text = "";
BI.each(ob.value, function (name, children) {
var childNodes = getChildrenNode(children);
text += name + (childNodes === "" ? "" : (":" + childNodes)) + "; ";
text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + "; ";
});
this.editor.setState(text);
}
@ -13454,7 +13460,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
BI.each(ob, function (name, children) {
index++;
var childNodes = getChildrenNode(children);
text += name + (childNodes === "" ? "" : (":" + childNodes)) + (index === size ? "" : ",");
text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + (index === size ? "" : ",");
});
return text;
}
@ -23155,7 +23161,8 @@ BI.AbstractAllValueChooser = BI.inherit(BI.Widget, {
var text = v;
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
if (item.value === v) {
// 把value都换成字符串
if (item.value + "" === v) {
text = item.text;
return true;
}
@ -23344,6 +23351,19 @@ BI.shortcut("bi.all_value_chooser_pane", BI.AllValueChooserPane);BI.AbstractTree
});
},
_valueFormatter: function (v) {
var text = v;
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
if (item.value + "" === v) {
text = item.text;
return true;
}
});
}
return text;
},
_initData: function (items) {
this.items = items;
var nodes = BI.Tree.treeFormat(items);
@ -24017,6 +24037,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
type: "bi.multi_tree_combo",
element: this,
itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width,
height: o.height
});
@ -24117,7 +24138,8 @@ BI.AbstractValueChooser = BI.inherit(BI.Widget, {
var text = v;
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
if (item.value === v) {
// 把value都换成字符串
if (item.value + "" === v) {
text = item.text;
return true;
}

2
src/case/button/item.singleselect.radio.js

@ -43,7 +43,7 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, {
items: BI.LogicFactory.createLogicItemsByDirection("left", {
type: "bi.center_adapt",
items: [this.radio],
width: 36
width: 16
}, this.text)
}))));
},

1
src/case/segment/segment.js

@ -19,6 +19,7 @@ BI.Segment = BI.inherit(BI.Widget, {
this.buttonGroup = BI.createWidget({
element: this,
type: "bi.button_group",
value: o.value,
items: BI.createItems(o.items, {
type: "bi.segment_button",
height: o.height - 2,

3
src/component/allvaluechooser/abstract.allvaluechooser.js

@ -26,7 +26,8 @@ BI.AbstractAllValueChooser = BI.inherit(BI.Widget, {
var text = v;
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
if (item.value === v) {
// 把value都换成字符串
if (item.value + "" === v) {
text = item.text;
return true;
}

13
src/component/treevaluechooser/abstract.treevaluechooser.js

@ -11,6 +11,19 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
});
},
_valueFormatter: function (v) {
var text = v;
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
if (item.value + "" === v) {
text = item.text;
return true;
}
});
}
return text;
},
_initData: function (items) {
this.items = items;
var nodes = BI.Tree.treeFormat(items);

1
src/component/treevaluechooser/combo.treevaluechooser.js

@ -27,6 +27,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
type: "bi.multi_tree_combo",
element: this,
itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width,
height: o.height
});

3
src/component/valuechooser/abstract.valuechooser.js

@ -24,7 +24,8 @@ BI.AbstractValueChooser = BI.inherit(BI.Widget, {
var text = v;
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
if (item.value === v) {
// 把value都换成字符串
if (item.value + "" === v) {
text = item.text;
return true;
}

2
src/widget/multitree/multi.tree.combo.js

@ -19,6 +19,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
return BI.extend(BI.MultiTreeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-tree-combo",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
height: 25
});
},
@ -36,6 +37,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
this.trigger = BI.createWidget({
type: "bi.multi_select_trigger",
height: o.height,
valueFormatter: o.valueFormatter,
// adapter: this.popup,
masker: {
offset: this.constants.offset

8
src/widget/multitree/trigger/searcher.multi.tree.js

@ -10,6 +10,9 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
return BI.extend(BI.MultiTreeSearcher.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-tree-searcher",
itemsCreator: BI.emptyFn,
valueFormatter: function (v) {
return v;
},
popup: {},
adapter: null,
@ -105,6 +108,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
},
setState: function (ob) {
var o = this.options;
ob || (ob = {});
ob.value || (ob.value = {});
if (BI.isNumber(ob)) {
@ -115,7 +119,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
var text = "";
BI.each(ob.value, function (name, children) {
var childNodes = getChildrenNode(children);
text += name + (childNodes === "" ? "" : (":" + childNodes)) + "; ";
text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + "; ";
});
this.editor.setState(text);
}
@ -126,7 +130,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
BI.each(ob, function (name, children) {
index++;
var childNodes = getChildrenNode(children);
text += name + (childNodes === "" ? "" : (":" + childNodes)) + (index === size ? "" : ",");
text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + (index === size ? "" : ",");
});
return text;
}

Loading…
Cancel
Save