Browse Source

Pull request #6866: REPORT-63308【接触点优化】轮播期间在组件上右键的交互问题

Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0

* commit 'ddd7b9fb4aa88bd75cc4f35c737d894dc52d41e5':
  REPORT-62672【接触点优化】部分埋点无法模拟对应埋点数据
  REPORT-63308【接触点优化】轮播期间在组件上右键的交互问题
bugfix/11.0
kerry 3 years ago
parent
commit
cd143a5240
  1. 19
      designer-base/src/main/java/com/fr/design/mainframe/share/collect/ComponentCollector.java
  2. 2
      designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/AbstractOnlineWidgetBlock.java

19
designer-base/src/main/java/com/fr/design/mainframe/share/collect/ComponentCollector.java

@ -343,18 +343,12 @@ public class ComponentCollector implements XMLable {
} }
public void clickComponentSetting() { public void clickComponentSetting() {
boolean changed = false;
int firstShowReact = ComponentReuseNotificationInfo.getInstance().isWidgetLibHasRefreshed() ? 2 : -1; int firstShowReact = ComponentReuseNotificationInfo.getInstance().isWidgetLibHasRefreshed() ? 2 : -1;
if (this.firstShowReact != firstShowReact) { if (this.firstShowReact != firstShowReact) {
this.firstShowReact = firstShowReact; collectFirstShowReact(firstShowReact);
changed = true;
} }
if (this.embededFilterReact == 0 && ComponentReuseNotificationInfo.getInstance().isWidgetLibHasRefreshed()) { if (this.embededFilterReact == 0 && ComponentReuseNotificationInfo.getInstance().isWidgetLibHasRefreshed()) {
this.embededFilterReact = -1; collectEmbededFilterReact(-1);
changed = true;
}
if (changed) {
saveInfo();
} }
} }
@ -371,11 +365,16 @@ public class ComponentCollector implements XMLable {
return; return;
} }
if (System.currentTimeMillis() - ComponentReuseNotificationInfo.getInstance().getFirstDragEndTime() <= ONE_MINUTE) { if (System.currentTimeMillis() - ComponentReuseNotificationInfo.getInstance().getFirstDragEndTime() <= ONE_MINUTE) {
this.dynamicEffectReact = 1; collectDynamicEffectReactFlag(1);
saveInfo();
} }
} }
public void collectDynamicEffectReactFlag(int flag) {
this.dynamicEffectReact = flag;
saveInfo();
}
public void clearSortType() { public void clearSortType() {
sortType = JSONFactory.createJSON(JSON.ARRAY); sortType = JSONFactory.createJSON(JSON.ARRAY);
} }

2
designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/AbstractOnlineWidgetBlock.java

@ -114,7 +114,7 @@ public abstract class AbstractOnlineWidgetBlock extends PreviewWidgetBlock<Onlin
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
super.mouseClicked(e); super.mouseClicked(e);
if (e.getButton() == MouseEvent.BUTTON3) { if (e.getButton() == MouseEvent.BUTTON3) {
CarouselStateManger.getInstance().suspend(CarouselStateManger.MOUSE_HOVER); CarouselStateManger.getInstance().suspend(CarouselStateManger.RIGHT_CLICK);
this.parentPane.hidePreviewPane(); this.parentPane.hidePreviewPane();
JPopupMenu rightClickPopupMenu = getRightClickPopupMenu(); JPopupMenu rightClickPopupMenu = getRightClickPopupMenu();
GUICoreUtils.showPopupMenu(rightClickPopupMenu, this, e.getX(), e.getY()); GUICoreUtils.showPopupMenu(rightClickPopupMenu, this, e.getX(), e.getY());

Loading…
Cancel
Save