Browse Source

Merge pull request #2958 in DESIGN/design from feature/10.0 to research/10.0

* commit '236209c43cb6efe953ad61ada73120714667b768':
  REPORT-42237 代码修改
  REPORT-42237 组件使用过程优化
research/10.0
superman 4 years ago
parent
commit
261c5ace20
  1. 4
      designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java
  2. 4
      designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java

4
designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java

@ -14,6 +14,7 @@ import com.fr.design.gui.chart.MiddleChartComponent;
import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.BaseJForm;
import com.fr.design.mainframe.CoverReportPane;
import com.fr.design.mainframe.EastRegionContainerPane;
import com.fr.design.mainframe.EditingMouseListener;
import com.fr.design.mainframe.FormDesigner;
import com.fr.design.mainframe.HelpDialogManager;
@ -266,6 +267,9 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
if (editingMouseListener.stopEditing()) {
if (this != (XCreator) designer.getRootComponent()) {
ComponentAdapter adapter = AdapterBus.getComponentAdapter(designer, this);
if (isEditing) {
EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_WIDGET_SETTINGS);
}
editingMouseListener.startEditing(this, isEditing ? adapter.getDesignerEditor() : null, adapter);
}
}

4
designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java

@ -728,14 +728,14 @@ public class EditingMouseListener extends MouseInputAdapter {
/**
* 刷新顶层组件
* */
*/
public void refreshTopXCreator(boolean isEditing) {
designer.refreshTopXCreator(isEditing);
}
/**
* 刷新顶层组件
* */
*/
public void refreshTopXCreator() {
refreshTopXCreator(false);
}

Loading…
Cancel
Save