Browse Source

Merge pull request #48 in ~GUY/fineui from ~WINDY/fineui:master to master

* commit '21965bebed041a7d2482646699507ec938bedcc9':
  bubblecombo 实现setEnable方法
  getMonthDay
master
windy 8 years ago
parent
commit
470bfd3d7d
  1. 8
      bi/case.js
  2. 5
      bi/core.js
  3. 8
      docs/case.js
  4. 5
      docs/core.js
  5. 8
      src/case/combo/bubblecombo/combo.bubble.js
  6. 5
      src/core/proto/date.js

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) {

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) {

Loading…
Cancel
Save