fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #102 in ~GUY/fineui from ~URTHUR/fineui:master to master 

* commit '57bce428f523c6fb9ea90c159b90d8abe8154e36':
  update
  BI-7322 日期 时分秒基本控件  日期格式打印方式修改
es6
guy 7 years ago
parent
adcc3c3e13 57bce428f5
commit
f5d0fe63a4
9 changed files with 33428 additions and 33446 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. 33332
      bi/widget.js
  2. 16
      demo/js/widget/demo.datetime.js
  3. 16
      docs/demo.js
  4. 33332
      docs/widget.js
  5. 46
      src/widget/datetime/datetime.combo.js
  6. 6
      src/widget/datetime/datetime.js
  7. 82
      src/widget/datetime/datetime.popup.js
  8. 2
      src/widget/datetime/datetime.select.js
  9. 42
      src/widget/datetime/datetime.trigger.js

33332
bi/widget.js
View File

File diff suppressed because it is too large Load Diff

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

@ -2,7 +2,8 @@
* Created by Urthur on 2017/7/18. * Created by Urthur on 2017/7/18.
*/ */
Demo.CustomDateTime = BI.inherit(BI.Widget, { Demo.CustomDateTime = BI.inherit(BI.Widget, {
props: {}, props: {
},
render: function () { render: function () {
var self = this; var self = this;
return { return {
@ -11,12 +12,19 @@ Demo.CustomDateTime = BI.inherit(BI.Widget, {
el: { el: {
type: "bi.custom_date_time_combo", type: "bi.custom_date_time_combo",
ref: function (_ref) { ref: function (_ref) {
self.customDateTime = _ref; self.customDateTime = _ref;
var value, date, dateStr;
self.customDateTime.on(BI.CustomDateTimeCombo.EVENT_CONFIRM, function () { self.customDateTime.on(BI.CustomDateTimeCombo.EVENT_CONFIRM, function () {
BI.Msg.alert("日期", this.getValue().text); value = this.getValue();
date = new Date(value.year,value.month,value.day,value.hour,value.minute,value.second);
dateStr = date.print("%Y-%X-%d %H:%M:%S");
BI.Msg.alert("日期", dateStr);
}); });
self.customDateTime.on(BI.CustomDateTimeCombo.EVENT_CANCEL, function () { self.customDateTime.on(BI.CustomDateTimeCombo.EVENT_CANCEL, function () {
BI.Msg.alert("日期", this.getValue().text); value = this.getValue();
date = new Date(value.year,value.month,value.day,value.hour,value.minute,value.second);
dateStr = date.print("%Y-%X-%d %H:%M:%S");
BI.Msg.alert("日期", dateStr);
}); });
} }
}, },

16
docs/demo.js
Unescape View File

@ -7275,7 +7275,8 @@ BI.shortcut("demo.date_pane_widget", Demo.DatePane);/**
* Created by Urthur on 2017/7/18. * Created by Urthur on 2017/7/18.
*/ */
Demo.CustomDateTime = BI.inherit(BI.Widget, { Demo.CustomDateTime = BI.inherit(BI.Widget, {
props: {}, props: {
},
render: function () { render: function () {
var self = this; var self = this;
return { return {
@ -7284,12 +7285,19 @@ Demo.CustomDateTime = BI.inherit(BI.Widget, {
el: { el: {
type: "bi.custom_date_time_combo", type: "bi.custom_date_time_combo",
ref: function (_ref) { ref: function (_ref) {
self.customDateTime = _ref; self.customDateTime = _ref;
var value, date, dateStr;
self.customDateTime.on(BI.CustomDateTimeCombo.EVENT_CONFIRM, function () { self.customDateTime.on(BI.CustomDateTimeCombo.EVENT_CONFIRM, function () {
BI.Msg.alert("日期", this.getValue().text); value = this.getValue();
date = new Date(value.year,value.month,value.day,value.hour,value.minute,value.second);
dateStr = date.print("%Y-%X-%d %H:%M:%S");
BI.Msg.alert("日期", dateStr);
}); });
self.customDateTime.on(BI.CustomDateTimeCombo.EVENT_CANCEL, function () { self.customDateTime.on(BI.CustomDateTimeCombo.EVENT_CANCEL, function () {
BI.Msg.alert("日期", this.getValue().text); value = this.getValue();
date = new Date(value.year,value.month,value.day,value.hour,value.minute,value.second);
dateStr = date.print("%Y-%X-%d %H:%M:%S");
BI.Msg.alert("日期", dateStr);
}); });
} }
}, },

33332
docs/widget.js
View File

File diff suppressed because it is too large Load Diff

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

@ -12,30 +12,26 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
}, },
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.DateTimeCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.DateTimeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: 'bi-date-time-combo', baseCls: 'bi-date-time-combo bi-border',
height: 24 height: 24
}); });
}, },
_init: function () { _init: function () {
BI.DateTimeCombo.superclass._init.apply(this, arguments); BI.DateTimeCombo.superclass._init.apply(this, arguments);
var self = this; var self = this, opts = this.options;
var date = new Date(); var date = new Date();
this.storeValue = { this.storeValue = {
value: { year: date.getFullYear(),
year: date.getFullYear(), month: date.getMonth(),
month: date.getMonth(), day: date.getDate(),
day: date.getDate(), hour: date.getHours(),
hour: date.getHours(), minute: date.getMinutes(),
minute: date.getMinutes(), second: date.getSeconds()
second: date.getSeconds()
}
}; };
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: 'bi.date_time_trigger' type: 'bi.date_time_trigger',
}); min: this.constants.DATE_MIN_VALUE,
max: this.constants.DATE_MAX_VALUE
this.trigger.on(BI.DateTrigger.EVENT_TRIGGER_CLICK, function () {
self.combo.toggle();
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
@ -47,18 +43,19 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
this.popup.on(BI.DateTimePopup.BUTTON_CANCEL_EVENT_CHANGE, function () { this.popup.on(BI.DateTimePopup.BUTTON_CANCEL_EVENT_CHANGE, function () {
self.setValue(self.storeValue); self.setValue(self.storeValue);
self.combo.hideView(); self.hidePopupView();
self.fireEvent(BI.DateTimeCombo.EVENT_CANCEL); self.fireEvent(BI.DateTimeCombo.EVENT_CANCEL);
}); });
this.popup.on(BI.DateTimePopup.BUTTON_OK_EVENT_CHANGE, function () { this.popup.on(BI.DateTimePopup.BUTTON_OK_EVENT_CHANGE, function () {
self.storeValue = self.popup.getValue(); self.storeValue = self.popup.getValue();
self.setValue(self.storeValue); self.setValue(self.storeValue);
self.combo.hideView(); self.hidePopupView();
self.fireEvent(BI.DateTimeCombo.EVENT_CONFIRM); self.fireEvent(BI.DateTimeCombo.EVENT_CONFIRM);
}); });
this.popup.on(BI.DateTimePopup.CALENDAR_EVENT_CHANGE, function () { this.popup.on(BI.DateTimePopup.CALENDAR_EVENT_CHANGE, function () {
self.trigger.setValue(self.popup.getValue()); self.trigger.setValue(self.popup.getValue());
}); self.fireEvent(BI.DateTimeCombo.EVENT_CHANGE);
});
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: 'bi.combo', type: 'bi.combo',
toggle: false, toggle: false,
@ -80,9 +77,9 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
var triggerBtn = BI.createWidget({ var triggerBtn = BI.createWidget({
type: "bi.trigger_icon_button", type: "bi.trigger_icon_button",
cls: "chart-date-normal-font bi-border-left bi-border-top bi-border-bottom", cls: "bi-trigger-date-button chart-date-normal-font bi-border-right",
width: 30, width: 30,
height: 25 height: 24
}); });
triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () { triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () {
if (self.combo.isViewVisible()) { if (self.combo.isViewVisible()) {
@ -118,10 +115,11 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
this.trigger.setValue(v); this.trigger.setValue(v);
}, },
getValue: function () { getValue: function () {
return { return this.storeValue;
value: this.storeValue, },
text: this.trigger.getValue()
}; hidePopupView: function () {
this.combo.hideView();
} }
}); });

6
src/widget/datetime/datetime.js
Unescape View File

@ -16,12 +16,18 @@ BI.CustomDateTimeCombo = BI.inherit(BI.Widget, {
element: this element: this
}); });
this.DateTime.on(BI.DateTimeCombo.EVENT_CANCEL, function () { this.DateTime.on(BI.DateTimeCombo.EVENT_CANCEL, function () {
self.fireEvent(BI.CustomDateTimeCombo.EVENT_CHANGE);
self.fireEvent(BI.CustomDateTimeCombo.EVENT_CANCEL); self.fireEvent(BI.CustomDateTimeCombo.EVENT_CANCEL);
}); });
this.DateTime.on(BI.DateTimeCombo.EVENT_CONFIRM, function () { this.DateTime.on(BI.DateTimeCombo.EVENT_CONFIRM, function () {
self.fireEvent(BI.CustomDateTimeCombo.EVENT_CHANGE);
self.fireEvent(BI.CustomDateTimeCombo.EVENT_CONFIRM); self.fireEvent(BI.CustomDateTimeCombo.EVENT_CONFIRM);
}); });
this.DateTime.on(BI.DateTimeCombo.EVENT_CHANGE, function () {
self.fireEvent(BI.CustomDateTimeCombo.EVENT_CHANGE);
});
}, },
getValue: function () { getValue: function () {

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

@ -2,18 +2,6 @@
* Created by Urthur on 2017/7/14. * Created by Urthur on 2017/7/14.
*/ */
BI.DateTimePopup = BI.inherit(BI.Widget, { BI.DateTimePopup = BI.inherit(BI.Widget, {
constants: {
triggerHeight: 24,
buttonWidth: 90,
buttonHeight: 25,
popupHeight: 290,
popupWidth: 270,
comboAdjustHeight: 1,
lgap: 2,
border: 1
},
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.DateTimePopup.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.DateTimePopup.superclass._defaultConfig.apply(this, arguments), {
baseCls: 'bi-date-time-popup', baseCls: 'bi-date-time-popup',
@ -23,7 +11,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
}, },
_init: function () { _init: function () {
BI.DateTimePopup.superclass._init.apply(this, arguments); BI.DateTimePopup.superclass._init.apply(this, arguments);
var self = this; var self = this, opts = this.options;
this.cancelButton = BI.createWidget({ this.cancelButton = BI.createWidget({
type: 'bi.text_button', type: 'bi.text_button',
forceCenter: true, forceCenter: true,
@ -109,6 +97,16 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
}] }]
}); });
var date = new Date();
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",
items: [[this.cancelButton, this.okButton]] items: [[this.cancelButton, this.okButton]]
@ -129,42 +127,37 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
}, },
setValue: function (v) { setValue: function (v) {
var value, date; var value = v, date;
if (BI.isNotNull(v)) { if (BI.isNull(value)) {
value = v.value; date = new Date();
if(BI.isNull(value)){ this.dateCombo.setValue({
date = new Date(); year: date.getFullYear(),
this.dateCombo.setValue({ month: date.getMonth(),
year: date.getFullYear(), day: date.getDate()
month: date.getMonth(), });
day: date.getDate() this.hour.setValue(date.getHours());
}); this.minute.setValue(date.getMinutes());
this.hour.setValue(date.getHours()); this.second.setValue(date.getSeconds());
this.minute.setValue(date.getMinutes()); } else {
this.second.setValue(date.getSeconds()); this.dateCombo.setValue({
} else { year: value.year,
this.dateCombo.setValue({ month: value.month,
year: value.year, day: value.day
month: value.month, });
day: value.day this.hour.setValue(value.hour);
}); this.minute.setValue(value.minute);
this.hour.setValue(value.hour); this.second.setValue(value.second);
this.minute.setValue(value.minute);
this.second.setValue(value.second);
}
} }
}, },
getValue: function () { getValue: function () {
return { return {
value: { year: this.dateCombo.getValue().year,
year: this.dateCombo.getValue().year, month: this.dateCombo.getValue().month,
month: this.dateCombo.getValue().month, day: this.dateCombo.getValue().day,
day: this.dateCombo.getValue().day, hour: this.hour.getValue(),
hour: this.hour.getValue(), minute: this.minute.getValue(),
minute: this.minute.getValue(), second: this.second.getValue()
second: this.second.getValue()
}
} }
} }
}); });
@ -172,4 +165,3 @@ BI.DateTimePopup.BUTTON_OK_EVENT_CHANGE = "BUTTON_OK_EVENT_CHANGE";
BI.DateTimePopup.BUTTON_CANCEL_EVENT_CHANGE = "BUTTON_CANCEL_EVENT_CHANGE"; BI.DateTimePopup.BUTTON_CANCEL_EVENT_CHANGE = "BUTTON_CANCEL_EVENT_CHANGE";
BI.DateTimePopup.CALENDAR_EVENT_CHANGE = "CALENDAR_EVENT_CHANGE"; BI.DateTimePopup.CALENDAR_EVENT_CHANGE = "CALENDAR_EVENT_CHANGE";
BI.shortcut('bi.date_time_popup', BI.DateTimePopup); BI.shortcut('bi.date_time_popup', BI.DateTimePopup);

2
src/widget/datetime/datetime.select.js
Unescape View File

@ -103,4 +103,4 @@ BI.DateTimeSelect = BI.inherit(BI.Widget, {
}); });
BI.DateTimeSelect.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.DateTimeSelect.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.shortcut("bi.date_time_select", BI.DateTimeSelect); BI.shortcut("bi.date_time_select", BI.DateTimeSelect);

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

@ -4,15 +4,16 @@
BI.DateTimeTrigger = BI.inherit(BI.Trigger, { BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
_const: { _const: {
hgap: 4, hgap: 4,
vgap: 2,
triggerWidth: 30 triggerWidth: 30
}, },
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.DateTimeTrigger.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.DateTimeTrigger.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-date-time-trigger", extraCls: "bi-date-time-trigger",
height: 25, min: '1900-01-01', //最小日期
width: 180 max: '2099-12-31', //最大日期
height: 24,
width: 200
}); });
}, },
_init: function () { _init: function () {
@ -20,19 +21,18 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
var self = this, o = this.options, c = this._const; var self = this, o = this.options, c = this._const;
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.label", type: "bi.label",
cls: "bi-border",
textAlign: "left", textAlign: "left",
height: o.height, height: o.height,
width: o.width, width: o.width,
hgap: c.hgap, hgap: c.hgap
vgap: c.vgap
}); });
BI.createWidget({ BI.createWidget({
type: "bi.htape", type: "bi.htape",
element: this, element: this,
items: [{ items: [{
el: BI.createWidget(), el: BI.createWidget(),
width: 30 width: c.triggerWidth
}, { }, {
el: this.text el: this.text
}] }]
@ -45,24 +45,18 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
setValue: function (v) { setValue: function (v) {
var self = this; var self = this;
if (BI.isNotNull(v)) { var value = v, dateStr;
var value = v.value, dateStr; if(BI.isNull(value)){
if(BI.isNull(value)){ value = new Date();
value = new Date(); dateStr = value.print("%Y-%X-%d %H:%M:%S");
dateStr = value.getFullYear() + "-" + self._printTime(value.getMonth() + 1) + "-" + self._printTime(value.getDate()) } else {
+ " " + self._printTime(value.getHours()) + ":" + self._printTime(value.getMinutes()) + ":" + self._printTime(value.getSeconds()); var date = new Date(value.year,value.month,value.day,value.hour,value.minute,value.second);
} else { dateStr = date.print("%Y-%X-%d %H:%M:%S");
dateStr = value.year + "-" + self._printTime(value.month + 1) + "-" + self._printTime(value.day)
+ " " + self._printTime(value.hour) + ":" + self._printTime(value.minute) + ":" + self._printTime(value.second);
}
this.text.setText(dateStr);
this.text.setTitle(dateStr);
} }
}, this.text.setText(dateStr);
getValue: function () { this.text.setTitle(dateStr);
return this.text.getText();
} }
}); });
BI.DateTrigger.EVENT_TRIGGER_CLICK = "EVENT_TRIGGER_CLICK"; BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);
BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);
Write Preview
Loading…
Cancel
Save