getrebuild/rebuild
1
1
Fork 0
mirror of https://github.com/getrebuild/rebuild.git synced 2024-09-21 07:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix

Browse source
This commit is contained in:
devezhao 2019-08-24 23:49:00 +08:00
parent 037c72446a
commit f1268846c9
4 changed files with 49 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -110,7 +110,7 @@
<dependency>
<groupId>com.github.devezhao</groupId>
<artifactId>persist4j</artifactId>
<version>65f880fc99</version>
<version>7f077c7812</version>
</dependency>
<dependency>
<groupId>junit</groupId>

42
src/main/java/com/rebuild/server/service/CommonService.java
View file

@ -55,26 +55,50 @@ public class CommonService extends BaseService {
@Override
public Record create(Record record) {
tryIfWithPrivileges(record);
return super.create(record);
return this.create(record, true);
}
@Override
public int delete(ID recordId) {
tryIfWithPrivileges(recordId);
return super.delete(recordId);
return this.delete(recordId, true);
}
@Override
public Record update(Record record) {
return update(record, true);
}
/**
* @param record
* @param strictMode 会进行一定的约束检查
* @param strictMode
* @return
* @see #tryIfWithPrivileges(Object) 约束检查
* @see #tryIfWithPrivileges(Object)
*/
public Record create(Record record, boolean strictMode) {
if (strictMode) {
tryIfWithPrivileges(record);
}
return super.create(record);
}
/**
* @param recordId
* @param strictMode
* @return
* @see #tryIfWithPrivileges(Object)
*/
public int delete(ID recordId, boolean strictMode) {
if (strictMode) {
tryIfWithPrivileges(recordId);
}
return super.delete(recordId);
}
/**
* @param record
* @param strictMode
* @return
* @see #tryIfWithPrivileges(Object)
*/
public Record update(Record record, boolean strictMode) {
if (strictMode) {
@ -82,7 +106,7 @@ public class CommonService extends BaseService {
}
return super.update(record);
}
/**
* 批量删除
*

26
src/main/webapp/admin/entityhub/field-new.jsp
View file

@ -18,6 +18,15 @@
<label class="col-sm-3 col-form-label text-sm-right">字段类型</label>
<div class="col-sm-7">
<select class="form-control form-control-sm" id="type">
<optgroup label="文本">
<option value="TEXT">文本</option>
<option value="NTEXT">大文本</option>
<option value="PHONE">电话</option>
<option value="EMAIL">邮箱</option>
<option value="URL">链接</option>
<option value="SERIES">自动编号</option>
<option value="PICKLIST">列表</option>
</optgroup>
<optgroup label="数字">
<option value="NUMBER">整数</option>
<option value="DECIMAL">货币</option>
@ -26,25 +35,16 @@
<option value="DATE">日期</option>
<option value="DATETIME">日期时间</option>
</optgroup>
<optgroup label="文本">
<option value="TEXT">文本</option>
<option value="NTEXT">大文本</option>
<option value="PHONE">电话</option>
<option value="EMAIL">邮箱</option>
<option value="URL">链接</option>
<option value="PICKLIST">列表</option>
<option value="CLASSIFICATION">分类</option>
<option value="SERIES">自动编号</option>
</optgroup>
<optgroup label="媒体">
<option value="IMAGE">图片</option>
<option value="FILE">文件</option>
<option value="IMAGE">图片</option>
<option value="AVATAR">头像</option>
</optgroup>
<optgroup label="关系">
<option value="REFERENCE">引用</option>
<option value="CLASSIFICATION">分类</option>
</optgroup>
<optgroup label="其他" class="bosskey-show">
<option value="AVATAR">头像</option>
<optgroup label="保留类型" class="bosskey-show">
<option value="BOOL">布尔</option>
</optgroup>
</select>

2
src/main/webapp/assets/js/entityhub/field-edit.jsx
View file

@ -72,6 +72,8 @@ $(document).ready(function () {
})
} else if (dt === 'SERIES') {
$('#defaultValue').parents('.form-group').remove()
if (extConfigOld.seriesFormat) $('#seriesFormat').val(extConfigOld.seriesFormat)
if (extConfigOld.seriesZero) $('#seriesZero').val(extConfigOld.seriesZero)
} else if (dt === 'DATE' || dt === 'DATETIME') {
$('#defaultValue').datetimepicker({
componentIcon: 'zmdi zmdi-calendar',