diff --git a/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java b/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java index 0f5685a76c..f1a88383ef 100644 --- a/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java +++ b/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java @@ -94,6 +94,7 @@ public class MenuManage { || coreMenu.getId().equals(17L) || coreMenu.getId().equals(18L) || coreMenu.getId().equals(21L) - || coreMenu.getPid().equals(21L); + || coreMenu.getPid().equals(21L) + || coreMenu.getId().equals(25L); } } diff --git a/core/core-backend/src/main/resources/i18n/core_zh_CN.properties b/core/core-backend/src/main/resources/i18n/core_zh_CN.properties index a4c4d2a969..e01c771929 100644 --- a/core/core-backend/src/main/resources/i18n/core_zh_CN.properties +++ b/core/core-backend/src/main/resources/i18n/core_zh_CN.properties @@ -22,6 +22,7 @@ i18n_menu.sync=\u540C\u6B65\u7BA1\u7406 i18n_menu.summary=\u6982\u89C8 i18n_menu.ds=\u6570\u636E\u6E90\u7BA1\u7406 i18n_menu.task=\u4EFB\u52A1\u7BA1\u7406 +i18n_menu.embedded=\u5D4C\u5165\u5F0F\u7BA1\u7406 i18n_field_name_repeat=\u6709\u91CD\u590D\u5B57\u6BB5\u540D\uFF1A i18n_pid_not_eq_id=\u79FB\u52A8\u76EE\u6807\u4E0D\u80FD\u662F\u81EA\u5DF1\u6216\u5B50\u76EE\u5F55 i18n_ds_name_exists=\u8BE5\u5206\u7EC4\u4E0B\u540D\u79F0\u91CD\u590D diff --git a/core/core-frontend/src/assets/svg/embedded.svg b/core/core-frontend/src/assets/svg/embedded.svg new file mode 100644 index 0000000000..251744ab6e --- /dev/null +++ b/core/core-frontend/src/assets/svg/embedded.svg @@ -0,0 +1,4 @@ + + + + diff --git a/de-xpack b/de-xpack index 9fe00fdb3a..a0ed462213 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 9fe00fdb3accef3e87d27dbd59f8a3c6e1cf51c9 +Subproject commit a0ed462213c8f274e09305cdc2ab0b238e9a2547 diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/api/EmbeddedApi.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/api/EmbeddedApi.java new file mode 100644 index 0000000000..7f2ffb2eb9 --- /dev/null +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/api/EmbeddedApi.java @@ -0,0 +1,30 @@ +package io.dataease.api.permissions.embedded.api; + +import io.dataease.api.permissions.embedded.dto.EmbeddedCreator; +import io.dataease.api.permissions.embedded.dto.EmbeddedEditor; +import io.dataease.api.permissions.embedded.dto.EmbeddedResetRequest; +import io.dataease.api.permissions.embedded.vo.EmbeddedGridVO; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +public interface EmbeddedApi { + + @GetMapping("/queryGrid") + List queryGrid(); + + @PostMapping("/create") + void create(@RequestBody EmbeddedCreator creator); + + @PostMapping("/edit") + void edit(@RequestBody EmbeddedEditor editor); + + @PostMapping("/delete/{id}") + void delete(@PathVariable("id") Long id); + + @PostMapping("/reset") + void reset(@RequestBody EmbeddedResetRequest request); +} diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/dto/EmbeddedCreator.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/dto/EmbeddedCreator.java new file mode 100644 index 0000000000..13f09cb844 --- /dev/null +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/dto/EmbeddedCreator.java @@ -0,0 +1,13 @@ +package io.dataease.api.permissions.embedded.dto; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class EmbeddedCreator implements Serializable { + + private String name; + + private String domain; +} diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/dto/EmbeddedEditor.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/dto/EmbeddedEditor.java new file mode 100644 index 0000000000..8227621660 --- /dev/null +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/dto/EmbeddedEditor.java @@ -0,0 +1,15 @@ +package io.dataease.api.permissions.embedded.dto; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class EmbeddedEditor implements Serializable { + + private Long id; + + private String name; + + private String domain; +} diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/dto/EmbeddedResetRequest.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/dto/EmbeddedResetRequest.java new file mode 100644 index 0000000000..fb74fc6e47 --- /dev/null +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/dto/EmbeddedResetRequest.java @@ -0,0 +1,13 @@ +package io.dataease.api.permissions.embedded.dto; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class EmbeddedResetRequest implements Serializable { + + private Long id; + + private String appSecret; +} diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/vo/EmbeddedGridVO.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/vo/EmbeddedGridVO.java new file mode 100644 index 0000000000..0d0cb68d37 --- /dev/null +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/vo/EmbeddedGridVO.java @@ -0,0 +1,22 @@ +package io.dataease.api.permissions.embedded.vo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class EmbeddedGridVO implements Serializable { + + @JsonSerialize(using= ToStringSerializer.class) + private Long id; + + private String name; + + private String appId; + + private String appSecret; + + private String domain; +}