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

Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/visual/fineui 

# Conflicts:
#	dist/bundle.min.js
#	dist/fineui.min.js
#	dist/utils.min.js
es6
guy 6 years ago
parent
bfa70d5e0f e6573eedab
commit
09e911a57e
25 changed files with 227 additions and 92 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. 2
      demo/js/case/combo/demo.text_value_down_list_combo.js
  2. 2
      demo/js/widget/slider/demo.slider.js
  3. 2
      dist/base.css
  4. 5
      dist/base.js
  5. 2
      dist/bundle.css
  6. 37
      dist/bundle.js
  7. 2
      dist/bundle.min.css
  8. 56
      dist/bundle.min.js
  9. 4
      dist/demo.js
  10. 2
      dist/fineui.css
  11. 37
      dist/fineui.js
  12. 2
      dist/fineui.min.css
  13. 56
      dist/fineui.min.js
  14. 37
      dist/fineui_without_jquery_polyfill.js
  15. 4
      dist/fix/fix.js
  16. 2
      dist/utils.min.js
  17. 28
      dist/widget.js
  18. 5
      src/base/pane.js
  19. 2
      src/css/base/pane.css
  20. 4
      src/less/base/pane.less
  21. 5
      src/widget/multiselect/multiselect.combo.js
  22. 6
      src/widget/multiselect/multiselect.insert.combo.js
  23. 5
      src/widget/multiselect/multiselect.insert.combo.nobar.js
  24. 5
      src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
  25. 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"
}, {
text: BI.i18nText("BI-Basic_Average_Value"),
value: 4,
value: 5,
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();
var singleSliderLabel = BI.createWidget({
type: "bi.single_slider",
type: "bi.single_slider_label",
width: o.width,
height: o.height,
digit: 0,

2
dist/base.css vendored
Unescape View File

@ -997,6 +997,8 @@
}
.bi-pane {
min-height: 55px;
}
.bi-pane .loading-container {
background-color: rgba(247, 248, 250, 0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00f7f8fa,endColorstr=#00f7f8fa);
}

5
dist/base.js vendored
Unescape View File

@ -275,10 +275,14 @@ BI.Pane = BI.inherit(BI.Widget, {
width: 5
}]
});
// pane在同步方式下由items决定tipText的显示与否
// loading的异步情况下由loaded后对面板的populate的时机决定
this.setTipVisible(false);
if (o.overlap === true) {
if (!BI.Layers.has(this.getName())) {
BI.createWidget({
type: "bi.absolute_center_adapt",
cls: "loading-container",
items: [{
el: loadingAnimation
}],
@ -292,6 +296,7 @@ BI.Pane = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.absolute_center_adapt",
element: this,
cls: "loading-container",
items: [{
el: this._loading,
left: 0,

2
dist/bundle.css vendored
Unescape View File

@ -2951,6 +2951,8 @@ textarea {
}
.bi-pane {
min-height: 55px;
}
.bi-pane .loading-container {
background-color: rgba(247, 248, 250, 0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00f7f8fa,endColorstr=#00f7f8fa);
}

37
dist/bundle.js vendored
Unescape View File

@ -35264,12 +35264,12 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
defineProps(this, keys);
childContext && defineContext(this, childContext);
this.$$model && (this.model.__ob__ = this.$$model.__ob__);
initMixins(this, mixins);
this._init();
initState(this, state);
initMixins(this, mixins);
initMethods(this, actions);
initComputed(this, computed);
initWatch(this, watch$$1);
initMethods(this, actions);
this.created && this.created();
if (this.$$model) {
return this.model;
@ -35619,10 +35619,14 @@ BI.Pane = BI.inherit(BI.Widget, {
width: 5
}]
});
// pane在同步方式下由items决定tipText的显示与否
// loading的异步情况下由loaded后对面板的populate的时机决定
this.setTipVisible(false);
if (o.overlap === true) {
if (!BI.Layers.has(this.getName())) {
BI.createWidget({
type: "bi.absolute_center_adapt",
cls: "loading-container",
items: [{
el: loadingAnimation
}],
@ -35636,6 +35640,7 @@ BI.Pane = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.absolute_center_adapt",
element: this,
cls: "loading-container",
items: [{
el: this._loading,
left: 0,
@ -66930,6 +66935,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -66942,9 +66948,11 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
var newItems = [];
BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]];
}
if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item);
}
});
@ -66998,6 +67006,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) {
if (!map[v]) {
self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v;
}
});
@ -67005,6 +67014,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -67328,6 +67338,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -67340,9 +67351,11 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
var newItems = [];
BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]];
}
if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item);
}
});
@ -67373,6 +67386,8 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) {
if (!map[v]) {
self.storeValue.value.push(v);
// value更新的时候assist也需要更新
BI.remove(self.storeValue.assist, v);
map[v] = v;
}
});
@ -67380,6 +67395,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -67714,6 +67730,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -67726,9 +67743,11 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
var newItems = [];
BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]];
}
if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item);
}
});
@ -67759,6 +67778,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) {
if (!map[v]) {
self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v;
}
});
@ -67766,6 +67786,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -72901,6 +72922,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -72913,9 +72935,11 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
var newItems = [];
BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]];
}
if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item);
}
});
@ -72971,6 +72995,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) {
if (!map[v]) {
self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v;
}
});
@ -72978,6 +73003,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -76612,10 +76638,9 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
el: {
type: "bi.vertical",
items: [{
type: "bi.absolute",
type: "bi.horizontal_auto",
items: [this.label]
}],
rgap: c.EDITOR_WIDTH,
height: c.EDITOR_HEIGHT
},
top: 0,
@ -76642,7 +76667,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
self._setSliderPosition(significantPercent);
var v = self._getValueByPercent(significantPercent);
v = o.digit === false ? v : v.toFixed(o.digit);
self.label.setValue(v);
self.label.setValue(v + o.unit);
self.value = v;
self.fireEvent(BI.SingleSliderLabel.EVENT_CHANGE);
}
@ -76714,7 +76739,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
},
_setLabelPosition: function (percent) {
this.label.element.css({left: percent + "%"});
// this.label.element.css({left: percent + "%"});
},
_setSliderPosition: function (percent) {

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

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

2
dist/fineui.css vendored
Unescape View File

@ -2951,6 +2951,8 @@ textarea {
}
.bi-pane {
min-height: 55px;
}
.bi-pane .loading-container {
background-color: rgba(247, 248, 250, 0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00f7f8fa,endColorstr=#00f7f8fa);
}

37
dist/fineui.js vendored
Unescape View File

@ -35506,12 +35506,12 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
defineProps(this, keys);
childContext && defineContext(this, childContext);
this.$$model && (this.model.__ob__ = this.$$model.__ob__);
initMixins(this, mixins);
this._init();
initState(this, state);
initMixins(this, mixins);
initMethods(this, actions);
initComputed(this, computed);
initWatch(this, watch$$1);
initMethods(this, actions);
this.created && this.created();
if (this.$$model) {
return this.model;
@ -35861,10 +35861,14 @@ BI.Pane = BI.inherit(BI.Widget, {
width: 5
}]
});
// pane在同步方式下由items决定tipText的显示与否
// loading的异步情况下由loaded后对面板的populate的时机决定
this.setTipVisible(false);
if (o.overlap === true) {
if (!BI.Layers.has(this.getName())) {
BI.createWidget({
type: "bi.absolute_center_adapt",
cls: "loading-container",
items: [{
el: loadingAnimation
}],
@ -35878,6 +35882,7 @@ BI.Pane = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.absolute_center_adapt",
element: this,
cls: "loading-container",
items: [{
el: this._loading,
left: 0,
@ -67172,6 +67177,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -67184,9 +67190,11 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
var newItems = [];
BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]];
}
if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item);
}
});
@ -67240,6 +67248,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) {
if (!map[v]) {
self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v;
}
});
@ -67247,6 +67256,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -67570,6 +67580,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -67582,9 +67593,11 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
var newItems = [];
BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]];
}
if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item);
}
});
@ -67615,6 +67628,8 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) {
if (!map[v]) {
self.storeValue.value.push(v);
// value更新的时候assist也需要更新
BI.remove(self.storeValue.assist, v);
map[v] = v;
}
});
@ -67622,6 +67637,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -67956,6 +67972,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -67968,9 +67985,11 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
var newItems = [];
BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]];
}
if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item);
}
});
@ -68001,6 +68020,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) {
if (!map[v]) {
self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v;
}
});
@ -68008,6 +68028,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -73143,6 +73164,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -73155,9 +73177,11 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
var newItems = [];
BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]];
}
if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item);
}
});
@ -73213,6 +73237,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) {
if (!map[v]) {
self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v;
}
});
@ -73220,6 +73245,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -76854,10 +76880,9 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
el: {
type: "bi.vertical",
items: [{
type: "bi.absolute",
type: "bi.horizontal_auto",
items: [this.label]
}],
rgap: c.EDITOR_WIDTH,
height: c.EDITOR_HEIGHT
},
top: 0,
@ -76884,7 +76909,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
self._setSliderPosition(significantPercent);
var v = self._getValueByPercent(significantPercent);
v = o.digit === false ? v : v.toFixed(o.digit);
self.label.setValue(v);
self.label.setValue(v + o.unit);
self.value = v;
self.fireEvent(BI.SingleSliderLabel.EVENT_CHANGE);
}
@ -76956,7 +76981,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
},
_setLabelPosition: function (percent) {
this.label.element.css({left: percent + "%"});
// this.label.element.css({left: percent + "%"});
},
_setSliderPosition: function (percent) {

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

56
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

37
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -24275,12 +24275,12 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
defineProps(this, keys);
childContext && defineContext(this, childContext);
this.$$model && (this.model.__ob__ = this.$$model.__ob__);
initMixins(this, mixins);
this._init();
initState(this, state);
initMixins(this, mixins);
initMethods(this, actions);
initComputed(this, computed);
initWatch(this, watch$$1);
initMethods(this, actions);
this.created && this.created();
if (this.$$model) {
return this.model;
@ -24429,10 +24429,14 @@ BI.Pane = BI.inherit(BI.Widget, {
width: 5
}]
});
// pane在同步方式下由items决定tipText的显示与否
// loading的异步情况下由loaded后对面板的populate的时机决定
this.setTipVisible(false);
if (o.overlap === true) {
if (!BI.Layers.has(this.getName())) {
BI.createWidget({
type: "bi.absolute_center_adapt",
cls: "loading-container",
items: [{
el: loadingAnimation
}],
@ -24446,6 +24450,7 @@ BI.Pane = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.absolute_center_adapt",
element: this,
cls: "loading-container",
items: [{
el: this._loading,
left: 0,
@ -50036,6 +50041,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -50048,9 +50054,11 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
var newItems = [];
BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]];
}
if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item);
}
});
@ -50104,6 +50112,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) {
if (!map[v]) {
self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v;
}
});
@ -50111,6 +50120,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -50434,6 +50444,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -50446,9 +50457,11 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
var newItems = [];
BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]];
}
if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item);
}
});
@ -50479,6 +50492,8 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) {
if (!map[v]) {
self.storeValue.value.push(v);
// value更新的时候assist也需要更新
BI.remove(self.storeValue.assist, v);
map[v] = v;
}
});
@ -50486,6 +50501,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -50820,6 +50836,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -50832,9 +50849,11 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
var newItems = [];
BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]];
}
if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item);
}
});
@ -50865,6 +50884,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) {
if (!map[v]) {
self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v;
}
});
@ -50872,6 +50892,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -56007,6 +56028,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(items, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -56019,9 +56041,11 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
var newItems = [];
BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]];
}
if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item);
}
});
@ -56077,6 +56101,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) {
if (!map[v]) {
self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v;
}
});
@ -56084,6 +56109,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -59718,10 +59744,9 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
el: {
type: "bi.vertical",
items: [{
type: "bi.absolute",
type: "bi.horizontal_auto",
items: [this.label]
}],
rgap: c.EDITOR_WIDTH,
height: c.EDITOR_HEIGHT
},
top: 0,
@ -59748,7 +59773,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
self._setSliderPosition(significantPercent);
var v = self._getValueByPercent(significantPercent);
v = o.digit === false ? v : v.toFixed(o.digit);
self.label.setValue(v);
self.label.setValue(v + o.unit);
self.value = v;
self.fireEvent(BI.SingleSliderLabel.EVENT_CHANGE);
}
@ -59820,7 +59845,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
},
_setLabelPosition: function (percent) {
this.label.element.css({left: percent + "%"});
// this.label.element.css({left: percent + "%"});
},
_setSliderPosition: function (percent) {

4
dist/fix/fix.js vendored
Unescape View File

@ -1330,12 +1330,12 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
defineProps(this, keys);
childContext && defineContext(this, childContext);
this.$$model && (this.model.__ob__ = this.$$model.__ob__);
initMixins(this, mixins);
this._init();
initState(this, state);
initMixins(this, mixins);
initMethods(this, actions);
initComputed(this, computed);
initWatch(this, watch$$1);
initMethods(this, actions);
this.created && this.created();
if (this.$$model) {
return this.model;

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

5
src/base/pane.js
Unescape View File

@ -74,10 +74,14 @@ BI.Pane = BI.inherit(BI.Widget, {
width: 5
}]
});
// pane在同步方式下由items决定tipText的显示与否
// loading的异步情况下由loaded后对面板的populate的时机决定
this.setTipVisible(false);
if (o.overlap === true) {
if (!BI.Layers.has(this.getName())) {
BI.createWidget({
type: "bi.absolute_center_adapt",
cls: "loading-container",
items: [{
el: loadingAnimation
}],
@ -91,6 +95,7 @@ BI.Pane = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.absolute_center_adapt",
element: this,
cls: "loading-container",
items: [{
el: this._loading,
left: 0,

2
src/css/base/pane.css
Unescape View File

@ -344,6 +344,8 @@
}
.bi-pane {
min-height: 55px;
}
.bi-pane .loading-container {
background-color: rgba(247, 248, 250, 0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00f7f8fa,endColorstr=#00f7f8fa);
}

4
src/less/base/pane.less
Unescape View File

@ -2,7 +2,9 @@
@import "../resource/background";
.bi-pane {
min-height: 55px;
.background-color(@color-bi-background-normal, 0);
& .loading-container {
.background-color(@color-bi-background-normal, 0);
}
}
.bi-loading-widget {

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) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -283,9 +284,11 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
var newItems = [];
BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]];
}
if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item);
}
});
@ -339,6 +342,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) {
if (!map[v]) {
self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v;
}
});
@ -346,6 +350,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(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) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -295,9 +296,11 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
var newItems = [];
BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]];
}
if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item);
}
});
@ -328,6 +331,8 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) {
if (!map[v]) {
self.storeValue.value.push(v);
// value更新的时候assist也需要更新
BI.remove(self.storeValue.assist, v);
map[v] = v;
}
});
@ -335,6 +340,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(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) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -307,9 +308,11 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
var newItems = [];
BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]];
}
if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item);
}
});
@ -340,6 +343,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) {
if (!map[v]) {
self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v;
}
});
@ -347,6 +351,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(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) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(map[v]);
delete map[v];
}
});
@ -294,9 +295,11 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
var newItems = [];
BI.each(items, function (i, item) {
if (BI.isNotNull(selectedMap[items[i]])) {
self.storeValue.assist && self.storeValue.assist.push(selectedMap[items[i]]);
delete selectedMap[items[i]];
}
if (BI.isNull(notSelectedMap[items[i]])) {
BI.remove(self.storeValue.assist, item);
newItems.push(item);
}
});
@ -352,6 +355,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(res.value, function (i, v) {
if (!map[v]) {
self.storeValue.value.push(v);
BI.remove(self.storeValue.assist, v);
map[v] = v;
}
});
@ -359,6 +363,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
BI.each(res.assist, function (i, v) {
if (BI.isNotNull(map[v])) {
change = true;
self.storeValue.assist && self.storeValue.assist.push(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: {
type: "bi.vertical",
items: [{
type: "bi.absolute",
type: "bi.horizontal_auto",
items: [this.label]
}],
rgap: c.EDITOR_WIDTH,
height: c.EDITOR_HEIGHT
},
top: 0,
@ -140,7 +139,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
self._setSliderPosition(significantPercent);
var v = self._getValueByPercent(significantPercent);
v = o.digit === false ? v : v.toFixed(o.digit);
self.label.setValue(v);
self.label.setValue(v + o.unit);
self.value = v;
self.fireEvent(BI.SingleSliderLabel.EVENT_CHANGE);
}
@ -212,7 +211,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
},
_setLabelPosition: function (percent) {
this.label.element.css({left: percent + "%"});
// this.label.element.css({left: percent + "%"});
},
_setSliderPosition: function (percent) {

Write Preview
Loading…
Cancel
Save