diff --git a/.eslintrc.js b/.eslintrc.js
index 4f247dbe2..8455e637a 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -129,5 +129,7 @@ module.exports = {
     $escapeHtml: true,
     $isLight: true,
     RbGritter: true,
+    $formattedCode: true,
+    CodeViewport: true,
   },
 }
diff --git a/@rbv b/@rbv
index b7e5e1659..cb938a242 160000
--- a/@rbv
+++ b/@rbv
@@ -1 +1 @@
-Subproject commit b7e5e165931230ab89ca6ac0ab61bc6c72d21e4a
+Subproject commit cb938a242952b8f84cbf4a2b3387166b503f42fd
diff --git a/pom.xml b/pom.xml
index 28a94f966..199438505 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.17</version>
+        <version>2.7.18</version>
         <relativePath/>
     </parent>
     <groupId>com.rebuild</groupId>
     <artifactId>rebuild</artifactId>
-    <version>3.5.0-beta3</version>
+    <version>3.6.0-dev</version>
     <name>rebuild</name>
     <description>Building your business-systems freely!</description>
     <!-- UNCOMMENT USE TOMCAT -->
@@ -335,7 +335,7 @@
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>4.4.3</version>
+            <version>4.4.6</version>
         </dependency>
         <dependency>
             <groupId>com.qiniu</groupId>
@@ -497,6 +497,11 @@
             <artifactId>mammoth</artifactId>
             <version>1.5.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.getui.push</groupId>
+            <artifactId>restful-sdk</artifactId>
+            <version>1.0.0.15</version>
+        </dependency>
 
         <!-- fix: CVEs -->
         <dependency>
diff --git a/src/main/java/com/rebuild/core/Application.java b/src/main/java/com/rebuild/core/Application.java
index 7ad79e678..45c4241d2 100644
--- a/src/main/java/com/rebuild/core/Application.java
+++ b/src/main/java/com/rebuild/core/Application.java
@@ -74,11 +74,11 @@ public class Application implements ApplicationListener<ApplicationStartedEvent>
     /**
      * Rebuild Version
      */
-    public static final String VER = "3.5.0-beta3";
+    public static final String VER = "3.6.0-dev";
     /**
      * Rebuild Build [MAJOR]{1}[MINOR]{2}[PATCH]{2}[BUILD]{2}
      */
-    public static final int BUILD = 3050003;
+    public static final int BUILD = 3060000;
 
     static {
         // Driver for DB
diff --git a/src/main/java/com/rebuild/core/service/notification/Message.java b/src/main/java/com/rebuild/core/service/notification/Message.java
index 670ab56f8..e9227df2f 100644
--- a/src/main/java/com/rebuild/core/service/notification/Message.java
+++ b/src/main/java/com/rebuild/core/service/notification/Message.java
@@ -9,6 +9,7 @@
 
 import cn.devezhao.persist4j.engine.ID;
 import com.rebuild.core.privileges.UserService;
+import com.rebuild.core.support.i18n.Language;
 import lombok.AccessLevel;
 import lombok.Data;
 import lombok.Setter;
@@ -57,4 +58,17 @@ public Message(ID fromUser, ID toUser, String message, int type, ID relatedRecor
         this.type = type;
         this.relatedRecord = relatedRecord;
     }
+
+    /**
+     * 获取通知标题
+     * @return
+     */
+    public String getTitle4Type() {
+        if (this.type == TYPE_ASSIGN) return Language.L("记录分配通知");
+        else if (this.type == TYPE_SAHRE) return Language.L("记录共享通知");
+        else if (this.type == TYPE_APPROVAL) return Language.L("记录审核通知");
+        else if (this.type == TYPE_FEEDS) return Language.L("动态通知");
+        else if (this.type == TYPE_PROJECT) return Language.L("项目任务通知");
+        else return Language.L("新通知");
+    }
 }
diff --git a/src/main/java/com/rebuild/utils/MarkdownUtils.java b/src/main/java/com/rebuild/utils/MarkdownUtils.java
index c17edffd5..415f92cbd 100644
--- a/src/main/java/com/rebuild/utils/MarkdownUtils.java
+++ b/src/main/java/com/rebuild/utils/MarkdownUtils.java
@@ -82,7 +82,7 @@ public static String render(String md, boolean targetBlank) {
      * @param md
      * @return
      */
-    public static String cleanMd(String md) {
+    public static String cleanMarks(String md) {
         String html = render(md);
         return Jsoup.parse(html).body().text();
     }
diff --git a/src/main/java/com/rebuild/web/admin/audit/RecycleBinController.java b/src/main/java/com/rebuild/web/admin/audit/RecycleBinController.java
index 4a66a86c1..9258c04fb 100644
--- a/src/main/java/com/rebuild/web/admin/audit/RecycleBinController.java
+++ b/src/main/java/com/rebuild/web/admin/audit/RecycleBinController.java
@@ -8,13 +8,16 @@
 package com.rebuild.web.admin.audit;
 
 import cn.devezhao.persist4j.engine.ID;
+import com.rebuild.api.RespBody;
+import com.rebuild.core.Application;
 import com.rebuild.core.service.general.recyclebin.RecycleRestore;
 import com.rebuild.utils.JSONUtils;
 import com.rebuild.web.BaseController;
+import com.rebuild.web.IdParam;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
@@ -27,7 +30,7 @@
  * @since 2019-08-20
  */
 @Slf4j
-@Controller
+@RestController
 @RequestMapping("/admin/audit/")
 public class RecycleBinController extends BaseController {
 
@@ -37,7 +40,7 @@ public ModelAndView page() {
     }
 
     @RequestMapping("recycle-bin/restore")
-    public void dataList(HttpServletRequest request, HttpServletResponse response) {
+    public RespBody dataList(HttpServletRequest request) {
         boolean cascade = getBoolParameter(request, "cascade");
         String ids = getParameterNotNull(request, "ids");
 
@@ -60,9 +63,14 @@ public void dataList(HttpServletRequest request, HttpServletResponse response) {
         }
 
         if (lastError != null && restored == 0) {
-            writeFailure(response, lastError);
-        } else {
-            writeSuccess(response, JSONUtils.toJSONObject("restored", restored));
+            return RespBody.error(lastError);
         }
+        return RespBody.ok(JSONUtils.toJSONObject("restored", restored));
+    }
+
+    @GetMapping("recycle-bin/details")
+    public RespBody details(@IdParam ID id) {
+        Object[] o = Application.getQueryFactory().uniqueNoFilter(id, "recordContent");
+        return RespBody.ok(o[0]);
     }
 }
diff --git a/src/main/java/com/rebuild/web/admin/audit/RevisionHistoryController.java b/src/main/java/com/rebuild/web/admin/audit/RevisionHistoryController.java
index 552ffb7c4..0c56a264c 100644
--- a/src/main/java/com/rebuild/web/admin/audit/RevisionHistoryController.java
+++ b/src/main/java/com/rebuild/web/admin/audit/RevisionHistoryController.java
@@ -16,7 +16,9 @@
 import com.rebuild.core.metadata.MetadataHelper;
 import com.rebuild.core.metadata.easymeta.EasyField;
 import com.rebuild.core.metadata.easymeta.EasyMetaFactory;
+import com.rebuild.core.support.i18n.I18nUtils;
 import com.rebuild.core.support.i18n.Language;
+import com.rebuild.utils.JSONUtils;
 import com.rebuild.web.EntityController;
 import com.rebuild.web.IdParam;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -24,7 +26,10 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.Iterator;
+import java.util.List;
 
 /**
  * @author devezhao
@@ -39,42 +44,70 @@ public ModelAndView page() {
         return createModelAndView("/admin/audit/revision-history");
     }
 
-    @RequestMapping("revision-history/details")
+    @GetMapping("revision-history/details")
     public JSON details(@IdParam ID revisionId) {
         Object[] rev = Application.createQueryNoFilter(
                 "select revisionContent,belongEntity from RevisionHistory where revisionId = ?")
                 .setParameter(1, revisionId)
                 .unique();
-        JSONArray contents = JSON.parseArray((String) rev[0]);
 
-        // 补充字段名称
+        JSONArray contents = JSON.parseArray((String) rev[0]);
         if (MetadataHelper.containsEntity((String) rev[1])) {
-            Entity entity = MetadataHelper.getEntity((String) rev[1]);
+            paddingFieldsName(contents, MetadataHelper.getEntity((String) rev[1]));
+        }
 
-            for (Iterator<Object> iter = contents.iterator(); iter.hasNext(); ) {
-                JSONObject item = (JSONObject) iter.next();
-                String fieldName = item.getString("field");
+        return contents;
+    }
 
-                if (entity.containsField(fieldName)) {
-                    EasyField easyField = EasyMetaFactory.valueOf(entity.getField(fieldName));
-                    // 排除不可查询字段
-                    if (!easyField.isQueryable()) {
-                        iter.remove();
-                        continue;
-                    }
+    @GetMapping("revision-history/details-list")
+    public JSON detailsList(@IdParam ID revisionId) {
+        Object[] o = Application.getQueryFactory().uniqueNoFilter(revisionId, "recordId,belongEntity");
+        if (o == null) return JSONUtils.EMPTY_ARRAY;
 
-                    fieldName = easyField.getLabel();
+        Object[][] array = Application.createQueryNoFilter(
+                "select revisionContent,revisionType,revisionOn,revisionBy.fullName from RevisionHistory where recordId = ? order by autoId desc")
+                .setParameter(1, o[0])
+                .array();
+
+        List<Object> list = new ArrayList<>();
+        if (MetadataHelper.containsEntity((String) o[1])) {
+            Entity entity = MetadataHelper.getEntity((String) o[1]);
+
+            for (Object[] item : array) {
+                JSONArray contents = JSON.parseArray((String) item[0]);
+                paddingFieldsName(contents, entity);
+
+                item[0] = contents;
+                item[2] = I18nUtils.formatDate((Date) item[2]);
+                list.add(item);
+            }
+        }
+        return (JSON) JSON.toJSON(list);
+    }
+
+    // 补充字段名称
+    private void paddingFieldsName(JSONArray contents, Entity entity) {
+        for (Iterator<Object> iter = contents.iterator(); iter.hasNext(); ) {
+            JSONObject item = (JSONObject) iter.next();
+            String fieldName = item.getString("field");
+
+            if (entity.containsField(fieldName)) {
+                EasyField easyField = EasyMetaFactory.valueOf(entity.getField(fieldName));
+                // 排除不可查询字段
+                if (!easyField.isQueryable()) {
+                    iter.remove();
+                    continue;
+                }
+
+                fieldName = easyField.getLabel();
+            } else {
+                if ("SHARETO".equalsIgnoreCase(fieldName)) {
+                    fieldName = Language.L("共享用户");
                 } else {
-                    if ("SHARETO".equalsIgnoreCase(fieldName)) {
-                        fieldName = Language.L("共享用户");
-                    } else {
-                        fieldName = "[" + fieldName.toUpperCase() + "]";
-                    }
+                    fieldName = "[" + fieldName.toUpperCase() + "]";
                 }
-                item.put("field", fieldName);
             }
+            item.put("field", fieldName);
         }
-
-        return contents;
     }
 }
diff --git a/src/main/resources/web/_include/forms.html b/src/main/resources/web/_include/forms.html
index f31d9fdc2..4180dd6ed 100644
--- a/src/main/resources/web/_include/forms.html
+++ b/src/main/resources/web/_include/forms.html
@@ -1,10 +1,10 @@
-<script th:src="@{/assets/js/rb-forms.js}" type="text/babel"></script>
-<script th:src="@{/assets/js/rb-forms.append.js}" type="text/babel"></script>
-<script th:src="@{/assets/js/rb-forms.protable.js}" type="text/babel"></script>
-<script th:src="@{/assets/js/rb-datalist.common.js}" type="text/babel"></script>
-<script th:src="@{/assets/js/rb-approval.js}" type="text/babel"></script>
-<script th:src="@{/assets/js/rb-advfilter.js}" type="text/babel"></script>
-<script th:src="@{/assets/js/rb-assignshare.js}" type="text/babel"></script>
+<script th:src="@{/assets/js/general/rb-forms.js}" type="text/babel"></script>
+<script th:src="@{/assets/js/general/rb-forms.append.js}" type="text/babel"></script>
+<script th:src="@{/assets/js/general/rb-forms.protable.js}" type="text/babel"></script>
+<script th:src="@{/assets/js/general/rb-datalist.common.js}" type="text/babel"></script>
+<script th:src="@{/assets/js/general/rb-approval.js}" type="text/babel"></script>
+<script th:src="@{/assets/js/general/rb-advfilter.js}" type="text/babel"></script>
+<script th:src="@{/assets/js/general/rb-assignshare.js}" type="text/babel"></script>
 <!--
 <link rel="stylesheet" type="text/css" th:href="@{/assets/css/customized.css}" />
 <script th:src="@{/assets/js/customized-forms.js}" type="text/babel"></script>
diff --git a/src/main/resources/web/admin/audit/login-logs.html b/src/main/resources/web/admin/audit/login-logs.html
index 7e78630c8..e1611309d 100644
--- a/src/main/resources/web/admin/audit/login-logs.html
+++ b/src/main/resources/web/admin/audit/login-logs.html
@@ -45,8 +45,8 @@
       </div>
     </div>
     <th:block th:replace="~{/_include/footer}" />
-    <script th:src="@{/assets/js/rb-datalist.common.js}" type="text/babel"></script>
-    <script th:src="@{/assets/js/rb-datalist.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-datalist.common.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-datalist.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/admin/login-logs.js}" type="text/babel"></script>
   </body>
 </html>
diff --git a/src/main/resources/web/admin/audit/recycle-bin.html b/src/main/resources/web/admin/audit/recycle-bin.html
index a39d2337f..87d887f60 100644
--- a/src/main/resources/web/admin/audit/recycle-bin.html
+++ b/src/main/resources/web/admin/audit/recycle-bin.html
@@ -34,6 +34,7 @@
                   </div>
                   <div class="col-12 col-md-6">
                     <div class="dataTables_oper">
+                      <button class="btn btn-space btn-secondary J_details" type="button"><i class="icon mdi mdi-text-box-search-outline"></i> [[${bundle.L('详情')}]]</button>
                       <button class="btn btn-space btn-outline btn-danger J_restore" type="button"><i class="icon zmdi zmdi-time-restore"></i> [[${bundle.L('恢复')}]]</button>
                     </div>
                   </div>
@@ -48,8 +49,11 @@
       </div>
     </div>
     <th:block th:replace="~{/_include/footer}" />
-    <script th:src="@{/assets/js/rb-datalist.common.js}" type="text/babel"></script>
-    <script th:src="@{/assets/js/rb-datalist.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-datalist.common.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-datalist.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/admin/recycle-bin.js}" type="text/babel"></script>
+    <script th:src="@{/assets/lib/prettier/standalone.js}"></script>
+    <script th:src="@{/assets/lib/prettier/parser-babel.js}"></script>
+    <script th:src="@{/assets/lib/clipboard.min.js}"></script>
   </body>
 </html>
diff --git a/src/main/resources/web/admin/audit/revision-history.html b/src/main/resources/web/admin/audit/revision-history.html
index 1322b83d8..fe45efbc3 100644
--- a/src/main/resources/web/admin/audit/revision-history.html
+++ b/src/main/resources/web/admin/audit/revision-history.html
@@ -14,6 +14,23 @@
         overflow: hidden;
         text-overflow: ellipsis;
       }
+      .table tr.group > td {
+        padding: 0;
+      }
+      .table tr.group > td > h5 {
+        padding: 8px 10px;
+        margin: 0;
+        background-color: #dee2e6;
+        border-radius: 0;
+      }
+      .table tr.group > td > h5,
+      .table tr.group > td > h5 * {
+        color: #444;
+        font-weight: normal;
+      }
+      .table.group > thead > tr > th {
+        border-bottom-width: 0;
+      }
     </style>
   </head>
   <body>
@@ -59,8 +76,8 @@
       </div>
     </div>
     <th:block th:replace="~{/_include/footer}" />
-    <script th:src="@{/assets/js/rb-datalist.common.js}" type="text/babel"></script>
-    <script th:src="@{/assets/js/rb-datalist.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-datalist.common.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-datalist.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/admin/revision-history.js}" type="text/babel"></script>
   </body>
 </html>
diff --git a/src/main/resources/web/admin/bizuser/dept-list.html b/src/main/resources/web/admin/bizuser/dept-list.html
index 40f14db4b..bcf55ffeb 100644
--- a/src/main/resources/web/admin/bizuser/dept-list.html
+++ b/src/main/resources/web/admin/bizuser/dept-list.html
@@ -95,7 +95,7 @@
       }
     </script>
     <th:block th:replace="~{/_include/forms}" />
-    <script th:src="@{/assets/js/rb-datalist.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-datalist.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/aside-tree.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/bizuser/dept-tree.js}" type="text/babel"></script>
     <script type="text/babel">
diff --git a/src/main/resources/web/admin/bizuser/dept-view.html b/src/main/resources/web/admin/bizuser/dept-view.html
index d45b797ec..49ad6623a 100644
--- a/src/main/resources/web/admin/bizuser/dept-view.html
+++ b/src/main/resources/web/admin/bizuser/dept-view.html
@@ -67,7 +67,7 @@ <h3 class="title">[[${bundle.L('部门详情')}]]</h3>
       }
     </script>
     <th:block th:replace="~{/_include/forms}" />
-    <script th:src="@{/assets/js/rb-view.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-view.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/bizuser/dept-view.js}" type="text/babel"></script>
   </body>
 </html>
diff --git a/src/main/resources/web/admin/bizuser/role-view.html b/src/main/resources/web/admin/bizuser/role-view.html
index e347eb00b..9d93800d0 100644
--- a/src/main/resources/web/admin/bizuser/role-view.html
+++ b/src/main/resources/web/admin/bizuser/role-view.html
@@ -64,7 +64,7 @@ <h3 class="title">[[${bundle.L('角色详情')}]]</h3>
       }
     </script>
     <th:block th:replace="~{/_include/forms}" />
-    <script th:src="@{/assets/js/rb-view.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-view.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/bizuser/role-view.js}" type="text/babel"></script>
   </body>
 </html>
diff --git a/src/main/resources/web/admin/bizuser/team-list.html b/src/main/resources/web/admin/bizuser/team-list.html
index 6d5993012..f891f3c47 100644
--- a/src/main/resources/web/admin/bizuser/team-list.html
+++ b/src/main/resources/web/admin/bizuser/team-list.html
@@ -58,6 +58,6 @@
       }
     </script>
     <th:block th:replace="~{/_include/forms}" />
-    <script th:src="@{/assets/js/rb-datalist.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-datalist.js}" type="text/babel"></script>
   </body>
 </html>
diff --git a/src/main/resources/web/admin/bizuser/team-view.html b/src/main/resources/web/admin/bizuser/team-view.html
index 6870fc14a..a16d6e459 100644
--- a/src/main/resources/web/admin/bizuser/team-view.html
+++ b/src/main/resources/web/admin/bizuser/team-view.html
@@ -79,7 +79,7 @@ <h3 class="title">[[${bundle.L('团队详情')}]]</h3>
       }
     </script>
     <th:block th:replace="~{/_include/forms}" />
-    <script th:src="@{/assets/js/rb-view.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-view.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/bizuser/team-view.js}" type="text/babel"></script>
   </body>
 </html>
diff --git a/src/main/resources/web/admin/bizuser/user-list.html b/src/main/resources/web/admin/bizuser/user-list.html
index 02b56f4ec..d6c862b71 100644
--- a/src/main/resources/web/admin/bizuser/user-list.html
+++ b/src/main/resources/web/admin/bizuser/user-list.html
@@ -111,7 +111,7 @@
       }
     </script>
     <th:block th:replace="~{/_include/forms}" />
-    <script th:src="@{/assets/js/rb-datalist.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-datalist.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/aside-tree.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/bizuser/dept-tree.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/bizuser/user-list.js}" type="text/babel"></script>
diff --git a/src/main/resources/web/admin/bizuser/user-view.html b/src/main/resources/web/admin/bizuser/user-view.html
index 363921941..c1cf1cf78 100644
--- a/src/main/resources/web/admin/bizuser/user-view.html
+++ b/src/main/resources/web/admin/bizuser/user-view.html
@@ -100,7 +100,7 @@ <h3 class="title">[[${bundle.L('用户详情')}]]</h3>
     </script>
     <th:block th:replace="~{/_include/forms}" />
     <script th:src="@{/assets/lib/clipboard.min.js}"></script>
-    <script th:src="@{/assets/js/rb-view.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-view.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/bizuser/user-view.js}" type="text/babel"></script>
   </body>
 </html>
diff --git a/src/main/resources/web/admin/integration/apis-manager.html b/src/main/resources/web/admin/integration/apis-manager.html
index 4e40c4d36..7ca133d32 100644
--- a/src/main/resources/web/admin/integration/apis-manager.html
+++ b/src/main/resources/web/admin/integration/apis-manager.html
@@ -35,23 +35,16 @@
       .logs-detail dd {
         color: #222;
       }
-      .code-wrap > pre {
-        background-color: #f5f2f0;
-        color: #905;
-        text-shadow: 0 1px #fff;
-        border-radius: 4px;
-        padding: 15px;
-        font-family: ui-monospace, 'Cascadia Mono', 'Segoe UI Mono', 'Liberation Mono', Menlo, Monaco, Consolas, monospace !important;
-      }
       .search-logs > input {
         appearance: none !important;
         outline: none !important;
         border: 0 none;
-        padding: 5px 8px;
+        padding: 6px 8px;
         width: 100%;
         border-radius: 2px;
         display: block;
         border-bottom: 1px solid rgba(0, 0, 0, 0.125);
+        line-height: 1;
       }
       .search-logs > input:focus {
         background-color: #ddd;
@@ -127,5 +120,6 @@
     <script th:src="@{/assets/js/admin/apis-manager.js}" type="text/babel"></script>
     <script th:src="@{/assets/lib/prettier/standalone.js}"></script>
     <script th:src="@{/assets/lib/prettier/parser-babel.js}"></script>
+    <script th:src="@{/assets/lib/clipboard.min.js}"></script>
   </body>
 </html>
diff --git a/src/main/resources/web/admin/metadata/field-edit.html b/src/main/resources/web/admin/metadata/field-edit.html
index 8b6e2a8b6..6c18135c0 100644
--- a/src/main/resources/web/admin/metadata/field-edit.html
+++ b/src/main/resources/web/admin/metadata/field-edit.html
@@ -521,8 +521,8 @@ <h5>[[${bundle.L('常用')}]]</h5>
       }
     </script>
     <script th:src="@{/assets/lib/widget/bootstrap-slider.min.js}"></script>
-    <script th:src="@{/assets/js/rb-advfilter.js}" type="text/babel"></script>
-    <script th:src="@{/assets/js/rb-forms.append.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-advfilter.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-forms.append.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/metadata/field-formula.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/metadata/field-edit.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/metadata/entity-switch.js}" type="text/babel"></script>
diff --git a/src/main/resources/web/admin/robot/approval-design.html b/src/main/resources/web/admin/robot/approval-design.html
index 09c0e1f3a..d3a36194f 100644
--- a/src/main/resources/web/admin/robot/approval-design.html
+++ b/src/main/resources/web/admin/robot/approval-design.html
@@ -67,7 +67,7 @@
         flowDefinition: [(${flowDefinition ?:'null'})],
       }
     </script>
-    <script th:src="@{/assets/js/rb-advfilter.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-advfilter.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/admin/config-comps.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/admin/approval-design.js}" type="text/babel"></script>
   </body>
diff --git a/src/main/resources/web/admin/robot/transform-design.html b/src/main/resources/web/admin/robot/transform-design.html
index aea50cd51..5e3cda467 100644
--- a/src/main/resources/web/admin/robot/transform-design.html
+++ b/src/main/resources/web/admin/robot/transform-design.html
@@ -175,7 +175,7 @@ <h5 class="mt-0 text-bold">[[${bundle.L('明细记录导入条件')}]]</h5>
       }
     </script>
     <script th:src="@{/assets/js/metadata/field-valueset.js}" type="text/babel"></script>
-    <script th:src="@{/assets/js/rb-advfilter.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-advfilter.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/metadata/field-compatible.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/admin/transform-design.js}" type="text/babel"></script>
   </body>
diff --git a/src/main/resources/web/admin/robot/trigger-design.html b/src/main/resources/web/admin/robot/trigger-design.html
index 9ec1b3b5b..560b6f7bf 100644
--- a/src/main/resources/web/admin/robot/trigger-design.html
+++ b/src/main/resources/web/admin/robot/trigger-design.html
@@ -197,7 +197,7 @@
         actionContent: [(${actionContent ?:'null'})],
       }
     </script>
-    <script th:src="@{/assets/js/rb-advfilter.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-advfilter.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/metadata/field-compatible.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/metadata/field-valueset.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/metadata/field-formula.js}" type="text/babel"></script>
diff --git a/src/main/resources/web/assets/css/rb-page.css b/src/main/resources/web/assets/css/rb-page.css
index 89faf1cf5..8cbf8f621 100644
--- a/src/main/resources/web/assets/css/rb-page.css
+++ b/src/main/resources/web/assets/css/rb-page.css
@@ -218,6 +218,7 @@ code {
 .badge {
   font-weight: normal !important;
   font-style: normal !important;
+  text-transform: uppercase;
 }
 
 .badge.badge-light,
@@ -5384,3 +5385,28 @@ div.dataTables_wrapper.compact div.dataTables_oper .btn-space {
 .dataTables_oper.invisible2 > .btn.J_view {
   display: inline-block;
 }
+
+.code-viewport {
+  position: relative;
+}
+
+.code-viewport > pre {
+  background-color: #f5f2f0;
+  color: #905;
+  text-shadow: 0 1px #fff;
+  border-radius: 4px;
+  padding: 15px;
+  margin: 0;
+  font-family: ui-monospace, 'Cascadia Mono', 'Segoe UI Mono', 'Liberation Mono', Menlo, Monaco, Consolas, monospace !important;
+}
+
+.code-viewport > a.copy {
+  position: absolute;
+  top: 15px;
+  right: 15px;
+  display: none;
+}
+
+.code-viewport:hover > a.copy {
+  display: inline-block;
+}
\ No newline at end of file
diff --git a/src/main/resources/web/assets/js/admin/apis-manager.js b/src/main/resources/web/assets/js/admin/apis-manager.js
index 3d09f02b3..542f822ca 100644
--- a/src/main/resources/web/assets/js/admin/apis-manager.js
+++ b/src/main/resources/web/assets/js/admin/apis-manager.js
@@ -171,7 +171,7 @@ class AppLogsViewer extends RbModal {
             <div className="search-logs position-relative">
               <input
                 type="text"
-                placeholder={$L('查询')}
+                placeholder={$L('搜索')}
                 onKeyDown={(e) => {
                   if (e.keyCode === 13) {
                     this._loadNext(true, e.target.value)
@@ -202,12 +202,7 @@ class AppLogsViewer extends RbModal {
             </div>
             {this.state.showMore && (
               <div className="text-center mt-3">
-                <a
-                  href="###"
-                  onClick={(e) => {
-                    $stopEvent(e, true)
-                    this._loadNext()
-                  }}>
+                <a className="text-primary" onClick={() => this._loadNext()}>
                   {$L('加载更多')}
                 </a>
               </div>
@@ -231,19 +226,9 @@ class AppLogsViewer extends RbModal {
                   <dt className="col-sm-3">{$L('请求地址')}</dt>
                   <dd className="col-sm-9 text-break">{dataShow[3]}</dd>
                   <dt className="col-sm-12">{$L('请求数据')}</dt>
-                  <dd className="col-sm-12">
-                    <div className="code-wrap">
-                      <pre ref={(c) => (this._$codeReq = c)}>{JSON.stringify(dataShow[4])}</pre>
-                    </div>
-                  </dd>
+                  <dd className="col-sm-12">{dataShow[4] && <CodeViewport code={dataShow[4]} />}</dd>
                   <dt className="col-sm-12">{$L('响应数据')}</dt>
-                  <dd className="col-sm-12 mb-0">
-                    <div className="code-wrap">
-                      <pre className="mb-0" ref={(c) => (this._$codeResp = c)}>
-                        {JSON.stringify(dataShow[5])}
-                      </pre>
-                    </div>
-                  </dd>
+                  <dd className="col-sm-12 mb-0">{dataShow[5] && <CodeViewport code={dataShow[5]} />}</dd>
                 </dl>
               </div>
             ) : (
@@ -265,12 +250,12 @@ class AppLogsViewer extends RbModal {
     this._loadNext()
   }
 
-  componentDidUpdate(prevProps, prevState) {
-    if (this._$codeReq && this._$codeResp && (this.state.dataShow || [])[6] !== (prevState || [])[6]) {
-      this._$codeReq.innerHTML = this._formattedCode(JSON.stringify(this.state.dataShow[4]))
-      this._$codeResp.innerHTML = this._formattedCode(JSON.stringify(this.state.dataShow[5]))
-    }
-  }
+  // componentDidUpdate(prevProps, prevState) {
+  //   if (this._$codeReq && this._$codeResp && (this.state.dataShow || [])[6] !== (prevState || [])[6]) {
+  //     this._$codeReq.innerHTML = $formattedCode(this.state.dataShow[4])
+  //     this._$codeResp.innerHTML = $formattedCode(this.state.dataShow[5])
+  //   }
+  // }
 
   _loadNext(reset, q) {
     if (this.__inLoading) return
@@ -306,19 +291,4 @@ class AppLogsViewer extends RbModal {
     }
     return false
   }
-
-  _formattedCode(c) {
-    try {
-      // eslint-disable-next-line no-undef
-      return prettier.format(c, {
-        parser: 'json',
-        // eslint-disable-next-line no-undef
-        plugins: prettierPlugins,
-        printWidth: 10,
-      })
-    } catch (err) {
-      console.log('Cannot format :', err)
-      return c
-    }
-  }
 }
diff --git a/src/main/resources/web/assets/js/admin/recycle-bin.js b/src/main/resources/web/assets/js/admin/recycle-bin.js
index 725834ebe..87eaabe68 100644
--- a/src/main/resources/web/assets/js/admin/recycle-bin.js
+++ b/src/main/resources/web/assets/js/admin/recycle-bin.js
@@ -64,6 +64,7 @@ class DataList extends React.Component {
     this._$recordName = $input
 
     $('.J_restore').on('click', () => this.restore())
+    $('.J_details').on('click', () => this.showDetails())
   }
 
   queryList() {
@@ -93,13 +94,13 @@ class DataList extends React.Component {
     if (!ids || ids.length === 0) return
 
     const alertMsg = (
-      <React.Fragment>
+      <RF>
         <div className="text-bold mb-2">{$L('是否恢复选中的 %d 条记录？', ids.length)}</div>
         <label className="custom-control custom-control-sm custom-checkbox custom-control-inline mb-2">
           <input className="custom-control-input" type="checkbox" />
           <span className="custom-control-label">{$L('同时恢复关联删除的记录 (如有)')}</span>
         </label>
-      </React.Fragment>
+      </RF>
     )
 
     const that = this
@@ -121,6 +122,13 @@ class DataList extends React.Component {
       },
     })
   }
+
+  showDetails() {
+    const ids = this._List.getSelectedIds()
+    if (!ids || ids.length === 0) return
+
+    renderRbcomp(<DlgDetails id={ids[0]} width="681" />)
+  }
 }
 
 const CellRenders_renderSimple = CellRenders.renderSimple
@@ -145,3 +153,17 @@ CellRenders.renderSimple = function (v, s, k) {
 
   return CellRenders_renderSimple(v, s, k)
 }
+
+// ~~ 数据详情
+class DlgDetails extends RbAlert {
+  renderContent() {
+    return this.state.code && <CodeViewport code={this.state.code} />
+  }
+
+  componentDidMount() {
+    $.get(`/admin/audit/recycle-bin/details?id=${this.props.id}`, (res) => {
+      super.componentDidMount()
+      this.setState({ code: res.data })
+    })
+  }
+}
diff --git a/src/main/resources/web/assets/js/admin/revision-history.js b/src/main/resources/web/assets/js/admin/revision-history.js
index 8b05f9b12..e080d7667 100644
--- a/src/main/resources/web/assets/js/admin/revision-history.js
+++ b/src/main/resources/web/assets/js/admin/revision-history.js
@@ -134,8 +134,9 @@ CellRenders.renderSimple = function (v, s, k) {
 // ~~ 变更详情
 class DlgDetails extends RbAlert {
   renderContent() {
-    const _data = (this.state.data || []).filter((item) => !$same(item.after, item.before))
-    if (_data.length === 0) return <div className="m-3 text-center text-muted">{$L('无变更详情')}</div>
+    if (this.state.viewAll) {
+      return <HistoryViewport id={this.props.id} />
+    }
 
     return (
       <table className="table table-fixed">
@@ -147,17 +148,63 @@ class DlgDetails extends RbAlert {
           </tr>
         </thead>
         <tbody>
-          {_data.map((item) => {
+          <ContentsGroup contents={this.state.data} />
+          <tr>
+            <td colSpan="3" className="text-center pb-0">
+              <a className="text-primary" onClick={() => this.setState({ viewAll: true })}>
+                {$L('查看全部')}
+              </a>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    )
+  }
+
+  componentDidMount() {
+    $.get(`/admin/audit/revision-history/details?id=${this.props.id}`, (res) => {
+      super.componentDidMount()
+      this.setState({ data: res.data || [] })
+    })
+  }
+}
+
+class HistoryViewport extends React.Component {
+  constructor(props) {
+    super(props)
+    this.state = { ...props }
+  }
+
+  render() {
+    if (!this.state.dataList) {
+      return (
+        <div className="rb-loading rb-loading-active">
+          <RbSpinner />
+          <div style={{ minHeight: 132 }} />
+        </div>
+      )
+    }
+
+    return (
+      <table className="table table-fixed group">
+        <thead>
+          <tr>
+            <th width="25%">{$L('字段')}</th>
+            <th>{$L('变更前')}</th>
+            <th>{$L('变更后')}</th>
+          </tr>
+        </thead>
+        <tbody>
+          {this.state.dataList.map((item, idx) => {
             return (
-              <tr key={item.field}>
-                <td>{item.field}</td>
-                <td>
-                  <div>{this._formatValue(item.before)}</div>
-                </td>
-                <td>
-                  <div>{this._formatValue(item.after)}</div>
-                </td>
-              </tr>
+              <RF key={idx}>
+                <tr className="group">
+                  <td colSpan="3">
+                    <h5>{WrapHtml($L('**%s** 由 %s %s', item[2].split(' UTC')[0], item[3], RevTypes[item[1]]))}</h5>
+                  </td>
+                </tr>
+                <ContentsGroup contents={item[0]} />
+              </RF>
             )
           })}
         </tbody>
@@ -166,22 +213,46 @@ class DlgDetails extends RbAlert {
   }
 
   componentDidMount() {
-    $.get(`/admin/audit/revision-history/details?id=${this.props.id}`, (res) => {
-      if (res.data.length === 0) {
-        RbHighbar.create($L('无变更详情'))
-        this.hide()
-      } else {
-        super.componentDidMount()
-        this.setState({ data: res.data })
-      }
+    $.get(`/admin/audit/revision-history/details-list?id=${this.props.id}`, (res) => {
+      this.setState({ dataList: res.data || [] })
     })
   }
+}
 
-  _formatValue(v) {
+function ContentsGroup({ contents }) {
+  const f = function (v) {
     if (v) {
       return typeof v === 'object' ? v.join(', ') : v
     } else {
       return <span className="text-muted">{$L('空')}</span>
     }
   }
+
+  // 排除相同
+  const notSame = (contents || []).filter((item) => !$same(item.after, item.before))
+  return (
+    <RF>
+      {(notSame || []).length === 0 ? (
+        <tr>
+          <td colSpan="3">
+            <div className="text-muted">{$L('无变更详情')}</div>
+          </td>
+        </tr>
+      ) : (
+        notSame.map((item) => {
+          return (
+            <tr key={item.field}>
+              <td>{item.field}</td>
+              <td>
+                <div>{f(item.before)}</div>
+              </td>
+              <td>
+                <div>{f(item.after)}</div>
+              </td>
+            </tr>
+          )
+        })
+      )}
+    </RF>
+  )
 }
diff --git a/src/main/resources/web/assets/js/list-fields.js b/src/main/resources/web/assets/js/general/list-fields.js
similarity index 100%
rename from src/main/resources/web/assets/js/list-fields.js
rename to src/main/resources/web/assets/js/general/list-fields.js
diff --git a/src/main/resources/web/assets/js/print-preview.js b/src/main/resources/web/assets/js/general/print-preview.js
similarity index 100%
rename from src/main/resources/web/assets/js/print-preview.js
rename to src/main/resources/web/assets/js/general/print-preview.js
diff --git a/src/main/resources/web/assets/js/rb-advfilter.js b/src/main/resources/web/assets/js/general/rb-advfilter.js
similarity index 100%
rename from src/main/resources/web/assets/js/rb-advfilter.js
rename to src/main/resources/web/assets/js/general/rb-advfilter.js
diff --git a/src/main/resources/web/assets/js/rb-approval.js b/src/main/resources/web/assets/js/general/rb-approval.js
similarity index 100%
rename from src/main/resources/web/assets/js/rb-approval.js
rename to src/main/resources/web/assets/js/general/rb-approval.js
diff --git a/src/main/resources/web/assets/js/rb-assignshare.js b/src/main/resources/web/assets/js/general/rb-assignshare.js
similarity index 100%
rename from src/main/resources/web/assets/js/rb-assignshare.js
rename to src/main/resources/web/assets/js/general/rb-assignshare.js
diff --git a/src/main/resources/web/assets/js/rb-datalist.common.js b/src/main/resources/web/assets/js/general/rb-datalist.common.js
similarity index 100%
rename from src/main/resources/web/assets/js/rb-datalist.common.js
rename to src/main/resources/web/assets/js/general/rb-datalist.common.js
diff --git a/src/main/resources/web/assets/js/rb-datalist.js b/src/main/resources/web/assets/js/general/rb-datalist.js
similarity index 100%
rename from src/main/resources/web/assets/js/rb-datalist.js
rename to src/main/resources/web/assets/js/general/rb-datalist.js
diff --git a/src/main/resources/web/assets/js/rb-forms.append.js b/src/main/resources/web/assets/js/general/rb-forms.append.js
similarity index 100%
rename from src/main/resources/web/assets/js/rb-forms.append.js
rename to src/main/resources/web/assets/js/general/rb-forms.append.js
diff --git a/src/main/resources/web/assets/js/rb-forms.js b/src/main/resources/web/assets/js/general/rb-forms.js
similarity index 100%
rename from src/main/resources/web/assets/js/rb-forms.js
rename to src/main/resources/web/assets/js/general/rb-forms.js
diff --git a/src/main/resources/web/assets/js/rb-forms.protable.js b/src/main/resources/web/assets/js/general/rb-forms.protable.js
similarity index 100%
rename from src/main/resources/web/assets/js/rb-forms.protable.js
rename to src/main/resources/web/assets/js/general/rb-forms.protable.js
diff --git a/src/main/resources/web/assets/js/rb-view.append.js b/src/main/resources/web/assets/js/general/rb-view.append.js
similarity index 100%
rename from src/main/resources/web/assets/js/rb-view.append.js
rename to src/main/resources/web/assets/js/general/rb-view.append.js
diff --git a/src/main/resources/web/assets/js/rb-view.js b/src/main/resources/web/assets/js/general/rb-view.js
similarity index 100%
rename from src/main/resources/web/assets/js/rb-view.js
rename to src/main/resources/web/assets/js/general/rb-view.js
diff --git a/src/main/resources/web/assets/js/rb-components.js b/src/main/resources/web/assets/js/rb-components.js
index b696c4687..fdf767032 100644
--- a/src/main/resources/web/assets/js/rb-components.js
+++ b/src/main/resources/web/assets/js/rb-components.js
@@ -1182,6 +1182,41 @@ class RbGritter extends React.Component {
   }
 }
 
+// 代码
+class CodeViewport extends React.Component {
+  render() {
+    return (
+      <div className="code-viewport">
+        <pre ref={(c) => (this._$code = c)}>Loading</pre>
+        {window.ClipboardJS && (
+          <a className="copy" title={$L('复制')} ref={(c) => (this._$copy = c)}>
+            <i className="icon zmdi zmdi-copy" />
+          </a>
+        )}
+      </div>
+    )
+  }
+
+  componentDidMount() {
+    this._$code.innerHTML = $formattedCode(this.props.code || '')
+
+    if (this._$copy) {
+      const that = this
+      const $copy = $(this._$copy).on('mouseenter', () => $(this._$copy).removeClass('copied-check'))
+      // eslint-disable-next-line no-undef
+      new ClipboardJS($copy[0], {
+        text: function () {
+          return $(that._$code).text()
+        },
+      }).on('success', () => $copy.addClass('copied-check'))
+    }
+  }
+
+  UNSAFE_componentWillReceiveProps(newProps) {
+    if (newProps.code) this._$code.innerHTML = $formattedCode(newProps.code)
+  }
+}
+
 /**
  * JSX 组件渲染
  *
diff --git a/src/main/resources/web/dashboard/chart-design.html b/src/main/resources/web/dashboard/chart-design.html
index 20c3d0df1..ab5ecda7b 100644
--- a/src/main/resources/web/dashboard/chart-design.html
+++ b/src/main/resources/web/dashboard/chart-design.html
@@ -207,7 +207,7 @@ <h5>[[${bundle.L('图表选项')}]]</h5>
     <script th:src="@{/assets/lib/charts/echarts.min.js}"></script>
     <script th:src="@{/assets/lib/charts/tablecellsselection.js}"></script>
     <script th:src="@{/assets/js/charts/charts.js}" type="text/babel"></script>
-    <script th:src="@{/assets/js/rb-advfilter.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-advfilter.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/charts/chart-design.js}" type="text/babel"></script>
   </body>
 </html>
diff --git a/src/main/resources/web/general/detail-list.html b/src/main/resources/web/general/detail-list.html
index bcf4b2e0f..78d958546 100644
--- a/src/main/resources/web/general/detail-list.html
+++ b/src/main/resources/web/general/detail-list.html
@@ -136,6 +136,6 @@
     <script th:src="@{/assets/js/metadata/field-valueset.js}" type="text/babel"></script>
     <th:block th:replace="~{/_include/forms}" />
     <th:block th:if="${commercial > 1}"><script th:src="@{/assets/js/rb-filterpane.js}" type="text/babel"></script></th:block>
-    <script th:src="@{/assets/js/rb-datalist.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-datalist.js}" type="text/babel"></script>
   </body>
 </html>
diff --git a/src/main/resources/web/general/detail-view.html b/src/main/resources/web/general/detail-view.html
index 8a04aee8a..63d1a1a2a 100644
--- a/src/main/resources/web/general/detail-view.html
+++ b/src/main/resources/web/general/detail-view.html
@@ -90,7 +90,7 @@ <h3 class="title" th:text="${bundle.L('%s详情', entityLabel)}"></h3>
       }
     </script>
     <th:block th:replace="~{/_include/forms}" />
-    <script th:src="@{/assets/js/rb-view.js}" type="text/babel"></script>
-    <script th:src="@{/assets/js/rb-view.append.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-view.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-view.append.js}" type="text/babel"></script>
   </body>
 </html>
diff --git a/src/main/resources/web/general/list-fields.html b/src/main/resources/web/general/list-fields.html
index 66f26c27b..3fdcc7851 100644
--- a/src/main/resources/web/general/list-fields.html
+++ b/src/main/resources/web/general/list-fields.html
@@ -73,6 +73,6 @@ <h5 class="sortable-box-title">
     <script th:src="@{/assets/lib/widget/bootstrap-slider.min.js}"></script>
     <script th:src="@{/assets/js/sortable.js}"></script>
     <script th:src="@{/assets/js/show-styles.js}" type="text/babel"></script>
-    <script th:src="@{/assets/js/list-fields.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/list-fields.js}" type="text/babel"></script>
   </body>
 </html>
diff --git a/src/main/resources/web/general/print-preview.html b/src/main/resources/web/general/print-preview.html
index d1614e800..a70164cb9 100644
--- a/src/main/resources/web/general/print-preview.html
+++ b/src/main/resources/web/general/print-preview.html
@@ -141,8 +141,8 @@
         content: [(${contentBody})],
       }
     </script>
-    <script th:src="@{/assets/js/rb-forms.js}" type="text/babel"></script>
-    <script th:src="@{/assets/js/rb-forms.append.js}" type="text/babel"></script>
-    <script th:src="@{/assets/js/print-preview.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-forms.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-forms.append.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/print-preview.js}" type="text/babel"></script>
   </body>
 </html>
diff --git a/src/main/resources/web/general/record-list.html b/src/main/resources/web/general/record-list.html
index 80da4558b..15a0b9d12 100644
--- a/src/main/resources/web/general/record-list.html
+++ b/src/main/resources/web/general/record-list.html
@@ -141,6 +141,6 @@
     <script th:src="@{/assets/js/metadata/field-valueset.js}" type="text/babel"></script>
     <th:block th:replace="~{/_include/forms}" />
     <th:block th:if="${commercial > 1}"><script th:src="@{/assets/js/rb-filterpane.js}" type="text/babel"></script></th:block>
-    <script th:src="@{/assets/js/rb-datalist.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-datalist.js}" type="text/babel"></script>
   </body>
 </html>
diff --git a/src/main/resources/web/general/record-view.html b/src/main/resources/web/general/record-view.html
index 843bfd0ec..05c0d1c98 100644
--- a/src/main/resources/web/general/record-view.html
+++ b/src/main/resources/web/general/record-view.html
@@ -133,7 +133,7 @@ <h3 class="title" th:text="${bundle.L('%s详情', entityLabel)}"></h3>
     <script th:src="@{/assets/js/feeds/feeds-post.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/feeds/feeds-list.js}" type="text/babel"></script>
     <th:block th:replace="~{/_include/forms}" />
-    <script th:src="@{/assets/js/rb-view.js}" type="text/babel"></script>
-    <script th:src="@{/assets/js/rb-view.append.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-view.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-view.append.js}" type="text/babel"></script>
   </body>
 </html>
diff --git a/src/main/resources/web/general/reference-search.html b/src/main/resources/web/general/reference-search.html
index d97805c4d..e49175fb1 100644
--- a/src/main/resources/web/general/reference-search.html
+++ b/src/main/resources/web/general/reference-search.html
@@ -73,7 +73,7 @@
       }
     </script>
     <th:block th:replace="~{/_include/forms}" />
-    <script th:src="@{/assets/js/rb-datalist.js}" type="text/babel"></script>
+    <script th:src="@{/assets/js/general/rb-datalist.js}" type="text/babel"></script>
     <script type="text/babel">
       CellRenders.clickView = function (v, e) {
         if (parent && parent.RbViewModal && parent.RbViewModal.mode === 1) {
diff --git a/src/test/java/com/rebuild/utils/MarkdownUtilsTest.java b/src/test/java/com/rebuild/utils/MarkdownUtilsTest.java
index 205ec8910..2d9b412e3 100644
--- a/src/test/java/com/rebuild/utils/MarkdownUtilsTest.java
+++ b/src/test/java/com/rebuild/utils/MarkdownUtilsTest.java
@@ -29,7 +29,7 @@ void render() {
 
     @Test
     void cleanMd() {
-        System.out.println(MarkdownUtils.cleanMd("你有 2 条日程提醒（注意要两个换行符）\n" +
+        System.out.println(MarkdownUtils.cleanMarks("你有 2 条日程提醒（注意要两个换行符）\n" +
                 "\n- 123" +
                 "\n- [456](/rebuild/789)"));
     }