From 40761e2aeb30c170259e6aff1f6a5f4825269116 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 12 May 2017 16:33:33 +0800 Subject: [PATCH 1/2] getMonthDay --- bi/core.js | 5 +++-- docs/core.js | 5 +++-- src/core/proto/date.js | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/bi/core.js b/bi/core.js index 494b9d052f..6b0896e755 100644 --- a/bi/core.js +++ b/bi/core.js @@ -6579,8 +6579,9 @@ Date.checkLegal = function (str) { if (ar.length <= 2) { return MM >= 1 && MM <= 12; } - Date._MD[1] = Date.isLeap(YY) ? 29 : 28; - return MM >= 1 && MM <= 12 && DD <= Date._MD[MM - 1]; + var MD = Date._MD.slice(0); + MD[1] = Date.isLeap(YY) ? 29 : 28; + return MM >= 1 && MM <= 12 && DD <= MD[MM - 1]; }; Date.parseDateTime = function (str, fmt) { diff --git a/docs/core.js b/docs/core.js index 0bd912d24a..0b43853e70 100644 --- a/docs/core.js +++ b/docs/core.js @@ -24062,8 +24062,9 @@ Date.checkLegal = function (str) { if (ar.length <= 2) { return MM >= 1 && MM <= 12; } - Date._MD[1] = Date.isLeap(YY) ? 29 : 28; - return MM >= 1 && MM <= 12 && DD <= Date._MD[MM - 1]; + var MD = Date._MD.slice(0); + MD[1] = Date.isLeap(YY) ? 29 : 28; + return MM >= 1 && MM <= 12 && DD <= MD[MM - 1]; }; Date.parseDateTime = function (str, fmt) { diff --git a/src/core/proto/date.js b/src/core/proto/date.js index 36197df932..75e833c6a4 100644 --- a/src/core/proto/date.js +++ b/src/core/proto/date.js @@ -386,8 +386,9 @@ Date.checkLegal = function (str) { if (ar.length <= 2) { return MM >= 1 && MM <= 12; } - Date._MD[1] = Date.isLeap(YY) ? 29 : 28; - return MM >= 1 && MM <= 12 && DD <= Date._MD[MM - 1]; + var MD = Date._MD.slice(0); + MD[1] = Date.isLeap(YY) ? 29 : 28; + return MM >= 1 && MM <= 12 && DD <= MD[MM - 1]; }; Date.parseDateTime = function (str, fmt) { From 21965bebed041a7d2482646699507ec938bedcc9 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Mon, 15 May 2017 10:17:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bubblecombo=20=E5=AE=9E=E7=8E=B0setEnable?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bi/case.js | 8 ++++++++ docs/case.js | 8 ++++++++ src/case/combo/bubblecombo/combo.bubble.js | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/bi/case.js b/bi/case.js index 7b4c962e3c..44260087cf 100644 --- a/bi/case.js +++ b/bi/case.js @@ -3596,6 +3596,14 @@ BI.BubbleCombo = BI.inherit(BI.Widget, { hasView: function () { return BI.isNotNull(this.combo.getView()); + }, + + isViewVisible: function () { + return this.combo.isViewVisible(); + }, + + setEnable: function (v) { + this.combo.setEnable(!!v); } }); diff --git a/docs/case.js b/docs/case.js index 7b4c962e3c..44260087cf 100644 --- a/docs/case.js +++ b/docs/case.js @@ -3596,6 +3596,14 @@ BI.BubbleCombo = BI.inherit(BI.Widget, { hasView: function () { return BI.isNotNull(this.combo.getView()); + }, + + isViewVisible: function () { + return this.combo.isViewVisible(); + }, + + setEnable: function (v) { + this.combo.setEnable(!!v); } }); diff --git a/src/case/combo/bubblecombo/combo.bubble.js b/src/case/combo/bubblecombo/combo.bubble.js index 7da74e5caf..023872a577 100644 --- a/src/case/combo/bubblecombo/combo.bubble.js +++ b/src/case/combo/bubblecombo/combo.bubble.js @@ -197,6 +197,14 @@ BI.BubbleCombo = BI.inherit(BI.Widget, { hasView: function () { return BI.isNotNull(this.combo.getView()); + }, + + isViewVisible: function () { + return this.combo.isViewVisible(); + }, + + setEnable: function (v) { + this.combo.setEnable(!!v); } });