diff --git a/package.json b/package.json index 86377f6c7..bdd4e659f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220913141541", + "version": "2.0.20220914135738", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", 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); } } diff --git a/src/case/trigger/trigger.text.select.js b/src/case/trigger/trigger.text.select.js index 6c466959d..5a171be2e 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, }; } }, diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less index 76a93b316..0a0b0e53b 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: not-allowed !important; + } + color: @color-bi-text-disabled !important; & .bi-input { @@ -41,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时边框高亮 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);