diff --git a/core/core-frontend/src/components/grid-table/src/GridTable.vue b/core/core-frontend/src/components/grid-table/src/GridTable.vue index c6106f9d3d..bc08502165 100644 --- a/core/core-frontend/src/components/grid-table/src/GridTable.vue +++ b/core/core-frontend/src/components/grid-table/src/GridTable.vue @@ -35,6 +35,9 @@ const handleListeners = () => { const toggleRowSelection = row => { table.value.toggleRowSelection(row, true) } +const toggleAllSelection = () => { + table.value.toggleAllSelection() +} const clearSelection = () => { table.value.clearSelection() } @@ -111,6 +114,7 @@ watch( defineExpose({ toggleRowSelection, clearSelection, + toggleAllSelection, multipleSelectionAll }) diff --git a/core/core-frontend/src/components/icon-custom/src/Icon.vue b/core/core-frontend/src/components/icon-custom/src/Icon.vue index 93bc1b704d..c7bf9d501d 100644 --- a/core/core-frontend/src/components/icon-custom/src/Icon.vue +++ b/core/core-frontend/src/components/icon-custom/src/Icon.vue @@ -223,6 +223,7 @@ import emailTask from '@/assets/svg/email-task.svg' import embedded from '@/assets/svg/embedded.svg' import association from '@/assets/svg/association.svg' import threshold from '@/assets/svg/threshold.svg' +import threshold_full from '@/assets/svg/threshold_full.svg' import example from '@/assets/svg/example.svg' import exclamationmark from '@/assets/svg/exclamationmark.svg' import exclamationmark2 from '@/assets/svg/exclamationmark2.svg' @@ -893,6 +894,7 @@ const iconMap = { embedded: embedded, association: association, threshold: threshold, + threshold_full, example: example, exclamationmark: exclamationmark, exclamationmark2: exclamationmark2, diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/ThresholdApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/threshold/ThresholdApi.java index 7b63449a6e..e6b633b672 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/ThresholdApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/threshold/ThresholdApi.java @@ -2,13 +2,9 @@ package io.dataease.api.threshold; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.threshold.dto.ThresholdBatchReciRequest; -import io.dataease.api.threshold.dto.ThresholdCreator; -import io.dataease.api.threshold.dto.ThresholdGridRequest; -import io.dataease.api.threshold.dto.ThresholdSwitchRequest; +import io.dataease.api.threshold.dto.*; import io.dataease.api.threshold.vo.ThresholdGridVO; import io.dataease.api.threshold.vo.ThresholdInstanceVO; -import io.dataease.model.KeywordRequest; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -65,6 +61,6 @@ public interface ThresholdApi { @Parameter(name = "request", description = "过滤条件", required = true) }) @PostMapping("/instancePager/{goPage}/{pageSize}") - IPage instancePager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody KeywordRequest request); + IPage instancePager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody ThresholdInstanceRequest request); } diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdInstanceRequest.java b/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdInstanceRequest.java new file mode 100644 index 0000000000..488ec778fc --- /dev/null +++ b/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdInstanceRequest.java @@ -0,0 +1,17 @@ +package io.dataease.api.threshold.dto; + +import io.dataease.model.KeywordRequest; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.io.Serializable; + +@EqualsAndHashCode(callSuper = true) +@Data +public class ThresholdInstanceRequest extends KeywordRequest implements Serializable { + @Serial + private static final long serialVersionUID = 7146083160815300271L; + + private Long thresholdId; +}