Browse Source

Merge pull request #4297 in DESIGN/design from final/10.0 to release/10.0

* commit 'f8c74e4f324247fcb49ac0935cb6ef4c238552ae':
  REPORT-52462 保存模板时,将设计器最小化到后台,模板保存失败的弹窗到了屏幕左上角
  REPORT-52406 导出-字体检测-权限编辑时检测按钮需要灰化
zheng-1641779399395
superman 4 years ago
parent
commit
7e4742949a
  1. 5
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
  2. 4
      designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java

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

@ -12,7 +12,6 @@ import com.fr.design.ExtraDesignClassManager;
import com.fr.design.actions.core.ActionFactory;
import com.fr.design.base.mode.DesignModeContext;
import com.fr.design.constants.UIConstants;
import com.fr.design.data.BasicTableDataTreePane;
import com.fr.design.data.DesignTableDataManager;
import com.fr.design.data.datapane.TableDataTreePane;
import com.fr.design.dialog.FineJOptionPane;
@ -706,9 +705,9 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
combineUp.add(jComponent);
}
}
//添加检测按钮
addCheckButton();
}
//添加检测按钮
addCheckButton();
//添加分享按钮
addShareButton();
//添加插件中的按钮

4
designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java

@ -10,6 +10,7 @@ import com.fr.design.mainframe.JTemplate;
import com.fr.design.worker.WorkerManager;
import com.fr.general.ComparatorUtils;
import com.fr.log.FineLoggerFactory;
import java.awt.Frame;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
@ -54,8 +55,9 @@ public class SaveWorker extends SwingWorker<Boolean, Void> {
} catch (Exception e) {
processResult();
FineLoggerFactory.getLogger().error(e.getMessage(), e);
boolean minimized = (DesignerContext.getDesignerFrame().getExtendedState() & Frame.ICONIFIED ) != 0;
FineJOptionPane.showMessageDialog(
DesignerContext.getDesignerFrame(),
minimized ? null : DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Design-Basic_Save_Failure"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
JOptionPane.ERROR_MESSAGE);

Loading…
Cancel
Save