Skip to content

Commit 79c38d4

Browse files
committed
fix: fix field create request parameter bug.
1 parent f408d9e commit 79c38d4

24 files changed

Lines changed: 482 additions & 85 deletions

client/src/main/java/cn/vika/client/api/model/CreateFieldRequest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package cn.vika.client.api.model;
22

33
import cn.vika.client.api.model.field.property.BaseFieldProperty;
4+
import com.fasterxml.jackson.annotation.JsonInclude;
5+
import com.fasterxml.jackson.annotation.JsonInclude.Include;
46

57
/**
68
* @author tao
@@ -23,6 +25,7 @@ public class CreateFieldRequest <T extends BaseFieldProperty> {
2325
* @see cn.vika.client.api.model.field.property.BaseFieldProperty
2426
* value: BaseFieldProperty or it's subtype class
2527
*/
28+
@JsonInclude(Include.NON_EMPTY)
2629
private T property;
2730

2831
public String getType() {

client/src/main/java/cn/vika/client/api/model/builder/CreateFieldRequestBuilder.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import cn.vika.client.api.model.CreateFieldRequest;
44
import cn.vika.client.api.model.field.FieldType;
55
import cn.vika.client.api.model.field.property.BaseFieldProperty;
6+
import cn.vika.client.api.model.field.property.EmptyProperty;
67

78
/**
89
* @author tao
@@ -94,6 +95,11 @@ public <T extends BaseFieldProperty> IBuildCreateField<T> withProperty(T propert
9495
return new BuildCreateField<>(context);
9596
}
9697

98+
@Override
99+
public IBuildCreateField<EmptyProperty> withoutProperty() {
100+
context.setProperty(new EmptyProperty());
101+
return new BuildCreateField<>(context);
102+
}
97103
}
98104

99105
class BuildCreateField<T extends BaseFieldProperty> implements IBuildCreateField<T> {

client/src/main/java/cn/vika/client/api/model/builder/IPropertyOfCreateField.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package cn.vika.client.api.model.builder;
22

33
import cn.vika.client.api.model.field.property.BaseFieldProperty;
4+
import cn.vika.client.api.model.field.property.EmptyProperty;
45

56
/**
67
* @author tao
@@ -15,4 +16,5 @@ public interface IPropertyOfCreateField {
1516
*/
1617
<T extends BaseFieldProperty> IBuildCreateField<T> withProperty(T property);
1718

19+
IBuildCreateField<EmptyProperty> withoutProperty();
1820
}
Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,8 @@
11
package cn.vika.client.api.model.field.property;
22

3-
import java.util.List;
4-
5-
import cn.vika.client.api.model.field.property.option.UserOption;
6-
73
/**
84
* @author tao
95
*/
106
public class CreatedByFieldProperty extends BaseFieldProperty {
117

12-
private List<UserOption> options;
13-
14-
public List<UserOption> getOptions() {
15-
return options;
16-
}
17-
18-
public void setOptions(List<UserOption> options) {
19-
this.options = options;
20-
}
218
}
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,49 @@
11
package cn.vika.client.api.model.field.property;
22

3+
import cn.vika.client.api.model.field.property.option.DateFormatEnum;
4+
import cn.vika.client.api.model.field.property.option.TimeFormatEnum;
5+
import com.fasterxml.jackson.annotation.JsonInclude;
6+
import com.fasterxml.jackson.annotation.JsonInclude.Include;
7+
38
/**
49
* @author tao
510
*/
611
public class CreatedTimeFieldProperty extends DateTimeFieldProperty{
12+
13+
private DateFormatEnum dateFormat;
14+
15+
@JsonInclude(Include.NON_NULL)
16+
private TimeFormatEnum timeFormat;
17+
18+
@JsonInclude(Include.NON_NULL)
19+
private Boolean includeTime;
20+
21+
@Override
22+
public DateFormatEnum getDateFormat() {
23+
return dateFormat;
24+
}
25+
26+
@Override
27+
public void setDateFormat(DateFormatEnum dateFormat) {
28+
this.dateFormat = dateFormat;
29+
}
30+
31+
@Override
32+
public TimeFormatEnum getTimeFormat() {
33+
return timeFormat;
34+
}
35+
36+
@Override
37+
public void setTimeFormat(TimeFormatEnum timeFormat) {
38+
this.timeFormat = timeFormat;
39+
}
40+
41+
public Boolean getIncludeTime() {
42+
return includeTime;
43+
}
44+
45+
@Override
46+
public void setIncludeTime(Boolean includeTime) {
47+
this.includeTime = includeTime;
48+
}
749
}
Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,57 @@
11
package cn.vika.client.api.model.field.property;
22

3+
import cn.vika.client.api.model.field.property.option.PrecisionEnum;
4+
import cn.vika.client.api.model.field.property.option.SymbolAlignEnum;
5+
import com.fasterxml.jackson.annotation.JsonInclude;
6+
import com.fasterxml.jackson.annotation.JsonInclude.Include;
7+
38
/**
49
* @author tao
510
*/
6-
public class CurrencyFieldProperty extends NumberFieldProperty {
11+
@JsonInclude(Include.NON_EMPTY)
12+
public class CurrencyFieldProperty extends BaseFieldProperty {
13+
14+
@JsonInclude(Include.NON_NULL)
15+
private String defaultValue;
716

17+
@JsonInclude(Include.NON_NULL)
18+
private PrecisionEnum precision;
19+
20+
@JsonInclude(Include.NON_NULL)
821
private String symbol;
922

23+
@JsonInclude(Include.NON_NULL)
24+
private SymbolAlignEnum symbolAlign;
25+
26+
public String getDefaultValue() {
27+
return defaultValue;
28+
}
29+
30+
public void setDefaultValue(String defaultValue) {
31+
this.defaultValue = defaultValue;
32+
}
33+
34+
public PrecisionEnum getPrecision() {
35+
return precision;
36+
}
37+
38+
public void setPrecision(PrecisionEnum precision) {
39+
this.precision = precision;
40+
}
41+
1042
public String getSymbol() {
1143
return symbol;
1244
}
1345

1446
public void setSymbol(String symbol) {
1547
this.symbol = symbol;
1648
}
49+
50+
public SymbolAlignEnum getSymbolAlign() {
51+
return symbolAlign;
52+
}
53+
54+
public void setSymbolAlign(SymbolAlignEnum symbolAlign) {
55+
this.symbolAlign = symbolAlign;
56+
}
1757
}
Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,55 @@
11
package cn.vika.client.api.model.field.property;
22

3+
import cn.vika.client.api.model.field.property.option.DateFormatEnum;
4+
import cn.vika.client.api.model.field.property.option.TimeFormatEnum;
5+
import com.fasterxml.jackson.annotation.JsonInclude;
6+
import com.fasterxml.jackson.annotation.JsonInclude.Include;
7+
38
/**
49
* @author tao
510
*/
611
public class DateTimeFieldProperty extends BaseFieldProperty {
712

8-
private String format;
13+
private DateFormatEnum dateFormat;
14+
15+
@JsonInclude(Include.NON_NULL)
16+
private TimeFormatEnum timeFormat;
17+
18+
@JsonInclude(Include.NON_NULL)
19+
private Boolean autoFill;
920

10-
private boolean autoFill = false;
21+
@JsonInclude(Include.NON_NULL)
22+
private Boolean includeTime;
1123

12-
private boolean bool = false;
24+
public DateFormatEnum getDateFormat() {
25+
return dateFormat;
26+
}
27+
28+
public void setDateFormat(DateFormatEnum dateFormat) {
29+
this.dateFormat = dateFormat;
30+
}
1331

14-
public String getFormat() {
15-
return format;
32+
public TimeFormatEnum getTimeFormat() {
33+
return timeFormat;
1634
}
1735

18-
public void setFormat(String format) {
19-
this.format = format;
36+
public void setTimeFormat(TimeFormatEnum timeFormat) {
37+
this.timeFormat = timeFormat;
2038
}
2139

22-
public boolean isAutoFill() {
40+
public Boolean isAutoFill() {
2341
return autoFill;
2442
}
2543

26-
public void setAutoFill(boolean autoFill) {
44+
public void setAutoFill(Boolean autoFill) {
2745
this.autoFill = autoFill;
2846
}
2947

30-
public boolean isBool() {
31-
return bool;
48+
public Boolean isIncludeTime() {
49+
return includeTime;
3250
}
3351

34-
public void setBool(boolean bool) {
35-
this.bool = bool;
52+
public void setIncludeTime(Boolean includeTime) {
53+
this.includeTime = includeTime;
3654
}
3755
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package cn.vika.client.api.model.field.property;
2+
3+
/**
4+
* @author tao
5+
*/
6+
public class EmptyProperty extends BaseFieldProperty{
7+
}
Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,34 @@
11
package cn.vika.client.api.model.field.property;
22

3-
import cn.vika.client.api.model.field.property.CreatedByFieldProperty;
3+
import java.util.List;
4+
5+
import cn.vika.client.api.model.field.property.option.CollectTypeEnum;
6+
import com.fasterxml.jackson.annotation.JsonInclude;
7+
import com.fasterxml.jackson.annotation.JsonInclude.Include;
48

59
/**
610
* @author tao
711
*/
8-
public class LastModifiedByFieldProperty extends CreatedByFieldProperty {
12+
public class LastModifiedByFieldProperty extends BaseFieldProperty {
13+
14+
private CollectTypeEnum collectType;
15+
16+
@JsonInclude(Include.NON_EMPTY)
17+
private List<String> fieldsIdCollection;
18+
19+
public CollectTypeEnum getCollectType() {
20+
return collectType;
21+
}
22+
23+
public void setCollectType(CollectTypeEnum collectType) {
24+
this.collectType = collectType;
25+
}
26+
27+
public List<String> getFieldsIdCollection() {
28+
return fieldsIdCollection;
29+
}
30+
31+
public void setFieldsIdCollection(List<String> fieldsIdCollection) {
32+
this.fieldsIdCollection = fieldsIdCollection;
33+
}
934
}
Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,34 @@
11
package cn.vika.client.api.model.field.property;
22

3-
import cn.vika.client.api.model.field.property.DateTimeFieldProperty;
3+
import java.util.List;
4+
5+
import cn.vika.client.api.model.field.property.option.CollectTypeEnum;
6+
import com.fasterxml.jackson.annotation.JsonInclude;
7+
import com.fasterxml.jackson.annotation.JsonInclude.Include;
48

59
/**
610
* @author tao
711
*/
8-
public class LastModifiedTimeFieldProperty extends DateTimeFieldProperty {
12+
public class LastModifiedTimeFieldProperty extends CreatedTimeFieldProperty {
13+
14+
private CollectTypeEnum collectType;
15+
16+
@JsonInclude(Include.NON_EMPTY)
17+
private List<String> fieldIdCollection;
18+
19+
public CollectTypeEnum getCollectType() {
20+
return collectType;
21+
}
22+
23+
public void setCollectType(CollectTypeEnum collectType) {
24+
this.collectType = collectType;
25+
}
26+
27+
public List<String> getFieldIdCollection() {
28+
return fieldIdCollection;
29+
}
30+
31+
public void setFieldIdCollection(List<String> fieldIdCollection) {
32+
this.fieldIdCollection = fieldIdCollection;
33+
}
934
}

0 commit comments

Comments
 (0)