From 9bdf44d1fba033ac6a98ffec32ee29ff6fb22cf6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 08 Jul 2022 17:00:14 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/farmer/cms/core/node/AttrNode.java | 65 +++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/core/node/AttrNode.java b/src/main/java/com/xcong/farmer/cms/core/node/AttrNode.java
index ce47824..7d9cd18 100644
--- a/src/main/java/com/xcong/farmer/cms/core/node/AttrNode.java
+++ b/src/main/java/com/xcong/farmer/cms/core/node/AttrNode.java
@@ -2,10 +2,12 @@
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.xcong.farmer.cms.core.handler.DataParserHandler;
import com.xcong.farmer.cms.core.tag.TagsEnum;
import com.xcong.farmer.cms.core.template.Configuration;
+import com.xcong.farmer.cms.core.template.TemplateConfiguration;
import groovy.lang.Binding;
import groovy.lang.GroovyShell;
import org.apache.commons.text.StringSubstitutor;
@@ -52,22 +54,6 @@
this.parserData = parserData;
}
- public static void main(String[] args) {
-// String data = "{id=[1,2,3], page=1, limit=5, field=art}";
-// Articles articles = new AttrNode().parserTag(data, Articles.class);
-
-// String value = "{id=${col.id}, page=1, limit=5, field=art}";
-// String pattern = "(?<=\\$\\{)[\\s\\S]*?(?=\\})";
-// Matcher matcher = Pattern.compile(pattern).matcher(value);
-// while (matcher.find()) {
-// String group = matcher.group();
-// System.out.println(1);
-// }
-
-
- System.out.println(1);
- }
-
private boolean isNeedEmpty() {
Elements children = this.element.children();
if (CollUtil.isNotEmpty(children)) {
@@ -86,7 +72,32 @@
return false;
}
+ public void staticPath() {
+ // 设置img的链接访问
+ if ("img".equals(this.element.tagName())) {
+ String src = this.element.attr("src");
+ if (StrUtil.isNotBlank(STATIC_URL)) {
+ this.element.attr("src", STATIC_URL + src);
+ }
+ }
+
+ if ("link".equals(this.element.tagName())) {
+ String src = this.element.attr("href");
+ if (StrUtil.isNotBlank(STATIC_URL)) {
+ this.element.attr("href", STATIC_URL + src);
+ }
+ }
+
+ if ("script".equals(this.element.tagName())) {
+ String src = this.element.attr("src");
+ if (StrUtil.isNotBlank(STATIC_URL)) {
+ this.element.attr("src", STATIC_URL + src);
+ }
+ }
+ }
+
public void parser() {
+ staticPath();
// 判断是否为最小节点，如果是且没有特殊标签，则跳过清空
if (!isNeedEmpty()) {
return;
@@ -112,6 +123,7 @@
i++;
try {
+ Template.TAGS.add(tagsEnum.getName());
// {id=${col.id}, page=1, limit=5, field=art} ${col.id} 形式需先设置值
String tagValue = attributes.get(tagsEnum.getName());
tagValue = attrValueFormat(tagValue);
@@ -139,18 +151,24 @@
public void runDataInject() {
Attributes attributes = this.element.attributes();
for (Attribute attribute : attributes) {
+ if (attribute.getKey().startsWith("\\$")) {
+ Template.TAGS.add(attribute.getKey());
+ }
+
String key = attribute.getKey().replaceAll("\\$", "");
String value = attribute.getValue();
+ String result = attrValueFormat(value);
// @{} 为java表达式; ${}为需要注入的数据项
if (value.startsWith("@{")) {
- value = value.replaceAll("\\@\\{", "").replaceAll("}", "");
+ value = result.replaceAll("\\@\\{", "").replaceAll("}", "");
Binding binding = new Binding();
for (Map.Entry<String, Object> entry : this.parserData.entrySet()) {
String fieldKey = entry.getKey();
Map<String, Object> data = (Map<String, Object>) entry.getValue();
- binding.setProperty(fieldKey, data);
- binding.setVariable(fieldKey + ".index", 1);
+ binding.setProperty(fieldKey, data.get("state"));
+ int index = (int) data.get("index");
+ binding.setVariable( "index", index);
}
GroovyShell shell = new GroovyShell(binding);
String evaluate = (String) shell.evaluate(value);
@@ -158,11 +176,10 @@
this.element.removeAttr("class");
this.element.attr("class", evaluate);
} else if (value.contains( "${")) {
-
- String result = attrValueFormat(value);
- System.out.println(result);
if ("text".equals(key)) {
this.element.text(result);
+ } else if ("html".equals(key)) {
+ this.element.html(result);
} else {
this.element.attr(key, result);
}
@@ -258,4 +275,8 @@
public void systemData(Map<String, Object> systemData) {
this.systemData = systemData;
}
+
+ public Object getSystemDataValue(String key) {
+ return this.systemData.get(key);
+ }
}
--
Gitblit v1.9.1