From 41c53ab8ca171ca6adc5e9852c6e346cfad9aafd Mon Sep 17 00:00:00 2001 From: neil Date: Thu, 16 Jun 2016 16:03:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/ExtraDesignClassManager.java | 5 +++-- .../com/fr/design/dialog/BasicScrollPane.java | 7 ++++--- .../editor/editor/ColumnSelectedEditor.java | 1 - .../mobile/ElementCasePropertyTable.java | 18 ++++++++++++++---- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/designer_base/src/com/fr/design/ExtraDesignClassManager.java b/designer_base/src/com/fr/design/ExtraDesignClassManager.java index b0a6bb2a7..bc84cd662 100644 --- a/designer_base/src/com/fr/design/ExtraDesignClassManager.java +++ b/designer_base/src/com/fr/design/ExtraDesignClassManager.java @@ -134,12 +134,12 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi private Set exportAttrTabProviders; + private Set verifyDefineProviders; + private Set backgroundQuickUIProviders; private Set backgroundUIProviders; - private Set verifyDefineProviders; - public TableDataPaneProcessor getTableDataPaneProcessor() { return tableDataPaneProcessor; } @@ -970,4 +970,5 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi writer.startTAG(XML_TAG); writer.end(); } + } \ No newline at end of file diff --git a/designer_base/src/com/fr/design/dialog/BasicScrollPane.java b/designer_base/src/com/fr/design/dialog/BasicScrollPane.java index d4fabca8b..bdb5a012f 100644 --- a/designer_base/src/com/fr/design/dialog/BasicScrollPane.java +++ b/designer_base/src/com/fr/design/dialog/BasicScrollPane.java @@ -154,8 +154,8 @@ public abstract class BasicScrollPane extends BasicBeanPane{ scrollBar.setVisible(false); } else { boolean show = isShowScrollBar(); - scrollBar.setEnabled(show); - scrollBar.setVisible(show); + scrollBar.setEnabled(show); + scrollBar.setVisible(show); } maxheight = getHeight() - DET_HEIGHT; if ((MAXVALUE - scrollBar.getVisibleAmount()) == 0) { @@ -180,7 +180,8 @@ public abstract class BasicScrollPane extends BasicBeanPane{ } leftcontentPane.validate(); } - } + + } protected boolean isShowScrollBar() { return true; diff --git a/designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java b/designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java index 62f829aaf..0f1c50a5f 100644 --- a/designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java +++ b/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; diff --git a/designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java b/designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java index 9d4a14d5b..c4fdf396b 100644 --- a/designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java +++ b/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 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 defaultList = (ArrayList) 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; + } }