|
@@ -702,17 +702,23 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
|
|
.filter(e -> e.getFormulaId() != null)
|
|
.filter(e -> e.getFormulaId() != null)
|
|
.forEach(e -> {
|
|
.forEach(e -> {
|
|
String key = e.getField() + "__";
|
|
String key = e.getField() + "__";
|
|
- processElements(doc.select("el-input[keyname^=" + key + "]"));
|
|
|
|
- processElements(doc.select("el-date-picker[keyname^=" + key + "]"));
|
|
|
|
|
|
+ processElements(doc.select("table").first().select("[keyname^=" + key + "]"));
|
|
});
|
|
});
|
|
}
|
|
}
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ public Element findParentTd(Element element) {
|
|
|
|
+ Element parent = element.parent();
|
|
|
|
+ while (parent != null && !parent.tagName().equalsIgnoreCase("td")) {
|
|
|
|
+ parent = parent.parent();
|
|
|
|
+ }
|
|
|
|
+ return parent;
|
|
|
|
+ }
|
|
|
|
|
|
private void processElements(Elements elements) {
|
|
private void processElements(Elements elements) {
|
|
- elements.forEach(element -> element.parent().attr("gscolor", "11"));
|
|
|
|
|
|
+ elements.stream().map(this::findParentTd).filter(Objects::nonNull).forEach(element -> element.attr("gscolor", "11"));
|
|
}
|
|
}
|
|
|
|
|
|
public void dataInfo(List<WbsTreeContract> collect, Map<Long, String> lastList, Map<String, List<WbsTreeContract>> Data) {
|
|
public void dataInfo(List<WbsTreeContract> collect, Map<Long, String> lastList, Map<String, List<WbsTreeContract>> Data) {
|