新增[查询-表单组件配置]

src/main/java/net/tccn/base/MetaKit.java

@@ -2,10 +2,9 @@ package net.tccn.base;
 
 import lombok.Getter;
 import net.tccn.base.arango.Doc;
-import net.tccn.dbq.table.Field;
-import net.tccn.dbq.fbean.FilterType;
 import net.tccn.dbq.jdbc.api.DbAccount;
 import net.tccn.dbq.jdbc.api.DbKit;
+import net.tccn.dbq.table.Field;
 import net.tccn.meta.*;
 import net.tccn.plat.DbPlat;
 import net.tccn.plat.SysPlat;
@@ -261,7 +260,7 @@ public final class MetaKit {
 
 
         //filters
-        List<Map> _filters = new ArrayList<>();
+        /*List<Map> _filters = new ArrayList<>();
         filters.forEach(x -> {
             String col = String.valueOf(x.getName());
             MetaTable metaTable = metaTables.get(col.split("[.]")[0]); // 表别名
@@ -289,7 +288,7 @@ public final class MetaKit {
                         filter.set("checked", x.isChecked());
                     });
             _filters.add(filter);
-        });
+        });*/
 
         //edits
         //List _edits = new ArrayList();//edits;
@@ -350,7 +349,7 @@ public final class MetaKit {
                 .set("title", comment)
                 //.set("items", _items2)
                 .set("shows", shows)
-                .set("filters", _filters)
+                .set("filters", filters)
                 .set("edits", edits)
                 .set("details", details);
     }

src/main/java/net/tccn/meta/Filter.java

@@ -3,6 +3,7 @@ package net.tccn.meta;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author: liangxianyou
@@ -12,5 +13,7 @@ public class Filter {
     private String name;
     private String label;
     private boolean checked;
-    private List<String> filterType;
+    private String inType;
+    private String inExt;
+    private List<Map<String, String>> filterType;
 }