Browse Source

Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~kira/fineui

es6
Kira 4 years ago
parent
commit
a27fa76656
  1. 2
      dist/2.0/fineui.css
  2. 4
      dist/2.0/fineui.ie.min.js
  3. 2
      dist/2.0/fineui.ie.min.js.map
  4. 73
      dist/2.0/fineui.js
  5. 2
      dist/2.0/fineui.js.map
  6. 2
      dist/2.0/fineui.min.css
  7. 4
      dist/2.0/fineui.min.js
  8. 2
      dist/2.0/fineui.min.js.map
  9. 2
      dist/2.0/fineui_without_normalize.css
  10. 2
      dist/2.0/fineui_without_normalize.min.css
  11. 2
      dist/core.css
  12. 73
      dist/core.js
  13. 2
      dist/core.js.map
  14. 2
      dist/demo.css
  15. 73
      dist/demo.js
  16. 2
      dist/demo.js.map
  17. 2
      dist/fineui.css
  18. 4
      dist/fineui.ie.min.js
  19. 2
      dist/fineui.ie.min.js.map
  20. 73
      dist/fineui.js
  21. 2
      dist/fineui.js.map
  22. 2
      dist/fineui.min.css
  23. 4
      dist/fineui.min.js
  24. 2
      dist/fineui.min.js.map
  25. 2
      dist/fineui.proxy.css
  26. 73
      dist/fineui.proxy.js
  27. 2
      dist/fineui.proxy.js.map
  28. 2
      dist/fineui.proxy.min.css
  29. 4
      dist/fineui.proxy.min.js
  30. 2
      dist/fineui.proxy.min.js.map
  31. 73
      dist/fineui_without_jquery_polyfill.js
  32. 2
      dist/fineui_without_jquery_polyfill.js.map
  33. 2
      dist/font.css
  34. 2
      dist/lib/core/base.d.ts
  35. 2
      dist/resource.css
  36. 2
      dist/utils.js
  37. 2
      dist/utils.min.js
  38. 2
      package.json
  39. 1
      src/case/pager/pager.all.count.js
  40. 32
      src/core/wrapper/layout/flex/flex.leftrightvertical.center.js
  41. 27
      src/core/wrapper/layout/layout.tape.js
  42. 11
      src/core/wrapper/layout/layout.vertical.js
  43. 2
      typescript/core/base.ts

2
dist/2.0/fineui.css vendored

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.ie.min.js.map vendored

File diff suppressed because one or more lines are too long

73
dist/2.0/fineui.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-6-4 5:10:18 PM */
/*! time: 2021-6-7 3:40:35 PM */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -18130,28 +18130,18 @@ BI.FlexLeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
}
return json;
});
rightItems = BI.map(rightItems, function (i, item) {
var json = {
el: BI.stripEL(item)
};
if (o.rvgap + o.rtgap + (item.tgap || 0) + (item.vgap || 0) !== 0) {
json.tgap = o.rvgap + o.rtgap + (item.tgap || 0) + (item.vgap || 0);
}
if (o.rhgap + o.rlgap + (item.lgap || 0) + (item.hgap || 0) !== 0) {
json.lgap = o.rlgap + (item.lgap || 0) + (item.hgap || 0);
}
if (o.rhgap + o.rrgap + (item.rgap || 0) + (item.hgap || 0) !== 0) {
json.rgap = o.rhgap + o.rrgap + (item.rgap || 0) + (item.hgap || 0);
}
if (o.rvgap + o.rbgap + (item.bgap || 0) + (item.vgap || 0) !== 0) {
json.bgap = o.rvgap + o.rbgap + (item.bgap || 0) + (item.vgap || 0);
}
return json;
});
return leftItems.concat({
type: "bi.flex_vertical_adapt",
cls: "flex-left-auto",
items: rightItems
el: {
type: "bi.flex_vertical_adapt",
cls: "flex-left-auto",
hgap: o.rhgap,
vgap: o.rvgap,
lgap: o.rlgap,
rgap: o.rrgap,
tgap: o.rtgap,
bgap: o.rbgap,
items: rightItems
}
});
},
@ -20186,6 +20176,7 @@ BI.HTapeLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.HTapeLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-h-tape",
verticalAlign: BI.VerticalAlign.Top,
hgap: 0,
vgap: 0,
lgap: 0,
@ -20223,6 +20214,16 @@ BI.HTapeLayout = BI.inherit(BI.Layout, {
top: ((item.vgap || 0) + (item.tgap || 0) + o.vgap + o.tgap) / BI.pixRatio + BI.pixUnit,
bottom: ((item.bgap || 0) + (item.vgap || 0) + o.vgap + o.bgap) / BI.pixRatio + BI.pixUnit
});
if (o.verticalAlign === BI.VerticalAlign.Middle) {
w.element.css({
marginTop: "auto",
marginBottom: "auto"
});
} else if (o.verticalAlign === BI.VerticalAlign.Bottom) {
w.element.css({
marginTop: "auto"
});
}
});
var left = {}, right = {};
@ -20289,6 +20290,7 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.VTapeLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-v-tape-layout",
horizontalAlign: BI.HorizontalAlign.Left,
hgap: 0,
vgap: 0,
lgap: 0,
@ -20327,6 +20329,16 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
left: ((item.lgap || 0) + (item.hgap || 0) + o.hgap + o.lgap) / BI.pixRatio + BI.pixUnit,
right: +((item.hgap || 0) + (item.rgap || 0) + o.hgap + o.rgap) / BI.pixRatio + BI.pixUnit
});
if (o.horizontalAlign === BI.HorizontalAlign.Center) {
w.element.css({
marginLeft: "auto",
marginRight: "auto"
});
} else if (o.horizontalAlign === BI.HorizontalAlign.Right) {
w.element.css({
marginLeft: "auto"
});
}
});
var top = {}, bottom = {};
@ -20356,7 +20368,10 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
bottom[i] = bottom[i + 1] + items[i + 1].height + (items[i + 1].bgap || 0) + 2 * (items[i + 1].vgap || 0) + o.vgap + o.tgap + o.bgap;
}
if (item.height < 1 && item.height >= 0) {
w.element.css({bottom: (bottom[i] * 100).toFixed(1) + "%", height: (item.height * 100).toFixed(1) + "%"});
w.element.css({
bottom: (bottom[i] * 100).toFixed(1) + "%",
height: (item.height * 100).toFixed(1) + "%"
});
} else {
w.element.css({
bottom: (bottom[i] + (item.vgap || 0) + (item.bgap || 0) + o.vgap + o.bgap) / BI.pixRatio + BI.pixUnit,
@ -20553,6 +20568,7 @@ BI.VerticalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.VerticalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-v",
horizontalAlign: BI.HorizontalAlign.Stretch,
hgap: 0,
vgap: 0,
lgap: 0,
@ -20593,6 +20609,16 @@ BI.VerticalLayout = BI.inherit(BI.Layout, {
"margin-bottom": (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0)) / BI.pixRatio + BI.pixUnit
});
}
if (o.horizontalAlign === BI.HorizontalAlign.Center) {
w.element.css({
marginLeft: "auto",
marginRight: "auto"
});
} else if (o.horizontalAlign === BI.HorizontalAlign.Right) {
w.element.css({
marginLeft: "auto"
});
}
return w;
},
@ -41081,7 +41107,6 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
type: "bi.label",
height: o.height,
text: BI.i18nText("BI-Tiao_Data"),
width: 40,
textAlign: "left"
}, BI.isNotEmptyObject(o.rowInfoObject) ? o.rowInfoObject : null]
};

2
dist/2.0/fineui.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.min.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui_without_normalize.css vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui_without_normalize.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/core.css vendored

File diff suppressed because one or more lines are too long

73
dist/core.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-6-4 5:10:18 PM */
/*! time: 2021-6-7 3:40:35 PM */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -18130,28 +18130,18 @@ BI.FlexLeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
}
return json;
});
rightItems = BI.map(rightItems, function (i, item) {
var json = {
el: BI.stripEL(item)
};
if (o.rvgap + o.rtgap + (item.tgap || 0) + (item.vgap || 0) !== 0) {
json.tgap = o.rvgap + o.rtgap + (item.tgap || 0) + (item.vgap || 0);
}
if (o.rhgap + o.rlgap + (item.lgap || 0) + (item.hgap || 0) !== 0) {
json.lgap = o.rlgap + (item.lgap || 0) + (item.hgap || 0);
}
if (o.rhgap + o.rrgap + (item.rgap || 0) + (item.hgap || 0) !== 0) {
json.rgap = o.rhgap + o.rrgap + (item.rgap || 0) + (item.hgap || 0);
}
if (o.rvgap + o.rbgap + (item.bgap || 0) + (item.vgap || 0) !== 0) {
json.bgap = o.rvgap + o.rbgap + (item.bgap || 0) + (item.vgap || 0);
}
return json;
});
return leftItems.concat({
type: "bi.flex_vertical_adapt",
cls: "flex-left-auto",
items: rightItems
el: {
type: "bi.flex_vertical_adapt",
cls: "flex-left-auto",
hgap: o.rhgap,
vgap: o.rvgap,
lgap: o.rlgap,
rgap: o.rrgap,
tgap: o.rtgap,
bgap: o.rbgap,
items: rightItems
}
});
},
@ -20186,6 +20176,7 @@ BI.HTapeLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.HTapeLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-h-tape",
verticalAlign: BI.VerticalAlign.Top,
hgap: 0,
vgap: 0,
lgap: 0,
@ -20223,6 +20214,16 @@ BI.HTapeLayout = BI.inherit(BI.Layout, {
top: ((item.vgap || 0) + (item.tgap || 0) + o.vgap + o.tgap) / BI.pixRatio + BI.pixUnit,
bottom: ((item.bgap || 0) + (item.vgap || 0) + o.vgap + o.bgap) / BI.pixRatio + BI.pixUnit
});
if (o.verticalAlign === BI.VerticalAlign.Middle) {
w.element.css({
marginTop: "auto",
marginBottom: "auto"
});
} else if (o.verticalAlign === BI.VerticalAlign.Bottom) {
w.element.css({
marginTop: "auto"
});
}
});
var left = {}, right = {};
@ -20289,6 +20290,7 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.VTapeLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-v-tape-layout",
horizontalAlign: BI.HorizontalAlign.Left,
hgap: 0,
vgap: 0,
lgap: 0,
@ -20327,6 +20329,16 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
left: ((item.lgap || 0) + (item.hgap || 0) + o.hgap + o.lgap) / BI.pixRatio + BI.pixUnit,
right: +((item.hgap || 0) + (item.rgap || 0) + o.hgap + o.rgap) / BI.pixRatio + BI.pixUnit
});
if (o.horizontalAlign === BI.HorizontalAlign.Center) {
w.element.css({
marginLeft: "auto",
marginRight: "auto"
});
} else if (o.horizontalAlign === BI.HorizontalAlign.Right) {
w.element.css({
marginLeft: "auto"
});
}
});
var top = {}, bottom = {};
@ -20356,7 +20368,10 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
bottom[i] = bottom[i + 1] + items[i + 1].height + (items[i + 1].bgap || 0) + 2 * (items[i + 1].vgap || 0) + o.vgap + o.tgap + o.bgap;
}
if (item.height < 1 && item.height >= 0) {
w.element.css({bottom: (bottom[i] * 100).toFixed(1) + "%", height: (item.height * 100).toFixed(1) + "%"});
w.element.css({
bottom: (bottom[i] * 100).toFixed(1) + "%",
height: (item.height * 100).toFixed(1) + "%"
});
} else {
w.element.css({
bottom: (bottom[i] + (item.vgap || 0) + (item.bgap || 0) + o.vgap + o.bgap) / BI.pixRatio + BI.pixUnit,
@ -20553,6 +20568,7 @@ BI.VerticalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.VerticalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-v",
horizontalAlign: BI.HorizontalAlign.Stretch,
hgap: 0,
vgap: 0,
lgap: 0,
@ -20593,6 +20609,16 @@ BI.VerticalLayout = BI.inherit(BI.Layout, {
"margin-bottom": (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0)) / BI.pixRatio + BI.pixUnit
});
}
if (o.horizontalAlign === BI.HorizontalAlign.Center) {
w.element.css({
marginLeft: "auto",
marginRight: "auto"
});
} else if (o.horizontalAlign === BI.HorizontalAlign.Right) {
w.element.css({
marginLeft: "auto"
});
}
return w;
},
@ -41081,7 +41107,6 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
type: "bi.label",
height: o.height,
text: BI.i18nText("BI-Tiao_Data"),
width: 40,
textAlign: "left"
}, BI.isNotEmptyObject(o.rowInfoObject) ? o.rowInfoObject : null]
};

2
dist/core.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/demo.css vendored

File diff suppressed because one or more lines are too long

73
dist/demo.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-6-4 5:10:18 PM */
/*! time: 2021-6-7 3:40:35 PM */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -18130,28 +18130,18 @@ BI.FlexLeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
}
return json;
});
rightItems = BI.map(rightItems, function (i, item) {
var json = {
el: BI.stripEL(item)
};
if (o.rvgap + o.rtgap + (item.tgap || 0) + (item.vgap || 0) !== 0) {
json.tgap = o.rvgap + o.rtgap + (item.tgap || 0) + (item.vgap || 0);
}
if (o.rhgap + o.rlgap + (item.lgap || 0) + (item.hgap || 0) !== 0) {
json.lgap = o.rlgap + (item.lgap || 0) + (item.hgap || 0);
}
if (o.rhgap + o.rrgap + (item.rgap || 0) + (item.hgap || 0) !== 0) {
json.rgap = o.rhgap + o.rrgap + (item.rgap || 0) + (item.hgap || 0);
}
if (o.rvgap + o.rbgap + (item.bgap || 0) + (item.vgap || 0) !== 0) {
json.bgap = o.rvgap + o.rbgap + (item.bgap || 0) + (item.vgap || 0);
}
return json;
});
return leftItems.concat({
type: "bi.flex_vertical_adapt",
cls: "flex-left-auto",
items: rightItems
el: {
type: "bi.flex_vertical_adapt",
cls: "flex-left-auto",
hgap: o.rhgap,
vgap: o.rvgap,
lgap: o.rlgap,
rgap: o.rrgap,
tgap: o.rtgap,
bgap: o.rbgap,
items: rightItems
}
});
},
@ -20186,6 +20176,7 @@ BI.HTapeLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.HTapeLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-h-tape",
verticalAlign: BI.VerticalAlign.Top,
hgap: 0,
vgap: 0,
lgap: 0,
@ -20223,6 +20214,16 @@ BI.HTapeLayout = BI.inherit(BI.Layout, {
top: ((item.vgap || 0) + (item.tgap || 0) + o.vgap + o.tgap) / BI.pixRatio + BI.pixUnit,
bottom: ((item.bgap || 0) + (item.vgap || 0) + o.vgap + o.bgap) / BI.pixRatio + BI.pixUnit
});
if (o.verticalAlign === BI.VerticalAlign.Middle) {
w.element.css({
marginTop: "auto",
marginBottom: "auto"
});
} else if (o.verticalAlign === BI.VerticalAlign.Bottom) {
w.element.css({
marginTop: "auto"
});
}
});
var left = {}, right = {};
@ -20289,6 +20290,7 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.VTapeLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-v-tape-layout",
horizontalAlign: BI.HorizontalAlign.Left,
hgap: 0,
vgap: 0,
lgap: 0,
@ -20327,6 +20329,16 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
left: ((item.lgap || 0) + (item.hgap || 0) + o.hgap + o.lgap) / BI.pixRatio + BI.pixUnit,
right: +((item.hgap || 0) + (item.rgap || 0) + o.hgap + o.rgap) / BI.pixRatio + BI.pixUnit
});
if (o.horizontalAlign === BI.HorizontalAlign.Center) {
w.element.css({
marginLeft: "auto",
marginRight: "auto"
});
} else if (o.horizontalAlign === BI.HorizontalAlign.Right) {
w.element.css({
marginLeft: "auto"
});
}
});
var top = {}, bottom = {};
@ -20356,7 +20368,10 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
bottom[i] = bottom[i + 1] + items[i + 1].height + (items[i + 1].bgap || 0) + 2 * (items[i + 1].vgap || 0) + o.vgap + o.tgap + o.bgap;
}
if (item.height < 1 && item.height >= 0) {
w.element.css({bottom: (bottom[i] * 100).toFixed(1) + "%", height: (item.height * 100).toFixed(1) + "%"});
w.element.css({
bottom: (bottom[i] * 100).toFixed(1) + "%",
height: (item.height * 100).toFixed(1) + "%"
});
} else {
w.element.css({
bottom: (bottom[i] + (item.vgap || 0) + (item.bgap || 0) + o.vgap + o.bgap) / BI.pixRatio + BI.pixUnit,
@ -20553,6 +20568,7 @@ BI.VerticalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.VerticalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-v",
horizontalAlign: BI.HorizontalAlign.Stretch,
hgap: 0,
vgap: 0,
lgap: 0,
@ -20593,6 +20609,16 @@ BI.VerticalLayout = BI.inherit(BI.Layout, {
"margin-bottom": (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0)) / BI.pixRatio + BI.pixUnit
});
}
if (o.horizontalAlign === BI.HorizontalAlign.Center) {
w.element.css({
marginLeft: "auto",
marginRight: "auto"
});
} else if (o.horizontalAlign === BI.HorizontalAlign.Right) {
w.element.css({
marginLeft: "auto"
});
}
return w;
},
@ -41081,7 +41107,6 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
type: "bi.label",
height: o.height,
text: BI.i18nText("BI-Tiao_Data"),
width: 40,
textAlign: "left"
}, BI.isNotEmptyObject(o.rowInfoObject) ? o.rowInfoObject : null]
};

2
dist/demo.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.css vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.ie.min.js.map vendored

File diff suppressed because one or more lines are too long

73
dist/fineui.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-6-4 5:10:18 PM */
/*! time: 2021-6-7 3:40:35 PM */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -18130,28 +18130,18 @@ BI.FlexLeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
}
return json;
});
rightItems = BI.map(rightItems, function (i, item) {
var json = {
el: BI.stripEL(item)
};
if (o.rvgap + o.rtgap + (item.tgap || 0) + (item.vgap || 0) !== 0) {
json.tgap = o.rvgap + o.rtgap + (item.tgap || 0) + (item.vgap || 0);
}
if (o.rhgap + o.rlgap + (item.lgap || 0) + (item.hgap || 0) !== 0) {
json.lgap = o.rlgap + (item.lgap || 0) + (item.hgap || 0);
}
if (o.rhgap + o.rrgap + (item.rgap || 0) + (item.hgap || 0) !== 0) {
json.rgap = o.rhgap + o.rrgap + (item.rgap || 0) + (item.hgap || 0);
}
if (o.rvgap + o.rbgap + (item.bgap || 0) + (item.vgap || 0) !== 0) {
json.bgap = o.rvgap + o.rbgap + (item.bgap || 0) + (item.vgap || 0);
}
return json;
});
return leftItems.concat({
type: "bi.flex_vertical_adapt",
cls: "flex-left-auto",
items: rightItems
el: {
type: "bi.flex_vertical_adapt",
cls: "flex-left-auto",
hgap: o.rhgap,
vgap: o.rvgap,
lgap: o.rlgap,
rgap: o.rrgap,
tgap: o.rtgap,
bgap: o.rbgap,
items: rightItems
}
});
},
@ -20186,6 +20176,7 @@ BI.HTapeLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.HTapeLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-h-tape",
verticalAlign: BI.VerticalAlign.Top,
hgap: 0,
vgap: 0,
lgap: 0,
@ -20223,6 +20214,16 @@ BI.HTapeLayout = BI.inherit(BI.Layout, {
top: ((item.vgap || 0) + (item.tgap || 0) + o.vgap + o.tgap) / BI.pixRatio + BI.pixUnit,
bottom: ((item.bgap || 0) + (item.vgap || 0) + o.vgap + o.bgap) / BI.pixRatio + BI.pixUnit
});
if (o.verticalAlign === BI.VerticalAlign.Middle) {
w.element.css({
marginTop: "auto",
marginBottom: "auto"
});
} else if (o.verticalAlign === BI.VerticalAlign.Bottom) {
w.element.css({
marginTop: "auto"
});
}
});
var left = {}, right = {};
@ -20289,6 +20290,7 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.VTapeLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-v-tape-layout",
horizontalAlign: BI.HorizontalAlign.Left,
hgap: 0,
vgap: 0,
lgap: 0,
@ -20327,6 +20329,16 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
left: ((item.lgap || 0) + (item.hgap || 0) + o.hgap + o.lgap) / BI.pixRatio + BI.pixUnit,
right: +((item.hgap || 0) + (item.rgap || 0) + o.hgap + o.rgap) / BI.pixRatio + BI.pixUnit
});
if (o.horizontalAlign === BI.HorizontalAlign.Center) {
w.element.css({
marginLeft: "auto",
marginRight: "auto"
});
} else if (o.horizontalAlign === BI.HorizontalAlign.Right) {
w.element.css({
marginLeft: "auto"
});
}
});
var top = {}, bottom = {};
@ -20356,7 +20368,10 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
bottom[i] = bottom[i + 1] + items[i + 1].height + (items[i + 1].bgap || 0) + 2 * (items[i + 1].vgap || 0) + o.vgap + o.tgap + o.bgap;
}
if (item.height < 1 && item.height >= 0) {
w.element.css({bottom: (bottom[i] * 100).toFixed(1) + "%", height: (item.height * 100).toFixed(1) + "%"});
w.element.css({
bottom: (bottom[i] * 100).toFixed(1) + "%",
height: (item.height * 100).toFixed(1) + "%"
});
} else {
w.element.css({
bottom: (bottom[i] + (item.vgap || 0) + (item.bgap || 0) + o.vgap + o.bgap) / BI.pixRatio + BI.pixUnit,
@ -20553,6 +20568,7 @@ BI.VerticalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.VerticalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-v",
horizontalAlign: BI.HorizontalAlign.Stretch,
hgap: 0,
vgap: 0,
lgap: 0,
@ -20593,6 +20609,16 @@ BI.VerticalLayout = BI.inherit(BI.Layout, {
"margin-bottom": (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0)) / BI.pixRatio + BI.pixUnit
});
}
if (o.horizontalAlign === BI.HorizontalAlign.Center) {
w.element.css({
marginLeft: "auto",
marginRight: "auto"
});
} else if (o.horizontalAlign === BI.HorizontalAlign.Right) {
w.element.css({
marginLeft: "auto"
});
}
return w;
},
@ -41081,7 +41107,6 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
type: "bi.label",
height: o.height,
text: BI.i18nText("BI-Tiao_Data"),
width: 40,
textAlign: "left"
}, BI.isNotEmptyObject(o.rowInfoObject) ? o.rowInfoObject : null]
};

2
dist/fineui.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.min.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.proxy.css vendored

File diff suppressed because one or more lines are too long

73
dist/fineui.proxy.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-6-4 5:10:18 PM */
/*! time: 2021-6-7 3:40:35 PM */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -15591,28 +15591,18 @@ BI.FlexLeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
}
return json;
});
rightItems = BI.map(rightItems, function (i, item) {
var json = {
el: BI.stripEL(item)
};
if (o.rvgap + o.rtgap + (item.tgap || 0) + (item.vgap || 0) !== 0) {
json.tgap = o.rvgap + o.rtgap + (item.tgap || 0) + (item.vgap || 0);
}
if (o.rhgap + o.rlgap + (item.lgap || 0) + (item.hgap || 0) !== 0) {
json.lgap = o.rlgap + (item.lgap || 0) + (item.hgap || 0);
}
if (o.rhgap + o.rrgap + (item.rgap || 0) + (item.hgap || 0) !== 0) {
json.rgap = o.rhgap + o.rrgap + (item.rgap || 0) + (item.hgap || 0);
}
if (o.rvgap + o.rbgap + (item.bgap || 0) + (item.vgap || 0) !== 0) {
json.bgap = o.rvgap + o.rbgap + (item.bgap || 0) + (item.vgap || 0);
}
return json;
});
return leftItems.concat({
type: "bi.flex_vertical_adapt",
cls: "flex-left-auto",
items: rightItems
el: {
type: "bi.flex_vertical_adapt",
cls: "flex-left-auto",
hgap: o.rhgap,
vgap: o.rvgap,
lgap: o.rlgap,
rgap: o.rrgap,
tgap: o.rtgap,
bgap: o.rbgap,
items: rightItems
}
});
},
@ -17647,6 +17637,7 @@ BI.HTapeLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.HTapeLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-h-tape",
verticalAlign: BI.VerticalAlign.Top,
hgap: 0,
vgap: 0,
lgap: 0,
@ -17684,6 +17675,16 @@ BI.HTapeLayout = BI.inherit(BI.Layout, {
top: ((item.vgap || 0) + (item.tgap || 0) + o.vgap + o.tgap) / BI.pixRatio + BI.pixUnit,
bottom: ((item.bgap || 0) + (item.vgap || 0) + o.vgap + o.bgap) / BI.pixRatio + BI.pixUnit
});
if (o.verticalAlign === BI.VerticalAlign.Middle) {
w.element.css({
marginTop: "auto",
marginBottom: "auto"
});
} else if (o.verticalAlign === BI.VerticalAlign.Bottom) {
w.element.css({
marginTop: "auto"
});
}
});
var left = {}, right = {};
@ -17750,6 +17751,7 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.VTapeLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-v-tape-layout",
horizontalAlign: BI.HorizontalAlign.Left,
hgap: 0,
vgap: 0,
lgap: 0,
@ -17788,6 +17790,16 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
left: ((item.lgap || 0) + (item.hgap || 0) + o.hgap + o.lgap) / BI.pixRatio + BI.pixUnit,
right: +((item.hgap || 0) + (item.rgap || 0) + o.hgap + o.rgap) / BI.pixRatio + BI.pixUnit
});
if (o.horizontalAlign === BI.HorizontalAlign.Center) {
w.element.css({
marginLeft: "auto",
marginRight: "auto"
});
} else if (o.horizontalAlign === BI.HorizontalAlign.Right) {
w.element.css({
marginLeft: "auto"
});
}
});
var top = {}, bottom = {};
@ -17817,7 +17829,10 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
bottom[i] = bottom[i + 1] + items[i + 1].height + (items[i + 1].bgap || 0) + 2 * (items[i + 1].vgap || 0) + o.vgap + o.tgap + o.bgap;
}
if (item.height < 1 && item.height >= 0) {
w.element.css({bottom: (bottom[i] * 100).toFixed(1) + "%", height: (item.height * 100).toFixed(1) + "%"});
w.element.css({
bottom: (bottom[i] * 100).toFixed(1) + "%",
height: (item.height * 100).toFixed(1) + "%"
});
} else {
w.element.css({
bottom: (bottom[i] + (item.vgap || 0) + (item.bgap || 0) + o.vgap + o.bgap) / BI.pixRatio + BI.pixUnit,
@ -18014,6 +18029,7 @@ BI.VerticalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.VerticalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-v",
horizontalAlign: BI.HorizontalAlign.Stretch,
hgap: 0,
vgap: 0,
lgap: 0,
@ -18054,6 +18070,16 @@ BI.VerticalLayout = BI.inherit(BI.Layout, {
"margin-bottom": (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0)) / BI.pixRatio + BI.pixUnit
});
}
if (o.horizontalAlign === BI.HorizontalAlign.Center) {
w.element.css({
marginLeft: "auto",
marginRight: "auto"
});
} else if (o.horizontalAlign === BI.HorizontalAlign.Right) {
w.element.css({
marginLeft: "auto"
});
}
return w;
},
@ -38542,7 +38568,6 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
type: "bi.label",
height: o.height,
text: BI.i18nText("BI-Tiao_Data"),
width: 40,
textAlign: "left"
}, BI.isNotEmptyObject(o.rowInfoObject) ? o.rowInfoObject : null]
};

2
dist/fineui.proxy.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.proxy.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.proxy.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.proxy.min.js.map vendored

File diff suppressed because one or more lines are too long

73
dist/fineui_without_jquery_polyfill.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-6-4 5:10:18 PM */
/*! time: 2021-6-7 3:40:35 PM */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -15201,28 +15201,18 @@ BI.FlexLeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
}
return json;
});
rightItems = BI.map(rightItems, function (i, item) {
var json = {
el: BI.stripEL(item)
};
if (o.rvgap + o.rtgap + (item.tgap || 0) + (item.vgap || 0) !== 0) {
json.tgap = o.rvgap + o.rtgap + (item.tgap || 0) + (item.vgap || 0);
}
if (o.rhgap + o.rlgap + (item.lgap || 0) + (item.hgap || 0) !== 0) {
json.lgap = o.rlgap + (item.lgap || 0) + (item.hgap || 0);
}
if (o.rhgap + o.rrgap + (item.rgap || 0) + (item.hgap || 0) !== 0) {
json.rgap = o.rhgap + o.rrgap + (item.rgap || 0) + (item.hgap || 0);
}
if (o.rvgap + o.rbgap + (item.bgap || 0) + (item.vgap || 0) !== 0) {
json.bgap = o.rvgap + o.rbgap + (item.bgap || 0) + (item.vgap || 0);
}
return json;
});
return leftItems.concat({
type: "bi.flex_vertical_adapt",
cls: "flex-left-auto",
items: rightItems
el: {
type: "bi.flex_vertical_adapt",
cls: "flex-left-auto",
hgap: o.rhgap,
vgap: o.rvgap,
lgap: o.rlgap,
rgap: o.rrgap,
tgap: o.rtgap,
bgap: o.rbgap,
items: rightItems
}
});
},
@ -17257,6 +17247,7 @@ BI.HTapeLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.HTapeLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-h-tape",
verticalAlign: BI.VerticalAlign.Top,
hgap: 0,
vgap: 0,
lgap: 0,
@ -17294,6 +17285,16 @@ BI.HTapeLayout = BI.inherit(BI.Layout, {
top: ((item.vgap || 0) + (item.tgap || 0) + o.vgap + o.tgap) / BI.pixRatio + BI.pixUnit,
bottom: ((item.bgap || 0) + (item.vgap || 0) + o.vgap + o.bgap) / BI.pixRatio + BI.pixUnit
});
if (o.verticalAlign === BI.VerticalAlign.Middle) {
w.element.css({
marginTop: "auto",
marginBottom: "auto"
});
} else if (o.verticalAlign === BI.VerticalAlign.Bottom) {
w.element.css({
marginTop: "auto"
});
}
});
var left = {}, right = {};
@ -17360,6 +17361,7 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.VTapeLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-v-tape-layout",
horizontalAlign: BI.HorizontalAlign.Left,
hgap: 0,
vgap: 0,
lgap: 0,
@ -17398,6 +17400,16 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
left: ((item.lgap || 0) + (item.hgap || 0) + o.hgap + o.lgap) / BI.pixRatio + BI.pixUnit,
right: +((item.hgap || 0) + (item.rgap || 0) + o.hgap + o.rgap) / BI.pixRatio + BI.pixUnit
});
if (o.horizontalAlign === BI.HorizontalAlign.Center) {
w.element.css({
marginLeft: "auto",
marginRight: "auto"
});
} else if (o.horizontalAlign === BI.HorizontalAlign.Right) {
w.element.css({
marginLeft: "auto"
});
}
});
var top = {}, bottom = {};
@ -17427,7 +17439,10 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
bottom[i] = bottom[i + 1] + items[i + 1].height + (items[i + 1].bgap || 0) + 2 * (items[i + 1].vgap || 0) + o.vgap + o.tgap + o.bgap;
}
if (item.height < 1 && item.height >= 0) {
w.element.css({bottom: (bottom[i] * 100).toFixed(1) + "%", height: (item.height * 100).toFixed(1) + "%"});
w.element.css({
bottom: (bottom[i] * 100).toFixed(1) + "%",
height: (item.height * 100).toFixed(1) + "%"
});
} else {
w.element.css({
bottom: (bottom[i] + (item.vgap || 0) + (item.bgap || 0) + o.vgap + o.bgap) / BI.pixRatio + BI.pixUnit,
@ -17624,6 +17639,7 @@ BI.VerticalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.VerticalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-v",
horizontalAlign: BI.HorizontalAlign.Stretch,
hgap: 0,
vgap: 0,
lgap: 0,
@ -17664,6 +17680,16 @@ BI.VerticalLayout = BI.inherit(BI.Layout, {
"margin-bottom": (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0)) / BI.pixRatio + BI.pixUnit
});
}
if (o.horizontalAlign === BI.HorizontalAlign.Center) {
w.element.css({
marginLeft: "auto",
marginRight: "auto"
});
} else if (o.horizontalAlign === BI.HorizontalAlign.Right) {
w.element.css({
marginLeft: "auto"
});
}
return w;
},
@ -38152,7 +38178,6 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
type: "bi.label",
height: o.height,
text: BI.i18nText("BI-Tiao_Data"),
width: 40,
textAlign: "left"
}, BI.isNotEmptyObject(o.rowInfoObject) ? o.rowInfoObject : null]
};

2
dist/fineui_without_jquery_polyfill.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/font.css vendored

File diff suppressed because one or more lines are too long

2
dist/lib/core/base.d.ts vendored

@ -138,7 +138,7 @@ export interface _base {
deepExtend: merge['deepExtend'];
isDeepMatch: (object: any, attrs: any) => boolean;
contains: (obj: any[], target: any, fromIndex?: number) => boolean;
deepContains: (obj: any[], copy: any) => number;
deepContains: (obj: any[], copy: any) => boolean;
deepIndexOf: (obj: any[], target: any) => number;
deepRemove: (obj: any[], target: any) => boolean;
deepWithout: (obj: any[], target: any) => any[];

2
dist/resource.css vendored

File diff suppressed because one or more lines are too long

2
dist/utils.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-6-4 5:10:18 PM */
/*! time: 2021-6-7 3:40:35 PM */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

2
package.json

@ -1,6 +1,6 @@
{
"name": "fineui",
"version": "2.0.20210604171127",
"version": "2.0.20210607154204",
"description": "fineui",
"main": "dist/fineui.min.js",
"types": "dist/lib/index.d.ts",

1
src/case/pager/pager.all.count.js

@ -158,7 +158,6 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
type: "bi.label",
height: o.height,
text: BI.i18nText("BI-Tiao_Data"),
width: 40,
textAlign: "left"
}, BI.isNotEmptyObject(o.rowInfoObject) ? o.rowInfoObject : null]
};

32
src/core/wrapper/layout/flex/flex.leftrightvertical.center.js

@ -54,28 +54,18 @@ BI.FlexLeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
}
return json;
});
rightItems = BI.map(rightItems, function (i, item) {
var json = {
el: BI.stripEL(item)
};
if (o.rvgap + o.rtgap + (item.tgap || 0) + (item.vgap || 0) !== 0) {
json.tgap = o.rvgap + o.rtgap + (item.tgap || 0) + (item.vgap || 0);
}
if (o.rhgap + o.rlgap + (item.lgap || 0) + (item.hgap || 0) !== 0) {
json.lgap = o.rlgap + (item.lgap || 0) + (item.hgap || 0);
}
if (o.rhgap + o.rrgap + (item.rgap || 0) + (item.hgap || 0) !== 0) {
json.rgap = o.rhgap + o.rrgap + (item.rgap || 0) + (item.hgap || 0);
}
if (o.rvgap + o.rbgap + (item.bgap || 0) + (item.vgap || 0) !== 0) {
json.bgap = o.rvgap + o.rbgap + (item.bgap || 0) + (item.vgap || 0);
}
return json;
});
return leftItems.concat({
type: "bi.flex_vertical_adapt",
cls: "flex-left-auto",
items: rightItems
el: {
type: "bi.flex_vertical_adapt",
cls: "flex-left-auto",
hgap: o.rhgap,
vgap: o.rvgap,
lgap: o.rlgap,
rgap: o.rrgap,
tgap: o.rtgap,
bgap: o.rbgap,
items: rightItems
}
});
},

27
src/core/wrapper/layout/layout.tape.js

@ -7,6 +7,7 @@ BI.HTapeLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.HTapeLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-h-tape",
verticalAlign: BI.VerticalAlign.Top,
hgap: 0,
vgap: 0,
lgap: 0,
@ -44,6 +45,16 @@ BI.HTapeLayout = BI.inherit(BI.Layout, {
top: ((item.vgap || 0) + (item.tgap || 0) + o.vgap + o.tgap) / BI.pixRatio + BI.pixUnit,
bottom: ((item.bgap || 0) + (item.vgap || 0) + o.vgap + o.bgap) / BI.pixRatio + BI.pixUnit
});
if (o.verticalAlign === BI.VerticalAlign.Middle) {
w.element.css({
marginTop: "auto",
marginBottom: "auto"
});
} else if (o.verticalAlign === BI.VerticalAlign.Bottom) {
w.element.css({
marginTop: "auto"
});
}
});
var left = {}, right = {};
@ -110,6 +121,7 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.VTapeLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-v-tape-layout",
horizontalAlign: BI.HorizontalAlign.Left,
hgap: 0,
vgap: 0,
lgap: 0,
@ -148,6 +160,16 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
left: ((item.lgap || 0) + (item.hgap || 0) + o.hgap + o.lgap) / BI.pixRatio + BI.pixUnit,
right: +((item.hgap || 0) + (item.rgap || 0) + o.hgap + o.rgap) / BI.pixRatio + BI.pixUnit
});
if (o.horizontalAlign === BI.HorizontalAlign.Center) {
w.element.css({
marginLeft: "auto",
marginRight: "auto"
});
} else if (o.horizontalAlign === BI.HorizontalAlign.Right) {
w.element.css({
marginLeft: "auto"
});
}
});
var top = {}, bottom = {};
@ -177,7 +199,10 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
bottom[i] = bottom[i + 1] + items[i + 1].height + (items[i + 1].bgap || 0) + 2 * (items[i + 1].vgap || 0) + o.vgap + o.tgap + o.bgap;
}
if (item.height < 1 && item.height >= 0) {
w.element.css({bottom: (bottom[i] * 100).toFixed(1) + "%", height: (item.height * 100).toFixed(1) + "%"});
w.element.css({
bottom: (bottom[i] * 100).toFixed(1) + "%",
height: (item.height * 100).toFixed(1) + "%"
});
} else {
w.element.css({
bottom: (bottom[i] + (item.vgap || 0) + (item.bgap || 0) + o.vgap + o.bgap) / BI.pixRatio + BI.pixUnit,

11
src/core/wrapper/layout/layout.vertical.js

@ -7,6 +7,7 @@ BI.VerticalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.VerticalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-v",
horizontalAlign: BI.HorizontalAlign.Stretch,
hgap: 0,
vgap: 0,
lgap: 0,
@ -47,6 +48,16 @@ BI.VerticalLayout = BI.inherit(BI.Layout, {
"margin-bottom": (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0)) / BI.pixRatio + BI.pixUnit
});
}
if (o.horizontalAlign === BI.HorizontalAlign.Center) {
w.element.css({
marginLeft: "auto",
marginRight: "auto"
});
} else if (o.horizontalAlign === BI.HorizontalAlign.Right) {
w.element.css({
marginLeft: "auto"
});
}
return w;
},

2
typescript/core/base.ts

@ -269,7 +269,7 @@ export interface _base {
contains: (obj: any[], target: any, fromIndex?: number) => boolean;
deepContains: (obj: any[], copy: any) => number;
deepContains: (obj: any[], copy: any) => boolean;
deepIndexOf: (obj: any[], target: any) => number;

Loading…
Cancel
Save