Browse Source

Merge pull request #2277 in DESIGN/design from feature/10.0 to bugfix/10.0

* commit '2b9228d1eefaed9de598fabb402cfca4b7c0bbd7':
  REPORT-38529 && REPORT-38527
  REPORT-38534 设计器界面中的剪切和复制按钮灰化不可用 1. bug原因:对于工具栏上的工具条combineUp,当处于编辑sheet的时候,是剪切+复制+粘贴+格式刷,其它情况都是剪切+复制+粘贴+删除,而带删除的这种,是会有两种状态,选中了某个组件时,剪切、复制、删除就都是可用的,未选中时,这几个都不可用,所以这里需要有个逻辑来切换这几个按钮的状态,而对于带格式刷的,不论有没有选中都会走到这个逻辑,然后被无脑置为不可用 2. 修改方案:添加一个判断,如果当前的状态是WORK_SHEET的时候,即编辑sheet时,直接返回,其它情况正常走逻辑
  REPORT-38645 【JDK11】设计器右上角,fs插件管理点击登录无反应
bugfix/10.0
superman 4 years ago
parent
commit
d47443fbbf
  1. 4
      designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java
  2. 6
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
  3. 3
      designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java
  4. 2
      designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoLabel.java

4
designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java

@ -159,7 +159,7 @@ public class WebViewDlgHelper {
}
public static void createLoginDialog() {
if (StableUtils.getMajorJavaVersion() == VERSION_8) {
if (StableUtils.getMajorJavaVersion() >= VERSION_8) {
File file = new File(StableUtils.pathJoin(installHome, "scripts"));
if (!file.exists()) {
confirmDownLoadShopJS();
@ -172,7 +172,7 @@ public class WebViewDlgHelper {
public static void createLoginDialog(Window parent) {
if (StableUtils.getMajorJavaVersion() == VERSION_8) {
if (StableUtils.getMajorJavaVersion() >= VERSION_8) {
File file = new File(StableUtils.pathJoin(installHome, "scripts"));
if (!file.exists()) {
confirmDownLoadShopJS();

6
designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java

@ -748,9 +748,11 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
* @param al 组件名称
*/
public void checkCombineUp(boolean flag, ArrayList<String> al) {
//Yvan: 检查当前是否为WORK_SHEET状态,因为只有WORK_SHEET中含有格式刷组件,此时是不需要进行checkComponentsByNames的
if (HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getMenuState() == DesignState.WORK_SHEET) {
return;
}
combineUp.checkComponentsByNames(flag, al);
}
/**

3
designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java

@ -1,5 +1,6 @@
package com.fr.design.form.util;
import com.fr.design.designer.creator.XWFitLayout;
import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.mainframe.FormDesigner;
import com.fr.design.mainframe.JTemplate;
@ -17,7 +18,7 @@ public class FormDesignerUtils {
* @return
*/
public static boolean isAppRelayout(FormDesigner designer) {
if (!designer.getRootComponent().acceptType(WFitLayout.class)) {
if (!designer.getRootComponent().acceptType(XWFitLayout.class)) {
return false;
}
return ((WFitLayout) designer.getRootComponent().toData()).isAppRelayout();

2
designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoLabel.java

@ -199,7 +199,7 @@ public class UserInfoLabel extends UILabel {
this.addMouseListener(userInfoAdapter);
this.setHorizontalAlignment(SwingConstants.CENTER);
if (StableUtils.getMajorJavaVersion() == VERSION_8) {
if (StableUtils.getMajorJavaVersion() >= VERSION_8) {
LoginWebBridge.getHelper().setUILabel(UserInfoLabel.this);
PluginWebBridge.getHelper().setUILabel(UserInfoLabel.this);
}

Loading…
Cancel
Save