Merge pull request #5 in ~NEIL/design from release/10.0 to feature/10.0

* commit 'adfca6c286d479f905733b94eabab42a7218ea01':
  无JIRA任务 删除过时的接口
  REPORT-11623 IOFile移动到报表中
  CHART-3252 更换单元格数据布局方式和边框大小
  REPORT-12852 10.0模板短信事件在mac下的提示弹框有问题
  REPORT-12710
  REPORT-12885 设计器鸣谢名单SiteCenter修改不生效
  REPORT-12865 文件控件，ie11下图标显示不出来了
  CHART-3399 dialog.pack()说要写在子组件里
  CHART-3413 优化改法
  CHART-3413 词云-系列 类型转换错误
  rt
  REPORT-9679 去除国际化影响,后续feature合进来之后统一定义成常量

designer-base/src/main/java/com/fr/design/ExtraDesignClassManager.java

@@ -7,7 +7,6 @@ package com.fr.design;
 import com.fr.base.BaseUtils;
 import com.fr.design.data.datapane.TableDataNameObjectCreator;
 import com.fr.design.fun.CellWidgetOptionProvider;
-import com.fr.design.fun.Feedback;
 import com.fr.design.fun.FormWidgetOptionProvider;
 import com.fr.design.fun.ParameterWidgetOptionProvider;
 import com.fr.design.fun.ServerTableDataDefineProvider;
@@ -19,8 +18,6 @@ import com.fr.design.menu.ShortCut;
 import com.fr.design.widget.Appearance;
 import com.fr.design.widget.mobile.WidgetMobilePane;
 import com.fr.form.ui.Widget;
-import com.fr.general.FRLogger;
-import com.fr.general.GeneralUtils;
 import com.fr.general.IOUtils;
 import com.fr.plugin.AbstractExtraClassManager;
 import com.fr.plugin.injectable.PluginModule;
@@ -210,19 +207,6 @@ public class ExtraDesignClassManager extends AbstractExtraClassManager implement
         return map;
     }
 
-
-    public Feedback getFeedback() {
-        try {
-            Class clazz = GeneralUtils.classForName("com.fr.design.feedback.CurrentFeedback");
-            if (clazz != null) {
-                return (Feedback) clazz.newInstance();
-            }
-        } catch (Exception e) {
-            FRLogger.getLogger().info("no feed back support");
-        }
-        return Feedback.EMPTY;
-    }
-
     @Override
     protected boolean demountSpecific(PluginSingleInjection injection) {
 

designer-base/src/main/java/com/fr/design/fun/Feedback.java

@@ -1,19 +0,0 @@
-package com.fr.design.fun;
-
-/**
- * @author richie
- * @date 2015-03-31
- * @since 8.0
- */
-public interface Feedback {
-    String MARK_STRING = "FineReport_Feedback";
-
-    void didFeedback();
-
-    Feedback EMPTY = new Feedback() {
-        @Override
-        public void didFeedback() {
-
-        }
-    };
-}

designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java

@@ -249,7 +249,8 @@ abstract class UIControlPane extends JControlPane {
                 checkValid();
             } catch (Exception exp) {
                 // 存在非法输入 拒绝隐藏
-                JOptionPane.showMessageDialog(UIControlPane.this.controlUpdatePane, exp.getMessage());
+                this.setAlwaysOnTop(true);
+                JOptionPane.showMessageDialog(this, exp.getMessage());
                 this.requestFocus();
                 return;
             }

designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java

@@ -12,7 +12,7 @@ import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 import java.awt.Component;
-import java.awt.FlowLayout;
+import java.awt.BorderLayout;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -54,11 +54,11 @@ public abstract class AbstractExtendedChartReportDataPane<T extends AbstractData
         Arrays.fill(rowSize, p);
 
         JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 24, 6);
-        panel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 15));
+        panel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 8));
 
-        this.setLayout(new FlowLayout());
-        this.add(panel);
-        this.add(addSouthPane());
+        this.setLayout(new BorderLayout());
+        this.add(panel, BorderLayout.CENTER);
+        this.add(addSouthPane(),  BorderLayout.SOUTH);
     }
 
     protected JPanel addSouthPane() {

designer-chart/src/main/java/com/fr/van/chart/designer/other/AutoRefreshPane.java

@@ -142,6 +142,7 @@ public class AutoRefreshPane extends BasicBeanPane<RefreshMoreLabel> {
 
                     }
                 });
+                dialog.pack();
                 dialog.setModal(true);
                 dialog.setVisible(true);
             }

designer-form/src/main/java/com/fr/design/designer/properties/EventPropertyTable.java

@@ -23,124 +23,131 @@ import java.util.ArrayList;
 
 public class EventPropertyTable extends UIListControlPane {
 
-	private XCreator creator;
-	private FormDesigner designer;
-
-	public EventPropertyTable(FormDesigner designer) {
-		super();
-		this.designer = designer;
-	}
-
-	@Override
-	public String getAddItemText() {
-		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Add_Event");
-	}
-
-	public static class WidgetEventListenerUpdatePane extends ListenerUpdatePane {
-
-		@Override
-		protected JavaScriptActionPane createJavaScriptActionPane() {
-			return new JavaScriptActionPane() {
-				@Override
-				protected DBManipulationPane createDBManipulationPane() {
-					return new DBManipulationPane(ValueEditorPaneFactory.formEditors());
-				}
-
-				@Override
-				protected String title4PopupWindow() {
-					return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Callback_Function");
-				}
-				@Override
-				protected EmailPane initEmaiPane() {
-					return new FormEmailPane();
-				}
-				@Override
-				public boolean isForm() {
-					return  true;
-				}
-
-				protected String[] getDefaultArgs() {
-					return new String[0];
-				}
-
-			};
-		}
-
-		@Override
-		protected boolean supportCellAction() {
-			return false;
-		}
-	}
-
-	private String switchLang(String eventName)	{
-	    // 在 properties 文件中找到相应的 key 值
+    private XCreator creator;
+    private FormDesigner designer;
+
+    public EventPropertyTable(FormDesigner designer) {
+        super();
+        this.designer = designer;
+    }
+
+    @Override
+    public String getAddItemText() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Add_Event");
+    }
+
+    public static class WidgetEventListenerUpdatePane extends ListenerUpdatePane {
+
+        @Override
+        protected JavaScriptActionPane createJavaScriptActionPane() {
+            return new JavaScriptActionPane() {
+                @Override
+                protected DBManipulationPane createDBManipulationPane() {
+                    return new DBManipulationPane(ValueEditorPaneFactory.formEditors());
+                }
+
+                @Override
+                protected String title4PopupWindow() {
+                    return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Callback_Function");
+                }
+
+                @Override
+                protected EmailPane initEmaiPane() {
+                    return new FormEmailPane();
+                }
+
+                @Override
+                public boolean isForm() {
+                    return true;
+                }
+
+                protected String[] getDefaultArgs() {
+                    return new String[0];
+                }
+
+            };
+        }
+
+        @Override
+        protected boolean supportCellAction() {
+            return false;
+        }
+    }
+
+    private String switchLang(String eventName) {
+        // 在 properties 文件中找到相应的 key 值
         String localeKey = ReportEngineEventMapping.getLocaleName(eventName);
         return com.fr.design.i18n.Toolkit.i18nText(localeKey);
-	}
-
-	/**
-	 * 刷新
-	 */
-	public void refresh() {
-		int selectionSize = designer.getSelectionModel().getSelection().size();
-		if (selectionSize == 0 || selectionSize == 1) {
-			this.creator = selectionSize == 0 ? designer.getRootComponent() : designer.getSelectionModel()
-					.getSelection().getSelectedCreator();
-		} else {
-			this.creator = null;
-			((DefaultListModel) nameableList.getModel()).removeAllElements();
-			checkButtonEnabled();
-			return;
-		}
-		Widget widget = creator.toData();
-
-		refreshNameableCreator(EventCreator.createEventCreator(widget.supportedEvents(), WidgetEventListenerUpdatePane.class));
-
-		ArrayList<NameObject> nameObjectList = new ArrayList<>();
-		for (int i = 0, size = widget.getListenerSize(); i < size; i++) {
-			Listener listener = widget.getListener(i);
-			if (!listener.isDefault()) {
-				nameObjectList.add(i, new NameObject(switchLang(listener.getEventName()) + (i + 1), listener));
-			}
-		}
-		populate(nameObjectList.toArray(new NameObject[widget.getListenerSize()]));
-		checkButtonEnabled();
-		this.repaint();
-	}
-
-	/**
-	 * 更新控件事件
-	 * @param creator 控件
-	 */
-	public void updateWidgetListener(XCreator creator) {
-		(creator.toData()).clearListeners();
-		Nameable[] res = this.update();
-		for (int i = 0; i < res.length; i++) {
-			NameObject nameObject = (NameObject)res[i];
-			(creator.toData()).addListener((Listener) nameObject.getObject());
-		}
-
-		designer.fireTargetModified();
-		checkButtonEnabled();
-	}
-
-	@Override
-	protected String title4PopupWindow() {
-		return "Event";
-	}
-
-	@Override
-	public NameableCreator[] createNameableCreators() {
-		return new NameableCreator[]{
-				new EventCreator(Widget.EVENT_STATECHANGE, WidgetEventListenerUpdatePane.class)
-		};
-	}
-
-	@Override
-	public void saveSettings() {
-		if (isPopulating) {
-			return;
-		}
-		updateWidgetListener(creator);
-	}
+    }
+
+    /**
+     * 刷新
+     */
+    public void refresh() {
+        int selectionSize = designer.getSelectionModel().getSelection().size();
+        if (selectionSize == 0 || selectionSize == 1) {
+            this.creator = selectionSize == 0 ? designer.getRootComponent() : designer.getSelectionModel()
+                    .getSelection().getSelectedCreator();
+        } else {
+            this.creator = null;
+            ((DefaultListModel) nameableList.getModel()).removeAllElements();
+            checkButtonEnabled();
+            return;
+        }
+        Widget widget = creator.toData();
+
+        refreshNameableCreator(EventCreator.createEventCreator(widget.supportedEvents(), WidgetEventListenerUpdatePane.class));
+    }
+
+    public void populateNameObjects() {
+        Widget widget = creator.toData();
+
+        ArrayList<NameObject> nameObjectList = new ArrayList<>();
+        for (int i = 0, size = widget.getListenerSize(); i < size; i++) {
+            Listener listener = widget.getListener(i);
+            if (!listener.isDefault()) {
+                nameObjectList.add(i, new NameObject(switchLang(listener.getEventName()) + (i + 1), listener));
+            }
+        }
+        populate(nameObjectList.toArray(new NameObject[widget.getListenerSize()]));
+        checkButtonEnabled();
+        this.repaint();
+    }
+
+    /**
+     * 更新控件事件
+     *
+     * @param creator 控件
+     */
+    public void updateWidgetListener(XCreator creator) {
+        (creator.toData()).clearListeners();
+        Nameable[] res = this.update();
+        for (int i = 0; i < res.length; i++) {
+            NameObject nameObject = (NameObject) res[i];
+            (creator.toData()).addListener((Listener) nameObject.getObject());
+        }
+
+        designer.fireTargetModified();
+        checkButtonEnabled();
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return "Event";
+    }
+
+    @Override
+    public NameableCreator[] createNameableCreators() {
+        return new NameableCreator[]{
+                new EventCreator(Widget.EVENT_STATECHANGE, WidgetEventListenerUpdatePane.class)
+        };
+    }
+
+    @Override
+    public void saveSettings() {
+        if (isPopulating) {
+            return;
+        }
+        updateWidgetListener(creator);
+    }
 }

designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java

@@ -108,6 +108,7 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetProper
      */
     private void initTables() {
         formWidgetCardPane.populate();
+        eventTable.refresh();
 
         if (mobileExtraPropertyPanes != null) {
             for (MobileWidgetDefinePane extraPane : mobileExtraPropertyPanes) {
@@ -233,7 +234,7 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetProper
             public void tabChanged(int index) {
                 //切换的时候再populate
                 if (index == 1) {
-                    eventTable.refresh();
+                    eventTable.populateNameObjects();
                 } else if (index == 2) {
                     if (mobileExtraPropertyPanes != null) {
                         for (MobileWidgetDefinePane extraPane : mobileExtraPropertyPanes) {

designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java

@@ -129,7 +129,7 @@ public class ReportWebWidgetConstants {
             BaseUtils.readIcon("/com/fr/web/images/appendRow.png"), AppendColumnRow.class);
     public static final WidgetOption DELETECOLUMNROW = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Delete_Record"),
             BaseUtils.readIcon("/com/fr/web/images/deleteRow.png"), DeleteColumnRow.class);
-    public static final WidgetOption VERIFY = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Data_Verify"), BaseUtils.readIcon("/com/fr/web/images/verify.gif"),
+    public static final WidgetOption VERIFY = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Data_Verify"), BaseUtils.readIcon("/com/fr/web/images/verify.png"),
             Verify.class);
     public static final WidgetOption SUBMITFORCIBLY = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Submit_Forcibly"),
             BaseUtils.readIcon("/com/fr/web/images/save2.png"), SubmitForcibly.class);

designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java

@@ -166,8 +166,6 @@ public class DesignerActivator extends Activator {
         designerRegister();
 
         InformationCollector.getInstance().collectStartTime();
-
-        ExtraDesignClassManager.getInstance().getFeedback().didFeedback();
     }
 
     private static void preLoadPane() {

designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java

@@ -370,7 +370,7 @@ public class ImagePreLoader {
             "com/fr/web/images/scale.png",
             "com/fr/web/images/appendRow.png",
             "com/fr/web/images/deleteRow.png",
-            "com/fr/web/images/verify.gif",
+            "com/fr/web/images/verify.png",
             "com/fr/web/images/save2.png",
             "com/fr/design/images/m_file/export.png",
             "com/fr/web/images/showValue.png",