diff --git a/@rbv b/@rbv
index cb281b05e..401838fe3 160000
--- a/@rbv
+++ b/@rbv
@@ -1 +1 @@
-Subproject commit cb281b05e8599188146deb464eb66e84b0e6ec16
+Subproject commit 401838fe374096d94f70267eacb44f429ef6e8bd
diff --git a/src/main/java/com/rebuild/core/configuration/general/FormsBuilder.java b/src/main/java/com/rebuild/core/configuration/general/FormsBuilder.java
index 5cf7bd43d..49cab06ac 100644
--- a/src/main/java/com/rebuild/core/configuration/general/FormsBuilder.java
+++ b/src/main/java/com/rebuild/core/configuration/general/FormsBuilder.java
@@ -296,7 +296,8 @@ else if (viewMode) {
         // v3.7
         model.set("hadSop", true);
 
-        model.remove("id");  // Clean form's ID of config
+        model.set("layoutId", model.getID("id"));
+        model.remove("id");
         return model.toJSON();
     }
 
@@ -392,45 +393,51 @@ protected void buildModelElements(JSONArray elements, Entity entity, Record reco
             // v2.2 高级控制
             // v3.8.4 视图下也有效（单字段编辑也算编辑）
             if (useAdvControl) {
-                Object displayOnCreate = el.remove("displayOnCreate");
-                Object displayOnUpdate = el.remove("displayOnUpdate");
+                Object hiddenOnCreate = el.remove("hiddenOnCreate");
+                Object hiddenOnUpdate = el.remove("hiddenOnUpdate");
+                if (hiddenOnCreate == null) {
+                    Object displayOnCreate39 = el.remove("displayOnCreate");
+                    Object displayOnUpdate39 = el.remove("displayOnUpdate");
+                    if (displayOnCreate39 != null && !(Boolean) displayOnCreate39) hiddenOnCreate = true;
+                    if (displayOnUpdate39 != null && !(Boolean) displayOnUpdate39) hiddenOnUpdate = true;
+                }
                 final Object requiredOnCreate = el.remove("requiredOnCreate");
                 final Object requiredOnUpdate = el.remove("requiredOnUpdate");
                 final Object readonlyOnCreate = el.remove("readonlyOnCreate");
                 final Object readonlyOnUpdate = el.remove("readonlyOnUpdate");
                 // fix v3.3.4 跟随主记录新建/更新
-                boolean isNew2 = isNew;
+                boolean isNewState = isNew;
                 if (entity.getMainEntity() != null) {
                     ID fromMain = FormsBuilderContextHolder.getMainIdOfDetail(false);
-                    isNew2 = EntityHelper.isUnsavedId(fromMain);
+                    isNewState = EntityHelper.isUnsavedId(fromMain);
                 }
 
                 // 视图下忽略此选项
                 if (viewModel) {
-                    displayOnCreate = true;
-                    displayOnUpdate = true;
+                    hiddenOnCreate = false;
+                    hiddenOnUpdate = false;
                 }
-                // 显示
-                if (displayOnCreate != null && !(Boolean) displayOnCreate && isNew2) {
+                // 隐藏 v4.0
+                if (hiddenOnCreate != null && (Boolean) hiddenOnCreate && isNewState) {
                     iter.remove();
                     continue;
                 }
-                if (displayOnUpdate != null && !(Boolean) displayOnUpdate && !isNew2) {
+                if (hiddenOnUpdate != null && (Boolean) hiddenOnUpdate && !isNewState) {
                     iter.remove();
                     continue;
                 }
                 // 必填
-                if (requiredOnCreate != null && (Boolean) requiredOnCreate && isNew2) {
+                if (requiredOnCreate != null && (Boolean) requiredOnCreate && isNewState) {
                     el.put("nullable", false);
                 }
-                if (requiredOnUpdate != null && (Boolean) requiredOnUpdate && !isNew2) {
+                if (requiredOnUpdate != null && (Boolean) requiredOnUpdate && !isNewState) {
                     el.put("nullable", false);
                 }
                 // 只读 v3.6
-                if (readonlyOnCreate != null && (Boolean) readonlyOnCreate && isNew2) {
+                if (readonlyOnCreate != null && (Boolean) readonlyOnCreate && isNewState) {
                     el.put("readonly", true);
                 }
-                if (readonlyOnUpdate != null && (Boolean) readonlyOnUpdate && !isNew2) {
+                if (readonlyOnUpdate != null && (Boolean) readonlyOnUpdate && !isNewState) {
                     el.put("readonly", true);
                 }
             }
diff --git a/src/main/java/com/rebuild/core/metadata/impl/Entity2Schema.java b/src/main/java/com/rebuild/core/metadata/impl/Entity2Schema.java
index c3f59a4df..b9cf89f53 100644
--- a/src/main/java/com/rebuild/core/metadata/impl/Entity2Schema.java
+++ b/src/main/java/com/rebuild/core/metadata/impl/Entity2Schema.java
@@ -31,6 +31,9 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * 创建实体
  *
@@ -271,7 +274,9 @@ private Field createBuiltinField(Entity entity, String fieldName, String fieldLa
      */
     private boolean schema2Database(Entity entity) {
         Dialect dialect = Application.getPersistManagerFactory().getDialect();
-        Table table = new Table40(entity, dialect);
+        List<String> ixs = Arrays.asList(
+                EntityHelper.QuickCode, EntityHelper.OwningUser, EntityHelper.OwningDept, EntityHelper.CreatedOn, EntityHelper.ModifiedOn);
+        Table table = new Table40(entity, dialect, ixs);
         String[] ddls = table.generateDDL(false, false, false);
 
         try {
diff --git a/src/main/java/com/rebuild/core/metadata/impl/Table40.java b/src/main/java/com/rebuild/core/metadata/impl/Table40.java
index 3277444fe..bcd77f64d 100644
--- a/src/main/java/com/rebuild/core/metadata/impl/Table40.java
+++ b/src/main/java/com/rebuild/core/metadata/impl/Table40.java
@@ -10,8 +10,11 @@
 import cn.devezhao.persist4j.Entity;
 import cn.devezhao.persist4j.Field;
 import cn.devezhao.persist4j.dialect.Dialect;
+import cn.devezhao.persist4j.util.XmlHelper;
 import cn.devezhao.persist4j.util.support.Table;
+import org.dom4j.Element;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -23,11 +26,23 @@
 public class Table40 extends Table {
 
     public Table40(Entity entity, Dialect dialect) {
-        super(entity, dialect);
+        this(entity, dialect, null);
     }
 
-    public Table40(Entity entity, Dialect dialect, List<?> indexList) {
-        super(entity, dialect, indexList);
+    public Table40(Entity entity, Dialect dialect, List<String> indexFields) {
+        super(entity, dialect, buildIndexList(indexFields));
+    }
+
+    private static List<Element> buildIndexList(List<String> indexFields) {
+        if (indexFields == null || indexFields.isEmpty()) return null;
+
+        List<Element> ixs = new ArrayList<>();
+        for (String indexField : indexFields) {
+            Element ix = XmlHelper.createDom4jElement("index");
+            ix.addAttribute("field-list", indexField);
+            ixs.add(ix);
+        }
+        return ixs;
     }
 
     @Override
diff --git a/src/main/java/com/rebuild/core/service/query/ParseHelper.java b/src/main/java/com/rebuild/core/service/query/ParseHelper.java
index 8a8101f23..a8ceebc00 100644
--- a/src/main/java/com/rebuild/core/service/query/ParseHelper.java
+++ b/src/main/java/com/rebuild/core/service/query/ParseHelper.java
@@ -117,7 +117,7 @@ public class ParseHelper {
      * @param token
      * @return
      */
-    protected static String convetOperation(String token) {
+    public static String convetOperation(String token) {
         if (EQ.equalsIgnoreCase(token)) {
             return "=";
         } else if (NEQ.equalsIgnoreCase(token)) {
diff --git a/src/main/java/com/rebuild/core/support/general/QueryParser.java b/src/main/java/com/rebuild/core/support/general/QueryParser.java
index cb7055ea3..a057de4b7 100644
--- a/src/main/java/com/rebuild/core/support/general/QueryParser.java
+++ b/src/main/java/com/rebuild/core/support/general/QueryParser.java
@@ -217,24 +217,28 @@ private void doParseIfNeed() {
             if (StringUtils.isNotBlank(where)) wheres.add(where);
         }
 
-        final String sqlWhere = wheres.isEmpty() ? "1=1" : StringUtils.join(wheres.iterator(), " and ");
-        fullSql.append(" where ").append(sqlWhere);
+        final String whereClause = wheres.isEmpty() ? "1=1" : StringUtils.join(wheres.iterator(), " and ");
+        fullSql.append(" where ").append(whereClause);
 
         // 排序
 
         String sortNode = queryExpr.getString("sort");
-        String sortSql = null;
+        String sortClause = null;
         if (StringUtils.isNotBlank(sortNode)) {
-            sortSql = parseSort(sortNode);
+            sortClause = parseSort(sortNode);
         } else if (entity.containsField(EntityHelper.ModifiedOn)) {
-            sortSql = EntityHelper.ModifiedOn + " desc";
+            sortClause = EntityHelper.ModifiedOn + " desc";
         } else if (entity.containsField(EntityHelper.CreatedOn)) {
-            sortSql = EntityHelper.CreatedOn + " desc";
+            sortClause = EntityHelper.CreatedOn + " desc";
+        }
+        if (StringUtils.isNotBlank(sortClause)) {
+            fullSql.append(" order by ").append(sortClause);
+            // v3.9.1
+            if (!sortClause.contains(" autoId") && entity.containsField(EntityHelper.AutoId)) fullSql.append(", autoId");
         }
-        if (StringUtils.isNotBlank(sortSql)) fullSql.append(" order by ").append(sortSql);
 
         this.sql = fullSql.toString();
-        this.countSql = this.buildCountSql(pkName) + sqlWhere;
+        this.countSql = this.buildCountSql(pkName) + whereClause;
 
         int pageNo = NumberUtils.toInt(queryExpr.getString("pageNo"), 1);
         int pageSize = NumberUtils.toInt(queryExpr.getString("pageSize"), 40);
diff --git a/src/main/resources/web/admin/bizuser/role-privileges.html b/src/main/resources/web/admin/bizuser/role-privileges.html
index 04d8b4bcf..35bf204c2 100644
--- a/src/main/resources/web/admin/bizuser/role-privileges.html
+++ b/src/main/resources/web/admin/bizuser/role-privileges.html
@@ -70,22 +70,33 @@
         padding: 10px 0 5px;
         text-align: right;
       }
-      .table.table-priv td > a.cp {
+      .table.table-priv td > a.cp,
+      .name > span > a {
         position: absolute;
         left: 50%;
         margin-left: 15px;
-        margin-top: 1px;
-        font-size: 16px;
+        margin-top: 2px;
+        font-size: 15px;
         color: #999;
         display: none;
       }
       .table.table-priv tr:hover > td > a.cp,
-      .table.table-priv td > a.cp.active {
+      .table.table-priv td > a.cp.active,
+      .name > span > a.active,
+      .table.table-priv tr:hover .name > span > a {
         display: inline-block;
       }
       .table.table-priv td > a.cp.active,
-      .table.table-priv td > a.cp:hover {
-        color: #4285f4;
+      .table.table-priv td > a.cp:hover,
+      .name > span > a.active,
+      .name > span > a:hover {
+        color: #4285f4 !important;
+      }
+      .name > span > a {
+        font-size: 16px;
+        left: unset;
+        margin-left: 10px;
+        margin-top: -2px;
       }
 
       .nav-tabs li {
@@ -99,22 +110,6 @@
         font-weight: normal;
         line-height: 1.2;
       }
-
-      .name > span > a {
-        font-size: 18px;
-        position: absolute;
-        margin-left: 6px;
-        margin-top: -3px;
-        display: none;
-      }
-      .name > span > a.active,
-      .name > span > a:hover {
-        color: #4285f4 !important;
-      }
-      .name > span > a.active,
-      .table.table-priv tr:hover .name > span > a {
-        display: inline-block;
-      }
     </style>
   </head>
   <body>
@@ -178,30 +173,30 @@
                     <tr th:each="entity : ${Entities}">
                       <td class="name">
                         <a th:data-entity="${entity[1]}" th:data-name="${entity[0]}" th:title="${bundle.L('批量选择')}">[[${entity[2]}]]</a>
-                        <span class="bosskey-show">
-                          <a th:data-entity="${entity[1]}" th:title="${bundle.L('字段权限')}"><i class="mdi mdi-playlist-edit"></i></a>
+                        <span>
+                          <a th:data-entity="${entity[1]}" th:title="${bundle.L('字段权限')}"><i class="mdi mdi-filter-variant-remove"></i></a>
                         </span>
                       </td>
                       <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"></i></a>
+                        <a data-action="R9" class="cp" th:title="${bundle.L('自定义权限')}"><i class="mdi mdi-filter-cog-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"></i></a>
+                        <a data-action="U9" class="cp" th:title="${bundle.L('自定义权限')}"><i class="mdi mdi-filter-cog-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"></i></a>
+                        <a data-action="D9" class="cp" th:title="${bundle.L('自定义权限')}"><i class="mdi mdi-filter-cog-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"></i></a>
+                        <a data-action="A9" class="cp" th:title="${bundle.L('自定义权限')}"><i class="mdi mdi-filter-cog-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"></i></a>
+                        <a data-action="S9" class="cp" th:title="${bundle.L('自定义权限')}"><i class="mdi mdi-filter-cog-outline"></i></a>
                       </td>
                     </tr>
                   </tbody>
diff --git a/src/main/resources/web/admin/metadata/form-design.html b/src/main/resources/web/admin/metadata/form-design.html
index 5d6a7951f..ab4b2bc6c 100644
--- a/src/main/resources/web/admin/metadata/form-design.html
+++ b/src/main/resources/web/admin/metadata/form-design.html
@@ -87,7 +87,7 @@
                     <thead>
                       <tr>
                         <th>[[${bundle.L('字段')}]]</th>
-                        <th>[[${bundle.L('显示')}]]</th>
+                        <th>[[${bundle.L('隐藏')}]]</th>
                         <th>
                           <span class="d-inline-block">[[${bundle.L('必填')}]] <i class="zmdi zmdi-help zicon up-2" data-toggle="tooltip" th:title="${bundle.L('本选项仅针对表单有效')}"></i></span>
                         </th>
@@ -101,13 +101,14 @@
                         <td>TEMPLATE</td>
                         <td>
                           <label class="custom-control custom-control-sm custom-checkbox custom-control-inline">
-                            <input class="custom-control-input" type="checkbox" name="displayOnCreate" checked />
+                            <input class="custom-control-input" type="checkbox" name="hiddenOnCreate" />
                             <span class="custom-control-label">[[${bundle.L('新建时')}]]</span>
                           </label>
                           <label class="custom-control custom-control-sm custom-checkbox custom-control-inline">
-                            <input class="custom-control-input" type="checkbox" name="displayOnUpdate" checked />
+                            <input class="custom-control-input" type="checkbox" name="hiddenOnUpdate" />
                             <span class="custom-control-label">[[${bundle.L('编辑时')}]]</span>
                           </label>
+                          <a class="easy-control" data-type="hidden"><i class="icon mdi mdi-filter-cog-outline"></i></a>
                         </td>
                         <td>
                           <label class="custom-control custom-control-sm custom-checkbox custom-control-inline">
@@ -118,6 +119,7 @@
                             <input class="custom-control-input" type="checkbox" name="requiredOnUpdate" />
                             <span class="custom-control-label">[[${bundle.L('编辑时')}]]</span>
                           </label>
+                          <a class="easy-control" data-type="required"><i class="icon mdi mdi-filter-cog-outline"></i></a>
                         </td>
                         <td>
                           <label class="custom-control custom-control-sm custom-checkbox custom-control-inline">
@@ -128,6 +130,7 @@
                             <input class="custom-control-input" type="checkbox" name="readonlyOnUpdate" />
                             <span class="custom-control-label">[[${bundle.L('编辑时')}]]</span>
                           </label>
+                          <a class="easy-control" data-type="readonly"><i class="icon mdi mdi-filter-cog-outline"></i></a>
                         </td>
                       </tr>
                     </tbody>
@@ -152,6 +155,7 @@
     </script>
     <script th:src="@{/assets/js/metadata/entity-switch.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-easyfilter.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/metadata/field-type.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/metadata/field-new2.js}" type="text/babel"></script>
     <script th:src="@{/assets/js/metadata/form-design.js}" type="text/babel"></script>
diff --git a/src/main/resources/web/admin/robot/trigger-design.html b/src/main/resources/web/admin/robot/trigger-design.html
index 74b8836e2..e6bd69548 100644
--- a/src/main/resources/web/admin/robot/trigger-design.html
+++ b/src/main/resources/web/admin/robot/trigger-design.html
@@ -129,7 +129,7 @@
                     </form>
                   </div>
                 </li>
-                <li class="timeline-item">
+                <li class="timeline-item exec">
                   <div class="timeline-date"><span>[[${bundle.L('就执行操作')}]]</span></div>
                   <div class="timeline-content">
                     <form class="simple">
diff --git a/src/main/resources/web/assets/css/approvals.css b/src/main/resources/web/assets/css/approvals.css
index de9452ded..8ec0c7eba 100644
--- a/src/main/resources/web/assets/css/approvals.css
+++ b/src/main/resources/web/assets/css/approvals.css
@@ -68,6 +68,11 @@ See LICENSE and COMMERCIAL in the project root for license information.
   padding: 4px 20px;
 }
 
+#config-side .adv-filter-wrap .alert.alert-warning {
+  padding: 0;
+  margin-bottom: 20px;
+}
+
 #config-side .footer,
 #config-side .adv-filter-option .btn-footer {
   position: absolute;
diff --git a/src/main/resources/web/assets/css/form-design.css b/src/main/resources/web/assets/css/form-design.css
index 0b808623d..5fb40e56f 100644
--- a/src/main/resources/web/assets/css/form-design.css
+++ b/src/main/resources/web/assets/css/form-design.css
@@ -334,6 +334,24 @@ form.field-attr label > span {
 .table.table-p .custom-control {
   padding-left: 1.9377rem;
   margin-right: 1.385rem;
+  padding-left: 22px;
+  margin-right: 12px;
+}
+
+.table.table-p a.easy-control {
+  font-size: 15px;
+  color: #999;
+  display: none;
+}
+
+.table.table-p tr:hover a.easy-control {
+  display: inline-block;
+}
+
+.table.table-p a.easy-control:hover,
+.table.table-p a.easy-control.active {
+  color: #4285f4;
+  display: inline-block;
 }
 
 .type-list .dd-handle {
diff --git a/src/main/resources/web/assets/css/triggers.css b/src/main/resources/web/assets/css/triggers.css
index 84a005878..3e8dc19dc 100644
--- a/src/main/resources/web/assets/css/triggers.css
+++ b/src/main/resources/web/assets/css/triggers.css
@@ -614,3 +614,19 @@ textarea.formula-code + .fields-vars {
   border-radius: 3px;
   margin-top: 10px;
 }
+
+.timeline-item.exec::before {
+  border: 0 none;
+  background-color: #fff;
+  font-family: 'Material Design Icons', serif;
+  content: '\F1936';
+  color: #f7b904;
+  font-size: 20px;
+  margin-left: -2px;
+  margin-top: -2px;
+}
+
+.timeline-item:first-child::before {
+  background-color: #4285f4;
+  border: 1px solid #fff;
+}
diff --git a/src/main/resources/web/assets/js/charts/charts.js b/src/main/resources/web/assets/js/charts/charts.js
index 9c9cb8690..4ea40f653 100644
--- a/src/main/resources/web/assets/js/charts/charts.js
+++ b/src/main/resources/web/assets/js/charts/charts.js
@@ -1391,7 +1391,7 @@ class DataList extends BaseChart {
     }
 
     const extconfig = this.state.config.extconfig
-    extconfig && this.setState({ title: extconfig.title || $L('数据列表') })
+    // extconfig && this.setState({ title: extconfig.title || $L('数据列表') })
 
     const listFields = data.fields
     const listData = data.data
@@ -1451,7 +1451,6 @@ class DataList extends BaseChart {
                     if (idx === lastIndex) return null // Last is ID
                     return this.renderCell(c, listFields[idx])
                   })}
-
                   <td className="open-newtab">
                     <a href={`${rb.baseUrl}/app/redirect?id=${lastCell.id}&type=newtab`} target="_blank" title={$L('打开')}>
                       <i className="zmdi zmdi-open-in-new icon" />
diff --git a/src/main/resources/web/assets/js/general/rb-advfilter.js b/src/main/resources/web/assets/js/general/rb-advfilter.js
index 225a3d17c..427e7d651 100644
--- a/src/main/resources/web/assets/js/general/rb-advfilter.js
+++ b/src/main/resources/web/assets/js/general/rb-advfilter.js
@@ -77,7 +77,7 @@ class AdvFilter extends React.Component {
                 <input className="custom-control-input" type="radio" name={this._htmlid} data-id="useEquation" value="AND" checked={this.state.useEquation === 'AND'} onChange={this.handleChange} />
                 <span className="custom-control-label pl-1">{$L('符合全部')}</span>
               </label>
-              <label className="custom-control custom-control-sm custom-radio custom-control-inline mb-2">
+              <label className={`custom-control custom-control-sm custom-radio custom-control-inline mb-2 ${this.props.inEasyFilter && 'hide'}`}>
                 <input className="custom-control-input" type="radio" name={this._htmlid} data-id="useEquation" value="9999" checked={this.state.useEquation === '9999'} onChange={this.handleChange} />
                 <span className="custom-control-label pl-1">
                   {$L('高级表达式')}
@@ -131,7 +131,7 @@ class AdvFilter extends React.Component {
   }
 
   componentDidMount() {
-    const deep = this.props.deep3 || location.href.includes('/admin/') || window.__LAB_ADVFILTER_FSDEEP3 ? 3 : 2
+    const deep = this.props.fsDeep ? this.props.fsDeep : location.href.includes('/admin/') || window.__LAB_ADVFILTER_FSDEEP3 ? 3 : 2
     const referer = this.props.referer || ''
     $.get(`/commons/metadata/fields?deep=${deep}&entity=${this.props.entity}&referer=${referer}`, (res) => {
       const validFs = []
@@ -214,11 +214,15 @@ class AdvFilter extends React.Component {
       index: items.length + 1,
     }
     if (props) itemProps = { ...itemProps, ...props }
-    items.push(<FilterItem {...itemProps} />)
+    items.push(this.addItem40(itemProps))
 
     this.setState({ items }, () => this.renderEquation())
   }
 
+  addItem40(props) {
+    return <FilterItem {...props} />
+  }
+
   removeItem(id) {
     this._itemsRef = this._itemsRef.filter((c) => c.props.id !== id)
     const items = this.state.items.filter((c) => c.props.id !== id)
@@ -853,22 +857,24 @@ class FilterItem extends React.Component {
     const s = this.state // DON'T CHANGES `state`!!!
 
     // v3.9
-    if (this._inFilterPane && s.op === 'BW' && (s.value || s.value2)) {
-      const item = {
-        index: s.index,
-        field: s.field,
-        op: s.op,
-      }
-      if (s.value) item.value = s.value
-      if (s.value2) item.value2 = s.value2
-      return item
-    } else if (this._inFilterPane && s.op === 'BW' && s.op4) {
-      const item = {
-        index: s.index,
-        field: s.field,
-        op: s.op4,
+    if (this.props.inFilterPane) {
+      if (s.op === 'BW' && (s.value || s.value2)) {
+        const item = {
+          index: s.index,
+          field: s.field,
+          op: s.op,
+        }
+        if (s.value) item.value = s.value
+        if (s.value2) item.value2 = s.value2
+        return item
+      } else if (s.op === 'BW' && s.op4) {
+        const item = {
+          index: s.index,
+          field: s.field,
+          op: s.op4,
+        }
+        return item
       }
-      return item
     }
 
     let noValue = false
diff --git a/src/main/resources/web/assets/js/general/rb-easyfilter.js b/src/main/resources/web/assets/js/general/rb-easyfilter.js
new file mode 100644
index 000000000..c78937111
--- /dev/null
+++ b/src/main/resources/web/assets/js/general/rb-easyfilter.js
@@ -0,0 +1,49 @@
+/*!
+Copyright (c) REBUILD <https://getrebuild.com/> and/or its owners. All rights reserved.
+
+rebuild is dual-licensed under commercial and open source licenses (GPLv3).
+See LICENSE and COMMERCIAL in the project root for license information.
+*/
+
+// ~~ 简易过滤器
+
+// eslint-disable-next-line no-unused-vars
+class EasyFilter extends AdvFilter {
+  addItem40(props) {
+    return <EasyFilterItem {...props} />
+  }
+
+  // -- USAGE
+
+  /**
+   * @param {RbForm} form
+   */
+  static check(form) {
+    console.log(form)
+  }
+}
+
+// eslint-disable-next-line no-undef
+class EasyFilterItem extends FilterItem {
+  selectOp() {
+    const fieldType = this.state.type
+
+    // default
+    let op = ['LK', 'NLK', 'EQ', 'NEQ']
+    if (fieldType === 'NUMBER' || fieldType === 'DECIMAL' || fieldType === 'DATE' || fieldType === 'DATETIME' || fieldType === 'TIME') {
+      op = ['GT', 'LT', 'EQ', 'GE', 'LE']
+    } else if (fieldType === 'BOOL') {
+      op = ['EQ']
+    } else if (fieldType === 'LOCATION') {
+      op = ['LK', 'NLK']
+    } else if (fieldType === 'TAG' || fieldType === 'PICKLIST') {
+      op = ['IN', 'NIN']
+    } else if (fieldType === 'FILE' || fieldType === 'IMAGE' || fieldType === 'AVATAR') {
+      op = []
+    }
+
+    op.push('NL', 'NT')
+    this.__op = op
+    return op
+  }
+}
diff --git a/src/main/resources/web/assets/js/general/rb-forms.append.js b/src/main/resources/web/assets/js/general/rb-forms.append.js
index e1cac724e..c887d16ad 100644
--- a/src/main/resources/web/assets/js/general/rb-forms.append.js
+++ b/src/main/resources/web/assets/js/general/rb-forms.append.js
@@ -1012,3 +1012,48 @@ class LiteFormArea extends React.Component {
     else return v
   }
 }
+
+const EasyFilterEval = {
+  __timer: null,
+
+  evalAndEffect: function (form) {
+    if (this.__timer) {
+      clearTimeout(this.__timer)
+      this.__timer = null
+    }
+    this.__timer = setTimeout(() => this._evalAndEffect(form), 600)
+  },
+
+  _evalAndEffect: function (form) {
+    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))
+
+      attrs.forEach((a) => {
+        const fieldComp = _this.getFieldComp(a.field)
+        if (fieldComp) {
+          const aLast = this._getLastAttr(a.field, attrsLast)
+          if (a.hidden === true || a.hidden === false) {
+            if (aLast.hidden !== a.hidden) fieldComp.setHidden(a.hidden)
+          }
+          if (a.required === true || a.required === false) {
+            if (aLast.required !== a.required) fieldComp.setNullable(!a.required)
+          }
+          if (a.readonly === true || a.readonly === false) {
+            if (aLast.readonly !== a.readonly) fieldComp.setReadonly(a.readonly)
+          }
+        }
+      })
+    })
+  },
+
+  _getLastAttr(field, attrsLast) {
+    for (let i = 0; i < attrsLast.length; i++) {
+      if (attrsLast[i].field === field) return attrsLast[i]
+    }
+    return {}
+  },
+}
diff --git a/src/main/resources/web/assets/js/general/rb-forms.js b/src/main/resources/web/assets/js/general/rb-forms.js
index 74a4af4d5..cac915921 100644
--- a/src/main/resources/web/assets/js/general/rb-forms.js
+++ b/src/main/resources/web/assets/js/general/rb-forms.js
@@ -38,7 +38,7 @@ class RbFormModal extends React.Component {
 
     return (
       <div className="modal-wrapper">
-        <div className="modal rbmodal colored-header colored-header-primary" aria-hidden="true" ref={(c) => (this._rbmodal = c)}>
+        <div className="modal rbmodal colored-header colored-header-primary" aria-modal="true" ref={(c) => (this._rbmodal = c)}>
           <div className="modal-dialog" style={style2}>
             <div className="modal-content" style={style2}>
               <div
@@ -691,8 +691,10 @@ class RbForm extends React.Component {
 
     if (window.FrontJS) {
       const fieldKey = `${this.props.entity}.${field}`
-      const ret = window.FrontJS.Form._trigger('fieldValueChange', [fieldKey, value, this.props.id || null])
-      if (ret === false) return false
+      window.FrontJS.Form._trigger('fieldValueChange', [fieldKey, value, this.props.id || null])
+      // v4.0
+      // eslint-disable-next-line no-undef
+      if (window.EasyFilterEval) EasyFilterEval.evalAndEffect(this)
     }
   }
 
@@ -712,7 +714,7 @@ class RbForm extends React.Component {
 
       const fieldComp = _refs[key]
       let v = fieldComp.getValue()
-      if (v && typeof v === 'object') v = v.id
+      if (v && typeof v === 'object') v = v.id || v // array
       if (v) data[fieldComp.props.field] = v
     }
     return data
@@ -1561,7 +1563,7 @@ class RbFormDateTime extends RbFormElement {
       const that = this
       this.__datetimepicker = $(this._fieldValue)
         .datetimepicker({
-          format: format || 'yyyy-mm-dd hh:ii:ss',
+          format: (format || 'yyyy-mm-dd hh:ii:ss').replace(':ss', ':00'),
           minView: minView,
           startView: startView,
           pickerPosition: this._getAutoPosition(),
@@ -1609,7 +1611,7 @@ class RbFormTime extends RbFormDateTime {
       const that = this
       this.__datetimepicker = $(this._fieldValue)
         .datetimepicker({
-          format: format,
+          format: format.replace(':ss', ':00'),
           startView: 1,
           minView: minView,
           maxView: 1,
@@ -2937,9 +2939,11 @@ class RbFormTag extends RbFormElement {
   }
 
   renderElement() {
+    const _readonly40 = this.state.readonly
+
     const keyName = `${this.state.field}-tag-`
     return (
-      <select ref={(c) => (this._fieldValue = c)} className="form-control form-control-sm" multiple defaultValue={this._selected}>
+      <select ref={(c) => (this._fieldValue = c)} className="form-control form-control-sm" multiple defaultValue={this._selected} disabled={_readonly40}>
         {this._options.map((item) => {
           return (
             <option key={`${keyName}${item.name}`} value={item.name}>
@@ -3003,8 +3007,8 @@ class RbFormTag extends RbFormElement {
         that.handleChange({ target: { value: mVal.join('$$$$') } }, true)
       })
 
-      const _readonly37 = this.state.readonly
-      if (_readonly37) $(this._fieldValue).attr('disabled', true)
+      // const _readonly37 = this.state.readonly
+      // if (_readonly37) $(this._fieldValue).attr('disabled', true)
     }
   }
 
diff --git a/src/main/resources/web/assets/js/metadata/form-design.js b/src/main/resources/web/assets/js/metadata/form-design.js
index 199a8d249..5277c23df 100644
--- a/src/main/resources/web/assets/js/metadata/form-design.js
+++ b/src/main/resources/web/assets/js/metadata/form-design.js
@@ -4,7 +4,7 @@ Copyright (c) REBUILD <https://getrebuild.com/> and/or its owners. All rights re
 rebuild is dual-licensed under commercial and open source licenses (GPLv3).
 See LICENSE and COMMERCIAL in the project root for license information.
 */
-/* global FIELD_TYPES */
+/* global FIELD_TYPES, EasyFilter */
 
 const wpc = window.__PageConfig
 const DIVIDER_LINE = '$DIVIDER$'
@@ -201,7 +201,7 @@ $(document).ready(() => {
   })()
 
   $('.nav-tabs-classic a[href="#adv-control"]').on('click', (e) => {
-    if (rb.commercial < 1) {
+    if (rb.commercial < 10) {
       e.preventDefault()
       RbHighbar.error(WrapHtml($L('免费版不支持此功能 [(查看详情)](https://getrebuild.com/docs/rbv-features)')))
       return false
@@ -646,42 +646,110 @@ const AdvControl = {
   $tbody: $('#adv-control tbody'),
 
   init() {
-    this._template = this.$tbody.find('tr').html()
+    this._$template = this.$tbody.find('tr').html()
     this.$tbody.find('tr').remove()
   },
 
   set: function (field) {
-    const $c = $(`<tr data-field="${field.fieldName}">${this._template}</tr>`).appendTo(this.$tbody)
+    // comp:v3.9
+    if (typeof field['displayOnCreate'] !== 'undefined') {
+      if (field['displayOnCreate'] === false) field.hiddenOnCreate = true
+      if (field['displayOnUpdate'] === false) field.hiddenOnUpdate = true
+    }
+
+    const $c = $(`<tr data-field="${field.fieldName}">${this._$template}</tr>`).appendTo(this.$tbody)
     $c.find('td:eq(0)').text(field.fieldLabel)
 
+    // 隐藏
+    const $show = $c.find('td:eq(1)')
+    $show.find('>a').on('click', () => this._showEasyFilter(field.fieldName, 'hidden', $L('隐藏条件')))
     // 必填
     const $req = $c.find('td:eq(2)')
     if (field.builtin) $req.empty()
-    else if (!field.nullable) {
+    else if ($L('二维码') === field.displayType || $L('自动编号') === field.displayType) {
+      $req.find('input').attr({ disabled: true, checked: false })
+      $req.find('>a').remove()
+    } else if (!field.nullable) {
       $req.find('input').attr({ disabled: true, checked: true })
+      $req.find('>a').remove()
     }
+    $req.find('>a').on('click', () => this._showEasyFilter(field.fieldName, 'required', $L('必填条件')))
     // 只读
     const $ro = $c.find('td:eq(3)')
     if (field.builtin) $ro.empty()
     else {
       if (!field.creatable) $ro.find('input:eq(0)').attr({ disabled: true, checked: true })
       if (!field.updatable) $ro.find('input:eq(1)').attr({ disabled: true, checked: true })
+      if (!field.creatable || !field.updatable) $ro.find('>a').remove()
     }
+    $ro.find('>a').on('click', () => this._showEasyFilter(field.fieldName, 'readonly', $L('只读条件')))
 
-    this.$tbody.find(`tr[data-field="${field.fieldName}"] input`).each(function () {
+    // init
+    const $tr = this.$tbody.find(`tr[data-field="${field.fieldName}"]`)
+    $tr.find('input').each(function () {
       const $this = $(this)
       if ($this.prop('disabled')) return
       const v = field[$this.attr('name')]
       if (v === true || v === false) $this.attr('checked', v)
     })
+    // v4.0
+    ;['hidden', 'required', 'readonly'].forEach((type) => {
+      const s = field[type + 'OnEasyFilter']
+      if (s) {
+        const key = field.fieldName + '--' + type
+        AdvControl._EasyFilters__data[key] = s
+        $tr.find(`a.easy-control[data-type="${type}"]`).addClass('active')
+      }
+    })
   },
 
   cfgAppend: function (item) {
-    this.$tbody.find(`tr[data-field="${item.field}"] input`).each(function () {
+    const $tr = this.$tbody.find(`tr[data-field="${item.field}"]`)
+    $tr.find('input').each(function () {
       const $this = $(this)
       if ($this.prop('disabled')) return
       item[$this.attr('name')] = $this.prop('checked')
     })
+    // v4.0
+    $tr.find('a.easy-control.active').each(function () {
+      const type = $(this).data('type')
+      const key = item.field + '--' + type
+      if (AdvControl._EasyFilters__data[key]) item[type + 'OnEasyFilter'] = AdvControl._EasyFilters__data[key]
+    })
+  },
+
+  _EasyFilters: {},
+  _EasyFilters__data: {},
+  _showEasyFilter: function (field, type, title) {
+    const key = field + '--' + type
+    if (this._EasyFilters[key]) {
+      this._EasyFilters[key].show()
+    } else {
+      renderRbcomp(
+        <EasyFilter
+          inModal
+          inEasyFilter
+          canNoFilters
+          fsDeep={1}
+          entity={wpc.entityName}
+          title={title}
+          filter={this._EasyFilters__data[key] || null}
+          onConfirm={(s) => {
+            this._EasyFilters__data[key] = s
+            const $t = $(`#adv-control tr[data-field="${field}"]`).find(`a.easy-control[data-type="${type}"]`)
+            if (s.items.length === 0) {
+              $t.removeClass('active')
+              delete this._EasyFilters__data[key]
+            } else {
+              $t.addClass('active')
+            }
+          }}
+        />,
+        function () {
+          AdvControl._EasyFilters[key] = this
+        }
+      )
+    }
   },
 }
 
diff --git a/src/main/resources/web/assets/js/rb-components.js b/src/main/resources/web/assets/js/rb-components.js
index 6016805c0..6a1d53b5d 100644
--- a/src/main/resources/web/assets/js/rb-components.js
+++ b/src/main/resources/web/assets/js/rb-components.js
@@ -27,7 +27,7 @@ class RbModal extends React.Component {
       <div
         className={modalClazz}
         style={props.zIndex ? { zIndex: props.zIndex } : null}
-        aria-hidden="true"
+        aria-modal="true"
         ref={(c) => {
           this._rbmodal = c
           this._element = c
@@ -256,7 +256,7 @@ class RbAlert extends React.Component {
     return (
       <div
         className="modal rbalert"
-        aria-hidden="true"
+        aria-modal="true"
         style={style1}
         ref={(c) => {
           this._dlg = c