Browse Source

Merge pull request #971 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit 'f668c8e09b6291432808239d3cc8e3fba3affabd':
  update
  REPORT-18382 fix: 时分秒自定义格式无效
  update
  BI-46786 refactor: bi.button设置宽度后,icon和文本分太开
es6
guy 5 years ago
parent
commit
0bd21a2930
  1. 2
      src/base/single/button/buttons/button.js
  2. 3
      src/widget/time/time.trigger.js

2
src/base/single/button/buttons/button.js

@ -59,7 +59,7 @@ BI.Button = BI.inherit(BI.BasicButton, {
height: o.height - 2
});
BI.createWidget({
type: "bi.horizontal_auto",
type: "bi.center_adapt",
cls: o.iconCls,
element: this,
hgap: o.hgap,

3
src/widget/time/time.trigger.js

@ -3,7 +3,7 @@
_const: {
COMPARE_FORMAT: "%H:%M:%S",
COMPLETE_COMPARE_FORMAT: "%Y-%M-%d %H:%M:%S",
COMPLETE_COMPARE_FORMAT: "%Y-%M-%d %H:%M:%S %P",
FORMAT_ARRAY: [
"%H:%M:%S", // HH:mm:ss
"%I:%M:%S", // hh:mm:ss
@ -11,6 +11,7 @@
"%k:%M:%S", // H:mm:ss
"%l:%M:%S %p", // h:mm:ss a
"%l:%M:%S %P", // h:mm:ss a
"%H:%M:%S %p", // HH:mm:ss a
"%l:%M", // h:mm
"%k:%M", // H:mm
"%I:%M", // hh:mm

Loading…
Cancel
Save