Browse Source

Merge pull request #79736 in DEC/fineui from release/11.0 to final/11.0

* commit '6c8b2e00b4f08aaecc7c3f4d815505df9ef050c6':
  chore: 去掉ie6-8字体支持
  REPORT-73699 fix: 允许编辑时外部传递进来的text可能是一个方法
  auto upgrade version to 2.0.20220617213406
  无JIRA任务 simple
  auto upgrade version to 2.0.20220617172333
  auto upgrade version to 2.0.20220617145310
  无JIRA任务 暗色系popover头背景
  auto upgrade version to 2.0.20220617120359
  auto upgrade version to 2.0.20220617115451
  auto upgrade version to 2.0.20220617114413
  DESIGN-3918 feat: 拓展box-shadow,允许配置常量一样自定义个阴影效果
  无JIRA任务 同步lessconfig
research/test
superman 2 years ago
parent
commit
e7b95c206e
  1. 2
      package.json
  2. 2
      src/less/base/single/tip/tip.toast.less
  3. 2
      src/less/image.less
  4. 3
      src/less/lib/constant.less
  5. 1
      src/less/lib/theme.less
  6. 6
      src/less/visual.less
  7. 7
      src/widget/multiselect/multiselect.trigger.js

2
package.json

@ -1,6 +1,6 @@
{ {
"name": "fineui", "name": "fineui",
"version": "2.0.20220616223849", "version": "2.0.20220617213406",
"description": "fineui", "description": "fineui",
"main": "dist/fineui.min.js", "main": "dist/fineui.min.js",
"types": "dist/lib/index.d.ts", "types": "dist/lib/index.d.ts",

2
src/less/base/single/tip/tip.toast.less

@ -4,7 +4,7 @@
color: @color-bi-color-toast-text; color: @color-bi-color-toast-text;
line-height: @font-size-16; line-height: @font-size-16;
.border-radius(2px); .border-radius(2px);
.box-shadow(0 6px 20px -2px, @color-bi-color-toast-shadow); .box-shadow(@box-shadow-toast) ;
&.toast-success { &.toast-success {
background: @color-bi-background-toast-success; background: @color-bi-background-toast-success;

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- */
} }
} }

3
src/less/lib/constant.less

@ -244,3 +244,6 @@
@scroll-color-theme-dark: @color-white; @scroll-color-theme-dark: @color-white;
@scroll-thumb-color: @color-black; @scroll-thumb-color: @color-black;
@scroll-thumb-color-theme-dark: @color-black; @scroll-thumb-color-theme-dark: @color-black;
//box-shadow效果
@box-shadow-toast: 0 2px 6px 0 rgba(0, 0, 0, 0.2);

1
src/less/lib/theme.less

@ -32,7 +32,6 @@
@color-bi-color-toast-error: @color-bi-text; @color-bi-color-toast-error: @color-bi-text;
@color-bi-color-toast-normal: @color-bi-text; @color-bi-color-toast-normal: @color-bi-text;
@color-bi-color-toast-text: @color-bi-text; @color-bi-color-toast-text: @color-bi-text;
@color-bi-color-toast-shadow: @color-bi-background-black;
//bubble //bubble
@color-bi-background-bubble-success: @color-bi-background-light-success; @color-bi-background-bubble-success: @color-bi-background-light-success;

6
src/less/visual.less

@ -16,6 +16,12 @@
box-shadow: none; box-shadow: none;
} }
.box-shadow(@shadow) {
-webkit-box-shadow: @shadow;
-moz-box-shadow: @shadow;
box-shadow: @shadow;
}
.box-shadow(@style, @c) when (iscolor(@c)) { .box-shadow(@style, @c) when (iscolor(@c)) {
-webkit-box-shadow: @style @c; -webkit-box-shadow: @style @c;
-moz-box-shadow: @style @c; -moz-box-shadow: @style @c;

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