diff --git a/designer-base/src/com/fr/design/mainframe/DesignerFrame.java b/designer-base/src/com/fr/design/mainframe/DesignerFrame.java index f4766b798..df48ad0b7 100644 --- a/designer-base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/designer-base/src/com/fr/design/mainframe/DesignerFrame.java @@ -12,6 +12,7 @@ import com.fr.design.actions.core.ActionFactory; import com.fr.design.constants.UIConstants; import com.fr.design.data.DesignTableDataManager; import com.fr.design.data.datapane.TableDataTreePane; +import com.fr.design.env.RemoteWorkspace; import com.fr.design.event.DesignerOpenedListener; import com.fr.design.event.TargetModifiedEvent; import com.fr.design.event.TargetModifiedListener; diff --git a/designer-form/src/com/fr/design/mainframe/FormModelAdapter.java b/designer-form/src/com/fr/design/mainframe/FormModelAdapter.java index 65e9d41d8..3c1233fab 100644 --- a/designer-form/src/com/fr/design/mainframe/FormModelAdapter.java +++ b/designer-form/src/com/fr/design/mainframe/FormModelAdapter.java @@ -1,6 +1,8 @@ package com.fr.design.mainframe; import com.fr.base.Parameter; +import com.fr.base.TableData; +import com.fr.data.TableDataSource; import com.fr.design.DesignModelAdapter; import com.fr.design.file.HistoryTemplateListPane; import com.fr.form.main.Form; @@ -10,6 +12,9 @@ import com.fr.form.ui.DataControl; import com.fr.form.ui.ElementCaseEditor; import com.fr.form.ui.MultiFileEditor; import com.fr.form.ui.Widget; +import com.fr.main.parameter.ReportParameterAttr; +import com.fr.script.Calculator; +import com.fr.stable.ParameterProvider; import com.fr.stable.js.WidgetName; import java.util.ArrayList; @@ -87,20 +92,44 @@ public class FormModelAdapter extends DesignModelAdapter