style

getrebuild · Mar 14, 2024 · da12886 · da12886
1 parent 4fb3632
commit da12886
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/src/main/resources/web/assets/css/view-page.css b/src/main/resources/web/assets/css/view-page.css
@@ -20,6 +20,14 @@ body {
   padding: 41px 0;
 }
 
+.view-body.loading .main-content {
+  display: none;
+}
+
+.view-body.loading .view-header > .header-icon::before {
+  animation: flash 2s infinite;
+}
+
 .tab-container {
   margin-top: -8px;
   padding-right: 4px;

diff --git a/src/main/resources/web/assets/js/general/rb-view.js b/src/main/resources/web/assets/js/general/rb-view.js
@@ -594,7 +594,7 @@ const RbViewPage = {
 
     renderRbcomp(<RbViewForm entity={entity[0]} id={id} onViewEditable={ep && ep.U} />, 'tab-rbview', function () {
       RbViewPage._RbViewForm = this
-      setTimeout(() => $('.main-content>.row.hide').removeClass('hide'), 100)
+      setTimeout(() => $('.view-body.loading').removeClass('loading'), 100)
     })
 
     $('.J_close').on('click', () => this.hide())

diff --git a/src/main/resources/web/general/detail-view.html b/src/main/resources/web/general/detail-view.html
@@ -6,7 +6,7 @@
     <link rel="stylesheet" type="text/css" th:href="@{/assets/css/view-page.css}" />
     <title th:text="${entityLabel}"></title>
   </head>
-  <body class="view-body">
+  <body class="view-body loading">
     <div class="view-header">
       <i class="header-icon zmdi" th:classappend="|zmdi-${entityIcon}|"></i>
       <h3 class="title" th:text="${bundle.L('%s详情', entityLabel)}"></h3>

diff --git a/src/main/resources/web/general/record-view.html b/src/main/resources/web/general/record-view.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" type="text/css" th:href="@{/assets/css/view-page.css}" />
     <title th:text="${entityLabel}"></title>
   </head>
-  <body class="view-body">
+  <body class="view-body loading">
     <div class="view-header">
       <i class="header-icon zmdi" th:classappend="|zmdi-${entityIcon}|"></i>
       <h3 class="title" th:text="${bundle.L('%s详情', entityLabel)}"></h3>
@@ -23,7 +23,7 @@ <h3 class="title" th:text="${bundle.L('%s详情', entityLabel)}"></h3>
       </span>
     </div>
     <div class="main-content container-fluid">
-      <div class="row hide">
+      <div class="row">
         <div class="col-12 col-md-9">
           <div class="tab-container">
             <ul class="nav nav-tabs">

diff --git a/src/test/java/com/rebuild/core/service/query/AdvFilterParserTest.java b/src/test/java/com/rebuild/core/service/query/AdvFilterParserTest.java
@@ -105,13 +105,13 @@ void testDateFunc() {
     }
 
     @Test
-    void testRepe() {
+    void testRep() {
         JSONObject filterExp = new JSONObject();
         filterExp.put("entity", TestAllFields);
         JSONArray items = new JSONArray();
         filterExp.put("items", items);
 
-        items.add(JSON.parseObject("{ op:'REPE', field:'TestAllFieldsName', value:2 }"));
+        items.add(JSON.parseObject("{ op:'REP', field:'TestAllFieldsName', value:2 }"));
         System.out.println(new AdvFilterParser(filterExp).toSqlWhere());
     }
 }