Cauchy.Ke
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

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

* commit '6eab4f96c269e33a47d4bb708f988c690d51566d':
  update
  text_value_check_combo的trigger自定义
  date_time_combo和bubble
master
guy 7 years ago
parent
be4013545c 6eab4f96c2
commit
48927a557c
12 changed files with 82 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      demo/js/widget/datetime/demo.datetime.js
  2. 29
      dist/bundle.js
  3. 2
      dist/case.js
  4. 8
      dist/core.js
  5. 10
      dist/demo.js
  6. 29
      dist/fineui.js
  7. 19
      dist/widget.js
  8. 2
      src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
  9. 8
      src/core/controller/controller.bubbles.js
  10. 8
      src/widget/datetime/datetime.combo.js
  11. 10
      src/widget/datetime/datetime.popup.js
  12. 1
      src/widget/datetime/datetime.trigger.js

10
demo/js/widget/datetime/demo.datetime.js
Unescape View File

@ -22,7 +22,15 @@ Demo.CustomDateTime = BI.inherit(BI.Widget, {
eventName: BI.DateTimeCombo.EVENT_CANCEL, eventName: BI.DateTimeCombo.EVENT_CANCEL,
action: function () { action: function () {
} }
}] }],
value: {
year: 2017,
month: 2,
day: 23,
hour: 12,
minute: 11,
second: 1
}
}, },
top: 200, top: 200,
left: 200 left: 200

29
dist/bundle.js vendored
Unescape View File

@ -18197,8 +18197,16 @@ BI.BubblesController = BI.inherit(BI.Controller, {
_init: function () { _init: function () {
BI.BubblesController.superclass._init.apply(this, arguments); BI.BubblesController.superclass._init.apply(this, arguments);
var self = this;
this.bubblesManager = {}; this.bubblesManager = {};
this.storeBubbles = {}; this.storeBubbles = {};
BI.Resizers.add("bubbleController" + BI.uniqueId(), function () {
BI.each(self.bubblesManager, function (name) {
self.remove(name);
});
self.bubblesManager = {};
self.storeBubbles = {};
});
}, },
_createBubble: function (direct, text, height) { _createBubble: function (direct, text, height) {
@ -67982,7 +67990,7 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
_init: function () { _init: function () {
BI.TextValueCheckCombo.superclass._init.apply(this, arguments); BI.TextValueCheckCombo.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.trigger = BI.createWidget({ this.trigger = BI.createWidget(o.el, {
type: "bi.select_text_trigger", type: "bi.select_text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height,
@ -79189,7 +79197,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
BI.DateTimeCombo.superclass._init.apply(this, arguments); BI.DateTimeCombo.superclass._init.apply(this, arguments);
var self = this, opts = this.options; var self = this, opts = this.options;
var date = Date.getDate(); var date = Date.getDate();
this.storeValue = { this.storeValue = BI.isNotNull(opts.value) ? opts.value : {
year: date.getFullYear(), year: date.getFullYear(),
month: date.getMonth(), month: date.getMonth(),
day: date.getDate(), day: date.getDate(),
@ -79200,13 +79208,15 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.date_time_trigger", type: "bi.date_time_trigger",
min: this.constants.DATE_MIN_VALUE, min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE max: this.constants.DATE_MAX_VALUE,
value: opts.value
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.date_time_popup", type: "bi.date_time_popup",
min: this.constants.DATE_MIN_VALUE, min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE max: this.constants.DATE_MAX_VALUE,
value: opts.value
}); });
self.setValue(this.storeValue); self.setValue(this.storeValue);
@ -79405,15 +79415,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
}] }]
}); });
var date = Date.getDate(); this.setValue(opts.value);
this.dateCombo.setValue({
year: date.getFullYear(),
month: date.getMonth(),
day: date.getDate()
});
this.hour.setValue(date.getHours());
this.minute.setValue(date.getMinutes());
this.second.setValue(date.getSeconds());
this.dateButton = BI.createWidget({ this.dateButton = BI.createWidget({
type: "bi.grid", type: "bi.grid",
@ -79617,6 +79619,7 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
el: this.text el: this.text
}] }]
}); });
this.setValue(o.value);
}, },
_printTime: function (v) { _printTime: function (v) {

2
dist/case.js vendored
Unescape View File

@ -5679,7 +5679,7 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
_init: function () { _init: function () {
BI.TextValueCheckCombo.superclass._init.apply(this, arguments); BI.TextValueCheckCombo.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.trigger = BI.createWidget({ this.trigger = BI.createWidget(o.el, {
type: "bi.select_text_trigger", type: "bi.select_text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height,

8
dist/core.js vendored
Unescape View File

@ -18197,8 +18197,16 @@ BI.BubblesController = BI.inherit(BI.Controller, {
_init: function () { _init: function () {
BI.BubblesController.superclass._init.apply(this, arguments); BI.BubblesController.superclass._init.apply(this, arguments);
var self = this;
this.bubblesManager = {}; this.bubblesManager = {};
this.storeBubbles = {}; this.storeBubbles = {};
BI.Resizers.add("bubbleController" + BI.uniqueId(), function () {
BI.each(self.bubblesManager, function (name) {
self.remove(name);
});
self.bubblesManager = {};
self.storeBubbles = {};
});
}, },
_createBubble: function (direct, text, height) { _createBubble: function (direct, text, height) {

10
dist/demo.js vendored
Unescape View File

@ -12337,7 +12337,15 @@ Demo.CustomDateTime = BI.inherit(BI.Widget, {
eventName: BI.DateTimeCombo.EVENT_CANCEL, eventName: BI.DateTimeCombo.EVENT_CANCEL,
action: function () { action: function () {
} }
}] }],
value: {
year: 2017,
month: 2,
day: 23,
hour: 12,
minute: 11,
second: 1
}
}, },
top: 200, top: 200,
left: 200 left: 200

29
dist/fineui.js vendored
Unescape View File

@ -18370,8 +18370,16 @@ BI.BubblesController = BI.inherit(BI.Controller, {
_init: function () { _init: function () {
BI.BubblesController.superclass._init.apply(this, arguments); BI.BubblesController.superclass._init.apply(this, arguments);
var self = this;
this.bubblesManager = {}; this.bubblesManager = {};
this.storeBubbles = {}; this.storeBubbles = {};
BI.Resizers.add("bubbleController" + BI.uniqueId(), function () {
BI.each(self.bubblesManager, function (name) {
self.remove(name);
});
self.bubblesManager = {};
self.storeBubbles = {};
});
}, },
_createBubble: function (direct, text, height) { _createBubble: function (direct, text, height) {
@ -69676,7 +69684,7 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
_init: function () { _init: function () {
BI.TextValueCheckCombo.superclass._init.apply(this, arguments); BI.TextValueCheckCombo.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.trigger = BI.createWidget({ this.trigger = BI.createWidget(o.el, {
type: "bi.select_text_trigger", type: "bi.select_text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height,
@ -80883,7 +80891,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
BI.DateTimeCombo.superclass._init.apply(this, arguments); BI.DateTimeCombo.superclass._init.apply(this, arguments);
var self = this, opts = this.options; var self = this, opts = this.options;
var date = Date.getDate(); var date = Date.getDate();
this.storeValue = { this.storeValue = BI.isNotNull(opts.value) ? opts.value : {
year: date.getFullYear(), year: date.getFullYear(),
month: date.getMonth(), month: date.getMonth(),
day: date.getDate(), day: date.getDate(),
@ -80894,13 +80902,15 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.date_time_trigger", type: "bi.date_time_trigger",
min: this.constants.DATE_MIN_VALUE, min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE max: this.constants.DATE_MAX_VALUE,
value: opts.value
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.date_time_popup", type: "bi.date_time_popup",
min: this.constants.DATE_MIN_VALUE, min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE max: this.constants.DATE_MAX_VALUE,
value: opts.value
}); });
self.setValue(this.storeValue); self.setValue(this.storeValue);
@ -81099,15 +81109,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
}] }]
}); });
var date = Date.getDate(); this.setValue(opts.value);
this.dateCombo.setValue({
year: date.getFullYear(),
month: date.getMonth(),
day: date.getDate()
});
this.hour.setValue(date.getHours());
this.minute.setValue(date.getMinutes());
this.second.setValue(date.getSeconds());
this.dateButton = BI.createWidget({ this.dateButton = BI.createWidget({
type: "bi.grid", type: "bi.grid",
@ -81311,6 +81313,7 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
el: this.text el: this.text
}] }]
}); });
this.setValue(o.value);
}, },
_printTime: function (v) { _printTime: function (v) {

19
dist/widget.js vendored
Unescape View File

@ -2758,7 +2758,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
BI.DateTimeCombo.superclass._init.apply(this, arguments); BI.DateTimeCombo.superclass._init.apply(this, arguments);
var self = this, opts = this.options; var self = this, opts = this.options;
var date = Date.getDate(); var date = Date.getDate();
this.storeValue = { this.storeValue = BI.isNotNull(opts.value) ? opts.value : {
year: date.getFullYear(), year: date.getFullYear(),
month: date.getMonth(), month: date.getMonth(),
day: date.getDate(), day: date.getDate(),
@ -2769,13 +2769,15 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.date_time_trigger", type: "bi.date_time_trigger",
min: this.constants.DATE_MIN_VALUE, min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE max: this.constants.DATE_MAX_VALUE,
value: opts.value
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.date_time_popup", type: "bi.date_time_popup",
min: this.constants.DATE_MIN_VALUE, min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE max: this.constants.DATE_MAX_VALUE,
value: opts.value
}); });
self.setValue(this.storeValue); self.setValue(this.storeValue);
@ -2974,15 +2976,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
}] }]
}); });
var date = Date.getDate(); this.setValue(opts.value);
this.dateCombo.setValue({
year: date.getFullYear(),
month: date.getMonth(),
day: date.getDate()
});
this.hour.setValue(date.getHours());
this.minute.setValue(date.getMinutes());
this.second.setValue(date.getSeconds());
this.dateButton = BI.createWidget({ this.dateButton = BI.createWidget({
type: "bi.grid", type: "bi.grid",
@ -3186,6 +3180,7 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
el: this.text el: this.text
}] }]
}); });
this.setValue(o.value);
}, },
_printTime: function (v) { _printTime: function (v) {

2
src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
Unescape View File

@ -17,7 +17,7 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
_init: function () { _init: function () {
BI.TextValueCheckCombo.superclass._init.apply(this, arguments); BI.TextValueCheckCombo.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.trigger = BI.createWidget({ this.trigger = BI.createWidget(o.el, {
type: "bi.select_text_trigger", type: "bi.select_text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height,

8
src/core/controller/controller.bubbles.js
Unescape View File

@ -16,8 +16,16 @@ BI.BubblesController = BI.inherit(BI.Controller, {
_init: function () { _init: function () {
BI.BubblesController.superclass._init.apply(this, arguments); BI.BubblesController.superclass._init.apply(this, arguments);
var self = this;
this.bubblesManager = {}; this.bubblesManager = {};
this.storeBubbles = {}; this.storeBubbles = {};
BI.Resizers.add("bubbleController" + BI.uniqueId(), function () {
BI.each(self.bubblesManager, function (name) {
self.remove(name);
});
self.bubblesManager = {};
self.storeBubbles = {};
});
}, },
_createBubble: function (direct, text, height) { _createBubble: function (direct, text, height) {

8
src/widget/datetime/datetime.combo.js
Unescape View File

@ -21,7 +21,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
BI.DateTimeCombo.superclass._init.apply(this, arguments); BI.DateTimeCombo.superclass._init.apply(this, arguments);
var self = this, opts = this.options; var self = this, opts = this.options;
var date = Date.getDate(); var date = Date.getDate();
this.storeValue = { this.storeValue = BI.isNotNull(opts.value) ? opts.value : {
year: date.getFullYear(), year: date.getFullYear(),
month: date.getMonth(), month: date.getMonth(),
day: date.getDate(), day: date.getDate(),
@ -32,13 +32,15 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.date_time_trigger", type: "bi.date_time_trigger",
min: this.constants.DATE_MIN_VALUE, min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE max: this.constants.DATE_MAX_VALUE,
value: opts.value
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.date_time_popup", type: "bi.date_time_popup",
min: this.constants.DATE_MIN_VALUE, min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE max: this.constants.DATE_MAX_VALUE,
value: opts.value
}); });
self.setValue(this.storeValue); self.setValue(this.storeValue);

10
src/widget/datetime/datetime.popup.js
Unescape View File

@ -106,15 +106,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
}] }]
}); });
var date = Date.getDate(); this.setValue(opts.value);
this.dateCombo.setValue({
year: date.getFullYear(),
month: date.getMonth(),
day: date.getDate()
});
this.hour.setValue(date.getHours());
this.minute.setValue(date.getMinutes());
this.second.setValue(date.getSeconds());
this.dateButton = BI.createWidget({ this.dateButton = BI.createWidget({
type: "bi.grid", type: "bi.grid",

1
src/widget/datetime/datetime.trigger.js
Unescape View File

@ -36,6 +36,7 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
el: this.text el: this.text
}] }]
}); });
this.setValue(o.value);
}, },
_printTime: function (v) { _printTime: function (v) {

Write Preview
Loading…
Cancel
Save