diff --git a/package.json b/package.json index 26d1c92a6..9cf646a11 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220616223849", + "version": "2.0.20220617213406", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", diff --git a/src/less/base/single/tip/tip.toast.less b/src/less/base/single/tip/tip.toast.less index cb39afe70..6f792ac49 100644 --- a/src/less/base/single/tip/tip.toast.less +++ b/src/less/base/single/tip/tip.toast.less @@ -4,7 +4,7 @@ color: @color-bi-color-toast-text; line-height: @font-size-16; .border-radius(2px); - .box-shadow(0 6px 20px -2px, @color-bi-color-toast-shadow); + .box-shadow(@box-shadow-toast) ; &.toast-success { background: @color-bi-background-toast-success; diff --git a/src/less/image.less b/src/less/image.less index bd2bcfabc..34be5fe1d 100644 --- a/src/less/image.less +++ b/src/less/image.less @@ -333,7 +333,7 @@ @font-face { font-family: "@{name}"; 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- */ } } diff --git a/src/less/lib/constant.less b/src/less/lib/constant.less index 5236ce2cb..b3a514511 100644 --- a/src/less/lib/constant.less +++ b/src/less/lib/constant.less @@ -244,3 +244,6 @@ @scroll-color-theme-dark: @color-white; @scroll-thumb-color: @color-black; @scroll-thumb-color-theme-dark: @color-black; + +//box-shadow效果 +@box-shadow-toast: 0 2px 6px 0 rgba(0, 0, 0, 0.2); diff --git a/src/less/lib/theme.less b/src/less/lib/theme.less index 2a570c985..87d578943 100644 --- a/src/less/lib/theme.less +++ b/src/less/lib/theme.less @@ -32,7 +32,6 @@ @color-bi-color-toast-error: @color-bi-text; @color-bi-color-toast-normal: @color-bi-text; @color-bi-color-toast-text: @color-bi-text; -@color-bi-color-toast-shadow: @color-bi-background-black; //bubble @color-bi-background-bubble-success: @color-bi-background-light-success; diff --git a/src/less/visual.less b/src/less/visual.less index fca93b43c..8e227fb8f 100644 --- a/src/less/visual.less +++ b/src/less/visual.less @@ -16,6 +16,12 @@ box-shadow: none; } +.box-shadow(@shadow) { + -webkit-box-shadow: @shadow; + -moz-box-shadow: @shadow; + box-shadow: @shadow; +} + .box-shadow(@style, @c) when (iscolor(@c)) { -webkit-box-shadow: @style @c; -moz-box-shadow: @style @c; @@ -219,7 +225,7 @@ margin-top: 5px; content: ""; transform: rotate(-135deg); - .box-shadow(3px 3px 10px 0, rgba(0, 0, 0, 0.06)); + .box-shadow(3px 3px 10px 0, rgba(0, 0, 0, 0.06)); } } @@ -238,7 +244,7 @@ margin-top: -5px; content: ""; transform: rotate(45deg); - .box-shadow(3px 3px 10px 0, rgba(0, 0, 0, 0.07)); + .box-shadow(3px 3px 10px 0, rgba(0, 0, 0, 0.07)); } } @@ -258,7 +264,7 @@ margin-top: 4px; content: ""; transform: rotate(135deg); - .box-shadow(3px 3px 10px 0, rgba(0, 0, 0, 0.06)); + .box-shadow(3px 3px 10px 0, rgba(0, 0, 0, 0.06)); } } @@ -277,26 +283,26 @@ margin-top: 4px; content: ""; transform: rotate(-45deg); - .box-shadow(3px 3px 10px 0, rgba(0, 0, 0, 0.07)); + .box-shadow(3px 3px 10px 0, rgba(0, 0, 0, 0.07)); } } // css3 animation .keyframes(@name, @frames) { @-webkit-keyframes @name { - @frames(); + @frames(); } @-moz-keyframes @name { - @frames(); + @frames(); } @-ms-keyframes @name { - @frames(); + @frames(); } @-o-keyframes @name { - @frames(); + @frames(); } @keyframes @name { - @frames(); + @frames(); } } @@ -326,10 +332,10 @@ .transform-origin (@x:center, @y:center) { -webkit-transform-origin: @x @y; - -moz-transform-origin: @x @y; - -ms-transform-origin: @x @y; - -o-transform-origin: @x @y; - transform-origin: @x @y; + -moz-transform-origin: @x @y; + -ms-transform-origin: @x @y; + -o-transform-origin: @x @y; + transform-origin: @x @y; } .hover-visible(@cls) { diff --git a/src/widget/multiselect/multiselect.trigger.js b/src/widget/multiselect/multiselect.trigger.js index 7406bd5ba..5b39b84dc 100644 --- a/src/widget/multiselect/multiselect.trigger.js +++ b/src/widget/multiselect/multiselect.trigger.js @@ -95,7 +95,12 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, { el: { type: "bi.text", title: function () { - return self.searcher.getState(); + /** 修正REPORT-73699引入,需要考虑到传递过来的值是方法的情况 */ + var state = self.searcher.getState(); + if (BI.isFunction(state)) { + return state(); + } + return state; } }, left: 0,