无jira 解决冲突

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

@@ -92,7 +92,7 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
         } else if (jt.isOpening()) {
             showOpenStatus();
         } else if (jt.isOpenFailed()) {
-            showOpenFailedCover();
+            showOpenFailedCover(jt.getTemplateOpenFailedTip());
         } else {
             hideCover();
         }
@@ -121,7 +121,8 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
         layeredPane.moveToFront(loadingPane);
     }
 
-    public void showOpenFailedCover() {
+    public void showOpenFailedCover(String text) {
+        failedPane.setFailedTip(text);
         layeredPane.moveToFront(failedPane);
     }
 

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

@@ -134,6 +134,8 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     private JComponent centerPane;
     private DesignModelAdapter<T, ?> designModel;
     private PreviewProvider previewType;
+    private String templateOpenFailedTip;
+
     /**
      * 统计模板制作耗时
      *
@@ -1129,35 +1131,49 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     /**
      * 判断是否是新版设计器
      *
+     * @param showTipPane 是否需要展示弹窗
      * @return 是返回true
      */
-    public boolean isNewDesigner() {
+    public boolean isNewDesigner(boolean showTipPane) {
         String xmlDesignerVersion = getTarget().getXMLDesignerVersion();
         if (isLowerThanHBB(xmlDesignerVersion)) {
             String info = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open-New_Form_Tip");
             String moreInfo = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Version_Tip_More_Info");
+            if (showTipPane) {
                 new InformationWarnPane(info, moreInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips")).show();
+            }
             return true;
         }
         return false;
     }
 
+    public boolean isNewDesigner() {
+        return isNewDesigner(true);
+    }
+
     /**
      * 是否是就版本设计器
      *
+     * @param showTipPane 是否需要展示弹窗
      * @return 是就返回true
      */
-    public boolean isOldDesigner() {
+    public boolean isOldDesigner(boolean showTipPane) {
         String xmlDesignerVersion = getTarget().getXMLDesignerVersion();
         if (isHigherThanCurrent(xmlDesignerVersion)) {
             String infor = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Version_Not_Match", DesignUtils.parseVersion(xmlDesignerVersion));
             String moreInfo = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Version_Tip_More_Info");
+            if (showTipPane) {
                 new InformationWarnPane(infor, moreInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips")).show();
+            }
             return true;
         }
         return false;
     }
 
+    public boolean isOldDesigner() {
+        return isOldDesigner(true);
+    }
+
     /**
      *
      */
@@ -1777,6 +1793,15 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         themeAttrMark.setDark(theme.isDark());
     }
 
+    public String getTemplateOpenFailedTip() {
+        return templateOpenFailedTip;
+    }
+
+    public void setTemplateOpenFailedTip(String templateOpenFailedTip) {
+        this.templateOpenFailedTip = templateOpenFailedTip;
+    }
+}
+
     @Override
     public void setTemplateTheme(TemplateTheme newTheme, TemplateThemeCompatible compatible) {
         ThemedTemplate.super.setTemplateTheme(newTheme, compatible);

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

@@ -24,6 +24,7 @@ public class OpenFailedPane extends JPanel {
 
     private  UILabel label;
     private MessageWithLink link;
+    private String defaultFailedText;
 
     public OpenFailedPane() {
         this.setLayout(new LayoutManager() {
@@ -83,11 +84,18 @@ public class OpenFailedPane extends JPanel {
                 });
             }
         };
+        this.defaultFailedText = link.getText();
         link.setBackground(Color.WHITE);
         this.add(label);
         this.add(link);
     }
 
-
+    public void setFailedTip(String text) {
+        if (StringUtils.isEmpty(text)) {
+            this.link.setText(defaultFailedText);
+        } else {
+            this.link.setText(text);
+        }
+    }
 
 }

designer-base/src/main/java/com/fr/design/worker/open/OpenWorker.java

@@ -7,12 +7,14 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrameFileDealerPane;
 import com.fr.design.mainframe.JTemplate;
+import com.fr.design.utils.DesignUtils;
 import com.fr.design.worker.WorkerManager;
 import com.fr.exception.DecryptTemplateException;
 import com.fr.file.FILE;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
 
+import com.fr.stable.StringUtils;
 import javax.swing.JOptionPane;
 import javax.swing.SwingWorker;
 import javax.swing.UIManager;
@@ -51,6 +53,7 @@ public class OpenWorker<T> extends SwingWorker<T, Void> {
 
     @Override
     protected T doInBackground() throws Exception {
+        TimeUnit.SECONDS.sleep(5);
         return this.callable.call();
     }
 
@@ -61,7 +64,7 @@ public class OpenWorker<T> extends SwingWorker<T, Void> {
         } catch (CancellationException ignored) {
           return;
         } catch (Throwable t) {
-            processFailed();
+            processFailed(StringUtils.EMPTY);
             Throwable cause = t.getCause();
             if (cause instanceof DecryptTemplateException) {
                 FineJOptionPane.showMessageDialog(
@@ -91,6 +94,11 @@ public class OpenWorker<T> extends SwingWorker<T, Void> {
         if (slowly && templateCallable != null) {
             try {
                 JTemplate<?, ?> book = templateCallable.call();
+                if (inValidDesigner(book)) {
+                    String text = Toolkit.i18nText("Fine-Design_Report_Template_Version_Not_Match", DesignUtils.parseVersion(book.getTarget().getDesignerVersion()));
+                    processFailed(text);
+                    return;
+                }
                 FILE tplFile = book.getEditingFILE();
                 JTemplate<?, ?> currentTemplate =  HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
                 // 当前tab页是正在打开的模板
@@ -117,11 +125,21 @@ public class OpenWorker<T> extends SwingWorker<T, Void> {
         WorkerManager.getInstance().removeWorker(taskName);
     }
 
-    private void processFailed() {
+    private boolean inValidDesigner(JTemplate<?, ?> jt) {
+        return jt.isOldDesigner(false) || (!jt.isJWorkBook() && jt.isNewDesigner(false));
+    }
+
+    private void processFailed(String text) {
         this.template.setOpenFailed(true);
         this.template.setOpening(false);
-        DesignerContext.getDesignerFrame().getCenterTemplateCardPane().showOpenFailedCover();
+        JTemplate<?, ?> currentTemplate =  HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        // 需要判断当前打开的模板是不是异步执行后失败的模板 是的话立即展示失败后的提示内容 否则只设置下失败的提示内容
+        if (ComparatorUtils.equals(currentTemplate.getEditingFILE().getName(), this.template.getName())) {
+            DesignerContext.getDesignerFrame().getCenterTemplateCardPane().showOpenFailedCover(text);
             DesignerFrameFileDealerPane.getInstance().stateChange();
+        } else {
+            this.template.setTemplateOpenFailedTip(text);
+        }
         WorkerManager.getInstance().removeWorker(taskName);
 
     }

designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java

@@ -100,7 +100,12 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith
         double f = TableLayout.FILL;
         double[] columnSize = {f};
         double[] rowSize = {p, p, p, p, p, p};
-        Component[][] components = new Component[][]{
+        Component[][] components = ChartEditContext.duchampMode() ? new Component[][]{
+                new Component[]{null},
+                new Component[]{createTitlePane(Toolkit.i18nText("Fine-Design_Chart_Character"), textAttrPane)},
+                new Component[]{backgroundPane},
+                new Component[]{selectBackgroundPane}
+        } : new Component[][]{
                 new Component[]{null},
                 new Component[]{createTitlePane(Toolkit.i18nText("Fine-Design_Chart_Character"), textAttrPane)},
                 new Component[]{backgroundPane},