Browse Source

Merge branch 'master' of ssh://code.fineres.com:7999/~dailer/fineui

es6
dailer 3 years ago
parent
commit
f49a860346
  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. 70
      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. 70
      dist/core.js
  13. 2
      dist/core.js.map
  14. 2
      dist/demo.css
  15. 70
      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. 70
      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. 70
      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. 70
      dist/fineui_without_jquery_polyfill.js
  32. 2
      dist/fineui_without_jquery_polyfill.js.map
  33. 2
      dist/font.css
  34. 2
      dist/resource.css
  35. 2
      dist/utils.js
  36. 2
      dist/utils.min.js
  37. 2
      package.json
  38. 10
      src/core/wrapper/layout/adapt/adapt.table.js
  39. 14
      src/core/wrapper/layout/flex/flex.horizontal.js
  40. 14
      src/core/wrapper/layout/flex/flex.vertical.js
  41. 14
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js
  42. 14
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js

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

70
dist/2.0/fineui.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-8-24 21:21:01 */
/*! time: 2021-8-25 11:30:29 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -20592,11 +20592,6 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
if (!this.hasWidget(this._getChildName(i))) {
var w = BI._lazyCreateWidget(item);
w.element.css({position: "relative", top: "0", left: "0", margin: "0px auto"});
if (o.verticalAlign === BI.VerticalAlign.Stretch) {
var top = o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0),
bottom = o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0);
w.element.css("height", "calc(100% - " + ((top + bottom) / BI.pixRatio + BI.pixUnit) + ")");
}
td = BI._lazyCreateWidget({
type: "bi.default",
width: width,
@ -20607,6 +20602,11 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
td = this.getWidgetByName(this._getChildName(i));
td.element.width(width);
}
if (o.verticalAlign === BI.VerticalAlign.Stretch) {
var top = o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0),
bottom = o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0);
w.element.css("height", "calc(100% - " + ((top + bottom) / BI.pixRatio + BI.pixUnit) + ")");
}
// 对于表现为td的元素设置最大宽度,有几点需要注意
// 1、由于直接对td设置最大宽度是在规范中未定义的, 所以要使用类似td:firstChild来迂回实现
// 2、不能给多个td设置最大宽度,这样只会平分宽度
@ -21260,6 +21260,18 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.columnSize.length > 0) {
return o.columnSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.width === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexHorizontalLayout.superclass._addElement.apply(this, arguments);
@ -21280,7 +21292,7 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (columnSize === "" && o.columnSize.indexOf("fill") >= 0) {
if (columnSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {
@ -21505,6 +21517,18 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.rowSize.length > 0) {
return o.rowSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.height === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexVerticalLayout.superclass._addElement.apply(this, arguments);
@ -21525,7 +21549,7 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (rowSize === "" && o.rowSize.indexOf("fill") >= 0) {
if (rowSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {
@ -21716,6 +21740,18 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.columnSize.length > 0) {
return o.columnSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.width === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexWrapperHorizontalLayout.superclass._addElement.apply(this, arguments);
@ -21736,7 +21772,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (columnSize === "" && o.columnSize.indexOf("fill") >= 0) {
if (columnSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {
@ -21876,6 +21912,18 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.rowSize.length > 0) {
return o.rowSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.height === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexWrapperVerticalLayout.superclass._addElement.apply(this, arguments);
@ -21896,7 +21944,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (rowSize === "" && o.rowSize.indexOf("fill") >= 0) {
if (rowSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {
@ -64292,7 +64340,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
var names = BI.Func.getSortedResult(BI.keys(value));
BI.each(names, function (idx, name) {
var childNodes = getChildrenNode(value[name]);
text += (name === "null" ? "" : (o.valueFormatter(name + "") || name)) + (childNodes === "" ? "" : (":" + childNodes)) + "; ";
text += (name === "null" ? "" : (o.valueFormatter(name + "") || name)) + (childNodes === "" ? (BI.isEmptyObject(value[name]) ? "" : ":") : (":" + childNodes)) + "; ";
if (childNodes === "") {
count++;
}

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

70
dist/core.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-8-24 21:21:01 */
/*! time: 2021-8-25 11:30:29 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -20592,11 +20592,6 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
if (!this.hasWidget(this._getChildName(i))) {
var w = BI._lazyCreateWidget(item);
w.element.css({position: "relative", top: "0", left: "0", margin: "0px auto"});
if (o.verticalAlign === BI.VerticalAlign.Stretch) {
var top = o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0),
bottom = o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0);
w.element.css("height", "calc(100% - " + ((top + bottom) / BI.pixRatio + BI.pixUnit) + ")");
}
td = BI._lazyCreateWidget({
type: "bi.default",
width: width,
@ -20607,6 +20602,11 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
td = this.getWidgetByName(this._getChildName(i));
td.element.width(width);
}
if (o.verticalAlign === BI.VerticalAlign.Stretch) {
var top = o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0),
bottom = o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0);
w.element.css("height", "calc(100% - " + ((top + bottom) / BI.pixRatio + BI.pixUnit) + ")");
}
// 对于表现为td的元素设置最大宽度,有几点需要注意
// 1、由于直接对td设置最大宽度是在规范中未定义的, 所以要使用类似td:firstChild来迂回实现
// 2、不能给多个td设置最大宽度,这样只会平分宽度
@ -21260,6 +21260,18 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.columnSize.length > 0) {
return o.columnSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.width === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexHorizontalLayout.superclass._addElement.apply(this, arguments);
@ -21280,7 +21292,7 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (columnSize === "" && o.columnSize.indexOf("fill") >= 0) {
if (columnSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {
@ -21505,6 +21517,18 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.rowSize.length > 0) {
return o.rowSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.height === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexVerticalLayout.superclass._addElement.apply(this, arguments);
@ -21525,7 +21549,7 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (rowSize === "" && o.rowSize.indexOf("fill") >= 0) {
if (rowSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {
@ -21716,6 +21740,18 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.columnSize.length > 0) {
return o.columnSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.width === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexWrapperHorizontalLayout.superclass._addElement.apply(this, arguments);
@ -21736,7 +21772,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (columnSize === "" && o.columnSize.indexOf("fill") >= 0) {
if (columnSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {
@ -21876,6 +21912,18 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.rowSize.length > 0) {
return o.rowSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.height === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexWrapperVerticalLayout.superclass._addElement.apply(this, arguments);
@ -21896,7 +21944,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (rowSize === "" && o.rowSize.indexOf("fill") >= 0) {
if (rowSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {
@ -64292,7 +64340,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
var names = BI.Func.getSortedResult(BI.keys(value));
BI.each(names, function (idx, name) {
var childNodes = getChildrenNode(value[name]);
text += (name === "null" ? "" : (o.valueFormatter(name + "") || name)) + (childNodes === "" ? "" : (":" + childNodes)) + "; ";
text += (name === "null" ? "" : (o.valueFormatter(name + "") || name)) + (childNodes === "" ? (BI.isEmptyObject(value[name]) ? "" : ":") : (":" + childNodes)) + "; ";
if (childNodes === "") {
count++;
}

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

70
dist/demo.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-8-24 21:21:01 */
/*! time: 2021-8-25 11:30:29 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -20592,11 +20592,6 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
if (!this.hasWidget(this._getChildName(i))) {
var w = BI._lazyCreateWidget(item);
w.element.css({position: "relative", top: "0", left: "0", margin: "0px auto"});
if (o.verticalAlign === BI.VerticalAlign.Stretch) {
var top = o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0),
bottom = o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0);
w.element.css("height", "calc(100% - " + ((top + bottom) / BI.pixRatio + BI.pixUnit) + ")");
}
td = BI._lazyCreateWidget({
type: "bi.default",
width: width,
@ -20607,6 +20602,11 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
td = this.getWidgetByName(this._getChildName(i));
td.element.width(width);
}
if (o.verticalAlign === BI.VerticalAlign.Stretch) {
var top = o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0),
bottom = o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0);
w.element.css("height", "calc(100% - " + ((top + bottom) / BI.pixRatio + BI.pixUnit) + ")");
}
// 对于表现为td的元素设置最大宽度,有几点需要注意
// 1、由于直接对td设置最大宽度是在规范中未定义的, 所以要使用类似td:firstChild来迂回实现
// 2、不能给多个td设置最大宽度,这样只会平分宽度
@ -21260,6 +21260,18 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.columnSize.length > 0) {
return o.columnSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.width === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexHorizontalLayout.superclass._addElement.apply(this, arguments);
@ -21280,7 +21292,7 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (columnSize === "" && o.columnSize.indexOf("fill") >= 0) {
if (columnSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {
@ -21505,6 +21517,18 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.rowSize.length > 0) {
return o.rowSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.height === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexVerticalLayout.superclass._addElement.apply(this, arguments);
@ -21525,7 +21549,7 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (rowSize === "" && o.rowSize.indexOf("fill") >= 0) {
if (rowSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {
@ -21716,6 +21740,18 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.columnSize.length > 0) {
return o.columnSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.width === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexWrapperHorizontalLayout.superclass._addElement.apply(this, arguments);
@ -21736,7 +21772,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (columnSize === "" && o.columnSize.indexOf("fill") >= 0) {
if (columnSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {
@ -21876,6 +21912,18 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.rowSize.length > 0) {
return o.rowSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.height === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexWrapperVerticalLayout.superclass._addElement.apply(this, arguments);
@ -21896,7 +21944,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (rowSize === "" && o.rowSize.indexOf("fill") >= 0) {
if (rowSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {
@ -64292,7 +64340,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
var names = BI.Func.getSortedResult(BI.keys(value));
BI.each(names, function (idx, name) {
var childNodes = getChildrenNode(value[name]);
text += (name === "null" ? "" : (o.valueFormatter(name + "") || name)) + (childNodes === "" ? "" : (":" + childNodes)) + "; ";
text += (name === "null" ? "" : (o.valueFormatter(name + "") || name)) + (childNodes === "" ? (BI.isEmptyObject(value[name]) ? "" : ":") : (":" + childNodes)) + "; ";
if (childNodes === "") {
count++;
}

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

70
dist/fineui.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-8-24 21:21:01 */
/*! time: 2021-8-25 11:30:29 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -20592,11 +20592,6 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
if (!this.hasWidget(this._getChildName(i))) {
var w = BI._lazyCreateWidget(item);
w.element.css({position: "relative", top: "0", left: "0", margin: "0px auto"});
if (o.verticalAlign === BI.VerticalAlign.Stretch) {
var top = o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0),
bottom = o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0);
w.element.css("height", "calc(100% - " + ((top + bottom) / BI.pixRatio + BI.pixUnit) + ")");
}
td = BI._lazyCreateWidget({
type: "bi.default",
width: width,
@ -20607,6 +20602,11 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
td = this.getWidgetByName(this._getChildName(i));
td.element.width(width);
}
if (o.verticalAlign === BI.VerticalAlign.Stretch) {
var top = o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0),
bottom = o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0);
w.element.css("height", "calc(100% - " + ((top + bottom) / BI.pixRatio + BI.pixUnit) + ")");
}
// 对于表现为td的元素设置最大宽度,有几点需要注意
// 1、由于直接对td设置最大宽度是在规范中未定义的, 所以要使用类似td:firstChild来迂回实现
// 2、不能给多个td设置最大宽度,这样只会平分宽度
@ -21260,6 +21260,18 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.columnSize.length > 0) {
return o.columnSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.width === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexHorizontalLayout.superclass._addElement.apply(this, arguments);
@ -21280,7 +21292,7 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (columnSize === "" && o.columnSize.indexOf("fill") >= 0) {
if (columnSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {
@ -21505,6 +21517,18 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.rowSize.length > 0) {
return o.rowSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.height === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexVerticalLayout.superclass._addElement.apply(this, arguments);
@ -21525,7 +21549,7 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (rowSize === "" && o.rowSize.indexOf("fill") >= 0) {
if (rowSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {
@ -21716,6 +21740,18 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.columnSize.length > 0) {
return o.columnSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.width === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexWrapperHorizontalLayout.superclass._addElement.apply(this, arguments);
@ -21736,7 +21772,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (columnSize === "" && o.columnSize.indexOf("fill") >= 0) {
if (columnSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {
@ -21876,6 +21912,18 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.rowSize.length > 0) {
return o.rowSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.height === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexWrapperVerticalLayout.superclass._addElement.apply(this, arguments);
@ -21896,7 +21944,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (rowSize === "" && o.rowSize.indexOf("fill") >= 0) {
if (rowSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {
@ -64292,7 +64340,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
var names = BI.Func.getSortedResult(BI.keys(value));
BI.each(names, function (idx, name) {
var childNodes = getChildrenNode(value[name]);
text += (name === "null" ? "" : (o.valueFormatter(name + "") || name)) + (childNodes === "" ? "" : (":" + childNodes)) + "; ";
text += (name === "null" ? "" : (o.valueFormatter(name + "") || name)) + (childNodes === "" ? (BI.isEmptyObject(value[name]) ? "" : ":") : (":" + childNodes)) + "; ";
if (childNodes === "") {
count++;
}

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

70
dist/fineui.proxy.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-8-24 21:21:01 */
/*! time: 2021-8-25 11:30:29 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -18053,11 +18053,6 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
if (!this.hasWidget(this._getChildName(i))) {
var w = BI._lazyCreateWidget(item);
w.element.css({position: "relative", top: "0", left: "0", margin: "0px auto"});
if (o.verticalAlign === BI.VerticalAlign.Stretch) {
var top = o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0),
bottom = o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0);
w.element.css("height", "calc(100% - " + ((top + bottom) / BI.pixRatio + BI.pixUnit) + ")");
}
td = BI._lazyCreateWidget({
type: "bi.default",
width: width,
@ -18068,6 +18063,11 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
td = this.getWidgetByName(this._getChildName(i));
td.element.width(width);
}
if (o.verticalAlign === BI.VerticalAlign.Stretch) {
var top = o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0),
bottom = o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0);
w.element.css("height", "calc(100% - " + ((top + bottom) / BI.pixRatio + BI.pixUnit) + ")");
}
// 对于表现为td的元素设置最大宽度,有几点需要注意
// 1、由于直接对td设置最大宽度是在规范中未定义的, 所以要使用类似td:firstChild来迂回实现
// 2、不能给多个td设置最大宽度,这样只会平分宽度
@ -18721,6 +18721,18 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.columnSize.length > 0) {
return o.columnSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.width === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexHorizontalLayout.superclass._addElement.apply(this, arguments);
@ -18741,7 +18753,7 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (columnSize === "" && o.columnSize.indexOf("fill") >= 0) {
if (columnSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {
@ -18966,6 +18978,18 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.rowSize.length > 0) {
return o.rowSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.height === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexVerticalLayout.superclass._addElement.apply(this, arguments);
@ -18986,7 +19010,7 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (rowSize === "" && o.rowSize.indexOf("fill") >= 0) {
if (rowSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {
@ -19177,6 +19201,18 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.columnSize.length > 0) {
return o.columnSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.width === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexWrapperHorizontalLayout.superclass._addElement.apply(this, arguments);
@ -19197,7 +19233,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (columnSize === "" && o.columnSize.indexOf("fill") >= 0) {
if (columnSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {
@ -19337,6 +19373,18 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.rowSize.length > 0) {
return o.rowSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.height === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexWrapperVerticalLayout.superclass._addElement.apply(this, arguments);
@ -19357,7 +19405,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (rowSize === "" && o.rowSize.indexOf("fill") >= 0) {
if (rowSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {
@ -61753,7 +61801,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
var names = BI.Func.getSortedResult(BI.keys(value));
BI.each(names, function (idx, name) {
var childNodes = getChildrenNode(value[name]);
text += (name === "null" ? "" : (o.valueFormatter(name + "") || name)) + (childNodes === "" ? "" : (":" + childNodes)) + "; ";
text += (name === "null" ? "" : (o.valueFormatter(name + "") || name)) + (childNodes === "" ? (BI.isEmptyObject(value[name]) ? "" : ":") : (":" + childNodes)) + "; ";
if (childNodes === "") {
count++;
}

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

70
dist/fineui_without_jquery_polyfill.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-8-24 21:21:01 */
/*! time: 2021-8-25 11:30:29 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -17668,11 +17668,6 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
if (!this.hasWidget(this._getChildName(i))) {
var w = BI._lazyCreateWidget(item);
w.element.css({position: "relative", top: "0", left: "0", margin: "0px auto"});
if (o.verticalAlign === BI.VerticalAlign.Stretch) {
var top = o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0),
bottom = o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0);
w.element.css("height", "calc(100% - " + ((top + bottom) / BI.pixRatio + BI.pixUnit) + ")");
}
td = BI._lazyCreateWidget({
type: "bi.default",
width: width,
@ -17683,6 +17678,11 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
td = this.getWidgetByName(this._getChildName(i));
td.element.width(width);
}
if (o.verticalAlign === BI.VerticalAlign.Stretch) {
var top = o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0),
bottom = o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0);
w.element.css("height", "calc(100% - " + ((top + bottom) / BI.pixRatio + BI.pixUnit) + ")");
}
// 对于表现为td的元素设置最大宽度,有几点需要注意
// 1、由于直接对td设置最大宽度是在规范中未定义的, 所以要使用类似td:firstChild来迂回实现
// 2、不能给多个td设置最大宽度,这样只会平分宽度
@ -18336,6 +18336,18 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.columnSize.length > 0) {
return o.columnSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.width === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexHorizontalLayout.superclass._addElement.apply(this, arguments);
@ -18356,7 +18368,7 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (columnSize === "" && o.columnSize.indexOf("fill") >= 0) {
if (columnSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {
@ -18581,6 +18593,18 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.rowSize.length > 0) {
return o.rowSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.height === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexVerticalLayout.superclass._addElement.apply(this, arguments);
@ -18601,7 +18625,7 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (rowSize === "" && o.rowSize.indexOf("fill") >= 0) {
if (rowSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {
@ -18792,6 +18816,18 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.columnSize.length > 0) {
return o.columnSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.width === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexWrapperHorizontalLayout.superclass._addElement.apply(this, arguments);
@ -18812,7 +18848,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (columnSize === "" && o.columnSize.indexOf("fill") >= 0) {
if (columnSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {
@ -18952,6 +18988,18 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.rowSize.length > 0) {
return o.rowSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.height === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexWrapperVerticalLayout.superclass._addElement.apply(this, arguments);
@ -18972,7 +19020,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (rowSize === "" && o.rowSize.indexOf("fill") >= 0) {
if (rowSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {
@ -61368,7 +61416,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
var names = BI.Func.getSortedResult(BI.keys(value));
BI.each(names, function (idx, name) {
var childNodes = getChildrenNode(value[name]);
text += (name === "null" ? "" : (o.valueFormatter(name + "") || name)) + (childNodes === "" ? "" : (":" + childNodes)) + "; ";
text += (name === "null" ? "" : (o.valueFormatter(name + "") || name)) + (childNodes === "" ? (BI.isEmptyObject(value[name]) ? "" : ":") : (":" + childNodes)) + "; ";
if (childNodes === "") {
count++;
}

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/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-8-24 21:21:01 */
/*! time: 2021-8-25 11:30:29 */
/******/ (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.20210824212236",
"version": "2.0.20210825113209",
"description": "fineui",
"main": "dist/fineui.min.js",
"types": "dist/lib/index.d.ts",

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

@ -58,11 +58,6 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
if (!this.hasWidget(this._getChildName(i))) {
var w = BI._lazyCreateWidget(item);
w.element.css({position: "relative", top: "0", left: "0", margin: "0px auto"});
if (o.verticalAlign === BI.VerticalAlign.Stretch) {
var top = o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0),
bottom = o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0);
w.element.css("height", "calc(100% - " + ((top + bottom) / BI.pixRatio + BI.pixUnit) + ")");
}
td = BI._lazyCreateWidget({
type: "bi.default",
width: width,
@ -73,6 +68,11 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
td = this.getWidgetByName(this._getChildName(i));
td.element.width(width);
}
if (o.verticalAlign === BI.VerticalAlign.Stretch) {
var top = o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0),
bottom = o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0);
w.element.css("height", "calc(100% - " + ((top + bottom) / BI.pixRatio + BI.pixUnit) + ")");
}
// 对于表现为td的元素设置最大宽度,有几点需要注意
// 1、由于直接对td设置最大宽度是在规范中未定义的, 所以要使用类似td:firstChild来迂回实现
// 2、不能给多个td设置最大宽度,这样只会平分宽度

14
src/core/wrapper/layout/flex/flex.horizontal.js

@ -34,6 +34,18 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.columnSize.length > 0) {
return o.columnSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.width === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexHorizontalLayout.superclass._addElement.apply(this, arguments);
@ -54,7 +66,7 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (columnSize === "" && o.columnSize.indexOf("fill") >= 0) {
if (columnSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {

14
src/core/wrapper/layout/flex/flex.vertical.js

@ -33,6 +33,18 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.rowSize.length > 0) {
return o.rowSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.height === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexVerticalLayout.superclass._addElement.apply(this, arguments);
@ -53,7 +65,7 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (rowSize === "" && o.rowSize.indexOf("fill") >= 0) {
if (rowSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {

14
src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js

@ -30,6 +30,18 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.columnSize.length > 0) {
return o.columnSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.width === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexWrapperHorizontalLayout.superclass._addElement.apply(this, arguments);
@ -50,7 +62,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (columnSize === "" && o.columnSize.indexOf("fill") >= 0) {
if (columnSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {

14
src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js

@ -30,6 +30,18 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
this.populate(this.options.items);
},
_hasFill: function () {
var o = this.options;
if (o.rowSize.length > 0) {
return o.rowSize.indexOf("fill") >= 0;
}
return BI.some(o.items, function (i, item) {
if (item.height === "fill") {
return true;
}
});
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexWrapperVerticalLayout.superclass._addElement.apply(this, arguments);
@ -50,7 +62,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (rowSize === "" && o.rowSize.indexOf("fill") >= 0) {
if (rowSize === "" && this._hasFill()) {
w.element.addClass("f-s-n");
}
} else {

Loading…
Cancel
Save