From 380864c7b186c66c670897caced0ca099399ad20 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Wed, 15 Jun 2022 17:28:52 +0800 Subject: [PATCH 01/11] =?UTF-8?q?BI-107651=20=E8=BE=B9=E6=A1=86=E9=AB=98?= =?UTF-8?q?=E4=BA=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/numberinterval/numberinterval.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/widget/numberinterval/numberinterval.js b/src/widget/numberinterval/numberinterval.js index 88b640130..9fb76367f 100644 --- a/src/widget/numberinterval/numberinterval.js +++ b/src/widget/numberinterval/numberinterval.js @@ -55,7 +55,7 @@ BI.NumberInterval = BI.inherit(BI.Single, { } return true; }, - cls: "number-interval-small-editor " + (o.simple ? "bi-border-bottom" : "bi-border bi-border-corner-left-radius") + cls: "number-interval-small-editor bi-focus-shadow " + (o.simple ? "bi-border-bottom" : "bi-border bi-border-corner-left-radius") }); this.smallTip = BI.createWidget({ @@ -93,7 +93,7 @@ BI.NumberInterval = BI.inherit(BI.Single, { } return true; }, - cls: "number-interval-big-editor" + (o.simple ? " bi-border-bottom" : " bi-border bi-border-corner-right-radius") + cls: "number-interval-big-editor bi-focus-shadow" + (o.simple ? " bi-border-bottom" : " bi-border bi-border-corner-right-radius") }); this.bigTip = BI.createWidget({ From fb633cfe7fab496e08deafea9235c35c7e38f094 Mon Sep 17 00:00:00 2001 From: data Date: Wed, 15 Jun 2022 18:34:30 +0800 Subject: [PATCH 02/11] auto upgrade version to 2.0.20220615183423 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 14f7108ae..22559275c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220615141348", + "version": "2.0.20220615183423", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 8085e4c624b89403af56a563d8774df4ed837e21 Mon Sep 17 00:00:00 2001 From: data Date: Wed, 15 Jun 2022 20:23:46 +0800 Subject: [PATCH 03/11] auto upgrade version to 2.0.20220615202341 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 22559275c..85af8a7fd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220615183423", + "version": "2.0.20220615202341", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 8349c03b8bf881657cf7a9be42f697f2a2b0dd11 Mon Sep 17 00:00:00 2001 From: zsmj Date: Wed, 15 Jun 2022 20:57:16 +0800 Subject: [PATCH 04/11] =?UTF-8?q?BI-107564=20fix:=20=E3=80=906.0=E4=B8=80?= =?UTF-8?q?=E8=BD=AE=E5=86=92=E7=83=9F=E3=80=91=E5=B9=B3=E5=8F=B0=E6=B7=B1?= =?UTF-8?q?=E8=89=B2=EF=BC=8C=E7=9B=AE=E5=BD=95=E7=9A=84=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BE=9D=E6=97=A7=E6=98=AF=E9=BB=91=E8=89=B2?= =?UTF-8?q?=E7=9C=8B=E4=B8=8D=E6=B8=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/theme/dark.less | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/less/theme/dark.less b/src/less/theme/dark.less index a0149a1f9..1ba39a88e 100644 --- a/src/less/theme/dark.less +++ b/src/less/theme/dark.less @@ -2,7 +2,14 @@ .bi-theme-dark { color: @color-bi-text-theme-dark; + & .bi-input { color: @color-bi-text; } -} \ No newline at end of file + + & .bi-textarea { + color: @color-bi-text; + } + + +} From f429be3d0d596158243c2aeff5d004c74cc0603f Mon Sep 17 00:00:00 2001 From: jian Date: Wed, 15 Jun 2022 21:30:32 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20simple?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/trigger/trigger.editor.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/case/trigger/trigger.editor.js b/src/case/trigger/trigger.editor.js index 7243d528f..55ff83884 100644 --- a/src/case/trigger/trigger.editor.js +++ b/src/case/trigger/trigger.editor.js @@ -6,10 +6,10 @@ * @extends BI.Trigger */ BI.EditorTrigger = BI.inherit(BI.Trigger, { - _defaultConfig: function () { + _defaultConfig: function (config) { var conf = BI.EditorTrigger.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: (conf.baseCls || "") + " bi-editor-trigger bi-border bi-border-radius", + baseCls: (conf.baseCls || "") + " bi-editor-trigger bi-border-radius " + (config.simple ? "bi-border-bottom" : "bi-border"), height: 24, validationChecker: BI.emptyFn, quitChecker: BI.emptyFn, From e77e8067c31d2cdcafcdc2483701405c41f15ba8 Mon Sep 17 00:00:00 2001 From: data Date: Wed, 15 Jun 2022 22:35:36 +0800 Subject: [PATCH 06/11] auto upgrade version to 2.0.20220615223521 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 85af8a7fd..3f073721c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220615202341", + "version": "2.0.20220615223521", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 9f4eea0aa39194b8b5a458379a75c9444a3d3853 Mon Sep 17 00:00:00 2001 From: data Date: Wed, 15 Jun 2022 23:05:40 +0800 Subject: [PATCH 07/11] auto upgrade version to 2.0.20220615230525 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3f073721c..c688fec2b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220615223521", + "version": "2.0.20220615230525", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 6a13b43becac7181f8476bb11db18f9194ec3e40 Mon Sep 17 00:00:00 2001 From: zsmj Date: Thu, 16 Jun 2022 15:24:56 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=97=A0JIRA=20fix:=20=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E8=89=B2=E4=B8=8D=E8=83=BD=E9=81=AE=E4=BD=8F=E7=BA=BF,?= =?UTF-8?q?=E6=94=B9=E4=B8=BA:after?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/base/tree/tree.expander.less | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/less/base/tree/tree.expander.less b/src/less/base/tree/tree.expander.less index b0e6ce76a..e176eecb4 100644 --- a/src/less/base/tree/tree.expander.less +++ b/src/less/base/tree/tree.expander.less @@ -3,40 +3,34 @@ .bi-tree-expander-popup.line { - &:before { + &:after { border-left: 1px dashed @border-color-dark-gray-line; position: absolute; content: ""; height: 100%; left: -1px; + top: 0; } - &.solid:before { + &.solid:after { border-left: 1px solid @border-color-dark-gray-line; - position: absolute; - content: ""; - height: 100%; - left: -1px; } } .bi-theme-dark { .bi-tree-expander-popup.line { - &:before { + &:after { border-left: 1px dashed @border-color-dark-gray-line-theme-dark; position: absolute; content: ""; height: 100%; left: -1px; + top: 0; } - &.solid:before { + &.solid:after { border-left: 1px solid @border-color-dark-gray-line-theme-dark; - position: absolute; - content: ""; - height: 100%; - left: -1px; } } } From 8264bbf6f1e677f488f68aa6098564496d2e1798 Mon Sep 17 00:00:00 2001 From: data Date: Thu, 16 Jun 2022 17:14:41 +0800 Subject: [PATCH 09/11] auto upgrade version to 2.0.20220616171423 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c688fec2b..c2d824c59 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220615230525", + "version": "2.0.20220616171423", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 68aa6e3921a97a82d4410161f2851b761ebbbbd3 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Thu, 16 Jun 2022 21:31:50 +0800 Subject: [PATCH 10/11] =?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/widget/datetime/datetime.combo.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/widget/datetime/datetime.combo.js b/src/widget/datetime/datetime.combo.js index d436da1a8..28037bb69 100644 --- a/src/widget/datetime/datetime.combo.js +++ b/src/widget/datetime/datetime.combo.js @@ -9,9 +9,9 @@ BI.DateTimeCombo = BI.inherit(BI.Single, { border: 1, iconWidth: 24 }, - _defaultConfig: function () { + _defaultConfig: function (conf) { return BI.extend(BI.DateTimeCombo.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-date-time-combo bi-border bi-border-radius", + baseCls: "bi-date-time-combo bi-focus-shadow " + (conf.simple ? "bi-border-bottom" : "bi-border bi-border-radius"), width: 200, height: 24, minDate: "1900-01-01", From 334c6332e02d534a53d3cf94fb28548cef3a965a Mon Sep 17 00:00:00 2001 From: data Date: Thu, 16 Jun 2022 22:39:16 +0800 Subject: [PATCH 11/11] auto upgrade version to 2.0.20220616223849 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c2d824c59..26d1c92a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220616171423", + "version": "2.0.20220616223849", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts",