Merge remote-tracking branch 'origin/dev' into dev

designer_base/src/com/fr/design/formula/FormulaPane.java

@@ -22,6 +22,7 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.Inter;
 import com.fr.parser.FRLexer;
 import com.fr.parser.FRParser;
+import com.fr.stable.EncodeConstants;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.StringUtils;
 import com.fr.stable.script.Expression;
@@ -38,12 +39,14 @@ import java.awt.event.*;
 import java.io.*;
 import java.util.Locale;
 import java.util.Set;
+
 /**
  * 公式编辑面板
+ *
  * @editor zhou
  * @since 2012-3-29下午1:50:53
  */
-public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
+public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
 
     protected VariableTreeAndDescriptionArea variableTreeAndDescriptionArea;
     protected RSyntaxTextArea formulaTextArea;
@@ -63,7 +66,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
         initComponents();
     }
 
-    private void initFormulaTextAreaKeyListener(){
+    private void initFormulaTextAreaKeyListener() {
         formulaTextArea.addKeyListener(this);
         formulaTextArea.addKeyListener(new KeyAdapter() {
             public void keyReleased(KeyEvent e) {
@@ -72,7 +75,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
                 // 判断在中文输入状态是否还包含提示符 要删掉
                 //Tips:You_Can_Input_B1_To_Input_The_Data_Of_The_First_Row_Second_Column
                 String tip = "\n\n\n" + Inter.getLocText("FR-Designer_FormulaPane_Tips");
-                if(text.contains(tip)) {
+                if (text.contains(tip)) {
                     text = text.substring(0, text.indexOf(tip));
                     insertPosition = 0;
                     formulaTextArea.setText(text);
@@ -81,7 +84,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
         });
     }
 
-    private void initFormulaTextAreaMouseListener(){
+    private void initFormulaTextAreaMouseListener() {
         formulaTextArea.addMouseListener(new MouseAdapter() {
             @Override
             public void mousePressed(MouseEvent e) {
@@ -107,21 +110,23 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
         });
     }
 
-    private void initFormulaTextArea(){
+    private void initFormulaTextArea() {
         formulaTextArea = new RSyntaxTextArea();
         configFormulaArea();
         initFormulaTextAreaKeyListener();
         initFormulaTextAreaMouseListener();
     }
 
-    private void initKeyWordTextFieldKeyListener(){
+    private void initKeyWordTextFieldKeyListener() {
         keyWordTextField.addKeyListener(new KeyListener() {
             @Override
             public void keyTyped(KeyEvent e) {
             }
+
             @Override
             public void keyReleased(KeyEvent e) {
             }
+
             @Override
             public void keyPressed(KeyEvent e) {
                 if (e.getKeyCode() == KeyEvent.VK_ENTER) {
@@ -134,7 +139,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
         });
     }
 
-    private void initTipsPane(){
+    private void initTipsPane() {
         // tipsPane
         JPanel tipsPane = new JPanel(new BorderLayout(4, 4));
         this.add(tipsPane, BorderLayout.EAST);
@@ -259,6 +264,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
             this.formulaTextArea.setText(StringUtils.EMPTY);
         }
     }
+
     //hugh:为啥会是10呢？搞不懂~~~
     private static final int KEY_10 = 10;
     //上下左右
@@ -266,6 +272,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
     private static final int KEY_38 = 38;
     private static final int KEY_39 = 39;
     private static final int KEY_40 = 40;
+
     @Override
     public void keyReleased(KeyEvent e) {
         int key = e.getKeyCode();
@@ -562,7 +569,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
             this.initComponents();
         }
 
-        private void initFunctionTypeList(JPanel functionPane){
+        private void initFunctionTypeList(JPanel functionPane) {
             functionTypeList = new QuickList(functionTypeListModel);
             UIScrollPane functionTypeScrollPane = new UIScrollPane(functionTypeList);
             functionTypeScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
@@ -573,7 +580,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
             initTypeListSelectionListener();
         }
 
-        private void initTypeListCellRenderer(){
+        private void initTypeListCellRenderer() {
             functionTypeList.setCellRenderer(
                     new DefaultListCellRenderer() {
                         @Override
@@ -587,7 +594,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
                     });
         }
 
-        private void initTypeListSelectionListener(){
+        private void initTypeListSelectionListener() {
             functionTypeList.addListSelectionListener(new ListSelectionListener() {
                 public void valueChanged(ListSelectionEvent evt) {
                     Object selectedValue = ((JList) evt.getSource()).getSelectedValue();
@@ -608,7 +615,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
             });
         }
 
-        private void initGroupTypeModel(){
+        private void initGroupTypeModel() {
             functionTypeListModel.addElement(FunctionConstants.COMMON);
             for (int i = 0; i < FunctionConstants.EMBFUNCTIONS.length; i++) {
                 functionTypeListModel.addElement(FunctionConstants.EMBFUNCTIONS[i]);
@@ -621,7 +628,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
             FunctionConstants.addFunctionGroupFromPlugins(functionTypeListModel);
         }
 
-        private void initFunctionNameListCellRenderer(){
+        private void initFunctionNameListCellRenderer() {
             functionNameList.setCellRenderer(new DefaultListCellRenderer() {
 
                 @Override
@@ -635,7 +642,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
             });
         }
 
-        private void initFunctionNameListSelectionListener(){
+        private void initFunctionNameListSelectionListener() {
             functionNameList.addListSelectionListener(new ListSelectionListener() {
 
                 public void valueChanged(ListSelectionEvent evt) {
@@ -652,7 +659,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
             });
         }
 
-        private void initFunctionNameListMouseListener(){
+        private void initFunctionNameListMouseListener() {
             functionNameList.addMouseListener(new MouseAdapter() {
                 public void mouseClicked(MouseEvent evt) {
                     if (evt.getClickCount() >= 2) {
@@ -676,7 +683,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
             });
         }
 
-        private void initFunctionNameList(JPanel functionPane){
+        private void initFunctionNameList(JPanel functionPane) {
             functionNameList = new JList(new DefaultListModel());
             UIScrollPane functionNameScrollPane = new UIScrollPane(functionNameList);
             functionNameScrollPane.setPreferredSize(new Dimension(140, 200));
@@ -689,7 +696,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
             initFunctionNameListMouseListener();
         }
 
-        private void initDescriptionTextArea(){
+        private void initDescriptionTextArea() {
             // Description
             descriptionTextArea = new UITextArea(16, 27);
 
@@ -711,15 +718,15 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
 
         }
 
-        private StringBuilder getText(TextUserObject selectedValue,String path) throws IOException{
+        private StringBuilder getText(TextUserObject selectedValue, String path) throws IOException {
             Reader desReader;
             StringBuilder desBuf = new StringBuilder();
-    		InputStream desInputStream = BaseUtils.readResource(path+ ((TextUserObject) selectedValue).displayText+".txt");
+            InputStream desInputStream = BaseUtils.readResource(path + ((TextUserObject) selectedValue).displayText + ".txt");
             if (desInputStream == null) {
                 String description = "";
                 desReader = new StringReader(description);
             } else {
-                desReader = new InputStreamReader(desInputStream);
+                desReader = new InputStreamReader(desInputStream, EncodeConstants.ENCODING_UTF_8);
             }
             BufferedReader reader = new BufferedReader(desReader);
             String lineText;
@@ -734,7 +741,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
             return desBuf;
         }
 
-        private void initVariablesTreeSelectionListener(){
+        private void initVariablesTreeSelectionListener() {
             variablesTree.addTreeSelectionListener(new TreeSelectionListener() {
                 public void valueChanged(TreeSelectionEvent e) {
                     Object selectedValue = ((DefaultMutableTreeNode) variablesTree.getLastSelectedPathComponent()).getUserObject();
@@ -751,7 +758,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
                             path = "/com/fr/design/insert/formula/variable/en/";
                         }
                         if (selectedValue instanceof TextUserObject) {
-                        	desBuf = getText((TextUserObject)selectedValue,path);
+                            desBuf = getText((TextUserObject) selectedValue, path);
                         }
                     } catch (IOException exp) {
                         FRContext.getLogger().error(exp.getMessage(), exp);
@@ -762,7 +769,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
             });
         }
 
-        private void initVariablesTree(){
+        private void initVariablesTree() {
             // vairable.
             variablesTree = new JTree();
             UIScrollPane variablesTreePane = new UIScrollPane(variablesTree);

designer_base/src/com/fr/design/insert/formula/variable/cn/$$$.txt

@@ -1 +1 @@
-΅±Η°Φ΅
+当前值

designer_base/src/com/fr/design/insert/formula/variable/cn/$$page_number.txt

@@ -1 +1 @@
-当前的页数。
+当前的页数。

designer_base/src/com/fr/design/insert/formula/variable/cn/$$totalPage_number.txt

@@ -1 +1 @@
-总页数。
+总页数。

designer_base/src/com/fr/design/insert/formula/variable/cn/$fr_authority.txt

@@ -1 +1 @@
-使用权限时保存角色的参数
+使用权限时保存角色的参数

designer_base/src/com/fr/design/insert/formula/variable/cn/$fr_username.txt

@@ -1 +1 @@
-使用权限时保存用户名的参数
+使用权限时保存用户名的参数

designer_base/src/com/fr/design/insert/formula/variable/cn/$fr_userposition.txt

@@ -1,3 +1 @@
-使用权限时,$fr_userposition就是部门角色，
+使用权限时,$fr_userposition就是部门角色，格式如：{"jobTitle":"销售经理","departments":"销售"}，部门角色是以部门和职务组成的数组。
-格式如：{"departments":"销售","jobTitle":"销售经理"}，
-部门角色是以部门和职务组成的数组。

designer_base/src/com/fr/design/insert/formula/variable/cn/NOFILTER.txt

@@ -1 +1 @@
-NOFILTER是一个与任意值比较都为true的参数。
+NOFILTER是一个与任意值比较都为true的参数。

designer_base/src/com/fr/design/insert/formula/variable/cn/NULL.txt

@@ -1 +1 @@
-空值的参数。
+空值的参数。

designer_base/src/com/fr/design/insert/formula/variable/cn/contextPath.txt

@@ -1,3 +1 @@
-contextPath是指绝对路径的服务器别名，即虚拟目录.
+contextPath是指绝对路径的服务器别名，即虚拟目录.假如访问：http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt，contextPath是/WebReport
-假如访问：http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt，
-contextPath是/WebReport

designer_base/src/com/fr/design/insert/formula/variable/cn/curReport.txt

@@ -1 +1 @@
-当前报表。
+当前报表。

designer_base/src/com/fr/design/insert/formula/variable/cn/formletName.txt

@@ -1,3 +1 @@
-表单名字
+表单名字假如访问：http://localhost:8080/WebReport/ReportServer?formlet=Form1.frm，formName就是Form1.frm
-假如访问：http://localhost:8080/WebReport/ReportServer?formlet=Form1.frm，
-formName就是Form1.frm

designer_base/src/com/fr/design/insert/formula/variable/cn/fr_submitinfo.txt

@@ -1 +1 @@
-提交入库事件的返回信息。
fr_submitinfo.success记录成功与否
fr_submitinfo.failinfo简单记录出错信息
+提交入库事件的返回信息。fr_submitinfo.success记录成功与否fr_submitinfo.failinfo简单记录出错信息

designer_base/src/com/fr/design/insert/formula/variable/cn/reportName.txt

@@ -1,3 +1 @@
-报表名字
+报表名字假如访问：http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt，reportName就是WorkBook1.cpt
-假如访问：http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt，
-reportName就是WorkBook1.cpt

designer_base/src/com/fr/design/insert/formula/variable/cn/serverName.txt

@@ -1,3 +1 @@
-serverName，是指服务器地址或名称.
+serverName，是指服务器地址或名称.假如访问：http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt，serverName指的是：localhost，即访问机子的IP
-假如访问：http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt，
-serverName指的是：localhost，即访问机子的IP

designer_base/src/com/fr/design/insert/formula/variable/cn/serverPort.txt

@@ -1 +1 @@
-serverPort指的是访问的端口
+serverPort指的是访问的端口

designer_base/src/com/fr/design/insert/formula/variable/cn/serverSchema.txt

@@ -1,3 +1 @@
-serverSchema，是指协议名称.
+serverSchema，是指协议名称.假如访问：http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt，serverSchema指的是：http
-假如访问：http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt，
-serverSchema指的是：http

designer_base/src/com/fr/design/insert/formula/variable/cn/serverURL.txt

@@ -1,3 +1 @@
-serverURL是指访问服务的URL
+serverURL是指访问服务的URL假如访问：http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt，serverURL就是http://localhost:8080
-假如访问：http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt，
-serverURL就是http://localhost:8080

designer_base/src/com/fr/design/insert/formula/variable/cn/servletURL.txt

@@ -1,2 +1 @@
-假如访问：http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt，
+假如访问：http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt，servletURL指的是：/WebReport/ReportServer
-servletURL指的是：/WebReport/ReportServer

designer_base/src/com/fr/design/insert/formula/variable/cn/sessionID.txt

@@ -1,4 +1 @@
-SessionID属性是返回用户会话的标识。
+SessionID属性是返回用户会话的标识。在创建会话时，服务器会为每一个会话生成一个单独的标识，会话标识以长整形数据类型返回。SessionID等于本次会话ID的记录，SessionID 多数情况是用于WEB页面的统计。
-在创建会话时，服务器会为每一个会话生成一个单独的标识，
-会话标识以长整形数据类型返回。SessionID等于本次会话ID的记录，
-SessionID 多数情况是用于WEB页面的统计。

designer_base/src/com/fr/design/insert/formula/variable/en/contextPath.txt

@@ -1 +1 @@
-absolute path of the server
http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt£¬
contextPath is /WebReport
+absolute path of the serverhttp://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt，contextPath is /WebReport

designer_base/src/com/fr/design/insert/formula/variable/en/formletName.txt

@@ -1,3 +1 @@
-form name
+form namehttp://localhost:8080/WebReport/ReportServer?formlet=Form1.frm，formName is Form1.frm
-http://localhost:8080/WebReport/ReportServer?formlet=Form1.frm£¬
-formName is Form1.frm

designer_base/src/com/fr/design/insert/formula/variable/en/fr_submitinfo.txt

@@ -1 +1 @@
-callback status of form submit
contains fr_submitinfo.success and fr_submitinfo.failinfo
+callback status of form submitcontains fr_submitinfo.success and fr_submitinfo.failinfo

designer_base/src/com/fr/design/insert/formula/variable/en/reportName.txt

@@ -1,3 +1 @@
-report name
+report namehttp://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt，reportName is WorkBook1.cpt
-http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt£¬
-reportName is WorkBook1.cpt

designer_base/src/com/fr/design/insert/formula/variable/en/serverName.txt

@@ -1,3 +1 @@
-address or name of the server
+address or name of the serverhttp://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt，serverName means localhost
-http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt£¬
-serverName means localhost

designer_base/src/com/fr/design/insert/formula/variable/en/serverSchema.txt

@@ -1,3 +1 @@
-serverSchema
+serverSchemahttp://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt，serverSchema is http
-http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt£¬
-serverSchema is http

designer_base/src/com/fr/design/insert/formula/variable/en/serverURL.txt

@@ -1,3 +1 @@
-URL of the server
+URL of the serverhttp://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt，serverURL is http://localhost:8080
-http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt£¬
-serverURL is http://localhost:8080

designer_base/src/com/fr/design/insert/formula/variable/en/servletURL.txt

@@ -1,2 +1 @@
-http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt£¬
+http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt，servletURL is /WebReport/ReportServer
-servletURL is /WebReport/ReportServer

designer_form/src/com/fr/design/designer/creator/XChartEditor.java

@@ -85,6 +85,13 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
         return  new CRPropertyDescriptor[] {
                 new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter
                         .getLocText("Form-Widget_Name")),
+				new CRPropertyDescriptor("visible", this.data.getClass()).setI18NName(
+						Inter.getLocText("FR-Designer_Widget-Visible")).setPropertyChangeListener(new PropertyChangeAdapter() {
+
+					@Override
+					public void propertyChange() {
+						makeVisible(toData().isVisible());}
+				}),
                 new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
                         WLayoutBorderStyleEditor.class).setI18NName(
                         Inter.getLocText("Chart-Style_Name")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")

designer_form/src/com/fr/design/designer/creator/XCreator.java

@@ -379,6 +379,14 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 		toData().setWidgetName(name);
 	}
 
+	/**
+	 * 重置组件的可见性
+	 * @param visible 可见性
+	 */
+	public void resetVisible(boolean visible){
+		toData().setVisible(visible);
+	}
+
 	/**
 	 * 返回编辑的子组件，scale为其内部组件
 	 * @return 组件

designer_form/src/com/fr/design/designer/creator/XElementCase.java

@@ -83,6 +83,13 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 		CRPropertyDescriptor[] propertyTableEditor = new CRPropertyDescriptor[]{
 				new CRPropertyDescriptor("widgetName", this.data.getClass())
 						.setI18NName(Inter.getLocText("Form-Widget_Name")),
+				new CRPropertyDescriptor("visible", this.data.getClass()).setI18NName(
+						Inter.getLocText("FR-Designer_Widget-Visible")).setPropertyChangeListener(new PropertyChangeAdapter() {
+
+					@Override
+					public void propertyChange() {
+						makeVisible(toData().isVisible());}
+				}),
 				new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
 						WLayoutBorderStyleEditor.class).setI18NName(
 						Inter.getLocText("FR-Designer-Widget_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")

designer_form/src/com/fr/design/designer/creator/XWidgetCreator.java

@@ -146,6 +146,15 @@ public abstract class XWidgetCreator extends XCreator {
 		}
 	}
 
+	/**
+	 * 渲染Painter
+	 */
+	public void paint(Graphics g) {
+		//不可见时，按钮.4f透明
+		AlphaComposite composite = this.data.isVisible() ? (AlphaComposite)((Graphics2D)g).getComposite() : AlphaComposite.getInstance(AlphaComposite.SRC_OVER,HALF_OPACITY);
+		((Graphics2D)g).setComposite(composite);
+		super.paint(g);
+	}
 	/**
 	 * 重命名
 	 * 

designer_form/src/com/fr/design/gui/xtable/PropertyGroupModel.java

@@ -53,6 +53,9 @@ public class PropertyGroupModel extends AbstractPropertyGroupModel {
             if(ComparatorUtils.equals(FormConstants.NAME, properties[row].getName())){
                 creator.resetCreatorName(value.toString());
             }
+            if(ComparatorUtils.equals("visible", properties[row].getName())){
+                creator.resetVisible((boolean) value);
+            }
             properties[row].firePropertyChanged();
             return true;
         } catch (Exception e) {