Pull request #6099: 无JIRA任务 代码合并

Merge in DESIGN/design from feature/10.0 to release/10.0

* commit '75a372ffb25c1d470c15c638b7e92839122ce17d':
  CHART-21222 大屏模板中的钻取地图屏蔽钻取目录的超链
  CHART-20937 fix:不新创建editpane但是要重置lastChartCollection 否则不触发保存
  REPORT-59256 填报-填报属性设置-新增自定义提交会带出之前自定义提交设置
  和抽之前完全一样
  CHART-21076 清楚磁盘缓存
  CHART-20411 适配大屏模板关闭
  CHART-20411 适配大屏模板另存为
  CHART-20686 大屏模板中的图表不支持导出
  CHART-20850 fix:大屏模板中 试管型仪表盘切换为横向后 标签颜色就变了
  CHART-21014 大屏模板中的cpt组件里面还是要有全部图表类型的
  CHART-20939 design fix: 三维组合地图有类型界面

designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java

@@ -4,6 +4,7 @@ package com.fr.design.file;
 import com.fr.base.BaseUtils;
 import com.fr.base.GraphHelper;
 import com.fr.base.vcs.DesignerMode;
+import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.imenu.UIMenuItem;
@@ -753,7 +754,7 @@ public class MutilTempalteTabPane extends JComponent {
     /**
      * 关闭掉一个模板之后激活新的待显示模板
      */
-    private void activePrevTemplateAfterClose() {
+    public void activePrevTemplateAfterClose() {
         if (openedTemplate.isEmpty()) {
             //新建并激活模板
             DesignerContext.getDesignerFrame().addAndActivateJTemplate();

designer-base/src/main/java/com/fr/design/gui/chart/ChartEditPaneProvider.java

@@ -16,4 +16,7 @@ public interface ChartEditPaneProvider {
     default void removeChartEditPaneActionListener(ChartEditPaneActionListener l) {
     }
 
+    default void resetLastChartCollection() {
+    }
+
 }

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

@@ -879,7 +879,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     }
 
     protected boolean export() throws Exception {
-        return this.getTarget().export(TemplateResourceManager.getResource().saveTemplate(editingFILE));
+        return this.getTarget().export(TemplateResourceManager.getResource().saveTemplate(getEditingFILE()));
 
     }
 
@@ -1476,7 +1476,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         if (editingFILE == null || editingFILE instanceof MemFILE) {
             return false;
         }
-        this.getTarget().export(TemplateResourceManager.getResource().saveTemplate(editingFILE));
+        export();
         this.editingFILE = editingFILE;
         return true;
     }

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

@@ -408,7 +408,9 @@ public abstract class ToolBarMenuDock {
 
         menuDef.addShortCut(new OpenRecentReportMenuDef());
 
+        if (!DesignModeContext.isDuchampMode()) {
             addCloseCurrentTemplateAction(menuDef);
+        }
 
         scs = plus.shortcut4FileMenu();
         if (!ArrayUtils.isEmpty(scs)) {

designer-base/src/main/java/com/fr/design/ui/ModernUIPane.java

@@ -26,6 +26,7 @@ import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.io.File;
 import java.util.Map;
 
 /**
@@ -170,6 +171,10 @@ public class ModernUIPane<T> extends BasicPane {
     public void clearCache() {
         if (browser != null) {
             browser.getCacheStorage().clearCache();
+            File file = new File(browser.getContext().getCacheDir());
+            if (file.exists()) {
+                file.delete();
+            }
         }
     }
 

designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java

@@ -13,6 +13,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 
+import com.fr.stable.ListMap;
 import com.fr.stable.StringUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
 
@@ -115,7 +116,12 @@ public abstract class CustomJobPane  extends BasicBeanPane {
 
 	@Override
 	public void populateBean(Object ob) {
-		if (ob instanceof AbstractClassJob) {
+		if (ob == null) {
+			// 自定义提交新增时初始化页面 REPORT-59256
+			this.classNameTextField.setText(StringUtils.EMPTY);
+			this.objectProperiesPane.populateBean(new ListMap());
+		}
+		else if (ob instanceof AbstractClassJob) {
 			AbstractClassJob cj = (AbstractClassJob) ob;
 			this.classNameTextField.setText(cj.getClassName());
 			this.objectProperiesPane.populateBean(cj.getPropertyMap());

designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java

@@ -149,7 +149,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
 
     public static WidgetOption[] initWidgetOption() {
 
-        String[] chartIDs = ChartTypeManager.getInstance().getAllChartIDs();
+        String[] chartIDs = ChartTypeManager.getInstance().getChartIDs4Create();
         ChartWidgetOption[] child = new ChartWidgetOption[chartIDs.length];
         int index = 0;
 

designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java

@@ -31,7 +31,7 @@ import java.awt.Component;
 public class ChartTypePane extends ChartCommonWizardPane implements CallbackEvent {
     private static final long serialVersionUID = -1175602484968520546L;
 
-    private String[] chartIDs = ChartTypeManager.getInstanceWithCheck().getAllChartIDs();
+    private String[] chartIDs = ChartTypeManager.getInstanceWithCheck().getChartIDs4Create();
 
     private JList mainTypeList = null;
     private JList iconViewList = null;

designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java

@@ -55,6 +55,8 @@ public class ChartPropertyPane extends BaseChartPropertyPane {
             chartEditPane.setContainer(container);
             currentID = plotID;
             resetChartEditPane();
+        } else {
+            chartEditPane.resetLastChartCollection();
         }
     }
 

designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java

@@ -118,6 +118,10 @@ public class ChartEditPane extends BasicPane implements AttributeChange, Prepare
         this.listenerList.remove(ChartEditPaneActionListener.class, l);
     }
 
+    public void resetLastChartCollection() {
+        this.lastCollection = null;
+    }
+
     private void fireAttributeChange(ChartCollection chartCollection) {
         // Guaranteed to return a non-null array
         Object[] listeners = listenerList.getListenerList();

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java

@@ -4,6 +4,7 @@ import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.charttypes.ChartTypeManager;
 import com.fr.chartx.attr.ChartProvider;
 import com.fr.design.ChartTypeInterfaceManager;
+import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.beans.FurtherBasicBeanPane;
 import com.fr.design.dialog.BasicScrollPane;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -18,6 +19,7 @@ import com.fr.design.mainframe.chart.gui.item.FlexibleComboBox;
 import com.fr.design.mainframe.chart.gui.item.ItemEventType;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
 import com.fr.design.mainframe.chart.mode.ChartEditContext;
+import com.fr.design.mainframe.chart.mode.ChartEditMode;
 import com.fr.design.module.DesignModuleFactory;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
@@ -173,7 +175,7 @@ public class ChartTypePane extends AbstractChartAttrPane {
                                             Map<Integer, Map<String, FurtherBasicBeanPane<? extends ChartProvider>>> allChartTypePane,
                                             ActionListener autoButtonListener) {
 
-        String[] chartIDs = ChartTypeManager.getInstance().getAllChartIDsIncludeDisabled();
+        String[] chartIDs = ChartTypeManager.getInstance().getAllChartIDs();
 
         for (String id : chartIDs) {
 
@@ -288,9 +290,11 @@ public class ChartTypePane extends AbstractChartAttrPane {
                 Map.Entry<String, FurtherBasicBeanPane<? extends ChartProvider>> entry = iterator.next();
                 String plotID = entry.getKey();
                 if (ignore || ChartTypeManager.enabledChart(plotID)) {
+                    if (ChartTypeManager.getInstance().isShowInDesigner(plotID)) {
                         cards.add(entry.getValue());
                     }
                 }
+            }
 
         }
 
@@ -310,7 +314,9 @@ public class ChartTypePane extends AbstractChartAttrPane {
 
             //第一步就是重构cards
             cards.clear();
-            if (enabledChart) {
+            if (ChartEditContext.duchampMode()) {
+                addOnePlotIDCards(priority, chartID);
+            } else if (enabledChart) {
                 if (collection.getChartCount() == 1) {
                     addAllCards();
                 } else {

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

@@ -471,7 +471,11 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
     }
 
     protected Component[][] createToolBarComponents() {
-        return new Component[][]{
+        return ChartEditContext.duchampMode() ? new Component[][]{
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")), isSort},
+                new Component[]{null, fullScreenDisplay},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout")), collapse},
+        } : new Component[][]{
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")), isSort},
                 new Component[]{null, exportImages},
                 new Component[]{null, fullScreenDisplay},
@@ -480,7 +484,10 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
     }
 
     protected Component[][] createToolBarComponentsWithOutSort() {
-        return new Component[][]{
+        return ChartEditContext.duchampMode() ? new Component[][]{
+                new Component[]{null, fullScreenDisplay},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout")), collapse}
+        } : new Component[][]{
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")), exportImages},
                 new Component[]{null, fullScreenDisplay},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout")), collapse}

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

@@ -101,7 +101,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},

designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java

@@ -16,6 +16,7 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.style.series.ColorPickerPaneWithMaxMin;
 import com.fr.design.mainframe.chart.gui.style.series.UIColorPickerPane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.design.style.color.ColorSelectBox;
 import com.fr.general.ComparatorUtils;
 import com.fr.plugin.chart.attr.GaugeDetailStyle;
@@ -199,7 +200,9 @@ public class VanChartGaugeSeriesPane extends VanChartMultiColorSeriesPane {
                 if (attrLabelDetail == null || attrLabelDetail.getTextAttr() == null) {
                     return;
                 }
+                if (!ChartEditContext.duchampMode()) {
                     attrLabelDetail.getTextAttr().setFRFont(VanChartGaugePlot.THERMOMETER_LABEL_FONT);
+                }
                 if (gaugeLayout.getSelectedIndex() == 0) {
                     attrLabel.getAttrLabelDetail().setPosition(Constants.LEFT);
                     attrLabel.getGaugeValueLabelDetail().setPosition(Constants.LEFT);

designer-realize/src/main/java/com/fr/poly/PolyComponentsBar.java

@@ -46,7 +46,7 @@ public class PolyComponentsBar extends JToolBar {
         setFloatable(false);
         setBackground(UIConstants.TOOLBARUI_BACKGROUND);
         setLayout(FRGUIPaneFactory.create1ColumnGridLayout());
-        String[] iDs = ChartTypeManager.getInstance().getAllChartIDs();
+        String[] iDs = ChartTypeManager.getInstance().getChartIDs4Create();
         int typeLen = iDs.length < MAX_BAR_NUM ? iDs.length : MAX_BAR_NUM;
         serIcons = new SerIcon[typeLen + 1];
         serIcons[0] = new SerIcon(