REPORT-10591 自适应插件内置 设计器部分

designer-base/src/main/java/com/fr/design/reportfit/FitType.java

@@ -1,4 +1,4 @@
-package com.fr.conf;
+package com.fr.design.reportfit;
 
 import com.fr.design.designer.properties.items.Item;
 import com.fr.report.fun.ReportFitAttrProvider;
@@ -7,7 +7,7 @@ import com.fr.stable.StringUtils;
 /**
  * Created by Administrator on 2016/4/13/0013.
  */
-public enum FitAttrState {
+public enum FitType {
     DEFAULT(0) {
         @Override
         public String description() {
@@ -41,17 +41,17 @@ public enum FitAttrState {
     private int state;
 
 
-    FitAttrState(int state) {
+    FitType(int state) {
         this.state = state;
     }
 
-    public static FitAttrState parse(ReportFitAttrProvider attr) {
+    public static FitType parse(ReportFitAttrProvider attr) {
 
         if (attr == null) {
             return DEFAULT;
         }
 
-        for (FitAttrState attrState : values()) {
+        for (FitType attrState : values()) {
             if (attrState.state == attr.fitStateInPC()) {
                 return attrState;
             }

designer-base/src/main/java/com/fr/design/reportfit/menupane/BrowserFitAttrPane.java

@@ -1,6 +1,6 @@
-package com.fr.design.mainframe.menupane;
+package com.fr.design.reportfit.menupane;
 
-import com.fr.conf.FitAttrState;
+import com.fr.design.reportfit.FitType;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIRadioButton;
@@ -81,10 +81,10 @@ public class BrowserFitAttrPane extends BasicBeanPane<ReportFitAttrProvider> {
         fontRadioGroup.addActionListener(actionListener);
 
         fitRadionGroup = new FitRadioGroup();
-        defaultRadio = new UIRadioButton(FitAttrState.DEFAULT.description());
-        horizonRadio = new UIRadioButton(FitAttrState.HORIZONTAL_FIT.description());
-        doubleRadio = new UIRadioButton(FitAttrState.DOUBLE_FIT.description());
-        notFitRadio = new UIRadioButton(FitAttrState.NOT_FIT.description());
+        defaultRadio = new UIRadioButton(FitType.DEFAULT.description());
+        horizonRadio = new UIRadioButton(FitType.HORIZONTAL_FIT.description());
+        doubleRadio = new UIRadioButton(FitType.DOUBLE_FIT.description());
+        notFitRadio = new UIRadioButton(FitType.NOT_FIT.description());
         addRadioToGroup(fitRadionGroup, defaultRadio, horizonRadio, doubleRadio, notFitRadio);
         fitRadionGroup.addActionListener(actionListener);
 

designer-base/src/main/java/com/fr/design/reportfit/menupane/FitPreviewPane.java

@@ -1,4 +1,4 @@
-package com.fr.design.mainframe.menupane;
+package com.fr.design.reportfit.menupane;
 
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ilable.UILabel;

designer-base/src/main/java/com/fr/design/reportfit/menupane/FitRadioGroup.java

@@ -1,4 +1,4 @@
-package com.fr.design.mainframe.menupane;
+package com.fr.design.reportfit.menupane;
 
 import com.fr.design.gui.ibutton.UIRadioButton;
 

designer-base/src/main/java/com/fr/design/reportfit/menupane/FontRadioGroup.java

@@ -1,4 +1,4 @@
-package com.fr.design.mainframe.menupane;
+package com.fr.design.reportfit.menupane;
 
 /**
  * 字体的两个选项组成的group

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

@@ -1,4 +1,4 @@
-package com.fr.design.mainframe.menupane;
+package com.fr.design.reportfit.menupane;
 
 import com.fr.base.BaseUtils;
 import com.fr.design.actions.JTemplateAction;

designer-base/src/main/java/com/fr/design/reportfit/menupane/ReportFitAttrPane.java

@@ -1,4 +1,4 @@
-package com.fr.design.mainframe.menupane;
+package com.fr.design.reportfit.menupane;
 
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.report.fun.ReportFitAttrProvider;

designer-base/src/main/java/com/fr/design/reportfit/menupane/TemplateBrowserFitAttrPane.java

@@ -1,4 +1,4 @@
-package com.fr.design.mainframe.menupane;
+package com.fr.design.reportfit.menupane;
 
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.log.FineLoggerFactory;

designer-base/src/main/java/com/fr/design/reportfit/menupane/TemplateFitAttrPane.java

@@ -1,4 +1,4 @@
-package com.fr.design.mainframe.menupane;
+package com.fr.design.reportfit.menupane;
 
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.report.fun.ReportFitAttrProvider;

designer-base/src/main/java/com/fr/design/utils/DesignUtils.java

@@ -65,12 +65,12 @@ public class DesignUtils {
      * @return 启动了返回true
      */
     public static boolean isStarted() {
-        try {
-            new Socket("localhost", port);
-            return true;
-        } catch (Exception exp) {
-
-        }
+//        try {
+//            new Socket("localhost", port);
+//            return true;
+//        } catch (Exception exp) {
+//
+//        }
         return false;
     }
 

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

@@ -32,11 +32,10 @@ import com.fr.design.gui.xpane.FormHyperlinkGroupPane;
 import com.fr.design.gui.xpane.FormHyperlinkGroupPaneNoPop;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.actions.EmbeddedFormExportExportAction;
-import com.fr.design.mainframe.actions.FormMobileAttrAction;
 import com.fr.design.mainframe.actions.TemplateParameterAction;
 import com.fr.design.mainframe.form.FormECCompositeProvider;
 import com.fr.design.mainframe.form.FormECDesignerProvider;
-import com.fr.design.mainframe.menupane.ReportFitAttrAction;
+import com.fr.design.reportfit.menupane.ReportFitAttrAction;
 import com.fr.design.mainframe.templateinfo.JFormProcessInfo;
 import com.fr.design.mainframe.templateinfo.TemplateProcessInfo;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDock;

designer-form/src/main/java/com/fr/design/mainframe/widget/propertypane/BrowserFitAlignmentItems.java

@@ -1,15 +1,15 @@
 package com.fr.design.mainframe.widget.propertypane;
 
-import com.fr.conf.FitAttrState;
+import com.fr.design.reportfit.FitType;
 import com.fr.design.designer.properties.items.Item;
 import com.fr.design.designer.properties.items.ItemProvider;
 
 public class BrowserFitAlignmentItems implements ItemProvider {
 
     private static Item[] VALUE_ITEMS = {
-            FitAttrState.HORIZONTAL_FIT.propertyItem(),
-            FitAttrState.DOUBLE_FIT.propertyItem(),
-            FitAttrState.NOT_FIT.propertyItem(),
+            FitType.HORIZONTAL_FIT.propertyItem(),
+            FitType.DOUBLE_FIT.propertyItem(),
+            FitType.NOT_FIT.propertyItem(),
     };
 
     @Override

designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java

@@ -41,7 +41,7 @@ import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icontainer.UIModeControlContainer;
 import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.mainframe.cell.QuickEditorRegion;
-import com.fr.design.mainframe.menupane.ReportFitAttrAction;
+import com.fr.design.reportfit.menupane.ReportFitAttrAction;
 import com.fr.design.mainframe.templateinfo.JWorkBookProcessInfo;
 import com.fr.design.mainframe.templateinfo.TemplateProcessInfo;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;