Browse Source

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

* commit '33f603406163cb4399e9606dd222402e21408e84':
  chore: 去掉ie6-8字体支持
  REPORT-73699 fix: 允许编辑时外部传递进来的text可能是一个方法
research/test
superman 2 years ago
parent
commit
d1a73da030
  1. 2
      src/less/image.less
  2. 7
      src/widget/multiselect/multiselect.trigger.js

2
src/less/image.less

@ -333,7 +333,7 @@
@font-face { @font-face {
font-family: "@{name}"; font-family: "@{name}";
src: url('@{fontUrl}iconfont.eot'); src: url('@{fontUrl}iconfont.eot');
src: url('@{fontUrl}iconfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('@{fontUrl}iconfont.woff') format('woff'), /* chrome、firefox */ url('@{fontUrl}iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('@{fontUrl}iconfont.svg#svgFontName') format('svg'); /* iOS 4.1- */ src: url('@{fontUrl}iconfont.woff') format('woff'), /* chrome、firefox */ url('@{fontUrl}iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('@{fontUrl}iconfont.svg#svgFontName') format('svg'); /* iOS 4.1- */
} }
} }

7
src/widget/multiselect/multiselect.trigger.js

@ -95,7 +95,12 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
el: { el: {
type: "bi.text", type: "bi.text",
title: function () { title: function () {
return self.searcher.getState(); /** 修正REPORT-73699引入,需要考虑到传递过来的值是方法的情况 */
var state = self.searcher.getState();
if (BI.isFunction(state)) {
return state();
}
return state;
} }
}, },
left: 0, left: 0,

Loading…
Cancel
Save