be

Author: getrebuild

@rbv

@@ -1 +1 @@
-Subproject commit 065eb8939801a5d3bf664fdcbf3470fe158fd4f7
+Subproject commit fd2547369b05a1b5e6733772112db14b5328c993

src/main/java/com/rebuild/core/configuration/general/LiteFormBuilder.java

@@ -65,7 +65,7 @@ public JSONArray build(JSONArray fieldElements) {
             throw new DefinedException("No field elements");
         }
         // Use clone
-        fieldElements = (JSONArray) fieldElements.clone();
+        fieldElements = (JSONArray) JSONUtils.clone(fieldElements);
 
         Record recordData = null;
         if (recordId != null) {

src/main/resources/web/admin/bizuser/role-privileges.html

@@ -77,7 +77,7 @@
         margin-left: 15px;
         margin-top: 2px;
         font-size: 15px;
-        color: #999;
+        color: #999 !important;
         display: none;
       }
       .table.table-priv tr:hover > td > a.cp,
@@ -180,23 +180,23 @@
                       <td><i data-action="C" class="priv R0"></i><a></a></td>
                       <td>
                         <i data-action="R" class="priv R0"></i>
-                        <a data-action="R9" class="cp" th:title="${bundle.L('自定义权限')}"><i class="mdi mdi-filter-cog-outline"></i></a>
+                        <a data-action="R9" class="cp" th:title="${bundle.L('自定义权限')}"><i class="mdi mdi-filter-check-outline"></i></a>
                       </td>
                       <td>
                         <i data-action="U" class="priv R0"></i>
-                        <a data-action="U9" class="cp" th:title="${bundle.L('自定义权限')}"><i class="mdi mdi-filter-cog-outline"></i></a>
+                        <a data-action="U9" class="cp" th:title="${bundle.L('自定义权限')}"><i class="mdi mdi-filter-check-outline"></i></a>
                       </td>
                       <td>
                         <i data-action="D" class="priv R0"></i>
-                        <a data-action="D9" class="cp" th:title="${bundle.L('自定义权限')}"><i class="mdi mdi-filter-cog-outline"></i></a>
+                        <a data-action="D9" class="cp" th:title="${bundle.L('自定义权限')}"><i class="mdi mdi-filter-check-outline"></i></a>
                       </td>
                       <td>
                         <i data-action="A" class="priv R0"></i>
-                        <a data-action="A9" class="cp" th:title="${bundle.L('自定义权限')}"><i class="mdi mdi-filter-cog-outline"></i></a>
+                        <a data-action="A9" class="cp" th:title="${bundle.L('自定义权限')}"><i class="mdi mdi-filter-check-outline"></i></a>
                       </td>
                       <td>
                         <i data-action="S" class="priv R0"></i>
-                        <a data-action="S9" class="cp" th:title="${bundle.L('自定义权限')}"><i class="mdi mdi-filter-cog-outline"></i></a>
+                        <a data-action="S9" class="cp" th:title="${bundle.L('自定义权限')}"><i class="mdi mdi-filter-check-outline"></i></a>
                       </td>
                     </tr>
                   </tbody>

src/main/resources/web/admin/robot/trigger-design.html

@@ -100,7 +100,7 @@
                                   <option value="D">[[${bundle.L('每天')}]]</option>
                                   <option value="H">[[${bundle.L('每小时')}]]</option>
                                   <option value="M">[[${bundle.L('每月')}]]</option>
-                                  <option value="cron">[[${bundle.L('表达式')}]]</option>
+                                  <option value="cron">[[${bundle.L('高级表达式')}]]</option>
                                 </select>
                                 <span class="J_timerSimple">
                                   <span>[[${bundle.L('执行')}]]</span>

src/main/resources/web/assets/js/general/rb-forms.append.js

@@ -1031,9 +1031,8 @@ const EasyFilterEval = {
     const _this = form
     $.post(`/app/entity/extras/easyfilter-eval?layout=${_this.props.rawModel.layoutId}`, JSON.stringify(_this.getFormData()), (res) => {
       const attrs = res.data || []
-      const attrsLast = form.__lastEasyFilterEval || []
-      form.__lastEasyFilterEval = attrs // 绑定到表单对象
-      console.log('Eval ...', JSON.stringify(attrs))
+      const attrsLast = _this.__lastEasyFilterEval || []
+      _this.__lastEasyFilterEval = attrs // 绑定到表单对象
 
       attrs.forEach((a) => {
         const fieldComp = _this.getFieldComp(a.field)