diff --git a/dist/font/iconfont.eot b/dist/font/iconfont.eot
index 0ec02a8f4..6cd1f1cf2 100644
Binary files a/dist/font/iconfont.eot and b/dist/font/iconfont.eot differ
diff --git a/dist/font/iconfont.svg b/dist/font/iconfont.svg
index 04d4186a9..c70fa76fe 100644
--- a/dist/font/iconfont.svg
+++ b/dist/font/iconfont.svg
@@ -14,6 +14,36 @@
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -24,9 +54,9 @@
-
+
-
+
@@ -38,7 +68,7 @@
-
+
@@ -48,7 +78,7 @@
-
+
@@ -198,7 +228,7 @@
-
+
@@ -252,12 +282,6 @@
-
-
-
-
-
-
@@ -286,9 +310,9 @@
-
+
-
+
@@ -302,29 +326,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -532,7 +538,7 @@
-
+
@@ -594,7 +600,7 @@
-
+
@@ -606,7 +612,7 @@
-
+
@@ -618,7 +624,7 @@
-
+
@@ -626,7 +632,7 @@
-
+
@@ -636,19 +642,19 @@
-
+
-
+
-
+
@@ -660,7 +666,7 @@
-
+
@@ -678,7 +684,7 @@
-
+
@@ -690,7 +696,7 @@
-
+
@@ -780,7 +786,7 @@
-
+
@@ -804,23 +810,23 @@
-
+
-
+
-
+
-
+
@@ -864,13 +870,13 @@
-
+
-
+
@@ -892,13 +898,13 @@
-
+
-
+
@@ -916,7 +922,7 @@
-
+
@@ -992,7 +998,7 @@
-
+
@@ -1016,7 +1022,7 @@
-
+
@@ -1056,7 +1062,7 @@
-
+
@@ -1128,13 +1134,13 @@
-
+
-
+
-
+
@@ -1148,7 +1154,7 @@
-
+
@@ -1208,7 +1214,7 @@
-
+
@@ -1294,7 +1300,7 @@
-
+
@@ -1374,7 +1380,7 @@
-
+
@@ -1404,13 +1410,13 @@
-
+
-
+
@@ -1464,19 +1470,19 @@
-
+
-
+
-
+
@@ -1490,7 +1496,7 @@
-
+
@@ -1514,7 +1520,7 @@
-
+
@@ -1544,7 +1550,7 @@
-
+
@@ -1552,11 +1558,11 @@
-
+
-
+
@@ -1580,19 +1586,19 @@
-
+
-
+
-
+
-
+
@@ -1604,15 +1610,15 @@
-
+
-
+
-
+
-
+
@@ -1634,19 +1640,19 @@
-
+
-
+
-
+
-
+
@@ -1694,7 +1700,7 @@
-
+
@@ -1710,15 +1716,15 @@
-
+
-
+
-
+
@@ -1742,7 +1748,7 @@
-
+
@@ -1762,7 +1768,7 @@
-
+
@@ -1782,15 +1788,15 @@
-
+
-
+
-
+
@@ -1798,11 +1804,11 @@
-
+
-
+
diff --git a/dist/font/iconfont.ttf b/dist/font/iconfont.ttf
index 1ae8e4a9d..76debf9d2 100644
Binary files a/dist/font/iconfont.ttf and b/dist/font/iconfont.ttf differ
diff --git a/dist/font/iconfont.woff b/dist/font/iconfont.woff
index 2e41e5dc5..ea016fed7 100644
Binary files a/dist/font/iconfont.woff and b/dist/font/iconfont.woff differ
diff --git a/dist/font/iconfont.woff2 b/dist/font/iconfont.woff2
index 2fbd0e5b9..1d6e0c461 100644
Binary files a/dist/font/iconfont.woff2 and b/dist/font/iconfont.woff2 differ
diff --git a/package.json b/package.json
index 3e5b923c5..85af8a7fd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "fineui",
- "version": "2.0.20220614170402",
+ "version": "2.0.20220615202341",
"description": "fineui",
"main": "dist/fineui.min.js",
"types": "dist/lib/index.d.ts",
diff --git a/src/core/wrapper/layout/flex/flex.horizontal.js b/src/core/wrapper/layout/flex/flex.horizontal.js
index 7d53dfe0e..75326335b 100644
--- a/src/core/wrapper/layout/flex/flex.horizontal.js
+++ b/src/core/wrapper/layout/flex/flex.horizontal.js
@@ -82,6 +82,9 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
if (columnSize === "fill") {
w.element.addClass("f-f");
}
+ if (columnSize === "" || columnSize === "auto") {
+ w.element.addClass("f-auto");
+ }
w.element.addClass("c-e");
if (i === 0) {
w.element.addClass("f-c");
diff --git a/src/core/wrapper/layout/flex/flex.leftrightvertical.center.js b/src/core/wrapper/layout/flex/flex.leftrightvertical.center.js
index 01a462707..b52b1e456 100644
--- a/src/core/wrapper/layout/flex/flex.leftrightvertical.center.js
+++ b/src/core/wrapper/layout/flex/flex.leftrightvertical.center.js
@@ -2,6 +2,7 @@ BI.FlexLeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexLeftRightVerticalAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-f-lr-v-c",
+ columnSize: [],
items: {},
llgap: 0,
lrgap: 0,
@@ -20,17 +21,19 @@ BI.FlexLeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
render: function () {
var o = this.options, self = this;
BI.FlexLeftRightVerticalAdaptLayout.superclass.render.apply(this, arguments);
+ var items = this._formatItems(o.items);
return {
type: "bi.flex_vertical_adapt",
ref: function (_ref) {
self.layout = _ref;
},
- items: this._formatItems(o.items),
+ columnSize: o.columnSize.slice(0, (o.items.left || []).length).concat((o.items.right || []).length > 0 ? [""] : []),
+ items: items,
scrollx: o.scrollx,
scrolly: o.scrolly,
scrollable: o.scrollable,
innerHgap: o.innerHgap,
- innerVgap: o.innerVgap,
+ innerVgap: o.innerVgap
};
},
@@ -70,6 +73,7 @@ BI.FlexLeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
return leftItems.concat({
el: {
type: "bi.flex_vertical_adapt",
+ columnSize: o.columnSize.slice(leftItems.length),
css: {
"margin-left": "auto"
},
diff --git a/src/core/wrapper/layout/flex/flex.vertical.js b/src/core/wrapper/layout/flex/flex.vertical.js
index 46b175e9b..1c56586cc 100644
--- a/src/core/wrapper/layout/flex/flex.vertical.js
+++ b/src/core/wrapper/layout/flex/flex.vertical.js
@@ -81,6 +81,9 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
if (rowSize === "fill") {
w.element.addClass("f-f");
}
+ if (rowSize === "" || rowSize === "auto") {
+ w.element.addClass("f-auto");
+ }
w.element.addClass("c-e");
if (i === 0) {
w.element.addClass("f-c");
diff --git a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js
index 8c803abaa..fa90b0543 100644
--- a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js
+++ b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js
@@ -79,6 +79,10 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
w.element.addClass("f-f");
this.element.addClass("f-f");
}
+ if (columnSize === "" || columnSize === "auto") {
+ w.element.addClass("f-auto");
+ this.element.addClass("f-auto");
+ }
w.element.addClass("c-e");
if (i === 0) {
w.element.addClass("f-c");
diff --git a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js
index 33609e717..76beeb601 100644
--- a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js
+++ b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js
@@ -79,6 +79,10 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
w.element.addClass("f-f");
this.element.addClass("f-f");
}
+ if (rowSize === "" || rowSize === "auto") {
+ w.element.addClass("f-auto");
+ this.element.addClass("f-auto");
+ }
w.element.addClass("c-e");
if (i === 0) {
w.element.addClass("f-c");
diff --git a/src/less/core/wrapper/flex.horizontal.less b/src/less/core/wrapper/flex.horizontal.less
index 606e929d5..1ae9458c5 100644
--- a/src/less/core/wrapper/flex.horizontal.less
+++ b/src/less/core/wrapper/flex.horizontal.less
@@ -183,4 +183,10 @@
-ms-flex-shrink: 1;
flex-shrink: 1;
}
+
+ > .f-auto {
+ &:not(.f-s-n) {
+ min-width: 1px;
+ }
+ }
}
diff --git a/src/less/core/wrapper/flex.vertical.less b/src/less/core/wrapper/flex.vertical.less
index 8124422b3..3d1b23d50 100644
--- a/src/less/core/wrapper/flex.vertical.less
+++ b/src/less/core/wrapper/flex.vertical.less
@@ -182,4 +182,10 @@
-ms-flex-shrink: 1;
flex-shrink: 1;
}
+
+ > .f-auto {
+ &:not(.f-s-n) {
+ min-width: 1px;
+ }
+ }
}
diff --git a/src/less/core/wrapper/flex.wrapper.horizontal.less b/src/less/core/wrapper/flex.wrapper.horizontal.less
index 70ae040d7..fedf8e853 100644
--- a/src/less/core/wrapper/flex.wrapper.horizontal.less
+++ b/src/less/core/wrapper/flex.wrapper.horizontal.less
@@ -279,5 +279,11 @@
-ms-flex-shrink: 1;
flex-shrink: 1;
}
+
+ > .f-auto {
+ &:not(.f-s-n) {
+ min-width: 1px;
+ }
+ }
}
}
diff --git a/src/less/core/wrapper/flex.wrapper.vertical.less b/src/less/core/wrapper/flex.wrapper.vertical.less
index 755289825..32200f498 100644
--- a/src/less/core/wrapper/flex.wrapper.vertical.less
+++ b/src/less/core/wrapper/flex.wrapper.vertical.less
@@ -273,5 +273,11 @@
-ms-flex-shrink: 1;
flex-shrink: 1;
}
+
+ > .f-auto {
+ &:not(.f-s-n) {
+ min-width: 1px;
+ }
+ }
}
}
diff --git a/src/widget/downlist/popup.downlist.js b/src/widget/downlist/popup.downlist.js
index 35d395334..0e802a695 100644
--- a/src/widget/downlist/popup.downlist.js
+++ b/src/widget/downlist/popup.downlist.js
@@ -153,8 +153,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}],
cls: "bi-down-list-spliter-container cursor-pointer",
vgap: 5,
- lgap: 10,
- rgap: 0
+ hgap: 12
});
result.push(spliter_container);
}
diff --git a/src/widget/dynamicdatetime/dynamicdatetime.combo.js b/src/widget/dynamicdatetime/dynamicdatetime.combo.js
index 41df2ac41..176eff1ae 100644
--- a/src/widget/dynamicdatetime/dynamicdatetime.combo.js
+++ b/src/widget/dynamicdatetime/dynamicdatetime.combo.js
@@ -125,6 +125,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
}, {
eventName: BI.DynamicDateTimeTrigger.EVENT_VALID,
action: function () {
+ self.storeValue = self.trigger.getValue();
self.combo.element.removeClass("error");
self.fireEvent(BI.DynamicDateTimeCombo.EVENT_VALID);
}
diff --git a/src/widget/multilayerdownlist/popup.downlist.js b/src/widget/multilayerdownlist/popup.downlist.js
index fa222005d..7483349de 100644
--- a/src/widget/multilayerdownlist/popup.downlist.js
+++ b/src/widget/multilayerdownlist/popup.downlist.js
@@ -150,7 +150,7 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, {
}],
cls: "bi-down-list-spliter-container cursor-pointer",
vgap: 5,
- lgap: 10
+ hgap: 12,
});
result.push(spliter_container);
}
diff --git a/src/widget/numberinterval/numberinterval.js b/src/widget/numberinterval/numberinterval.js
index 88b640130..9fb76367f 100644
--- a/src/widget/numberinterval/numberinterval.js
+++ b/src/widget/numberinterval/numberinterval.js
@@ -55,7 +55,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
}
return true;
},
- cls: "number-interval-small-editor " + (o.simple ? "bi-border-bottom" : "bi-border bi-border-corner-left-radius")
+ cls: "number-interval-small-editor bi-focus-shadow " + (o.simple ? "bi-border-bottom" : "bi-border bi-border-corner-left-radius")
});
this.smallTip = BI.createWidget({
@@ -93,7 +93,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
}
return true;
},
- cls: "number-interval-big-editor" + (o.simple ? " bi-border-bottom" : " bi-border bi-border-corner-right-radius")
+ cls: "number-interval-big-editor bi-focus-shadow" + (o.simple ? " bi-border-bottom" : " bi-border bi-border-corner-right-radius")
});
this.bigTip = BI.createWidget({