Frank
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #652 in VISUAL/fineui from ~WINDY/fineui:master to master 

* commit '19dd74eb527590c59382b5c6a6cc23d500f6eb9c':
  update
  loading异步加载情况下不需要显示tipText，由loaded后的populate决定
  BI-31378 value校验的时候assist也要校验一下
  BI-31372 slider_label没有改
es6
guy 6 years ago
parent
4cf9a50c48 19dd74eb52
commit
344059e5c8
17 changed files with 170 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      demo/js/case/combo/demo.text_value_down_list_combo.js
  2. 2
      demo/js/widget/slider/demo.slider.js
  3. 3
      dist/base.js
  4. 31
      dist/bundle.js
  5. 30
      dist/bundle.min.js
  6. 4
      dist/demo.js
  7. 31
      dist/fineui.js
  8. 30
      dist/fineui.min.js
  9. 31
      dist/fineui_without_jquery_polyfill.js
  10. 2
      dist/utils.min.js
  11. 28
      dist/widget.js
  12. 3
      src/base/pane.js
  13. 5
      src/widget/multiselect/multiselect.combo.js
  14. 6
      src/widget/multiselect/multiselect.insert.combo.js
  15. 5
      src/widget/multiselect/multiselect.insert.combo.nobar.js
  16. 5
      src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
  17. 7
      src/widget/singleslider/singleslider.label.js

2
demo/js/case/combo/demo.text_value_down_list_combo.js
Unescape View File

@ -39,7 +39,7 @@ Demo.TextValueDownListCombo = BI.inherit(BI.Widget, {
cls: "dot-e-font" cls: "dot-e-font"
}, { }, {
text: BI.i18nText("BI-Basic_Average_Value"), text: BI.i18nText("BI-Basic_Average_Value"),
value: 4, value: 5,
cls: "dot-e-font" cls: "dot-e-font"
}] }]
}]] }]]

2
demo/js/widget/slider/demo.slider.js
Unescape View File

@ -45,7 +45,7 @@ Demo.Slider = BI.inherit(BI.Widget, {
normalSingleSlider.populate(); normalSingleSlider.populate();
var singleSliderLabel = BI.createWidget({ var singleSliderLabel = BI.createWidget({
type: "bi.single_slider", type: "bi.single_slider_label",
width: o.width, width: o.width,
height: o.height, height: o.height,
digit: 0, digit: 0,

3
dist/base.js vendored
Unescape View File

@ -275,6 +275,9 @@ BI.Pane = BI.inherit(BI.Widget, {
width: 5 width: 5
}] }]
}); });
// pane在同步方式下由items决定tipText的显示与否
// loading的异步情况下由loaded后对面板的populate的时机决定
this.setTipVisible(false);
if (o.overlap === true) { if (o.overlap === true) {
if (!BI.Layers.has(this.getName())) { if (!BI.Layers.has(this.getName())) {
BI.createWidget({ BI.createWidget({

31
dist/bundle.js vendored
Unescape View File

@ -35571,6 +35571,9 @@ BI.Pane = BI.inherit(BI.Widget, {
width: 5 width: 5
}] }]
}); });
// pane在同步方式下由items决定tipText的显示与否
// loading的异步情况下由loaded后对面板的populate的时机决定
this.setTipVisible(false);
if (o.overlap === true) { if (o.overlap === true) {
if (!BI.Layers.has(this.getName())) { if (!BI.Layers.has(this.getName())) {
BI.createWidget({ BI.createWidget({
@ -66882,6 +66885,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) { BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -66894,9 +66898,11 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
var newItems = []; var newItems = [];
BI.each(items, function (i, item) { BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) { if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]]; delete selectedMap[items[i]];
} }
if (BI.isNull(notSelectedMap[items[i]])) { if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item); newItems.push(item);
} }
}); });
@ -66950,6 +66956,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) { BI.each(res.value, function (i, v) {
if (!map[v]) { if (!map[v]) {
self.storeValue.value.push(v); self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v; map[v] = v;
} }
}); });
@ -66957,6 +66964,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) { BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -67280,6 +67288,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) { BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -67292,9 +67301,11 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
var newItems = []; var newItems = [];
BI.each(items, function (i, item) { BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) { if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]]; delete selectedMap[items[i]];
} }
if (BI.isNull(notSelectedMap[items[i]])) { if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item); newItems.push(item);
} }
}); });
@ -67325,6 +67336,8 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) { BI.each(res.value, function (i, v) {
if (!map[v]) { if (!map[v]) {
self.storeValue.value.push(v); self.storeValue.value.push(v);
// value更新的时候assist也需要更新
BI.remove(self.storeValue.assist, v);
map[v] = v; map[v] = v;
} }
}); });
@ -67332,6 +67345,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) { BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -67666,6 +67680,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) { BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -67678,9 +67693,11 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
var newItems = []; var newItems = [];
BI.each(items, function (i, item) { BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) { if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]]; delete selectedMap[items[i]];
} }
if (BI.isNull(notSelectedMap[items[i]])) { if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item); newItems.push(item);
} }
}); });
@ -67711,6 +67728,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) { BI.each(res.value, function (i, v) {
if (!map[v]) { if (!map[v]) {
self.storeValue.value.push(v); self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v; map[v] = v;
} }
}); });
@ -67718,6 +67736,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) { BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -72853,6 +72872,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) { BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -72865,9 +72885,11 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
var newItems = []; var newItems = [];
BI.each(items, function (i, item) { BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) { if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]]; delete selectedMap[items[i]];
} }
if (BI.isNull(notSelectedMap[items[i]])) { if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item); newItems.push(item);
} }
}); });
@ -72923,6 +72945,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) { BI.each(res.value, function (i, v) {
if (!map[v]) { if (!map[v]) {
self.storeValue.value.push(v); self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v; map[v] = v;
} }
}); });
@ -72930,6 +72953,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) { BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -76564,10 +76588,9 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
el: { el: {
type: "bi.vertical", type: "bi.vertical",
items: [{ items: [{
type: "bi.absolute", type: "bi.horizontal_auto",
items: [this.label] items: [this.label]
}], }],
rgap: c.EDITOR_WIDTH,
height: c.EDITOR_HEIGHT height: c.EDITOR_HEIGHT
}, },
top: 0, top: 0,
@ -76594,7 +76617,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
self._setSliderPosition(significantPercent); self._setSliderPosition(significantPercent);
var v = self._getValueByPercent(significantPercent); var v = self._getValueByPercent(significantPercent);
v = o.digit === false ? v : v.toFixed(o.digit); v = o.digit === false ? v : v.toFixed(o.digit);
self.label.setValue(v); self.label.setValue(v + o.unit);
self.value = v; self.value = v;
self.fireEvent(BI.SingleSliderLabel.EVENT_CHANGE); self.fireEvent(BI.SingleSliderLabel.EVENT_CHANGE);
} }
@ -76666,7 +76689,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
}, },
_setLabelPosition: function (percent) { _setLabelPosition: function (percent) {
this.label.element.css({left: percent + "%"}); // this.label.element.css({left: percent + "%"});
}, },
_setSliderPosition: function (percent) { _setSliderPosition: function (percent) {

30
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/demo.js vendored
Unescape View File

@ -1583,7 +1583,7 @@ Demo.TextValueDownListCombo = BI.inherit(BI.Widget, {
cls: "dot-e-font" cls: "dot-e-font"
}, { }, {
text: BI.i18nText("BI-Basic_Average_Value"), text: BI.i18nText("BI-Basic_Average_Value"),
value: 4, value: 5,
cls: "dot-e-font" cls: "dot-e-font"
}] }]
}]] }]]
@ -11400,7 +11400,7 @@ Demo.Slider = BI.inherit(BI.Widget, {
normalSingleSlider.populate(); normalSingleSlider.populate();
var singleSliderLabel = BI.createWidget({ var singleSliderLabel = BI.createWidget({
type: "bi.single_slider", type: "bi.single_slider_label",
width: o.width, width: o.width,
height: o.height, height: o.height,
digit: 0, digit: 0,

31
dist/fineui.js vendored
Unescape View File

@ -35813,6 +35813,9 @@ BI.Pane = BI.inherit(BI.Widget, {
width: 5 width: 5
}] }]
}); });
// pane在同步方式下由items决定tipText的显示与否
// loading的异步情况下由loaded后对面板的populate的时机决定
this.setTipVisible(false);
if (o.overlap === true) { if (o.overlap === true) {
if (!BI.Layers.has(this.getName())) { if (!BI.Layers.has(this.getName())) {
BI.createWidget({ BI.createWidget({
@ -67124,6 +67127,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) { BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -67136,9 +67140,11 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
var newItems = []; var newItems = [];
BI.each(items, function (i, item) { BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) { if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]]; delete selectedMap[items[i]];
} }
if (BI.isNull(notSelectedMap[items[i]])) { if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item); newItems.push(item);
} }
}); });
@ -67192,6 +67198,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) { BI.each(res.value, function (i, v) {
if (!map[v]) { if (!map[v]) {
self.storeValue.value.push(v); self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v; map[v] = v;
} }
}); });
@ -67199,6 +67206,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) { BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -67522,6 +67530,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) { BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -67534,9 +67543,11 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
var newItems = []; var newItems = [];
BI.each(items, function (i, item) { BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) { if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]]; delete selectedMap[items[i]];
} }
if (BI.isNull(notSelectedMap[items[i]])) { if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item); newItems.push(item);
} }
}); });
@ -67567,6 +67578,8 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) { BI.each(res.value, function (i, v) {
if (!map[v]) { if (!map[v]) {
self.storeValue.value.push(v); self.storeValue.value.push(v);
// value更新的时候assist也需要更新
BI.remove(self.storeValue.assist, v);
map[v] = v; map[v] = v;
} }
}); });
@ -67574,6 +67587,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) { BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -67908,6 +67922,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) { BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -67920,9 +67935,11 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
var newItems = []; var newItems = [];
BI.each(items, function (i, item) { BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) { if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]]; delete selectedMap[items[i]];
} }
if (BI.isNull(notSelectedMap[items[i]])) { if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item); newItems.push(item);
} }
}); });
@ -67953,6 +67970,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) { BI.each(res.value, function (i, v) {
if (!map[v]) { if (!map[v]) {
self.storeValue.value.push(v); self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v; map[v] = v;
} }
}); });
@ -67960,6 +67978,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) { BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -73095,6 +73114,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) { BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -73107,9 +73127,11 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
var newItems = []; var newItems = [];
BI.each(items, function (i, item) { BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) { if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]]; delete selectedMap[items[i]];
} }
if (BI.isNull(notSelectedMap[items[i]])) { if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item); newItems.push(item);
} }
}); });
@ -73165,6 +73187,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) { BI.each(res.value, function (i, v) {
if (!map[v]) { if (!map[v]) {
self.storeValue.value.push(v); self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v; map[v] = v;
} }
}); });
@ -73172,6 +73195,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) { BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -76806,10 +76830,9 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
el: { el: {
type: "bi.vertical", type: "bi.vertical",
items: [{ items: [{
type: "bi.absolute", type: "bi.horizontal_auto",
items: [this.label] items: [this.label]
}], }],
rgap: c.EDITOR_WIDTH,
height: c.EDITOR_HEIGHT height: c.EDITOR_HEIGHT
}, },
top: 0, top: 0,
@ -76836,7 +76859,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
self._setSliderPosition(significantPercent); self._setSliderPosition(significantPercent);
var v = self._getValueByPercent(significantPercent); var v = self._getValueByPercent(significantPercent);
v = o.digit === false ? v : v.toFixed(o.digit); v = o.digit === false ? v : v.toFixed(o.digit);
self.label.setValue(v); self.label.setValue(v + o.unit);
self.value = v; self.value = v;
self.fireEvent(BI.SingleSliderLabel.EVENT_CHANGE); self.fireEvent(BI.SingleSliderLabel.EVENT_CHANGE);
} }
@ -76908,7 +76931,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
}, },
_setLabelPosition: function (percent) { _setLabelPosition: function (percent) {
this.label.element.css({left: percent + "%"}); // this.label.element.css({left: percent + "%"});
}, },
_setSliderPosition: function (percent) { _setSliderPosition: function (percent) {

30
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

31
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -24403,6 +24403,9 @@ BI.Pane = BI.inherit(BI.Widget, {
width: 5 width: 5
}] }]
}); });
// pane在同步方式下由items决定tipText的显示与否
// loading的异步情况下由loaded后对面板的populate的时机决定
this.setTipVisible(false);
if (o.overlap === true) { if (o.overlap === true) {
if (!BI.Layers.has(this.getName())) { if (!BI.Layers.has(this.getName())) {
BI.createWidget({ BI.createWidget({
@ -50010,6 +50013,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) { BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -50022,9 +50026,11 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
var newItems = []; var newItems = [];
BI.each(items, function (i, item) { BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) { if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]]; delete selectedMap[items[i]];
} }
if (BI.isNull(notSelectedMap[items[i]])) { if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item); newItems.push(item);
} }
}); });
@ -50078,6 +50084,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) { BI.each(res.value, function (i, v) {
if (!map[v]) { if (!map[v]) {
self.storeValue.value.push(v); self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v; map[v] = v;
} }
}); });
@ -50085,6 +50092,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) { BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -50408,6 +50416,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) { BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -50420,9 +50429,11 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
var newItems = []; var newItems = [];
BI.each(items, function (i, item) { BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) { if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]]; delete selectedMap[items[i]];
} }
if (BI.isNull(notSelectedMap[items[i]])) { if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item); newItems.push(item);
} }
}); });
@ -50453,6 +50464,8 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) { BI.each(res.value, function (i, v) {
if (!map[v]) { if (!map[v]) {
self.storeValue.value.push(v); self.storeValue.value.push(v);
// value更新的时候assist也需要更新
BI.remove(self.storeValue.assist, v);
map[v] = v; map[v] = v;
} }
}); });
@ -50460,6 +50473,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) { BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -50794,6 +50808,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) { BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -50806,9 +50821,11 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
var newItems = []; var newItems = [];
BI.each(items, function (i, item) { BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) { if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]]; delete selectedMap[items[i]];
} }
if (BI.isNull(notSelectedMap[items[i]])) { if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item); newItems.push(item);
} }
}); });
@ -50839,6 +50856,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) { BI.each(res.value, function (i, v) {
if (!map[v]) { if (!map[v]) {
self.storeValue.value.push(v); self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v; map[v] = v;
} }
}); });
@ -50846,6 +50864,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) { BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -55981,6 +56000,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) { BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -55993,9 +56013,11 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
var newItems = []; var newItems = [];
BI.each(items, function (i, item) { BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) { if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]]; delete selectedMap[items[i]];
} }
if (BI.isNull(notSelectedMap[items[i]])) { if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item); newItems.push(item);
} }
}); });
@ -56051,6 +56073,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) { BI.each(res.value, function (i, v) {
if (!map[v]) { if (!map[v]) {
self.storeValue.value.push(v); self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v; map[v] = v;
} }
}); });
@ -56058,6 +56081,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) { BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -59692,10 +59716,9 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
el: { el: {
type: "bi.vertical", type: "bi.vertical",
items: [{ items: [{
type: "bi.absolute", type: "bi.horizontal_auto",
items: [this.label] items: [this.label]
}], }],
rgap: c.EDITOR_WIDTH,
height: c.EDITOR_HEIGHT height: c.EDITOR_HEIGHT
}, },
top: 0, top: 0,
@ -59722,7 +59745,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
self._setSliderPosition(significantPercent); self._setSliderPosition(significantPercent);
var v = self._getValueByPercent(significantPercent); var v = self._getValueByPercent(significantPercent);
v = o.digit === false ? v : v.toFixed(o.digit); v = o.digit === false ? v : v.toFixed(o.digit);
self.label.setValue(v); self.label.setValue(v + o.unit);
self.value = v; self.value = v;
self.fireEvent(BI.SingleSliderLabel.EVENT_CHANGE); self.fireEvent(BI.SingleSliderLabel.EVENT_CHANGE);
} }
@ -59794,7 +59817,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
}, },
_setLabelPosition: function (percent) { _setLabelPosition: function (percent) {
this.label.element.css({left: percent + "%"}); // this.label.element.css({left: percent + "%"});
}, },
_setSliderPosition: function (percent) { _setSliderPosition: function (percent) {

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

28
dist/widget.js vendored
Unescape View File

@ -8420,6 +8420,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) { BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -8432,9 +8433,11 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
var newItems = []; var newItems = [];
BI.each(items, function (i, item) { BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) { if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]]; delete selectedMap[items[i]];
} }
if (BI.isNull(notSelectedMap[items[i]])) { if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item); newItems.push(item);
} }
}); });
@ -8488,6 +8491,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) { BI.each(res.value, function (i, v) {
if (!map[v]) { if (!map[v]) {
self.storeValue.value.push(v); self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v; map[v] = v;
} }
}); });
@ -8495,6 +8499,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) { BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -8818,6 +8823,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) { BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -8830,9 +8836,11 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
var newItems = []; var newItems = [];
BI.each(items, function (i, item) { BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) { if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]]; delete selectedMap[items[i]];
} }
if (BI.isNull(notSelectedMap[items[i]])) { if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item); newItems.push(item);
} }
}); });
@ -8863,6 +8871,8 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) { BI.each(res.value, function (i, v) {
if (!map[v]) { if (!map[v]) {
self.storeValue.value.push(v); self.storeValue.value.push(v);
// value更新的时候assist也需要更新
BI.remove(self.storeValue.assist, v);
map[v] = v; map[v] = v;
} }
}); });
@ -8870,6 +8880,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) { BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -9204,6 +9215,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) { BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -9216,9 +9228,11 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
var newItems = []; var newItems = [];
BI.each(items, function (i, item) { BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) { if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]]; delete selectedMap[items[i]];
} }
if (BI.isNull(notSelectedMap[items[i]])) { if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item); newItems.push(item);
} }
}); });
@ -9249,6 +9263,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) { BI.each(res.value, function (i, v) {
if (!map[v]) { if (!map[v]) {
self.storeValue.value.push(v); self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v; map[v] = v;
} }
}); });
@ -9256,6 +9271,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) { BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -14391,6 +14407,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) { BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -14403,9 +14420,11 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
var newItems = []; var newItems = [];
BI.each(items, function (i, item) { BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) { if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]]; delete selectedMap[items[i]];
} }
if (BI.isNull(notSelectedMap[items[i]])) { if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item); newItems.push(item);
} }
}); });
@ -14461,6 +14480,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) { BI.each(res.value, function (i, v) {
if (!map[v]) { if (!map[v]) {
self.storeValue.value.push(v); self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v; map[v] = v;
} }
}); });
@ -14468,6 +14488,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) { BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -18102,10 +18123,9 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
el: { el: {
type: "bi.vertical", type: "bi.vertical",
items: [{ items: [{
type: "bi.absolute", type: "bi.horizontal_auto",
items: [this.label] items: [this.label]
}], }],
rgap: c.EDITOR_WIDTH,
height: c.EDITOR_HEIGHT height: c.EDITOR_HEIGHT
}, },
top: 0, top: 0,
@ -18132,7 +18152,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
self._setSliderPosition(significantPercent); self._setSliderPosition(significantPercent);
var v = self._getValueByPercent(significantPercent); var v = self._getValueByPercent(significantPercent);
v = o.digit === false ? v : v.toFixed(o.digit); v = o.digit === false ? v : v.toFixed(o.digit);
self.label.setValue(v); self.label.setValue(v + o.unit);
self.value = v; self.value = v;
self.fireEvent(BI.SingleSliderLabel.EVENT_CHANGE); self.fireEvent(BI.SingleSliderLabel.EVENT_CHANGE);
} }
@ -18204,7 +18224,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
}, },
_setLabelPosition: function (percent) { _setLabelPosition: function (percent) {
this.label.element.css({left: percent + "%"}); // this.label.element.css({left: percent + "%"});
}, },
_setSliderPosition: function (percent) { _setSliderPosition: function (percent) {

3
src/base/pane.js
Unescape View File

@ -74,6 +74,9 @@ BI.Pane = BI.inherit(BI.Widget, {
width: 5 width: 5
}] }]
}); });
// pane在同步方式下由items决定tipText的显示与否
// loading的异步情况下由loaded后对面板的populate的时机决定
this.setTipVisible(false);
if (o.overlap === true) { if (o.overlap === true) {
if (!BI.Layers.has(this.getName())) { if (!BI.Layers.has(this.getName())) {
BI.createWidget({ BI.createWidget({

5
src/widget/multiselect/multiselect.combo.js
Unescape View File

@ -271,6 +271,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) { BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -283,9 +284,11 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
var newItems = []; var newItems = [];
BI.each(items, function (i, item) { BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) { if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]]; delete selectedMap[items[i]];
} }
if (BI.isNull(notSelectedMap[items[i]])) { if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item); newItems.push(item);
} }
}); });
@ -339,6 +342,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) { BI.each(res.value, function (i, v) {
if (!map[v]) { if (!map[v]) {
self.storeValue.value.push(v); self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v; map[v] = v;
} }
}); });
@ -346,6 +350,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) { BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });

6
src/widget/multiselect/multiselect.insert.combo.js
Unescape View File

@ -283,6 +283,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) { BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -295,9 +296,11 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
var newItems = []; var newItems = [];
BI.each(items, function (i, item) { BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) { if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]]; delete selectedMap[items[i]];
} }
if (BI.isNull(notSelectedMap[items[i]])) { if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item); newItems.push(item);
} }
}); });
@ -328,6 +331,8 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) { BI.each(res.value, function (i, v) {
if (!map[v]) { if (!map[v]) {
self.storeValue.value.push(v); self.storeValue.value.push(v);
// value更新的时候assist也需要更新
BI.remove(self.storeValue.assist, v);
map[v] = v; map[v] = v;
} }
}); });
@ -335,6 +340,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) { BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });

5
src/widget/multiselect/multiselect.insert.combo.nobar.js
Unescape View File

@ -295,6 +295,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) { BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -307,9 +308,11 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
var newItems = []; var newItems = [];
BI.each(items, function (i, item) { BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) { if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]]; delete selectedMap[items[i]];
} }
if (BI.isNull(notSelectedMap[items[i]])) { if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item); newItems.push(item);
} }
}); });
@ -340,6 +343,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) { BI.each(res.value, function (i, v) {
if (!map[v]) { if (!map[v]) {
self.storeValue.value.push(v); self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v; map[v] = v;
} }
}); });
@ -347,6 +351,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) { BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });

5
src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
Unescape View File

@ -282,6 +282,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) { BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });
@ -294,9 +295,11 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
var newItems = []; var newItems = [];
BI.each(items, function (i, item) { BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) { if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]]; delete selectedMap[items[i]];
} }
if (BI.isNull(notSelectedMap[items[i]])) { if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item); newItems.push(item);
} }
}); });
@ -352,6 +355,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) { BI.each(res.value, function (i, v) {
if (!map[v]) { if (!map[v]) {
self.storeValue.value.push(v); self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v; map[v] = v;
} }
}); });
@ -359,6 +363,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) { BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) { if (BI.isNotNull(map[v])) {
change = true; change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v]; delete map[v];
} }
}); });

7
src/widget/singleslider/singleslider.label.js
Unescape View File

@ -110,10 +110,9 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
el: { el: {
type: "bi.vertical", type: "bi.vertical",
items: [{ items: [{
type: "bi.absolute", type: "bi.horizontal_auto",
items: [this.label] items: [this.label]
}], }],
rgap: c.EDITOR_WIDTH,
height: c.EDITOR_HEIGHT height: c.EDITOR_HEIGHT
}, },
top: 0, top: 0,
@ -140,7 +139,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
self._setSliderPosition(significantPercent); self._setSliderPosition(significantPercent);
var v = self._getValueByPercent(significantPercent); var v = self._getValueByPercent(significantPercent);
v = o.digit === false ? v : v.toFixed(o.digit); v = o.digit === false ? v : v.toFixed(o.digit);
self.label.setValue(v); self.label.setValue(v + o.unit);
self.value = v; self.value = v;
self.fireEvent(BI.SingleSliderLabel.EVENT_CHANGE); self.fireEvent(BI.SingleSliderLabel.EVENT_CHANGE);
} }
@ -212,7 +211,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
}, },
_setLabelPosition: function (percent) { _setLabelPosition: function (percent) {
this.label.element.css({left: percent + "%"}); // this.label.element.css({left: percent + "%"});
}, },
_setSliderPosition: function (percent) { _setSliderPosition: function (percent) {

Write Preview
Loading…
Cancel
Save