diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java index 8d98e11357..c1adf134a4 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java @@ -11,12 +11,6 @@ import com.fr.data.impl.EmbeddedTableData; import com.fr.data.impl.FileTableData; import com.fr.data.impl.RecursionTableData; import com.fine.theme.icon.LazyIcon; -import com.fr.data.impl.ClassTableData; -import com.fr.data.impl.ConditionTableData; -import com.fr.data.impl.DBTableData; -import com.fr.data.impl.EmbeddedTableData; -import com.fr.data.impl.FileTableData; -import com.fr.data.impl.RecursionTableData; import com.fr.data.impl.storeproc.StoreProcedure; import com.fr.datacenters.tabledata.DCTableData; import com.fr.design.ExtraDesignClassManager; @@ -31,16 +25,6 @@ import com.fr.design.data.tabledata.tabledatapane.GlobalTreeTableDataPane; import com.fr.design.data.tabledata.tabledatapane.MultiTDTableDataPane; import com.fr.design.data.tabledata.tabledatapane.ProcedureDataPane; import com.fr.design.data.tabledata.tabledatapane.TreeTableDataPane; -import com.fr.design.data.tabledata.tabledatapane.ClassTableDataPane; -import com.fr.design.data.tabledata.tabledatapane.DBTableDataPane; -import com.fr.design.data.tabledata.tabledatapane.EmbeddedTableDataPane; -import com.fr.design.data.tabledata.tabledatapane.FileTableDataSmallHeightPane; -import com.fr.design.data.tabledata.tabledatapane.FileTableDataSmallPane; -import com.fr.design.data.tabledata.tabledatapane.GlobalMultiTDTableDataPane; -import com.fr.design.data.tabledata.tabledatapane.GlobalTreeTableDataPane; -import com.fr.design.data.tabledata.tabledatapane.MultiTDTableDataPane; -import com.fr.design.data.tabledata.tabledatapane.ProcedureDataPane; -import com.fr.design.data.tabledata.tabledatapane.TreeTableDataPane; import com.fr.stable.ArrayUtils; import com.fr.workspace.WorkContext; @@ -109,8 +93,8 @@ public class TableDataCreatorProducer { private TableDataNameObjectCreator[] createDatacentersTableDataCreator() { if (!WorkContext.getCurrent().isLocal()) { return new TableDataNameObjectCreator[]{ - new TableDataNameObjectCreator(i18nText("Dec-Authority_Data_Center"), - "/com/fr/design/standard/server_database_normal.svg", + new TableDataNameObjectCreator(i18nText("Fine-Design_Basic_DS_Datacenters"), + new LazyIcon("datacenter"), DCTableData.class, DatacentersPane.class) { @Override public boolean shouldInsertSeparator() { @@ -125,6 +109,7 @@ public class TableDataCreatorProducer { /** * 服务器数据集 + * * @return TableDataNameObjectCreator[] */ public TableDataNameObjectCreator[] createServerTableDataCreator() { diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java index c5d8731407..096fcc420d 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java @@ -76,8 +76,8 @@ public abstract class TableDataFactory { //defaultMap.put(MultiFieldTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/database_normal.svg", MultiFieldTableData.class, null)); defaultMap.put(DCTableData.class.getName(), new TableDataNameObjectCreator( - i18nText("Dec-Authority_Data_Center"), - "/com/fr/design/standard/store_procedure_normal.svg", + i18nText("Fine-Design_Basic_DS_Datacenters"), + new LazyIcon("datacenter"), DCTableData.class, DatacentersPane.class)); map.putAll(defaultMap); diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/datacenter.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/datacenter.svg new file mode 100644 index 0000000000..abba82dab3 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/datacenter.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json b/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json index 8ceab59960..d73d090802 100644 --- a/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json +++ b/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json @@ -48,6 +48,9 @@ "file": "dataset/file.svg", "tree": "dataset/tree.svg", "store_procedure": "dataset/store_procedure.svg", + "datacenter": { + "normal": "dataset/datacenter.svg" + }, "batch_esd_on": "dataset/batch_esd_on.svg", "batch_esd_off": "dataset/batch_esd_off.svg", "edit": "dataset/edit.svg",