Browse Source

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

* commit 'f30eb1480d693733139aa5b56559cf2c4f562334':
  BI-25546 && BI-25184
es6
Teller 6 years ago
parent
commit
321266a3bd
  1. 16
      dist/_fineui.min.js
  2. 1
      dist/base.css
  3. 1
      dist/bundle.css
  4. 6
      dist/bundle.js
  5. 2
      dist/bundle.min.css
  6. 38
      dist/bundle.min.js
  7. 1
      dist/fineui.css
  8. 6
      dist/fineui.js
  9. 2
      dist/fineui.min.css
  10. 16
      dist/fineui.min.js
  11. 6
      dist/widget.js
  12. 1
      src/css/base/single/text.css
  13. 2
      src/less/base/single/text.less
  14. 6
      src/widget/numbereditor/number.editor.js

16
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

1
dist/base.css vendored

@ -1283,7 +1283,6 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
/*IE8*/
box-sizing: border-box;
/*W3C标准(IE9+,Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
word-wrap: break-word;
word-break: break-word;
}
.bi-bubble .bubble-text {

1
dist/bundle.css vendored

@ -3039,7 +3039,6 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
/*IE8*/
box-sizing: border-box;
/*W3C标准(IE9+,Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
word-wrap: break-word;
word-break: break-word;
}
.bi-bubble .bubble-text {

6
dist/bundle.js vendored

@ -102591,8 +102591,9 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
});
this.topBtn = BI.createWidget({
type: "bi.icon_button",
forceNotSelected: true,
trigger: "lclick,",
cls: "column-pre-page-h-font top-button bi-border-left bi-border-bottom"
cls: "pull-up-font top-button bi-border-left bi-list-item-active3"
});
this.topBtn.on(BI.IconButton.EVENT_CHANGE, function () {
self._finetuning(o.step);
@ -102602,7 +102603,8 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
this.bottomBtn = BI.createWidget({
type: "bi.icon_button",
trigger: "lclick,",
cls: "column-next-page-h-font bottom-button bi-border-left bi-border-top"
forceNotSelected: true,
cls: "pull-down-font bottom-button bi-border-left bi-list-item-active3"
});
this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function () {
self._finetuning(-o.step);

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

38
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

1
dist/fineui.css vendored

@ -3039,7 +3039,6 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
/*IE8*/
box-sizing: border-box;
/*W3C标准(IE9+,Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
word-wrap: break-word;
word-break: break-word;
}
.bi-bubble .bubble-text {

6
dist/fineui.js vendored

@ -102834,8 +102834,9 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
});
this.topBtn = BI.createWidget({
type: "bi.icon_button",
forceNotSelected: true,
trigger: "lclick,",
cls: "column-pre-page-h-font top-button bi-border-left bi-border-bottom"
cls: "pull-up-font top-button bi-border-left bi-list-item-active3"
});
this.topBtn.on(BI.IconButton.EVENT_CHANGE, function () {
self._finetuning(o.step);
@ -102845,7 +102846,8 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
this.bottomBtn = BI.createWidget({
type: "bi.icon_button",
trigger: "lclick,",
cls: "column-next-page-h-font bottom-button bi-border-left bi-border-top"
forceNotSelected: true,
cls: "pull-down-font bottom-button bi-border-left bi-list-item-active3"
});
this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function () {
self._finetuning(-o.step);

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

16
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/widget.js vendored

@ -14937,8 +14937,9 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
});
this.topBtn = BI.createWidget({
type: "bi.icon_button",
forceNotSelected: true,
trigger: "lclick,",
cls: "column-pre-page-h-font top-button bi-border-left bi-border-bottom"
cls: "pull-up-font top-button bi-border-left bi-list-item-active3"
});
this.topBtn.on(BI.IconButton.EVENT_CHANGE, function () {
self._finetuning(o.step);
@ -14948,7 +14949,8 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
this.bottomBtn = BI.createWidget({
type: "bi.icon_button",
trigger: "lclick,",
cls: "column-next-page-h-font bottom-button bi-border-left bi-border-top"
forceNotSelected: true,
cls: "pull-down-font bottom-button bi-border-left bi-list-item-active3"
});
this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function () {
self._finetuning(-o.step);

1
src/css/base/single/text.css

@ -11,6 +11,5 @@
/*IE8*/
box-sizing: border-box;
/*W3C标准(IE9+,Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
word-wrap: break-word;
word-break: break-word;
}

2
src/less/base/single/text.less

@ -3,6 +3,6 @@
.bi-text {
.overflow-dot();
.box-sizing(border-box);
word-wrap: break-word;
// BI-9141 加的,但是去掉后在firefox下没有问题,先去掉以适配ie9
word-break: break-word;
}

6
src/widget/numbereditor/number.editor.js

@ -40,8 +40,9 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
});
this.topBtn = BI.createWidget({
type: "bi.icon_button",
forceNotSelected: true,
trigger: "lclick,",
cls: "column-pre-page-h-font top-button bi-border-left bi-border-bottom"
cls: "pull-up-font top-button bi-border-left bi-list-item-active3"
});
this.topBtn.on(BI.IconButton.EVENT_CHANGE, function () {
self._finetuning(o.step);
@ -51,7 +52,8 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
this.bottomBtn = BI.createWidget({
type: "bi.icon_button",
trigger: "lclick,",
cls: "column-next-page-h-font bottom-button bi-border-left bi-border-top"
forceNotSelected: true,
cls: "pull-down-font bottom-button bi-border-left bi-list-item-active3"
});
this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function () {
self._finetuning(-o.step);

Loading…
Cancel
Save