From 6e11f29f3accfb32a03a615473185aaf27263768 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Wed, 21 Mar 2018 16:43:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E4=BA=92=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/bundle.js | 28 +++++++++---------- dist/widget.js | 28 +++++++++---------- src/widget/dynamic/year/trigger.year.js | 4 +-- .../dynamic/yearmonth/trigger.yearmonth.js | 4 +-- .../yearquarter/trigger.yearquarter.js | 4 +-- src/widget/dynamicdate/dynamicdate.trigger.js | 16 +++++------ 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/dist/bundle.js b/dist/bundle.js index 50714aabb..8e5f37c84 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -90141,7 +90141,7 @@ BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger _getText: function (obj) { var value = ""; - if(BI.isNotNull(obj.year)) { + if(BI.isNotNull(obj.year) && obj.year !== 0) { value += Math.abs(obj.year) + BI.i18nText("BI-Basic_Year") + (obj.year < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")); } return value; @@ -90151,7 +90151,7 @@ BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger var dateStr = date.print("%Y"); this.editor.setState(dateStr); this.editor.setValue(dateStr); - this.setTitle(text + ":" + dateStr); + this.setTitle(BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr)); }, setValue: function (v) { @@ -90881,7 +90881,7 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY if(BI.isNotNull(obj.year)) { value += Math.abs(obj.year) + BI.i18nText("BI-Basic_Year") + (obj.year < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")); } - if(BI.isNotNull(obj.month)) { + if(BI.isNotNull(obj.month) && obj.month !== 0) { value += Math.abs(obj.month) + BI.i18nText("BI-Basic_Year") + (obj.month < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")); } return value; @@ -90891,7 +90891,7 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY var dateStr = date.print("%Y-%x"); this.yearEditor.setValue(date.getFullYear()); this.monthEditor.setValue(date.getMonth() + 1); - this.setTitle(text + ":" + dateStr); + this.setTitle(BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr)); }, setValue: function (v) { @@ -91604,7 +91604,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna if(BI.isNotNull(obj.year)) { value += Math.abs(obj.year) + BI.i18nText("BI-Basic_Year") + (obj.year < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")); } - if(BI.isNotNull(obj.quarter)) { + if(BI.isNotNull(obj.quarter) && obj.quarter !== 0) { value += Math.abs(obj.quarter) + BI.i18nText("BI-Basic_Year") + (obj.quarter < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")); } return value; @@ -91614,7 +91614,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna var dateStr = date.print("%Y-%x"); this.yearEditor.setValue(date.getFullYear()); this.quarterEditor.setValue(date.getQuarter()); - this.setTitle(text + ":" + dateStr); + this.setTitle(BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr)); }, setValue: function (v) { @@ -92742,32 +92742,32 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger var dateStr = date.print("%Y-%x-%e"); this.editor.setState(dateStr); this.editor.setValue(dateStr); - this.setTitle(text + ":" + dateStr); + this.setTitle(BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr)); }, _getText: function (obj) { var value = ""; - if(BI.isNotNull(obj.year)) { + if(BI.isNotNull(obj.year) && obj.year !== 0) { value += Math.abs(obj.year) + BI.i18nText("BI-Basic_Year") + (obj.year < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")) + getPositionText(BI.i18nText("BI-Basic_Year"), obj.position); } - if(BI.isNotNull(obj.quarter)) { + if(BI.isNotNull(obj.quarter) && obj.quarter !== 0) { value += Math.abs(obj.quarter) + BI.i18nText("BI-Basic_Single_Quarter") + (obj.quarter < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")) + getPositionText(BI.i18nText("BI-Basic_Year"), obj.position); } - if(BI.isNotNull(obj.month)) { + if(BI.isNotNull(obj.month) && obj.month !== 0) { value += Math.abs(obj.month) + BI.i18nText("BI-Basic_Month") + (obj.month < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")) + getPositionText(BI.i18nText("BI-Basic_Month"), obj.position); } - if(BI.isNotNull(obj.week)) { + if(BI.isNotNull(obj.week) && obj.week !== 0) { value += Math.abs(obj.week) + BI.i18nText("BI-Basic_Week") + (obj.week < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")) + getPositionText(BI.i18nText("BI-Basic_Week"), obj.position); } - if(BI.isNotNull(obj.day)) { + if(BI.isNotNull(obj.day) && obj.day !== 0) { value += Math.abs(obj.day) + BI.i18nText("BI-Basic_Day") + (obj.day < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")) + BI.size(obj) === 1 ? getPositionText(BI.i18nText("BI-Basic_Month"), obj.position) : ""; } - if(BI.isNotNull(obj.workDay)) { + if(BI.isNotNull(obj.workDay) && obj.workDay !== 0) { value += Math.abs(obj.workDay) + BI.i18nText("BI-Basic_Work_Day") + (obj.workDay < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")); } return value; - function getPositionText(baseText, position) { + function getPositionText (baseText, position) { switch (position) { case BI.DynamicDateCard.OFFSET.BEGIN: return baseText + BI.i18nText("BI-Basic_Begin_Start"); diff --git a/dist/widget.js b/dist/widget.js index 1f7b70549..abbaaad8d 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -3470,7 +3470,7 @@ BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger _getText: function (obj) { var value = ""; - if(BI.isNotNull(obj.year)) { + if(BI.isNotNull(obj.year) && obj.year !== 0) { value += Math.abs(obj.year) + BI.i18nText("BI-Basic_Year") + (obj.year < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")); } return value; @@ -3480,7 +3480,7 @@ BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger var dateStr = date.print("%Y"); this.editor.setState(dateStr); this.editor.setValue(dateStr); - this.setTitle(text + ":" + dateStr); + this.setTitle(BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr)); }, setValue: function (v) { @@ -4210,7 +4210,7 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY if(BI.isNotNull(obj.year)) { value += Math.abs(obj.year) + BI.i18nText("BI-Basic_Year") + (obj.year < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")); } - if(BI.isNotNull(obj.month)) { + if(BI.isNotNull(obj.month) && obj.month !== 0) { value += Math.abs(obj.month) + BI.i18nText("BI-Basic_Year") + (obj.month < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")); } return value; @@ -4220,7 +4220,7 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY var dateStr = date.print("%Y-%x"); this.yearEditor.setValue(date.getFullYear()); this.monthEditor.setValue(date.getMonth() + 1); - this.setTitle(text + ":" + dateStr); + this.setTitle(BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr)); }, setValue: function (v) { @@ -4933,7 +4933,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna if(BI.isNotNull(obj.year)) { value += Math.abs(obj.year) + BI.i18nText("BI-Basic_Year") + (obj.year < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")); } - if(BI.isNotNull(obj.quarter)) { + if(BI.isNotNull(obj.quarter) && obj.quarter !== 0) { value += Math.abs(obj.quarter) + BI.i18nText("BI-Basic_Year") + (obj.quarter < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")); } return value; @@ -4943,7 +4943,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna var dateStr = date.print("%Y-%x"); this.yearEditor.setValue(date.getFullYear()); this.quarterEditor.setValue(date.getQuarter()); - this.setTitle(text + ":" + dateStr); + this.setTitle(BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr)); }, setValue: function (v) { @@ -6071,32 +6071,32 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger var dateStr = date.print("%Y-%x-%e"); this.editor.setState(dateStr); this.editor.setValue(dateStr); - this.setTitle(text + ":" + dateStr); + this.setTitle(BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr)); }, _getText: function (obj) { var value = ""; - if(BI.isNotNull(obj.year)) { + if(BI.isNotNull(obj.year) && obj.year !== 0) { value += Math.abs(obj.year) + BI.i18nText("BI-Basic_Year") + (obj.year < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")) + getPositionText(BI.i18nText("BI-Basic_Year"), obj.position); } - if(BI.isNotNull(obj.quarter)) { + if(BI.isNotNull(obj.quarter) && obj.quarter !== 0) { value += Math.abs(obj.quarter) + BI.i18nText("BI-Basic_Single_Quarter") + (obj.quarter < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")) + getPositionText(BI.i18nText("BI-Basic_Year"), obj.position); } - if(BI.isNotNull(obj.month)) { + if(BI.isNotNull(obj.month) && obj.month !== 0) { value += Math.abs(obj.month) + BI.i18nText("BI-Basic_Month") + (obj.month < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")) + getPositionText(BI.i18nText("BI-Basic_Month"), obj.position); } - if(BI.isNotNull(obj.week)) { + if(BI.isNotNull(obj.week) && obj.week !== 0) { value += Math.abs(obj.week) + BI.i18nText("BI-Basic_Week") + (obj.week < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")) + getPositionText(BI.i18nText("BI-Basic_Week"), obj.position); } - if(BI.isNotNull(obj.day)) { + if(BI.isNotNull(obj.day) && obj.day !== 0) { value += Math.abs(obj.day) + BI.i18nText("BI-Basic_Day") + (obj.day < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")) + BI.size(obj) === 1 ? getPositionText(BI.i18nText("BI-Basic_Month"), obj.position) : ""; } - if(BI.isNotNull(obj.workDay)) { + if(BI.isNotNull(obj.workDay) && obj.workDay !== 0) { value += Math.abs(obj.workDay) + BI.i18nText("BI-Basic_Work_Day") + (obj.workDay < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")); } return value; - function getPositionText(baseText, position) { + function getPositionText (baseText, position) { switch (position) { case BI.DynamicDateCard.OFFSET.BEGIN: return baseText + BI.i18nText("BI-Basic_Begin_Start"); diff --git a/src/widget/dynamic/year/trigger.year.js b/src/widget/dynamic/year/trigger.year.js index 845bfe41c..6c49685e2 100644 --- a/src/widget/dynamic/year/trigger.year.js +++ b/src/widget/dynamic/year/trigger.year.js @@ -93,7 +93,7 @@ BI.DynamicYearTrigger = BI.inherit(BI.Trigger, { _getText: function (obj) { var value = ""; - if(BI.isNotNull(obj.year)) { + if(BI.isNotNull(obj.year) && obj.year !== 0) { value += Math.abs(obj.year) + BI.i18nText("BI-Basic_Year") + (obj.year < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")); } return value; @@ -103,7 +103,7 @@ BI.DynamicYearTrigger = BI.inherit(BI.Trigger, { var dateStr = date.print("%Y"); this.editor.setState(dateStr); this.editor.setValue(dateStr); - this.setTitle(text + ":" + dateStr); + this.setTitle(BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr)); }, setValue: function (v) { diff --git a/src/widget/dynamic/yearmonth/trigger.yearmonth.js b/src/widget/dynamic/yearmonth/trigger.yearmonth.js index 7d28fe4a2..cde12ef08 100644 --- a/src/widget/dynamic/yearmonth/trigger.yearmonth.js +++ b/src/widget/dynamic/yearmonth/trigger.yearmonth.js @@ -140,7 +140,7 @@ BI.DynamicYearMonthTrigger = BI.inherit(BI.Trigger, { if(BI.isNotNull(obj.year)) { value += Math.abs(obj.year) + BI.i18nText("BI-Basic_Year") + (obj.year < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")); } - if(BI.isNotNull(obj.month)) { + if(BI.isNotNull(obj.month) && obj.month !== 0) { value += Math.abs(obj.month) + BI.i18nText("BI-Basic_Year") + (obj.month < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")); } return value; @@ -150,7 +150,7 @@ BI.DynamicYearMonthTrigger = BI.inherit(BI.Trigger, { var dateStr = date.print("%Y-%x"); this.yearEditor.setValue(date.getFullYear()); this.monthEditor.setValue(date.getMonth() + 1); - this.setTitle(text + ":" + dateStr); + this.setTitle(BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr)); }, setValue: function (v) { diff --git a/src/widget/dynamic/yearquarter/trigger.yearquarter.js b/src/widget/dynamic/yearquarter/trigger.yearquarter.js index 8d066d945..a4c82b157 100644 --- a/src/widget/dynamic/yearquarter/trigger.yearquarter.js +++ b/src/widget/dynamic/yearquarter/trigger.yearquarter.js @@ -140,7 +140,7 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, { if(BI.isNotNull(obj.year)) { value += Math.abs(obj.year) + BI.i18nText("BI-Basic_Year") + (obj.year < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")); } - if(BI.isNotNull(obj.quarter)) { + if(BI.isNotNull(obj.quarter) && obj.quarter !== 0) { value += Math.abs(obj.quarter) + BI.i18nText("BI-Basic_Year") + (obj.quarter < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")); } return value; @@ -150,7 +150,7 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, { var dateStr = date.print("%Y-%x"); this.yearEditor.setValue(date.getFullYear()); this.quarterEditor.setValue(date.getQuarter()); - this.setTitle(text + ":" + dateStr); + this.setTitle(BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr)); }, setValue: function (v) { diff --git a/src/widget/dynamicdate/dynamicdate.trigger.js b/src/widget/dynamicdate/dynamicdate.trigger.js index 9bef91e04..a770148c5 100644 --- a/src/widget/dynamicdate/dynamicdate.trigger.js +++ b/src/widget/dynamicdate/dynamicdate.trigger.js @@ -139,32 +139,32 @@ BI.DynamicDateTrigger = BI.inherit(BI.Trigger, { var dateStr = date.print("%Y-%x-%e"); this.editor.setState(dateStr); this.editor.setValue(dateStr); - this.setTitle(text + ":" + dateStr); + this.setTitle(BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr)); }, _getText: function (obj) { var value = ""; - if(BI.isNotNull(obj.year)) { + if(BI.isNotNull(obj.year) && obj.year !== 0) { value += Math.abs(obj.year) + BI.i18nText("BI-Basic_Year") + (obj.year < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")) + getPositionText(BI.i18nText("BI-Basic_Year"), obj.position); } - if(BI.isNotNull(obj.quarter)) { + if(BI.isNotNull(obj.quarter) && obj.quarter !== 0) { value += Math.abs(obj.quarter) + BI.i18nText("BI-Basic_Single_Quarter") + (obj.quarter < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")) + getPositionText(BI.i18nText("BI-Basic_Year"), obj.position); } - if(BI.isNotNull(obj.month)) { + if(BI.isNotNull(obj.month) && obj.month !== 0) { value += Math.abs(obj.month) + BI.i18nText("BI-Basic_Month") + (obj.month < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")) + getPositionText(BI.i18nText("BI-Basic_Month"), obj.position); } - if(BI.isNotNull(obj.week)) { + if(BI.isNotNull(obj.week) && obj.week !== 0) { value += Math.abs(obj.week) + BI.i18nText("BI-Basic_Week") + (obj.week < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")) + getPositionText(BI.i18nText("BI-Basic_Week"), obj.position); } - if(BI.isNotNull(obj.day)) { + if(BI.isNotNull(obj.day) && obj.day !== 0) { value += Math.abs(obj.day) + BI.i18nText("BI-Basic_Day") + (obj.day < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")) + BI.size(obj) === 1 ? getPositionText(BI.i18nText("BI-Basic_Month"), obj.position) : ""; } - if(BI.isNotNull(obj.workDay)) { + if(BI.isNotNull(obj.workDay) && obj.workDay !== 0) { value += Math.abs(obj.workDay) + BI.i18nText("BI-Basic_Work_Day") + (obj.workDay < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")); } return value; - function getPositionText(baseText, position) { + function getPositionText (baseText, position) { switch (position) { case BI.DynamicDateCard.OFFSET.BEGIN: return baseText + BI.i18nText("BI-Basic_Begin_Start");