From fc349fcbb72ad0575da1671127dff5b3aa05e330 Mon Sep 17 00:00:00 2001 From: "Richard.Fang" Date: Tue, 6 Aug 2024 11:57:48 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-127436=E3=80=90NewUI=E3=80=91=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=99=A8=E6=A0=B7=E5=BC=8F=E7=BF=BB=E6=96=B0-?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=95=B0=E6=8D=AE=E9=9B=86icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wrapper/ServerTableDataWrapper.java | 2 +- .../icon/dataset/server_database_warning.svg | 20 +++++++++++++++++++ .../theme/icon/widget/apply_components.svg | 13 ++++++++++++ .../icon/widget/apply_components_disable.svg | 13 ++++++++++++ .../com/fine/theme/icon/widget/prewidget.svg | 17 ++++++---------- .../theme/icon/widget/prewidget_disable.svg | 17 ++++++---------- .../fine/theme/light/ui/fine_light.icon.json | 2 ++ 7 files changed, 61 insertions(+), 23 deletions(-) create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/dataset/server_database_warning.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/widget/apply_components.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/widget/apply_components_disable.svg diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/ServerTableDataWrapper.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/ServerTableDataWrapper.java index df20f0d07a..fb02f1a3f8 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/ServerTableDataWrapper.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/ServerTableDataWrapper.java @@ -26,7 +26,7 @@ public final class ServerTableDataWrapper extends AbstractTableDataWrapper { public Icon getIcon() { if (tabledata instanceof DBTableData) { if (StringUtils.isBlank(((DBTableData) tabledata).getQuery())) { - return new WarningIcon(SVGLoader.load("/com/fr/design/standard/server_database.svg")); + return new LazyIcon("server_database_warning"); } else { return new LazyIcon("server_database"); diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/server_database_warning.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/server_database_warning.svg new file mode 100644 index 0000000000..a87767c3cc --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/server_database_warning.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/apply_components.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/apply_components.svg new file mode 100644 index 0000000000..8bea108a5a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/apply_components.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/apply_components_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/apply_components_disable.svg new file mode 100644 index 0000000000..49cc4a0b8a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/apply_components_disable.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/prewidget.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/prewidget.svg index 8bea108a5a..a0abe26237 100644 --- a/designer-base/src/main/resources/com/fine/theme/icon/widget/prewidget.svg +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/prewidget.svg @@ -1,13 +1,8 @@ - - - - - - - - - - - + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/prewidget_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/prewidget_disable.svg index 49cc4a0b8a..c41228a524 100644 --- a/designer-base/src/main/resources/com/fine/theme/icon/widget/prewidget_disable.svg +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/prewidget_disable.svg @@ -1,13 +1,8 @@ - - - - - - - - - - - + + + + + + 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 7bc179770b..5353466cbf 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 @@ -49,6 +49,7 @@ "batch_esd_off": "dataset/batch_esd_off.svg", "edit": "dataset/edit.svg", "server_database": "dataset/server_database.svg", + "server_database_warning": "dataset/server_database_warning.svg", "field": "dataset/field.svg", "folder": "filetree/folder.svg", "folder_open": "filetree/folder_open.svg", @@ -310,6 +311,7 @@ "password_field": "widget/password_field.svg", "picture": "widget/picture.svg", "widget_preview": "widget/preview.svg", + "apply_components": "widget/apply_components.svg", "prewidget": "widget/prewidget.svg", "tab": "widget/tab.svg", "text_area": "widget/text_area.svg",