From 5bc800cb60cd2c2d4c2512c30833a8faf31a0a95 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 16 Dec 2024 12:47:53 +0800 Subject: [PATCH] =?UTF-8?q?perf(X-Pack):=20=E5=B5=8C=E5=85=A5=E5=BC=8F?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96-?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/locales/en-US.ts | 2 ++ core/core-frontend/src/locales/tw.ts | 2 ++ core/core-frontend/src/locales/zh-CN.ts | 2 ++ de-xpack | 2 +- .../api/permissions/embedded/api/EmbeddedApi.java | 11 +++++++++-- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/core/core-frontend/src/locales/en-US.ts b/core/core-frontend/src/locales/en-US.ts index 9a64b09328..0e067fa022 100644 --- a/core/core-frontend/src/locales/en-US.ts +++ b/core/core-frontend/src/locales/en-US.ts @@ -561,6 +561,8 @@ export default { embedded_secret_len_change: 'The key length has changed. The key will be reset soon. Are you sure?', embedded_management: 'Embedded management', + embedded_del_confirm: 'Are you sure you want to delete {0} applications?', + embedded_search_placeholder: 'Search by application name, APP ID, and cross-domain settings.', to_5_applications: 'You can create up to 5 applications', update_app_secret: 'Are you sure you want to update the APP Secret?', operate_with_caution: diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index 404da771f1..5534201b36 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -545,6 +545,8 @@ export default { cross_domain_settings: '跨域設定', embedded_secret_len_change: '金鑰長度變化，金鑰即將重置，是否確認', embedded_management: '嵌入式管理', + embedded_del_confirm: '確定刪除 {0} 個應用嗎？', + embedded_search_placeholder: '通過應用名稱、APP ID、跨域設置搜索', to_5_applications: '最多支援創建5個應用程式', update_app_secret: '確定更新APP Secret嗎？ ', operate_with_caution: '重置後現有的APP Secret將會失效，請謹慎操作。 ', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index f4fbe0ce7c..c3e47716ac 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -548,6 +548,8 @@ export default { cross_domain_settings: '跨域设置', embedded_secret_len_change: '密钥长度变化，密钥即将重置，是否确认', embedded_management: '嵌入式管理', + embedded_del_confirm: '确定删除 {0} 个应用吗？', + embedded_search_placeholder: '通过应用名称、APP ID、跨域设置搜索', to_5_applications: '最多支持创建 {0} 个应用', update_app_secret: '确定更新APP Secret吗？', operate_with_caution: '重置后现有的APP Secret将会失效，请谨慎操作。', diff --git a/de-xpack b/de-xpack index 2d267e3804..05b8dcd659 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 2d267e3804c4f96c753784371bcbe63134b12b4c +Subproject commit 05b8dcd659c647f277f1175f9e9dec089038ce5c 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 index 1667367ec3..960f806351 100644 --- 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 @@ -1,5 +1,6 @@ package io.dataease.api.permissions.embedded.api; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.api.permissions.embedded.dto.EmbeddedCreator; @@ -8,6 +9,7 @@ import io.dataease.api.permissions.embedded.dto.EmbeddedOrigin; import io.dataease.api.permissions.embedded.dto.EmbeddedResetRequest; import io.dataease.api.permissions.embedded.vo.EmbeddedGridVO; import io.dataease.license.config.XpackResource; +import io.dataease.model.KeywordRequest; import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -28,8 +30,8 @@ public interface EmbeddedApi { @Operation(summary = "查询") @ApiOperationSupport(order = 1) - @GetMapping("/queryGrid") - List queryGrid(); + @PostMapping("/pager/{goPage}/{pageSize}") + IPage queryGrid(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody KeywordRequest request); @Operation(summary = "创建") @ApiOperationSupport(order = 2) @@ -47,6 +49,11 @@ public interface EmbeddedApi { @PostMapping("/delete/{id}") void delete(@PathVariable("id") Long id); + @Operation(summary = "批量删除") + @ApiOperationSupport(order = 4) + @PostMapping("/batchDelete") + void batchDelete(@RequestBody List ids); + @ApiOperationSupport(order = 5) @Operation(summary = "重置密钥") @PostMapping("/reset")