fanruan
/
design
6
1
Fork 1
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

REPORT-75998 修复查找完成后打开新模板无查找内容不符的提示，修复输入img返回结果不正确的bug

feature/x
Destiny.Lin 3 years ago
parent
1ad118e38b
commit
5c716eb147
3 changed files with 130 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 55
      designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceMainDialog.java
  2. 9
      designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITTableButton.java
  3. 108
      designer-realize/src/main/java/com/fr/design/actions/replace/utils/ShowValueUtils.java

55
designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceMainDialog.java
Unescape View File

@ -48,13 +48,14 @@ public class ITReplaceMainDialog extends UIDialog {
private static boolean matched = false; private static boolean matched = false;
private static volatile ITReplaceMainDialog instance = null; private static volatile ITReplaceMainDialog instance = null;
private static String templateID; private static String templateID;
private static String templateName;
private ITReplaceNorthPanel northPane; private ITReplaceNorthPanel northPane;
private ITReplaceSouthPanel southPanel; private ITReplaceSouthPanel southPanel;
private ITReplaceWestPanel westPanel; private ITReplaceWestPanel westPanel;
private boolean searchFlag; private boolean searchFlag;
private String searchStr; private String searchStr;
private static final int FIRST_ROW = 0; private static final int FIRST_ROW = 0;
public static int selectCount = 0; public static int selectCount = 0;
public ITReplaceMainDialog() { public ITReplaceMainDialog() {
super(DesignerContext.getDesignerFrame()); super(DesignerContext.getDesignerFrame());
@ -165,8 +166,9 @@ public class ITReplaceMainDialog extends UIDialog {
String searchStr = ((UITextField) (northPane.getFindInputCombobox().getEditor().getEditorComponent())).getText(); String searchStr = ((UITextField) (northPane.getFindInputCombobox().getEditor().getEditorComponent())).getText();
String replaceStr = ((UITextField) (northPane.getReplaceInputCombobox().getEditor().getEditorComponent())).getText(); String replaceStr = ((UITextField) (northPane.getReplaceInputCombobox().getEditor().getEditorComponent())).getText();
//替换内容为空需要触发搜索 //替换内容为空需要触发搜索
if (StringUtils.equals(getSearchStr(), searchStr) && StringUtils.isNotEmpty(replaceStr)) { if (isITReplaceValid() && checkTemplateChanged(searchResultList)) {
if (isITReplaceValid() && checkTemplateChanged(searchResultList)) { if (StringUtils.equals(getSearchStr(), searchStr) && StringUtils.isNotEmpty(replaceStr)) {
HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().fireTargetModified(true);
for (Info info : searchResultList) { for (Info info : searchResultList) {
if (info.getContent().isSelected()) { if (info.getContent().isSelected()) {
info.setValue(info, searchStr, replaceStr, info.getContent().getOperatorArray()); info.setValue(info, searchStr, replaceStr, info.getContent().getOperatorArray());
@ -175,29 +177,26 @@ public class ITReplaceMainDialog extends UIDialog {
southPanel.getTableEditorPane().update(); southPanel.getTableEditorPane().update();
northPane.refreshReplaceInputComboBoxItems(); northPane.refreshReplaceInputComboBoxItems();
ITTableEditorPane.getEditTable().repaint(); ITTableEditorPane.getEditTable().repaint();
HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().fireTargetModified(true);
setSearchFlag(false); setSearchFlag(false);
search();
} else {
Object[] options = new Object[]{Toolkit.i18nText("Fine-Design_Replace_Search_Again"), Toolkit.i18nText("Fine-Design_Basic_Cancel")};
int optionSelected = FineJOptionPane.showOptionDialog(
ITReplaceMainDialog.this,
Toolkit.i18nText("Fine-Design_Replace_Message"),
Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
JOptionPane.YES_NO_CANCEL_OPTION,
JOptionPane.ERROR_MESSAGE,
null,
// 如果传null, 则按钮为 optionType 类型所表示的按钮（也就是确认对话框）
options,
options[0]
);
//如果选择了重新查找，则再查找一遍
if (optionSelected == 0) {
search();
}
} }
} else {
search(); search();
} else {
Object[] options = new Object[]{Toolkit.i18nText("Fine-Design_Replace_Search_Again"), Toolkit.i18nText("Fine-Design_Basic_Cancel")};
int optionSelected = FineJOptionPane.showOptionDialog(
ITReplaceMainDialog.this,
Toolkit.i18nText("Fine-Design_Replace_Message"),
Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
JOptionPane.YES_NO_CANCEL_OPTION,
JOptionPane.ERROR_MESSAGE,
null,
// 如果传null, 则按钮为 optionType 类型所表示的按钮（也就是确认对话框）
options,
options[0]
);
//如果选择了重新查找，则再查找一遍
if (optionSelected == 0) {
search();
}
} }
@ -220,7 +219,8 @@ public class ITReplaceMainDialog extends UIDialog {
*/ */
public boolean isITReplaceValid() { public boolean isITReplaceValid() {
if (JTemplate.isValid(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate())) { if (JTemplate.isValid(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate())) {
return StringUtils.equals(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getTarget().getTemplateID(), templateID); return StringUtils.equals(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getTarget().getTemplateID(), templateID)
&& StringUtils.equals(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getTemplateName(), templateName);
} else { } else {
return false; return false;
} }
@ -288,6 +288,7 @@ public class ITReplaceMainDialog extends UIDialog {
if (JTemplate.isValid(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate())) { if (JTemplate.isValid(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate())) {
JTemplate jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); JTemplate jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
templateID = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getTarget().getTemplateID(); templateID = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getTarget().getTemplateID();
templateName = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getTemplateName();
itTableEditor.clear(); itTableEditor.clear();
String searchStr = ((UITextField) (northPane.getFindInputCombobox().getEditor().getEditorComponent())).getText(); String searchStr = ((UITextField) (northPane.getFindInputCombobox().getEditor().getEditorComponent())).getText();
//更新搜索内容 //更新搜索内容
@ -310,12 +311,12 @@ public class ITReplaceMainDialog extends UIDialog {
setSearchFlag(true); setSearchFlag(true);
selectCount = searchResultList.size(); selectCount = searchResultList.size();
//如果有结果，默认选中第一行 //如果有结果，默认选中第一行
if (searchResultList.size() > 0){ if (searchResultList.size() > 0) {
getEditTable().addRowSelectionInterval(FIRST_ROW,FIRST_ROW); getEditTable().addRowSelectionInterval(FIRST_ROW, FIRST_ROW);
} }
//更新替换按钮可用性 //更新替换按钮可用性
if (StringUtils.isEmpty(searchStr) || searchResultList.size() == 0){ if (StringUtils.isEmpty(searchStr) || searchResultList.size() == 0) {
northPane.getReplaceButton().setEnabled(false); northPane.getReplaceButton().setEnabled(false);
} else { } else {
northPane.getReplaceButton().setEnabled(true); northPane.getReplaceButton().setEnabled(true);

9
designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITTableButton.java
Unescape View File

@ -6,13 +6,14 @@ import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.ReportComponentComposite; import com.fr.file.FILEFactory;
import com.fr.general.GeneralUtils; import com.fr.general.GeneralUtils;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import com.fr.stable.project.ProjectConstants;
import javax.swing.AbstractCellEditor; import javax.swing.AbstractCellEditor;
import javax.swing.JTable; import javax.swing.JTable;
import javax.swing.SwingUtilities;
import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellEditor;
import javax.swing.table.TableCellRenderer; import javax.swing.table.TableCellRenderer;
import java.awt.Component; import java.awt.Component;
@ -42,7 +43,9 @@ public class ITTableButton extends AbstractCellEditor implements TableCellEditor
ITContent content = (ITContent) getEditTable().getValueAt(getEditTable().getEditingRow(), 6); ITContent content = (ITContent) getEditTable().getValueAt(getEditTable().getEditingRow(), 6);
if (StringUtils.isNotEmpty(GeneralUtils.objectToString(content.getTrlString()))) { if (StringUtils.isNotEmpty(GeneralUtils.objectToString(content.getTrlString()))) {
ITReplaceMainDialog.setITReplaceFlag(true); ITReplaceMainDialog.setITReplaceFlag(true);
HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().navigate(new TRL(GeneralUtils.objectToString(content.getTrlString()))); TRL trl = new TRL(GeneralUtils.objectToString(content.getTrlString()));
DesignerContext.getDesignerFrame().openTemplate(FILEFactory.createFILE(ProjectConstants.REPORTLETS_NAME + FILEFactory.SEPARATOR + content.getTemplateName()));
HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().navigate(trl);
} }
ITReplaceMainDialog.setITReplaceFlag(false); ITReplaceMainDialog.setITReplaceFlag(false);
} }

108
designer-realize/src/main/java/com/fr/design/actions/replace/utils/ShowValueUtils.java
Unescape View File

@ -28,6 +28,25 @@ public class ShowValueUtils {
public static final String ANY_THING_REGEX = "."; public static final String ANY_THING_REGEX = ".";
public static final String NUMBER_REGEX = "[0-9]"; public static final String NUMBER_REGEX = "[0-9]";
public static final String ENGLISH_REGEX = "[a-zA-Z]"; public static final String ENGLISH_REGEX = "[a-zA-Z]";
public static final char LEFT_HTML_CHAR = '<';
public static final char RIGHT_HTML_CHAR = '>';
public static final String HEAD = "<html><nobr>";
public static final String TAIL = "</nobr></html>";
public static final String FONT_HEAD = "<font color = 'rgb(61,153,249)'>";
public static final String FONT_TAIL = "</font>";
public static final String HTML = "<html>";
public static final String NOBR = "<nobr>";
public static final String HTML_TAIL = "</html>";
public static final String NOBR_TAIL = "</nobr>";
public static final int HEAD_LEN = HEAD.length();
public static final int TAIL_LEN = TAIL.length();
public static final int FONT_HEAD_LEN = FONT_HEAD.length();
public static final int FONT_TAIL_LEN = FONT_TAIL.length();
public static final int HTML_LEN = HTML.length();
public static final int HTML_TAIL_LEN = HTML_TAIL.length();
public static final int NOBR_LEN = NOBR.length();
public static final int NOBR_TAIL_LEN = NOBR_TAIL.length();
public static Pattern containPattern; public static Pattern containPattern;
private static List<String> specialCharList = new ArrayList<>(); private static List<String> specialCharList = new ArrayList<>();
@ -135,33 +154,97 @@ public class ShowValueUtils {
String result = str; String result = str;
Pattern pattern = containPattern; Pattern pattern = containPattern;
Matcher matcher = pattern.matcher(str); Matcher matcher = pattern.matcher(str);
String head = "<font color = 'rgb(61,153,249)'>"; int size = FONT_HEAD.length() + FONT_TAIL.length();
String tail = "</font>";
int size = head.length() + tail.length();
int index = 0; int index = 0;
StringBuilder builder = new StringBuilder(str); StringBuilder builder = new StringBuilder(str);
while (matcher.find()) { while (matcher.find()) {
builder.replace(matcher.start() + index, matcher.end() + index, head + changeHtmlStr(matcher.group()) + tail); builder.replace(matcher.start() + index, matcher.end() + index, FONT_HEAD + changeHtmlStr(matcher.group()) + FONT_TAIL);
index += size; index += size;
index += getIncreaseCount(matcher.group());
} }
return "<html><body><div><nobr>" +
builder.toString() + return changeOriginHtmlStr(HEAD + builder.toString() + TAIL);
"</nobr></div></body></html>";
} else { } else {
return "<html><body><div><nobr>" + String ans = HEAD + replaceAll(str, searchStr, FONT_HEAD + changeHtmlStr(searchStr) + FONT_TAIL) + TAIL;
replaceAll(str, searchStr, "<font color = 'rgb(61,153,249)'>" + changeHtmlStr(searchStr) + "</font>") + return changeOriginHtmlStr(ans);
"</nobr></div></body></html>"; }
}
/**
* 用于处理原字符串中的尖括号
*/
private static String changeOriginHtmlStr(String str) {
int count = 0;
int different = 3;
StringBuilder builder = new StringBuilder(str);
for (int i = 0; i < str.length(); i++) {
char c = str.charAt(i);
if (c == LEFT_HTML_CHAR) {
if (!checkValid(str, i)) {
builder.replace(i + count, i + count + 1, "&lt;");
count += different;
}
}
} }
return builder.toString();
}
private static boolean checkValid(String str, int i) {
int leftLen = str.length() - (i + 1);
return checkStrValid(str, i, leftLen, HTML_LEN, HTML) ||
checkStrValid(str, i, leftLen, HTML_TAIL_LEN, HTML_TAIL) ||
checkStrValid(str, i, leftLen, FONT_HEAD_LEN, FONT_HEAD) ||
checkStrValid(str, i, leftLen, FONT_TAIL_LEN, FONT_TAIL) ||
checkStrValid(str, i, leftLen, NOBR_LEN, NOBR) ||
checkStrValid(str, i, leftLen, NOBR_TAIL_LEN, NOBR_TAIL);
} }
private static String changeHtmlStr(String searchStr){ /**
* 是否是所指定的字符串
*
* @param str
* @param i
* @param leftLen
* @return
*/
private static boolean checkStrValid(String str, int i, int leftLen, int len, String checkStr) {
if (leftLen < len - 1) {
return false;
} else {
return StringUtils.equals(str.substring(i, i + len), checkStr);
}
}
/**
* 用于处理搜索的字符中的尖括号
*
* @param searchStr
* @return
*/
private static String changeHtmlStr(String searchStr) {
String showStr = searchStr; String showStr = searchStr;
showStr = showStr.replace("<","&lt;"); showStr = showStr.replace("<", "&lt;");
showStr = showStr.replace(">", "&gt"); showStr = showStr.replace(">", "&gt");
return showStr; return showStr;
} }
private static int getIncreaseCount(String str) {
int count = 0;
int leftDifferent = 3;
int rightDifferent = 2;
for (int i = 0; i < str.length(); i++) {
if (str.charAt(i) == LEFT_HTML_CHAR) {
count += leftDifferent;
}
if (str.charAt(i) == RIGHT_HTML_CHAR) {
count += rightDifferent;
}
}
return count;
}
/** /**
* 集合是否不为空 * 集合是否不为空
* *
@ -193,6 +276,7 @@ public class ShowValueUtils {
/** /**
* 支持通配符的contains * 支持通配符的contains
*
* @param originStr * @param originStr
* @param matchStr * @param matchStr
* @return * @return

Write Preview
Loading…
Cancel
Save