From f73a025abff8b01326d83d26b2da77892777242e Mon Sep 17 00:00:00 2001 From: lxyer <237809796@qq.com> Date: Fri, 14 Jun 2019 17:10:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E[=E6=9F=A5=E8=AF=A2-=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E7=BB=84=E4=BB=B6=E9=85=8D=E7=BD=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- root/metadata/metaService.html | 68 +++++++++++++++++++++--- src/main/java/net/tccn/base/MetaKit.java | 9 ++-- src/main/java/net/tccn/meta/Filter.java | 5 +- 3 files changed, 69 insertions(+), 13 deletions(-) diff --git a/root/metadata/metaService.html b/root/metadata/metaService.html index b3b58b4..a6600b9 100644 --- a/root/metadata/metaService.html +++ b/root/metadata/metaService.html @@ -261,8 +261,9 @@ 字段名 中文名 - 默认展示 - 支持查询类型 + 默认 + 组件配置 + 附加参数 @@ -271,16 +272,46 @@ - + + + + - + + + @@ -476,6 +507,10 @@ sheetArr: ["a"],//别名 sheet: "a",//别名 + filterRemarks: { + EQUAL:"等于", NOTEQUAL:"等于", IN: "包含", NOTIN:"不包含", LIKE: "模糊查询", RANGE: "范围" + }, + findTypes: ["INPUT", "DICT", "CHECKBOX", "RADIO", "DAY", "TIME"], inTypes: ["INPUT", "DICT", "INPUT_DAY", "INPUT_TIME", "FUNC", "QTASK", "HIDDEN"], ckTypes: [{label:"必填", name: "NOTNULL"},{label:"IP", name: "IP"},{label:"IPv4", name: "IPv4"},{label:"电话号码", name: "phone"}], dataTypes: ["bigint(20)", "varchar(255)", "varchar(64)", "varchar(32)", "varchar(16)", "int(11)", "int(3)", "int(2)", "datetime"], @@ -956,6 +991,25 @@ let item = $(doms[i]).find("input[name='item']").val(); filters.push(JSON.parse(item)) } + + for (let filter of filters) { + let filterType = [] + let tmp = { + INPUT: ["EQUAL", "NOTEQUAL", "LIKE"], // "IN" + DICT: ["EQUAL", "NOTEQUAL"], //"IN" + CHECKBOX: ["IN", "NOTIN"], + RADIO: ["EQUAL", "NOTEQUAL"], + DAY: ["EQUAL", "NOTEQUAL", "RANGE"], // "IN" + TIME: ["RANGE"], + }[filter["inType"]] || [] + + for (let k of tmp) { + filterType.push({name:k, remark:this.filterRemarks[k]}) + } + + filter["filterType"] = filterType + } + filterSave({name: this.service, filters}).then(res => red.showOk()) } else if (vm.status == 3) { let doms = $("#export>table>tbody>tr") diff --git a/src/main/java/net/tccn/base/MetaKit.java b/src/main/java/net/tccn/base/MetaKit.java index 891906a..a696ee7 100644 --- a/src/main/java/net/tccn/base/MetaKit.java +++ b/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 _filters = new ArrayList<>(); + /*List _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); } diff --git a/src/main/java/net/tccn/meta/Filter.java b/src/main/java/net/tccn/meta/Filter.java index 3af5080..87ec5b9 100644 --- a/src/main/java/net/tccn/meta/Filter.java +++ b/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 filterType; + private String inType; + private String inExt; + private List> filterType; }