Merge pull request #1579 in BA/design from ~MOMEAK/design9.0:feature/9.0 to feature/9.0

* commit '3b42e57812e2d810758847ee99e2f3c2935345ca':
  PMD 去掉abstract.
  pmd 把WidgetNameField搞成变量
  REPORT-6416 提供只获取模版参数的接口方法，designer-chart模块使用
  REPORT-6392 决策报表组件重名时数据错乱

designer/src/com/fr/design/mainframe/JWorkBook.java

@@ -967,6 +967,11 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
         return ps;
     }
 
+    @Override
+    public Parameter[] getJTemplateParameters() {
+        return this.parameterPane.getAllParameters();
+    }
+
     /**
      * 请求单元格区域的焦点
      */

designer_base/src/com/fr/design/locale/designer.properties

@@ -2167,3 +2167,5 @@ FR-Designer_Tab_Template_Four=Template Four
 FR-Designer_Tab_Template_Five=Template Five
 FR-Designer_Tab_Template_Six=Template Six
 FR-Designer_Tab_Display_Position=Display Position
+FR-Designer_Form_Widget_Rename_Failure=There are the same components, please set the other name
+FR-Designer_Joption_News=news

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -2165,4 +2165,6 @@ FR-Designer_Tab_Template_Three=Template Three
 FR-Designer_Tab_Template_Four=Template Four
 FR-Designer_Tab_Template_Five=Template Five
 FR-Designer_Tab_Template_Six=Template Six
-FR-Designer_Tab_Display_Position=Display Position
+FR-Designer_Tab_Display_Position=Display Position
+FR-Designer_Form_Widget_Rename_Failure=There are the same components, please set the other name
+FR-Designer_Joption_News=news

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -2167,3 +2167,5 @@ FR-Designer_Tab_Template_Four=
 FR-Designer_Tab_Template_Five=
 FR-Designer_Tab_Template_Six=
 FR-Designer_Tab_Display_Position=
+FR-Designer_Form_Widget_Rename_Failure=\u5B58\u5728\u30EA\u30CD\u30FC\u30E0\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u3001\u4ED6\u306E\u540D\u79F0\u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+FR-Designer_Joption_News=\u30CB\u30E5\u30FC\u30B9

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -2152,7 +2152,6 @@ FR-Designer_Format_JavaScript=Format Code
 FR-Designer_Tip_Content=
 FR-Designer_Chart_Empty_Data=
 FR-Designer-Vcs_tab_click=
-FR-Designer_Move_Up=
 FR-Designer_Move_Down=
 FR-Designer_Move_To_Top=
 FR-Designer_Move_To_Bottom=
@@ -2167,3 +2166,5 @@ FR-Designer_Tab_Template_Four=
 FR-Designer_Tab_Template_Five=
 FR-Designer_Tab_Template_Six=
 FR-Designer_Tab_Display_Position=
+FR-Designer_Form_Widget_Rename_Failure=\uC874\uC7AC \uB3D9\uBA85 \uAD6C\uC131 \uC694\uC18C \uC124\uC815 \uC880 \uB2E4\uB978 \uC774\uB984
+FR-Designer_Joption_News=\uC18C\uC2DD

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -2166,4 +2166,6 @@ FR-Designer_Tab_Template_Three=\u6A21\u677F\u4E09
 FR-Designer_Tab_Template_Four=\u6A21\u677F\u56DB
 FR-Designer_Tab_Template_Five=\u6A21\u677F\u4E94
 FR-Designer_Tab_Template_Six=\u6A21\u677F\u516D
-FR-Designer_Tab_Display_Position=\u663E\u793A\u4F4D\u7F6E
+FR-Designer_Tab_Display_Position=\u663E\u793A\u4F4D\u7F6E
+FR-Designer_Form_Widget_Rename_Failure=\u5B58\u5728\u91CD\u540D\u7EC4\u4EF6\uFF0C\u8BF7\u8BBE\u7F6E\u5176\u4ED6\u540D\u79F0
+FR-Designer_Joption_News=\u6D88\u606F

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -2166,3 +2166,5 @@ FR-Designer_Tab_Template_Four=\u6A21\u677F\u56DB
 FR-Designer_Tab_Template_Five=\u6A21\u677F\u4E94
 FR-Designer_Tab_Template_Six=\u6A21\u677F\u516D
 FR-Designer_Tab_Display_Position=\u986F\u793A\u4F4D\u7F6E
+FR-Designer_Form_Widget_Rename_Failure=\u5B58\u5728\u91CD\u540D\u7D44\u4EF6\uFF0C\u8ACB\u8A2D\u5B9A\u5176\u4ED6\u540D\u7A31
+FR-Designer_Joption_News=\u6D88\u606F

designer_base/src/com/fr/design/mainframe/JTemplate.java

@@ -989,10 +989,24 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
         return UIConstants.RUN_BIG_ICON;
     }
 
+    /**
+     * 获取所有参数
+     *
+     * @return
+     */
     public Parameter[] getParameters() {
         return new Parameter[0];
     }
 
+    /**
+     * 获取模板参数
+     *
+     * @return
+     */
+    public Parameter[] getJTemplateParameters() {
+        return new Parameter[0];
+    }
+
     /**
      * 请求表单焦点
      */

designer_base/src/com/fr/design/mainframe/widget/BasicPropertyPane.java

@@ -13,6 +13,10 @@ import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
 
 /**
  * Created by plough on 2017/8/7.
@@ -27,7 +31,32 @@ public class BasicPropertyPane extends BasicPane {
     protected void initContentPane() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         this.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-        widgetName = new UITextField();
+        widgetName = new UITextField() {
+            protected void initListener() {
+                if (shouldResponseChangeListener()) {
+                    addFocusListener(new FocusListener() {
+                        @Override
+                        public void focusGained(FocusEvent e) {
+
+                        }
+
+                        @Override
+                        public void focusLost(FocusEvent e) {
+                            attributeChange();
+                        }
+                    });
+                    addKeyListener(new KeyAdapter() {
+                        @Override
+                        public void keyPressed(KeyEvent e) {
+                            if (e.getKeyCode() == KeyEvent.VK_ENTER) {
+                                attributeChange();
+                            }
+                        }
+                    });
+                }
+            }
+        };
+
         widgetName.setGlobalName(Inter.getLocText("FR-Designer_Basic"));
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;

designer_form/src/com/fr/design/mainframe/JForm.java

@@ -1,6 +1,7 @@
 package com.fr.design.mainframe;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.Parameter;
 import com.fr.design.DesignState;
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.actions.file.WebPreviewUtils;
@@ -672,6 +673,11 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
         return UIConstants.RUN_BIG_ICON;
     }
 
+    @Override
+    public Parameter[] getJTemplateParameters() {
+        return this.getTarget().getTemplateParameters();
+    }
+
     @Override
     /**
      * 创建菜单项Preview

designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe.widget.ui;
 
+import com.fr.base.BaseUtils;
 import com.fr.design.data.DataCreatorUI;
 import com.fr.design.designer.beans.events.DesignerEvent;
 import com.fr.design.designer.creator.XCreator;
@@ -16,7 +17,9 @@ import com.fr.design.dialog.BasicScrollPane;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.widget.DataModify;
 import com.fr.design.widget.FormWidgetDefinePaneFactoryBase;
@@ -34,6 +37,7 @@ import com.fr.stable.StringUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
 
@@ -208,6 +212,12 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
         currentEditorDefinePane.setGlobalName(getGlobalName());
         Widget widget = currentEditorDefinePane.updateBean();
         if (ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_Basic")) && widgetPropertyPane != null) {
+            UITextField widgetNameField = widgetPropertyPane.getWidgetNameField();
+            if (designer.getTarget().isNameExist(widgetNameField.getText()) && !ComparatorUtils.equals(widgetNameField.getText(), widget.getWidgetName())) {
+                widgetNameField.setText(widget.getWidgetName());
+                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer_Form_Widget_Rename_Failure"), Inter.getLocText("FR-Designer_Joption_News"), JOptionPane.ERROR_MESSAGE, BaseUtils.readIcon("com/fr/design/form/images/joption_failure.png"));
+                return;
+            }
             widgetPropertyPane.update(widget);
             xCreator.resetCreatorName(widget.getWidgetName());
             xCreator.resetVisible(widget.isVisible());