mirror of
https://github.com/getrebuild/rebuild.git
synced 2024-09-20 07:25:54 +08:00
Compare commits
6 commits
9d33128411
...
5f2055be37
Author | SHA1 | Date | |
---|---|---|---|
5f2055be37 | |||
0864324c6a | |||
19a9d24bc3 | |||
827f67e21e | |||
953cd22d54 | |||
d1a0579101 |
2
@rbv
2
@rbv
|
@ -1 +1 @@
|
|||
Subproject commit f7cd2def480c19edbf2cc36aca2e1811b027decc
|
||||
Subproject commit 6e8a20392f8f38af850b0683735e98b51fef8c30
|
16
README.md
16
README.md
|
@ -15,18 +15,18 @@
|
|||
|
||||
> **福利:加入 REBUILD VIP 用户 QQ 交流群 819865721 1013051587 GET 使用技能**
|
||||
|
||||
## V3.7 新特性
|
||||
## V3.8 新特性
|
||||
|
||||
本次更新为你带来众多功能增强与优化。
|
||||
|
||||
1. [新增] 限时审批
|
||||
2. [新增] 新建任务(触发器)
|
||||
3. [新增] 地图等多个图表
|
||||
4. [新增] 自动明细记录导入(记录转换)
|
||||
5. [新增] 数据列表之卡片模式
|
||||
1. [新增] HTML 报表模版
|
||||
2. [新增] 多表单布局
|
||||
3. [新增] 明细支持 Excel 粘贴录入
|
||||
4. [新增] 图片/附件支持摄像头上传模式
|
||||
5. [新增] 手机版数据列表可导出报表
|
||||
6. [新增] 多个 FrontJS 函数
|
||||
7. [优化] 图表支持多轴显示、横向显示、显示背景
|
||||
8. [优化] 手机版全新列表搜索组件
|
||||
7. [新增] 用户支持批量操作
|
||||
8. [优化] 20+ 细节/BUG/安全性更新
|
||||
9. ...
|
||||
|
||||
更多更新详情请参见 [更新日志](https://getrebuild.com/docs/dev/changelog)
|
||||
|
|
2
pom.xml
2
pom.xml
|
@ -10,7 +10,7 @@
|
|||
</parent>
|
||||
<groupId>com.rebuild</groupId>
|
||||
<artifactId>rebuild</artifactId>
|
||||
<version>3.8.0-dev</version>
|
||||
<version>3.8.0-beta1</version>
|
||||
<name>rebuild</name>
|
||||
<description>Building your business-systems freely!</description>
|
||||
<url>https://getrebuild.com/</url>
|
||||
|
|
|
@ -74,11 +74,11 @@ public class Application implements ApplicationListener<ApplicationStartedEvent>
|
|||
/**
|
||||
* Rebuild Version
|
||||
*/
|
||||
public static final String VER = "3.8.0-dev";
|
||||
public static final String VER = "3.8.0-beta1";
|
||||
/**
|
||||
* Rebuild Build [MAJOR]{1}[MINOR]{2}[PATCH]{2}[BUILD]{2}
|
||||
*/
|
||||
public static final int BUILD = 3080000;
|
||||
public static final int BUILD = 3080001;
|
||||
|
||||
static {
|
||||
// Driver for DB
|
||||
|
|
|
@ -97,7 +97,8 @@ public class CommonOperatingController extends BaseController {
|
|||
Entity entityMate = MetadataHelper.getEntity(entity);
|
||||
if (StringUtils.isBlank(fields)) fields = getAllFields(entityMate);
|
||||
|
||||
String sql = String.format("select %s from %s", fields, entityMate.getName());
|
||||
String sql = String.format("select %s from %s",
|
||||
StringUtils.join(fields.split("[,;]"), ","), entityMate.getName());
|
||||
if (ParseHelper.validAdvFilter(filter)) {
|
||||
String filterWhere = new AdvFilterParser(filter, entityMate).toSqlWhere();
|
||||
if (filterWhere != null) sql += " where " + filterWhere;
|
||||
|
@ -112,14 +113,16 @@ public class CommonOperatingController extends BaseController {
|
|||
|
||||
// 获取全部字段
|
||||
private String getAllFields(Entity entity) {
|
||||
List<String> ss = new ArrayList<>();
|
||||
List<String> fs = new ArrayList<>();
|
||||
for (Field field : entity.getFields()) {
|
||||
if (!MetadataHelper.isSystemField(field.getName())) ss.add(field.getName());
|
||||
if (!MetadataHelper.isSystemField(field.getName())) fs.add(field.getName());
|
||||
}
|
||||
return StringUtils.join(ss, ",");
|
||||
return StringUtils.join(fs, ",");
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存记录
|
||||
*
|
||||
* @param record
|
||||
* @return
|
||||
*/
|
||||
|
@ -134,6 +137,8 @@ public class CommonOperatingController extends BaseController {
|
|||
}
|
||||
|
||||
/**
|
||||
* 删除记录
|
||||
*
|
||||
* @param recordId
|
||||
* @return
|
||||
*/
|
||||
|
|
|
@ -1833,7 +1833,7 @@ th.column-fixed {
|
|||
}
|
||||
|
||||
.column-fixed.col-action .btn.btn-sm {
|
||||
line-height: 28px;
|
||||
line-height: 26px;
|
||||
min-width: 32px;
|
||||
}
|
||||
|
||||
|
|
|
@ -1148,7 +1148,10 @@ class RbFormElement extends React.Component {
|
|||
}
|
||||
// 可空/非空
|
||||
setNullable(nullable) {
|
||||
this.setState({ nullable: nullable === true })
|
||||
this.setState({ nullable: nullable === true }, () => {
|
||||
// fix:v3.8 通过此方法强制检查非空属性
|
||||
this.setValue(this.state.value || null)
|
||||
})
|
||||
}
|
||||
// 只读/非只读
|
||||
// 部分字段有效,且如字段属性为只读,即使填写值也无效
|
||||
|
|
|
@ -19,6 +19,7 @@ class RbViewForm extends React.Component {
|
|||
|
||||
this.onViewEditable = this.props.onViewEditable
|
||||
if (this.onViewEditable) this.onViewEditable = wpc.onViewEditable !== false
|
||||
if (window.__LAB_VIEWEDITABLE === false) this.onViewEditable = false
|
||||
// temp for `saveSingleFieldValue`
|
||||
this.__FormData = {}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue