From 946dd37475e47dd3b7ad72f16ad120b08a45d6ec Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Tue, 12 Nov 2024 15:31:46 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-140337=20=E3=80=90=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E6=9B=BF=E6=8D=A2=E3=80=91=E6=8A=A5=E8=A1=A8=E5=A1=AB?= =?UTF-8?q?=E6=8A=A5=E5=B1=9E=E6=80=A7-=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9A=84=E5=B1=9E=E6=80=A7=E4=B8=AD=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/SearchTemplateFormulaAction.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/template/SearchTemplateFormulaAction.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/template/SearchTemplateFormulaAction.java index dea8f4255f..e7603de567 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/template/SearchTemplateFormulaAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/template/SearchTemplateFormulaAction.java @@ -4,6 +4,7 @@ import com.fr.base.Formula; import com.fr.base.Parameter; import com.fr.base.io.AttrMark; import com.fr.base.iofile.attr.WatermarkAttr; +import com.fr.data.ClassSubmitJob; import com.fr.data.Verifier; import com.fr.data.VerifyItem; import com.fr.design.actions.replace.action.content.formula.highlight.javascript.SearchCommit2DBJSFormulaAction; @@ -20,7 +21,9 @@ import com.fr.report.write.BuiltInSQLSubmiter; import com.fr.report.write.ReportWriteAttr; import com.fr.report.write.SubmitVisitor; import com.fr.report.write.ValueVerifier; +import com.fr.report.write.WClassSubmiter; import com.fr.stable.CommonUtils; +import com.fr.stable.ListMap; import java.util.List; @@ -139,6 +142,25 @@ public class SearchTemplateFormulaAction implements SearchTemplateFormula { ITContent content = ITContent.copy(submitContent); content.addOtherPos(submiter.getName()); SearchCommit2DBJSFormulaAction.getInstance().dealWithDBManipulation(formulaInfos, content, submiter.getDBManipulation()); + } else if (visitor instanceof WClassSubmiter) { + WClassSubmiter submiter = (WClassSubmiter) visitor; + ITContent content = ITContent.copy(submitContent); + content.addOtherPos(submiter.getName()); + if (submiter.getSubmitJob() instanceof ClassSubmitJob) { + ClassSubmitJob job = (ClassSubmitJob) submiter.getSubmitJob(); + dealClassSubmitJob(formulaInfos, job, content); + } + } + } + + private void dealClassSubmitJob(List formulaInfos, ClassSubmitJob job, ITContent content) { + ListMap map = job.getPropertyMap(); + for (Object value : map.values()) { + if (value instanceof Formula) { + ITContent formulaContent = ITContent.copy(content); + formulaContent.setReplaceObject(value); + formulaInfos.add(new FormulaInfo(formulaContent)); + } } }