From f32a53f5534aa9f9a8591e8b197bb1f8acd9e6c0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 03 Jul 2022 21:42:36 +0800
Subject: [PATCH] fix cms core
---
src/main/java/com/xcong/farmer/cms/core/node/PartNode.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/cms/node/PartNode.java b/src/main/java/com/xcong/farmer/cms/core/node/PartNode.java
similarity index 91%
rename from src/main/java/com/xcong/farmer/cms/cms/node/PartNode.java
rename to src/main/java/com/xcong/farmer/cms/core/node/PartNode.java
index 3866f09..cad2a97 100644
--- a/src/main/java/com/xcong/farmer/cms/cms/node/PartNode.java
+++ b/src/main/java/com/xcong/farmer/cms/core/node/PartNode.java
@@ -1,8 +1,8 @@
-package com.xcong.farmer.cms.cms.node;
+package com.xcong.farmer.cms.core.node;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
-import com.xcong.farmer.cms.cms.template.Configuration;
+import com.xcong.farmer.cms.core.template.Configuration;
import org.jsoup.nodes.Element;
import java.util.HashMap;
@@ -14,10 +14,12 @@
private Element element;
private Element originalElement;
private String html;
+ private Map<String, Object> system;
- public PartNode(Element element) {
+ public PartNode(Element element, Map<String, Object> data) {
this.element = element.clone();
this.originalElement = element;
+ this.system = data;
}
public void parser() {
@@ -26,6 +28,7 @@
public String parser(Element element, Map<String, Object> tagDataMap) {
AttrNode attrNode = new AttrNode(element, tagDataMap);
+ attrNode.systemData(this.system);
attrNode.parser();
// attrNode.runDataInject();
@@ -38,7 +41,7 @@
if (parseData == null) {
// 特殊处理。 如果有子节点标签@child，但数据中没有子节点数据，则将该子节点直接删除即直接返回空字符串
- if (!"@child".equals(attrNode.getTag())) {
+ if (attrNode.processContinue()) {
for (Element children : element.children()) {
String html = parser(children, tagDataMap);
result.append(html);
--
Gitblit v1.9.1