Browse Source

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

* commit '13b9066f5f0f79bddf946de4f8c7d3dad7e2e0c8':
  BI-37809 editor_trigger编辑区域title
es6
windy 6 years ago
parent
commit
a0bc72dc61
  1. 9
      dist/bundle.ie.js
  2. 12
      dist/bundle.ie.min.js
  3. 9
      dist/bundle.js
  4. 8
      dist/bundle.min.js
  5. 9
      dist/case.js
  6. 25
      dist/demo.js
  7. 9
      dist/fineui.ie.js
  8. 12
      dist/fineui.ie.min.js
  9. 9
      dist/fineui.js
  10. 8
      dist/fineui.min.js
  11. 9
      dist/fineui_without_jquery_polyfill.js
  12. 2
      dist/utils.min.js
  13. 5
      src/case/combo/editoriconcheckcombo/combo.editiconcheck.js
  14. 4
      src/case/trigger/trigger.editor.js

9
dist/bundle.ie.js vendored

@ -53373,10 +53373,7 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
allowBlank: o.allowBlank, allowBlank: o.allowBlank,
watermark: o.watermark, watermark: o.watermark,
errorText: o.errorText, errorText: o.errorText,
value: o.value, value: o.value
title: function () {
return self.trigger.getValue();
}
}); });
this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () { this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () {
self.popup.setValue(this.getValue()); self.popup.setValue(this.getValue());
@ -58568,7 +58565,9 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
allowBlank: o.allowBlank, allowBlank: o.allowBlank,
watermark: o.watermark, watermark: o.watermark,
errorText: o.errorText, errorText: o.errorText,
title: o.title, title: function () {
return self.getValue();
}
}); });
this.editor.on(BI.Controller.EVENT_CHANGE, function () { this.editor.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);

12
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

9
dist/bundle.js vendored

@ -53777,10 +53777,7 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
allowBlank: o.allowBlank, allowBlank: o.allowBlank,
watermark: o.watermark, watermark: o.watermark,
errorText: o.errorText, errorText: o.errorText,
value: o.value, value: o.value
title: function () {
return self.trigger.getValue();
}
}); });
this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () { this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () {
self.popup.setValue(this.getValue()); self.popup.setValue(this.getValue());
@ -58972,7 +58969,9 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
allowBlank: o.allowBlank, allowBlank: o.allowBlank,
watermark: o.watermark, watermark: o.watermark,
errorText: o.errorText, errorText: o.errorText,
title: o.title, title: function () {
return self.getValue();
}
}); });
this.editor.on(BI.Controller.EVENT_CHANGE, function () { this.editor.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);

8
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

9
dist/case.js vendored

@ -4173,10 +4173,7 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
allowBlank: o.allowBlank, allowBlank: o.allowBlank,
watermark: o.watermark, watermark: o.watermark,
errorText: o.errorText, errorText: o.errorText,
value: o.value, value: o.value
title: function () {
return self.trigger.getValue();
}
}); });
this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () { this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () {
self.popup.setValue(this.getValue()); self.popup.setValue(this.getValue());
@ -9368,7 +9365,9 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
allowBlank: o.allowBlank, allowBlank: o.allowBlank,
watermark: o.watermark, watermark: o.watermark,
errorText: o.errorText, errorText: o.errorText,
title: o.title, title: function () {
return self.getValue();
}
}); });
this.editor.on(BI.Controller.EVENT_CHANGE, function () { this.editor.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);

25
dist/demo.js vendored

@ -6158,7 +6158,30 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
}; };
} }
}); });
BI.shortcut("demo.htape", Demo.HtapeLayout);/** BI.shortcut("demo.htape", Demo.HtapeLayout);Demo.InlineVerticalLayout = BI.inherit(BI.Widget, {
props: {
baseCls: "demo-absolute"
},
render: function () {
return {
type: "bi.inline_vertical_adapt",
items: [{
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 200
}, {
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 100
}]
};
}
});
BI.shortcut("demo.inline_vertical", Demo.InlineVerticalLayout);/**
* Created by User on 2017/3/22. * Created by User on 2017/3/22.
*/ */
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, { Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

9
dist/fineui.ie.js vendored

@ -53618,10 +53618,7 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
allowBlank: o.allowBlank, allowBlank: o.allowBlank,
watermark: o.watermark, watermark: o.watermark,
errorText: o.errorText, errorText: o.errorText,
value: o.value, value: o.value
title: function () {
return self.trigger.getValue();
}
}); });
this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () { this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () {
self.popup.setValue(this.getValue()); self.popup.setValue(this.getValue());
@ -58813,7 +58810,9 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
allowBlank: o.allowBlank, allowBlank: o.allowBlank,
watermark: o.watermark, watermark: o.watermark,
errorText: o.errorText, errorText: o.errorText,
title: o.title, title: function () {
return self.getValue();
}
}); });
this.editor.on(BI.Controller.EVENT_CHANGE, function () { this.editor.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);

12
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

9
dist/fineui.js vendored

@ -54022,10 +54022,7 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
allowBlank: o.allowBlank, allowBlank: o.allowBlank,
watermark: o.watermark, watermark: o.watermark,
errorText: o.errorText, errorText: o.errorText,
value: o.value, value: o.value
title: function () {
return self.trigger.getValue();
}
}); });
this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () { this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () {
self.popup.setValue(this.getValue()); self.popup.setValue(this.getValue());
@ -59217,7 +59214,9 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
allowBlank: o.allowBlank, allowBlank: o.allowBlank,
watermark: o.watermark, watermark: o.watermark,
errorText: o.errorText, errorText: o.errorText,
title: o.title, title: function () {
return self.getValue();
}
}); });
this.editor.on(BI.Controller.EVENT_CHANGE, function () { this.editor.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);

8
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

9
dist/fineui_without_jquery_polyfill.js vendored

@ -37035,10 +37035,7 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
allowBlank: o.allowBlank, allowBlank: o.allowBlank,
watermark: o.watermark, watermark: o.watermark,
errorText: o.errorText, errorText: o.errorText,
value: o.value, value: o.value
title: function () {
return self.trigger.getValue();
}
}); });
this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () { this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () {
self.popup.setValue(this.getValue()); self.popup.setValue(this.getValue());
@ -42031,7 +42028,9 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
allowBlank: o.allowBlank, allowBlank: o.allowBlank,
watermark: o.watermark, watermark: o.watermark,
errorText: o.errorText, errorText: o.errorText,
title: o.title, title: function () {
return self.getValue();
}
}); });
this.editor.on(BI.Controller.EVENT_CHANGE, function () { this.editor.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

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

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

4
src/case/trigger/trigger.editor.js

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

Loading…
Cancel
Save