Browse Source

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

* commit 'e4eed7fd5fd2e8b4c71afc75d3a1d14cd0515b57':
  年月,季度值为空
es6
windy 7 years ago
parent
commit
2b8e3a03af
  1. 9
      bi/widget.js
  2. 9
      dist/bundle.js
  3. 14
      dist/bundle.min.js
  4. 9
      dist/widget.js
  5. 6
      src/widget/month/trigger.month.js
  6. 1
      src/widget/quarter/trigger.quarter.js
  7. 2
      src/widget/year/combo.year.js

9
bi/widget.js

@ -5932,9 +5932,9 @@ BI.MonthTrigger = BI.inherit(BI.Trigger, {
this.editor.setTitle(v + 1); this.editor.setTitle(v + 1);
return; return;
} }
this.editor.setState(); this.editor.setState("");
this.editor.setValue(); this.editor.setValue("");
this.editor.setTitle(); this.editor.setTitle("");
}, },
getKey: function () { getKey: function () {
return this.editor.getValue() | 0; return this.editor.getValue() | 0;
@ -13385,6 +13385,7 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
}, },
setValue: function (v) { setValue: function (v) {
v = v || "";
this.editor.setState(v); this.editor.setState(v);
this.editor.setValue(v); this.editor.setValue(v);
this.editor.setTitle(v); this.editor.setTitle(v);
@ -16022,7 +16023,7 @@ BI.YearCombo = BI.inherit(BI.Widget, {
}, },
setValue: function (v) { setValue: function (v) {
this.combo.setValue(v); this.combo.setValue(v || "");
}, },
getValue: function () { getValue: function () {

9
dist/bundle.js vendored

@ -84257,9 +84257,9 @@ BI.MonthTrigger = BI.inherit(BI.Trigger, {
this.editor.setTitle(v + 1); this.editor.setTitle(v + 1);
return; return;
} }
this.editor.setState(); this.editor.setState("");
this.editor.setValue(); this.editor.setValue("");
this.editor.setTitle(); this.editor.setTitle("");
}, },
getKey: function () { getKey: function () {
return this.editor.getValue() | 0; return this.editor.getValue() | 0;
@ -91710,6 +91710,7 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
}, },
setValue: function (v) { setValue: function (v) {
v = v || "";
this.editor.setState(v); this.editor.setState(v);
this.editor.setValue(v); this.editor.setValue(v);
this.editor.setTitle(v); this.editor.setTitle(v);
@ -94347,7 +94348,7 @@ BI.YearCombo = BI.inherit(BI.Widget, {
}, },
setValue: function (v) { setValue: function (v) {
this.combo.setValue(v); this.combo.setValue(v || "");
}, },
getValue: function () { getValue: function () {

14
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

9
dist/widget.js vendored

@ -5932,9 +5932,9 @@ BI.MonthTrigger = BI.inherit(BI.Trigger, {
this.editor.setTitle(v + 1); this.editor.setTitle(v + 1);
return; return;
} }
this.editor.setState(); this.editor.setState("");
this.editor.setValue(); this.editor.setValue("");
this.editor.setTitle(); this.editor.setTitle("");
}, },
getKey: function () { getKey: function () {
return this.editor.getValue() | 0; return this.editor.getValue() | 0;
@ -13385,6 +13385,7 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
}, },
setValue: function (v) { setValue: function (v) {
v = v || "";
this.editor.setState(v); this.editor.setState(v);
this.editor.setValue(v); this.editor.setValue(v);
this.editor.setTitle(v); this.editor.setTitle(v);
@ -16022,7 +16023,7 @@ BI.YearCombo = BI.inherit(BI.Widget, {
}, },
setValue: function (v) { setValue: function (v) {
this.combo.setValue(v); this.combo.setValue(v || "");
}, },
getValue: function () { getValue: function () {

6
src/widget/month/trigger.month.js

@ -92,9 +92,9 @@ BI.MonthTrigger = BI.inherit(BI.Trigger, {
this.editor.setTitle(v + 1); this.editor.setTitle(v + 1);
return; return;
} }
this.editor.setState(); this.editor.setState("");
this.editor.setValue(); this.editor.setValue("");
this.editor.setTitle(); this.editor.setTitle("");
}, },
getKey: function () { getKey: function () {
return this.editor.getValue() | 0; return this.editor.getValue() | 0;

1
src/widget/quarter/trigger.quarter.js

@ -89,6 +89,7 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
}, },
setValue: function (v) { setValue: function (v) {
v = v || "";
this.editor.setState(v); this.editor.setState(v);
this.editor.setValue(v); this.editor.setValue(v);
this.editor.setTitle(v); this.editor.setTitle(v);

2
src/widget/year/combo.year.js

@ -91,7 +91,7 @@ BI.YearCombo = BI.inherit(BI.Widget, {
}, },
setValue: function (v) { setValue: function (v) {
this.combo.setValue(v); this.combo.setValue(v || "");
}, },
getValue: function () { getValue: function () {

Loading…
Cancel
Save