guy 8 years ago
parent
commit
c07d317e88
  1. 6
      bi/base.css
  2. 8
      bi/case.js
  3. 5
      bi/core.js
  4. 6
      docs/base.css
  5. 8
      docs/case.js
  6. 5
      docs/core.js
  7. 8
      src/case/combo/bubblecombo/combo.bubble.js
  8. 5
      src/core/proto/date.js
  9. 6
      src/css/base/single/editor/editor.textarea.css
  10. 4
      src/less/base/single/editor/editor.textarea.less

6
bi/base.css

@ -920,12 +920,6 @@ li.CodeMirror-hint-active {
.bi-textarea-editor .textarea-editor-content { .bi-textarea-editor .textarea-editor-content {
border: none; 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****/ /****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/

8
bi/case.js

@ -3596,6 +3596,14 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
hasView: function () { hasView: function () {
return BI.isNotNull(this.combo.getView()); return BI.isNotNull(this.combo.getView());
},
isViewVisible: function () {
return this.combo.isViewVisible();
},
setEnable: function (v) {
this.combo.setEnable(!!v);
} }
}); });

5
bi/core.js

@ -6338,8 +6338,9 @@ Date.checkLegal = function (str) {
if (ar.length <= 2) { if (ar.length <= 2) {
return MM >= 1 && MM <= 12; return MM >= 1 && MM <= 12;
} }
Date._MD[1] = Date.isLeap(YY) ? 29 : 28; var MD = Date._MD.slice(0);
return MM >= 1 && MM <= 12 && DD <= Date._MD[MM - 1]; MD[1] = Date.isLeap(YY) ? 29 : 28;
return MM >= 1 && MM <= 12 && DD <= MD[MM - 1];
}; };
Date.parseDateTime = function (str, fmt) { Date.parseDateTime = function (str, fmt) {

6
docs/base.css

@ -920,12 +920,6 @@ li.CodeMirror-hint-active {
.bi-textarea-editor .textarea-editor-content { .bi-textarea-editor .textarea-editor-content {
border: none; 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****/ /****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/

8
docs/case.js

@ -3596,6 +3596,14 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
hasView: function () { hasView: function () {
return BI.isNotNull(this.combo.getView()); return BI.isNotNull(this.combo.getView());
},
isViewVisible: function () {
return this.combo.isViewVisible();
},
setEnable: function (v) {
this.combo.setEnable(!!v);
} }
}); });

5
docs/core.js

@ -23821,8 +23821,9 @@ Date.checkLegal = function (str) {
if (ar.length <= 2) { if (ar.length <= 2) {
return MM >= 1 && MM <= 12; return MM >= 1 && MM <= 12;
} }
Date._MD[1] = Date.isLeap(YY) ? 29 : 28; var MD = Date._MD.slice(0);
return MM >= 1 && MM <= 12 && DD <= Date._MD[MM - 1]; MD[1] = Date.isLeap(YY) ? 29 : 28;
return MM >= 1 && MM <= 12 && DD <= MD[MM - 1];
}; };
Date.parseDateTime = function (str, fmt) { Date.parseDateTime = function (str, fmt) {

8
src/case/combo/bubblecombo/combo.bubble.js

@ -197,6 +197,14 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
hasView: function () { hasView: function () {
return BI.isNotNull(this.combo.getView()); return BI.isNotNull(this.combo.getView());
},
isViewVisible: function () {
return this.combo.isViewVisible();
},
setEnable: function (v) {
this.combo.setEnable(!!v);
} }
}); });

5
src/core/proto/date.js

@ -386,8 +386,9 @@ Date.checkLegal = function (str) {
if (ar.length <= 2) { if (ar.length <= 2) {
return MM >= 1 && MM <= 12; return MM >= 1 && MM <= 12;
} }
Date._MD[1] = Date.isLeap(YY) ? 29 : 28; var MD = Date._MD.slice(0);
return MM >= 1 && MM <= 12 && DD <= Date._MD[MM - 1]; MD[1] = Date.isLeap(YY) ? 29 : 28;
return MM >= 1 && MM <= 12 && DD <= MD[MM - 1];
}; };
Date.parseDateTime = function (str, fmt) { Date.parseDateTime = function (str, fmt) {

6
src/css/base/single/editor/editor.textarea.css

@ -12,9 +12,3 @@
.bi-textarea-editor .textarea-editor-content { .bi-textarea-editor .textarea-editor-content {
border: none; 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;
}

4
src/less/base/single/editor/editor.textarea.less

@ -8,7 +8,7 @@
border: none; border: none;
} }
&.textarea-editor-focus{ &.textarea-editor-focus{
border: 1px solid @color-bi-border-line;
} }
} }
} }
@ -17,7 +17,7 @@
.bi-textarea-editor { .bi-textarea-editor {
& .textarea-editor-content { & .textarea-editor-content {
&.textarea-editor-focus{ &.textarea-editor-focus{
border: 1px solid @color-bi-border-line-theme-dark;
} }
} }
} }

Loading…
Cancel
Save