BI-7322 日期 时分秒基本控件 日期格式打印方式修改

demo/js/widget/demo.datetime.js

@@ -13,11 +13,18 @@ Demo.CustomDateTime = BI.inherit(BI.Widget, {
                     type: "bi.custom_date_time_combo",
                     ref: function (_ref) {
                         self.customDateTime =  _ref;
+                        var value, date, dateStr;
                         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 () {
-                            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);
                         });
                     }
                 },

demo/js/widget/multidatetime/multi.datetime.combo.js

@@ -1,125 +0,0 @@
-/**
- * Created by Urthur on 2017/7/14.
- */
-BI.MultiDateTimeCombo = BI.inherit(BI.Single, {
-    constants: {
-        popupHeight: 290,
-        popupWidth: 270,
-        comboAdjustHeight: 1,
-        border: 1,
-        DATE_MIN_VALUE: "1900-01-01",
-        DATE_MAX_VALUE: "2099-12-31"
-    },
-    _defaultConfig: function () {
-        return BI.extend(BI.MultiDateTimeCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: 'bi-multi-date-time-combo bi-border',
-            height: 24
-        });
-    },
-    _init: function () {
-        BI.MultiDateTimeCombo.superclass._init.apply(this, arguments);
-        var self = this, opts = this.options;
-        var date = new Date();
-        this.storeValue = {
-            value: {
-                year: date.getFullYear(),
-                month: date.getMonth(),
-                day: date.getDate(),
-                hour: date.getHours(),
-                minute: date.getMinutes(),
-                second: date.getSeconds()
-            }
-        };
-        this.trigger = BI.createWidget({
-            type: 'bi.date_time_trigger',
-            min: this.constants.DATE_MIN_VALUE,
-            max: this.constants.DATE_MAX_VALUE
-        });
-
-        this.popup = BI.createWidget({
-            type: "bi.multi_date_time_popup",
-            min: this.constants.DATE_MIN_VALUE,
-            max: this.constants.DATE_MAX_VALUE
-        });
-        self.setValue(this.storeValue);
-
-        this.popup.on(BI.MultiDateTimePopup.BUTTON_CANCEL_EVENT_CHANGE, function () {
-            self.combo.hideView();
-            self.fireEvent(BI.MultiDateTimeCombo.EVENT_CANCEL);
-        });
-        this.popup.on(BI.MultiDateTimePopup.BUTTON_OK_EVENT_CHANGE, function () {
-            self.setValue(self.popup.getValue());
-            self.combo.hideView();
-            self.fireEvent(BI.MultiDateTimeCombo.EVENT_CONFIRM);
-        });
-        this.popup.on(BI.MultiDateTimePopup.CALENDAR_EVENT_CHANGE, function () {
-            self.setValue(self.popup.getValue());
-        });
-        this.combo = BI.createWidget({
-            type: 'bi.combo',
-            toggle: false,
-            isNeedAdjustHeight: false,
-            isNeedAdjustWidth: false,
-            el: this.trigger,
-            adjustLength: this.constants.comboAdjustHeight,
-            popup: {
-                el: this.popup,
-                maxHeight: this.constants.popupHeight,
-                width: this.constants.popupWidth,
-                stopPropagation: false
-            }
-        });
-        this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.popup.setValue(self.storeValue);
-            self.fireEvent(BI.MultiDateTimeCombo.EVENT_BEFORE_POPUPVIEW);
-        });
-
-        var triggerBtn = BI.createWidget({
-            type: "bi.trigger_icon_button",
-            cls: "bi-trigger-date-button chart-date-normal-font bi-border-right",
-            width: 30,
-            height: 24
-        });
-        triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () {
-            if (self.combo.isViewVisible()) {
-                self.combo.hideView();
-            } else {
-                self.combo.showView();
-            }
-        });
-
-        BI.createWidget({
-            type: "bi.htape",
-            element: this,
-            items: [{
-                type: "bi.absolute",
-                items: [{
-                    el: this.combo,
-                    top: 0,
-                    left: 0,
-                    right: 0,
-                    bottom: 0
-                }, {
-                    el: triggerBtn,
-                    top: 0,
-                    left: 0
-                }]
-            }]
-        })
-    },
-
-    setValue: function (v) {
-        this.storeValue = v;
-        this.popup.setValue(v);
-        this.trigger.setValue(v);
-    },
-    getValue: function () {
-        return this.storeValue;
-    }
-});
-
-BI.MultiDateTimeCombo.EVENT_CANCEL = "EVENT_CANCEL";
-BI.MultiDateTimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
-BI.MultiDateTimeCombo.EVENT_CHANGE = "EVENT_CHANGE";
-BI.MultiDateTimeCombo.EVENT_BEFORE_POPUPVIEW = "BI.MultiDateTimeCombo.EVENT_BEFORE_POPUPVIEW";
-BI.shortcut('bi.multi_date_time_combo', BI.MultiDateTimeCombo);

demo/js/widget/multidatetime/multi.datetime.js

@@ -1,38 +0,0 @@
-/**
- * Created by Urthur on 2017/7/14.
- */
-BI.CustomMultiDateTimeCombo = BI.inherit(BI.Widget, {
-    _defaultConfig: function () {
-        return BI.extend(BI.CustomMultiDateTimeCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-custom-multi-date-time-combo"
-        })
-    },
-
-    _init: function () {
-        BI.CustomMultiDateTimeCombo.superclass._init.apply(this, arguments);
-        var self = this;
-        this.multiDateTime = BI.createWidget({
-            type: "bi.multi_date_time_combo",
-            element: this
-        });
-        this.multiDateTime.on(BI.MultiDateTimeCombo.EVENT_CANCEL, function () {
-            self.fireEvent(BI.CustomMultiDateTimeCombo.EVENT_CANCEL);
-        });
-
-        this.multiDateTime.on(BI.MultiDateTimeCombo.EVENT_CONFIRM, function () {
-            self.fireEvent(BI.CustomMultiDateTimeCombo.EVENT_CONFIRM);
-        });
-    },
-
-    getValue: function () {
-        return this.multiDateTime.getValue();
-    },
-
-    setValue: function (v) {
-        this.multiDateTime.setValue(v);
-    }
-});
-BI.CustomMultiDateTimeCombo.EVENT_CHANGE = "EVENT_CHANGE";
-BI.CustomMultiDateTimeCombo.EVENT_CANCEL = "EVENT_CANCEL";
-BI.CustomMultiDateTimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
-BI.shortcut("bi.custom_multi_date_time_combo", BI.CustomMultiDateTimeCombo);

demo/js/widget/multidatetime/multi.datetime.popup.js

@@ -1,177 +0,0 @@
-/**
- * Created by Urthur on 2017/7/14.
- */
-BI.MultiDateTimePopup = BI.inherit(BI.Widget, {
-    constants: {
-        tabHeight: 30,
-        tabWidth: 42,
-        titleHeight: 27,
-        itemHeight: 30,
-        triggerHeight: 24,
-        buttonWidth: 90,
-        buttonHeight: 25,
-        popupHeight: 290,
-        popupWidth: 270,
-        comboAdjustHeight: 1,
-        lgap: 2,
-        border: 1
-    },
-    _defaultConfig: function () {
-        return BI.extend(BI.MultiDateTimePopup.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: 'bi-multi-date-time-popup',
-            width: 268,
-            height: 290
-        });
-    },
-    _init: function () {
-        BI.MultiDateTimePopup.superclass._init.apply(this, arguments);
-        var self = this, opts = this.options;
-        this.cancelButton = BI.createWidget({
-            type: 'bi.text_button',
-            forceCenter: true,
-            cls: 'bi-multidate-popup-button bi-border-top bi-border-right',
-            shadow: true,
-            text: BI.i18nText("BI-Basic_Cancel")
-        });
-        this.cancelButton.on(BI.TextButton.EVENT_CHANGE, function () {
-            self.fireEvent(BI.MultiDateTimePopup.BUTTON_CANCEL_EVENT_CHANGE);
-        });
-
-        this.okButton = BI.createWidget({
-            type: "bi.text_button",
-            forceCenter: true,
-            cls: 'bi-multidate-popup-button bi-border-top',
-            shadow: true,
-            text: BI.i18nText("BI-Basic_OK")
-        });
-        this.okButton.on(BI.TextButton.EVENT_CHANGE, function () {
-            self.fireEvent(BI.MultiDateTimePopup.BUTTON_OK_EVENT_CHANGE);
-        });
-
-        this.dateCombo = BI.createWidget({
-            type: "bi.date_calendar_popup",
-            min: self.options.min,
-            max: self.options.max
-        });
-        self.dateCombo.on(BI.DateCalendarPopup.EVENT_CHANGE, function () {
-            self.fireEvent(BI.MultiDateTimePopup.CALENDAR_EVENT_CHANGE);
-        });
-
-        this.dateSelect = BI.createWidget({
-            type: "bi.horizontal",
-            cls: "bi-border-top",
-            items: [{
-                type: "bi.label",
-                text: BI.i18nText("BI-Basic_Time"),
-                width: 45
-            },{
-                type: "bi.multi_date_time_select",
-                max: 23,
-                min: 0,
-                width: 60,
-                height: 30,
-                ref: function (_ref) {
-                    self.hour = _ref;
-                    self.hour.on(BI.MultiDateTimeSelect.EVENT_CONFIRM, function () {
-                        self.fireEvent(BI.MultiDateTimePopup.CALENDAR_EVENT_CHANGE);
-                    });
-                }
-            },{
-                type: "bi.label",
-                text: ":",
-                width: 15
-            },{
-                type: "bi.multi_date_time_select",
-                max: 59,
-                min: 0,
-                width: 60,
-                height: 30,
-                ref: function (_ref) {
-                    self.minute = _ref;
-                    self.minute.on(BI.MultiDateTimeSelect.EVENT_CONFIRM, function () {
-                        self.fireEvent(BI.MultiDateTimePopup.CALENDAR_EVENT_CHANGE);
-                    });
-                }
-            },{
-                type: "bi.label",
-                text: ":",
-                width: 15
-            },{
-                type: "bi.multi_date_time_select",
-                max: 59,
-                min: 0,
-                width: 60,
-                height: 30,
-                ref: function (_ref) {
-                    self.second = _ref;
-                    self.second.on(BI.MultiDateTimeSelect.EVENT_CONFIRM, function () {
-                        self.fireEvent(BI.MultiDateTimePopup.CALENDAR_EVENT_CHANGE);
-                    });
-                }
-            }]
-        });
-
-        this.dateButton = BI.createWidget({
-            type: "bi.grid",
-            items: [[this.cancelButton, this.okButton]]
-        });
-        BI.createWidget({
-            element: this,
-            type: "bi.vtape",
-            items: [{
-                el: this.dateCombo
-            }, {
-                el: this.dateSelect,
-                height: 50
-            },{
-                el: this.dateButton,
-                height: 30
-            }]
-        });
-    },
-
-    setValue: function (v) {
-        var value, date;
-        if (BI.isNotNull(v)) {
-            value = v.value;
-            if(BI.isNull(value)){
-                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());
-            } else {
-                this.dateCombo.setValue({
-                    year: value.year,
-                    month: value.month,
-                    day: value.day
-                });
-                this.hour.setValue(value.hour);
-                this.minute.setValue(value.minute);
-                this.second.setValue(value.second);
-            }
-        }
-    },
-
-    getValue: function () {
-        return {
-            value: {
-                year: this.dateCombo.getValue().year,
-                month: this.dateCombo.getValue().month,
-                day: this.dateCombo.getValue().day,
-                hour: this.hour.getValue(),
-                minute: this.minute.getValue(),
-                second: this.second.getValue()
-            }
-        }
-    }
-});
-BI.MultiDateTimePopup.BUTTON_OK_EVENT_CHANGE = "BUTTON_OK_EVENT_CHANGE";
-BI.MultiDateTimePopup.BUTTON_CANCEL_EVENT_CHANGE = "BUTTON_CANCEL_EVENT_CHANGE";
-BI.MultiDateTimePopup.CALENDAR_EVENT_CHANGE = "CALENDAR_EVENT_CHANGE";
-BI.shortcut('bi.multi_date_time_popup', BI.MultiDateTimePopup);
-

demo/js/widget/multidatetime/multi.datetime.select.js

@@ -1,106 +0,0 @@
-/**
- * Created by Urthur on 2017/7/14.
- */
-BI.MultiDateTimeSelect = BI.inherit(BI.Widget, {
-    _defaultConfig: function () {
-        return BI.extend(BI.MultiDateTimeSelect.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-multi-date-time-select bi-border",
-            max: 23,
-            min: 0
-        })
-    },
-
-    _init: function () {
-        BI.MultiDateTimeSelect.superclass._init.apply(this, arguments);
-        var self = this, o = this.options;
-        this.editor = BI.createWidget({
-            type: "bi.sign_editor",
-            value: this._alertInEditorValue(o.min),
-            errorText: BI.i18nText("BI-Please_Input_Natural_Number"),
-            validationChecker: function(v){
-                return BI.isNaturalNumber(v);
-            }
-        });
-        this.editor.on(BI.TextEditor.EVENT_CONFIRM, function(){
-            self._finetuning(0);
-            self.fireEvent(BI.MultiDateTimeSelect.EVENT_CONFIRM);
-        });
-        this.topBtn = BI.createWidget({
-            type: "bi.icon_button",
-            cls: "column-pre-page-h-font top-button bi-border-left bi-border-bottom"
-        });
-        this.topBtn.on(BI.IconButton.EVENT_CHANGE, function(){
-            self._finetuning(1);
-            self.fireEvent(BI.MultiDateTimeSelect.EVENT_CONFIRM);
-        });
-        this.bottomBtn = BI.createWidget({
-            type: "bi.icon_button",
-            cls: "column-next-page-h-font bottom-button bi-border-left"
-        });
-        this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function(){
-            self._finetuning(-1);
-            self.fireEvent(BI.MultiDateTimeSelect.EVENT_CONFIRM);
-        });
-        this._finetuning(0);
-        BI.createWidget({
-            type: "bi.htape",
-            element: this,
-            items: [this.editor, {
-                el: {
-                    type: "bi.grid",
-                    columns: 1,
-                    rows: 2,
-                    items: [{
-                        column: 0,
-                        row: 0,
-                        el: this.topBtn
-                    }, {
-                        column: 0,
-                        row: 1,
-                        el: this.bottomBtn
-                    }]
-                },
-                width: 30
-            }]
-        });
-    },
-
-    _alertOutEditorValue: function(v){
-        if (v > this.options.max){
-            v = this.options.min;
-        }
-        if (v < this.options.min){
-            v = this.options.max
-        }
-        return BI.parseInt(v);
-    },
-
-    _alertInEditorValue: function(v){
-        if (v > this.options.max){
-            v = this.options.min;
-        }
-        if (v < this.options.min){
-            v = this.options.max;
-        }
-        v = v < 10 ? "0" + v : v;
-        return v;
-    },
-
-    _finetuning: function(add){
-        var v = BI.parseInt(this._alertOutEditorValue(this.editor.getValue()));
-        this.editor.setValue(this._alertInEditorValue(v + add));
-    },
-
-    getValue: function () {
-        var v = this.editor.getValue();
-        return this._alertOutEditorValue(v);
-    },
-
-    setValue: function (v) {
-        this.editor.setValue(this._alertInEditorValue(v));
-        this._finetuning(0);
-    }
-
-});
-BI.MultiDateTimeSelect.EVENT_CONFIRM = "EVENT_CONFIRM";
-BI.shortcut("bi.multi_date_time_select", BI.MultiDateTimeSelect);

demo/js/widget/multidatetime/multi.datetime.trigger.js

@@ -1,63 +0,0 @@
-/**
- * Created by Urthur on 2017/7/14.
- */
-BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
-    _const: {
-        hgap: 4,
-        vgap: 2,
-        triggerWidth: 30
-    },
-
-    _defaultConfig: function () {
-        return BI.extend(BI.DateTimeTrigger.superclass._defaultConfig.apply(this, arguments), {
-            extraCls: "bi-date-time-trigger",
-            min: '1900-01-01', //最小日期
-            max: '2099-12-31', //最大日期
-            height: 25
-        });
-    },
-    _init: function () {
-        BI.DateTimeTrigger.superclass._init.apply(this, arguments);
-        var self = this, o = this.options, c = this._const;
-        this.editor = BI.createWidget({
-            type: "bi.sign_editor",
-            height: o.height,
-            hgap: c.hgap,
-            vgap: c.vgap,
-            disabled: true
-        });
-
-        BI.createWidget({
-            type: "bi.htape",
-            element: this,
-            items: [{
-                el: BI.createWidget(),
-                width: 30
-            }, {
-                el: this.editor
-            }]
-        })
-    },
-
-    _printTime: function (v) {
-        return v < 10 ? "0" + v : v;
-    },
-
-    setValue: function (v) {
-        var self = this;
-        if (BI.isNotNull(v)) {
-            var value = v.value, dateStr;
-            if(BI.isNull(value)){
-                value = new Date();
-                dateStr = value.getFullYear() + "-" + self._printTime(value.getMonth() + 1) + "-" + self._printTime(value.getDate())
-                    + " " + self._printTime(value.getHours()) + ":" + self._printTime(value.getMinutes()) + ":" + self._printTime(value.getSeconds());
-            } else {
-                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.editor.setValue(dateStr);
-        }
-    }
-
-});
-BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);

docs/demo.js

@@ -6638,11 +6638,18 @@ Demo.CustomDateTime = BI.inherit(BI.Widget, {
                     type: "bi.custom_date_time_combo",
                     ref: function (_ref) {
                         self.customDateTime =  _ref;
+                        var value, date, dateStr;
                         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 () {
-                            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);
                         });
                     }
                 },

src/widget/datetime/datetime.combo.js

@@ -12,30 +12,26 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
     },
     _defaultConfig: function () {
         return BI.extend(BI.DateTimeCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: 'bi-date-time-combo',
+            baseCls: 'bi-date-time-combo bi-border',
             height: 24
         });
     },
     _init: function () {
         BI.DateTimeCombo.superclass._init.apply(this, arguments);
-        var self = this;
+        var self = this, opts = this.options;
         var date = new Date();
         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({
-            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({
@@ -47,18 +43,19 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
 
         this.popup.on(BI.DateTimePopup.BUTTON_CANCEL_EVENT_CHANGE, function () {
             self.setValue(self.storeValue);
-            self.combo.hideView();
+            self.hidePopupView();
             self.fireEvent(BI.DateTimeCombo.EVENT_CANCEL);
         });
         this.popup.on(BI.DateTimePopup.BUTTON_OK_EVENT_CHANGE, function () {
             self.storeValue = self.popup.getValue();
             self.setValue(self.storeValue);
-            self.combo.hideView();
+            self.hidePopupView();
             self.fireEvent(BI.DateTimeCombo.EVENT_CONFIRM);
         });
         this.popup.on(BI.DateTimePopup.CALENDAR_EVENT_CHANGE, function () {
             self.trigger.setValue(self.popup.getValue());
-    });
+            self.fireEvent(BI.DateTimeCombo.EVENT_CHANGE);
+        });
         this.combo = BI.createWidget({
             type: 'bi.combo',
             toggle: false,
@@ -80,9 +77,9 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
 
         var triggerBtn = BI.createWidget({
             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,
-            height: 25
+            height: 24
         });
         triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () {
             if (self.combo.isViewVisible()) {
@@ -118,10 +115,11 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
         this.trigger.setValue(v);
     },
     getValue: function () {
-        return {
+        return this.storeValue;
-            value: this.storeValue,
+    },
-            text: this.trigger.getValue()
+
-        };
+    hidePopupView: function () {
+        this.combo.hideView();
     }
 });
 

src/widget/datetime/datetime.js

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

src/widget/datetime/datetime.popup.js

@@ -2,18 +2,6 @@
  * Created by Urthur on 2017/7/14.
  */
 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 () {
         return BI.extend(BI.DateTimePopup.superclass._defaultConfig.apply(this, arguments), {
             baseCls: 'bi-date-time-popup',
@@ -23,7 +11,7 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
     },
     _init: function () {
         BI.DateTimePopup.superclass._init.apply(this, arguments);
-        var self = this;
+        var self = this, opts = this.options;
         this.cancelButton = BI.createWidget({
             type: 'bi.text_button',
             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({
             type: "bi.grid",
             items: [[this.cancelButton, this.okButton]]
@@ -129,42 +127,37 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
     },
 
     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 () {
         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.CALENDAR_EVENT_CHANGE = "CALENDAR_EVENT_CHANGE";
 BI.shortcut('bi.date_time_popup', BI.DateTimePopup);
-

src/widget/datetime/datetime.select.js

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

src/widget/datetime/datetime.trigger.js

@@ -4,15 +4,16 @@
 BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
     _const: {
         hgap: 4,
-        vgap: 2,
         triggerWidth: 30
     },
 
     _defaultConfig: function () {
         return BI.extend(BI.DateTimeTrigger.superclass._defaultConfig.apply(this, arguments), {
             extraCls: "bi-date-time-trigger",
-            height: 25,
+            min: '1900-01-01', //最小日期
-            width: 180
+            max: '2099-12-31', //最大日期
+            height: 24,
+            width: 200
         });
     },
     _init: function () {
@@ -20,19 +21,18 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
         var self = this, o = this.options, c = this._const;
         this.text = BI.createWidget({
             type: "bi.label",
-            cls: "bi-border",
             textAlign: "left",
             height: o.height,
             width: o.width,
-            hgap: c.hgap,
+            hgap: c.hgap
-            vgap: c.vgap
         });
+
         BI.createWidget({
             type: "bi.htape",
             element: this,
             items: [{
                 el: BI.createWidget(),
-                width: 30
+                width: c.triggerWidth
             }, {
                 el: this.text
             }]
@@ -45,24 +45,18 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
 
     setValue: function (v) {
         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);