Browse Source

Merge pull request #164861 in DEC/fineui from release/11.0 to bugfix/11.0

* commit 'b7dc0c12ac1dc7a118f597029e5cf84c0a4a403e':
  BI-111334 style:视觉iconfont更新
  同步代码 feat: 给下拉框一个完全自由控制的tooltip方式
  BI-113579 可配置
  BI-113522 文本下拉展开发两次请求
  BI-112711 fix:单选按钮的选中视觉不对
research/test
superman 2 years ago
parent
commit
38fad52d2f
  1. BIN
      dist/font/iconfont.eot
  2. 8
      dist/font/iconfont.svg
  3. BIN
      dist/font/iconfont.ttf
  4. BIN
      dist/font/iconfont.woff
  5. BIN
      dist/font/iconfont.woff2
  6. 8
      src/base/single/input/radio/radio.js
  7. 28
      src/case/combo/textvaluecombo/combo.textvalue.js
  8. 6
      src/less/base/single/input/radio.less
  9. 2
      src/widget/multiselect/multiselect.loader.js
  10. 1
      src/widget/multiselectlist/multiselectlist.insert.js
  11. 1
      src/widget/multiselectlist/multiselectlist.js

BIN
dist/font/iconfont.eot vendored

Binary file not shown.

8
dist/font/iconfont.svg vendored

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 699 KiB

After

Width:  |  Height:  |  Size: 710 KiB

BIN
dist/font/iconfont.ttf vendored

Binary file not shown.

BIN
dist/font/iconfont.woff vendored

Binary file not shown.

BIN
dist/font/iconfont.woff2 vendored

Binary file not shown.

8
src/base/single/input/radio/radio.js

@ -9,10 +9,10 @@ BI.Radio = BI.inherit(BI.BasicButton, {
baseCls: "bi-radio", baseCls: "bi-radio",
selected: false, selected: false,
handler: BI.emptyFn, handler: BI.emptyFn,
width: 14, width: 16,
height: 14, height: 16,
iconWidth: 14, iconWidth: 16,
iconHeight: 14, iconHeight: 16
}, },
render: function () { render: function () {

28
src/case/combo/textvaluecombo/combo.textvalue.js

@ -14,7 +14,8 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
value: "", value: "",
defaultText: "", defaultText: "",
allowClear: false, allowClear: false,
status: "success", // success | warning | error status: "success", // success | warning | error,
title: null,
}); });
}, },
@ -35,15 +36,10 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
const o = this.options; const o = this.options;
const trigger = { const title = () => {
type: "bi.select_text_trigger", if (BI.isFunction(o.title)) {
ref: ref => this.trigger = ref, return o.title();
cls: "text-value-trigger", }
items: o.items,
height: o.height,
text: o.text,
value: o.value,
title: () => {
if (this.options.status === "error") { if (this.options.status === "error") {
return { return {
level: "warning", level: "warning",
@ -53,7 +49,17 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
return { return {
level: "success", level: "success",
}; };
}, };
const trigger = {
type: "bi.select_text_trigger",
ref: ref => this.trigger = ref,
cls: "text-value-trigger",
items: o.items,
height: o.height,
text: o.text,
value: o.value,
title,
allowClear: o.allowClear, allowClear: o.allowClear,
defaultText: o.defaultText, defaultText: o.defaultText,
listeners: [ listeners: [

6
src/less/base/single/input/radio.less

@ -18,13 +18,13 @@
border-color: @color-bi-border-hover-active-radio; border-color: @color-bi-border-hover-active-radio;
background-color: @color-bi-background-active-radio; background-color: @color-bi-background-active-radio;
&:after { &:after {
width: 6px; width: 8px;
height: 6px; height: 8px;
display: table; display: table;
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%; left: 50%;
.border-radius(3px); .border-radius(4px);
background-color: @color-bi-background-active-radio-content; background-color: @color-bi-background-active-radio-content;
.transform(translate(-50%, -50%)); .transform(translate(-50%, -50%));
@transition: all .1s cubic-bezier(.71,-.46,.88,.6),opacity .1s; @transition: all .1s cubic-bezier(.71,-.46,.88,.6),opacity .1s;

2
src/widget/multiselect/multiselect.loader.js

@ -20,6 +20,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
itemFormatter: BI.emptyFn, itemFormatter: BI.emptyFn,
onLoaded: BI.emptyFn, onLoaded: BI.emptyFn,
itemHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, itemHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
isDefaultInit: false,
}); });
}, },
@ -45,6 +46,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
onLoaded: opts.onLoaded, onLoaded: opts.onLoaded,
el: { el: {
type: "bi.multi_select_inner_loader", type: "bi.multi_select_inner_loader",
isDefaultInit: opts.isDefaultInit,
} }
}, opts.el), }, opts.el),
itemsCreator: function (op, callback) { itemsCreator: function (op, callback) {

1
src/widget/multiselectlist/multiselectlist.insert.js

@ -34,6 +34,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
}, },
// onLoaded: o.onLoaded, // onLoaded: o.onLoaded,
el: {}, el: {},
isDefaultInit: true,
value: o.value value: o.value
}); });
this.adapter.on(BI.MultiSelectLoader.EVENT_CHANGE, function () { this.adapter.on(BI.MultiSelectLoader.EVENT_CHANGE, function () {

1
src/widget/multiselectlist/multiselectlist.js

@ -31,6 +31,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
logic: { logic: {
dynamic: false dynamic: false
}, },
isDefaultInit: true,
// onLoaded: o.onLoaded, // onLoaded: o.onLoaded,
el: {} el: {}
}); });

Loading…
Cancel
Save