Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~neil/design into release/10.0

designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java

@@ -17,6 +17,7 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.EncodeConstants;
+import com.fr.stable.StringUtils;
 
 import javax.swing.*;
 import java.awt.*;
@@ -36,8 +37,8 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
     private JDialog dialog;
     private UILabel uiLabel;
     // 编码转换.
-    private UIComboBox newCharSetComboBox;
+    private UIComboBox charSetComboBox;
-    private String oirginalCharSet = null;
+    private String originalCharSet = null;
 
     // Database pane
     public DatabaseConnectionPane() {
@@ -50,7 +51,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
         okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
         cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
         String[] defaultEncode = new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Encode_Auto")};
-        newCharSetComboBox = new UIComboBox(ArrayUtils.addAll(defaultEncode, EncodeConstants.ENCODING_ARRAY));
+        charSetComboBox = new UIComboBox(ArrayUtils.addAll(defaultEncode, EncodeConstants.ENCODING_ARRAY));
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         JPanel northPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
         this.add(northPane, BorderLayout.NORTH);
@@ -72,7 +73,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
                 new ModLineBorder(ModLineBorder.TOP),
                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Advanced")
         ));
-        chartSetPane.add(GUICoreUtils.createNamedPane(newCharSetComboBox, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_New_Charset") + ":"));
+        chartSetPane.add(GUICoreUtils.createNamedPane(charSetComboBox, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Charset") + ":"));
     }
 
     protected abstract JPanel mainPanel();
@@ -81,8 +82,12 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
 
     @Override
     public void populateBean(com.fr.data.impl.Connection ob) {
-        this.oirginalCharSet = ob.getOriginalCharsetName();
+        this.originalCharSet = ob.getOriginalCharsetName();
-        this.newCharSetComboBox.setSelectedItem(ob.getNewCharsetName());
+        if (StringUtils.isBlank(originalCharSet)) {
+            this.charSetComboBox.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Encode_Auto"));
+        } else {
+            this.charSetComboBox.setSelectedItem(ob.getOriginalCharsetName());
+        }
 
         populateSubDatabaseConnectionBean((E) ob);
     }
@@ -93,11 +98,14 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
     public com.fr.data.impl.Connection updateBean() {
         E ob = updateSubDatabaseConnectionBean();
 
-        ob.setOriginalCharsetName(this.oirginalCharSet);
+        ob.setOriginalCharsetName(this.originalCharSet);
-        if (this.newCharSetComboBox.getSelectedIndex() == 0) {
+        if (this.charSetComboBox.getSelectedIndex() == 0) {
             ob.setNewCharsetName(null);
+            ob.setOriginalCharsetName(null);
         } else {
-            ob.setNewCharsetName((String) this.newCharSetComboBox.getSelectedItem());
+            ob.setNewCharsetName(EncodeConstants.ENCODING_GBK);
+            ob.setOriginalCharsetName(((String) this.charSetComboBox.getSelectedItem()));
+
         }
 
         return ob;

designer-base/src/main/java/com/fr/design/data/datapane/connect/JNDIDefPane.java

@@ -125,7 +125,7 @@ public class JNDIDefPane extends JPanel {
 		}
 
 		// Properties.
-		Hashtable<String, String> contextHashtable = jndiDatabase.getContextHashtable();
+		Map<String, String> contextHashtable = jndiDatabase.getContextHashtable();
 		Object INITIAL_CONTEXT_FACTORY = contextHashtable.get(Context.INITIAL_CONTEXT_FACTORY);
 
 		this.JNDIFactoryComboBox.setSelectedItem(INITIAL_CONTEXT_FACTORY == null ? "" : INITIAL_CONTEXT_FACTORY);
@@ -148,7 +148,7 @@ public class JNDIDefPane extends JPanel {
 		populateContextAttributes(contextHashtable, this.APPLET_TF, Context.APPLET);
 	}
 
-	private void populateContextAttributes(Hashtable<String, String> properties, UITextField textField, String contextAttr) {
+	private void populateContextAttributes(Map<String, String> properties, UITextField textField, String contextAttr) {
 		String PROVIDER_URL = properties.get(contextAttr);
 		if (PROVIDER_URL != null) {
 			textField.setText(PROVIDER_URL);
@@ -160,7 +160,7 @@ public class JNDIDefPane extends JPanel {
 
 		jndiDatabase.setJNDIName(this.jndiNameTextField.getText());
 
-		Hashtable<String, String> contextHashtable = jndiDatabase.getContextHashtable();
+		Map<String, String> contextHashtable = jndiDatabase.getContextHashtable();
 
 		String factoryString = (String)this.JNDIFactoryComboBox.getEditor().getItem();
 		if (factoryString != null && factoryString.trim().length() > 0) {
@@ -186,7 +186,7 @@ public class JNDIDefPane extends JPanel {
 		return jndiDatabase;
 	}
 
-	private void updateContextAttributes(Hashtable<String, String> contextHashtable, UITextField textField, String contextAttr) {
+	private void updateContextAttributes(Map<String, String> contextHashtable, UITextField textField, String contextAttr) {
 		String tValue = textField.getText();
 		if (tValue != null && tValue.trim().length() > 0) {
 			contextHashtable.put(contextAttr, tValue);

designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java

@@ -206,8 +206,7 @@ public class MutilTempalteTabPane extends JComponent {
                             openedTemplate.remove(jTemplate);
                             closeFormat(jTemplate);
                             HistoryTemplateListCache.getInstance().closeSelectedReport(jTemplate);
-                            // release lock
+                            closeAndFreeLock(jTemplate);
-                            WorkContext.getCurrent().get(TplOperator.class).closeAndFreeFile(jTemplate.getPath());
                         }
                     }
                     JTemplate<?, ?> currentTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
@@ -221,7 +220,6 @@ public class MutilTempalteTabPane extends JComponent {
         if (openedTemplate.size() == 1) {
             closeOther.setEnabled(false);
         }
-
         return closeOther;
     }
 
@@ -698,11 +696,19 @@ public class MutilTempalteTabPane extends JComponent {
 
     private void closeTpl(@Nonnull JTemplate<?, ?> specifiedTemplate, @Nonnull String fileName) {
         HistoryTemplateListCache.getInstance().closeSelectedReport(specifiedTemplate);
-        // release lock
+        closeAndFreeLock(specifiedTemplate);
-        WorkContext.getCurrent().get(TplOperator.class).closeAndFreeFile(specifiedTemplate.getPath());
         activeTemplate(fileName);
     }
 
+    private void closeAndFreeLock(@Nonnull JTemplate<?, ?> template) {
+        FILE file = template.getEditingFILE();
+        // 只有是环境内的文件，才执行释放锁
+        if (file != null && file.isEnvFile()) {
+            // release lock
+            WorkContext.getCurrent().get(TplOperator.class).closeAndFreeFile(file.getPath());
+        }
+    }
+
     /**
      * 关闭模板
      *

designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

@@ -63,19 +63,19 @@ import java.util.Locale;
  */
 public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
 
-    protected VariableTreeAndDescriptionArea variableTreeAndDescriptionArea;
+    private VariableTreeAndDescriptionArea variableTreeAndDescriptionArea;
-    protected RSyntaxTextArea formulaTextArea;
+    private RSyntaxTextArea formulaTextArea;
-    protected UITextField keyWordTextField = new UITextField(18);
+    private UITextField keyWordTextField = new UITextField(18);
-    protected int currentPosition = 0;
+    private int currentPosition = 0;
-    protected int beginPosition = 0;
+    private int beginPosition = 0;
-    protected int insertPosition = 0;
+    private int insertPosition = 0;
-    protected JList tipsList;
+    private JList tipsList;
     protected DefaultListModel listModel = new DefaultListModel();
-    protected int ifHasBeenWriten = 0;
+    private int ifHasBeenWriten = 0;
-    protected DefaultListModel functionTypeListModel = new DefaultListModel();
+    private DefaultListModel functionTypeListModel = new DefaultListModel();
-    protected QuickList functionTypeList;
+    private QuickList functionTypeList;
-    protected DefaultListModel functionNameModel;
+    private DefaultListModel functionNameModel;
-    protected JList functionNameList;
+    private JList functionNameList;
 
     public FormulaPane() {
         initComponents();
@@ -184,6 +184,18 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
 
     protected void initComponents() {
         this.setLayout(new BorderLayout(4, 4));
+
+        initTextPane();
+        initTipsPane();
+        initVariableTreeAndDescriptionArea();
+    }
+
+    private void initVariableTreeAndDescriptionArea() {
+        variableTreeAndDescriptionArea = new VariableTreeAndDescriptionArea();
+        this.add(variableTreeAndDescriptionArea, BorderLayout.SOUTH);
+    }
+
+    private void initTextPane() {
         // text
         JPanel textPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         this.add(textPane, BorderLayout.CENTER);
@@ -199,7 +211,6 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         textPane.add(formulaTextAreaScrollPane, BorderLayout.CENTER);
         textPane.add(checkBoxandbuttonPane, BorderLayout.SOUTH);
 
-        initTipsPane();
 
         UIButton checkValidButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Check_Valid"));
         checkValidButton.addActionListener(checkValidActionListener);
@@ -209,8 +220,6 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         checkBoxandbuttonPane.add(checkBoxPane, BorderLayout.WEST);
         checkBoxandbuttonPane.add(checkValidButton, BorderLayout.EAST);
         extendCheckBoxPane(checkBoxPane);
-        variableTreeAndDescriptionArea = new VariableTreeAndDescriptionArea();
-        this.add(variableTreeAndDescriptionArea, BorderLayout.SOUTH);
     }
 
 
@@ -218,7 +227,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
 
     }
 
-    protected void configFormulaArea() {
+    private void configFormulaArea() {
         formulaTextArea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_FORMULA);
         formulaTextArea.setAnimateBracketMatching(true);
         formulaTextArea.setAntiAliasingEnabled(true);
@@ -313,7 +322,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         }
     }
 
-    protected void fixFunctionNameList() {
+    private void fixFunctionNameList() {
         if (tipsList.getSelectedValue() != null) {
             int signOfContinue = 1;
             int indexOfFunction = 0;
@@ -346,7 +355,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
 
     }
 
-    protected int getBeginPosition() {
+    private int getBeginPosition() {
         int i = currentPosition;
         String textArea = formulaTextArea.getText();
         for (; i > 0; i--) {
@@ -361,7 +370,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         return i;
     }
 
-    protected void firstStepToFindTips(int theBeginPosition) {
+    private void firstStepToFindTips(int theBeginPosition) {
         String textArea = formulaTextArea.getText();
 
         if (currentPosition > 0 && theBeginPosition < currentPosition) {
@@ -443,7 +452,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
     /**
      * Apply text.
      */
-    public void applyText(String text) {
+    private void applyText(String text) {
         if (text == null || text.length() <= 0) {
             return;
         }
@@ -541,7 +550,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
     }
 
     // check valid
-    protected ActionListener checkValidActionListener = new ActionListener() {
+    private ActionListener checkValidActionListener = new ActionListener() {
 
         public void actionPerformed(ActionEvent evt) {
             // Execute Formula default cell element.
@@ -579,7 +588,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         private JTree variablesTree;
         private UITextArea descriptionTextArea;
 
-        public VariableTreeAndDescriptionArea() {
+        VariableTreeAndDescriptionArea() {
             this.initComponents();
         }
 
@@ -802,13 +811,15 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
 
         private void initComponents() {
             this.setLayout(new BorderLayout(4, 4));
-            // Function
+            initVariablesTree();
+            initFunctionPane();
+        }
+
+        private void initFunctionPane() {
             JPanel functionPane = new JPanel(new BorderLayout(4, 4));
             this.add(functionPane, BorderLayout.WEST);
             initFunctionTypeList(functionPane);
             initFunctionNameList(functionPane);
-            initVariablesTree();
-            // 选择:
             functionTypeList.setSelectedIndex(0);
         }
 
@@ -959,7 +970,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         private Icon icon;
         private String[] subNodes = new String[0];
 
-        public TextFolderUserObject(String text, Icon icon, String[] subNodes) {
+        TextFolderUserObject(String text, Icon icon, String[] subNodes) {
             this.text = text;
             this.icon = icon;
             this.subNodes = subNodes;
@@ -986,11 +997,11 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
 
     public static class TextUserObject {
 
-        public TextUserObject(String text) {
+        TextUserObject(String text) {
             this(text, text);
         }
 
-        public TextUserObject(String text, String displayText) {
+        TextUserObject(String text, String displayText) {
             this.text = text;
             this.displayText = displayText;
         }
@@ -999,7 +1010,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
             return this.text;
         }
 
-        public String getDisplayText() {
+        String getDisplayText() {
             return this.displayText;
         }
 

designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java

@@ -13,6 +13,7 @@ import com.fr.function.SUM;
 import com.fr.function.TIME;
 import com.fr.general.ComparatorUtils;
 
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.ExtraClassManager;
 import com.fr.stable.EncodeConstants;
 import com.fr.stable.OperatingSystem;
@@ -34,13 +35,75 @@ import java.util.zip.ZipFile;
 
 import javax.swing.DefaultListModel;
 
-public abstract class FunctionConstants {
+public final class FunctionConstants {
+
+	public static FunctionGroup PLUGIN = getPluginFunctionGroup();
+	public static FunctionGroup CUSTOM = getCustomFunctionGroup();
+	static NameAndFunctionList COMMON = getCommonFunctionList();
+	static NameAndTypeAndFunctionList[] EMBFUNCTIONS = getEmbededFunctionListArray();
+	public static FunctionGroup ALL = getAllFunctionGroup();
+
+	static {
+		loadEmbededFunctions();
+	}
+
+	/**
+	 * Don't let anyone instantiate this class.
+	 */
+	private FunctionConstants() {}
+
+	private static void loadEmbededFunctions() {
+		String pkgName = "com.fr.function";
+		Class<Function> iface = Function.class;
+		ClassLoader classloader = iface.getClassLoader();
+		Enumeration<URL> urlEnumeration = null;
+		try {
+			urlEnumeration = classloader.getResources(pkgName.replace('.', '/'));
+		} catch (IOException e) {
+			FineLoggerFactory.getLogger().error(e.getMessage());
+			return;
+		}
+		while (urlEnumeration.hasMoreElements()) {
+			URL url = urlEnumeration.nextElement();
+			String classFilePath = url.getFile();
+
+			/*
+			 * alex:url.getFile获取的地址中,如果有空格或中文会被URLEncoder.encode处理
+			 * 会变成%20这种%打头的东西,但是new File的时候%20是无法解析成空格,所以在此需要做URLDecoder.decode处理
+			 */
+			try {
+				classFilePath = URLDecoder.decode(classFilePath, EncodeConstants.ENCODING_UTF_8);
+			} catch (UnsupportedEncodingException e1) {
+				FRContext.getLogger().error(e1.getMessage(), e1);
+			}
+			FRContext.getLogger().info("ClassFilePath:" + classFilePath);
+			/*
+			 * alex:如果是jar包中的class文件
+			 * file:/D:/opt/FineReport6.5/WebReport/WEB-INF/lib/fr-server-6.5.jar!/com/fr/rpt/script/function
+			 */
+			for (String fileName : findClassNamesUnderFilePath(classFilePath)) {
+				try {
+					Class<?> cls = Class.forName(pkgName + "." + fileName.substring(0, fileName.length() - 6));
+					if (StableUtils.classInstanceOf(cls, iface)) {
+						Function inst;
+						inst = (Function)cls.newInstance();
+						for (NameAndTypeAndFunctionList EMBFUNCTION : EMBFUNCTIONS) {
+							if (EMBFUNCTION.test(inst)) {
+								break;
+							}
+						}
+					}
+				} catch (ClassNotFoundException | InstantiationException | IllegalAccessException ignore) {
+				}
+			}
+		}
+	}
 
 	/**
 	 * 将函数分组插件中的函数添加到对应的列表中
 	 * @param listModel
 	 */
-	public static void addFunctionGroupFromPlugins(DefaultListModel listModel){
+	static void addFunctionGroupFromPlugins(DefaultListModel listModel){
 		//hugh:自定义函数分组
         Set<Mutable> containers = ExtraClassManager.getInstance().getArray(FunctionDefContainer.MARK_STRING);
         if(!containers.isEmpty()){
@@ -75,98 +138,6 @@ public abstract class FunctionConstants {
 	    };
 	}
 
-    public static FunctionGroup PLUGIN = new FunctionGroup() {
-        @Override
-        public String getGroupName() {
-            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Formula_Plugin");
-        }
-
-        @Override
-        public NameAndDescription[] getDescriptions() {
-            FunctionDef[] fs = ExtraClassManager.getInstance().getFunctionDef();
-            int count = fs.length;
-            FunctionDefNAD[] nads = new FunctionDefNAD[count];
-            for (int i = 0; i < count; i ++) {
-                nads[i] = new FunctionDefNAD(fs[i]);
-            }
-            return nads;
-        }
-    };
-
-	public static FunctionGroup CUSTOM = new FunctionGroup() {
-		@Override
-		public String getGroupName() {
-			return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Custom_Function");
-		}
-		
-		@Override
-		public NameAndDescription[] getDescriptions() {
-            FunctionConfig funtionManager = FunctionConfig.getInstance();
-			if (funtionManager != null) {
-				int functionDefCount = funtionManager.getFunctionDefCount();
-
-				FunctionDefNAD[] nads = new FunctionDefNAD[functionDefCount];
-				for (int i = 0; i < functionDefCount; i++) {
-					nads[i] = new FunctionDefNAD(funtionManager.getFunctionDef(i));
-				}
-				
-				return nads;
-			}
-			
-			return new NameAndDescription[0];
-		}
-	};
-	
-	public static NameAndFunctionList COMMON = new NameAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Most_Recently_Used"), new Function[] {
-		new SUM(), new COUNT(), new AVERAGE(), new CHAR(), new DATE(), new MAX(), new MIN(), new TIME(), new RANGE()
-	});
-	
-	public static NameAndTypeAndFunctionList[] EMBFUNCTIONS = new NameAndTypeAndFunctionList[] {
-		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Math_&_Trig"), Function.MATH),
-		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Text"), Function.TEXT),
-		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Date_&_Time"), Function.DATETIME),
-		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Logical"), Function.LOGIC),
-		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Array"), Function.ARRAY),
-		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Report"), Function.REPORT),
-		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Other"), Function.OTHER),
-		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_Type_Hierarchy"), Function.HA)
-	};
-	
-	public static FunctionGroup ALL = new FunctionGroup() {
-		@Override
-		public String getGroupName() {
-			return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_All");
-		}
-		
-		@Override
-		public NameAndDescription[] getDescriptions() {
-			List<NameAndDescription> all = new ArrayList<NameAndDescription>();
-			for (int i = 0; i < EMBFUNCTIONS.length; i++) {
-				all.addAll(Arrays.asList(EMBFUNCTIONS[i].getDescriptions()));
-			}
-            Collections.addAll(all, PLUGIN.getDescriptions());
-            Collections.addAll(all, CUSTOM.getDescriptions());
-            //hugh:自定义函数分组
-            Set<Mutable> containers = ExtraClassManager.getInstance().getArray(FunctionDefContainer.MARK_STRING);
-            if(!containers.isEmpty()){
-            	for(Mutable container : containers){
-            		Collections.addAll(all,createFunctionGroup(((FunctionDefContainer)container)).getDescriptions());
-            	}
-            }
-			java.util.Collections.sort(all, NameAndDescriptionComparator);
-			
-			return all.toArray(new NameAndDescription[all.size()]);
-		}
-	};
-
-
-	
-	private static Comparator<NameAndDescription> NameAndDescriptionComparator = new Comparator<NameAndDescription>() {
-		@Override
-		public int compare(NameAndDescription o1, NameAndDescription o2) {
-			return ComparatorUtils.compare(o1.getName(), o2.getName());
-		}
-	};
 	
 	private static String[] findClassNamesUnderFilePath(String filePath) {
 		java.util.List<String> classNameList = new ArrayList<String>();
@@ -174,7 +145,7 @@ public abstract class FunctionConstants {
 		 * alex:如果是jar包中的class文件
 		 * file:/D:/opt/FineReport6.5/WebReport/WEB-INF/lib/fr-server-6.5.jar!/com/fr/rpt/script/function
 		 */
-		if (filePath.indexOf("!/") >= 0) {
+		if (filePath.contains("!/")) {
 			String[] arr = filePath.split("!/");
 			String jarPath = arr[0].substring(6); // alex:substring(6)去掉前面的file:/这六个字符
 			String classPath = arr[1];
@@ -197,7 +168,7 @@ public abstract class FunctionConstants {
 					}
 					
 					String entryName = entry.getName();
-					if (entryName.indexOf(classPath) < 0 || !entryName.endsWith(".class")) {
+					if (!entryName.contains(classPath) || !entryName.endsWith(".class")) {
 						continue;
 					}
 					
@@ -208,57 +179,117 @@ public abstract class FunctionConstants {
 			}
 		} else {
 			File dir = new File(filePath);
-			
+			File[] files = dir.listFiles();
-			for (File f : dir.listFiles()) {
+			if (files != null) {
-				String fileName = f.getName();
+				for (File f : files) {
-				if (fileName.endsWith(".class")) {
+					String fileName = f.getName();
-					classNameList.add(fileName);
+					if (fileName.endsWith(".class")) {
+						classNameList.add(fileName);
+					}
 				}
 			}
 		}
 		
-		return classNameList.toArray(new String[classNameList.size()]);
+		return classNameList.toArray(new String[0]);
 	}
 
-	// alex:读取com.fr.script.function包下面所有的Function类
+	private static FunctionGroup getPluginFunctionGroup() {
-	static {
+		return new FunctionGroup() {
-		String pkgName = "com.fr.function";
+			@Override
-		Class<Function> iface = Function.class;
+			public String getGroupName() {
-		ClassLoader classloader = iface.getClassLoader();
+				return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Formula_Plugin");
-		URL url = classloader.getResource(pkgName.replace('.', '/'));
+			}
-		String classFilePath = url.getFile();
 
-		/*
+			@Override
-		 * alex:url.getFile获取的地址中,如果有空格或中文会被URLEncoder.encode处理
+			public NameAndDescription[] getDescriptions() {
-		 * 会变成%20这种%打头的东西,但是new File的时候%20是无法解析成空格,所以在此需要做URLDecoder.decode处理
+				FunctionDef[] fs = ExtraClassManager.getInstance().getFunctionDef();
-		 */
+				int count = fs.length;
-		try {
+				FunctionDefNAD[] nads = new FunctionDefNAD[count];
-			classFilePath = URLDecoder.decode(classFilePath, EncodeConstants.ENCODING_UTF_8);
+				for (int i = 0; i < count; i ++) {
-		} catch (UnsupportedEncodingException e1) {
+					nads[i] = new FunctionDefNAD(fs[i]);
-			FRContext.getLogger().error(e1.getMessage(), e1);
+				}
-		}
+				return nads;
-		FRContext.getLogger().info("ClassFilePath:" + classFilePath);
+			}
-		/*
+		};
-		 * alex:如果是jar包中的class文件
+	}
-		 * file:/D:/opt/FineReport6.5/WebReport/WEB-INF/lib/fr-server-6.5.jar!/com/fr/rpt/script/function
+
-		 */
+	private static FunctionGroup getCustomFunctionGroup() {
-		for (String fileName : findClassNamesUnderFilePath(classFilePath)) {
+		return new FunctionGroup() {
-			try {
+			@Override
-				Class<?> cls = Class.forName(pkgName + "." + fileName.substring(0, fileName.length() - 6));
+			public String getGroupName() {
-				if (StableUtils.classInstanceOf(cls, iface)) {
+				return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Custom_Function");
-					Function inst;
+			}
-					inst = (Function)cls.newInstance();
+
-					for (int fi = 0; fi < EMBFUNCTIONS.length; fi++) {
+			@Override
-						if (EMBFUNCTIONS[fi].test(inst)) {
+			public NameAndDescription[] getDescriptions() {
-							break;
+				FunctionConfig funtionManager = FunctionConfig.getInstance();
-						}
+				if (funtionManager != null) {
+					int functionDefCount = funtionManager.getFunctionDefCount();
+
+					FunctionDefNAD[] nads = new FunctionDefNAD[functionDefCount];
+					for (int i = 0; i < functionDefCount; i++) {
+						nads[i] = new FunctionDefNAD(funtionManager.getFunctionDef(i));
 					}
 
+					return nads;
 				}
-			} catch (ClassNotFoundException e) {
+
-			} catch (InstantiationException e) {
+				return new NameAndDescription[0];
-			} catch (IllegalAccessException e) {
 			}
-		}
+		};
+	}
+
+	private static NameAndFunctionList getCommonFunctionList() {
+		return new NameAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Most_Recently_Used"), new Function[] {
+				new SUM(), new COUNT(), new AVERAGE(), new CHAR(), new DATE(), new MAX(), new MIN(), new TIME(), new RANGE()
+		});
+	}
+
+	private static NameAndTypeAndFunctionList[] getEmbededFunctionListArray() {
+		return new NameAndTypeAndFunctionList[] {
+				new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Math_&_Trig"), Function.MATH),
+				new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Text"), Function.TEXT),
+				new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Date_&_Time"), Function.DATETIME),
+				new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Logical"), Function.LOGIC),
+				new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Array"), Function.ARRAY),
+				new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Report"), Function.REPORT),
+				new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Other"), Function.OTHER),
+				new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_Type_Hierarchy"), Function.HA)
+		};
+	}
+
+	private static FunctionGroup getAllFunctionGroup() {
+		return new FunctionGroup() {
+			@Override
+			public String getGroupName() {
+				return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_All");
+			}
+
+			@Override
+			public NameAndDescription[] getDescriptions() {
+				List<NameAndDescription> all = new ArrayList<NameAndDescription>();
+				for (int i = 0; i < EMBFUNCTIONS.length; i++) {
+					all.addAll(Arrays.asList(EMBFUNCTIONS[i].getDescriptions()));
+				}
+				Collections.addAll(all, PLUGIN.getDescriptions());
+				Collections.addAll(all, CUSTOM.getDescriptions());
+				//hugh:自定义函数分组
+				Set<Mutable> containers = ExtraClassManager.getInstance().getArray(FunctionDefContainer.MARK_STRING);
+				if(!containers.isEmpty()){
+					for(Mutable container : containers){
+						Collections.addAll(all,createFunctionGroup(((FunctionDefContainer)container)).getDescriptions());
+					}
+				}
+
+				Collections.sort(all, new Comparator<NameAndDescription>() {
+					@Override
+					public int compare(NameAndDescription o1, NameAndDescription o2) {
+						return ComparatorUtils.compare(o1.getName(), o2.getName());
+					}
+				});
+
+				return all.toArray(new NameAndDescription[0]);
+			}
+		};
 	}
 }

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

@@ -0,0 +1,55 @@
+package com.fr.design.fun;
+
+import com.fr.design.actions.UpdateAction;
+import com.fr.design.designer.TargetComponent;
+import com.fr.design.gui.imenu.UIPopupMenu;
+import com.fr.design.mainframe.BaseFormDesigner;
+import com.fr.design.selection.SelectableElement;
+import com.fr.stable.fun.mark.Mutable;
+
+import java.util.List;
+
+/**
+ * 设计器右键菜单接口
+ */
+public interface RightSelectionHandlerProvider extends Mutable {
+
+    int CURRENT_LEVEL = 1;
+
+    String XML_TAG = "RightSelectionHandlerProvider";
+
+
+    /**
+     * 对单元格或者悬浮元素的右键菜单项进行增删改
+     *
+     * @param ePane     选择的元素
+     * @param popupMenu 右键主菜单
+     */
+    void dmlMenu(TargetComponent ePane, UIPopupMenu popupMenu);
+
+
+    /**
+     * 当前实现是否可以作用于当前元素
+     *
+     * @param selectableElement 当前选中元素分为CellSelection和FloatSelection(单元格和悬浮元素)
+     * @return
+     */
+    boolean accept(SelectableElement selectableElement);
+
+
+    /**
+     * 对表单,参数面板内置的右键选项进行增删改处理
+     *
+     * @param actions 默认的action集合  注意:主体代码要求这边的action必须是UndoableAction 的子类而非updateAction
+     */
+    void dmlUpdateActions(BaseFormDesigner formDesigner, List<UpdateAction> actions);
+
+    /**
+     * 当前实现是否可以作用于当前元素
+     *
+     * @param formDesigner 当前选中元素分为表单编辑器和参数面板(表单组件元素以及各种控件)
+     * @return
+     */
+    boolean accept(BaseFormDesigner formDesigner);
+
+}

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

@@ -0,0 +1,45 @@
+package com.fr.design.fun.impl;
+
+import com.fr.design.actions.UpdateAction;
+import com.fr.design.designer.TargetComponent;
+import com.fr.design.fun.RightSelectionHandlerProvider;
+import com.fr.design.gui.imenu.UIPopupMenu;
+import com.fr.design.mainframe.BaseFormDesigner;
+import com.fr.design.selection.SelectableElement;
+import com.fr.stable.fun.impl.AbstractProvider;
+import com.fr.stable.fun.mark.API;
+
+import java.util.List;
+
+@API(level = RightSelectionHandlerProvider.CURRENT_LEVEL)
+public abstract class AbstractRightSelectionHandlerProvider extends AbstractProvider implements RightSelectionHandlerProvider {
+    @Override
+    public int currentAPILevel() {
+        return CURRENT_LEVEL;
+    }
+
+    @Override
+    public String mark4Provider() {
+        return getClass().getName();
+    }
+
+    @Override
+    public void dmlUpdateActions(BaseFormDesigner formDesigner, List<UpdateAction> actions) {
+
+    }
+
+    @Override
+    public boolean accept(BaseFormDesigner formDesigner) {
+        return false;
+    }
+
+    @Override
+    public void dmlMenu(TargetComponent ePane, UIPopupMenu popupMenu) {
+
+    }
+
+    @Override
+    public boolean accept(SelectableElement selectableElement) {
+        return false;
+    }
+}

designer-base/src/main/java/com/fr/design/gui/imenu/UIBasicMenuItemUI.java

@@ -667,18 +667,10 @@ public class UIBasicMenuItemUI extends MenuItemUI {
     }
 
     private void installFont(final String prefix, final JComponent menuItem) {
-        Thread thread = new Thread(new Runnable() {
+        if (menuItem == null) {
-            @Override
+            return;
-            public void run() {
+        }
-                if (menuItem == null) {
+        LookAndFeel.installColorsAndFont(menuItem, prefix + ".background", prefix + ".foreground", prefix + ".font");
-                    return;
-                }
-                LookAndFeel.installColorsAndFont(menuItem, prefix + ".background", prefix + ".foreground", prefix + ".font");
-            }
-        });
-        thread.setName("UIBasicMenuItemUI");
-        thread.setDaemon(true);
-        thread.start();
     }
 
     protected Dimension getPreferredMenuItemSize(JComponent c, Icon checkIcon,

designer-base/src/main/java/com/fr/design/gui/itree/filetree/EnvFileTree.java

@@ -69,10 +69,8 @@ public class EnvFileTree extends RefreshableJTree {
                     if (treeNode.hasFullAuthority()) {
                         if (lock != null && !node.getUserID().equals(lock)) {
                             name = name + Toolkit.i18nText("Fine-Design_Basic_Template_Status_Locked", "(", ")");
-                            this.setIcon(FileTreeIcon.getIcon(node));
-                        } else {
-                            this.setIcon(FileTreeIcon.getIcon(node, false));
                         }
+                        this.setIcon(FileTreeIcon.getIcon(node));
                     } else {
                         this.setIcon(FileTreeIcon.getFolderHalfImageIcon());
                     }

designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java

@@ -3,6 +3,7 @@ package com.fr.design.gui.itree.filetree;
 import com.fr.base.BaseUtils;
 import com.fr.design.icon.LockIcon;
 import com.fr.file.filetree.FileNode;
+import com.fr.general.ComparatorUtils;
 import com.fr.stable.StableUtils;
 import com.fr.workspace.WorkContext;
 
@@ -125,8 +126,16 @@ public class FileTreeIcon {
         return FOLDER_HALF_IMAGE_ICON;
     }
 
+    /**
+     * 获取文件节点对应的图标
+     *
+     * @param node 文件节点
+     * @return 文件节点的图标
+     */
     public static Icon getIcon(FileNode node) {
-        return getIcon(node, node.getLock() != null);
+        // 如果文件节点锁不为空且不是当前用户锁定的该模板，那么模板ICON 提示用户当前文件节点被锁
+        boolean showLock = node.getLock() != null && !ComparatorUtils.equals(node.getUserID(), node.getLock());
+        return getIcon(node, showLock);
     }
 
     public static Icon getIcon(FileNode node, boolean isShowLock) {

designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@@ -32,6 +32,7 @@ import com.fr.design.gui.frpane.HyperlinkGroupPaneActionProvider;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.gui.itree.filetree.TemplateFileTree;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.templateinfo.TemplateInfoCollector;
 import com.fr.design.mainframe.templateinfo.TemplateProcessInfo;
@@ -56,6 +57,8 @@ import com.fr.stable.ArrayUtils;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.StringUtils;
 import com.fr.stable.core.UUID;
+import com.fr.workspace.WorkContext;
+import com.fr.workspace.server.lock.TplOperator;
 
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
@@ -419,7 +422,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         fireSuperTargetModified();
     }
 
-    protected boolean accept(Object o) {
+    public boolean accept(Object o) {
         return true;
     }
 
@@ -587,6 +590,8 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         if (isCancelOperation(chooseResult)) {
             return false;
         }
+        // 源文件
+        FILE sourceFile = editingFILE;
 
         if (isOkOperation(chooseResult)) {
             boolean access = false;
@@ -596,13 +601,33 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
             if (!access) {
-                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Message"), JOptionPane.WARNING_MESSAGE);
+                JOptionPane.showMessageDialog(
+                        DesignerContext.getDesignerFrame(),
+                        Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!",
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Message"),
+                        JOptionPane.WARNING_MESSAGE);
                 return false;
             }
+            // 目标文件
             editingFILE = fileChooser.getSelectedFILE();
         }
 
-        return saveNewFile(editingFILE, oldName);
+        boolean lockedTarget = WorkContext.getCurrent().get(TplOperator.class).saveAs(editingFILE.getPath());
+        if (lockedTarget) {
+            boolean saved = saveNewFile(editingFILE, oldName);
+            // 目标文件保存成功并且源文件不一致的情况下，把源文件锁释放掉
+            if (saved && !ComparatorUtils.equals(editingFILE.getPath(), sourceFile.getPath())) {
+                WorkContext.getCurrent().get(TplOperator.class).closeAndFreeFile(sourceFile.getPath());
+            }
+            return saved;
+        } else {
+            JOptionPane.showMessageDialog(
+                    DesignerContext.getDesignerFrame(),
+                    Toolkit.i18nText("Fine-Design_Basic_Template_Status_Locked"),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Message"),
+                    JOptionPane.WARNING_MESSAGE);
+            return false;
+        }
     }
 
     protected boolean saveNewFile(FILE editingFILE, String oldName) {

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DefaultMobileStyleDefinePane.java

@@ -12,6 +12,7 @@ import java.awt.Dimension;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.RenderingHints;
 
 public class DefaultMobileStyleDefinePane extends MobileTemplateStyleDefinePane {
 
@@ -84,7 +85,8 @@ public class DefaultMobileStyleDefinePane extends MobileTemplateStyleDefinePane
             int panelWidth = dimension.width;
             int panelHeight = dimension.height;
             Graphics2D g2d = (Graphics2D) g.create();
-            FRFont frFont = DefaultMobileTemplateStyle.DEFAULT_TAB_FONT.getFont();
+            g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+            FRFont frFont = this.getTabFontConfig().getFont();
             FontMetrics fm = GraphHelper.getFontMetrics(frFont);
             WCardTagLayout cardTagLayout = DefaultMobileStyleDefinePane.this.getTagLayout();
             int eachWidth = panelWidth / cardTagLayout.getWidgetCount();

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DownMenuStyleDefinePane.java

@@ -27,6 +27,7 @@ import java.awt.FlowLayout;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.RenderingHints;
 import java.awt.Stroke;
 import java.util.ArrayList;
 
@@ -151,6 +152,7 @@ public class DownMenuStyleDefinePane extends StyleDefinePaneWithSelectConf {
             int panelWidth = dimension.width;
             int panelHeight = dimension.height;
             Graphics2D g2d = (Graphics2D) g.create();
+            g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
             FRFont frFont = this.getTabFontConfig().getFont();
             FontMetrics fm = GraphHelper.getFontMetrics(frFont);
             WCardTagLayout cardTagLayout = DownMenuStyleDefinePane.this.getTagLayout();

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java

@@ -208,8 +208,10 @@ public abstract class MobileTemplateStyleDefinePane extends BasicBeanPane<Mobile
         MobileTemplateStyle ob = updateSubStyle();
         ob.setCustom(custom.getSelectedIndex() == 1);
         ob.setInitialColor(initialColorBox.getSelectObject());
-        TabFontConfig config = ob.getTabFontConfig();
+        TabFontConfig config = new TabFontConfig();
+        config.setSelectColor(ob.getTabFontConfig().getSelectColor());
         config.setFont(fontConfPane.update());
+        ob.setTabFontConfig(config);
         return ob;
     }
 

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SliderStyleDefinePane.java

@@ -24,6 +24,7 @@ import java.awt.FlowLayout;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.RenderingHints;
 
 public class SliderStyleDefinePane extends MobileTemplateStyleDefinePane {
     private NewColorSelectBox initDotColor;
@@ -131,6 +132,7 @@ public class SliderStyleDefinePane extends MobileTemplateStyleDefinePane {
             Dimension dimension = this.getSize();
             int panelHeight = dimension.height;
             Graphics2D g2d = (Graphics2D) g.create();
+            g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
             FRFont frFont = this.getTabFontConfig().getFont();
             g2d.setFont(frFont);
             g2d.setColor(frFont.getForeground());

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/StyleDefinePaneWithSelectConf.java

@@ -10,6 +10,7 @@ import com.fr.design.mainframe.widget.MobileTabFontConfPane;
 import com.fr.design.style.color.NewColorSelectBox;
 import com.fr.form.ui.container.cardlayout.WCardTagLayout;
 import com.fr.general.cardtag.mobile.MobileTemplateStyle;
+import com.fr.general.cardtag.mobile.TabFontConfig;
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.event.ChangeEvent;
@@ -97,7 +98,10 @@ public abstract class StyleDefinePaneWithSelectConf extends MobileTemplateStyleD
     public MobileTemplateStyle updateSubStyle() {
         MobileTemplateStyle mobileTemplateStyle = updateStyleWithSelectConf();
         mobileTemplateStyle.setSelectColor(selectColorBox.getSelectObject());
-        mobileTemplateStyle.getTabFontConfig().setSelectColor(selectFontColor.getColor());
+        TabFontConfig config = new TabFontConfig();
+        config.setFont(mobileTemplateStyle.getTabFontConfig().getFont());
+        config.setSelectColor(selectFontColor.getColor());
+        mobileTemplateStyle.setTabFontConfig(config);
         return mobileTemplateStyle;
     }
 

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/UpMenuStyleDefinePane.java

@@ -27,6 +27,7 @@ import java.awt.Dimension;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.RenderingHints;
 import java.awt.Stroke;
 
 public class UpMenuStyleDefinePane extends StyleDefinePaneWithSelectConf {
@@ -171,7 +172,8 @@ public class UpMenuStyleDefinePane extends StyleDefinePaneWithSelectConf {
             int panelWidth = dimension.width;
             int panelHeight = dimension.height;
             Graphics2D g2d = (Graphics2D) g.create();
-            FRFont frFont = UpMenuStyleDefinePane.this.fontConfPane.update();
+            g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+            FRFont frFont = this.getTabFontConfig().getFont();
             FontMetrics fm = GraphHelper.getFontMetrics(frFont);
             WCardTagLayout cardTagLayout = UpMenuStyleDefinePane.this.getTagLayout();
             int eachWidth = panelWidth / cardTagLayout.getWidgetCount();

designer-base/src/test/java/com/fr/design/formula/FunctionConstantsTest.java

@@ -0,0 +1,40 @@
+package com.fr.design.formula;
+
+import org.junit.Test;
+
+import static junit.framework.Assert.fail;
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertTrue;
+
+/**
+ * Created by plough on 2018/12/7.
+ */
+public class FunctionConstantsTest {
+    @Test
+    public void testNewInstanceFail() throws Exception {
+        try {
+            FunctionConstants.class.newInstance();
+            fail("Not allowed to instantiate FunctionConstants!");
+        } catch (IllegalAccessException e) {
+            assertTrue(true);
+        }
+    }
+
+    @Test
+    public void testEmbedFuntionsAfterStaticInit() {
+        NameAndTypeAndFunctionList[] embFunctionLists = FunctionConstants.EMBFUNCTIONS;
+        // 一共有 8 个分类
+        assertEquals(8, embFunctionLists.length);
+        for (NameAndTypeAndFunctionList embFunctionsList : embFunctionLists) {
+            // 每个分类下都有函数
+            NameAndDescription[] nameAndDescriptions = embFunctionsList.getDescriptions();
+            assertTrue(nameAndDescriptions.length > 0);
+        }
+    }
+
+    @Test
+    public void testCommonFuntionsAfterStaticInit() {
+        NameAndFunctionList commonFunctionList = FunctionConstants.COMMON;
+        assertEquals(9, commonFunctionList.getDescriptions().length);
+    }
+}

designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java

@@ -11,6 +11,7 @@ import java.awt.Image;
 import java.awt.Insets;
 import java.awt.Rectangle;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.swing.BorderFactory;
@@ -324,10 +325,11 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
      */
     public UpdateAction[] getActions() {
         if (designerActions == null) {
-            designerActions = new UpdateAction[]{new CutAction(this), new CopyAction(this), new PasteAction(this),
+            designerActions = new ArrayList<UpdateAction>(Arrays.asList(new UpdateAction[]{new CutAction(this), new CopyAction(this), new PasteAction(this),
-                    new FormDeleteAction(this)};
+                    new FormDeleteAction(this)}));
+            dmlActions(designerActions);
         }
-        return designerActions;
+        return designerActions.toArray(new UpdateAction[designerActions.size()]);
     }
 
     private boolean searchQueryCreators(XLayoutContainer rootContainer) {

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

@@ -1,9 +1,11 @@
 package com.fr.design.mainframe;
 
+import com.fr.base.FRContext;
 import com.fr.base.Parameter;
 import com.fr.base.ScreenResolution;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignState;
+import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.designer.TargetComponent;
@@ -39,6 +41,7 @@ import com.fr.design.designer.properties.FormWidgetAuthorityEditPane;
 import com.fr.design.event.DesignerOpenedListener;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.form.util.XCreatorConstants;
+import com.fr.design.fun.RightSelectionHandlerProvider;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
 import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.ShortCut;
@@ -89,6 +92,7 @@ import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 设计界面组件。该组件是界面设计工具的核心，主要负责的是被设计界面的显示，界面设计操作状态的 显示，编辑状态的显示等等。
@@ -132,7 +136,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
     private int resolution = ScreenResolution.getScreenResolution();
     // 编辑状态的事件表
     private CreatorEventListenerTable edit;
-    protected UpdateAction[] designerActions;
+    protected List<UpdateAction> designerActions;
     private FormDesignerModeForSpecial<?> desigerMode;
     private Action switchAction;
     private FormElementCaseContainerProvider elementCaseContainer;
@@ -1180,11 +1184,28 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
      */
     public UpdateAction[] getActions() {
         if (designerActions == null) {
-            designerActions = new UpdateAction[]{new CutAction(this), new CopyAction(this), new PasteAction(this),
+            designerActions = new ArrayList<UpdateAction>(Arrays.asList(new UpdateAction[]{new CutAction(this), new CopyAction(this), new PasteAction(this),
                     new FormDeleteAction(this), new MoveToTopAction(this), new MoveToBottomAction(this),
-                    new MoveUpAction(this), new MoveDownAction(this)};
+                    new MoveUpAction(this), new MoveDownAction(this)}));
+            dmlActions(designerActions);
+        }
+        return designerActions.toArray(new UpdateAction[designerActions.size()]);
+    }
+    /**
+     * 扩展菜单项
+     * @param actions
+     */
+    public void dmlActions(List<UpdateAction> actions) {
+        try {
+            Set<RightSelectionHandlerProvider> selectionHandlerProviders = ExtraDesignClassManager.getInstance().getArray(RightSelectionHandlerProvider.XML_TAG);
+            for (RightSelectionHandlerProvider handler : selectionHandlerProviders) {
+                if (handler.accept(this)) {
+                    handler.dmlUpdateActions(this,actions);
+                }
+            }
+        } catch (Exception e) {
+            FRContext.getLogger().error(e.getMessage(), e);
         }
-        return designerActions;
     }
 
     // 当前选中控件可以上移一层吗？

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

@@ -160,7 +160,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
     }
 
     @Override
-    protected boolean accept(Object o) {
+    public boolean accept(Object o) {
         return !(o instanceof FloatElementsProvider);
     }
 

designer-realize/src/main/java/com/fr/design/cell/clipboard/CellElementsClip.java

@@ -3,9 +3,6 @@
  */
 package com.fr.design.cell.clipboard;
 
-import java.util.Arrays;
-import java.util.Iterator;
-
 import com.fr.base.FRContext;
 import com.fr.grid.selection.CellSelection;
 import com.fr.report.cell.CellElement;
@@ -15,6 +12,9 @@ import com.fr.report.elementcase.TemplateElementCase;
 import com.fr.stable.StringUtils;
 import com.fr.stable.unit.FU;
 
+import java.util.Arrays;
+import java.util.Iterator;
+
 /**
  * The clip of CellElement.
  */
@@ -39,7 +39,47 @@ public class CellElementsClip implements Cloneable, java.io.Serializable {
         this.clips = clips;
     }
 
-    public String compateExcelPaste() {
+	public int getColumnSpan() {
+		return columnSpan;
+	}
+
+	public void setColumnSpan(int columnSpan) {
+		this.columnSpan = columnSpan;
+	}
+
+	public int getRowSpan() {
+		return rowSpan;
+	}
+
+	public void setRowSpan(int rowSpan) {
+		this.rowSpan = rowSpan;
+	}
+
+	public FU[] getColumnWidth() {
+		return columnWidth;
+	}
+
+	public void setColumnWidth(FU[] columnWidth) {
+		this.columnWidth = columnWidth;
+	}
+
+	public FU[] getRowHeight() {
+		return rowHeight;
+	}
+
+	public void setRowHeight(FU[] rowHeight) {
+		this.rowHeight = rowHeight;
+	}
+
+	public TemplateCellElement[] getClips() {
+		return clips;
+	}
+
+	public void setClips(TemplateCellElement[] clips) {
+		this.clips = clips;
+	}
+
+	public String compateExcelPaste() {
     	Arrays.sort(this.clips, CellElementComparator.getRowFirstComparator());
 
 		// 排序

designer-realize/src/main/java/com/fr/design/mainframe/CellElementPropertyPane.java

@@ -67,7 +67,7 @@ public class CellElementPropertyPane extends DockingView {
     }
 
 
-    public synchronized static CellElementPropertyPane getInstance() {
+    public static CellElementPropertyPane getInstance() {
         if (singleton == null) {
             synchronized (CellElementPropertyPane.class) {
                 if (singleton == null) {

designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java

@@ -663,7 +663,7 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
         }
     }
 
-    private Object getClipObject() {
+    public Object getClipObject() {
         // 需要检查是否可以编辑。
         Clipboard clipboard = DesignerContext.getClipboard(this.getGrid());
         Transferable clipData = clipboard.getContents(this);

designer-realize/src/main/java/com/fr/grid/selection/Selection.java

@@ -1,19 +1,22 @@
 package com.fr.grid.selection;
 
-import java.io.Serializable;
-
-import javax.swing.JPopupMenu;
-
 import com.fr.base.FRContext;
+import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.cell.clipboard.CellElementsClip;
 import com.fr.design.cell.clipboard.ElementsTransferable;
 import com.fr.design.cell.clipboard.FloatElementsClip;
+import com.fr.design.fun.RightSelectionHandlerProvider;
+import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.mainframe.ElementCasePane;
-import com.fr.report.elementcase.TemplateElementCase;
 import com.fr.design.selection.SelectableElement;
+import com.fr.report.elementcase.TemplateElementCase;
 import com.fr.stable.ColumnRow;
 import com.fr.stable.FCloneable;
 
+import javax.swing.JPopupMenu;
+import java.io.Serializable;
+import java.util.Set;
+
 /*
  * TODO ALEX_SEP Selection是跟ElementCasePane绑定的,能不能把ElementCasePane保存在Selection里面呢?
  * 
@@ -24,10 +27,8 @@ import com.fr.stable.FCloneable;
 public abstract class Selection implements FCloneable, Serializable , SelectableElement {
 	public abstract boolean isSelectedOneCell(ElementCasePane ePane);
 
-	// ///////////////////////////////copy/////////////////////////////////
 	public abstract void asTransferable(ElementsTransferable transferable, ElementCasePane ePane);
 
-	// ///////////////////////////////paste////////////////////////////////
 	public boolean pasteFloatElementClip(FloatElementsClip feClip, ElementCasePane ePane) {
 		FloatElementsClip floatElementClip;
 		try {
@@ -53,7 +54,6 @@ public abstract class Selection implements FCloneable, Serializable , Selectable
 
 	public abstract boolean pasteOtherType(Object ob, ElementCasePane ePane);
 
-	// ///////////////////////////////merge////////////////////////////////
 	public abstract boolean canMergeCells(ElementCasePane ePane);
 
 	public abstract boolean mergeCells(ElementCasePane ePane);
@@ -62,18 +62,28 @@ public abstract class Selection implements FCloneable, Serializable , Selectable
 
 	public abstract boolean unMergeCells(ElementCasePane ePane);
 
-	// ///////////////////////////////popup////////////////////////////////
 	public abstract JPopupMenu createPopupMenu(ElementCasePane ePane);
 
-	// ///////////////////////////////clear////////////////////////////////
+	/**
+	 * 添加插件菜单(增删改都可以)
+	 * @param ePane
+	 * @param popupMenu
+	 */
+	public void addExtraMenu(ElementCasePane ePane, UIPopupMenu popupMenu) {
+		Set<RightSelectionHandlerProvider> selectionHandlerProviders = ExtraDesignClassManager.getInstance().getArray(RightSelectionHandlerProvider.XML_TAG);
+		for (RightSelectionHandlerProvider handler : selectionHandlerProviders) {
+			if (handler.accept(this)) {
+				handler.dmlMenu(ePane, popupMenu);
+			}
+		}
+	}
+
 	public abstract boolean clear(ElementCasePane.Clear type, ElementCasePane ePane);
 
-	// ////////////////////////////////////////////////////////////////////
 	public abstract int[] getSelectedRows();
 
 	public abstract int[] getSelectedColumns();
 
-	// //////////////////////////////move//////////////////////////////////
 	public abstract void moveLeft(ElementCasePane ePane);
 
 	public abstract void moveRight(ElementCasePane ePane);
@@ -82,10 +92,8 @@ public abstract class Selection implements FCloneable, Serializable , Selectable
 
 	public abstract void moveDown(ElementCasePane ePane);
 
-	// //////////////////////////DeleteAction///////////////////////////////
 	public abstract boolean triggerDeleteAction(ElementCasePane ePane);
 
-	// //////////////////////////Just4CellSelection///////////////////////////////
 	public abstract boolean containsColumnRow(ColumnRow cr);
 
 	public abstract void populatePropertyPane(ElementCasePane ePane);