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/3] 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 494b9d052..6b0896e75 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 0bd912d24..0b43853e7 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 36197df93..75e833c6a 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/3] =?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 7b4c962e3..44260087c 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 7b4c962e3..44260087c 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 7da74e5ca..023872a57 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); } }); From f5737873aa0ed2e16aaa32778cbcbf7ae0be70c3 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Mon, 15 May 2017 10:29:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?textArea=20=E5=A4=9A=E8=BE=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bi/base.css | 6 ------ docs/base.css | 6 ------ src/css/base/single/editor/editor.textarea.css | 6 ------ src/less/base/single/editor/editor.textarea.less | 4 ++-- 4 files changed, 2 insertions(+), 20 deletions(-) diff --git a/bi/base.css b/bi/base.css index 2bd711754..9a756c550 100644 --- a/bi/base.css +++ b/bi/base.css @@ -920,12 +920,6 @@ li.CodeMirror-hint-active { .bi-textarea-editor .textarea-editor-content { border: none; } -.bi-textarea-editor .textarea-editor-content.textarea-editor-focus { - border: 1px solid #d4dadd; -} -.bi-theme-dark .bi-textarea-editor .textarea-editor-content.textarea-editor-focus { - border: 1px solid #525466; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ diff --git a/docs/base.css b/docs/base.css index 2bd711754..9a756c550 100644 --- a/docs/base.css +++ b/docs/base.css @@ -920,12 +920,6 @@ li.CodeMirror-hint-active { .bi-textarea-editor .textarea-editor-content { border: none; } -.bi-textarea-editor .textarea-editor-content.textarea-editor-focus { - border: 1px solid #d4dadd; -} -.bi-theme-dark .bi-textarea-editor .textarea-editor-content.textarea-editor-focus { - border: 1px solid #525466; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ diff --git a/src/css/base/single/editor/editor.textarea.css b/src/css/base/single/editor/editor.textarea.css index 95537977a..13e82616c 100644 --- a/src/css/base/single/editor/editor.textarea.css +++ b/src/css/base/single/editor/editor.textarea.css @@ -12,9 +12,3 @@ .bi-textarea-editor .textarea-editor-content { border: none; } -.bi-textarea-editor .textarea-editor-content.textarea-editor-focus { - border: 1px solid #d4dadd; -} -.bi-theme-dark .bi-textarea-editor .textarea-editor-content.textarea-editor-focus { - border: 1px solid #525466; -} diff --git a/src/less/base/single/editor/editor.textarea.less b/src/less/base/single/editor/editor.textarea.less index 452595970..02f9f449c 100644 --- a/src/less/base/single/editor/editor.textarea.less +++ b/src/less/base/single/editor/editor.textarea.less @@ -8,7 +8,7 @@ border: none; } &.textarea-editor-focus{ - border: 1px solid @color-bi-border-line; + } } } @@ -17,7 +17,7 @@ .bi-textarea-editor { & .textarea-editor-content { &.textarea-editor-focus{ - border: 1px solid @color-bi-border-line-theme-dark; + } } }