diff --git a/@rbv b/@rbv index 6baa8ff8b..cc0318cf8 160000 --- a/@rbv +++ b/@rbv @@ -1 +1 @@ -Subproject commit 6baa8ff8b0cc90ba5dbca259a74ad1c533a3c222 +Subproject commit cc0318cf8e03c1433e1ab53177a93dc3e26ad41b diff --git a/pom.xml b/pom.xml index 6839aa22b..a977b4521 100644 --- a/pom.xml +++ b/pom.xml @@ -290,7 +290,7 @@ com.github.devezhao persist4j - 0b293fa74b + 92c7777351 com.alibaba diff --git a/src/main/java/com/rebuild/core/metadata/MetadataSorter.java b/src/main/java/com/rebuild/core/metadata/MetadataSorter.java index 428766882..5de2631e6 100644 --- a/src/main/java/com/rebuild/core/metadata/MetadataSorter.java +++ b/src/main/java/com/rebuild/core/metadata/MetadataSorter.java @@ -109,10 +109,14 @@ public static Entity[] sortEntities(ID user, boolean includesBizz, boolean inclu public static Entity[] sortDetailEntities(Entity mainEntity) { Assert.notNull(mainEntity.getDetailEntity(), "None main entity : " + mainEntity); - List entities = new ArrayList<>(); - CollectionUtils.addAll(entities, mainEntity.getDetialEntities()); - sortByLabel(entities); - return entities.toArray(new Entity[0]); + // SORT:CODE + return mainEntity.getDetialEntities(); + +// // SORT: 名称 +// List entities = new ArrayList<>(); +// CollectionUtils.addAll(entities, mainEntity.getDetialEntities()); +// sortByLabel(entities); +// return entities.toArray(new Entity[0]); } /** diff --git a/src/main/resources/web/assets/css/rb-page.css b/src/main/resources/web/assets/css/rb-page.css index 15a2e98d9..196c0b77f 100644 --- a/src/main/resources/web/assets/css/rb-page.css +++ b/src/main/resources/web/assets/css/rb-page.css @@ -5365,3 +5365,12 @@ div.dataTables_wrapper.compact div.dataTables_oper .btn-space { .table.table-btm-line tbody { border-bottom: 1px solid #dee2e6; } + +.dataTables_oper.invisible2 > .btn, +.dataTables_oper.invisible2 > .btn-group { + display: none; +} + +.dataTables_oper.invisible2 > .btn.J_view { + display: inline-block; +} \ No newline at end of file diff --git a/src/main/resources/web/assets/js/metadata/entity-new.js b/src/main/resources/web/assets/js/metadata/entity-new.js index e6e1e8ad1..fca927b05 100644 --- a/src/main/resources/web/assets/js/metadata/entity-new.js +++ b/src/main/resources/web/assets/js/metadata/entity-new.js @@ -7,6 +7,9 @@ See LICENSE and COMMERCIAL in the project root for license information. /* global InitModels */ window.__LAB_SHOWNDETAIL = false +window.bosskeyTrigger = function () { + window.__LAB_SHOWNDETAIL = true +} $(document).ready(() => { const $bnew = $('.btn-primary.new').on('click', () => { diff --git a/src/main/resources/web/assets/js/rb-datalist.js b/src/main/resources/web/assets/js/rb-datalist.js index 41785a056..dddafc666 100644 --- a/src/main/resources/web/assets/js/rb-datalist.js +++ b/src/main/resources/web/assets/js/rb-datalist.js @@ -91,7 +91,7 @@ const RbListPage = { if (ep.A !== true) $('.J_assign').remove() if (ep.S !== true) $('.J_share, .J_unshare').remove() $cleanMenu('.J_action') - $('.dataTables_oper.invisible').removeClass('invisible') + $('.dataTables_oper.invisible2').removeClass('invisible2') } // Filter Pane diff --git a/src/main/resources/web/general/detail-list.html b/src/main/resources/web/general/detail-list.html index bebb73ad7..bcf4b2e0f 100644 --- a/src/main/resources/web/general/detail-list.html +++ b/src/main/resources/web/general/detail-list.html @@ -90,7 +90,7 @@
-