代码调整

designer-base/src/main/java/com/fr/design/fun/FormAdaptiveConfigUIProcessor.java

@@ -1,6 +1,7 @@
 package com.fr.design.fun;
 
-import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.menu.ShortCut;
 import com.fr.stable.fun.mark.Immutable;
 
 import javax.swing.JComponent;
@@ -14,14 +15,14 @@ import java.awt.image.BufferedImage;
  */
 public interface FormAdaptiveConfigUIProcessor extends Immutable {
 
-    String MARK_STRING = "FormAdaptiveConfigUI";
+    String MARK_STRING = "FormAdaptiveConfigUIProcessor";
     int CURRENT_LEVEL = 1;
 
     /**
-     * 获取表单自适应配置界面
+     * 获取表单自适应配置菜单
-     * @return 表单自适应配置界面
+     * @return 表单自适应配置菜单
      */
-    BasicBeanPane getConfigPane();
+    ShortCut getConfigShortCut(JTemplate jTemplate);
 
     /**
      * 绘制自适应下报表块在表单界面中显示图片

designer-base/src/main/java/com/fr/design/fun/impl/AbstractFormAdaptiveConfigUIProcessor.java

@@ -1,20 +1,14 @@
 package com.fr.design.fun.impl;
 
 
-import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.fun.FormAdaptiveConfigUIProcessor;
-import com.fr.stable.fun.impl.AbstractProvider;
 import com.fr.stable.fun.mark.API;
 
-import javax.swing.JComponent;
-import java.awt.Dimension;
-import java.awt.image.BufferedImage;
-
 /**
  * Created by kerry on 2020-04-09
  */
 @API(level = FormAdaptiveConfigUIProcessor.CURRENT_LEVEL)
-public abstract class AbstractFormAdaptiveConfigUIProcessor extends AbstractProvider implements FormAdaptiveConfigUIProcessor {
+public abstract class AbstractFormAdaptiveConfigUIProcessor  implements FormAdaptiveConfigUIProcessor {
 
     @Override
     public int currentAPILevel() {
@@ -26,13 +20,4 @@ public abstract class AbstractFormAdaptiveConfigUIProcessor extends AbstractProv
         return DEFAULT_LAYER_INDEX;
     }
 
-    @Override
-    public BasicBeanPane getConfigPane() {
-        return null;
-    }
-
-    @Override
-    public BufferedImage paintFormElementCaseImage(Dimension size, JComponent elementCasePane) {
-        return null;
-    }
 }

designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java

@@ -1,11 +1,9 @@
 package com.fr.design.report.fit.menupane;
 
-import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.JTemplateAction;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.dialog.UIDialog;
-import com.fr.design.fun.FormAdaptiveConfigUIProcessor;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.menu.MenuKeySet;
@@ -44,10 +42,6 @@ public class ReportFitAttrAction extends JTemplateAction {
 
         @Override
         public String getMenuName() {
-            FormAdaptiveConfigUIProcessor configPane = ExtraDesignClassManager.getInstance().getSingle(FormAdaptiveConfigUIProcessor.MARK_STRING);
-            if (configPane != null) {
-                return configPane.getConfigPane().getTitle();
-            }
             return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Elementcase");
         }
 
@@ -91,13 +85,7 @@ public class ReportFitAttrAction extends JTemplateAction {
             final TemplateFitAttrPane attrPane = new TemplateFitAttrPane();
             showReportFitDialog(fitAttr, jwb, wbTpl, attrPane);
         } else {
-            BasicBeanPane attrPane = null;
+            final ReportFitAttrPane attrPane = new ReportFitAttrPane();
-            FormAdaptiveConfigUIProcessor configPane = ExtraDesignClassManager.getInstance().getSingle(FormAdaptiveConfigUIProcessor.MARK_STRING);
-            if (configPane != null) {
-                attrPane =  configPane.getConfigPane();
-            }else{
-                attrPane = new ReportFitAttrPane();
-            }
             showReportFitDialog(fitAttr, jwb, wbTpl, attrPane);
         }
     }

designer-form/src/main/java/com/fr/design/mainframe/JForm.java

@@ -31,6 +31,7 @@ import com.fr.design.designer.creator.XWParameterLayout;
 import com.fr.design.designer.properties.FormWidgetAuthorityEditPane;
 import com.fr.design.event.TargetModifiedEvent;
 import com.fr.design.event.TargetModifiedListener;
+import com.fr.design.fun.FormAdaptiveConfigUIProcessor;
 import com.fr.design.fun.PreviewProvider;
 import com.fr.design.fun.PropertyItemPaneProvider;
 import com.fr.design.gui.frpane.HyperlinkGroupPane;
@@ -129,20 +130,20 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
 
     public JForm() {
         super(new Form(new WBorderLayout("form")), "Form");
-        
+
         initPluginPane();
         startListenPlugin();
     }
 
     public JForm(Form form, FILE file) {
         super(form, file);
-    
+
         initPluginPane();
         startListenPlugin();
     }
-    
+
     private void startListenPlugin() {
-    
+
         PluginFilter filter = new PluginFilter() {
             @Override
             public boolean accept(PluginContext context) {
@@ -162,25 +163,25 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
                     }
                 }, filter);
     }
-    
+
     private void initPluginPane() {
-        
+
         ExtraDesignClassManager classManager = PluginModule.getAgent(PluginModule.ExtraDesign);
         Set<PropertyItemPaneProvider> providers = classManager.getArray(PropertyItemPaneProvider.XML_TAG);
         for (PropertyItemPaneProvider provider : providers) {
             addPane(provider);
         }
     }
-    
+
     private void addPane(PropertyItemPaneProvider provider) {
-        
+
         PaneHolder<FormDesigner> holder = provider.getPaneHolder(FormDesigner.class);
         if (holder != null) {
             JPanel panel = holder.getInstance(formDesign);
             EastRegionContainerPane.getInstance().replaceKeyPane(provider.key(), panel);
         }
     }
-    
+
     @Override
     public void refreshEastPropertiesPane() {
         // 暂时用不到，遇到的时候再加刷新右侧tab面板的代码
@@ -561,12 +562,21 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
     @Override
     public ShortCut[] shortcut4TemplateMenu() {
         if (this.index == FORM_TAB) {
-            return ArrayUtils.addAll(new ShortCut[]{new TemplateParameterAction(this), new FormMobileAttrAction(this), new ReportFitAttrAction(this)}, new ShortCut[0]);
+            return ArrayUtils.addAll(new ShortCut[]{new TemplateParameterAction(this), new FormMobileAttrAction(this), getReportFitAttrAction()}, new ShortCut[0]);
         } else {
-            return ArrayUtils.addAll(new ShortCut[]{new TemplateParameterAction(this), new FormMobileAttrAction(this), new ReportFitAttrAction(this)}, this.elementCaseDesign.shortcut4TemplateMenu());
+            return ArrayUtils.addAll(new ShortCut[]{new TemplateParameterAction(this), new FormMobileAttrAction(this), getReportFitAttrAction()}, this.elementCaseDesign.shortcut4TemplateMenu());
         }
     }
 
+
+    private ShortCut getReportFitAttrAction() {
+        FormAdaptiveConfigUIProcessor adaptiveConfigUI = ExtraDesignClassManager.getInstance().getSingle(FormAdaptiveConfigUIProcessor.MARK_STRING);
+        if (adaptiveConfigUI != null) {
+            return adaptiveConfigUI.getConfigShortCut(this);
+        }
+        return new ReportFitAttrAction(this);
+    }
+
     /**
      * 权限细粒度模板菜单
      * 表单中去掉此菜单项
@@ -825,7 +835,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
 
         refreshWidgetLibPane();
     }
-    
+
     private void refreshWidgetLibPane() {
         if (EastRegionContainerPane.getInstance().getWidgetLibPane() == null) {
             new Thread() {