center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #11429 from dataease/pr@dev-v2@feat_calc

Browse Source 
feat: 计算字段支持自定义参数
This commit is contained in:
Junjun 2024-08-08 14:10:47 +08:00 committed by GitHub
commit ca1b268c22
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java
View File

@ -417,7 +417,7 @@ public class Utils {
}
public static List<CalParam> getParams(List<DatasetTableFieldDTO> list) {
if (ObjectUtils.isNotEmpty(list)) return Collections.emptyList();
if (ObjectUtils.isEmpty(list)) return Collections.emptyList();
List<CalParam> param = new ArrayList<>();
for (DatasetTableFieldDTO dto : list) {
if (Objects.equals(dto.getExtField(), ExtFieldConstant.EXT_CALC) && ObjectUtils.isNotEmpty(dto.getParams())) {

3
sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/CalParam.java
View File

@ -1,7 +1,5 @@
package io.dataease.extensions.datasource.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.io.Serializable;
@ -11,7 +9,6 @@ import java.io.Serializable;
*/
@Data
public class CalParam implements Serializable {
@JsonSerialize(using = ToStringSerializer.class)
private String id;
private String name;
private String value;