Browse Source

Merge remote-tracking branch 'origin/master'

es6
Young 6 years ago
parent
commit
4807c9b0b7
  1. 13
      dist/bundle.js
  2. 6
      dist/bundle.min.js
  3. 13
      dist/fineui.js
  4. 6
      dist/fineui.min.js
  5. 13
      dist/fineui_without_jquery_polyfill.js
  6. 2
      dist/utils.min.js
  7. 13
      dist/widget.js
  8. 2
      src/widget/datetime/datetime.combo.js
  9. 6
      src/widget/datetime/datetime.trigger.js
  10. 4
      src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js

13
dist/bundle.js vendored

@ -59492,7 +59492,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
}, { }, {
el: triggerBtn, el: triggerBtn,
top: 0, top: 0,
left: 0 right: 0
}] }]
}] }]
}); });
@ -59829,10 +59829,10 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
type: "bi.htape", type: "bi.htape",
element: this, element: this,
items: [{ items: [{
el: this.text
},{
el: BI.createWidget(), el: BI.createWidget(),
width: o.height width: o.height
}, {
el: this.text
}] }]
}); });
this.setValue(o.value); this.setValue(o.value);
@ -59858,7 +59858,8 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
} }
}); });
BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCard = BI.inherit(BI.Widget, { BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);
BI.StaticDateTimePaneCard = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.StaticDateTimePaneCard.superclass._defaultConfig.apply(this, arguments); var conf = BI.StaticDateTimePaneCard.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
@ -72665,6 +72666,10 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
if (self.requesting === true) { if (self.requesting === true) {
self.wants2Quit = true; self.wants2Quit = true;
} else { } else {
/**
* 在存在标红的情况如果popover没有发生改变就确认需要同步trigger的值否则对外value值和trigger样式不统一
*/
assertShowValue();
self.fireEvent(BI.SearchMultiTextValueCombo.EVENT_CONFIRM); self.fireEvent(BI.SearchMultiTextValueCombo.EVENT_CONFIRM);
} }
}); });

6
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

13
dist/fineui.js vendored

@ -59731,7 +59731,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
}, { }, {
el: triggerBtn, el: triggerBtn,
top: 0, top: 0,
left: 0 right: 0
}] }]
}] }]
}); });
@ -60068,10 +60068,10 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
type: "bi.htape", type: "bi.htape",
element: this, element: this,
items: [{ items: [{
el: this.text
},{
el: BI.createWidget(), el: BI.createWidget(),
width: o.height width: o.height
}, {
el: this.text
}] }]
}); });
this.setValue(o.value); this.setValue(o.value);
@ -60097,7 +60097,8 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
} }
}); });
BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCard = BI.inherit(BI.Widget, { BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);
BI.StaticDateTimePaneCard = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.StaticDateTimePaneCard.superclass._defaultConfig.apply(this, arguments); var conf = BI.StaticDateTimePaneCard.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
@ -72904,6 +72905,10 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
if (self.requesting === true) { if (self.requesting === true) {
self.wants2Quit = true; self.wants2Quit = true;
} else { } else {
/**
* 在存在标红的情况如果popover没有发生改变就确认需要同步trigger的值否则对外value值和trigger样式不统一
*/
assertShowValue();
self.fireEvent(BI.SearchMultiTextValueCombo.EVENT_CONFIRM); self.fireEvent(BI.SearchMultiTextValueCombo.EVENT_CONFIRM);
} }
}); });

6
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

13
dist/fineui_without_jquery_polyfill.js vendored

@ -43314,7 +43314,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
}, { }, {
el: triggerBtn, el: triggerBtn,
top: 0, top: 0,
left: 0 right: 0
}] }]
}] }]
}); });
@ -43651,10 +43651,10 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
type: "bi.htape", type: "bi.htape",
element: this, element: this,
items: [{ items: [{
el: this.text
},{
el: BI.createWidget(), el: BI.createWidget(),
width: o.height width: o.height
}, {
el: this.text
}] }]
}); });
this.setValue(o.value); this.setValue(o.value);
@ -43680,7 +43680,8 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
} }
}); });
BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCard = BI.inherit(BI.Widget, { BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);
BI.StaticDateTimePaneCard = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.StaticDateTimePaneCard.superclass._defaultConfig.apply(this, arguments); var conf = BI.StaticDateTimePaneCard.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
@ -56487,6 +56488,10 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
if (self.requesting === true) { if (self.requesting === true) {
self.wants2Quit = true; self.wants2Quit = true;
} else { } else {
/**
* 在存在标红的情况如果popover没有发生改变就确认需要同步trigger的值否则对外value值和trigger样式不统一
*/
assertShowValue();
self.fireEvent(BI.SearchMultiTextValueCombo.EVENT_CONFIRM); self.fireEvent(BI.SearchMultiTextValueCombo.EVENT_CONFIRM);
} }
}); });

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

13
dist/widget.js vendored

@ -1119,7 +1119,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
}, { }, {
el: triggerBtn, el: triggerBtn,
top: 0, top: 0,
left: 0 right: 0
}] }]
}] }]
}); });
@ -1456,10 +1456,10 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
type: "bi.htape", type: "bi.htape",
element: this, element: this,
items: [{ items: [{
el: this.text
},{
el: BI.createWidget(), el: BI.createWidget(),
width: o.height width: o.height
}, {
el: this.text
}] }]
}); });
this.setValue(o.value); this.setValue(o.value);
@ -1485,7 +1485,8 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
} }
}); });
BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCard = BI.inherit(BI.Widget, { BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);
BI.StaticDateTimePaneCard = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.StaticDateTimePaneCard.superclass._defaultConfig.apply(this, arguments); var conf = BI.StaticDateTimePaneCard.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
@ -14292,6 +14293,10 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
if (self.requesting === true) { if (self.requesting === true) {
self.wants2Quit = true; self.wants2Quit = true;
} else { } else {
/**
* 在存在标红的情况如果popover没有发生改变就确认需要同步trigger的值否则对外value值和trigger样式不统一
*/
assertShowValue();
self.fireEvent(BI.SearchMultiTextValueCombo.EVENT_CONFIRM); self.fireEvent(BI.SearchMultiTextValueCombo.EVENT_CONFIRM);
} }
}); });

2
src/widget/datetime/datetime.combo.js

@ -103,7 +103,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
}, { }, {
el: triggerBtn, el: triggerBtn,
top: 0, top: 0,
left: 0 right: 0
}] }]
}] }]
}); });

6
src/widget/datetime/datetime.trigger.js

@ -30,10 +30,10 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
type: "bi.htape", type: "bi.htape",
element: this, element: this,
items: [{ items: [{
el: this.text
},{
el: BI.createWidget(), el: BI.createWidget(),
width: o.height width: o.height
}, {
el: this.text
}] }]
}); });
this.setValue(o.value); this.setValue(o.value);
@ -59,4 +59,4 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
} }
}); });
BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger); BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);

4
src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js

@ -184,6 +184,10 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
if (self.requesting === true) { if (self.requesting === true) {
self.wants2Quit = true; self.wants2Quit = true;
} else { } else {
/**
* 在存在标红的情况如果popover没有发生改变就确认需要同步trigger的值否则对外value值和trigger样式不统一
*/
assertShowValue();
self.fireEvent(BI.SearchMultiTextValueCombo.EVENT_CONFIRM); self.fireEvent(BI.SearchMultiTextValueCombo.EVENT_CONFIRM);
} }
}); });

Loading…
Cancel
Save