Browse Source

Merge pull request #781 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit '3b14961c20a5702af204e82e047a08a9d79036bc':
  REPORT-15027 两个自定义按钮设置,第一个的提交入库会显示在第二个上
bugfix/10.0
Hades 6 years ago
parent
commit
79f9887fc0
  1. 8
      designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java

8
designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java

@ -679,12 +679,10 @@ public class EditToolBar extends BasicPane {
private void updateCustomToolBarButton() {
CustomToolBarButton customToolBarButton = (CustomToolBarButton) widget;
if (customToolBarButton.getJSImpl() != null) {
customToolBarButton.setJSImpl(this.javaScriptPane.updateBean());
} else {
customToolBarButton.setJSImpl(JavaScriptActionPane.createDefault().updateBean());
if (customToolBarButton.getJSImpl() == null) {
this.javaScriptPane = JavaScriptActionPane.createDefault();
}
customToolBarButton.setJSImpl(this.javaScriptPane.updateBean());
}
}

Loading…
Cancel
Save