From f86ac7bdc4ba098093e36fa0f7175f85f0001a1f Mon Sep 17 00:00:00 2001 From: kerry Date: Thu, 5 Jul 2018 11:54:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-9441=E3=80=9010.0=E4=B8=80=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92=E3=80=91=E4=BB=8E=E6=95=B0=E6=8D=AE=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=95=8C=E9=9D=A2=E5=AE=9A=E4=B9=89=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E7=95=8C=E9=9D=A2=EF=BC=8C=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E6=B2=A1=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/data/datapane/connect/ConnectionComboBoxPanel.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer-base/src/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java b/designer-base/src/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java index 9976bd94d6..f63b37d6cf 100644 --- a/designer-base/src/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java +++ b/designer-base/src/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java @@ -108,7 +108,6 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel { //如果更新失败，则不关闭对话框，也不写xml文件，并且将对话框定位在请重命名的那个对象页面 return; } - connectionListPane.update(connectionConfig); DesignerContext.getDesignerBean("databasename").refreshBeanElement(); } From e6f32294318a257f026d8510c31593fa59a89c85 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Thu, 5 Jul 2018 14:59:40 +0800 Subject: [PATCH 2/3] REPORT-9367 --- .../fr/design/mainframe/DesignerFrame.java | 1 + .../fr/design/mainframe/FormModelAdapter.java | 43 ++++++++++++++++--- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/designer-base/src/com/fr/design/mainframe/DesignerFrame.java b/designer-base/src/com/fr/design/mainframe/DesignerFrame.java index f4766b798e..df48ad0b72 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 65e9d41d8b..3c1233fab0 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 { public boolean dealWithAllCards() { return true; } - + public void dealWith(Widget widget) { - boolean isSupportAsHypelink = widget.acceptType(ElementCaseEditor.class) || widget.acceptType(BaseChartEditor.class); - //可以超链的对象不包含本身; 目前只有图表和报表块可以 - // bug66182 删了条件：!ComparatorUtils.equals(editingECName, widget.getWidgetName()) 让当前表单对象可以选到自己 - if (isSupportAsHypelink){ - linkAbleList.add( widget); - } + boolean isSupportAsHypelink = widget.acceptType(ElementCaseEditor.class) || widget.acceptType(BaseChartEditor.class); + //可以超链的对象不包含本身; 目前只有图表和报表块可以 + // bug66182 删了条件：!ComparatorUtils.equals(editingECName, widget.getWidgetName()) 让当前表单对象可以选到自己 + if (isSupportAsHypelink) { + linkAbleList.add(widget); + } } }, Widget.class); return linkAbleList.toArray(new Widget[linkAbleList.size()]); } + // 报表参数 + @Override + public Parameter[] getReportParameters() { + Parameter[] rpa = this.getBook().getTemplateParameters(); + return rpa == null ? new Parameter[0] : rpa; + } + + // 数据源参数 + @Override + public Parameter[] getTableDataParameters() { + TableDataSource source = this.getBook(); + Calculator c = Calculator.createCalculator(); + c.setAttribute(TableDataSource.KEY, source); + java.util.List list = new java.util.ArrayList(); + java.util.Iterator nameIt = this.getBook().getTableDataNameIterator(); + while (nameIt.hasNext()) { + TableData td = source.getTableData(nameIt.next()); + if (td.getParameters(c) != null) { + list.addAll(java.util.Arrays.asList(td.getParameters(c))); + } + } + return list.toArray(new Parameter[list.size()]); + } + @Override public Parameter[] getParameters() { return this.getBook().getParameters(); From f40b9eb1583786e95d5899c3362981facb6ea2ee Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Thu, 5 Jul 2018 15:02:48 +0800 Subject: [PATCH 3/3] REPORT-9367 --- designer-base/src/com/fr/design/mainframe/DesignerFrame.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer-base/src/com/fr/design/mainframe/DesignerFrame.java b/designer-base/src/com/fr/design/mainframe/DesignerFrame.java index df48ad0b72..f4766b798e 100644 --- a/designer-base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/designer-base/src/com/fr/design/mainframe/DesignerFrame.java @@ -12,7 +12,6 @@ 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;