后管-编辑元素

1、未匹配元素快捷选择栏 查询调整

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -1480,43 +1480,21 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         Document doc = Jsoup.parse(htmlString);
         Element table = doc.select("table").first();
         Elements td = table.select("td");
-        Map<String, String> set = new HashMap<>();
+        Set<String> set = new HashSet<>();
         for (Element element : td) {
-            if (element.childNodes().size() >= 2) {
-                String title = element.childNodes().get(1).attr("placeholder");
-                if (StringUtils.isNotBlank(title)) {
-                    if (title.contains("&")) {
-                        // 处理 &lt; 之类的转义字符
-                        if (title.contains("&amp;")) {
-                            title = Parser.unescapeEntities(title, false);
-                        }
-                        title = Parser.unescapeEntities(title, false);
+            if (element.childNodes().size() >= 1) {
+                element.childNodes().forEach(f->{
+                    String title = f.attr("placeholder");
+                    if (StringUtils.isNotBlank(title)) {
+                        set.add(title);
                     }
-                    set.put(title, title);
-                }
+                });
             }
         }
         //获取未匹配的字段
         List<WbsFormElement> list = new ArrayList<>();
         if (set != null && set.size() > 0) {
-//            list = baseMapper.getUnMatchField(tabId, set);
-            List<WbsFormElement> elements = jdbcTemplate.query("select * from m_wbs_form_element where f_id = ? and is_deleted = 0", new Object[]{tabId}, new BeanPropertyRowMapper<>(WbsFormElement.class));
-            elements.forEach(wbsFormElement -> {
-                String name = wbsFormElement.getEName();
-                if (StringUtils.isNotBlank(name)) {
-                    if (name.contains("&")) {
-                        // 处理 &lt; 之类的转义字符
-                        if (name.contains("&amp;")) {
-                            name = Parser.unescapeEntities(name, false);
-                        }
-                        name = Parser.unescapeEntities(name, false);
-                    }
-                }
-                if (set.containsKey(name)) {
-                    return;
-                }
-                list.add(wbsFormElement);
-            });
+            list = baseMapper.getUnMatchField(tabId, set);
         }
         return list;
     }