From 98767eb94812bf2a53019de492f7b9d4a4f73156 Mon Sep 17 00:00:00 2001 From: "lei.wang" Date: Mon, 3 Jun 2019 15:02:16 +0800 Subject: [PATCH] =?UTF-8?q?BI-45749=20fix:=20=E5=A6=82=E6=9E=9C=E5=9C=A8?= =?UTF-8?q?=E4=BB=85=E4=BC=A0=E5=85=A5value=E6=83=85=E5=86=B5=E4=B8=8B?= =?UTF-8?q?=E6=A0=87=E7=BA=A2=E4=BC=9A=E5=AF=BC=E8=87=B4=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/2.0/fineui.ie.js | 8 +++++--- dist/2.0/fineui.js | 8 +++++--- dist/bundle.ie.js | 8 +++++--- dist/bundle.js | 8 +++++--- dist/fineui.ie.js | 8 +++++--- dist/fineui.js | 8 +++++--- dist/fineui_without_jquery_polyfill.js | 8 +++++--- dist/widget.js | 3 ++- src/base/single/text.js | 4 ++-- 9 files changed, 39 insertions(+), 24 deletions(-) diff --git a/dist/2.0/fineui.ie.js b/dist/2.0/fineui.ie.js index 92f6a5357..6dac43fab 100644 --- a/dist/2.0/fineui.ie.js +++ b/dist/2.0/fineui.ie.js @@ -36084,7 +36084,7 @@ BI.Text = BI.inherit(BI.Single, { this.setText(o.value); } if (BI.isKey(o.keyword)) { - this.text.element.__textKeywordMarked__(text, o.keyword, o.py); + this.doRedMark(o.keyword); } if (o.highLight) { this.doHighLight(); @@ -36146,7 +36146,8 @@ BI.Text = BI.inherit(BI.Single, { } }); -BI.shortcut("bi.text", BI.Text);/** +BI.shortcut("bi.text", BI.Text); +/** * guy * @class BI.BasicButton * @extends BI.Single @@ -60260,7 +60261,8 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, { max: this.options.max, year: date.year, month: date.month, - day: this.selectedTime.day + // BI-45616 此处为确定当前应该展示哪个年月对应的Calendar, day不是关键数据, 给1号就可 + day: 1 }); return calendar; }, diff --git a/dist/2.0/fineui.js b/dist/2.0/fineui.js index 98537a639..05187661c 100644 --- a/dist/2.0/fineui.js +++ b/dist/2.0/fineui.js @@ -36488,7 +36488,7 @@ BI.Text = BI.inherit(BI.Single, { this.setText(o.value); } if (BI.isKey(o.keyword)) { - this.text.element.__textKeywordMarked__(text, o.keyword, o.py); + this.doRedMark(o.keyword); } if (o.highLight) { this.doHighLight(); @@ -36550,7 +36550,8 @@ BI.Text = BI.inherit(BI.Single, { } }); -BI.shortcut("bi.text", BI.Text);/** +BI.shortcut("bi.text", BI.Text); +/** * guy * @class BI.BasicButton * @extends BI.Single @@ -60664,7 +60665,8 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, { max: this.options.max, year: date.year, month: date.month, - day: this.selectedTime.day + // BI-45616 此处为确定当前应该展示哪个年月对应的Calendar, day不是关键数据, 给1号就可 + day: 1 }); return calendar; }, diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index 92f6a5357..6dac43fab 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -36084,7 +36084,7 @@ BI.Text = BI.inherit(BI.Single, { this.setText(o.value); } if (BI.isKey(o.keyword)) { - this.text.element.__textKeywordMarked__(text, o.keyword, o.py); + this.doRedMark(o.keyword); } if (o.highLight) { this.doHighLight(); @@ -36146,7 +36146,8 @@ BI.Text = BI.inherit(BI.Single, { } }); -BI.shortcut("bi.text", BI.Text);/** +BI.shortcut("bi.text", BI.Text); +/** * guy * @class BI.BasicButton * @extends BI.Single @@ -60260,7 +60261,8 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, { max: this.options.max, year: date.year, month: date.month, - day: this.selectedTime.day + // BI-45616 此处为确定当前应该展示哪个年月对应的Calendar, day不是关键数据, 给1号就可 + day: 1 }); return calendar; }, diff --git a/dist/bundle.js b/dist/bundle.js index 98537a639..05187661c 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -36488,7 +36488,7 @@ BI.Text = BI.inherit(BI.Single, { this.setText(o.value); } if (BI.isKey(o.keyword)) { - this.text.element.__textKeywordMarked__(text, o.keyword, o.py); + this.doRedMark(o.keyword); } if (o.highLight) { this.doHighLight(); @@ -36550,7 +36550,8 @@ BI.Text = BI.inherit(BI.Single, { } }); -BI.shortcut("bi.text", BI.Text);/** +BI.shortcut("bi.text", BI.Text); +/** * guy * @class BI.BasicButton * @extends BI.Single @@ -60664,7 +60665,8 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, { max: this.options.max, year: date.year, month: date.month, - day: this.selectedTime.day + // BI-45616 此处为确定当前应该展示哪个年月对应的Calendar, day不是关键数据, 给1号就可 + day: 1 }); return calendar; }, diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index a7a5e1eb7..219de80f3 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -36329,7 +36329,7 @@ BI.Text = BI.inherit(BI.Single, { this.setText(o.value); } if (BI.isKey(o.keyword)) { - this.text.element.__textKeywordMarked__(text, o.keyword, o.py); + this.doRedMark(o.keyword); } if (o.highLight) { this.doHighLight(); @@ -36391,7 +36391,8 @@ BI.Text = BI.inherit(BI.Single, { } }); -BI.shortcut("bi.text", BI.Text);/** +BI.shortcut("bi.text", BI.Text); +/** * guy * @class BI.BasicButton * @extends BI.Single @@ -60505,7 +60506,8 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, { max: this.options.max, year: date.year, month: date.month, - day: this.selectedTime.day + // BI-45616 此处为确定当前应该展示哪个年月对应的Calendar, day不是关键数据, 给1号就可 + day: 1 }); return calendar; }, diff --git a/dist/fineui.js b/dist/fineui.js index cc9e0566a..f1405360b 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -36733,7 +36733,7 @@ BI.Text = BI.inherit(BI.Single, { this.setText(o.value); } if (BI.isKey(o.keyword)) { - this.text.element.__textKeywordMarked__(text, o.keyword, o.py); + this.doRedMark(o.keyword); } if (o.highLight) { this.doHighLight(); @@ -36795,7 +36795,8 @@ BI.Text = BI.inherit(BI.Single, { } }); -BI.shortcut("bi.text", BI.Text);/** +BI.shortcut("bi.text", BI.Text); +/** * guy * @class BI.BasicButton * @extends BI.Single @@ -60909,7 +60910,8 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, { max: this.options.max, year: date.year, month: date.month, - day: this.selectedTime.day + // BI-45616 此处为确定当前应该展示哪个年月对应的Calendar, day不是关键数据, 给1号就可 + day: 1 }); return calendar; }, diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index 1d414bfdc..9c50cb6b0 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -25181,7 +25181,7 @@ BI.Text = BI.inherit(BI.Single, { this.setText(o.value); } if (BI.isKey(o.keyword)) { - this.text.element.__textKeywordMarked__(text, o.keyword, o.py); + this.doRedMark(o.keyword); } if (o.highLight) { this.doHighLight(); @@ -25243,7 +25243,8 @@ BI.Text = BI.inherit(BI.Single, { } }); -BI.shortcut("bi.text", BI.Text);/** +BI.shortcut("bi.text", BI.Text); +/** * guy * @class BI.BasicButton * @extends BI.Single @@ -43318,7 +43319,8 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, { max: this.options.max, year: date.year, month: date.month, - day: this.selectedTime.day + // BI-45616 此处为确定当前应该展示哪个年月对应的Calendar, day不是关键数据, 给1号就可 + day: 1 }); return calendar; }, diff --git a/dist/widget.js b/dist/widget.js index 337c172bf..e796f5c84 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -449,7 +449,8 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, { max: this.options.max, year: date.year, month: date.month, - day: this.selectedTime.day + // BI-45616 此处为确定当前应该展示哪个年月对应的Calendar, day不是关键数据, 给1号就可 + day: 1 }); return calendar; }, diff --git a/src/base/single/text.js b/src/base/single/text.js index aa41b1006..53e938d2a 100644 --- a/src/base/single/text.js +++ b/src/base/single/text.js @@ -85,7 +85,7 @@ BI.Text = BI.inherit(BI.Single, { this.setText(o.value); } if (BI.isKey(o.keyword)) { - this.text.element.__textKeywordMarked__(text, o.keyword, o.py); + this.doRedMark(o.keyword); } if (o.highLight) { this.doHighLight(); @@ -147,4 +147,4 @@ BI.Text = BI.inherit(BI.Single, { } }); -BI.shortcut("bi.text", BI.Text); \ No newline at end of file +BI.shortcut("bi.text", BI.Text);