caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #139 in FUI/fineui from ~GUY/fineui:master to master 

* commit '53fa45584c11001c9429f6e839847266a13480ab':
  月份和季度删除内容弹出面板
  update
  update
es6
guy 7 years ago
parent
588c392378 53fa45584c
commit
c773f7825c
8 changed files with 35 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      bi/widget.js
  2. 11
      demo/js/addons/slider/demo.slider.js
  3. 9
      dist/bundle.js
  4. 18
      dist/bundle.min.js
  5. 11
      dist/demo.js
  6. 9
      dist/widget.js
  7. 6
      src/widget/month/combo.month.js
  8. 3
      src/widget/quarter/combo.quarter.js

9
bi/widget.js
Unescape View File

@ -5694,6 +5694,9 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
});
this.trigger.on(BI.MonthTrigger.EVENT_CONFIRM, function (v) {
if (self.combo.isViewVisible()) {
return;
}
if (this.getKey() && this.getKey() !== self.storeValue) {
self.setValue(this.getValue());
} else if (!this.getKey()) {
@ -5712,9 +5715,6 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
self.combo.showView();
}
});
this.trigger.on(BI.MonthTrigger.EVENT_CHANGE, function () {
self.combo.isViewVisible() && self.combo.hideView();
});
this.popup = BI.createWidget({
type: "bi.month_popup",
@ -13161,9 +13161,6 @@ BI.QuarterCombo = BI.inherit(BI.Widget, {
this.trigger.on(BI.QuarterTrigger.EVENT_FOCUS, function () {
self.storeValue = this.getKey();
});
this.trigger.on(BI.QuarterTrigger.EVENT_CHANGE, function () {
self.combo.isViewVisible() && self.combo.hideView();
});
this.trigger.on(BI.QuarterTrigger.EVENT_START, function () {
self.combo.isViewVisible() && self.combo.hideView();
});

11
demo/js/addons/slider/demo.slider.js
Unescape View File

@ -2,16 +2,13 @@
* Created by Urthur on 2017/9/4.
*/
Demo.Slider = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(Demo.Slider.superclass._defaultConfig.apply(this, arguments), {
_props: {
baseCls: "demo-slider",
min: 10,
max: 50
})
},
_init: function () {
Demo.Slider.superclass._init.apply(this, arguments);
render: function () {
var singleSlider = BI.createWidget({
type: "bi.single_slider",
digit: 0,
@ -92,7 +89,7 @@ Demo.Slider = BI.inherit(BI.Widget, {
intervalSliderLabel.populate();
BI.createWidget({
return {
type: "bi.vertical",
element: this,
items: [{
@ -122,7 +119,7 @@ Demo.Slider = BI.inherit(BI.Widget, {
}]
}],
vgap: 20
});
};
}
});
BI.shortcut("demo.slider", Demo.Slider);

9
dist/bundle.js vendored
Unescape View File

@ -84023,6 +84023,9 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
});
this.trigger.on(BI.MonthTrigger.EVENT_CONFIRM, function (v) {
if (self.combo.isViewVisible()) {
return;
}
if (this.getKey() && this.getKey() !== self.storeValue) {
self.setValue(this.getValue());
} else if (!this.getKey()) {
@ -84041,9 +84044,6 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
self.combo.showView();
}
});
this.trigger.on(BI.MonthTrigger.EVENT_CHANGE, function () {
self.combo.isViewVisible() && self.combo.hideView();
});
this.popup = BI.createWidget({
type: "bi.month_popup",
@ -91490,9 +91490,6 @@ BI.QuarterCombo = BI.inherit(BI.Widget, {
this.trigger.on(BI.QuarterTrigger.EVENT_FOCUS, function () {
self.storeValue = this.getKey();
});
this.trigger.on(BI.QuarterTrigger.EVENT_CHANGE, function () {
self.combo.isViewVisible() && self.combo.hideView();
});
this.trigger.on(BI.QuarterTrigger.EVENT_START, function () {
self.combo.isViewVisible() && self.combo.hideView();
});

18
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

11
dist/demo.js vendored
Unescape View File

@ -13,16 +13,13 @@ $(function () {
* Created by Urthur on 2017/9/4.
*/
Demo.Slider = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(Demo.Slider.superclass._defaultConfig.apply(this, arguments), {
_props: {
baseCls: "demo-slider",
min: 10,
max: 50
})
},
_init: function () {
Demo.Slider.superclass._init.apply(this, arguments);
render: function () {
var singleSlider = BI.createWidget({
type: "bi.single_slider",
digit: 0,
@ -103,7 +100,7 @@ Demo.Slider = BI.inherit(BI.Widget, {
intervalSliderLabel.populate();
BI.createWidget({
return {
type: "bi.vertical",
element: this,
items: [{
@ -133,7 +130,7 @@ Demo.Slider = BI.inherit(BI.Widget, {
}]
}],
vgap: 20
});
};
}
});
BI.shortcut("demo.slider", Demo.Slider);Demo.Button = BI.inherit(BI.Widget, {

9
dist/widget.js vendored
Unescape View File

@ -5694,6 +5694,9 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
});
this.trigger.on(BI.MonthTrigger.EVENT_CONFIRM, function (v) {
if (self.combo.isViewVisible()) {
return;
}
if (this.getKey() && this.getKey() !== self.storeValue) {
self.setValue(this.getValue());
} else if (!this.getKey()) {
@ -5712,9 +5715,6 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
self.combo.showView();
}
});
this.trigger.on(BI.MonthTrigger.EVENT_CHANGE, function () {
self.combo.isViewVisible() && self.combo.hideView();
});
this.popup = BI.createWidget({
type: "bi.month_popup",
@ -13161,9 +13161,6 @@ BI.QuarterCombo = BI.inherit(BI.Widget, {
this.trigger.on(BI.QuarterTrigger.EVENT_FOCUS, function () {
self.storeValue = this.getKey();
});
this.trigger.on(BI.QuarterTrigger.EVENT_CHANGE, function () {
self.combo.isViewVisible() && self.combo.hideView();
});
this.trigger.on(BI.QuarterTrigger.EVENT_START, function () {
self.combo.isViewVisible() && self.combo.hideView();
});

6
src/widget/month/combo.month.js
Unescape View File

@ -22,6 +22,9 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
});
this.trigger.on(BI.MonthTrigger.EVENT_CONFIRM, function (v) {
if (self.combo.isViewVisible()) {
return;
}
if (this.getKey() && this.getKey() !== self.storeValue) {
self.setValue(this.getValue());
} else if (!this.getKey()) {
@ -40,9 +43,6 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
self.combo.showView();
}
});
this.trigger.on(BI.MonthTrigger.EVENT_CHANGE, function () {
self.combo.isViewVisible() && self.combo.hideView();
});
this.popup = BI.createWidget({
type: "bi.month_popup",

3
src/widget/quarter/combo.quarter.js
Unescape View File

@ -24,9 +24,6 @@ BI.QuarterCombo = BI.inherit(BI.Widget, {
this.trigger.on(BI.QuarterTrigger.EVENT_FOCUS, function () {
self.storeValue = this.getKey();
});
this.trigger.on(BI.QuarterTrigger.EVENT_CHANGE, function () {
self.combo.isViewVisible() && self.combo.hideView();
});
this.trigger.on(BI.QuarterTrigger.EVENT_START, function () {
self.combo.isViewVisible() && self.combo.hideView();
});

Write Preview
Loading…
Cancel
Save