Browse Source

Merge pull request #8958 in DESIGN/design from final/10.0 to release/10.0

* commit 'e18058dd789a9b29a853a342c79cb7c76e0d02b5':
  REPORT-71855 10.0下产品动态不显示new图标
  REPORT-70681 搜索一些特殊字符 高亮展示时 展示效果不对
security/10.0
superman 3 years ago
parent
commit
c79d9dfddd
  1. 8
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/AlphaFineUtil.java
  2. 25
      designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/new_tip.svg

8
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/AlphaFineUtil.java

@ -2,6 +2,7 @@ package com.fr.design.mainframe.alphafine;
import com.fr.design.DesignerEnvManager;
import com.fr.design.mainframe.alphafine.search.manager.impl.ProductNewsSearchManager;
import com.fr.stable.ArrayUtils;
import com.fr.stable.StringUtils;
import java.util.Set;
@ -13,10 +14,15 @@ import java.util.Set;
public class AlphaFineUtil {
public static String highLightModelName(String modelName, String[] strings) {
if (strings == null) {
if (strings == null || ArrayUtils.isEmpty(strings)) {
return modelName;
}
for (String string : strings) {
// 高亮分词 跳过高亮颜色本身的字符
boolean skipHighLight = modelName.contains(AlphaFineConstants.HIGH_LIGHT_COLOR) && AlphaFineConstants.HIGH_LIGHT_COLOR.contains(string);
if (skipHighLight) {
continue;
}
String primaryStr = getReplacedString(modelName, string);
if (StringUtils.isNotEmpty(primaryStr)) {
modelName = modelName.replaceAll("(?i)" + primaryStr, "|<font color=" + AlphaFineConstants.HIGH_LIGHT_COLOR + ">" + primaryStr + "</font>|");

25
designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/new_tip.svg

@ -0,0 +1,25 @@
<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_646_53710)">
<g filter="url(#filter0_d_646_53710)">
<path d="M28 0L0 28V10.5L10.5 0H28Z" fill="#EB1D1F"/>
</g>
<path d="M6.14139 17.6072L1.58594 13.0518L2.20431 12.4334L8.17363 13.6173L4.59701 10.0407L5.17499 9.46271L9.73044 14.0182L9.11207 14.6365L3.13964 13.4495L6.71937 17.0292L6.14139 17.6072Z" fill="white"/>
<path d="M11.8714 9.7517L12.5209 9.24519C12.7674 9.67401 12.8606 10.1049 12.8006 10.5379C12.7405 10.9708 12.5188 11.3789 12.1356 11.7622C11.6529 12.2449 11.1215 12.48 10.5415 12.4676C9.96142 12.451 9.40313 12.1744 8.86658 11.6379C8.31139 11.0827 8.02344 10.5089 8.00272 9.91639C7.98201 9.32391 8.19953 8.7998 8.65528 8.34404C9.09653 7.90279 9.60718 7.69252 10.1872 7.71324C10.7673 7.73396 11.3297 8.01673 11.8745 8.56156C11.9077 8.59471 11.9564 8.64546 12.0206 8.71382L9.55953 11.1749C9.94278 11.5167 10.3229 11.6918 10.6999 11.7C11.077 11.7083 11.4033 11.5747 11.6788 11.2992C11.8839 11.0941 12.0051 10.8652 12.0423 10.6124C12.0796 10.3597 12.0227 10.0728 11.8714 9.7517ZM9.13071 10.6839L10.9734 8.84123C10.6709 8.58849 10.3923 8.45073 10.1375 8.42794C9.7439 8.39065 9.4052 8.51391 9.12139 8.79772C8.86451 9.0546 8.734 9.35706 8.72986 9.70509C8.72778 10.051 8.8614 10.3773 9.13071 10.6839Z" fill="white"/>
<path d="M14.8266 8.92202L10.5166 6.63186L11.0946 6.05389L13.5246 7.43357L14.4288 7.9463C14.4019 7.90279 14.232 7.61898 13.9192 7.09487L12.5116 4.63691L13.0864 4.06204L15.4947 5.48213L16.2902 5.94824L15.8427 5.12167L14.5003 2.64817L15.0441 2.10438L17.3125 6.4361L16.7314 7.01718L14.23 5.56603L13.5401 5.13099L15.4108 8.33783L14.8266 8.92202Z" fill="white"/>
</g>
<defs>
<filter id="filter0_d_646_53710" x="-4" y="-2" width="36" height="36" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
<feOffset dy="2"/>
<feGaussianBlur stdDeviation="2"/>
<feComposite in2="hardAlpha" operator="out"/>
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_646_53710"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_646_53710" result="shape"/>
</filter>
<clipPath id="clip0_646_53710">
<rect width="36" height="36" fill="white"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 2.4 KiB

Loading…
Cancel
Save