kunfei
2023-03-26 20:30:25 +08:00
parent 37227b81ab
commit 28d9020395
@@ -142,8 +142,14 @@ class AnalyzeRule(
val content = mContent ?: this.content val content = mContent ?: this.content
if (content != null && ruleList.isNotEmpty()) { if (content != null && ruleList.isNotEmpty()) {
result = content result = content
if (content is NativeObject) { if (result is NativeObject) {
result = content[ruleList[0].rule]?.toString() val sourceRule = ruleList.first()
result = if (sourceRule.getParamSize() > 1) {
sourceRule.makeUpRule(result)
sourceRule.rule
} else {
result[sourceRule.rule]?.toString()
}
} else { } else {
for (sourceRule in ruleList) { for (sourceRule in ruleList) {
putRule(sourceRule.putMap) putRule(sourceRule.putMap)
@@ -219,7 +225,13 @@ class AnalyzeRule(
if (content != null && ruleList.isNotEmpty()) { if (content != null && ruleList.isNotEmpty()) {
result = content result = content
if (result is NativeObject) { if (result is NativeObject) {
result = result[ruleList[0].rule]?.toString() val sourceRule = ruleList.first()
result = if (sourceRule.getParamSize() > 1) {
sourceRule.makeUpRule(result)
sourceRule.rule
} else {
result[sourceRule.rule]?.toString()
}
} else { } else {
for (sourceRule in ruleList) { for (sourceRule in ruleList) {
putRule(sourceRule.putMap) putRule(sourceRule.putMap)
@@ -613,6 +625,10 @@ class AnalyzeRule(
|| ruleStr.startsWith("$[") || ruleStr.startsWith("$[")
|| ruleStr.startsWith("//") || ruleStr.startsWith("//")
} }
fun getParamSize(): Int {
return ruleParam.size
}
} }
enum class Mode { enum class Mode {