Pull request #14887: REPORT-135192【国际化】日语语言下，html标签不生效&REPORT-135273【fr-fbp回归】导出事件tab丢失

Merge in DESIGN/design from ~RENEKTON/design:fbp/release to fbp/release

* commit '021977e0929a45f425ecdf7742ee9e22f0bb15a5':
  回滚提交入库
  调整提交入库表格右侧按钮大小
  国际化去掉html换行&服务器配置模板web属性丢失导出事件

designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayConfigPane.java

@@ -1,5 +1,7 @@
 package com.fr.widgettheme.designer;
 
+import com.fine.theme.utils.FineUIStyle;
+import com.fine.theme.utils.FineUIUtils;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
@@ -9,6 +11,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.widgettheme.control.attr.WidgetDisplayEnhanceMarkAttr;
 
 import javax.swing.JPanel;
+import javax.swing.JTextArea;
 import java.awt.BorderLayout;
 import java.awt.Color;
 
@@ -39,9 +42,8 @@ public class WidgetThemeDisplayConfigPane extends BasicPane {
         northPane.add(row(cell(widgetEnhance)).getComponent());
 
         JPanel southPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Widget_Display_Enhance_Tip"));
+        JTextArea tipText = FineUIUtils.createAutoWrapTipLabel(Toolkit.i18nText("Fine-Design_Widget_Display_Enhance_Tip"));
-        label.setForeground(Color.GRAY);
+        southPane.add(tipText);
-        southPane.add(label);
         this.add(column(10, cell(northPane), cell(southPane)).getComponent());
     }
 

designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java

@@ -73,12 +73,13 @@ public class ListenerEditPane extends BasicBeanPane<Listener> {
         nameText = new UITextField();
         nameText.setEditable(false);
         final List<String> style = new ArrayList<>(Arrays.asList(JS, DBCOMMIT, CUSTOMACTION, EMAIL, MOBILEPOPUP));
-        styleBox = new UIComboBox(style.toArray());
-        styleBox.putClientProperty(FineClientProperties.COMBO_BOX_TYPE, FineClientProperties.ADAPTIVE_COMBO_BOX);
         boolean workbook = DesignerContext.getDesignerFrame().getSelectedJTemplate().isJWorkBook();
         if (workbook) {
             style.add(EXPORT);
         }
+        styleBox = new UIComboBox(style.toArray());
+        styleBox.putClientProperty(FineClientProperties.COMBO_BOX_TYPE, FineClientProperties.ADAPTIVE_COMBO_BOX);
+
         //事件名
         JPanel eventName = row(LayoutConstants.HGAP_LARGE,
                 cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event_Name"))),