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

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

* commit '86f10a15ab864068637c123eaf7ec0cbf57c144c':
  性能优化
  add
  update
  BI-7322 日期 时分秒基本控件  日期格式打印方式修改
  add
  少改了
  add
  add
es6
guy 7 years ago
parent
390e691879 86f10a15ab
commit
e7e8183775
19 changed files with 34069 additions and 33985 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. 4
      bi/base.js
  2. 4
      bi/case.js
  3. 38
      bi/core.js
  4. 106
      bi/widget.js
  5. 14
      demo/js/widget/demo.datetime.js
  6. 4
      docs/base.js
  7. 4
      docs/case.js
  8. 38
      docs/core.js
  9. 14
      docs/demo.js
  10. 106
      docs/widget.js
  11. 4
      src/base/table/table.js
  12. 4
      src/case/list/list.select.js
  13. 36
      src/core/model.js
  14. 2
      src/core/utils/load.js
  15. 32
      src/widget/datetime/datetime.combo.js
  16. 6
      src/widget/datetime/datetime.js
  17. 32
      src/widget/datetime/datetime.popup.js
  18. 30
      src/widget/datetime/datetime.trigger.js

4
bi/base.js
Unescape View File

@ -31366,8 +31366,8 @@ BI.Table = BI.inherit(BI.Widget, {
var isNeedMergeCol = o.mergeRule(map[i][j], map[i][j - 1]); var isNeedMergeCol = o.mergeRule(map[i][j], map[i][j - 1]);
if (isNeedMergeCol === true) { if (isNeedMergeCol === true) {
mergeCol(i, j); mergeCol(i, j);
preCol[j] = preRow[j - 1]; preCol[j] = preRow[i];
preCW[j] = preRW[j - 1]; preCW[j] = preRW[i];
} else { } else {
createOneEl(i, j); createOneEl(i, j);
} }

4
bi/case.js
Unescape View File

@ -8791,9 +8791,9 @@ BI.SelectList = BI.inherit(BI.Widget, {
this._checkAllSelected(); this._checkAllSelected();
}, },
_setEnable: function () { _setEnable: function (enable) {
BI.SelectList.superclass._setEnable.apply(this, arguments); BI.SelectList.superclass._setEnable.apply(this, arguments);
this.toolbar.setEnable(arguments); this.toolbar.setEnable(enable);
}, },
resetHeight: function (h) { resetHeight: function (h) {

38
bi/core.js
Unescape View File

@ -4904,7 +4904,41 @@ BI.Widget = BI.inherit(BI.OB, {
}, },
_change: function (child) { _change: function (child) {
this.set(this._map(child)); var self = this;
var childMap = this._map(child);
//this.set(childMap);
var changes = [];
var changing = this._changing;
var changed;
var options = {};
this._changing = true;
if (!changing) {
this._previousAttributes = _.clone(this.attributes);
this.changed = {};
}
var current = this.attributes, prev = this._previousAttributes, val;
for (var attr in childMap) {
val = childMap[attr];
changes.push(attr);
this.changed[attr] = val;
current[attr] = val;
}
if (changes.length) this._pending = options;
for (var i = 0, length = changes.length; i < length; i++) {
this.trigger('change:' + changes[i], this, current[changes[i]], options);
}
if (changing) return this;
changed = BI.clone(this.changed);
while (this._pending) {
options = this._pending;
this._pending = false;
this.trigger('change', changed, prev, this, options);
}
this._pending = false;
this._changing = false;
if (changes.length) {
this.trigger("changed", changed, prev, this, options);
}
return this; return this;
}, },
@ -9183,7 +9217,7 @@ $.extend(BI, {
$import: function () { $import: function () {
var _LOADED = {}; // alex:保存加载过的 var _LOADED = {}; // alex:保存加载过的
function loadReady(src, must) { function loadReady(src, must) {
var $scripts = $("head script"); var $scripts = $("head script, body script");
$.each($scripts, function (i, item) { $.each($scripts, function (i, item) {
if (item.src.indexOf(src) != -1) { if (item.src.indexOf(src) != -1) {
_LOADED[src] = true; _LOADED[src] = true;

106
bi/widget.js
Unescape View File

@ -3264,30 +3264,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({
@ -3299,17 +3295,18 @@ 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',
@ -3332,9 +3329,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()) {
@ -3370,10 +3367,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();
} }
}); });
@ -3400,12 +3398,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 () {
@ -3424,18 +3428,6 @@ BI.shortcut("bi.custom_date_time_combo", BI.CustomDateTimeCombo);
* 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',
@ -3445,7 +3437,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,
@ -3531,6 +3523,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]]
@ -3551,9 +3553,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
}, },
setValue: function (v) { setValue: function (v) {
var value, date; var value = v, date;
if (BI.isNotNull(v)) {
value = v.value;
if (BI.isNull(value)) { if (BI.isNull(value)) {
date = new Date(); date = new Date();
this.dateCombo.setValue({ this.dateCombo.setValue({
@ -3574,12 +3574,10 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
this.minute.setValue(value.minute); this.minute.setValue(value.minute);
this.second.setValue(value.second); 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,
@ -3588,13 +3586,11 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
second: this.second.getValue() second: this.second.getValue()
} }
} }
}
}); });
BI.DateTimePopup.BUTTON_OK_EVENT_CHANGE = "BUTTON_OK_EVENT_CHANGE"; 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);
/** /**
* Created by Urthur on 2017/7/14. * Created by Urthur on 2017/7/14.
*/ */
@ -3700,22 +3696,22 @@ 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);/**
/**
* Created by Urthur on 2017/7/14. * Created by Urthur on 2017/7/14.
*/ */
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 () {
@ -3723,19 +3719,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
}] }]
@ -3748,28 +3743,21 @@ 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.getFullYear() + "-" + self._printTime(value.getMonth() + 1) + "-" + self._printTime(value.getDate()) dateStr = value.print("%Y-%X-%d %H:%M:%S");
+ " " + self._printTime(value.getHours()) + ":" + self._printTime(value.getMinutes()) + ":" + self._printTime(value.getSeconds());
} else { } else {
dateStr = value.year + "-" + self._printTime(value.month + 1) + "-" + self._printTime(value.day) var date = new Date(value.year,value.month,value.day,value.hour,value.minute,value.second);
+ " " + self._printTime(value.hour) + ":" + self._printTime(value.minute) + ":" + self._printTime(value.second); dateStr = date.print("%Y-%X-%d %H:%M:%S");
} }
this.text.setText(dateStr); this.text.setText(dateStr);
this.text.setTitle(dateStr); this.text.setTitle(dateStr);
} }
},
getValue: function () {
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);
/**
* 带有方向的pathchooser * 带有方向的pathchooser
* *
* Created by GUY on 2016/4/21. * Created by GUY on 2016/4/21.

14
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 {
@ -12,11 +13,18 @@ Demo.CustomDateTime = BI.inherit(BI.Widget, {
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);
}); });
} }
}, },

4
docs/base.js
Unescape View File

@ -31366,8 +31366,8 @@ BI.Table = BI.inherit(BI.Widget, {
var isNeedMergeCol = o.mergeRule(map[i][j], map[i][j - 1]); var isNeedMergeCol = o.mergeRule(map[i][j], map[i][j - 1]);
if (isNeedMergeCol === true) { if (isNeedMergeCol === true) {
mergeCol(i, j); mergeCol(i, j);
preCol[j] = preRow[j - 1]; preCol[j] = preRow[i];
preCW[j] = preRW[j - 1]; preCW[j] = preRW[i];
} else { } else {
createOneEl(i, j); createOneEl(i, j);
} }

4
docs/case.js
Unescape View File

@ -8791,9 +8791,9 @@ BI.SelectList = BI.inherit(BI.Widget, {
this._checkAllSelected(); this._checkAllSelected();
}, },
_setEnable: function () { _setEnable: function (enable) {
BI.SelectList.superclass._setEnable.apply(this, arguments); BI.SelectList.superclass._setEnable.apply(this, arguments);
this.toolbar.setEnable(arguments); this.toolbar.setEnable(enable);
}, },
resetHeight: function (h) { resetHeight: function (h) {

38
docs/core.js
Unescape View File

@ -14900,7 +14900,41 @@ BI.Widget = BI.inherit(BI.OB, {
}, },
_change: function (child) { _change: function (child) {
this.set(this._map(child)); var self = this;
var childMap = this._map(child);
//this.set(childMap);
var changes = [];
var changing = this._changing;
var changed;
var options = {};
this._changing = true;
if (!changing) {
this._previousAttributes = _.clone(this.attributes);
this.changed = {};
}
var current = this.attributes, prev = this._previousAttributes, val;
for (var attr in childMap) {
val = childMap[attr];
changes.push(attr);
this.changed[attr] = val;
current[attr] = val;
}
if (changes.length) this._pending = options;
for (var i = 0, length = changes.length; i < length; i++) {
this.trigger('change:' + changes[i], this, current[changes[i]], options);
}
if (changing) return this;
changed = BI.clone(this.changed);
while (this._pending) {
options = this._pending;
this._pending = false;
this.trigger('change', changed, prev, this, options);
}
this._pending = false;
this._changing = false;
if (changes.length) {
this.trigger("changed", changed, prev, this, options);
}
return this; return this;
}, },
@ -17630,7 +17664,7 @@ $.extend(BI, {
$import: function () { $import: function () {
var _LOADED = {}; // alex:保存加载过的 var _LOADED = {}; // alex:保存加载过的
function loadReady(src, must) { function loadReady(src, must) {
var $scripts = $("head script"); var $scripts = $("head script, body script");
$.each($scripts, function (i, item) { $.each($scripts, function (i, item) {
if (item.src.indexOf(src) != -1) { if (item.src.indexOf(src) != -1) {
_LOADED[src] = true; _LOADED[src] = true;

14
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 {
@ -7285,11 +7286,18 @@ Demo.CustomDateTime = BI.inherit(BI.Widget, {
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);
}); });
} }
}, },

106
docs/widget.js
Unescape View File

@ -3264,30 +3264,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({
@ -3299,17 +3295,18 @@ 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',
@ -3332,9 +3329,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()) {
@ -3370,10 +3367,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();
} }
}); });
@ -3400,12 +3398,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 () {
@ -3424,18 +3428,6 @@ BI.shortcut("bi.custom_date_time_combo", BI.CustomDateTimeCombo);
* 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',
@ -3445,7 +3437,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,
@ -3531,6 +3523,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]]
@ -3551,9 +3553,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
}, },
setValue: function (v) { setValue: function (v) {
var value, date; var value = v, date;
if (BI.isNotNull(v)) {
value = v.value;
if (BI.isNull(value)) { if (BI.isNull(value)) {
date = new Date(); date = new Date();
this.dateCombo.setValue({ this.dateCombo.setValue({
@ -3574,12 +3574,10 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
this.minute.setValue(value.minute); this.minute.setValue(value.minute);
this.second.setValue(value.second); 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,
@ -3588,13 +3586,11 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
second: this.second.getValue() second: this.second.getValue()
} }
} }
}
}); });
BI.DateTimePopup.BUTTON_OK_EVENT_CHANGE = "BUTTON_OK_EVENT_CHANGE"; 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);
/** /**
* Created by Urthur on 2017/7/14. * Created by Urthur on 2017/7/14.
*/ */
@ -3700,22 +3696,22 @@ 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);/**
/**
* Created by Urthur on 2017/7/14. * Created by Urthur on 2017/7/14.
*/ */
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 () {
@ -3723,19 +3719,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
}] }]
@ -3748,28 +3743,21 @@ 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.getFullYear() + "-" + self._printTime(value.getMonth() + 1) + "-" + self._printTime(value.getDate()) dateStr = value.print("%Y-%X-%d %H:%M:%S");
+ " " + self._printTime(value.getHours()) + ":" + self._printTime(value.getMinutes()) + ":" + self._printTime(value.getSeconds());
} else { } else {
dateStr = value.year + "-" + self._printTime(value.month + 1) + "-" + self._printTime(value.day) var date = new Date(value.year,value.month,value.day,value.hour,value.minute,value.second);
+ " " + self._printTime(value.hour) + ":" + self._printTime(value.minute) + ":" + self._printTime(value.second); dateStr = date.print("%Y-%X-%d %H:%M:%S");
} }
this.text.setText(dateStr); this.text.setText(dateStr);
this.text.setTitle(dateStr); this.text.setTitle(dateStr);
} }
},
getValue: function () {
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);
/**
* 带有方向的pathchooser * 带有方向的pathchooser
* *
* Created by GUY on 2016/4/21. * Created by GUY on 2016/4/21.

4
src/base/table/table.js
Unescape View File

@ -418,8 +418,8 @@ BI.Table = BI.inherit(BI.Widget, {
var isNeedMergeCol = o.mergeRule(map[i][j], map[i][j - 1]); var isNeedMergeCol = o.mergeRule(map[i][j], map[i][j - 1]);
if (isNeedMergeCol === true) { if (isNeedMergeCol === true) {
mergeCol(i, j); mergeCol(i, j);
preCol[j] = preRow[j - 1]; preCol[j] = preRow[i];
preCW[j] = preRW[j - 1]; preCW[j] = preRW[i];
} else { } else {
createOneEl(i, j); createOneEl(i, j);
} }

4
src/case/list/list.select.js
Unescape View File

@ -158,9 +158,9 @@ BI.SelectList = BI.inherit(BI.Widget, {
this._checkAllSelected(); this._checkAllSelected();
}, },
_setEnable: function () { _setEnable: function (enable) {
BI.SelectList.superclass._setEnable.apply(this, arguments); BI.SelectList.superclass._setEnable.apply(this, arguments);
this.toolbar.setEnable(arguments); this.toolbar.setEnable(enable);
}, },
resetHeight: function (h) { resetHeight: function (h) {

36
src/core/model.js
Unescape View File

@ -117,7 +117,41 @@ BI.Model = BI.inherit(BI.M, {
}, },
_change: function (child) { _change: function (child) {
this.set(this._map(child)); var self = this;
var childMap = this._map(child);
//this.set(childMap);
var changes = [];
var changing = this._changing;
var changed;
var options = {};
this._changing = true;
if (!changing) {
this._previousAttributes = _.clone(this.attributes);
this.changed = {};
}
var current = this.attributes, prev = this._previousAttributes, val;
for (var attr in childMap) {
val = childMap[attr];
changes.push(attr);
this.changed[attr] = val;
current[attr] = val;
}
if (changes.length) this._pending = options;
for (var i = 0, length = changes.length; i < length; i++) {
this.trigger('change:' + changes[i], this, current[changes[i]], options);
}
if (changing) return this;
changed = BI.clone(this.changed);
while (this._pending) {
options = this._pending;
this._pending = false;
this.trigger('change', changed, prev, this, options);
}
this._pending = false;
this._changing = false;
if (changes.length) {
this.trigger("changed", changed, prev, this, options);
}
return this; return this;
}, },

2
src/core/utils/load.js
Unescape View File

@ -14,7 +14,7 @@ $.extend(BI, {
$import: function () { $import: function () {
var _LOADED = {}; // alex:保存加载过的 var _LOADED = {}; // alex:保存加载过的
function loadReady(src, must) { function loadReady(src, must) {
var $scripts = $("head script"); var $scripts = $("head script, body script");
$.each($scripts, function (i, item) { $.each($scripts, function (i, item) {
if (item.src.indexOf(src) != -1) { if (item.src.indexOf(src) != -1) {
_LOADED[src] = true; _LOADED[src] = true;

32
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,17 +43,18 @@ 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',
@ -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 () {

32
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,9 +127,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
}, },
setValue: function (v) { setValue: function (v) {
var value, date; var value = v, date;
if (BI.isNotNull(v)) {
value = v.value;
if (BI.isNull(value)) { if (BI.isNull(value)) {
date = new Date(); date = new Date();
this.dateCombo.setValue({ this.dateCombo.setValue({
@ -152,12 +148,10 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
this.minute.setValue(value.minute); this.minute.setValue(value.minute);
this.second.setValue(value.second); 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,
@ -166,10 +160,8 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
second: this.second.getValue() second: this.second.getValue()
} }
} }
}
}); });
BI.DateTimePopup.BUTTON_OK_EVENT_CHANGE = "BUTTON_OK_EVENT_CHANGE"; 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);

30
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.getFullYear() + "-" + self._printTime(value.getMonth() + 1) + "-" + self._printTime(value.getDate()) dateStr = value.print("%Y-%X-%d %H:%M:%S");
+ " " + self._printTime(value.getHours()) + ":" + self._printTime(value.getMinutes()) + ":" + self._printTime(value.getSeconds());
} else { } else {
dateStr = value.year + "-" + self._printTime(value.month + 1) + "-" + self._printTime(value.day) var date = new Date(value.year,value.month,value.day,value.hour,value.minute,value.second);
+ " " + self._printTime(value.hour) + ":" + self._printTime(value.minute) + ":" + self._printTime(value.second); dateStr = date.print("%Y-%X-%d %H:%M:%S");
} }
this.text.setText(dateStr); this.text.setText(dateStr);
this.text.setTitle(dateStr); this.text.setTitle(dateStr);
} }
},
getValue: function () {
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