Browse Source

Pull request #4365: REPORT-52843 && REPORT-52844 组件复用-合入主版本-read和clicked都是false时,点击提示的组件复用蓝字,弹出新手引导,关闭引导后,弹出了已合入主版本的提示; 组件复用-合入主版本-鼠标悬浮工具栏套用组件时,tooltip显示“套用组件”,交互文档以及和交互确认了下,应该是“复用组件”

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

* commit '8efb51bcdde6f07feb238c97f6a596bb74ab056b':
  REPORT-52843 && REPORT-52844 组件复用-合入主版本-read和clicked都是false时,点击提示的组件复用蓝字,弹出新手引导,关闭引导后,弹出了已合入主版本的提示;   组件复用-合入主版本-鼠标悬浮工具栏套用组件时,tooltip显示“套用组件”,交互文档以及和交互确认了下,应该是“复用组件”
feature/10.0
kerry 3 years ago
parent
commit
9f2fd06c0c
  1. 5
      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/FormParaWidgetPane.java
  4. 2
      designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java

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

@ -18,7 +18,7 @@ public class ComponentReuseNotifyUtil {
} }
public static void enterWidgetLibExtraAction() { public static void enterWidgetLibExtraAction(boolean needValidRead) {
if (ComponentReuseNotificationInfo.getInstance().isClickedWidgetLib()) { if (ComponentReuseNotificationInfo.getInstance().isClickedWidgetLib()) {
return; return;
} }
@ -28,11 +28,12 @@ public class ComponentReuseNotifyUtil {
return COMPONENT_SNAP_CHAT_KEY; return COMPONENT_SNAP_CHAT_KEY;
} }
}); });
if (snapChat.hasRead()) { if (snapChat.hasRead() && needValidRead) {
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);
DesignerEnvManager.getEnvManager().saveXMLFile(); DesignerEnvManager.getEnvManager().saveXMLFile();
} }
} }

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

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

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

@ -277,7 +277,7 @@ public class FormParaWidgetPane extends JPanel {
jPanel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); jPanel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
jPanel.add(uiLabel, BorderLayout.NORTH); jPanel.add(uiLabel, BorderLayout.NORTH);
jPanel.add(new UILabel(Toolkit.i18nText("Fine-Design_Component_Reuse_Apply_Widget")), BorderLayout.CENTER); jPanel.add(new UILabel(Toolkit.i18nText("Fine-Design_Component_Reuse_Apply_Widget")), BorderLayout.CENTER);
jPanel.setToolTipText(Toolkit.i18nText("Fine-Design_Component_Reuse_Apply_Widget")); jPanel.setToolTipText(Toolkit.i18nText("Fine-Design_Share_Component"));
return jPanel; return jPanel;
} }

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

@ -108,7 +108,7 @@ public class FormWidgetDetailPane extends FormDockView{
public void enterWidgetLib() { public void enterWidgetLib() {
EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_WIDGET_LIB); EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_WIDGET_LIB);
headGroup.setSelectedIndex(ONLINE_TAB); headGroup.setSelectedIndex(ONLINE_TAB);
ComponentReuseNotifyUtil.enterWidgetLibExtraAction(); ComponentReuseNotifyUtil.enterWidgetLibExtraAction(false);
} }
/** /**

Loading…
Cancel
Save