Browse Source

Merge pull request #848 in VISUAL/fineui from ~FRANK.QIU/fineui:master to master

* commit 'b422b9ada50c08bf2761e49550542a76f6c63097':
  fix: 调整combo宽度
  fix: 清空应该触发CONFIRM事件
es6
Frank.Qiu 6 years ago
parent
commit
e274c7fef6
  1. 5
      dist/bundle.ie.js
  2. 5
      dist/bundle.js
  3. 5
      dist/fineui.ie.js
  4. 5
      dist/fineui.js
  5. 5
      dist/fineui_without_jquery_polyfill.js
  6. 5
      dist/widget.js
  7. 5
      src/widget/time/time.combo.js

5
dist/bundle.ie.js vendored

@ -78589,7 +78589,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
},
props: {
baseCls: "bi-time-combo bi-border bi-border-radius",
width: 80,
width: 78,
height: 22
},
@ -78606,7 +78606,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
action: function () {
self.setValue();
self.hidePopupView();
self.fireEvent(BI.TimeCombo.EVENT_CANCEL);
self.fireEvent(BI.TimeCombo.EVENT_CONFIRM);
}
}, {
eventName: BI.TimePopup.BUTTON_OK_EVENT_CHANGE,
@ -78719,7 +78719,6 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
}
});
BI.TimeCombo.EVENT_CANCEL = "EVENT_CANCEL";
BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";

5
dist/bundle.js vendored

@ -78993,7 +78993,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
},
props: {
baseCls: "bi-time-combo bi-border bi-border-radius",
width: 80,
width: 78,
height: 22
},
@ -79010,7 +79010,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
action: function () {
self.setValue();
self.hidePopupView();
self.fireEvent(BI.TimeCombo.EVENT_CANCEL);
self.fireEvent(BI.TimeCombo.EVENT_CONFIRM);
}
}, {
eventName: BI.TimePopup.BUTTON_OK_EVENT_CHANGE,
@ -79123,7 +79123,6 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
}
});
BI.TimeCombo.EVENT_CANCEL = "EVENT_CANCEL";
BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";

5
dist/fineui.ie.js vendored

@ -78834,7 +78834,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
},
props: {
baseCls: "bi-time-combo bi-border bi-border-radius",
width: 80,
width: 78,
height: 22
},
@ -78851,7 +78851,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
action: function () {
self.setValue();
self.hidePopupView();
self.fireEvent(BI.TimeCombo.EVENT_CANCEL);
self.fireEvent(BI.TimeCombo.EVENT_CONFIRM);
}
}, {
eventName: BI.TimePopup.BUTTON_OK_EVENT_CHANGE,
@ -78964,7 +78964,6 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
}
});
BI.TimeCombo.EVENT_CANCEL = "EVENT_CANCEL";
BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";

5
dist/fineui.js vendored

@ -79238,7 +79238,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
},
props: {
baseCls: "bi-time-combo bi-border bi-border-radius",
width: 80,
width: 78,
height: 22
},
@ -79255,7 +79255,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
action: function () {
self.setValue();
self.hidePopupView();
self.fireEvent(BI.TimeCombo.EVENT_CANCEL);
self.fireEvent(BI.TimeCombo.EVENT_CONFIRM);
}
}, {
eventName: BI.TimePopup.BUTTON_OK_EVENT_CHANGE,
@ -79368,7 +79368,6 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
}
});
BI.TimeCombo.EVENT_CANCEL = "EVENT_CANCEL";
BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";

5
dist/fineui_without_jquery_polyfill.js vendored

@ -62012,7 +62012,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
},
props: {
baseCls: "bi-time-combo bi-border bi-border-radius",
width: 80,
width: 78,
height: 22
},
@ -62029,7 +62029,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
action: function () {
self.setValue();
self.hidePopupView();
self.fireEvent(BI.TimeCombo.EVENT_CANCEL);
self.fireEvent(BI.TimeCombo.EVENT_CONFIRM);
}
}, {
eventName: BI.TimePopup.BUTTON_OK_EVENT_CHANGE,
@ -62142,7 +62142,6 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
}
});
BI.TimeCombo.EVENT_CANCEL = "EVENT_CANCEL";
BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";

5
dist/widget.js vendored

@ -19360,7 +19360,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
},
props: {
baseCls: "bi-time-combo bi-border bi-border-radius",
width: 80,
width: 78,
height: 22
},
@ -19377,7 +19377,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
action: function () {
self.setValue();
self.hidePopupView();
self.fireEvent(BI.TimeCombo.EVENT_CANCEL);
self.fireEvent(BI.TimeCombo.EVENT_CONFIRM);
}
}, {
eventName: BI.TimePopup.BUTTON_OK_EVENT_CHANGE,
@ -19490,7 +19490,6 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
}
});
BI.TimeCombo.EVENT_CANCEL = "EVENT_CANCEL";
BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";

5
src/widget/time/time.combo.js

@ -14,7 +14,7 @@
},
props: {
baseCls: "bi-time-combo bi-border bi-border-radius",
width: 80,
width: 78,
height: 22
},
@ -31,7 +31,7 @@
action: function () {
self.setValue();
self.hidePopupView();
self.fireEvent(BI.TimeCombo.EVENT_CANCEL);
self.fireEvent(BI.TimeCombo.EVENT_CONFIRM);
}
}, {
eventName: BI.TimePopup.BUTTON_OK_EVENT_CHANGE,
@ -144,7 +144,6 @@
}
});
BI.TimeCombo.EVENT_CANCEL = "EVENT_CANCEL";
BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";

Loading…
Cancel
Save