Browse Source

REPORT-75998 调整格式

feature/x
Destiny.Lin 3 years ago
parent
commit
49ac7e25e3
  1. 1
      designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/javascript/SearchCommit2DBJSFormulaAction.java
  2. 20
      designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/template/SearchTemplateFormulaAction.java

1
designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/javascript/SearchCommit2DBJSFormulaAction.java

@ -44,6 +44,7 @@ public class SearchCommit2DBJSFormulaAction implements SearchJSFormula {
/** /**
* 处理DBManipulation * 处理DBManipulation
*
* @param formulaInfos * @param formulaInfos
* @param content * @param content
* @param dbManipulation * @param dbManipulation

20
designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/template/SearchTemplateFormulaAction.java

@ -69,9 +69,9 @@ public class SearchTemplateFormulaAction implements SearchTemplateFormula {
private void dealWorkSheetAttr(List<FormulaInfo> formulaInfos, ITContent sheetContent, WorkSheet report) { private void dealWorkSheetAttr(List<FormulaInfo> formulaInfos, ITContent sheetContent, WorkSheet report) {
ReportWriteAttr attr = report.getAttributeTarget(ReportWriteAttr.XML_TAG); ReportWriteAttr attr = report.getAttributeTarget(ReportWriteAttr.XML_TAG);
if (attr != null){ if (attr != null) {
//提交 //提交
for (int i = 0 ,len = attr.getSubmitVisitorCount(); i < len ; i ++){ for (int i = 0, len = attr.getSubmitVisitorCount(); i < len; i++) {
SubmitVisitor visitor = attr.getSubmitVisitor(i); SubmitVisitor visitor = attr.getSubmitVisitor(i);
ITContent submitContent = ITContent.copy(sheetContent); ITContent submitContent = ITContent.copy(sheetContent);
submitContent.addOtherPos(Toolkit.i18nText("FIne-Design_Basic_Submit")); submitContent.addOtherPos(Toolkit.i18nText("FIne-Design_Basic_Submit"));
@ -79,12 +79,12 @@ public class SearchTemplateFormulaAction implements SearchTemplateFormula {
} }
//数据校验 //数据校验
for (int i = 0 , len = attr.getValueVerifierCount() ;i < len ; i++){ for (int i = 0, len = attr.getValueVerifierCount(); i < len; i++) {
Verifier verifier = attr.getVerifier(i); Verifier verifier = attr.getVerifier(i);
if (verifier instanceof ValueVerifier){ if (verifier instanceof ValueVerifier) {
ITContent content = ITContent.copy(sheetContent); ITContent content = ITContent.copy(sheetContent);
content.addOtherPos(Toolkit.i18nText("Fine-Design_Report_Verify_Data_Verify")); content.addOtherPos(Toolkit.i18nText("Fine-Design_Report_Verify_Data_Verify"));
dealValueVerifier4Formula(formulaInfos,content, (ValueVerifier) verifier); dealValueVerifier4Formula(formulaInfos, content, (ValueVerifier) verifier);
} }
} }
} }
@ -94,14 +94,14 @@ public class SearchTemplateFormulaAction implements SearchTemplateFormula {
private void dealValueVerifier4Formula(List<FormulaInfo> formulaInfos, ITContent content, ValueVerifier verifier) { private void dealValueVerifier4Formula(List<FormulaInfo> formulaInfos, ITContent content, ValueVerifier verifier) {
ITContent verifyContent = ITContent.copy(content); ITContent verifyContent = ITContent.copy(content);
verifyContent.addOtherPos(verifier.getName()); verifyContent.addOtherPos(verifier.getName());
for (int i = 0,len = verifier.getVerifyItemsCount() ;i < len ; i ++){ for (int i = 0, len = verifier.getVerifyItemsCount(); i < len; i++) {
VerifyItem item = verifier.getVerifyItem(i); VerifyItem item = verifier.getVerifyItem(i);
if (item.getFormula() != null){ if (item.getFormula() != null) {
ITContent formulaContent = ITContent.copy(verifyContent); ITContent formulaContent = ITContent.copy(verifyContent);
formulaContent.setReplaceObject(item.getFormula()); formulaContent.setReplaceObject(item.getFormula());
formulaInfos.add(new FormulaInfo(formulaContent)); formulaInfos.add(new FormulaInfo(formulaContent));
} }
if (CommonUtils.canBeFormula(item.getMessage())){ if (CommonUtils.canBeFormula(item.getMessage())) {
ITContent messageContent = ITContent.copy(verifyContent); ITContent messageContent = ITContent.copy(verifyContent);
messageContent.setReplaceObject(item.getMessage()); messageContent.setReplaceObject(item.getMessage());
messageContent.setHoldObject(item); messageContent.setHoldObject(item);
@ -111,11 +111,11 @@ public class SearchTemplateFormulaAction implements SearchTemplateFormula {
} }
private void dealBuiltSQLSubmiter4Formula(List<FormulaInfo> formulaInfos, ITContent submitContent, SubmitVisitor visitor) { private void dealBuiltSQLSubmiter4Formula(List<FormulaInfo> formulaInfos, ITContent submitContent, SubmitVisitor visitor) {
if (visitor instanceof BuiltInSQLSubmiter){ if (visitor instanceof BuiltInSQLSubmiter) {
BuiltInSQLSubmiter submiter = (BuiltInSQLSubmiter) visitor; BuiltInSQLSubmiter submiter = (BuiltInSQLSubmiter) visitor;
ITContent content = ITContent.copy(submitContent); ITContent content = ITContent.copy(submitContent);
content.addOtherPos(submiter.getName()); content.addOtherPos(submiter.getName());
SearchCommit2DBJSFormulaAction.getInstance().dealWithDBManipulation(formulaInfos,content, submiter.getDBManipulation()); SearchCommit2DBJSFormulaAction.getInstance().dealWithDBManipulation(formulaInfos, content, submiter.getDBManipulation());
} }
} }

Loading…
Cancel
Save