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

somefix

Browse source
This commit is contained in:
devezhao 2021-09-24 12:35:05 +08:00
parent 7bdb16cb05
commit 8a27127543
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/com/rebuild/core/configuration/general/AutoFillinManager.java
View file

@ -69,6 +69,17 @@ public class AutoFillinManager implements ConfigManager {
.set("whenCreate", true)
.set("whenUpdate", true)
.set("fillinForce", true);
// 移除冲突的表单回填配置
for (Iterator<ConfigBean> iter = config.iterator(); iter.hasNext(); ) {
ConfigBean cb = iter.next();
if (cb.getString("source").equals(fake.getString("source"))
&& cb.getString("target").equals(fake.getString("target"))) {
iter.remove();
break;
}
}
config.add(fake);
}

2
src/main/java/com/rebuild/web/admin/metadata/MetaFieldController.java
View file

@ -124,7 +124,7 @@ public class MetaFieldController extends BaseController {
JSONObject extraAttrs = new JSONObject();
for (Map.Entry<String, Object> e : easyField.getExtraAttrs(true).entrySet()) {
String name = e.getKey();
// 排除非私有
// 排除私有
if (!name.startsWith("_")) extraAttrs.put(name, e.getValue());
}
mv.getModel().put("fieldExtConfig", extraAttrs);