diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml b/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml index 7d4566eb..545c05f7 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml @@ -105,6 +105,10 @@ import com.jeesite.modules.bpm.entity.BpmEntity; if (c.attrName == table.treeViewNameAttrName){ print(', isTreeName=true'); } + if (c.isNull == @Global.YES && @StringUtils.inString(c.simpleAttrType, + 'Long', 'Integer', 'Double', 'BigDecimal', 'Date')){ + print(', isUpdateForce=true'); + } } %>), <% diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/vueForm.xml b/modules/core/src/main/resources/templates/modules/gen/crud/vueForm.xml index 03e16044..04b7fe54 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/vueForm.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/vueForm.xml @@ -81,7 +81,6 @@ for(c in table.columnList){ field: 'parentCode', fieldLabel: 'parentName', component: 'TreeSelect', - defaultValue: '', componentProps: { allowClear: true, style: 'width: calc(50% - 60px)', @@ -116,7 +115,6 @@ for (c in table.columnList){ defaultValue: '30', <% }else{ %> component: '${c.showType == 'input' ? 'Input' : 'InputTextArea'}', - defaultValue: '', <% } %> <% if (c.dataLength != '0'){ %> componentProps: { @@ -133,7 +131,6 @@ for (c in table.columnList){ mode: 'multiple', <% } %> }, - defaultValue: '', <% }else if(c.showType == 'radio' || c.showType == 'checkbox'){ %> component: '${@StringUtils.cap(c.showType)}Group', componentProps: { @@ -157,7 +154,6 @@ for (c in table.columnList){ canSelectParent: false, allowClear: true, }, - defaultValue: '', <% }else if(c.showType == 'officeselect'){ if (isNotBlank(c.attrName2)){ %> fieldLabel: '${c.attrName2}', @@ -167,7 +163,6 @@ for (c in table.columnList){ api: officeTreeData, allowClear: true, }, - defaultValue: '', <% }else if(c.showType == 'areaselect'){ if (isNotBlank(c.attrName2)){ %> fieldLabel: '${c.attrName2}', @@ -177,7 +172,6 @@ for (c in table.columnList){ api: areaTreeData, allowClear: true, }, - defaultValue: '', <% }else{ %> component: 'Input', <% } diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/vueList.xml b/modules/core/src/main/resources/templates/modules/gen/crud/vueList.xml index 300d5135..70119f22 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/vueList.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/vueList.xml @@ -157,7 +157,6 @@ for(c in table.columnList){ mode: 'multiple', <% } %> }, - defaultValue: '', <% }else if(c.showType == 'radio' || c.showType == 'checkbox'){ %> component: '${@StringUtils.cap(c.showType)}Group', componentProps: { @@ -189,21 +188,18 @@ for(c in table.columnList){ canSelectParent: false, allowClear: true, }, - defaultValue: '', <% }else if(c.showType == 'officeselect'){ %> component: 'TreeSelect', componentProps: { api: officeTreeData, allowClear: true, }, - defaultValue: '', <% }else if(c.showType == 'areaselect'){ %> component: 'TreeSelect', componentProps: { api: areaTreeData, allowClear: true, }, - defaultValue: '', <% }else{ %> component: 'Input', <% } %> diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml index 8cbf72d4..f306df47 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml @@ -105,6 +105,10 @@ import com.jeesite.modules.bpm.entity.BpmEntity; if (c.attrName == table.treeViewNameAttrName){ print(', isTreeName=true'); } + if (c.isNull == @Global.YES && @StringUtils.inString(c.simpleAttrType, + 'Long', 'Integer', 'Double', 'BigDecimal', 'Date')){ + print(', isUpdateForce=true'); + } } %>), <% diff --git a/web/src/main/java/com/jeesite/modules/test/entity/TestData.java b/web/src/main/java/com/jeesite/modules/test/entity/TestData.java index b991c378..dbd07330 100644 --- a/web/src/main/java/com/jeesite/modules/test/entity/TestData.java +++ b/web/src/main/java/com/jeesite/modules/test/entity/TestData.java @@ -33,7 +33,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType; @Column(name="test_radio", attrName="testRadio", label="单选框"), @Column(name="test_checkbox", attrName="testCheckbox", label="复选框"), @Column(name="test_date", attrName="testDate", label="日期选择", isUpdateForce=true/*是否强制更新(当调用update并且该属性为空的时候,允许更新为空)*/), - @Column(name="test_datetime", attrName="testDatetime", label="日期时间"), + @Column(name="test_datetime", attrName="testDatetime", label="日期时间", isUpdateForce=true), @Column(name="test_user_code", attrName="testUser.userCode", label="用户选择"), @Column(name="test_office_code", attrName="testOffice.officeCode", label="机构选择"), @Column(name="test_area_code", attrName="testAreaCode", label="区域选择"), diff --git a/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java b/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java index 96da2ae9..4a83a789 100644 --- a/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java +++ b/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java @@ -32,8 +32,8 @@ import com.jeesite.common.mybatis.mapper.query.QueryType; @Column(name="test_select_multiple", attrName="testSelectMultiple", label="下拉多选"), @Column(name="test_radio", attrName="testRadio", label="单选框"), @Column(name="test_checkbox", attrName="testCheckbox", label="复选框"), - @Column(name="test_date", attrName="testDate", label="日期选择"), - @Column(name="test_datetime", attrName="testDatetime", label="日期时间"), + @Column(name="test_date", attrName="testDate", label="日期选择", isUpdateForce=true), + @Column(name="test_datetime", attrName="testDatetime", label="日期时间", isUpdateForce=true), @Column(name="test_user_code", attrName="testUser.userCode", label="用户选择"), @Column(name="test_office_code", attrName="testOffice.officeCode", label="机构选择"), @Column(name="test_area_code", attrName="testAreaCode", label="区域选择"), @@ -149,7 +149,7 @@ public class TestDataChild extends DataEntity { this.testCheckbox = testCheckbox; } - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") public Date getTestDate() { return testDate; } @@ -158,7 +158,7 @@ public class TestDataChild extends DataEntity { this.testDate = testDate; } - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") public Date getTestDatetime() { return testDatetime; }