Browse Source

REPORT-75998 添加不可跳转判断

feature/x
Destiny.Lin 2 years ago
parent
commit
7097f23bd9
  1. 2
      designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/data/SearchDataFormulaAction.java
  2. 1
      designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/template/SearchTemplateFormulaAction.java
  3. 1
      designer-realize/src/main/java/com/fr/design/actions/replace/action/content/js/SearchWebJSAction.java
  4. 1
      designer-realize/src/main/java/com/fr/design/actions/replace/action/content/sql/SearchSQLAction.java

2
designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/data/SearchDataFormulaAction.java

@ -44,6 +44,7 @@ public class SearchDataFormulaAction implements SearchFormula {
Toolkit.i18nText("Fine-Design_Basic_DS_Server_TableData"), Toolkit.i18nText("Fine-Design_Basic_DS_Server_TableData"),
dataName dataName
); );
content.setJumpAble(false);
content.setShowObject(Toolkit.i18nText("Fine-Design_Basic_DS_Server_TableData")); content.setShowObject(Toolkit.i18nText("Fine-Design_Basic_DS_Server_TableData"));
DataType dataType = DataType.match(tableDataConfig.getTableData(dataName).getClass().getSimpleName()); DataType dataType = DataType.match(tableDataConfig.getTableData(dataName).getClass().getSimpleName());
if (dataType != null) { if (dataType != null) {
@ -60,6 +61,7 @@ public class SearchDataFormulaAction implements SearchFormula {
String dataName = (String) dataIterator.next(); String dataName = (String) dataIterator.next();
ITContent content = new ITContent(); ITContent content = new ITContent();
content.setTemplateName(jTemplate.getTemplateName()); content.setTemplateName(jTemplate.getTemplateName());
content.setJumpAble(false);
content.addOtherPos( content.addOtherPos(
Toolkit.i18nText("Fine-Design_Basic_DS_Report_TableData"), Toolkit.i18nText("Fine-Design_Basic_DS_Report_TableData"),
dataName dataName

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

@ -32,6 +32,7 @@ public class SearchTemplateFormulaAction implements SearchTemplateFormula {
public void searchFormulaFromObject(JTemplate jTemplate, List<FormulaInfo> formulaInfos) { public void searchFormulaFromObject(JTemplate jTemplate, List<FormulaInfo> formulaInfos) {
ITContent content = new ITContent(); ITContent content = new ITContent();
content.setTemplateName(jTemplate.getTemplateName()); content.setTemplateName(jTemplate.getTemplateName());
content.setJumpAble(false);
searchTemplateParaFormula(jTemplate, formulaInfos, content); searchTemplateParaFormula(jTemplate, formulaInfos, content);
searchTemplateWaterMarkFormula(jTemplate, formulaInfos, content); searchTemplateWaterMarkFormula(jTemplate, formulaInfos, content);
} }

1
designer-realize/src/main/java/com/fr/design/actions/replace/action/content/js/SearchWebJSAction.java

@ -59,6 +59,7 @@ public class SearchWebJSAction implements SearchJS {
ReportWebAttr webAttr = workBook.getReportWebAttr(); ReportWebAttr webAttr = workBook.getReportWebAttr();
ITContent content = new ITContent(); ITContent content = new ITContent();
content.setTemplateName(jTemplate.getTemplateName()); content.setTemplateName(jTemplate.getTemplateName());
content.setJumpAble(false);
addWebContent2Array(webAttr); addWebContent2Array(webAttr);
for (int i = 0; i < arrayList.size(); i++) { for (int i = 0; i < arrayList.size(); i++) {
addJSInfos2ListFromArray(content, jsInfos, arrayList.get(i)); addJSInfos2ListFromArray(content, jsInfos, arrayList.get(i));

1
designer-realize/src/main/java/com/fr/design/actions/replace/action/content/sql/SearchSQLAction.java

@ -34,6 +34,7 @@ public class SearchSQLAction implements SearchAction {
List<SQLInfo> sqlInfos = new ArrayList<>(); List<SQLInfo> sqlInfos = new ArrayList<>();
ITContent content = new ITContent(); ITContent content = new ITContent();
content.setTemplateName(jTemplate.getTemplateName()); content.setTemplateName(jTemplate.getTemplateName());
content.setJumpAble(false);
addModelDataInfos2Array(jTemplate, content, sqlInfos); addModelDataInfos2Array(jTemplate, content, sqlInfos);
addServerDataInfos2Array(content, sqlInfos); addServerDataInfos2Array(content, sqlInfos);
setSqlInfos(sqlInfos); setSqlInfos(sqlInfos);

Loading…
Cancel
Save