From dcb02d88b976f59d913d03a7e34ec3c099dc9228 Mon Sep 17 00:00:00 2001 From: youki Date: Thu, 6 Apr 2023 10:49:12 +0800 Subject: [PATCH 1/7] =?UTF-8?q?FDL-4442=20fix:=20downListCombo=E5=8D=95?= =?UTF-8?q?=E8=BE=B9=E6=A1=86=E6=97=B6=E5=8E=BB=E6=8E=89=E5=9C=86=E8=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js b/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js index 956e18552..55ff01e49 100644 --- a/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js +++ b/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js @@ -5,7 +5,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { _defaultConfig: function (config) { return BI.extend(BI.TextValueDownListCombo.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-text-value-down-list-combo bi-border-radius " + (config.simple ? "bi-border-bottom" : "bi-border"), + baseCls: "bi-text-value-down-list-combo " + (config.simple ? "bi-border-bottom" : "bi-border bi-border-radius"), height: 24, }); }, From a4fc852d8266effa195a8811cf588c9c6424437f Mon Sep 17 00:00:00 2001 From: data Date: Thu, 6 Apr 2023 14:49:13 +0800 Subject: [PATCH 2/7] auto upgrade version to 2.0.20230406144639 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d626c4600..f58f3cf8a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230403115702", + "version": "2.0.20230406144639", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From cf5b898e367cdb0ec44fed0469dde1573e76c2dc Mon Sep 17 00:00:00 2001 From: jimmychai Date: Thu, 6 Apr 2023 15:33:38 +0800 Subject: [PATCH 3/7] =?UTF-8?q?BI-123725=20fix:=20=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E7=9A=84=E9=AB=98=E4=BA=AEcls?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../widget/multitree/check/multi.tree.check.pane.less | 9 --------- src/widget/multitree/check/multi.tree.check.pane.js | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 src/less/widget/multitree/check/multi.tree.check.pane.less diff --git a/src/less/widget/multitree/check/multi.tree.check.pane.less b/src/less/widget/multitree/check/multi.tree.check.pane.less deleted file mode 100644 index e193fb210..000000000 --- a/src/less/widget/multitree/check/multi.tree.check.pane.less +++ /dev/null @@ -1,9 +0,0 @@ -@import "../../../index.less"; - -.bi-multi-tree-check-pane { - & .multi-tree-continue-select { - } - & .multi-tree-check-selected { - color: @color-bi-text-multi-tree-check-pane-check-button; - } -} \ No newline at end of file diff --git a/src/widget/multitree/check/multi.tree.check.pane.js b/src/widget/multitree/check/multi.tree.check.pane.js index 598a19f21..4adbe1f90 100644 --- a/src/widget/multitree/check/multi.tree.check.pane.js +++ b/src/widget/multitree/check/multi.tree.check.pane.js @@ -32,7 +32,7 @@ BI.MultiTreeCheckPane = BI.inherit(BI.Pane, { type: "bi.text_button", title: BI.i18nText("BI-Continue_Select"), text: BI.i18nText("BI-Continue_Select"), - cls: "multi-tree-check-selected" + cls: "bi-high-light", }); continueSelect.on(BI.TextButton.EVENT_CHANGE, function () { opts.onClickContinueSelect(); From 253c9041cee8210e16ecfd92bb850bcd0d00d5aa Mon Sep 17 00:00:00 2001 From: data Date: Thu, 6 Apr 2023 15:56:32 +0800 Subject: [PATCH 4/7] auto upgrade version to 2.0.20230406155618 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f58f3cf8a..1105e19af 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230406144639", + "version": "2.0.20230406155618", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 5111d44fa86bcde179d5de5959a232e3ea0b82df Mon Sep 17 00:00:00 2001 From: jimmychai Date: Thu, 6 Apr 2023 15:33:38 +0800 Subject: [PATCH 5/7] =?UTF-8?q?BI-123725=20fix:=20=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E7=9A=84=E9=AB=98=E4=BA=AEcls?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit cf5b898e367cdb0ec44fed0469dde1573e76c2dc) --- .../widget/multitree/check/multi.tree.check.pane.less | 9 --------- src/widget/multitree/check/multi.tree.check.pane.js | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 src/less/widget/multitree/check/multi.tree.check.pane.less diff --git a/src/less/widget/multitree/check/multi.tree.check.pane.less b/src/less/widget/multitree/check/multi.tree.check.pane.less deleted file mode 100644 index e193fb210..000000000 --- a/src/less/widget/multitree/check/multi.tree.check.pane.less +++ /dev/null @@ -1,9 +0,0 @@ -@import "../../../index.less"; - -.bi-multi-tree-check-pane { - & .multi-tree-continue-select { - } - & .multi-tree-check-selected { - color: @color-bi-text-multi-tree-check-pane-check-button; - } -} \ No newline at end of file diff --git a/src/widget/multitree/check/multi.tree.check.pane.js b/src/widget/multitree/check/multi.tree.check.pane.js index 598a19f21..4adbe1f90 100644 --- a/src/widget/multitree/check/multi.tree.check.pane.js +++ b/src/widget/multitree/check/multi.tree.check.pane.js @@ -32,7 +32,7 @@ BI.MultiTreeCheckPane = BI.inherit(BI.Pane, { type: "bi.text_button", title: BI.i18nText("BI-Continue_Select"), text: BI.i18nText("BI-Continue_Select"), - cls: "multi-tree-check-selected" + cls: "bi-high-light", }); continueSelect.on(BI.TextButton.EVENT_CHANGE, function () { opts.onClickContinueSelect(); From 99a176d109f1fec98915426772a4d76130cb8c9d Mon Sep 17 00:00:00 2001 From: data Date: Thu, 6 Apr 2023 20:44:29 +0800 Subject: [PATCH 6/7] auto upgrade version to 2.0.20230406204420 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1105e19af..f3274ee3d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230406155618", + "version": "2.0.20230406204420", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From b739fd583ad1b91342a06adf6d741714ebafe635 Mon Sep 17 00:00:00 2001 From: data Date: Fri, 7 Apr 2023 13:55:03 +0800 Subject: [PATCH 7/7] auto upgrade version to 2.0.20230407135454 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f3274ee3d..daa54b6e6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230406204420", + "version": "2.0.20230407135454", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts",