冲突

designer_base/src/com/fr/design/ExtraDesignClassManager.java

@@ -134,12 +134,12 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
 
     private Set<ExportAttrTabProvider> exportAttrTabProviders;
 
+    private Set<VerifyDefineProvider> verifyDefineProviders;
+
     private Set<BackgroundQuickUIProvider> backgroundQuickUIProviders;
 
     private Set<BackgroundUIProvider> backgroundUIProviders;
 
-    private Set<VerifyDefineProvider> verifyDefineProviders;
-
     public TableDataPaneProcessor getTableDataPaneProcessor() {
         return tableDataPaneProcessor;
     }
@@ -970,4 +970,5 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
         writer.startTAG(XML_TAG);
         writer.end();
     }
+
 }

designer_base/src/com/fr/design/dialog/BasicScrollPane.java

@@ -154,8 +154,8 @@ public abstract class BasicScrollPane<T> extends BasicBeanPane<T>{
 				scrollBar.setVisible(false);
 			} else {
                 boolean show = isShowScrollBar();
-				scrollBar.setEnabled(show);
+                scrollBar.setEnabled(show);
-				scrollBar.setVisible(show);
+                scrollBar.setVisible(show);
 			}
 			maxheight = getHeight() - DET_HEIGHT;
 			if ((MAXVALUE - scrollBar.getVisibleAmount()) == 0) {
@@ -180,7 +180,8 @@ public abstract class BasicScrollPane<T> extends BasicBeanPane<T>{
 			}
 			leftcontentPane.validate();
 		}
-    }
+
+	}
 
     protected boolean isShowScrollBar() {
         return true;

designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java

@@ -13,7 +13,6 @@ import com.fr.stable.StringUtils;
 import java.awt.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.util.*;
 import java.util.List;
 import java.util.regex.Pattern;
 

designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java

@@ -7,19 +7,22 @@ import com.fr.design.designer.creator.XCreator;
 import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.gui.itable.AbstractPropertyTable;
 import com.fr.design.gui.itable.PropertyGroup;
-import com.fr.design.gui.xtable.PropertyGroupModel;
+import com.fr.design.gui.xtable.ReportAppPropertyGroupModel;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.WidgetPropertyPane;
-import com.fr.design.mainframe.widget.editors.DoubleEditor;
 import com.fr.design.mainframe.widget.editors.InChangeBooleanEditor;
+import com.fr.design.mainframe.widget.editors.RefinedDoubleEditor;
 import com.fr.form.ui.ElementCaseEditor;
 import com.fr.general.Inter;
+import com.fr.stable.fun.ReportFitAttrProvider;
 
 import javax.swing.table.TableModel;
 import java.beans.IntrospectionException;
 import java.util.ArrayList;
 import java.util.List;
 
+;
+
 /**
  * Created by Administrator on 2016/5/16/0016.
  */
@@ -42,6 +45,8 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{
     }
 
     protected List<CRPropertyDescriptor> createNonListenerProperties() throws IntrospectionException {
+        ReportFitAttrProvider attr = designer.getTarget().getFitAttr();
+
         CRPropertyDescriptor[] propertyTableEditor = {
                 new CRPropertyDescriptor("horziontalAttr", this.xCreator.toData().getClass()).setEditorClass(MobileFitEditor.class)
                         .setRendererClass(MobileFitRender.class)
@@ -65,7 +70,7 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{
 
     protected CRPropertyDescriptor[] revealHeightLimit() throws IntrospectionException {
         CRPropertyDescriptor heightLimitProperty = new CRPropertyDescriptor("heightPercent", this.xCreator.toData().getClass())
-                                                                .setEditorClass(DoubleEditor.class)
+                                                                .setEditorClass(RefinedDoubleEditor.class)
                                                                 .setI18NName(Inter.getLocText("Form-EC_heightpercent"))
                                                                 .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced");
         ArrayList<CRPropertyDescriptor> defaultList = (ArrayList<CRPropertyDescriptor>) createNonListenerProperties();
@@ -91,7 +96,7 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{
         }
 
 
-        groups.add(new PropertyGroup(new PropertyGroupModel(Inter.getLocText("FR-Designer_Fit-App"), xCreator, propertyTableEditor, designer)));
+        groups.add(new PropertyGroup(new ReportAppPropertyGroupModel(Inter.getLocText("FR-Designer_Fit-App"), xCreator, propertyTableEditor, designer)));
 
         TableModel model = new BeanTableModel();
         setModel(model);
@@ -107,4 +112,9 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{
         this.designer = designer;
         initPropertyGroups(this.designer.getTarget());
     }
+
+    @Override
+    public boolean isCellEditable(int row, int column) {
+        return false;
+    }
 }