Browse Source

Merge pull request #808 in VISUAL/fineui from ~LEI.WANG/fineui:master to master

* commit '8ad995d69a08d7e10349c157b54bd13cd37aa87e':
  按照Comment要求修改
  BI-37809 bi.editor_icon_check_combo 需要能显示title
es6
lei.wang 6 years ago
parent
commit
f88373a1c7
  1. 14
      dist/bundle.ie.js
  2. 14
      dist/bundle.js
  3. 14
      dist/case.js
  4. 14
      dist/fineui.ie.js
  5. 14
      dist/fineui.js
  6. 14
      dist/fineui_without_jquery_polyfill.js
  7. 5
      src/case/combo/editoriconcheckcombo/combo.editiconcheck.js
  8. 3
      src/case/trigger/trigger.editor.js

14
dist/bundle.ie.js vendored

@ -53377,7 +53377,10 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText,
value: o.value
value: o.value,
title: function () {
return self.trigger.getValue();
}
});
this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () {
self.popup.setValue(this.getValue());
@ -53424,7 +53427,8 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
}
});
BI.EditorIconCheckCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.editor_icon_check_combo", BI.EditorIconCheckCombo);/**
BI.shortcut("bi.editor_icon_check_combo", BI.EditorIconCheckCombo);
/**
* Created by GUY on 2016/2/2.
*
* @class BI.IconCombo
@ -58565,7 +58569,8 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
quitChecker: o.quitChecker,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
errorText: o.errorText,
title: o.title,
});
this.editor.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
@ -58604,7 +58609,8 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
}
});
BI.EditorTrigger.EVENT_CHANGE = "BI.EditorTrigger.EVENT_CHANGE";
BI.shortcut("bi.editor_trigger", BI.EditorTrigger);/**
BI.shortcut("bi.editor_trigger", BI.EditorTrigger);
/**
* 图标按钮trigger
*
* Created by GUY on 2015/10/8.

14
dist/bundle.js vendored

@ -53781,7 +53781,10 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText,
value: o.value
value: o.value,
title: function () {
return self.trigger.getValue();
}
});
this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () {
self.popup.setValue(this.getValue());
@ -53828,7 +53831,8 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
}
});
BI.EditorIconCheckCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.editor_icon_check_combo", BI.EditorIconCheckCombo);/**
BI.shortcut("bi.editor_icon_check_combo", BI.EditorIconCheckCombo);
/**
* Created by GUY on 2016/2/2.
*
* @class BI.IconCombo
@ -58969,7 +58973,8 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
quitChecker: o.quitChecker,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
errorText: o.errorText,
title: o.title,
});
this.editor.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
@ -59008,7 +59013,8 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
}
});
BI.EditorTrigger.EVENT_CHANGE = "BI.EditorTrigger.EVENT_CHANGE";
BI.shortcut("bi.editor_trigger", BI.EditorTrigger);/**
BI.shortcut("bi.editor_trigger", BI.EditorTrigger);
/**
* 图标按钮trigger
*
* Created by GUY on 2015/10/8.

14
dist/case.js vendored

@ -4173,7 +4173,10 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText,
value: o.value
value: o.value,
title: function () {
return self.trigger.getValue();
}
});
this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () {
self.popup.setValue(this.getValue());
@ -4220,7 +4223,8 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
}
});
BI.EditorIconCheckCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.editor_icon_check_combo", BI.EditorIconCheckCombo);/**
BI.shortcut("bi.editor_icon_check_combo", BI.EditorIconCheckCombo);
/**
* Created by GUY on 2016/2/2.
*
* @class BI.IconCombo
@ -9361,7 +9365,8 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
quitChecker: o.quitChecker,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
errorText: o.errorText,
title: o.title,
});
this.editor.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
@ -9400,7 +9405,8 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
}
});
BI.EditorTrigger.EVENT_CHANGE = "BI.EditorTrigger.EVENT_CHANGE";
BI.shortcut("bi.editor_trigger", BI.EditorTrigger);/**
BI.shortcut("bi.editor_trigger", BI.EditorTrigger);
/**
* 图标按钮trigger
*
* Created by GUY on 2015/10/8.

14
dist/fineui.ie.js vendored

@ -53622,7 +53622,10 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText,
value: o.value
value: o.value,
title: function () {
return self.trigger.getValue();
}
});
this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () {
self.popup.setValue(this.getValue());
@ -53669,7 +53672,8 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
}
});
BI.EditorIconCheckCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.editor_icon_check_combo", BI.EditorIconCheckCombo);/**
BI.shortcut("bi.editor_icon_check_combo", BI.EditorIconCheckCombo);
/**
* Created by GUY on 2016/2/2.
*
* @class BI.IconCombo
@ -58810,7 +58814,8 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
quitChecker: o.quitChecker,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
errorText: o.errorText,
title: o.title,
});
this.editor.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
@ -58849,7 +58854,8 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
}
});
BI.EditorTrigger.EVENT_CHANGE = "BI.EditorTrigger.EVENT_CHANGE";
BI.shortcut("bi.editor_trigger", BI.EditorTrigger);/**
BI.shortcut("bi.editor_trigger", BI.EditorTrigger);
/**
* 图标按钮trigger
*
* Created by GUY on 2015/10/8.

14
dist/fineui.js vendored

@ -54026,7 +54026,10 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText,
value: o.value
value: o.value,
title: function () {
return self.trigger.getValue();
}
});
this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () {
self.popup.setValue(this.getValue());
@ -54073,7 +54076,8 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
}
});
BI.EditorIconCheckCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.editor_icon_check_combo", BI.EditorIconCheckCombo);/**
BI.shortcut("bi.editor_icon_check_combo", BI.EditorIconCheckCombo);
/**
* Created by GUY on 2016/2/2.
*
* @class BI.IconCombo
@ -59214,7 +59218,8 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
quitChecker: o.quitChecker,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
errorText: o.errorText,
title: o.title,
});
this.editor.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
@ -59253,7 +59258,8 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
}
});
BI.EditorTrigger.EVENT_CHANGE = "BI.EditorTrigger.EVENT_CHANGE";
BI.shortcut("bi.editor_trigger", BI.EditorTrigger);/**
BI.shortcut("bi.editor_trigger", BI.EditorTrigger);
/**
* 图标按钮trigger
*
* Created by GUY on 2015/10/8.

14
dist/fineui_without_jquery_polyfill.js vendored

@ -37039,7 +37039,10 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText,
value: o.value
value: o.value,
title: function () {
return self.trigger.getValue();
}
});
this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () {
self.popup.setValue(this.getValue());
@ -37086,7 +37089,8 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
}
});
BI.EditorIconCheckCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.editor_icon_check_combo", BI.EditorIconCheckCombo);/**
BI.shortcut("bi.editor_icon_check_combo", BI.EditorIconCheckCombo);
/**
* Created by GUY on 2016/2/2.
*
* @class BI.IconCombo
@ -42028,7 +42032,8 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
quitChecker: o.quitChecker,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
errorText: o.errorText,
title: o.title,
});
this.editor.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
@ -42067,7 +42072,8 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
}
});
BI.EditorTrigger.EVENT_CHANGE = "BI.EditorTrigger.EVENT_CHANGE";
BI.shortcut("bi.editor_trigger", BI.EditorTrigger);/**
BI.shortcut("bi.editor_trigger", BI.EditorTrigger);
/**
* 图标按钮trigger
*
* Created by GUY on 2015/10/8.

5
src/case/combo/editoriconcheckcombo/combo.editiconcheck.js

@ -28,7 +28,10 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText,
value: o.value
value: o.value,
title: function () {
return self.trigger.getValue();
}
});
this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () {
self.popup.setValue(this.getValue());

3
src/case/trigger/trigger.editor.js

@ -35,7 +35,8 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
quitChecker: o.quitChecker,
allowBlank: o.allowBlank,
watermark: o.watermark,
errorText: o.errorText
errorText: o.errorText,
title: o.title,
});
this.editor.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);

Loading…
Cancel
Save