Browse Source

撤销

fix-lag
Henry.Wang 3 years ago
parent
commit
1415f85b9f
  1. 12
      designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java

12
designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java

@ -185,7 +185,7 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
*/ */
private void checkToolBarPaneEnable() { private void checkToolBarPaneEnable() {
List<ToolBarButton> toolBarButtons = toolBarPane.getToolBarButtons(); List<ToolBarButton> toolBarButtons = toolBarPane.getToolBarButtons();
boolean isnotEnable = ComparatorUtils.equals(title.getText(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Toolbar_Choose_Role")) && !WorkContext.getCurrent().isRoot(); boolean isnotEnable = ComparatorUtils.equals(title.getText(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Toolbar_Choose_Role"))&& !WorkContext.getCurrent().isRoot();
for (ToolBarButton button : toolBarButtons) { for (ToolBarButton button : toolBarButtons) {
button.setEnabled(!isnotEnable); button.setEnabled(!isnotEnable);
} }
@ -296,15 +296,9 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
if (toolBarManager.length == 0) { if (toolBarManager.length == 0) {
return; return;
} }
ToolBar resultToolbar = toolBarManager[0].getToolBar(); for (int i = 0; i < toolBarManager.length; i++) {
for (int i = 1; i < toolBarManager.length; i++) { toolBarPane.populateBean(toolBarManager[i].getToolBar());
ToolBar toolBar = toolBarManager[i].getToolBar();
for (int j = 0; j < toolBar.getWidgetSize(); j++) {
Widget widget = toolBar.getWidget(j);
resultToolbar.addWidget(widget);
}
} }
toolBarPane.populateBean(resultToolbar);
} }

Loading…
Cancel
Save