Be 4.1c (#917)

* Remove table-header-fixed2 class from chart tables

* Remove entity exclusion and fix React prop warning

* Update UI styles and logic for advanced search and navless mode

* Update FieldAggregationController.java

@rbv

@@ -1 +1 @@
-Subproject commit 5e2f71ad9f8973425fd80da6ff73852a9dd8a2ff
+Subproject commit e703f9d6135966765414b5d7d653a4d4394ae66e

src/main/java/com/rebuild/core/service/dashboard/charts/TableBuilder.java

@@ -125,7 +125,7 @@ public class TableBuilder {
         }
 
         String tClazz = (chart.isShowLineNumber() ? "line-number " : "") + (chart.isShowSums() ? "sums" : "");
-        return String.format("<table class=\"table table-bordered table-header-fixed2 %s\">%s%s</table>", tClazz, thead, tbody);
+        return String.format("<table class=\"table table-bordered %s\">%s%s</table>", tClazz, thead, tbody);
     }
 
     // --

src/main/java/com/rebuild/web/robot/trigger/FieldAggregationController.java

@@ -61,14 +61,13 @@ public class FieldAggregationController extends BaseController {
 
         // v35 字段匹配
         if (getBoolParameter(request, "matchfields")) {
-            List<String[]> entities2 = new ArrayList<>();
+            List<String[]> temp = new ArrayList<>();
             for (Entity entity : MetadataSorter.sortEntities(null, false, true)) {
-                entities2.add(new String[] {
-                        entity.getName(), EasyMetaFactory.getLabel(entity), "$" });
+                temp.add(new String[]{entity.getName(), EasyMetaFactory.getLabel(entity), "$"});
             }
 
-            FieldAggregationController.sortEntities(entities2, null);
-            entities.addAll(entities2);
+            sortEntities(temp, null);
+            entities.addAll(temp);
         }
 
         // v3.0 字段聚合无需自己

src/main/java/com/rebuild/web/robot/trigger/FieldWritebackController.java

@@ -99,8 +99,7 @@ public class FieldWritebackController extends BaseController {
         // v35 字段匹配
         if (getBoolParameter(request, "matchfields")) {
             for (Entity entity : MetadataSorter.sortEntities(null, false, true)) {
-                if (sourceEntity.equals(entity)) continue;
-                temp.add(new String[] { entity.getName(), EasyMetaFactory.getLabel(entity), "$" });
+                temp.add(new String[]{entity.getName(), EasyMetaFactory.getLabel(entity), "$"});
             }
 
             FieldAggregationController.sortEntities(temp, null);

src/main/resources/web/assets/css/charts.css

@@ -594,6 +594,7 @@ See LICENSE and COMMERCIAL in the project root for license information.
   overflow: hidden;
   clear: both;
   max-width: 400px;
+  line-height: 16px;
 }
 
 .chart-box.DataList .table td.open-newtab {

src/main/resources/web/assets/css/dashboard.css

@@ -14,6 +14,7 @@ See LICENSE and COMMERCIAL in the project root for license information.
 .grid-stack .grid-stack-item .grid-stack-item-content {
   background-color: #fff;
   height: 100%;
+  border-radius: 6px;
 }
 
 .grid-stack .grid-stack-item .grid-stack-item-content.high,

src/main/resources/web/assets/css/rb-page.css

@@ -651,7 +651,6 @@ div.dataTables_filter .filter-badge:hover .close {
 
 .adv-search .btn {
   border-radius: 0 2px 2px 0 !important;
-  text-align: left;
   height: 2.8rem;
   line-height: 2.7rem;
   position: relative;
@@ -661,6 +660,7 @@ div.dataTables_filter .filter-badge:hover .close {
 }
 
 .adv-search .btn.dropdown-toggle {
+  text-align: left;
   width: 100%;
   border-radius: 2px 0 0 2px !important;
 }

src/main/resources/web/assets/js/charts/charts.js

@@ -1446,7 +1446,7 @@ class DataList extends BaseChart {
 
     const table = (
       <RF>
-        <table className="table table-hover table-bordered table-striped table-header-fixed2 table-sortable">
+        <table className="table table-hover table-bordered table-striped table-sortable">
           <thead>
             <tr ref={(c) => (this._$head = c)}>
               {listFields.map((item) => {

src/main/resources/web/assets/js/metadata/field-new2.js

@@ -41,7 +41,7 @@ class FieldNew2 extends RbModalHandler {
                 </select>
               </div>
             </div>
-            <div className={`form-group row ${['REFERENCE', 'N2NREFERENCE', 'ANYREFERENCE'].includes(this.state.fieldType) ? '' : 'hide'}`}>
+            <div className={`form-group row ${['REFERENCE', 'N2NREFERENCE'].includes(this.state.fieldType) ? '' : 'hide'}`}>
               <label className="col-sm-3 col-form-label text-sm-right">{$L('选择引用实体')}</label>
               <div className="col-sm-7">
                 <select className="form-control form-control-sm" ref={(c) => (this._$refEntity = c)}>

src/main/resources/web/assets/js/rb-page.js

@@ -27,7 +27,7 @@ See LICENSE and COMMERCIAL in the project root for license information.
 // PAGE INITIAL
 $(function () {
   // navless
-  if (rb.commercial > 1 && ~~$urlp('navless') === 1) $(document.body).addClass('rb-navless40')
+  if (rb.commercial > 1 && (~~$urlp('navless') === 1 || ~~$urlp('frame') === 1)) $(document.body).addClass('rb-navless40')
 
   // scroller
   var $t = $('.rb-scroller')

src/main/resources/web/assets/js/trigger/trigger.FIELDWRITEBACK.js

@@ -504,6 +504,7 @@ class FieldFormula extends React.Component {
       return <div className="form-control-plaintext text-danger">{$L('暂不支持')}</div>
     } else {
       return (
+        // eslint-disable-next-line react/no-unknown-property
         <div className="form-control-plaintext formula" _title={$L('计算公式')} title={$L('编辑计算公式')} onClick={() => this.show(toFieldType)}>
           {this.state.valueText}
         </div>

src/main/resources/web/general/reference-search.html

@@ -28,6 +28,11 @@
       .dataTables_wrapper .paging_sizes-no {
         display: none;
       }
+      .adv-search .btn.w-auto {
+        width: 36px !important;
+        min-width: 36px !important;
+        border-radius: 2px !important;
+      }
     </style>
   </head>
   <body class="dialog">
@@ -39,7 +44,9 @@
               <div class="col-6">
                 <div class="dataTables_filter">
                   <div class="adv-search float-left">
-                    <button th:title="${bundle.L('高级查询')}" class="btn btn-secondary w-auto J_filterbtn mr-1" type="button"><i class="icon mdi mdi-filter"></i></button>
+                    <button th:title="${bundle.L('高级查询')}" class="btn btn-secondary w-auto J_filterbtn mr-1" type="button">
+                      <i class="icon mdi mdi-filter"></i>
+                    </button>
                   </div>
                   <div class="input-group input-search" style="width: 227px">
                     <input class="form-control" type="text" th:placeholder="${quickFieldsLabel ?:bundle.L('快速查询')}" th:title="${quickFieldsLabel}" />