From e14072f5a200612fc14a3c60d3b7f340b1469c48 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 12 Jun 2024 18:00:01 +0800 Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20=E6=96=B0=E5=A2=9E=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/img/nothing-none-gray.png | Bin 0 -> 5037 bytes .../src/assets/svg/icon_upload_outlined.svg | 4 +-- .../src/assets/svg/plugin-3dmap.svg | 1 + .../src/assets/svg/plugin-3dpie.svg | 16 ++++++++++ .../src/assets/svg/plugin-dameng.svg | 9 ++++++ .../src/assets/svg/plugin-default.svg | 3 ++ core/core-frontend/src/locales/zh-CN.ts | 5 +++ de-xpack | 2 +- .../dataease/api/xpack/plugin/PluginApi.java | 17 ++++++++++ .../api/xpack/plugin/vo/PluginVO.java | 30 ++++++++++++++++++ 10 files changed, 84 insertions(+), 3 deletions(-) create mode 100644 core/core-frontend/src/assets/img/nothing-none-gray.png create mode 100644 core/core-frontend/src/assets/svg/plugin-3dmap.svg create mode 100644 core/core-frontend/src/assets/svg/plugin-3dpie.svg create mode 100644 core/core-frontend/src/assets/svg/plugin-dameng.svg create mode 100644 core/core-frontend/src/assets/svg/plugin-default.svg create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/xpack/plugin/PluginApi.java create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/xpack/plugin/vo/PluginVO.java diff --git a/core/core-frontend/src/assets/img/nothing-none-gray.png b/core/core-frontend/src/assets/img/nothing-none-gray.png new file mode 100644 index 0000000000000000000000000000000000000000..1c308eae4711f86a337fc8075d47e973df920815 GIT binary patch literal 5037 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 vSWmBY0X9s@NZ{h(mx}w}QQ=jsf4Gw#2RYv - + + diff --git a/core/core-frontend/src/assets/svg/plugin-3dmap.svg b/core/core-frontend/src/assets/svg/plugin-3dmap.svg new file mode 100644 index 0000000000..f8b3e8b76c --- /dev/null +++ b/core/core-frontend/src/assets/svg/plugin-3dmap.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/core/core-frontend/src/assets/svg/plugin-3dpie.svg b/core/core-frontend/src/assets/svg/plugin-3dpie.svg new file mode 100644 index 0000000000..84dcb8f8a9 --- /dev/null +++ b/core/core-frontend/src/assets/svg/plugin-3dpie.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/core/core-frontend/src/assets/svg/plugin-dameng.svg b/core/core-frontend/src/assets/svg/plugin-dameng.svg new file mode 100644 index 0000000000..dade3a83c1 --- /dev/null +++ b/core/core-frontend/src/assets/svg/plugin-dameng.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/core/core-frontend/src/assets/svg/plugin-default.svg b/core/core-frontend/src/assets/svg/plugin-default.svg new file mode 100644 index 0000000000..6bdef216b7 --- /dev/null +++ b/core/core-frontend/src/assets/svg/plugin-default.svg @@ -0,0 +1,3 @@ + + + diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 3edfaa82df..82077935c0 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -2271,6 +2271,11 @@ export default { sure_bt: '确定', back_parent: '返回上一级' }, + plugin: { + 'flag-all': '全部', + 'flag-ds': '数据源插件', + 'flag-view': '图表插件' + }, online_map: { geometry: '地理信息', onlinemap: '在线地图', diff --git a/de-xpack b/de-xpack index bb258796ea..4e4115d980 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit bb258796ea5e3d47b02d4d09afb378479cc1e163 +Subproject commit 4e4115d9803717a06f114ef047183ab447f68470 diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/plugin/PluginApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/plugin/PluginApi.java new file mode 100644 index 0000000000..d9637a1e3c --- /dev/null +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/plugin/PluginApi.java @@ -0,0 +1,17 @@ +package io.dataease.api.xpack.plugin; + +import com.github.xiaoymin.knife4j.annotations.ApiSupport; +import io.dataease.api.xpack.plugin.vo.PluginVO; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.web.bind.annotation.GetMapping; + +import java.util.List; + +@Tag(name = "系统设置:插件管理") +@ApiSupport(order = 2) +public interface PluginApi { + + @GetMapping("/query") + List query(); + +} diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/plugin/vo/PluginVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/plugin/vo/PluginVO.java new file mode 100644 index 0000000000..2447fe2ce6 --- /dev/null +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/plugin/vo/PluginVO.java @@ -0,0 +1,30 @@ +package io.dataease.api.xpack.plugin.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serial; +import java.io.Serializable; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class PluginVO implements Serializable { + @Serial + private static final long serialVersionUID = -3889122930435272191L; + + private Long id; + + private String name; + + private String flag; + + private String icon; + + private String version; + + private Long installTime; + + private String developer; +}