Browse Source

Merge remote-tracking branch 'origin/fbp/release' into fbp/release

fbp/merge
Destiny.Lin 6 months ago
parent
commit
c10aebec68
  1. 6
      designer-base/src/main/java/com/fr/design/data/tabledata/datacenter/DatacentersPane.java
  2. 2
      designer-base/src/main/resources/com/fr/design/data/tabledata/datacenter/web/data-choose.main.css
  3. 106
      designer-base/src/main/resources/com/fr/design/data/tabledata/datacenter/web/data-choose.main.js

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

2
designer-base/src/main/resources/com/fr/design/data/tabledata/datacenter/web/data-choose.main.css

File diff suppressed because one or more lines are too long

106
designer-base/src/main/resources/com/fr/design/data/tabledata/datacenter/web/data-choose.main.js

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save