Merge pull request #12323 in DESIGN/design from bugfix/11.0 to feature/x

* commit '2fd18070f3d0afabae2fecc2ee1b285bc5e7ddc0':
  REPORT-97591 排序按钮设置颜色后，新增排序规则保存并关闭模板，再次打开排序按钮颜色丢失
  REPORT-97591 排序按钮设置颜色后，新增排序规则保存并关闭模板，再次打开排序按钮颜色丢失
  REPORT-97591 排序按钮设置颜色后，新增排序规则保存并关闭模板，再次打开排序按钮颜色丢失
  REPORT-99320 插件管理整体优化-设计器内单个插件更新的提示没有显示哪个插件更新，和平台提示文本不一致
  REPORT-99332 设计器文本输入框文本被自动移除的问题 rt， 把 trim 取消掉
  REPORT-97972 回退一下自己代码库的改动
  REPORT-97972 回退一下自己代码库的改动
  REPORT-97972 【FR国际化】文字显示不全

designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java

@@ -70,7 +70,7 @@ public class PluginOperateUtils {
 
     public static void updatePluginOnline(List<PluginMarker> pluginMarkerList, JSCallback jsCallback) {
         int size = pluginMarkerList.size();
-        BatchUpdateOnlineCallback batchUpdateOnlineCallback = new BatchUpdateOnlineCallback(jsCallback, size);
+        BatchUpdateOnlineCallback batchUpdateOnlineCallback = size <= 1 ? BatchUpdateOnlineCallback.NONE : new BatchUpdateOnlineCallback(jsCallback, size);
         for (int i = 0; i < size; i++) {
             updatePluginOnline(pluginMarkerList.get(i), jsCallback, batchUpdateOnlineCallback);
         }

designer-realize/src/main/java/com/fr/design/sort/header/HeaderSortRulePane.java

@@ -222,14 +222,18 @@ public class HeaderSortRulePane extends JPanel {
             for (SortHeader.SortItem sortItem : sortItems) {
                 SortRule sortRule = sortItem.getSortRule();
                 BufferedImage bufferedImage = sortItem.getBufferedImage();
+                FineColor fineColor = sortItem.getFineColor();
                 if (sortRule == SortRule.ASC) {
                     ascIconButton.refreshIconLabel(bufferedImage);
+                    ascIconButton.refreshIconLabelColor(fineColor);
                     ascUICheckBox.setSelected(true);
                 } else if (sortRule == SortRule.DES) {
                     desIconButton.refreshIconLabel(bufferedImage);
+                    desIconButton.refreshIconLabelColor(fineColor);
                     desUICheckBox.setSelected(true);
                 } else if (sortRule == SortRule.NO_SORT) {
                     nosortIconButton.refreshIconLabel(bufferedImage);
+                    nosortIconButton.refreshIconLabelColor(fineColor);
                     nosortUICheckBox.setSelected(true);
                 }
             }

designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellStringQuickEditor.java

@@ -37,17 +37,17 @@ public class CellStringQuickEditor extends CellQuickEditor {
     private DocumentListener documentListener = new DocumentListener() {
         @Override
         public void insertUpdate(DocumentEvent e) {
-            changeReportPaneCell(stringTextArea.getText().trim());
+            changeReportPaneCell(stringTextArea.getText());
         }
 
         @Override
         public void removeUpdate(DocumentEvent e) {
-            changeReportPaneCell(stringTextArea.getText().trim());
+            changeReportPaneCell(stringTextArea.getText());
         }
 
         @Override
         public void changedUpdate(DocumentEvent e) {
-            changeReportPaneCell(stringTextArea.getText().trim());
+            changeReportPaneCell(stringTextArea.getText());
         }
 
     };