From 5f4ea23c74fc1e9998532cbef8a6a3dd320f180a Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 17 Jun 2022 11:09:38 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E5=90=8C=E6=AD=A5lessconfig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bi.lessconfig.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bi.lessconfig.json b/bi.lessconfig.json index fafccaff8..d1a58f5ce 100644 --- a/bi.lessconfig.json +++ b/bi.lessconfig.json @@ -12,10 +12,13 @@ "@border-color-dark-line": "#2E3A4D", "@color-sliver-theme-dark": "#363E55", "@border-color-disabled": "rgba(9, 30, 64, 0.07)", + "@font-color-normal": "#091E40", "@font-color-gray": "rgba(9, 30, 64, 0.9)", "@font-color-light-gray": "rgba(9, 30, 64, 0.66)", "@font-color-tips": "rgba(9, 30, 64, 0.47)", "@font-color-disabled": "rgba(9, 30, 64, 0.25)", + "@background-color-normal": "#EEF1F6", + "@color-bi-background-active-radio": "transparent", "@color-bi-border-radio": "rgba(9, 30, 64, 0.37)", "@color-bi-border-disabled-radio": "rgba(9, 30, 64, 0.19)", @@ -35,6 +38,5 @@ "@color-bi-color-toast-warning": "#FAAA39", "@color-bi-color-toast-error": "#E65251", "@color-bi-color-toast-normal": "#2C60DB", - "@color-bi-color-toast-text": "#000A19", - "@color-bi-color-toast-shadow": "rgba(9, 30, 64, 0.16)" + "@color-bi-color-toast-text": "#000A19" } From 5a8bf7ac0aab97e563233e6a82f7166bc005e16d Mon Sep 17 00:00:00 2001 From: zsmj Date: Fri, 17 Jun 2022 11:27:07 +0800 Subject: [PATCH 02/12] =?UTF-8?q?DESIGN-3918=20feat:=20=E6=8B=93=E5=B1=95b?= =?UTF-8?q?ox-shadow,=E5=85=81=E8=AE=B8=E9=85=8D=E7=BD=AE=E5=B8=B8?= =?UTF-8?q?=E9=87=8F=E4=B8=80=E6=A0=B7=E8=87=AA=E5=AE=9A=E4=B9=89=E4=B8=AA?= =?UTF-8?q?=E9=98=B4=E5=BD=B1=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 先前的方案真是为了配置而配置,毫无卵用,现在想要什么效果,随意配好了 --- bi.lessconfig.json | 3 +-- src/less/base/single/tip/tip.toast.less | 2 +- src/less/lib/constant.less | 3 +++ src/less/lib/theme.less | 1 - src/less/visual.less | 32 +++++++++++++++---------- 5 files changed, 24 insertions(+), 17 deletions(-) diff --git a/bi.lessconfig.json b/bi.lessconfig.json index fafccaff8..141c28c7c 100644 --- a/bi.lessconfig.json +++ b/bi.lessconfig.json @@ -35,6 +35,5 @@ "@color-bi-color-toast-warning": "#FAAA39", "@color-bi-color-toast-error": "#E65251", "@color-bi-color-toast-normal": "#2C60DB", - "@color-bi-color-toast-text": "#000A19", - "@color-bi-color-toast-shadow": "rgba(9, 30, 64, 0.16)" + "@color-bi-color-toast-text": "#000A19" } 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/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) { From 796a0b28ced1584b92177e321a9437eeba8678d6 Mon Sep 17 00:00:00 2001 From: data Date: Fri, 17 Jun 2022 11:44:26 +0800 Subject: [PATCH 03/12] auto upgrade version to 2.0.20220617114413 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 26d1c92a6..7717be013 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220616223849", + "version": "2.0.20220617114413", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 6098bf29411de57633eafe67a18e2ea752933682 Mon Sep 17 00:00:00 2001 From: data Date: Fri, 17 Jun 2022 11:55:05 +0800 Subject: [PATCH 04/12] auto upgrade version to 2.0.20220617115451 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7717be013..fab22930a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220617114413", + "version": "2.0.20220617115451", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From f6382a02bb8fa9fbc9a6d7d7679dc5118fb278f7 Mon Sep 17 00:00:00 2001 From: data Date: Fri, 17 Jun 2022 12:04:07 +0800 Subject: [PATCH 05/12] auto upgrade version to 2.0.20220617120359 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fab22930a..4656b08bc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220617115451", + "version": "2.0.20220617120359", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From f104dad22dc400d3365d3d6fc8bc61dc91081f2f Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 17 Jun 2022 14:25:07 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E6=9A=97=E8=89=B2=E7=B3=BBpopover=E5=A4=B4=E8=83=8C=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bi.lessconfig.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bi.lessconfig.json b/bi.lessconfig.json index d1a58f5ce..6651f8914 100644 --- a/bi.lessconfig.json +++ b/bi.lessconfig.json @@ -38,5 +38,7 @@ "@color-bi-color-toast-warning": "#FAAA39", "@color-bi-color-toast-error": "#E65251", "@color-bi-color-toast-normal": "#2C60DB", - "@color-bi-color-toast-text": "#000A19" + "@color-bi-color-toast-text": "#000A19", + "@color-bi-background-header-background": "rgba(9, 30, 64, 0.9)", + "@color-bi-background-header-background-theme-dark": "rgba(255, 255, 255, 0.9)" } From 3e84291c4f8548dffbda9a079db899392a938be2 Mon Sep 17 00:00:00 2001 From: data Date: Fri, 17 Jun 2022 14:53:22 +0800 Subject: [PATCH 07/12] auto upgrade version to 2.0.20220617145310 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4656b08bc..09d4c6e4e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220617120359", + "version": "2.0.20220617145310", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 8af4f9decc27b52e06ed8d7249978441aad68c59 Mon Sep 17 00:00:00 2001 From: data Date: Fri, 17 Jun 2022 17:23:43 +0800 Subject: [PATCH 08/12] auto upgrade version to 2.0.20220617172333 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 09d4c6e4e..6b417db34 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220617145310", + "version": "2.0.20220617172333", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 55d569f896418c0d8f208f655b3c745ff684729a Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 17 Jun 2022 20:55:36 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20simple?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/combo/textvaluecombo/combo.textvalue.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/case/combo/textvaluecombo/combo.textvalue.js b/src/case/combo/textvaluecombo/combo.textvalue.js index 19b9425e3..633656464 100644 --- a/src/case/combo/textvaluecombo/combo.textvalue.js +++ b/src/case/combo/textvaluecombo/combo.textvalue.js @@ -18,8 +18,8 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { _init: function () { var self = this, o = this.options; - BI.isNumeric(o.width) && (o.width -= 2); - BI.isNumeric(o.height) && (o.height -= 2); + BI.isNumeric(o.width) && (o.width -= (o.simple ? 0 : 2)); + BI.isNumeric(o.height) && (o.height -= (o.simple ? 1 : 2)); o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) { self.setValue(newValue); }) : o.value; From 5fe5b8f37cc01c5199c412ce3b68517b67d18fb0 Mon Sep 17 00:00:00 2001 From: data Date: Fri, 17 Jun 2022 21:34:11 +0800 Subject: [PATCH 10/12] auto upgrade version to 2.0.20220617213406 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6b417db34..9cf646a11 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220617172333", + "version": "2.0.20220617213406", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 5c782618323f8e147cfe49d1219b0c2c46cb5a1a Mon Sep 17 00:00:00 2001 From: Kitetop Date: Mon, 20 Jun 2022 20:12:47 +0800 Subject: [PATCH 11/12] =?UTF-8?q?REPORT-73699=20fix:=20=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=97=B6=E5=A4=96=E9=83=A8=E4=BC=A0=E9=80=92?= =?UTF-8?q?=E8=BF=9B=E6=9D=A5=E7=9A=84text=E5=8F=AF=E8=83=BD=E6=98=AF?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/multiselect/multiselect.trigger.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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, From ec0707894cc9fd59540566d1a9b75ff473407232 Mon Sep 17 00:00:00 2001 From: iapyang Date: Tue, 21 Jun 2022 14:39:09 +0800 Subject: [PATCH 12/12] =?UTF-8?q?chore:=20=E5=8E=BB=E6=8E=89ie6-8=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/image.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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- */ } }