Browse Source

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

* commit '338ab665063514c78b508d3ded85b19f977a7e65':
  update
  BI-34242 弹窗内容最大高度
  无JIRA任务  和horizontal对齐
es6
windy 6 years ago
parent
commit
374bcfa6a4
  1. 4
      dist/base.css
  2. 1
      dist/base.js
  3. 4
      dist/bundle.css
  4. 5
      dist/bundle.ie.js
  5. 42
      dist/bundle.ie.min.js
  6. 5
      dist/bundle.js
  7. 2
      dist/bundle.min.css
  8. 8
      dist/bundle.min.js
  9. 1
      dist/case.js
  10. 3
      dist/core.js
  11. 4
      dist/fineui.css
  12. 5
      dist/fineui.ie.js
  13. 42
      dist/fineui.ie.min.js
  14. 5
      dist/fineui.js
  15. 2
      dist/fineui.min.css
  16. 8
      dist/fineui.min.js
  17. 5
      dist/fineui_without_jquery_polyfill.js
  18. 2
      dist/utils.min.js
  19. 1
      src/base/single/button/button.basic.js
  20. 1
      src/case/combo/bubblecombo/popup.bubble.js
  21. 3
      src/core/wrapper/layout/adapt/adapt.table.js
  22. 4
      src/css/base/combo/popup.css
  23. 5
      src/less/base/combo/popup.bubble.bar.less

4
dist/base.css vendored

@ -562,6 +562,10 @@
.bi-text-value-down-list-combo:hover > .bi-border { .bi-text-value-down-list-combo:hover > .bi-border {
border-color: #3685f2; border-color: #3685f2;
} }
.bi-bubble-bar-popup-view .bar-popup-container {
max-height: 656px;
}
/*************BI.SearchEditor******************/ /*************BI.SearchEditor******************/
.bi-search-editor { .bi-search-editor {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;

1
dist/base.js vendored

@ -865,6 +865,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
el: { el: {
type: "bi.bubble_combo", type: "bi.bubble_combo",
trigger: "", trigger: "",
direction: "top,left",
ref: function () { ref: function () {
self.combo = this; self.combo = this;
}, },

4
dist/bundle.css vendored

@ -2534,6 +2534,10 @@ textarea {
.bi-text-value-down-list-combo:hover > .bi-border { .bi-text-value-down-list-combo:hover > .bi-border {
border-color: #3685f2; border-color: #3685f2;
} }
.bi-bubble-bar-popup-view .bar-popup-container {
max-height: 656px;
}
/*************BI.SearchEditor******************/ /*************BI.SearchEditor******************/
.bi-search-editor { .bi-search-editor {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;

5
dist/bundle.ie.js vendored

@ -30777,6 +30777,7 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
columnSize: [], columnSize: [],
verticalAlign: BI.VerticalAlign.Top, verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left, horizontalAlign: BI.HorizontalAlign.Left,
scrollx: true,
hgap: 0, hgap: 0,
vgap: 0, vgap: 0,
lgap: 0, lgap: 0,
@ -30823,7 +30824,7 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
td.element.css({ td.element.css({
position: "relative", position: "relative",
display: "table-cell", display: "table-cell",
"vertical-align": "middle", "vertical-align": o.verticalAlign,
margin: "0", margin: "0",
padding: "0", padding: "0",
height: "100%" height: "100%"
@ -35931,6 +35932,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
el: { el: {
type: "bi.bubble_combo", type: "bi.bubble_combo",
trigger: "", trigger: "",
direction: "top,left",
ref: function () { ref: function () {
self.combo = this; self.combo = this;
}, },
@ -52571,6 +52573,7 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
items: [o.el], items: [o.el],
layouts: [{ layouts: [{
type: "bi.vertical", type: "bi.vertical",
cls: "bar-popup-container",
hgap: 15, hgap: 15,
tgap: 10 tgap: 10
}] }]

42
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

5
dist/bundle.js vendored

@ -30777,6 +30777,7 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
columnSize: [], columnSize: [],
verticalAlign: BI.VerticalAlign.Top, verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left, horizontalAlign: BI.HorizontalAlign.Left,
scrollx: true,
hgap: 0, hgap: 0,
vgap: 0, vgap: 0,
lgap: 0, lgap: 0,
@ -30823,7 +30824,7 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
td.element.css({ td.element.css({
position: "relative", position: "relative",
display: "table-cell", display: "table-cell",
"vertical-align": "middle", "vertical-align": o.verticalAlign,
margin: "0", margin: "0",
padding: "0", padding: "0",
height: "100%" height: "100%"
@ -36335,6 +36336,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
el: { el: {
type: "bi.bubble_combo", type: "bi.bubble_combo",
trigger: "", trigger: "",
direction: "top,left",
ref: function () { ref: function () {
self.combo = this; self.combo = this;
}, },
@ -52975,6 +52977,7 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
items: [o.el], items: [o.el],
layouts: [{ layouts: [{
type: "bi.vertical", type: "bi.vertical",
cls: "bar-popup-container",
hgap: 15, hgap: 15,
tgap: 10 tgap: 10
}] }]

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

8
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

1
dist/case.js vendored

@ -4067,6 +4067,7 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
items: [o.el], items: [o.el],
layouts: [{ layouts: [{
type: "bi.vertical", type: "bi.vertical",
cls: "bar-popup-container",
hgap: 15, hgap: 15,
tgap: 10 tgap: 10
}] }]

3
dist/core.js vendored

@ -30777,6 +30777,7 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
columnSize: [], columnSize: [],
verticalAlign: BI.VerticalAlign.Top, verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left, horizontalAlign: BI.HorizontalAlign.Left,
scrollx: true,
hgap: 0, hgap: 0,
vgap: 0, vgap: 0,
lgap: 0, lgap: 0,
@ -30823,7 +30824,7 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
td.element.css({ td.element.css({
position: "relative", position: "relative",
display: "table-cell", display: "table-cell",
"vertical-align": "middle", "vertical-align": o.verticalAlign,
margin: "0", margin: "0",
padding: "0", padding: "0",
height: "100%" height: "100%"

4
dist/fineui.css vendored

@ -2534,6 +2534,10 @@ textarea {
.bi-text-value-down-list-combo:hover > .bi-border { .bi-text-value-down-list-combo:hover > .bi-border {
border-color: #3685f2; border-color: #3685f2;
} }
.bi-bubble-bar-popup-view .bar-popup-container {
max-height: 656px;
}
/*************BI.SearchEditor******************/ /*************BI.SearchEditor******************/
.bi-search-editor { .bi-search-editor {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;

5
dist/fineui.ie.js vendored

@ -31019,6 +31019,7 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
columnSize: [], columnSize: [],
verticalAlign: BI.VerticalAlign.Top, verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left, horizontalAlign: BI.HorizontalAlign.Left,
scrollx: true,
hgap: 0, hgap: 0,
vgap: 0, vgap: 0,
lgap: 0, lgap: 0,
@ -31065,7 +31066,7 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
td.element.css({ td.element.css({
position: "relative", position: "relative",
display: "table-cell", display: "table-cell",
"vertical-align": "middle", "vertical-align": o.verticalAlign,
margin: "0", margin: "0",
padding: "0", padding: "0",
height: "100%" height: "100%"
@ -36173,6 +36174,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
el: { el: {
type: "bi.bubble_combo", type: "bi.bubble_combo",
trigger: "", trigger: "",
direction: "top,left",
ref: function () { ref: function () {
self.combo = this; self.combo = this;
}, },
@ -52813,6 +52815,7 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
items: [o.el], items: [o.el],
layouts: [{ layouts: [{
type: "bi.vertical", type: "bi.vertical",
cls: "bar-popup-container",
hgap: 15, hgap: 15,
tgap: 10 tgap: 10
}] }]

42
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

5
dist/fineui.js vendored

@ -31019,6 +31019,7 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
columnSize: [], columnSize: [],
verticalAlign: BI.VerticalAlign.Top, verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left, horizontalAlign: BI.HorizontalAlign.Left,
scrollx: true,
hgap: 0, hgap: 0,
vgap: 0, vgap: 0,
lgap: 0, lgap: 0,
@ -31065,7 +31066,7 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
td.element.css({ td.element.css({
position: "relative", position: "relative",
display: "table-cell", display: "table-cell",
"vertical-align": "middle", "vertical-align": o.verticalAlign,
margin: "0", margin: "0",
padding: "0", padding: "0",
height: "100%" height: "100%"
@ -36577,6 +36578,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
el: { el: {
type: "bi.bubble_combo", type: "bi.bubble_combo",
trigger: "", trigger: "",
direction: "top,left",
ref: function () { ref: function () {
self.combo = this; self.combo = this;
}, },
@ -53217,6 +53219,7 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
items: [o.el], items: [o.el],
layouts: [{ layouts: [{
type: "bi.vertical", type: "bi.vertical",
cls: "bar-popup-container",
hgap: 15, hgap: 15,
tgap: 10 tgap: 10
}] }]

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

8
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

5
dist/fineui_without_jquery_polyfill.js vendored

@ -19746,6 +19746,7 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
columnSize: [], columnSize: [],
verticalAlign: BI.VerticalAlign.Top, verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left, horizontalAlign: BI.HorizontalAlign.Left,
scrollx: true,
hgap: 0, hgap: 0,
vgap: 0, vgap: 0,
lgap: 0, lgap: 0,
@ -19792,7 +19793,7 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
td.element.css({ td.element.css({
position: "relative", position: "relative",
display: "table-cell", display: "table-cell",
"vertical-align": "middle", "vertical-align": o.verticalAlign,
margin: "0", margin: "0",
padding: "0", padding: "0",
height: "100%" height: "100%"
@ -25103,6 +25104,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
el: { el: {
type: "bi.bubble_combo", type: "bi.bubble_combo",
trigger: "", trigger: "",
direction: "top,left",
ref: function () { ref: function () {
self.combo = this; self.combo = this;
}, },
@ -36251,6 +36253,7 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
items: [o.el], items: [o.el],
layouts: [{ layouts: [{
type: "bi.vertical", type: "bi.vertical",
cls: "bar-popup-container",
hgap: 15, hgap: 15,
tgap: 10 tgap: 10
}] }]

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

1
src/base/single/button/button.basic.js

@ -229,6 +229,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
el: { el: {
type: "bi.bubble_combo", type: "bi.bubble_combo",
trigger: "", trigger: "",
direction: "top,left",
ref: function () { ref: function () {
self.combo = this; self.combo = this;
}, },

1
src/case/combo/bubblecombo/popup.bubble.js

@ -77,6 +77,7 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
items: [o.el], items: [o.el],
layouts: [{ layouts: [{
type: "bi.vertical", type: "bi.vertical",
cls: "bar-popup-container",
hgap: 15, hgap: 15,
tgap: 10 tgap: 10
}] }]

3
src/core/wrapper/layout/adapt/adapt.table.js

@ -10,6 +10,7 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
columnSize: [], columnSize: [],
verticalAlign: BI.VerticalAlign.Top, verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left, horizontalAlign: BI.HorizontalAlign.Left,
scrollx: true,
hgap: 0, hgap: 0,
vgap: 0, vgap: 0,
lgap: 0, lgap: 0,
@ -56,7 +57,7 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
td.element.css({ td.element.css({
position: "relative", position: "relative",
display: "table-cell", display: "table-cell",
"vertical-align": "middle", "vertical-align": o.verticalAlign,
margin: "0", margin: "0",
padding: "0", padding: "0",
height: "100%" height: "100%"

4
src/css/base/combo/popup.css

@ -0,0 +1,4 @@
.bi-bubble-bar-popup-view .bar-popup-container {
max-height: 656px;
}

5
src/less/base/combo/popup.bubble.bar.less

@ -0,0 +1,5 @@
.bi-bubble-bar-popup-view {
& .bar-popup-container{
max-height: 656px;
}
}
Loading…
Cancel
Save