Pull request #14631: REPORT-113978 补充一些资源

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

* commit 'c569948b46dca24d6a4596f2b020addd77d8019f':
  REPORT-113978 数据中心窗口大小直接设置为主窗口的百分比
  REPORT-113978 前端修复国际化
  REPORT-113978 补充一些资源

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() {

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

@@ -53,9 +53,6 @@ public class JxTableDataNamePane extends NamePane {
         return this.dialog;
     }
 
-    private static final int MIN_WIDTH = 1000;
-    private static final int MIN_HEIGHT = 600;
-
     /**
      * 计算数据集窗口大小
      * 宽：80%，高：90%
@@ -64,9 +61,7 @@ public class JxTableDataNamePane extends NamePane {
      */
     public static Dimension calculatePaneDimension() {
         DesignerFrame parent = DesignerContext.getDesignerFrame();
-        int width = Math.max((int) (parent.getWidth() * 0.8), MIN_WIDTH);
-        int height = Math.max((int) (parent.getHeight() * 0.9), MIN_HEIGHT);
-        return new Dimension(width, height);
+        return new Dimension((int) (parent.getWidth() * 0.8), (int) (parent.getHeight() * 0.9));
     }
 }
 

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);

designer-base/src/main/resources/com/fine/theme/icon/dataset/datacenter.svg

@@ -0,0 +1,23 @@
+<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g clip-path="url(#clip0_32_84473)">
+        <path d="M124.798 129.634C127.02 128.594 129.607 128.595 131.83 129.634L228.789 174.973C231.854 176.406 231.853 180.648 228.788 182.08L131.908 227.347C129.686 228.385 127.098 228.384 124.877 227.345L27.988 182.006C24.925 180.573 24.9257 176.332 27.9892 174.899L124.798 129.634Z" fill="#87B0F7"/>
+        <path d="M124.798 126.634C127.02 125.594 129.607 125.595 131.83 126.634L228.789 171.973C231.854 173.406 231.853 177.648 228.788 179.08L131.908 224.347C129.686 225.385 127.098 225.384 124.877 224.345L27.988 179.006C24.9249 177.573 24.9256 173.332 27.9891 171.899L124.798 126.634Z" fill="url(#paint0_linear_32_84473)"/>
+        <path d="M124.798 82.1335C127.02 81.0945 129.607 81.0945 131.83 82.1336L228.789 127.473C231.854 128.906 231.853 133.148 228.788 134.58L131.908 179.847C129.686 180.885 127.098 180.884 124.877 179.845L27.988 134.506C24.925 133.073 24.9257 128.832 27.9892 127.399L124.798 82.1335Z" fill="#5285EA"/>
+        <path d="M124.798 79.1335C127.02 78.0945 129.607 78.0945 131.83 79.1336L228.789 124.473C231.854 125.906 231.853 130.148 228.788 131.58L131.908 176.847C129.686 177.885 127.098 177.884 124.877 176.845L27.988 131.506C24.9249 130.073 24.9256 125.832 27.9891 124.399L124.798 79.1335Z" fill="url(#paint1_linear_32_84473)"/>
+        <path d="M124.798 34.6335C127.02 33.5945 129.607 33.5945 131.83 34.6336L228.789 79.9726C231.854 81.4056 231.853 85.6483 228.788 87.0803L131.908 132.347C129.686 133.385 127.098 133.384 124.877 132.345L27.988 87.006C24.925 85.5726 24.9257 81.3317 27.9892 79.8992L124.798 34.6335Z" fill="#1C4BBA"/>
+        <path d="M124.798 31.6335C127.02 30.5945 129.607 30.5945 131.83 31.6336L228.789 76.9726C231.854 78.4056 231.853 82.6483 228.788 84.0803L131.908 129.347C129.686 130.385 127.098 130.384 124.877 129.345L27.988 84.006C24.925 82.5726 24.9257 78.3317 27.9892 76.8992L124.798 31.6335Z" fill="#2C60DB"/>
+    </g>
+    <defs>
+        <linearGradient id="paint0_linear_32_84473" x1="128" y1="233.5" x2="124.045" y2="93.1114" gradientUnits="userSpaceOnUse">
+            <stop stop-color="#CDE0FF"/>
+            <stop offset="0.996611" stop-color="#98BFFF"/>
+        </linearGradient>
+        <linearGradient id="paint1_linear_32_84473" x1="119.5" y1="48" x2="127.318" y2="165.78" gradientUnits="userSpaceOnUse">
+            <stop stop-color="#5795FF"/>
+            <stop offset="1" stop-color="#84B1FF"/>
+        </linearGradient>
+        <clipPath id="clip0_32_84473">
+            <rect width="256" height="256" fill="white"/>
+        </clipPath>
+    </defs>
+</svg>

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",