diff --git a/src/main/java/com/rebuild/server/helper/manager/FormManager.java b/src/main/java/com/rebuild/server/helper/manager/FormManager.java index ac3e4dd50..696738b7f 100644 --- a/src/main/java/com/rebuild/server/helper/manager/FormManager.java +++ b/src/main/java/com/rebuild/server/helper/manager/FormManager.java @@ -265,9 +265,9 @@ public class FormManager extends LayoutManager { } if (entityMeta.getMasterEntity() != null) { - config.put("slave", true); + config.put("isSlave", true); } else if (entityMeta.getSlaveEntity() != null) { - config.put("master", true); + config.put("isMaster", true); config.put("slaveMeta", EasyMeta.getEntityShows(entityMeta.getSlaveEntity())); } diff --git a/src/main/java/com/rebuild/server/metadata/entityhub/Entity2Schema.java b/src/main/java/com/rebuild/server/metadata/entityhub/Entity2Schema.java index 487b26eac..2963e1b2c 100644 --- a/src/main/java/com/rebuild/server/metadata/entityhub/Entity2Schema.java +++ b/src/main/java/com/rebuild/server/metadata/entityhub/Entity2Schema.java @@ -123,8 +123,6 @@ public class Entity2Schema extends Field2Schema { createBuiltinField(tempEntity, primaryFiled, "ID", DisplayType.ID, null, null, null); // 自增ID createBuiltinField(tempEntity, EntityHelper.AutoId, "AUTOID", DisplayType.NUMBER, null, null, null); - // 助记码/搜索码 - createBuiltinField(tempEntity, EntityHelper.QuickCode, "QUICKCODE", DisplayType.TEXT, null, null, null); // 是否删除 createBuiltinField(tempEntity, EntityHelper.IsDeleted, "ISDELETED", DisplayType.BOOL, null, null, null); @@ -144,6 +142,10 @@ public class Entity2Schema extends Field2Schema { String masterField = masterEntity + "Id"; createBuiltinField(tempEntity, masterField, masterLabel, DisplayType.REFERENCE, "引用主记录(" + masterLabel + ")", masterEntity, CascadeModel.Delete); } else { + // 助记码/搜索码 +// createBuiltinField(tempEntity, EntityHelper.QuickCode, "QUICKCODE", DisplayType.TEXT, null, null, null); + createField(tempEntity, EntityHelper.QuickCode, "QUICKCODE", DisplayType.TEXT, true, false, false, null, null, null, true); + createBuiltinField(tempEntity, EntityHelper.OwningUser, "所属用户", DisplayType.REFERENCE, null, "User", null); createBuiltinField(tempEntity, EntityHelper.OwningDept, "所属部门", DisplayType.REFERENCE, null, "Department", null); } @@ -208,7 +210,7 @@ public class Entity2Schema extends Field2Schema { private Field createBuiltinField(Entity entity, String fieldName, String fieldLabel, DisplayType displayType, String comments, String refEntity, CascadeModel cascade) { comments = StringUtils.defaultIfBlank(comments, "系统内建"); - return createField(entity, fieldName, fieldLabel, displayType, false, false, false, comments, refEntity, cascade, true); + return createField(entity, fieldName, fieldLabel, displayType, false, false, false, comments, refEntity, cascade, false); } /** diff --git a/src/main/java/com/rebuild/server/metadata/entityhub/Field2Schema.java b/src/main/java/com/rebuild/server/metadata/entityhub/Field2Schema.java index a63c23d42..6ca5762d4 100644 --- a/src/main/java/com/rebuild/server/metadata/entityhub/Field2Schema.java +++ b/src/main/java/com/rebuild/server/metadata/entityhub/Field2Schema.java @@ -171,14 +171,11 @@ public class Field2Schema { * @param comments * @param refEntity * @param cascade - * @param isBuiltin 内建字段 + * @param dbNullable 在数据库中是否可为空，一般系统级字段不能为空 * @return */ protected Field createField(Entity entity, String fieldName, String fieldLabel, DisplayType displayType, - boolean nullable, boolean creatable, boolean updatable, String comments, String refEntity, CascadeModel cascade, boolean isBuiltin) { - // 在数据库中是否可为空 - boolean dbNullable = !isBuiltin; - + boolean nullable, boolean creatable, boolean updatable, String comments, String refEntity, CascadeModel cascade, boolean dbNullable) { if (displayType == DisplayType.SERIES) { nullable = false; creatable = false; diff --git a/src/main/webapp/admin/bizuser/role-privileges.jsp b/src/main/webapp/admin/bizuser/role-privileges.jsp index a9ed05a57..8218dc09a 100644 --- a/src/main/webapp/admin/bizuser/role-privileges.jsp +++ b/src/main/webapp/admin/bizuser/role-privileges.jsp @@ -121,16 +121,6 @@ 需具备相应实体的读取权限 - - 允许自定义列显示 - - 无 - - - 允许自定义查询字段 - - 无 -
diff --git a/src/main/webapp/admin/system-general.jsp b/src/main/webapp/admin/system-general.jsp index ac255d7fb..2155511b7 100644 --- a/src/main/webapp/admin/system-general.jsp +++ b/src/main/webapp/admin/system-general.jsp @@ -74,7 +74,7 @@

版本 <%=Application.VER%>

) let entity = this.state.entity + let wpc = window.__PageConfig if (entity == 'User' || entity == 'Department' || entity == 'Role' - || window.pageType == 'SlaveView' || window.pageType == 'SlaveList'){ + || wpc.type == 'SlaveView' || wpc.type == 'SlaveList' || this.isNew != true) { saveBtns = } @@ -201,12 +202,12 @@ class RbForm extends React.Component { rb.notice('保存成功', 'success') setTimeout(() => { that.props.$$$parent.hide(true) - RbForm.postAfter(res.data, next == 111) + RbForm.postAfter(res.data, next == 101) - if (next == 101 || next == 111) { + if (next == 101) { let pstate = that.props.$$$parent.state rb.RbFormModal({ title: pstate.title, entity: pstate.entity, icon: pstate.icon }) - } else if (next == 112) { + } else if (next == 102) { let iv = { '$MASTER$': res.data.id } let sm = that.props.$$$parent.state.__formModel.slaveMeta rb.RbFormModal({ title: `添加${sm[1]}`, entity: sm[0], icon: sm[2], initialValue: iv }) diff --git a/src/main/webapp/server-status.jsp b/src/main/webapp/server-status.jsp index 3de6800f0..ae3929826 100644 --- a/src/main/webapp/server-status.jsp +++ b/src/main/webapp/server-status.jsp @@ -78,7 +78,7 @@
<% } %>
-
© 2018 Rebuild CHECK
+
© 2019 Rebuild CHECK
\ No newline at end of file