Browse Source

Merge pull request #200530 in DEC/fineui from master to feature/x

* commit 'b3540cf33517b3b0231b692d0d1085a1d301eb3e':
  无JIRA chore: 描述
  KERNEL-13123 feat: combo trigger支持 hover-click
research/test
superman 2 years ago
parent
commit
e9aa4ad6c1
  1. 11
      src/base/combination/bubble.js
  2. 2
      typescript/core/platform/web/detectElementResize.ts

11
src/base/combination/bubble.js

@ -12,7 +12,7 @@
attributes: { attributes: {
tabIndex: -1, tabIndex: -1,
}, },
trigger: "click", // click || hover || click-hover || "" trigger: "click", // click || hover || click-hover || "hover-click" || ""
toggle: true, toggle: true,
direction: "", direction: "",
placement: "bottom-start", // top-start/top/top-end/bottom-start/bottom/bottom-end/left-start/left/left-end/right-start/right/right-end placement: "bottom-start", // top-start/top/top-end/bottom-start/bottom/bottom-end/left-start/left/left-end/right-start/right/right-end
@ -219,6 +219,15 @@
} }
}); });
break; break;
case "hover-click":
self.element.on("mouseenter." + self.getName(), function (e) {
if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid()) {
self._popupView(e);
self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.EXPAND, "", self.combo);
self.fireEvent(BI.Bubble.EVENT_EXPAND);
}
});
break;
default: default:
break; break;
} }

2
typescript/core/platform/web/detectElementResize.ts

@ -2,5 +2,5 @@ import { Widget } from "../../../core/widget";
export type _DetectElementResize = { export type _DetectElementResize = {
addResizeListener: (widget: Widget, fn: Function) => Function addResizeListener: (widget: Widget, fn: Function) => Function
removeResizeListener: (widget: Widget, fn: Function) => void removeResizeListener: (widget: Widget, fn?: Function) => void
} }
Loading…
Cancel
Save