From 2a91325a2fa3d8c5c55e0ceccae68f88fa1d7160 Mon Sep 17 00:00:00 2001 From: FangfangZhao Date: Sat, 24 Nov 2018 16:25:44 +0800 Subject: [PATCH] some fix --- .../helper/manager/FieldValueWrapper.java | 3 +-- .../web/base/entity/RelatedListControll.java | 22 +++++++++---------- src/main/resources/metadata-conf.xml | 6 ++--- src/main/webapp/admin/bizuser/dept-list.jsp | 2 +- src/main/webapp/admin/bizuser/dept-view.jsp | 2 +- src/main/webapp/admin/bizuser/user-list.jsp | 2 +- src/main/webapp/admin/bizuser/user-view.jsp | 2 +- src/main/webapp/assets/js/rb-forms.jsx | 9 +++++--- src/main/webapp/assets/js/rb-view.jsx | 6 ++--- .../webapp/general-entity/record-list.jsp | 4 ++-- .../webapp/general-entity/record-view.jsp | 2 +- src/main/webapp/general-entity/slave-list.jsp | 5 +++-- src/main/webapp/general-entity/slave-view.jsp | 3 ++- 13 files changed, 36 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/rebuild/server/helper/manager/FieldValueWrapper.java b/src/main/java/com/rebuild/server/helper/manager/FieldValueWrapper.java index 86897dc2c..324aef4b0 100644 --- a/src/main/java/com/rebuild/server/helper/manager/FieldValueWrapper.java +++ b/src/main/java/com/rebuild/server/helper/manager/FieldValueWrapper.java @@ -76,8 +76,7 @@ public class FieldValueWrapper { return wrapDecimal(value, field); } else if (dt == DisplayType.REFERENCE) { return wrapReference(value, field); - } else if (dt == DisplayType.PICKLIST - || dt == DisplayType.IMAGE || dt == DisplayType.FILE || dt == DisplayType.LOCATION) { + } else if (dt == DisplayType.PICKLIST || dt == DisplayType.IMAGE || dt == DisplayType.FILE || dt == DisplayType.LOCATION) { // 无需处理 return value; } else if (dt == DisplayType.BOOL) { diff --git a/src/main/java/com/rebuild/web/base/entity/RelatedListControll.java b/src/main/java/com/rebuild/web/base/entity/RelatedListControll.java index 4f351096b..dd7a56d20 100644 --- a/src/main/java/com/rebuild/web/base/entity/RelatedListControll.java +++ b/src/main/java/com/rebuild/web/base/entity/RelatedListControll.java @@ -61,14 +61,14 @@ public class RelatedListControll extends BaseControll { @RequestMapping("related-list") public void relatedList(HttpServletRequest request, HttpServletResponse response) throws IOException { - ID masterId = getIdParameterNotNull(request, "master"); + ID masterId = getIdParameterNotNull(request, "masterId"); String related = getParameterNotNull(request, "related"); Entity relatedEntity = MetadataHelper.getEntity(related); - String sql = genMasterSql(masterId, relatedEntity, false); + String sql = buildMasterSql(masterId, relatedEntity, false); int pn = NumberUtils.toInt(getParameter(request, "pageNo"), 1); - int ps = NumberUtils.toInt(getParameter(request, "pageSize"), 100); + int ps = NumberUtils.toInt(getParameter(request, "pageSize"), 200); // TODO 相关项列表分页 @@ -76,7 +76,7 @@ public class RelatedListControll extends BaseControll { for (Object[] o : array) { o[0] = o[0].toString(); o[1] = FieldValueWrapper.wrapFieldValue(o[1], relatedEntity.getNameField()); - if (StringUtils.EMPTY == o[1]) { + if (o[1] == null || StringUtils.isEmpty(o[1].toString())) { o[1] = o[0].toString().toUpperCase(); // 使用ID值作为名称字段值 } o[2] = CalendarUtils.getUTCDateTimeFormat().format(o[2]); @@ -90,12 +90,12 @@ public class RelatedListControll extends BaseControll { @RequestMapping("related-counts") public void relatedCounts(HttpServletRequest request, HttpServletResponse response) throws IOException { - ID masterId = getIdParameterNotNull(request, "master"); - String relates[] = getParameterNotNull(request, "relates").split(","); + ID masterId = getIdParameterNotNull(request, "masterId"); + String relates[] = getParameterNotNull(request, "relateds").split(","); Map countMap = new HashMap<>(); for (String related : relates) { - String sql = genMasterSql(masterId, MetadataHelper.getEntity(related), true); + String sql = buildMasterSql(masterId, MetadataHelper.getEntity(related), true); Object[] count = Application.createQuery(sql).unique(); countMap.put(related, ObjectUtils.toInt(count[0])); } @@ -103,13 +103,13 @@ public class RelatedListControll extends BaseControll { } /** - * @param masterId + * @param recordOfMain * @param relatedEntity * @param count * @return */ - static String genMasterSql(ID masterId, Entity relatedEntity, boolean count) { - Entity masterEntity = MetadataHelper.getEntity(masterId.getEntityCode()); + private String buildMasterSql(ID recordOfMain, Entity relatedEntity, boolean count) { + Entity masterEntity = MetadataHelper.getEntity(recordOfMain.getEntityCode()); Set relatedFields = new HashSet<>(); for (Field field : relatedEntity.getFields()) { if (field.getType() == FieldType.REFERENCE @@ -119,7 +119,7 @@ public class RelatedListControll extends BaseControll { } String masterSql = "(" + StringUtils.join(relatedFields, " or ") + ")"; - masterSql = MessageFormat.format(masterSql, masterId); + masterSql = MessageFormat.format(masterSql, recordOfMain); String baseSql = "select %s from " + relatedEntity.getName() + " where " + masterSql; diff --git a/src/main/resources/metadata-conf.xml b/src/main/resources/metadata-conf.xml index e0782c6a8..e98db90c1 100644 --- a/src/main/resources/metadata-conf.xml +++ b/src/main/resources/metadata-conf.xml @@ -14,13 +14,13 @@ + - - - + + diff --git a/src/main/webapp/admin/bizuser/dept-list.jsp b/src/main/webapp/admin/bizuser/dept-list.jsp index 70de43cc4..7b9f0b9a8 100644 --- a/src/main/webapp/admin/bizuser/dept-list.jsp +++ b/src/main/webapp/admin/bizuser/dept-list.jsp @@ -33,7 +33,7 @@
- +
diff --git a/src/main/webapp/admin/bizuser/dept-view.jsp b/src/main/webapp/admin/bizuser/dept-view.jsp index 7d47a23ff..0bc225da2 100644 --- a/src/main/webapp/admin/bizuser/dept-view.jsp +++ b/src/main/webapp/admin/bizuser/dept-view.jsp @@ -32,7 +32,7 @@
- +
删除
diff --git a/src/main/webapp/admin/bizuser/user-list.jsp b/src/main/webapp/admin/bizuser/user-list.jsp index 811ef5b65..95d3ed8e4 100644 --- a/src/main/webapp/admin/bizuser/user-list.jsp +++ b/src/main/webapp/admin/bizuser/user-list.jsp @@ -33,7 +33,7 @@
- +
diff --git a/src/main/webapp/admin/bizuser/user-view.jsp b/src/main/webapp/admin/bizuser/user-view.jsp index f6291c03b..8e466fd58 100644 --- a/src/main/webapp/admin/bizuser/user-view.jsp +++ b/src/main/webapp/admin/bizuser/user-view.jsp @@ -32,7 +32,7 @@
- +
删除
diff --git a/src/main/webapp/assets/js/rb-forms.jsx b/src/main/webapp/assets/js/rb-forms.jsx index aa13ae8a7..af88c6e35 100644 --- a/src/main/webapp/assets/js/rb-forms.jsx +++ b/src/main/webapp/assets/js/rb-forms.jsx @@ -133,13 +133,16 @@ class RbForm extends React.Component {
) - //saveBtns = + + let _entity = this.state.entity + if (_entity == 'User' || _entity == 'Department' || _entity == 'Role' || window.pageType == 'SlaveView'){ + saveBtns = + } return (
{saveBtns} -  
@@ -202,7 +205,7 @@ class RbForm extends React.Component { let sm = that.props.$$$parent.state.__formModel.slaveMeta rb.RbFormModal({ title: `添加${sm[1]}`, entity: sm[0], icon: sm[2], defaultValues: dv }) } - if (next == 111 && window.RbViewPage) window.RbViewPage.updateVTabs([_entity]) + //if (next == 111 && window.RbViewPage) window.RbViewPage.updateVTabs([_entity]) }else{ rb.notice(res.error_msg || '保存失败，请稍后重试', 'danger') diff --git a/src/main/webapp/assets/js/rb-view.jsx b/src/main/webapp/assets/js/rb-view.jsx index e4819dff5..2332164d3 100644 --- a/src/main/webapp/assets/js/rb-view.jsx +++ b/src/main/webapp/assets/js/rb-view.jsx @@ -159,7 +159,7 @@ const RbViewPage = { ReactDOM.render(, pane[0]) that.renderRelatedGrid(pane, _this.attr('href').substr(5)) } else { - ReactDOM.render(

没有相关数据

, pane[0]) + ReactDOM.render(

暂无数据

, pane[0]) pane.removeClass('rb-loading-active') } } @@ -176,7 +176,7 @@ const RbViewPage = { updateVTabs(es) { es = es || this.__vtab_es if (!!!es || es.length == 0) return - $.get(rb.baseUrl + '/app/entity/related-counts?master=' + this.__id + '&relates=' + es.join(','), function(res){ + $.get(rb.baseUrl + '/app/entity/related-counts?masterId=' + this.__id + '&relateds=' + es.join(','), function(res){ for (let k in res.data) { if (~~res.data[k] > 0) { let tab = $('.nav-tabs a[href="#tab-' + k + '"]') @@ -189,7 +189,7 @@ const RbViewPage = { renderRelatedGrid(el, related, page) { page = page || 1 - $.get(rb.baseUrl + '/app/entity/related-list?master=' + this.__id + '&related=' + related + '&pageNo=' + page, function(res){ + $.get(rb.baseUrl + '/app/entity/related-list?masterId=' + this.__id + '&related=' + related + '&pageNo=' + page, function(res){ el.removeClass('rb-loading-active') $(res.data.data).each(function(){ let h = '#!/View/' + related + '/' + this[0] diff --git a/src/main/webapp/general-entity/record-list.jsp b/src/main/webapp/general-entity/record-list.jsp index bdd119835..c647e32d3 100644 --- a/src/main/webapp/general-entity/record-list.jsp +++ b/src/main/webapp/general-entity/record-list.jsp @@ -34,14 +34,14 @@
所有数据
-
添加过滤项
+
添加过滤项
- +
diff --git a/src/main/webapp/general-entity/record-view.jsp b/src/main/webapp/general-entity/record-view.jsp index 30d2b6afe..838394936 100644 --- a/src/main/webapp/general-entity/record-view.jsp +++ b/src/main/webapp/general-entity/record-view.jsp @@ -37,7 +37,7 @@
- +
删除 分派 diff --git a/src/main/webapp/general-entity/slave-list.jsp b/src/main/webapp/general-entity/slave-list.jsp index e0a6d7e5d..58b0f254e 100644 --- a/src/main/webapp/general-entity/slave-list.jsp +++ b/src/main/webapp/general-entity/slave-list.jsp @@ -31,14 +31,14 @@
所有数据
-
添加过滤项
+
添加过滤项
- +
@@ -76,6 +76,7 @@