Browse Source

Merge pull request #312 in FUI/fineui from ~WINDY/fui:master to master

* commit '8e761fd3e7f0788cc783c150fbcee52b73603638':
  BI-17600 驼峰
es6
richie 7 years ago
parent
commit
18c71e90f4
  1. 2
      dist/_fineui.min.js
  2. 20
      dist/bundle.js
  3. 2
      dist/bundle.min.js
  4. 2
      dist/fineui.min.js
  5. 20
      dist/widget.js
  6. 20
      src/widget/numberinterval/numberinterval.js

2
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

20
dist/bundle.js vendored

@ -100230,7 +100230,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
iconCls: "less-equal-font"
}]
});
if (o.closemin === true) {
if (o.closeMin === true) {
this.smallCombo.setValue(1);
} else {
this.smallCombo.setValue(0);
@ -100249,7 +100249,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
iconCls: "less-equal-font"
}]
});
if (o.closemax === true) {
if (o.closeMax === true) {
this.bigCombo.setValue(1);
} else {
this.bigCombo.setValue(0);
@ -100580,8 +100580,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
self.bigEditor.setValue("");
}
if (!BI.isNull(data.closemin)) {
if (data.closemin === true) {
if (!BI.isNull(data.closeMin)) {
if (data.closeMin === true) {
combo_value = 1;
} else {
combo_value = 0;
@ -100589,8 +100589,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
self.smallCombo.setValue(combo_value);
}
if (!BI.isNull(data.closemax)) {
if (data.closemax === true) {
if (!BI.isNull(data.closeMax)) {
if (data.closeMax === true) {
combo_value = 1;
} else {
combo_value = 0;
@ -100605,15 +100605,15 @@ BI.NumberInterval = BI.inherit(BI.Single, {
value.min = self.smallEditor.getValue();
value.max = self.bigEditor.getValue();
if (minComboValue[0] === 0) {
value.closemin = false;
value.closeMin = false;
} else {
value.closemin = true;
value.closeMin = true;
}
if (maxComboValue[0] === 0) {
value.closemax = false;
value.closeMax = false;
} else {
value.closemax = true;
value.closeMax = true;
}
return value;
}

2
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

20
dist/widget.js vendored

@ -13714,7 +13714,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
iconCls: "less-equal-font"
}]
});
if (o.closemin === true) {
if (o.closeMin === true) {
this.smallCombo.setValue(1);
} else {
this.smallCombo.setValue(0);
@ -13733,7 +13733,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
iconCls: "less-equal-font"
}]
});
if (o.closemax === true) {
if (o.closeMax === true) {
this.bigCombo.setValue(1);
} else {
this.bigCombo.setValue(0);
@ -14064,8 +14064,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
self.bigEditor.setValue("");
}
if (!BI.isNull(data.closemin)) {
if (data.closemin === true) {
if (!BI.isNull(data.closeMin)) {
if (data.closeMin === true) {
combo_value = 1;
} else {
combo_value = 0;
@ -14073,8 +14073,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
self.smallCombo.setValue(combo_value);
}
if (!BI.isNull(data.closemax)) {
if (data.closemax === true) {
if (!BI.isNull(data.closeMax)) {
if (data.closeMax === true) {
combo_value = 1;
} else {
combo_value = 0;
@ -14089,15 +14089,15 @@ BI.NumberInterval = BI.inherit(BI.Single, {
value.min = self.smallEditor.getValue();
value.max = self.bigEditor.getValue();
if (minComboValue[0] === 0) {
value.closemin = false;
value.closeMin = false;
} else {
value.closemin = true;
value.closeMin = true;
}
if (maxComboValue[0] === 0) {
value.closemax = false;
value.closeMax = false;
} else {
value.closemax = true;
value.closeMax = true;
}
return value;
}

20
src/widget/numberinterval/numberinterval.js

@ -133,7 +133,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
iconCls: "less-equal-font"
}]
});
if (o.closemin === true) {
if (o.closeMin === true) {
this.smallCombo.setValue(1);
} else {
this.smallCombo.setValue(0);
@ -152,7 +152,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
iconCls: "less-equal-font"
}]
});
if (o.closemax === true) {
if (o.closeMax === true) {
this.bigCombo.setValue(1);
} else {
this.bigCombo.setValue(0);
@ -483,8 +483,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
self.bigEditor.setValue("");
}
if (!BI.isNull(data.closemin)) {
if (data.closemin === true) {
if (!BI.isNull(data.closeMin)) {
if (data.closeMin === true) {
combo_value = 1;
} else {
combo_value = 0;
@ -492,8 +492,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
self.smallCombo.setValue(combo_value);
}
if (!BI.isNull(data.closemax)) {
if (data.closemax === true) {
if (!BI.isNull(data.closeMax)) {
if (data.closeMax === true) {
combo_value = 1;
} else {
combo_value = 0;
@ -508,15 +508,15 @@ BI.NumberInterval = BI.inherit(BI.Single, {
value.min = self.smallEditor.getValue();
value.max = self.bigEditor.getValue();
if (minComboValue[0] === 0) {
value.closemin = false;
value.closeMin = false;
} else {
value.closemin = true;
value.closeMin = true;
}
if (maxComboValue[0] === 0) {
value.closemax = false;
value.closeMax = false;
} else {
value.closemax = true;
value.closeMax = true;
}
return value;
}

Loading…
Cancel
Save