Merge remote-tracking branch 'origin/feature/x' into feature/x

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;
@@ -763,7 +764,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/mainframe/JTemplate.java

@@ -956,7 +956,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()));
 
     }
 
@@ -1584,7 +1584,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;
         } else {

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

@@ -408,7 +408,9 @@ public abstract class ToolBarMenuDock {
 
         menuDef.addShortCut(new OpenRecentReportMenuDef());
 
-        addCloseCurrentTemplateAction(menuDef);
+        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/update/push/DesignerPushUpdateManager.java

@@ -60,7 +60,7 @@ public class DesignerPushUpdateManager {
 
     private String getFullLatestVersion() {
         try {
-            String url = CloudCenter.getInstance().acquireUrlByKind("jar10.update");
+            String url = CloudCenter.getInstance().acquireUrlByKind("jar11.update");
             if(StringUtils.isBlank(url)){
                 return StringUtils.EMPTY;
             }

designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java

@@ -350,7 +350,7 @@ public class UpdateMainDialog extends UIDialog {
         new SwingWorker<JSONObject, Void>() {
             @Override
             protected JSONObject doInBackground() throws Exception {
-                return new JSONObject(HttpToolbox.get(CloudCenter.getInstance().acquireUrlByKind("jar10.update")));
+                return new JSONObject(HttpToolbox.get(CloudCenter.getInstance().acquireUrlByKind("jar11.update")));
             }
 
             @Override

designer-base/src/main/java/com/fr/file/FILEChooserPane.java

@@ -29,6 +29,9 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.event.Event;
+import com.fr.event.EventDispatcher;
+import com.fr.event.Listener;
 import com.fr.file.filetree.FileNode;
 import com.fr.file.filter.ChooseFileFilter;
 import com.fr.file.filter.FILEFilter;
@@ -45,6 +48,8 @@ import com.fr.stable.os.windows.WindowsDetector;
 import com.fr.stable.project.ProjectConstants;
 import com.fr.workspace.WorkContext;
 
+import com.fr.workspace.Workspace;
+import com.fr.workspace.WorkspaceEvent;
 import javax.swing.AbstractAction;
 import javax.swing.AbstractListModel;
 import javax.swing.ActionMap;
@@ -1325,6 +1330,12 @@ public class FILEChooserPane extends BasicPane {
                     LocationButtonPane.this.repaint(10);
                 }
             });
+            EventDispatcher.listen(WorkspaceEvent.AfterSwitch, new Listener<Workspace>() {
+                @Override
+                public void on(Event event, Workspace param) {
+                    setPopDir(null);
+                }
+            });
         }
 
         public void highLightButton(FILE dir) {

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/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,7 +290,9 @@ public class ChartTypePane extends AbstractChartAttrPane {
                 Map.Entry<String, FurtherBasicBeanPane<? extends ChartProvider>> entry = iterator.next();
                 String plotID = entry.getKey();
                 if (ignore || ChartTypeManager.enabledChart(plotID)) {
-                    cards.add(entry.getValue());
+                    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/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;
@@ -198,7 +199,9 @@ public class VanChartGaugeSeriesPane extends VanChartMultiColorSeriesPane {
                 if (attrLabelDetail == null || attrLabelDetail.getTextAttr() == null) {
                     return;
                 }
-                attrLabelDetail.getTextAttr().setFRFont(VanChartGaugePlot.THERMOMETER_LABEL_FONT);
+                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-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java

@@ -7,8 +7,6 @@ import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.form.layout.FRBorderLayout;
 import com.fr.general.ComparatorUtils;
 
-
-import javax.swing.JOptionPane;
 import java.awt.BorderLayout;
 import java.awt.Rectangle;
 
@@ -46,18 +44,27 @@ public class FRCardMainBorderLayoutAdapter extends FRBorderLayoutAdapter {
         Rectangle rectangle = creator.getBounds();
         //不能超出控件边界
         if (ComparatorUtils.equals(constraints, BorderLayout.NORTH) || ComparatorUtils.equals(constraints, BorderLayout.SOUTH)) {
-            int containerHeight = container.getHeight();
+            return isBeyondMinConstraint(rectangle.height, container.getHeight());
-            if (rectangle.height > containerHeight) {
-                FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Beyond_Tablayout_Bounds"));
-                return true;
-            }
         } else if (ComparatorUtils.equals(constraints, BorderLayout.EAST) || ComparatorUtils.equals(constraints, BorderLayout.WEST)) {
-            int containerWidth = container.getWidth();
+            return isBeyondMinConstraint(rectangle.width, container.getWidth());
-            if (rectangle.width > containerWidth) {
-                FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Beyond_Tablayout_Bounds"));
-                return true;
-            }
         }
         return false;
     }
+
+    /**
+     * 是否超出最小限制
+     *
+     * @param minConstraint 最小限制
+     * @param value 数值
+     * @return 是否超出最小限制
+     */
+    private boolean isBeyondMinConstraint(int minConstraint, int value) {
+        if (minConstraint > value) {
+            FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Beyond_Tablayout_Bounds"));
+            container.setSize(container.getBackupBound().getSize());
+            return true;
+        } else {
+            return false;
+        }
+    }
 }

designer-form/src/main/java/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java

@@ -104,6 +104,15 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
 		refreshStylePreviewEffect();
 	}
 
+	/**
+	 * @deprecated 该方法在样式数据模型发生变化，如主题更新/body布局类型切换等均会被调用，并不仅限于初始化，
+	 * 因此原方法名称废弃，不应当被继续使用
+	 * @link {{@link #refreshStylePreviewEffect()}}
+	 */
+	protected void initStyle() {
+		refreshStylePreviewEffect();
+	}
+
 	public void refreshStylePreviewEffect() {
     	BorderPacker style = toData().getBorderStyle();
      	refreshBorderAndBackgroundStylePreviewEffect();
@@ -117,6 +126,15 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
 		reshuffleBorderAndBackgroundPaintingEffectIfTitleExists();
      }
 
+	/**
+	 * @deprecated 该方法在样式数据模型发生变化，如主题更新/图表默认开启标题等时均会被调用，并不仅限于初始化，
+	 * 因此原方法名称废弃，不应当被继续使用
+	 * @link {{@link #refreshBorderAndBackgroundStylePreviewEffect()} ()}}
+	 */
+	protected void initBorderAndBackgroundStyle() {
+		refreshBorderAndBackgroundStylePreviewEffect();
+	}
+
     public void refreshBorderAndBackgroundStylePreviewEffect() {
     	BorderPacker style = toData().getBorderStyle();
 		LineBorder DEFAULT_LINE_BORDER = (LineBorder) DEFALUTBORDER;

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(

designer-realize/src/main/java/com/fr/start/MainDesigner.java

@@ -6,7 +6,6 @@ import com.fr.design.DesignerEnvManager;
 import com.fr.design.actions.file.WebPreviewUtils;
 import com.fr.design.actions.file.newReport.NewPolyReportAction;
 import com.fr.design.actions.file.newReport.NewWorkBookAction;
-import com.fr.design.actions.server.LocalAnalyzerAction;
 import com.fr.design.actions.server.ServerConfigManagerAction;
 import com.fr.design.actions.server.StyleListAction;
 import com.fr.design.actions.server.predefined.ServerPredefinedStyleAction;
@@ -177,7 +176,6 @@ public class MainDesigner extends BaseDesigner {
                         new WidgetManagerAction()
                 );
                 menuDef.addShortCut(new ChartPreStyleAction(), new ChartEmptyDataStyleAction(),new ChartMapEditorAction());
-                menuDef.addShortCut(new LocalAnalyzerAction());
             }
 
             insertMenu(menuDef, MenuHandler.SERVER);