Merge pull request #4011 in DESIGN/design from release/10.0 to feature/10.0

* commit '3e727767c4c47304873e761d37aa1fad363923b0':
  REPORT-49034 引用JS静态资源文件路径出错
  REPORT-50802 参数面板组建设置面板中，删除按钮的快捷键提示浮窗内容不正确

designer-base/src/main/java/com/fr/design/actions/core/ActionFactory.java

@@ -7,6 +7,7 @@ import com.fr.design.mainframe.JTemplate;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.design.selection.QuickEditor;
 import com.fr.log.FineLoggerFactory;
+import com.fr.stable.StringUtils;
 
 import javax.swing.Action;
 import javax.swing.KeyStroke;
@@ -14,7 +15,6 @@ import java.awt.event.KeyEvent;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -242,8 +242,11 @@ public class ActionFactory {
         KeyStroke keyStroke = (KeyStroke) action.getValue(Action.ACCELERATOR_KEY);
         if (keyStroke != null) {
             buttonToolTipTextBuf.append(" (");
-            buttonToolTipTextBuf.append(KeyEvent.getKeyModifiersText(keyStroke.getModifiers()));
-            buttonToolTipTextBuf.append('+');
+            String modifiersText = KeyEvent.getKeyModifiersText(keyStroke.getModifiers());
+            if (!StringUtils.isEmpty(modifiersText)) {
+                buttonToolTipTextBuf.append(modifiersText);
+                buttonToolTipTextBuf.append('+');
+            }
             buttonToolTipTextBuf.append(KeyEvent.getKeyText(keyStroke.getKeyCode()));
             buttonToolTipTextBuf.append(')');
         }