Browse Source

Pull request #14692: REPORT-131407 & REPORT-131586

Merge in DESIGN/design from ~VITO/c-design:fbp/release to fbp/release

* commit '4b3ea735a0b7c6642e5cff22c32efeb871737ac5':
  REPORT-131586 修复复制数据集在编辑情况下名称不变的问题
  REPORT-131407 名称统一为数据中心
fbp/release
vito-刘恒霖 3 months ago
parent
commit
f23abfe472
  1. 6
      designer-base/src/main/java/com/fr/design/data/tabledata/datacenter/DatacentersPane.java

6
designer-base/src/main/java/com/fr/design/data/tabledata/datacenter/DatacentersPane.java

@ -110,7 +110,9 @@ public class DatacentersPane extends AbstractTableDataPane<DCTableData> {
namePane.setObjectName(tableDataBean.getDsName()); namePane.setObjectName(tableDataBean.getDsName());
return DCTableData.fromBean(tableDataBean); return DCTableData.fromBean(tableDataBean);
} else { } else {
// 复制的场景下,不打开界面需要返回数据集 // 复制的场景下,不打开界面需要返回数据集,需同步面板的名称
dcTableData.setDsName(namePane.getObjectName());
dcTableData.setName(namePane.getObjectName());
return dcTableData; return dcTableData;
} }
} }
@ -126,6 +128,6 @@ public class DatacentersPane extends AbstractTableDataPane<DCTableData> {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return Toolkit.i18nText("Fine-Design_Report_Add_TableData"); return Toolkit.i18nText("Fine-Design_Basic_DS_Datacenters");
} }
} }

Loading…
Cancel
Save