From 85d730d79db1e77234e7a4a3451ea504d7dc4647 Mon Sep 17 00:00:00 2001 From: fay Date: Wed, 26 Sep 2018 17:30:17 +0800 Subject: [PATCH 01/13] update --- .../combo.textvaluedownlist.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js b/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js index f075a3ec9..3ab2a9786 100644 --- a/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js +++ b/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js @@ -21,6 +21,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ + this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ @@ -44,13 +45,19 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }); this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () { - self.setValue(self.combo.getValue()[0].value); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + var currentVal = self.combo.getValue()[0].value; + if (currentVal !== self.value) { + self.setValue(currentVal); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + } }); this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () { - self.setValue(self.combo.getValue()[0].childValue); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + var currentVal = self.combo.getValue()[0].childValue; + if (currentVal !== self.value) { + self.setValue(currentVal); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + } }); }, @@ -69,6 +76,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }, _digest: function (v) { + this.value = v; return this.valueMap[v]; }, From d57bb5bcb0879ac5fa2a945f74e3aaad46bcd7fc Mon Sep 17 00:00:00 2001 From: fay Date: Wed, 26 Sep 2018 17:33:09 +0800 Subject: [PATCH 02/13] update --- src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js b/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js index 3ab2a9786..f7162df09 100644 --- a/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js +++ b/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js @@ -21,7 +21,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ - this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ From acd89f38e6de62af93881754a8df483f3dca50c7 Mon Sep 17 00:00:00 2001 From: fay Date: Wed, 26 Sep 2018 19:17:11 +0800 Subject: [PATCH 03/13] update --- dist/bundle.ie.js | 15 +++++++++++---- dist/bundle.js | 15 +++++++++++---- dist/case.js | 15 +++++++++++---- dist/fineui.ie.js | 15 +++++++++++---- dist/fineui.js | 15 +++++++++++---- dist/fineui_without_jquery_polyfill.js | 15 +++++++++++---- 6 files changed, 66 insertions(+), 24 deletions(-) diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index b375d1acb..12617312e 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -53813,13 +53813,19 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }); this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () { - self.setValue(self.combo.getValue()[0].value); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + var currentVal = self.combo.getValue()[0].value; + if (currentVal !== self.value) { + self.setValue(currentVal); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + } }); this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () { - self.setValue(self.combo.getValue()[0].childValue); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + var currentVal = self.combo.getValue()[0].childValue; + if (currentVal !== self.value) { + self.setValue(currentVal); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + } }); }, @@ -53838,6 +53844,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }, _digest: function (v) { + this.value = v; return this.valueMap[v]; }, diff --git a/dist/bundle.js b/dist/bundle.js index 83962a960..56974400f 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -54352,13 +54352,19 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }); this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () { - self.setValue(self.combo.getValue()[0].value); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + var currentVal = self.combo.getValue()[0].value; + if (currentVal !== self.value) { + self.setValue(currentVal); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + } }); this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () { - self.setValue(self.combo.getValue()[0].childValue); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + var currentVal = self.combo.getValue()[0].childValue; + if (currentVal !== self.value) { + self.setValue(currentVal); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + } }); }, @@ -54377,6 +54383,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }, _digest: function (v) { + this.value = v; return this.valueMap[v]; }, diff --git a/dist/case.js b/dist/case.js index 0ff496e20..1f89d5bd4 100644 --- a/dist/case.js +++ b/dist/case.js @@ -5490,13 +5490,19 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }); this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () { - self.setValue(self.combo.getValue()[0].value); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + var currentVal = self.combo.getValue()[0].value; + if (currentVal !== self.value) { + self.setValue(currentVal); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + } }); this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () { - self.setValue(self.combo.getValue()[0].childValue); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + var currentVal = self.combo.getValue()[0].childValue; + if (currentVal !== self.value) { + self.setValue(currentVal); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + } }); }, @@ -5515,6 +5521,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }, _digest: function (v) { + this.value = v; return this.valueMap[v]; }, diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index c264cfbe6..77fb82a6b 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -54055,13 +54055,19 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }); this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () { - self.setValue(self.combo.getValue()[0].value); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + var currentVal = self.combo.getValue()[0].value; + if (currentVal !== self.value) { + self.setValue(currentVal); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + } }); this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () { - self.setValue(self.combo.getValue()[0].childValue); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + var currentVal = self.combo.getValue()[0].childValue; + if (currentVal !== self.value) { + self.setValue(currentVal); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + } }); }, @@ -54080,6 +54086,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }, _digest: function (v) { + this.value = v; return this.valueMap[v]; }, diff --git a/dist/fineui.js b/dist/fineui.js index 3fb06bb08..6752a56a4 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -54594,13 +54594,19 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }); this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () { - self.setValue(self.combo.getValue()[0].value); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + var currentVal = self.combo.getValue()[0].value; + if (currentVal !== self.value) { + self.setValue(currentVal); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + } }); this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () { - self.setValue(self.combo.getValue()[0].childValue); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + var currentVal = self.combo.getValue()[0].childValue; + if (currentVal !== self.value) { + self.setValue(currentVal); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + } }); }, @@ -54619,6 +54625,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }, _digest: function (v) { + this.value = v; return this.valueMap[v]; }, diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index 460bbfd85..733dc043d 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -37675,13 +37675,19 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }); this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () { - self.setValue(self.combo.getValue()[0].value); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + var currentVal = self.combo.getValue()[0].value; + if (currentVal !== self.value) { + self.setValue(currentVal); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + } }); this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () { - self.setValue(self.combo.getValue()[0].childValue); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + var currentVal = self.combo.getValue()[0].childValue; + if (currentVal !== self.value) { + self.setValue(currentVal); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + } }); }, @@ -37700,6 +37706,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }, _digest: function (v) { + this.value = v; return this.valueMap[v]; }, From e9c7bce07a64f4b6083f6d6d42c3a448f2919e0e Mon Sep 17 00:00:00 2001 From: fay Date: Wed, 26 Sep 2018 19:18:00 +0800 Subject: [PATCH 04/13] Revert "update" This reverts commit d57bb5bcb0879ac5fa2a945f74e3aaad46bcd7fc. --- src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js b/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js index f7162df09..3ab2a9786 100644 --- a/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js +++ b/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js @@ -21,6 +21,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ + this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ From f7b1279d1b5d85863617a1abe4b230e549e33f0c Mon Sep 17 00:00:00 2001 From: fay Date: Wed, 26 Sep 2018 19:18:24 +0800 Subject: [PATCH 05/13] update --- dist/bundle.ie.js | 1 + dist/bundle.js | 1 + dist/case.js | 1 + dist/fineui.ie.js | 1 + dist/fineui.js | 1 + dist/fineui_without_jquery_polyfill.js | 1 + 6 files changed, 6 insertions(+) diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index 12617312e..e9dafc684 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -53790,6 +53790,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ + this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ diff --git a/dist/bundle.js b/dist/bundle.js index 56974400f..2698e009f 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -54329,6 +54329,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ + this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ diff --git a/dist/case.js b/dist/case.js index 1f89d5bd4..546799fdd 100644 --- a/dist/case.js +++ b/dist/case.js @@ -5467,6 +5467,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ + this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index 77fb82a6b..89400f914 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -54032,6 +54032,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ + this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ diff --git a/dist/fineui.js b/dist/fineui.js index 6752a56a4..3f6161c9d 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -54571,6 +54571,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ + this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index 733dc043d..c02edb3a5 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -37652,6 +37652,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ + this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ From 47fcdf2211c1ff9081597b7d322fa58a135fc122 Mon Sep 17 00:00:00 2001 From: fay Date: Wed, 26 Sep 2018 19:39:04 +0800 Subject: [PATCH 06/13] Revert "update" This reverts commit f7b1279d1b5d85863617a1abe4b230e549e33f0c. --- dist/bundle.ie.js | 1 - dist/bundle.js | 1 - dist/case.js | 1 - dist/fineui.ie.js | 1 - dist/fineui.js | 1 - dist/fineui_without_jquery_polyfill.js | 1 - 6 files changed, 6 deletions(-) diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index e9dafc684..12617312e 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -53790,7 +53790,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ - this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ diff --git a/dist/bundle.js b/dist/bundle.js index 2698e009f..56974400f 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -54329,7 +54329,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ - this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ diff --git a/dist/case.js b/dist/case.js index 546799fdd..1f89d5bd4 100644 --- a/dist/case.js +++ b/dist/case.js @@ -5467,7 +5467,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ - this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index 89400f914..77fb82a6b 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -54032,7 +54032,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ - this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ diff --git a/dist/fineui.js b/dist/fineui.js index 3f6161c9d..6752a56a4 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -54571,7 +54571,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ - this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index c02edb3a5..733dc043d 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -37652,7 +37652,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ - this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ From 862ba43f287e45743295d0994124f0c843ed1110 Mon Sep 17 00:00:00 2001 From: fay Date: Wed, 26 Sep 2018 19:39:51 +0800 Subject: [PATCH 07/13] Revert "Revert "update"" This reverts commit 47fcdf2211c1ff9081597b7d322fa58a135fc122. --- dist/bundle.ie.js | 1 + dist/bundle.js | 1 + dist/case.js | 1 + dist/fineui.ie.js | 1 + dist/fineui.js | 1 + dist/fineui_without_jquery_polyfill.js | 1 + 6 files changed, 6 insertions(+) diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index 12617312e..e9dafc684 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -53790,6 +53790,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ + this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ diff --git a/dist/bundle.js b/dist/bundle.js index 56974400f..2698e009f 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -54329,6 +54329,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ + this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ diff --git a/dist/case.js b/dist/case.js index 1f89d5bd4..546799fdd 100644 --- a/dist/case.js +++ b/dist/case.js @@ -5467,6 +5467,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ + this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index 77fb82a6b..89400f914 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -54032,6 +54032,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ + this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ diff --git a/dist/fineui.js b/dist/fineui.js index 6752a56a4..3f6161c9d 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -54571,6 +54571,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ + this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index 733dc043d..c02edb3a5 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -37652,6 +37652,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ + this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ From 21f5987af638d198d949dd118c2c6fb68de80168 Mon Sep 17 00:00:00 2001 From: fay Date: Wed, 26 Sep 2018 19:39:52 +0800 Subject: [PATCH 08/13] Revert "update" This reverts commit f7b1279d1b5d85863617a1abe4b230e549e33f0c. --- dist/bundle.ie.js | 1 - dist/bundle.js | 1 - dist/case.js | 1 - dist/fineui.ie.js | 1 - dist/fineui.js | 1 - dist/fineui_without_jquery_polyfill.js | 1 - 6 files changed, 6 deletions(-) diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index e9dafc684..12617312e 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -53790,7 +53790,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ - this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ diff --git a/dist/bundle.js b/dist/bundle.js index 2698e009f..56974400f 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -54329,7 +54329,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ - this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ diff --git a/dist/case.js b/dist/case.js index 546799fdd..1f89d5bd4 100644 --- a/dist/case.js +++ b/dist/case.js @@ -5467,7 +5467,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ - this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index 89400f914..77fb82a6b 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -54032,7 +54032,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ - this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ diff --git a/dist/fineui.js b/dist/fineui.js index 3f6161c9d..6752a56a4 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -54571,7 +54571,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ - this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index c02edb3a5..733dc043d 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -37652,7 +37652,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ - this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ From d7179d6e8ffae605b9b1c9df7bd6b30039468bba Mon Sep 17 00:00:00 2001 From: fay Date: Wed, 26 Sep 2018 19:39:53 +0800 Subject: [PATCH 09/13] Revert "Revert "update"" This reverts commit e9c7bce07a64f4b6083f6d6d42c3a448f2919e0e. --- src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js b/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js index 3ab2a9786..f7162df09 100644 --- a/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js +++ b/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js @@ -21,7 +21,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ - this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ From 5494009030a37e1adfa29a89d67b772d2ede7f3a Mon Sep 17 00:00:00 2001 From: fay Date: Wed, 26 Sep 2018 19:39:53 +0800 Subject: [PATCH 10/13] Revert "update" This reverts commit acd89f38e6de62af93881754a8df483f3dca50c7. --- dist/bundle.ie.js | 15 ++++----------- dist/bundle.js | 15 ++++----------- dist/case.js | 15 ++++----------- dist/fineui.ie.js | 15 ++++----------- dist/fineui.js | 15 ++++----------- dist/fineui_without_jquery_polyfill.js | 15 ++++----------- 6 files changed, 24 insertions(+), 66 deletions(-) diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index 12617312e..b375d1acb 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -53813,19 +53813,13 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }); this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () { - var currentVal = self.combo.getValue()[0].value; - if (currentVal !== self.value) { - self.setValue(currentVal); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); - } + self.setValue(self.combo.getValue()[0].value); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); }); this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () { - var currentVal = self.combo.getValue()[0].childValue; - if (currentVal !== self.value) { - self.setValue(currentVal); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); - } + self.setValue(self.combo.getValue()[0].childValue); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); }); }, @@ -53844,7 +53838,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }, _digest: function (v) { - this.value = v; return this.valueMap[v]; }, diff --git a/dist/bundle.js b/dist/bundle.js index 56974400f..83962a960 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -54352,19 +54352,13 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }); this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () { - var currentVal = self.combo.getValue()[0].value; - if (currentVal !== self.value) { - self.setValue(currentVal); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); - } + self.setValue(self.combo.getValue()[0].value); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); }); this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () { - var currentVal = self.combo.getValue()[0].childValue; - if (currentVal !== self.value) { - self.setValue(currentVal); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); - } + self.setValue(self.combo.getValue()[0].childValue); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); }); }, @@ -54383,7 +54377,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }, _digest: function (v) { - this.value = v; return this.valueMap[v]; }, diff --git a/dist/case.js b/dist/case.js index 1f89d5bd4..0ff496e20 100644 --- a/dist/case.js +++ b/dist/case.js @@ -5490,19 +5490,13 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }); this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () { - var currentVal = self.combo.getValue()[0].value; - if (currentVal !== self.value) { - self.setValue(currentVal); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); - } + self.setValue(self.combo.getValue()[0].value); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); }); this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () { - var currentVal = self.combo.getValue()[0].childValue; - if (currentVal !== self.value) { - self.setValue(currentVal); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); - } + self.setValue(self.combo.getValue()[0].childValue); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); }); }, @@ -5521,7 +5515,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }, _digest: function (v) { - this.value = v; return this.valueMap[v]; }, diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index 77fb82a6b..c264cfbe6 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -54055,19 +54055,13 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }); this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () { - var currentVal = self.combo.getValue()[0].value; - if (currentVal !== self.value) { - self.setValue(currentVal); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); - } + self.setValue(self.combo.getValue()[0].value); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); }); this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () { - var currentVal = self.combo.getValue()[0].childValue; - if (currentVal !== self.value) { - self.setValue(currentVal); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); - } + self.setValue(self.combo.getValue()[0].childValue); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); }); }, @@ -54086,7 +54080,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }, _digest: function (v) { - this.value = v; return this.valueMap[v]; }, diff --git a/dist/fineui.js b/dist/fineui.js index 6752a56a4..3fb06bb08 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -54594,19 +54594,13 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }); this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () { - var currentVal = self.combo.getValue()[0].value; - if (currentVal !== self.value) { - self.setValue(currentVal); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); - } + self.setValue(self.combo.getValue()[0].value); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); }); this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () { - var currentVal = self.combo.getValue()[0].childValue; - if (currentVal !== self.value) { - self.setValue(currentVal); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); - } + self.setValue(self.combo.getValue()[0].childValue); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); }); }, @@ -54625,7 +54619,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }, _digest: function (v) { - this.value = v; return this.valueMap[v]; }, diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index 733dc043d..460bbfd85 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -37675,19 +37675,13 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }); this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () { - var currentVal = self.combo.getValue()[0].value; - if (currentVal !== self.value) { - self.setValue(currentVal); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); - } + self.setValue(self.combo.getValue()[0].value); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); }); this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () { - var currentVal = self.combo.getValue()[0].childValue; - if (currentVal !== self.value) { - self.setValue(currentVal); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); - } + self.setValue(self.combo.getValue()[0].childValue); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); }); }, @@ -37706,7 +37700,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }, _digest: function (v) { - this.value = v; return this.valueMap[v]; }, From f44a051f03a905c6df83a35002cfd0fd3f990c90 Mon Sep 17 00:00:00 2001 From: fay Date: Wed, 26 Sep 2018 19:39:54 +0800 Subject: [PATCH 11/13] Revert "update" This reverts commit d57bb5bcb0879ac5fa2a945f74e3aaad46bcd7fc. --- src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js b/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js index f7162df09..3ab2a9786 100644 --- a/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js +++ b/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js @@ -21,6 +21,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ + this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ From 2ae29be0a0ab0100a168aa2bad9328ca4d9cee86 Mon Sep 17 00:00:00 2001 From: fay Date: Wed, 26 Sep 2018 19:39:54 +0800 Subject: [PATCH 12/13] Revert "update" This reverts commit 85d730d79db1e77234e7a4a3451ea504d7dc4647. --- .../combo.textvaluedownlist.js | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js b/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js index 3ab2a9786..f075a3ec9 100644 --- a/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js +++ b/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js @@ -21,7 +21,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { var value; if(BI.isNotNull(o.value)){ - this.value = o.value; value = this._digest(o.value); } this.trigger = BI.createWidget({ @@ -45,19 +44,13 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }); this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () { - var currentVal = self.combo.getValue()[0].value; - if (currentVal !== self.value) { - self.setValue(currentVal); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); - } + self.setValue(self.combo.getValue()[0].value); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); }); this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () { - var currentVal = self.combo.getValue()[0].childValue; - if (currentVal !== self.value) { - self.setValue(currentVal); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); - } + self.setValue(self.combo.getValue()[0].childValue); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); }); }, @@ -76,7 +69,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }, _digest: function (v) { - this.value = v; return this.valueMap[v]; }, From 5b901d9a2a22de68623e44abeb25bbb19168113c Mon Sep 17 00:00:00 2001 From: fay Date: Wed, 26 Sep 2018 19:40:59 +0800 Subject: [PATCH 13/13] update --- .../combo.textvaluedownlist.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js b/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js index f075a3ec9..734395889 100644 --- a/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js +++ b/src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js @@ -20,7 +20,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { this._createValueMap(); var value; - if(BI.isNotNull(o.value)){ + if(BI.isNotNull(o.value)) { value = this._digest(o.value); } this.trigger = BI.createWidget({ @@ -44,13 +44,19 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }); this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () { - self.setValue(self.combo.getValue()[0].value); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + var currentVal = self.combo.getValue()[0].value; + if (currentVal !== self.value) { + self.setValue(currentVal); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + } }); this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () { - self.setValue(self.combo.getValue()[0].childValue); - self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + var currentVal = self.combo.getValue()[0].childValue; + if (currentVal !== self.value) { + self.setValue(currentVal); + self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE); + } }); }, @@ -69,6 +75,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }, _digest: function (v) { + this.value = v; return this.valueMap[v]; },