style: dataTables_oper.invisible2

getrebuild · Nov 17, 2023 · 95c666b · 95c666b
1 parent 6525cd8
commit 95c666b
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 9 deletions.
diff --git a/@rbv b/@rbv
diff --git a/pom.xml b/pom.xml
@@ -290,7 +290,7 @@
         <dependency>
             <groupId>com.github.devezhao</groupId>
             <artifactId>persist4j</artifactId>
-            <version>0b293fa74b</version>
+            <version>92c7777351</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.alibaba</groupId>

diff --git 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<BaseMeta> entities = new ArrayList<>();
-        CollectionUtils.addAll(entities, mainEntity.getDetialEntities());
-        sortByLabel(entities);
-        return entities.toArray(new Entity[0]);
+        // SORT:CODE
+        return mainEntity.getDetialEntities();
+
+//        // SORT: 名称
+//        List<BaseMeta> 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
@@ -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;
+}
diff --git 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
@@ -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
@@ -90,7 +90,7 @@
                     </div>
                   </div>
                   <div class="col-12 col-md-6">
-                    <div class="dataTables_oper invisible">
+                    <div class="dataTables_oper invisible2">
                       <button class="btn btn-space btn-secondary J_view" type="button" disabled="disabled"><i class="icon zmdi zmdi-folder"></i> [[${bundle.L('打开')}]]</button>
                       <button class="btn btn-space btn-secondary J_edit" type="button" disabled="disabled"><i class="icon zmdi zmdi-edit"></i> [[${bundle.L('编辑')}]]</button>
                       <div class="btn-group btn-space J_action">

diff --git a/src/main/resources/web/general/record-list.html b/src/main/resources/web/general/record-list.html
@@ -90,7 +90,7 @@
                     </div>
                   </div>
                   <div class="col-12 col-md-6">
-                    <div class="dataTables_oper invisible">
+                    <div class="dataTables_oper invisible2">
                       <button class="btn btn-space btn-secondary J_view" type="button" disabled="disabled"><i class="icon zmdi zmdi-folder"></i> [[${bundle.L('打开')}]]</button>
                       <button class="btn btn-space btn-secondary J_edit" type="button" disabled="disabled"><i class="icon zmdi zmdi-edit"></i> [[${bundle.L('编辑')}]]</button>
                       <button class="btn btn-space btn-primary J_new" type="button" disabled="disabled"><i class="icon zmdi zmdi-plus"></i> [[${bundle.L('新建')}]]</button>