diff --git a/dist/font/iconfont.eot b/dist/font/iconfont.eot
index 015c39e65..ac0a97fe4 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 2205e4bc4..7fe826ad6 100644
--- a/dist/font/iconfont.svg
+++ b/dist/font/iconfont.svg
@@ -14,6 +14,12 @@
/>
+
+
+
+
+
+
@@ -1710,7 +1716,7 @@
-
+
diff --git a/dist/font/iconfont.ttf b/dist/font/iconfont.ttf
index 674d12bbe..ed9114ed8 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 77bcb44e4..fb9750bb1 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 379326119..dbb237c0f 100644
Binary files a/dist/font/iconfont.woff2 and b/dist/font/iconfont.woff2 differ
diff --git a/src/base/single/input/radio/radio.js b/src/base/single/input/radio/radio.js
index d842196ae..f84cf4038 100644
--- a/src/base/single/input/radio/radio.js
+++ b/src/base/single/input/radio/radio.js
@@ -9,10 +9,10 @@ BI.Radio = BI.inherit(BI.BasicButton, {
baseCls: "bi-radio",
selected: false,
handler: BI.emptyFn,
- width: 14,
- height: 14,
- iconWidth: 14,
- iconHeight: 14,
+ width: 16,
+ height: 16,
+ iconWidth: 16,
+ iconHeight: 16
},
render: function () {
diff --git a/src/case/combo/textvaluecombo/combo.textvalue.js b/src/case/combo/textvaluecombo/combo.textvalue.js
index dc39d1b1e..b9aaac2ba 100644
--- a/src/case/combo/textvaluecombo/combo.textvalue.js
+++ b/src/case/combo/textvaluecombo/combo.textvalue.js
@@ -14,7 +14,8 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
value: "",
defaultText: "",
allowClear: false,
- status: "success", // success | warning | error
+ status: "success", // success | warning | error,
+ title: null,
});
},
@@ -35,6 +36,21 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
const o = this.options;
+ const title = () => {
+ if (BI.isFunction(o.title)) {
+ return o.title();
+ }
+ if (this.options.status === "error") {
+ return {
+ level: "warning",
+ text: o.warningTitle,
+ };
+ }
+ return {
+ level: "success",
+ };
+ };
+
const trigger = {
type: "bi.select_text_trigger",
ref: ref => this.trigger = ref,
@@ -43,17 +59,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
height: o.height,
text: o.text,
value: o.value,
- title: () => {
- if (this.options.status === "error") {
- return {
- level: "warning",
- text: o.warningTitle,
- };
- }
- return {
- level: "success",
- };
- },
+ title,
allowClear: o.allowClear,
defaultText: o.defaultText,
listeners: [
diff --git a/src/less/base/single/input/radio.less b/src/less/base/single/input/radio.less
index 8e48818e7..0a3345e42 100644
--- a/src/less/base/single/input/radio.less
+++ b/src/less/base/single/input/radio.less
@@ -18,13 +18,13 @@
border-color: @color-bi-border-hover-active-radio;
background-color: @color-bi-background-active-radio;
&:after {
- width: 6px;
- height: 6px;
+ width: 8px;
+ height: 8px;
display: table;
position: absolute;
top: 50%;
left: 50%;
- .border-radius(3px);
+ .border-radius(4px);
background-color: @color-bi-background-active-radio-content;
.transform(translate(-50%, -50%));
@transition: all .1s cubic-bezier(.71,-.46,.88,.6),opacity .1s;
diff --git a/src/widget/multiselect/multiselect.loader.js b/src/widget/multiselect/multiselect.loader.js
index 7c45c68c1..2aa22aad5 100644
--- a/src/widget/multiselect/multiselect.loader.js
+++ b/src/widget/multiselect/multiselect.loader.js
@@ -20,6 +20,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
itemFormatter: BI.emptyFn,
onLoaded: BI.emptyFn,
itemHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
+ isDefaultInit: false,
});
},
@@ -45,6 +46,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
onLoaded: opts.onLoaded,
el: {
type: "bi.multi_select_inner_loader",
+ isDefaultInit: opts.isDefaultInit,
}
}, opts.el),
itemsCreator: function (op, callback) {
diff --git a/src/widget/multiselectlist/multiselectlist.insert.js b/src/widget/multiselectlist/multiselectlist.insert.js
index 277ee20a9..3311d3536 100644
--- a/src/widget/multiselectlist/multiselectlist.insert.js
+++ b/src/widget/multiselectlist/multiselectlist.insert.js
@@ -34,6 +34,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
},
// onLoaded: o.onLoaded,
el: {},
+ isDefaultInit: true,
value: o.value
});
this.adapter.on(BI.MultiSelectLoader.EVENT_CHANGE, function () {
diff --git a/src/widget/multiselectlist/multiselectlist.js b/src/widget/multiselectlist/multiselectlist.js
index eccc18581..eb0baaed1 100644
--- a/src/widget/multiselectlist/multiselectlist.js
+++ b/src/widget/multiselectlist/multiselectlist.js
@@ -31,6 +31,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
logic: {
dynamic: false
},
+ isDefaultInit: true,
// onLoaded: o.onLoaded,
el: {}
});