From a2c940e63742305f29f002f4876f466698d3c4b2 Mon Sep 17 00:00:00 2001 From: MrErHu Date: Fri, 21 Dec 2018 11:33:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BI-37809=20bi.editor=5Ficon=5Fcheck=5Fcombo?= =?UTF-8?q?=20=E9=9C=80=E8=A6=81=E8=83=BD=E6=98=BE=E7=A4=BAtitle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/bundle.ie.js | 6 ++++-- dist/bundle.js | 6 ++++-- dist/case.js | 6 ++++-- dist/fineui.ie.js | 6 ++++-- dist/fineui.js | 6 ++++-- dist/fineui_without_jquery_polyfill.js | 6 ++++-- src/case/combo/editoriconcheckcombo/combo.editiconcheck.js | 5 +++-- 7 files changed, 27 insertions(+), 14 deletions(-) diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index 75e2fff085..3573c30b95 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -53377,7 +53377,8 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, { allowBlank: o.allowBlank, watermark: o.watermark, errorText: o.errorText, - value: o.value + value: o.value, + title: o.title }); this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () { self.popup.setValue(this.getValue()); @@ -53424,7 +53425,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 diff --git a/dist/bundle.js b/dist/bundle.js index a9c56b0d0c..20a1227ef8 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -53781,7 +53781,8 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, { allowBlank: o.allowBlank, watermark: o.watermark, errorText: o.errorText, - value: o.value + value: o.value, + title: o.title }); this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () { self.popup.setValue(this.getValue()); @@ -53828,7 +53829,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 diff --git a/dist/case.js b/dist/case.js index 185fe68208..85a38f21d0 100644 --- a/dist/case.js +++ b/dist/case.js @@ -4173,7 +4173,8 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, { allowBlank: o.allowBlank, watermark: o.watermark, errorText: o.errorText, - value: o.value + value: o.value, + title: o.title }); this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () { self.popup.setValue(this.getValue()); @@ -4220,7 +4221,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 diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index fa1dfda162..bb74db06c8 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -53622,7 +53622,8 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, { allowBlank: o.allowBlank, watermark: o.watermark, errorText: o.errorText, - value: o.value + value: o.value, + title: o.title }); this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () { self.popup.setValue(this.getValue()); @@ -53669,7 +53670,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 diff --git a/dist/fineui.js b/dist/fineui.js index bfbd567405..0bdd207601 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -54026,7 +54026,8 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, { allowBlank: o.allowBlank, watermark: o.watermark, errorText: o.errorText, - value: o.value + value: o.value, + title: o.title }); this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () { self.popup.setValue(this.getValue()); @@ -54073,7 +54074,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 diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index 689edb8ff4..d6f7a87bb3 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -37039,7 +37039,8 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, { allowBlank: o.allowBlank, watermark: o.watermark, errorText: o.errorText, - value: o.value + value: o.value, + title: o.title }); this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () { self.popup.setValue(this.getValue()); @@ -37086,7 +37087,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 diff --git a/src/case/combo/editoriconcheckcombo/combo.editiconcheck.js b/src/case/combo/editoriconcheckcombo/combo.editiconcheck.js index b4576fa447..318530c210 100644 --- a/src/case/combo/editoriconcheckcombo/combo.editiconcheck.js +++ b/src/case/combo/editoriconcheckcombo/combo.editiconcheck.js @@ -28,7 +28,8 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, { allowBlank: o.allowBlank, watermark: o.watermark, errorText: o.errorText, - value: o.value + value: o.value, + title: o.title }); this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () { self.popup.setValue(this.getValue()); @@ -75,4 +76,4 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, { } }); BI.EditorIconCheckCombo.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.editor_icon_check_combo", BI.EditorIconCheckCombo); \ No newline at end of file +BI.shortcut("bi.editor_icon_check_combo", BI.EditorIconCheckCombo); From 8ad995d69a08d7e10349c157b54bd13cd37aa87e Mon Sep 17 00:00:00 2001 From: MrErHu Date: Fri, 21 Dec 2018 12:47:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8C=89=E7=85=A7Comment=E8=A6=81=E6=B1=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/bundle.ie.js | 10 +++++++--- dist/bundle.js | 10 +++++++--- dist/case.js | 10 +++++++--- dist/fineui.ie.js | 10 +++++++--- dist/fineui.js | 10 +++++++--- dist/fineui_without_jquery_polyfill.js | 10 +++++++--- .../combo/editoriconcheckcombo/combo.editiconcheck.js | 4 +++- src/case/trigger/trigger.editor.js | 5 +++-- 8 files changed, 48 insertions(+), 21 deletions(-) diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index 3573c30b95..dda659b690 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -53378,7 +53378,9 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, { watermark: o.watermark, errorText: o.errorText, value: o.value, - title: o.title + title: function () { + return self.trigger.getValue(); + } }); this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () { self.popup.setValue(this.getValue()); @@ -58567,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); @@ -58606,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. diff --git a/dist/bundle.js b/dist/bundle.js index 20a1227ef8..fd779f54bc 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -53782,7 +53782,9 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, { watermark: o.watermark, errorText: o.errorText, value: o.value, - title: o.title + title: function () { + return self.trigger.getValue(); + } }); this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () { self.popup.setValue(this.getValue()); @@ -58971,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); @@ -59010,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. diff --git a/dist/case.js b/dist/case.js index 85a38f21d0..303050b5ba 100644 --- a/dist/case.js +++ b/dist/case.js @@ -4174,7 +4174,9 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, { watermark: o.watermark, errorText: o.errorText, value: o.value, - title: o.title + title: function () { + return self.trigger.getValue(); + } }); this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () { self.popup.setValue(this.getValue()); @@ -9363,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); @@ -9402,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. diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index bb74db06c8..7b0272c20c 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -53623,7 +53623,9 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, { watermark: o.watermark, errorText: o.errorText, value: o.value, - title: o.title + title: function () { + return self.trigger.getValue(); + } }); this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () { self.popup.setValue(this.getValue()); @@ -58812,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); @@ -58851,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. diff --git a/dist/fineui.js b/dist/fineui.js index 0bdd207601..973f97596f 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -54027,7 +54027,9 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, { watermark: o.watermark, errorText: o.errorText, value: o.value, - title: o.title + title: function () { + return self.trigger.getValue(); + } }); this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () { self.popup.setValue(this.getValue()); @@ -59216,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); @@ -59255,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. diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index d6f7a87bb3..298f87e2a9 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -37040,7 +37040,9 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, { watermark: o.watermark, errorText: o.errorText, value: o.value, - title: o.title + title: function () { + return self.trigger.getValue(); + } }); this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () { self.popup.setValue(this.getValue()); @@ -42030,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); @@ -42069,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. diff --git a/src/case/combo/editoriconcheckcombo/combo.editiconcheck.js b/src/case/combo/editoriconcheckcombo/combo.editiconcheck.js index 318530c210..c3131c0871 100644 --- a/src/case/combo/editoriconcheckcombo/combo.editiconcheck.js +++ b/src/case/combo/editoriconcheckcombo/combo.editiconcheck.js @@ -29,7 +29,9 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, { watermark: o.watermark, errorText: o.errorText, value: o.value, - title: o.title + title: function () { + return self.trigger.getValue(); + } }); this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () { self.popup.setValue(this.getValue()); diff --git a/src/case/trigger/trigger.editor.js b/src/case/trigger/trigger.editor.js index 8737f5aca7..655b543100 100644 --- a/src/case/trigger/trigger.editor.js +++ b/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); @@ -74,4 +75,4 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, { } }); BI.EditorTrigger.EVENT_CHANGE = "BI.EditorTrigger.EVENT_CHANGE"; -BI.shortcut("bi.editor_trigger", BI.EditorTrigger); \ No newline at end of file +BI.shortcut("bi.editor_trigger", BI.EditorTrigger);