From 0be44091b2d4f84fcdf9b26876ba9da3e4bdcc70 Mon Sep 17 00:00:00 2001 From: "Oliver.Ke" Date: Tue, 13 Sep 2022 13:54:06 +0800 Subject: [PATCH 1/9] =?UTF-8?q?BI-113888=20fix:=20MultiLayerDownListPopup?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=A1=B9=E9=AB=98=E5=BA=A6=E5=8F=AF=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/multilayerdownlist/popup.downlist.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/widget/multilayerdownlist/popup.downlist.js b/src/widget/multilayerdownlist/popup.downlist.js index 7483349de..8fbacd285 100644 --- a/src/widget/multilayerdownlist/popup.downlist.js +++ b/src/widget/multilayerdownlist/popup.downlist.js @@ -99,7 +99,7 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, { item.el.logic = { dynamic: true }; - item.el.height = sourceItem.el.height || self.constants.height; + item.el.height = sourceItem.el.height || BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT; item.el.iconCls2 = self.constants.nextIcon; item.popup = { lgap: 1, @@ -183,7 +183,7 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, { if (BI.isNotEmptyArray(child.children)) { item.type = "bi.down_list_group_item"; item.iconCls2 = self.constants.nextIcon; - item.height = child.height || self.constants.height; + item.height = child.height || BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT; self._createChildren(item, child); } targetItem.items.push(item); From c6650459a6dbb0b178319b3a59ef1116658c09c5 Mon Sep 17 00:00:00 2001 From: "Oliver.Ke" Date: Tue, 13 Sep 2022 13:56:08 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20SelectTex?= =?UTF-8?q?tTrigger=E7=9A=84text=E4=BC=A0=E5=87=BD=E6=95=B0=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/trigger/trigger.text.select.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/case/trigger/trigger.text.select.js b/src/case/trigger/trigger.text.select.js index 6907cd38d..fad37b1ce 100644 --- a/src/case/trigger/trigger.text.select.js +++ b/src/case/trigger/trigger.text.select.js @@ -86,7 +86,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, { }; } return { - text: o.text + text, }; } }, From 5b2ad630265c070d069465b0657721b5af794345 Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 13 Sep 2022 19:47:08 +0800 Subject: [PATCH 3/9] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/core/utils/common.less | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less index 76a93b316..fe9230f3f 100644 --- a/src/less/core/utils/common.less +++ b/src/less/core/utils/common.less @@ -2,6 +2,19 @@ .base-disabled { cursor: not-allowed !important; + .cursor-pointer { + cursor: not-allowed !important; + } + .cursor-default { + cursor: not-allowed !important; + } + .cursor-move { + cursor: not-allowed !important; + } + + .cursor-text{ + cursor: text; + } color: @color-bi-text-disabled !important; & .bi-input { From 34fa238aeff0c5c603fb4c23546b5630c049debb Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 13 Sep 2022 19:47:28 +0800 Subject: [PATCH 4/9] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/core/utils/common.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less index fe9230f3f..bc87e80cb 100644 --- a/src/less/core/utils/common.less +++ b/src/less/core/utils/common.less @@ -11,10 +11,10 @@ .cursor-move { cursor: not-allowed !important; } - .cursor-text{ - cursor: text; + cursor: not-allowed !important; } + color: @color-bi-text-disabled !important; & .bi-input { From c1c03b01350575b39ae7caa6752b74238dda52f3 Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 13 Sep 2022 19:59:18 +0800 Subject: [PATCH 5/9] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/core/utils/common.less | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less index bc87e80cb..0a0b0e53b 100644 --- a/src/less/core/utils/common.less +++ b/src/less/core/utils/common.less @@ -54,6 +54,18 @@ .base-invalid { cursor: default !important; + .cursor-pointer { + cursor: default !important; + } + .cursor-default { + cursor: default !important; + } + .cursor-move { + cursor: default !important; + } + .cursor-text{ + cursor: default !important; + } } //focus时边框高亮 From 4bc40f824f5fc73c7c4048952f933156862dddeb Mon Sep 17 00:00:00 2001 From: data Date: Tue, 13 Sep 2022 20:23:54 +0800 Subject: [PATCH 6/9] auto upgrade version to 2.0.20220913202347 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 86377f6c7..4c2cc6c0a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220913141541", + "version": "2.0.20220913202347", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From f8b222b02f671db31b07f029db20cc8a63dab737 Mon Sep 17 00:00:00 2001 From: data Date: Wed, 14 Sep 2022 10:03:39 +0800 Subject: [PATCH 7/9] auto upgrade version to 2.0.20220914100333 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4c2cc6c0a..c536412f4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220913202347", + "version": "2.0.20220914100333", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 784b2400215859ac2458ffe86934bc842acdcd54 Mon Sep 17 00:00:00 2001 From: guy Date: Wed, 14 Sep 2022 13:37:39 +0800 Subject: [PATCH 8/9] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/combo/textvaluecombo/combo.textvalue.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/case/combo/textvaluecombo/combo.textvalue.js b/src/case/combo/textvaluecombo/combo.textvalue.js index 7637773f2..f6794f7bd 100644 --- a/src/case/combo/textvaluecombo/combo.textvalue.js +++ b/src/case/combo/textvaluecombo/combo.textvalue.js @@ -116,7 +116,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { }, { eventName: BI.Combo.EVENT_AFTER_HIDEVIEW, action: (...args) => { - if (changeTag) { + if (o.chooseType !== BI.ButtonGroup.CHOOSE_TYPE_SINGLE && changeTag) { this.fireEvent(BI.TextValueCombo.EVENT_CHANGE, ...args); } } From 06d0c160058b994ac229ac92a5735ed9786152e1 Mon Sep 17 00:00:00 2001 From: data Date: Wed, 14 Sep 2022 13:57:56 +0800 Subject: [PATCH 9/9] auto upgrade version to 2.0.20220914135738 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c536412f4..bdd4e659f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220914100333", + "version": "2.0.20220914135738", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts",