Browse Source

Pull request #4727: REPORT-54361 组件复用-合入主版本-接触点优化-MarkReadMap为true&&clickedWidgetLib为false时,点套用组件入口,没弹出已合入主版本的提示;点组件库,可以弹出@kerry

Merge in DESIGN/design from ~KERRY/design_10.0:final/10.0 to final/10.0

* commit '9ccbf778ec5a2f2890357978d396b8ac9d7c3baf':
  REPORT-54361 组件复用-合入主版本-接触点优化-MarkReadMap为true&&clickedWidgetLib为false时,点套用组件入口,没弹出已合入主版本的提示;点组件库,可以弹出@kerry
final/10.0
Kara 3 years ago
parent
commit
9c4bc2a9ca
  1. 4
      designer-base/src/main/java/com/fr/design/mainframe/ComponentReuseNotifyUtil.java
  2. 2
      designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java
  3. 2
      designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java

4
designer-base/src/main/java/com/fr/design/mainframe/ComponentReuseNotifyUtil.java

@ -18,7 +18,7 @@ public class ComponentReuseNotifyUtil {
} }
public static void enterWidgetLibExtraAction(boolean needValidRead) { public static void enterWidgetLibExtraAction() {
if (ComponentReuseNotificationInfo.getInstance().isClickedWidgetLib()) { if (ComponentReuseNotificationInfo.getInstance().isClickedWidgetLib()) {
return; return;
} }
@ -28,7 +28,7 @@ public class ComponentReuseNotifyUtil {
return COMPONENT_SNAP_CHAT_KEY; return COMPONENT_SNAP_CHAT_KEY;
} }
}); });
if (snapChat.hasRead() && needValidRead) { if (snapChat.hasRead()) {
DesignerToastMsgUtil.toastPrompt(Toolkit.i18nText("Fine-Design_Component_Reuse_Merge_Prompt")); DesignerToastMsgUtil.toastPrompt(Toolkit.i18nText("Fine-Design_Component_Reuse_Merge_Prompt"));
} }
ComponentReuseNotificationInfo.getInstance().setClickedWidgetLib(true); ComponentReuseNotificationInfo.getInstance().setClickedWidgetLib(true);

2
designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java

@ -315,7 +315,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
ComponentCollector.getInstance().collectCmpBoardClick(); ComponentCollector.getInstance().collectCmpBoardClick();
ComponentReuseNotifyUtil.enterWidgetLibExtraAction(true); ComponentReuseNotifyUtil.enterWidgetLibExtraAction();
} }
}); });
// 权限编辑 // 权限编辑

2
designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java

@ -107,8 +107,8 @@ public class FormWidgetDetailPane extends FormDockView{
public void enterWidgetLib() { public void enterWidgetLib() {
ComponentReuseNotifyUtil.enterWidgetLibExtraAction();
EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_WIDGET_LIB); EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_WIDGET_LIB);
ComponentReuseNotifyUtil.enterWidgetLibExtraAction(false);
} }
/** /**

Loading…
Cancel
Save