Merge branch 'release/9.0' of http://www.finedevelop.com:2015/scm/~kerry/design into release/9.0

designer/src/com/fr/design/mainframe/bbs/BBSConstants.java

@@ -4,13 +4,13 @@
 package com.fr.design.mainframe.bbs;
 
 import com.fr.general.IOUtils;
+import com.fr.general.SiteCenter;
 import com.fr.stable.StringUtils;
 
 import java.util.Properties;
 
 /**
  * @author neil
- *
  * @date: 2015-3-10-上午9:50:13
  */
 public class BBSConstants {
@@ -20,25 +20,35 @@ public class BBSConstants {
 
 
     private static final String GUEST_KEY = "USER";
+    private static final String GUEST_KEY_ONLINE = "guest.user";
     private static final String LINK_KEY = "LINK";
-	private static final int GUEST_NUM = 5;
+    private static final String LINK_KEY_ONLINE = "guest.link";
-	
-	//用户名信息数组
-	public static final String[] ALL_GUEST = loadAllGuestsInfo(GUEST_KEY);
-	//用户论坛链接信息
-	public static final String[] ALL_LINK = loadAllGuestsInfo(LINK_KEY);
 
     private static Properties PROP = null;
 
+    public static String[] getAllGuest() {
+        return loadAllGuestsInfoOnline(GUEST_KEY_ONLINE, loadAllGuestsInfo(GUEST_KEY));
+    }
+
+    public static String[] getAllLink() {
+        return loadAllGuestsInfoOnline(LINK_KEY_ONLINE, loadAllGuestsInfo(LINK_KEY));
+    }
+
     //加载所有用户的信息, 用户名, 论坛连接
-	private static String[] loadAllGuestsInfo(String key){
+    private static String loadAllGuestsInfo(String key) {
-		String[] allGuests = new String[GUEST_NUM];
+        return loadAttribute(key, StringUtils.EMPTY);
-		for (int i = 0; i < GUEST_NUM; i++) {
-			allGuests[i] = loadAttribute(key + i, StringUtils.EMPTY);
     }
 
+    //加载所有用户的信息, 用户名, 论坛连接
+    private static String[] loadAllGuestsInfoOnline(String key, String defaultValue) {
+        String[] allGuests = new String[0];
+        String guest = SiteCenter.getInstance().acquireUrlByKind(key, defaultValue);
+        if (StringUtils.isNotEmpty(guest)) {
+            allGuests = guest.split("\\|");
+        }
         return allGuests;
     }
+    
     //如果要定制, 直接改bbs.properties就行了
     private static String loadAttribute(String key, String defaultValue) {
         if (PROP == null) {

designer/src/com/fr/design/mainframe/bbs/BBSGuestPane.java

@@ -3,15 +3,6 @@
  */
 package com.fr.design.mainframe.bbs;
 
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Desktop;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.net.URI;
-
-import javax.swing.JPanel;
-
 import com.fr.design.gui.ilable.ActionLabel;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -21,6 +12,12 @@ import com.fr.general.Inter;
 import com.fr.stable.StringUtils;
 import com.fr.start.BBSGuestPaneProvider;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.net.URI;
+
 /**
  * @author neil
  *
@@ -54,9 +51,12 @@ public class BBSGuestPane extends JPanel implements BBSGuestPaneProvider{
 		double[] colSize = {p};
 		
 		Component[][] components = new Component[rowSize.length][colSize.length];
-		for (int i = 0; i < components.length; i++) {
+		String[] allGuest = BBSConstants.getAllGuest();
-			String userName = BBSConstants.ALL_GUEST[i];
+		String[] allLink = BBSConstants.getAllLink();
-			String url = BBSConstants.ALL_LINK[i];
+		int min = Math.min(allGuest.length, components.length);
+		for (int i = 0; i < min; i++) {
+			String userName = allGuest[i];
+			String url = allLink[i];
 			components[i][0] = getURLActionLabel(userName, url);
 		}
 		

designer/src/com/fr/design/mainframe/bbs/bbs.properties

@@ -4,16 +4,8 @@ COLLECT_URL=http://www.finereporthelp.com:8081/bbs/ReportServer?op=bbs&cmd=colle
 DEFAULT_URL=http\://bbs.finereport.com/home.php?mod=space&do=notice
 GET_MESSAGE_URL=http://feedback.finedevelop.com:3000/bbs/message/count
 GET_SIGN_INFO_URL=http\://bbs.finereport.com
-LINK0=http\://bbs.finereport.com/space-uid-55823.html
+LLINK= http\://bbs.fanruan.com/home.php?mod=space&uid=66470&do=profile|http\://bbs.fanruan.com/home.php?mod=space&uid=67190&do=profile|http\://bbs.fanruan.com/home.php?mod=space&uid=65659&do=profile|http\://bbs.fanruan.com/home.php?mod=space&uid=60352&do=profile|http\://bbs.fanruan.com/home.php?mod=space&uid=78157&do=profile
-LINK1=http\://bbs.finereport.com/space-uid-56940.html
-LINK2=http\://bbs.finereport.com/space-uid-51621.html
-LINK3=http\://bbs.finereport.com/space-uid-52618.html
-LINK4=http\://bbs.finereport.com/space-uid-48993.html
 SHARE_URL=http\://bbs.finereport.com
-USER0=\u6590\u6CE2\u90A3\u5951(\u5B59\u70B3\u6DA6)
+UUSER=cherishdqy\uFF08\u9093\u79CB\u4E91\uFF09|yets11\uFF08\u9676\u5B5D\u6587\uFF09|\u661F\u75D5\uFF08\u71D5\u5B8F\u4F1F\uFF09|\u9759\u542C\u7985\u9E23\uFF08\u674E\u51A0\u519B\uFF09|yiyemeiying\uFF08\u5218\u4F73\uFF09
-USER1=deafire(\u674E\u5FD7\u4F1F)
-USER2=\u963F\u8FEA(\u8C22\u8FEA)
-USER3=bingjie(\u5F20\u8BB0\u82B1)
-USER4=\u6D77\u7EF5\u5B9D\u5B9D(\u90DD\u6B63)
 VERIFY_URL=http://www.finereporthelp.com:8081/bbs/ReportServer?op=bbs&cmd=verify
 UPDATE_INFO_URL=http://bbs.finereport.com/source/plugin/infor/infor.html

designer/src/com/fr/start/ReportSplashPane.java

@@ -8,6 +8,7 @@ import com.fr.base.FRContext;
 import com.fr.base.GraphHelper;
 import com.fr.design.mainframe.bbs.BBSConstants;
 import com.fr.general.GeneralContext;
+import com.fr.general.Inter;
 import com.fr.general.ModuleContext;
 import com.fr.stable.Constants;
 import com.fr.stable.CoreGraphHelper;
@@ -27,14 +28,11 @@ import java.util.TimerTask;
 
 /**
  * @author neil
- *
  * @date: 2015-3-13-上午9:47:58
  */
-public class ReportSplashPane extends SplashPane{
+public class ReportSplashPane extends SplashPane {
 
     private static final String OEM_PATH = "/com/fr/base/images/oem";
-	private static final String SPLASH_CN = "splash_chinese.png";
-	private static final String SPLASH_EN = "splash_english.png";
     private static final String SPLASH_MAC_CN = "splash_chinese_mac.png";
     private static final String SPLASH_MAC_EN = "splash_english_mac.png";
 
@@ -55,6 +53,10 @@ public class ReportSplashPane extends SplashPane{
     private java.util.Timer timer = new java.util.Timer();
 
     public ReportSplashPane() {
+        init();
+    }
+
+    private void init() {
         this.setBackground(null);
 
         timer.schedule(new TimerTask() {
@@ -65,10 +67,7 @@ public class ReportSplashPane extends SplashPane{
             }
         }, 0, 300);
 
-        ModuleContext.registerModuleListener(moduleListener);
+        ModuleListener moduleListener = new ModuleAdapter() {
-    }
-    
-    private ModuleListener moduleListener = new ModuleAdapter() {
             @Override
             public void onStartBefore(String moduleName, String moduleI18nName) {
                 moduleID = moduleI18nName;
@@ -77,6 +76,8 @@ public class ReportSplashPane extends SplashPane{
                 ReportSplashPane.this.repaint();
             }
         };
+        ModuleContext.registerModuleListener(moduleListener);
+    }
 
     protected void paintComponent(Graphics g) {
         super.paintComponent(g);
@@ -105,7 +106,7 @@ public class ReportSplashPane extends SplashPane{
         return splashBuffedImage;
     }
 
-    private void paintShowText(Graphics2D splashG2d){
+    private void paintShowText(Graphics2D splashG2d) {
         FontRenderContext fontRenderContext = splashG2d.getFontRenderContext();
         LineMetrics fm = splashG2d.getFont().getLineMetrics("",
                 fontRenderContext);
@@ -119,6 +120,13 @@ public class ReportSplashPane extends SplashPane{
         //加载模块信息
         double y = MODULE_INFO_Y + height + leading + ascent;
         GraphHelper.drawString(splashG2d, showText, MODULE_INFO_X, y);
+
+        //每次随机感谢一位论坛用户
+        if (shouldShowThanks()) {
+            splashG2d.setPaint(THANK_COLOR);
+            String content = Inter.getLocText("FR-Designer_Thanks-To") + GUEST;
+            GraphHelper.drawString(splashG2d, content, THANK_INFO_X, y);
+        }
     }
 
     // 是否显示鸣谢文字
@@ -132,14 +140,17 @@ public class ReportSplashPane extends SplashPane{
         return true;
     }
 
-    private static String getRandomUser(){
+    private static String getRandomUser() {
-    	int num = new Random().nextInt(BBSConstants.ALL_GUEST.length);
+        String[] allGuest = BBSConstants.getAllGuest();
-    	return StringUtils.BLANK + BBSConstants.ALL_GUEST[num];
+        if (allGuest.length == 0) {
+            return StringUtils.EMPTY;
+        }
+        int num = new Random().nextInt(allGuest.length);
+        return StringUtils.BLANK + allGuest[num];
     }
 
     /**
      * 窗口关闭后取消定时获取模块信息的timer
-	 * 
      */
     public void releaseTimer() {
         timer.cancel();
@@ -149,7 +160,6 @@ public class ReportSplashPane extends SplashPane{
      * 创建启动画面的背景图片
      *
      * @return 背景图片
-	 * 
      */
     public Image createSplashBackground() {
         String fileName = getImageName();
@@ -157,12 +167,9 @@ public class ReportSplashPane extends SplashPane{
     }
 
     //获取图片文件名
-	private String getImageName(){
+    private String getImageName() {
         boolean isChina = GeneralContext.isChineseEnv();
         //jdk1.8下透明有bug, 设置了setWindowTransparent后, JFrame直接最小化了, 先用mac下的加载图片
         return isChina ? SPLASH_MAC_CN : SPLASH_MAC_EN;
     }
-
-
-	
 }

designer_base/src/com/fr/design/DesignerEnvManager.java

@@ -139,7 +139,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
             if (designerEnvManager.nameEnvMap.size() <= 0) {
                 String installHome = StableUtils.getInstallHome();
                 if (installHome != null) {
-                    String name = Inter.getLocText("FR-Designer_DEFAULT");
+                    String name = Inter.getLocText("FR-Engine_DEFAULT");
                     String envPath = StableUtils.pathJoin(new String[]{installHome, ProjectConstants.WEBAPP_NAME, ProjectConstants.WEBINF_NAME});
                     designerEnvManager.putEnv(name, LocalEnv.createEnv(envPath));
                     designerEnvManager.setCurEnvName(name);

designer_base/src/com/fr/design/actions/help/AboutPane.java

@@ -39,10 +39,10 @@ public class AboutPane extends JPanel {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
 
         //center panel
-        JPanel centerPane=FRGUIPaneFactory.createBorderLayout_L_Pane();
+        JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
         this.add(centerPane, BorderLayout.CENTER);
 
-        JPanel contentPane=FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
+        JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
         centerPane.add(contentPane, BorderLayout.NORTH);
 
         BoxCenterAlignmentCopyablePane buildCopyPane = new BoxCenterAlignmentCopyablePane(
@@ -68,8 +68,8 @@ public class AboutPane extends JPanel {
                         Inter.getLocText("FR-Designer-Basic_Activation_Key_Copy_OK")
                 }));
 
-        if (shouldShowPhoneAndQQ()){
+        if (shouldShowPhoneAndQQ()) {
-            if(ComparatorUtils.equals(ProductConstants.APP_NAME,FINEREPORT)){
+            if (ComparatorUtils.equals(ProductConstants.APP_NAME, FINEREPORT)) {
                 boxCenterAlignmentPane = new BoxCenterAligmentPane(Inter.getLocText("FR-Designer_Service_Phone") + ProductConstants.COMPARE_TELEPHONE);
                 contentPane.add(boxCenterAlignmentPane);
             }
@@ -82,12 +82,16 @@ public class AboutPane extends JPanel {
 
         contentPane.add(actionLabel);
         contentPane.add(emailLabel);
+        if (shouldShowThanks()) {
+            addThankPane(contentPane);
+        }
     }
 
     // 是否显示服务电话和 qq
     private boolean shouldShowPhoneAndQQ() {
         return !FRContext.getLocale().equals(Locale.US);
     }
+
     // 是否显示鸣谢面板
     private boolean shouldShowThanks() {
         Locale[] hideLocales = {Locale.US, Locale.KOREA, Locale.JAPAN};
@@ -100,9 +104,9 @@ public class AboutPane extends JPanel {
     }
 
     //添加鸣谢面板
-    private void addThankPane(JPanel contentPane){
+    private void addThankPane(JPanel contentPane) {
         BBSGuestPaneProvider pane = StableFactory.getMarkedInstanceObjectFromClass(BBSGuestPaneProvider.XML_TAG, BBSGuestPaneProvider.class);
-        if(pane == null){
+        if (pane == null) {
             return;
         }
 
@@ -110,16 +114,16 @@ public class AboutPane extends JPanel {
         contentPane.add((Component) pane);
     }
 
-    private String append(String...strs){
+    private String append(String... strs) {
         StringBuilder sb = new StringBuilder();
-    	for(String str : strs){
+        for (String str : strs) {
             sb.append(str);
         }
 
         return sb.toString();
     }
 
-    private String getCopyRight(){
+    private String getCopyRight() {
         return append(Inter.getLocText("FR-Designer_About_CopyRight"), COPYRIGHT_LABEL,
                 ProductConstants.HISTORY, StringUtils.BLANK, SiteCenter.getInstance().acquireUrlByKind("company.name", ProductConstants.COMPANY_NAME));
     }
@@ -129,7 +133,7 @@ public class AboutPane extends JPanel {
                 StringUtils.BLANK, ProductConstants.RELEASE_VERSION, BUILD_PREFIX);
     }
 
-    private BoxCenterAligmentPane getEmailActionLabel(final String mailTo){
+    private BoxCenterAligmentPane getEmailActionLabel(final String mailTo) {
         ActionLabel emailLabel = new ActionLabel(mailTo);
 
         emailLabel.addActionListener(new ActionListener() {
@@ -146,7 +150,7 @@ public class AboutPane extends JPanel {
         return new BoxCenterAligmentPane(emailLabel);
     }
 
-    private BoxCenterAligmentPane getURLActionLabel(final String url){
+    private BoxCenterAligmentPane getURLActionLabel(final String url) {
         ActionLabel actionLabel = new ActionLabel(url);
         actionLabel.addActionListener(new ActionListener() {
             @Override

designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java

@@ -37,6 +37,9 @@ public class ColumnSelectedEditor extends Editor<SimpleDSColumn> {
 			@Override
 			public void itemStateChanged(ItemEvent e) {
                 //这边需要重新初始化columnNames, 否则nameList长度和columnNames长度不同导致出錯。
+				if (tableDataComboBox.getSelectedItem() == null) {
+					return;
+				}
                 List<String> nameList = tableDataComboBox.getSelectedItem().calculateColumnNameList();
                 columnNames = new String[nameList.size()];
 				columnNames = tableDataComboBox.getSelectedItem().calculateColumnNameList().toArray(columnNames);
@@ -56,7 +59,7 @@ public class ColumnSelectedEditor extends Editor<SimpleDSColumn> {
 
 	@Override
 	public SimpleDSColumn getValue() {
-		if (this.tableDataComboBox.getSelectedItem() == null && this.columnNameComboBox.getSelectedItem() == null) {
+		if (this.tableDataComboBox.getSelectedItem() == null || this.columnNameComboBox.getSelectedItem() == null) {
 			return null;
 		}
 		SimpleDSColumn dsColumn = new SimpleDSColumn();

designer_base/src/com/fr/design/gui/icombobox/FunctionComboBox.java

@@ -60,7 +60,7 @@ public class FunctionComboBox extends UIComboBox {
 
 			if (value instanceof DataFunction) {
 				DataFunction function = (DataFunction) value;
-				this.setText(DataCoreUtils.getFunctionDisplayName(function));
+				this.setText(" " + DataCoreUtils.getFunctionDisplayName(function));
 			}
 
 			return this;

designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java

@@ -67,9 +67,9 @@ public class UIComboBoxUI extends BasicComboBoxUI implements MouseListener {
         }
         g2d.setColor(linecolor);
         if (!comboBox.isPopupVisible()) {
-            g2d.drawRoundRect(0, 0, c.getWidth() - arrowButton.getWidth() + 3, c.getHeight() - 1, UIConstants.LARGEARC, UIConstants.LARGEARC);
+            g2d.drawRoundRect(0, 0, c.getWidth() - arrowButton.getWidth() + 3, c.getHeight() - 1, UIConstants.ARC, UIConstants.ARC);
         } else {
-            g2d.drawRoundRect(0, 0, c.getWidth(), c.getHeight() + 3, UIConstants.LARGEARC, UIConstants.LARGEARC);
+            g2d.drawRoundRect(0, 0, c.getWidth(), c.getHeight() + 3, UIConstants.ARC, UIConstants.ARC);
             g2d.drawLine(0, c.getHeight() - 1, c.getWidth(), c.getHeight() - 1);
         }
     }

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

@@ -183,7 +183,7 @@ FR-Designer_Support_QQ=\u6280\u672FQQ
 FR-Designer_Swatch=\u6837\u54C1
 FR-Designer_Tab_title=tab\u6807\u9898
 FR-Designer_TableData=\u6570\u636E\u96C6
-FR-Designer_Thank_guest=\u7279\u522B\u9E23\u8C22\u4EE5\u4E0B\u8BBA\u575B\u5E06\u85AF\u5BF9\u8BE5\u7248\u672C\u8BBE\u8BA1\u5668\u6613\u7528\u6027\u505A\u51FA\u7684\u7A81\u51FA\u8D21\u732E
+FR-Designer_Thank_guest=\u7279\u522B\u9E23\u8C22\u4EE5\u4E0B\u756A\u85AF\u5BF9\u5E06\u8F6F\u4EA7\u54C1\u3001\u6587\u5316\u3001\u751F\u6001\u5EFA\u8BBE\u505A\u51FA\u7684\u7A81\u51FA\u8D21\u732E
 FR-Designer_Thanks-To=\u9E23\u8C22
 FR-Designer_Title=\u6807\u9898
 FR-Designer_Total=\u603B\u5171

designer_base/src/com/fr/start/BaseDesigner.java

@@ -27,6 +27,7 @@ import com.fr.general.FRLogger;
 import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
 import com.fr.general.ModuleContext;
+import com.fr.general.SiteCenter;
 import com.fr.plugin.PluginCollector;
 import com.fr.plugin.manage.PluginManager;
 import com.fr.plugin.manage.PluginStartup;
@@ -64,6 +65,8 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
         }
         RestartHelper.deleteRecordFilesWhenStart();
 
+        SiteCenter.getInstance();
+
         DesignUtils.setPort(getStartPort());
         // 如果端口被占用了 说明程序已经运行了一次,也就是说，已经建立一个监听服务器，现在只要给服务器发送命令就好了
         if (DesignUtils.isStarted()) {

designer_chart/src/com/fr/design/chart/javascript/ChartEmailPane.java

@@ -45,7 +45,6 @@ public class ChartEmailPane extends EmailPane{
 		} else {
 			double[] rSizes = { preferred, preferred, preferred, preferred, preferred, fill, preferred};
 			contentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{
-                    {new UILabel(Inter.getLocText("Name") + ":", SwingConstants.RIGHT), itemNameTextField},
                     {new UILabel(), tipsPane1},
                     createLinePane(Inter.getLocText("HJS-Mail_to"), maitoEditor = new UITextField()),
                     createLinePane(Inter.getLocText("HJS-CC_to"), ccEditor = new UITextField()),

designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotMoreCateTableDataContentPane.java

@@ -4,6 +4,7 @@ import com.fr.base.BaseUtils;
 import com.fr.base.chart.chartdata.TopDefinitionProvider;
 import com.fr.chart.chartattr.Bar2DPlot;
 import com.fr.chart.chartattr.ChartCollection;
+import com.fr.chart.chartattr.Plot;
 import com.fr.chart.chartdata.NormalTableDataDefinition;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
@@ -26,10 +27,11 @@ import java.util.List;
 
 /**
  * 多分类轴 的数据集定义界面.
+ *
  * @author kunsnat E-mail:kunsnat@gmail.com
  * @version 创建时间：2013-9-3 上午10:00:28
  */
-public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableDataContentPane implements UIObserver{
+public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableDataContentPane implements UIObserver {
     private static final long serialVersionUID = -3305681053750642843L;
     private static final int COMBOX_GAP = 8;
     private static final int COMBOX_WIDTH = 95;
@@ -42,6 +44,10 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD
 
     private UIObserverListener uiobListener = null;
 
+    public List<UIComboBox> getBoxList() {
+        return boxList;
+    }
+
     public CategoryPlotMoreCateTableDataContentPane() {
         // do nothing
     }
@@ -50,17 +56,17 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD
         categoryCombox = new UIComboBox();
         categoryCombox.setPreferredSize(new Dimension(COMBOX_WIDTH,COMBOX_HEIGHT));
 
-		JPanel categoryPane = new JPanel(new BorderLayout(4,0));
+        JPanel categoryPane = new JPanel(new BorderLayout(4, 0));
         categoryPane.setBorder(BorderFactory.createMatteBorder(0, 0, 6, 1, getBackground()));
-        UILabel categoryLabel = new BoldFontTextLabel(Inter.getLocText("FR-Chart-Category_Name")) ;
+        UILabel categoryLabel = new BoldFontTextLabel(Inter.getLocText("FR-Chart-Category_Name"));
         categoryLabel.setPreferredSize(new Dimension(85,COMBOX_HEIGHT));
 
         addButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));
         addButton.setPreferredSize(new Dimension(20, COMBOX_HEIGHT));
 
-        categoryPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{categoryCombox, addButton,null,categoryLabel,null}));
+        categoryPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{categoryCombox, addButton, null, categoryLabel, null}));
-		categoryPane.setBorder(BorderFactory.createEmptyBorder(0,24,10,15));
 
+        categoryPane.setBorder(BorderFactory.createEmptyBorder(0,24,10,15));
 
         boxPane = new JPanel();
         boxPane.setLayout(new BoxLayout(boxPane, BoxLayout.Y_AXIS));
@@ -76,7 +82,7 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD
         addButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-				if(boxList.size() < 2) {
+                if (boxList.size() < 2) {
                     addNewCombox();
                     relayoutPane();
                 }
@@ -90,7 +96,7 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD
                 checkSeriseUse(categoryCombox.getSelectedItem() != null);
                 makeToolTipUse(categoryCombox);
 
-				checkAddButton();
+                checkComponent();
             }
         });
     }
@@ -109,7 +115,7 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD
         combox.setPreferredSize(new Dimension(COMBOX_WIDTH, COMBOX_HEIGHT));
 
         int count = categoryCombox.getItemCount();
-		 for(int i = 0; i < count; i++) {
+        for (int i = 0; i < count; i++) {
             combox.addItem(categoryCombox.getItemAt(i));
         }
 
@@ -130,14 +136,14 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD
         boxPane.add(buttonPane);
         boxList.add(combox);
 
-		 checkAddButton();
+        checkComponent();
 
         delButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
                 boxPane.remove(buttonPane);
                 boxList.remove(combox);
-				checkAddButton();
+                checkComponent();
                 relayoutPane();
             }
         });
@@ -151,25 +157,30 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD
         addButton.setEnabled(size < 2 && categoryCombox.getSelectedItem() != null);
     }
 
+    protected void checkComponent() {
+        checkAddButton();
+    }
+
     private void relayoutPane() {
         this.revalidate();
     }
 
 
     /**
-	 *检查 某些Box是否可用
+     * 检查 某些Box是否可用
+     *
      * @param hasUse 是否使用.
      */
     public void checkBoxUse(boolean hasUse) {
         super.checkBoxUse(hasUse);
 
-		checkAddButton();
+        checkComponent();
     }
 
     protected void refreshBoxListWithSelectTableData(List list) {
         super.refreshBoxListWithSelectTableData(list);
 
-    	for(int i = 0, size = boxList.size(); i < size; i++) {
+        for (int i = 0, size = boxList.size(); i < size; i++) {
             refreshBoxItems(boxList.get(i), list);
         }
     }
@@ -194,6 +205,7 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD
 
     /**
      * 更新 多分类相关界面
+     *
      * @param collection
      */
     public void populateBean(ChartCollection collection) {
@@ -202,10 +214,10 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD
         boxList.clear();
 
         TopDefinitionProvider top = collection.getSelectedChart().getFilterDefinition();
-		if(top instanceof NormalTableDataDefinition) {
+        if (top instanceof NormalTableDataDefinition) {
-			NormalTableDataDefinition normal = (NormalTableDataDefinition)top;
+            NormalTableDataDefinition normal = (NormalTableDataDefinition) top;
             int size = normal.getMoreCateSize();
-			for(int i = 0; i < size; i++) {
+            for (int i = 0; i < size; i++) {
                 UIComboBox box = addNewCombox();
                 box.setSelectedItem(normal.getMoreCateWithIndex(i));
             }
@@ -217,21 +229,28 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD
 
     /**
      * 保存多分类界面到collection
+     *
      * @param collection
      */
     public void updateBean(ChartCollection collection) {
         super.updateBean(collection);
 
         TopDefinitionProvider top = collection.getSelectedChart().getFilterDefinition();
-		if(top instanceof NormalTableDataDefinition) {
+        Plot plot = collection.getSelectedChart().getPlot();
-			NormalTableDataDefinition normal = (NormalTableDataDefinition)top;
+        if (top instanceof NormalTableDataDefinition) {
+            NormalTableDataDefinition normal = (NormalTableDataDefinition) top;
             normal.clearMoreCate();
-			for(int i = 0, size = boxList.size(); i < size; i++) {
+            updateMoreCate(normal, plot);
+        }
+    }
+
+    protected void updateMoreCate(NormalTableDataDefinition normal, Plot plot) {
+        for (int i = 0, size = boxList.size(); i < size; i++) {
             UIComboBox box = boxList.get(i);
-				if(box.getSelectedItem() != null) {
+            if (box.getSelectedItem() != null) {
                 normal.addMoreCate(box.getSelectedItem().toString());
             }
         }
     }
-	}
+
 }

designer_chart/src/com/fr/design/mainframe/chart/gui/type/AbstractChartTypePane.java

@@ -4,8 +4,18 @@ import com.fr.base.ChartPreStyleManagerProvider;
 import com.fr.base.ChartPreStyleServerManager;
 import com.fr.base.FRContext;
 import com.fr.base.background.ColorBackground;
-import com.fr.chart.base.*;
+import com.fr.chart.base.AttrContents;
-import com.fr.chart.chartattr.*;
+import com.fr.chart.base.AttrFillStyle;
+import com.fr.chart.base.ChartConstants;
+import com.fr.chart.base.ChartPreStyle;
+import com.fr.chart.base.DataSeriesCondition;
+import com.fr.chart.base.TextAttr;
+import com.fr.chart.chartattr.Axis;
+import com.fr.chart.chartattr.CategoryPlot;
+import com.fr.chart.chartattr.Chart;
+import com.fr.chart.chartattr.Legend;
+import com.fr.chart.chartattr.Plot;
+import com.fr.chart.chartattr.Title;
 import com.fr.chart.chartglyph.ConditionAttr;
 import com.fr.chart.charttypes.BarIndependentChart;
 import com.fr.design.beans.FurtherBasicBeanPane;
@@ -43,6 +53,7 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane<Chart>{
     protected List<ChartImagePane> styleList;
 
     protected JPanel stylePane; //样式布局的面板
+    private JPanel typePane;
     protected abstract String[] getTypeIconPath();
     protected abstract String[] getTypeTipName();
     protected abstract String[] getTypeLayoutPath();
@@ -70,7 +81,7 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane<Chart>{
 
         checkDemosBackground();
 
-        JPanel typePane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(4);
+        typePane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(4);
         for(int i = 0; i < typeDemo.size(); i++) {
             ChartImagePane tmp = typeDemo.get(i);
             typePane.add(tmp);
@@ -133,7 +144,7 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane<Chart>{
     }
 
     //子类覆盖
-    protected Plot getSelectedClonedPlot(){
+    protected <T extends Plot> T getSelectedClonedPlot(){
         return null;
     }
 
@@ -586,6 +597,10 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane<Chart>{
                 && chart.getPlot().getPlotStyle() != ChartConstants.STYLE_NONE;
     }
 
+    protected JPanel getTypePane(){
+        return typePane;
+    }
+
     public Chart getDefaultChart() {
         return BarIndependentChart.barChartTypes[0];
     }

designer_chart/src/com/fr/plugin/chart/designer/TableLayout4VanChartHelper.java

@@ -5,7 +5,6 @@ import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.general.Inter;
 
 import javax.swing.*;
 import java.awt.*;
@@ -42,9 +41,11 @@ public class TableLayout4VanChartHelper {
         double f = TableLayout.FILL;
         double[] columnSize = {f, componentWidth};
         double[] rowSize = {p, p};
+        UILabel label = new UILabel(title);
+        label.setVerticalAlignment(SwingConstants.TOP);
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{new UILabel(Inter.getLocText(title)), component},
+                new Component[]{label, component},
         };
         return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, COMPONENT_INTERVAL, LayoutConstants.VGAP_LARGE);
     }

designer_chart/src/com/fr/plugin/chart/designer/component/VanChartHtmlLabelPane.java

@@ -15,7 +15,6 @@ import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.general.Inter;
 import com.fr.plugin.chart.base.VanChartHtmlLabel;
-import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
 import com.fr.plugin.chart.designer.style.VanChartStylePane;
 
 import javax.swing.*;
@@ -66,7 +65,6 @@ public class VanChartHtmlLabelPane extends JPanel{
         };
 
         JPanel contentPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
-        contentPane.setBorder(BorderFactory.createEmptyBorder(0, (int)TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH + TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0));
 
         this.setLayout(new BorderLayout());
         this.add(contentPane, BorderLayout.CENTER);

designer_chart/src/com/fr/plugin/chart/designer/component/background/VanChartBackgroundPaneWithOutImageAndShadow.java

@@ -16,23 +16,20 @@ import java.awt.*;
  */
 public class VanChartBackgroundPaneWithOutImageAndShadow extends VanChartBackgroundPane {
 
-    public VanChartBackgroundPaneWithOutImageAndShadow() {
+    @Override
-        initComponents();
+    protected JPanel initContentPanel() {
-
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
 
         double[] columnSize = {p, f};
-        double[] rowSize = { p,p,p,p,p};
+        double[] rowSize = { p,p,p};
 
-        JPanel panel = TableLayoutHelper.createTableLayoutPane(getPaneComponents(),rowSize,columnSize);
+        return TableLayoutHelper.createTableLayoutPane(getPaneComponents(),rowSize,columnSize);
-        this.setLayout(new BorderLayout());
-        this.add(panel,BorderLayout.CENTER);
     }
 
     @Override
     protected void initList() {
-        paneList.add(new NullBackgroundQuickPane(){
+        paneList.add(new NullBackgroundQuickPane() {
             /**
              * 名称
              *
@@ -46,14 +43,15 @@ public class VanChartBackgroundPaneWithOutImageAndShadow extends VanChartBackgro
         paneList.add(new ColorBackgroundQuickPane());
     }
 
+
     @Override
     protected Component[][] getPaneComponents() {
         return new Component[][]{
-                new Component[]{null, null},
+                new Component[]{typeComboBox, null},
-                new Component[]{new UILabel(Inter.getLocText("FR-Chart-Shape_Fill")), typeComboBox},
+                new Component[]{centerPane, null},
-                new Component[]{null, centerPane},
+                new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Alpha")), transparent},
-                new Component[]{new UILabel(Inter.getLocText("Plugin-Chart_Alpha")), transparent},
         };
     }
+
 }
 

designer_chart/src/com/fr/plugin/chart/designer/data/VanChartMoreCateReportDataContentPane.java

@@ -27,27 +27,24 @@ public class VanChartMoreCateReportDataContentPane extends CategoryPlotMoreCateR
     }
 
     protected void updateMoreCate(NormalReportDataDefinition reportDefinition, Plot plot) {
-        //todo@shine9.0
+        super.updateMoreCate(reportDefinition, plot);
-//        super.updateMoreCate(reportDefinition, plot);
+        ((VanChartPlot) plot).setCategoryNum(getFormualList().size() + 1);
-//        ((VanChartPlot) plot).setCategoryNum(getFormualList().size() + 1);
+        if (!getFormualList().isEmpty()) {
-//        if (!getFormualList().isEmpty()) {
+            plot.getDataSheet().setVisible(false);
-//            plot.getDataSheet().setVisible(false);
+        }
-//        }
     }
 
     protected void checkComponent() {
-        //todo@shine9.0
+        super.checkComponent();
-//        super.checkComponent();
+        checkBoxList(isSupportMultiCategory);
-//        checkBoxList(isSupportMultiCategory);
     }
 
     private void checkBoxList(boolean isSupportMulticategory) {
-        //todo@shine9.0
+        if (getFormualList().size() != 0) {
-//        if (getFormualList().size() != 0) {
+            for (int i = 0; i < getFormualList().size(); i++) {
-//            for (int i = 0; i < getFormualList().size(); i++) {
+                getFormualList().get(i).setEnabled(isSupportMulticategory);
-//                getFormualList().get(i).setEnabled(isSupportMulticategory);
+            }
-//            }
+        }
-//        }
     }
 
 }

designer_chart/src/com/fr/plugin/chart/designer/data/VanChartMoreCateTableDataContentPane.java

@@ -28,27 +28,24 @@ public class VanChartMoreCateTableDataContentPane extends CategoryPlotMoreCateTa
     }
 
     protected void updateMoreCate(NormalTableDataDefinition normal, Plot plot) {
-        //todo@shine9.0
+        super.updateMoreCate(normal, plot);
-//        super.updateMoreCate(normal, plot);
+        ((VanChartPlot) plot).setCategoryNum(getBoxList().size() + 1);
-//        ((VanChartPlot) plot).setCategoryNum(getBoxList().size() + 1);
+        if (!getBoxList().isEmpty()) {
-//        if (!getBoxList().isEmpty()) {
+            plot.getDataSheet().setVisible(false);
-//            plot.getDataSheet().setVisible(false);
+        }
-//        }
 
     }
 
     protected void checkComponent() {
-        //todo@shine9.0
+        super.checkComponent();
-//        super.checkComponent();
+        checkBoxList(isSupportMultiCategory);
-//        checkBoxList(isSupportMultiCategory);
     }
 
     private void checkBoxList(boolean isSupportMulticategory) {
-        //todo@shine9.0
+        if (getBoxList().size() != 0) {
-//        if (getBoxList().size() != 0) {
+            for (int i = 0; i < getBoxList().size(); i++) {
-//            for (int i = 0; i < getBoxList().size(); i++) {
+                getBoxList().get(i).setEnabled(isSupportMulticategory);
-//                getBoxList().get(i).setEnabled(isSupportMulticategory);
+            }
-//            }
+        }
-//        }
     }
 }

designer_chart/src/com/fr/plugin/chart/designer/style/label/VanChartPlotLabelDetailPane.java

@@ -205,6 +205,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
 
     private void checkStyleUse() {
         textFontPane.setVisible(style.getSelectedIndex() == 1);
+        textFontPane.setPreferredSize(style.getSelectedIndex() == 1 ? new Dimension(0, 60) : new Dimension(0, 0));
     }
 
     private void checkPosition() {

designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java

@@ -68,6 +68,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
     protected JPanel stackAndAxisEditExpandablePane;//堆積和坐標軸展开面板
 
     private RadiusCardLayoutPane radiusPane;//半径设置界面
+    private JPanel radiusPaneWithTitle;
 
     private UIButtonGroup<DataProcessor> largeDataModelGroup;//大数据模式
 
@@ -158,9 +159,10 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
     }
 
     //半径界面
-    protected RadiusCardLayoutPane createRadiusPane() {
+    protected JPanel createRadiusPane() {
         radiusPane = initRadiusPane();
-        return radiusPane;
+        radiusPaneWithTitle = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Radius_Set"), radiusPane);
+        return ((VanChartPlot)plot).isInCustom() ? null : radiusPaneWithTitle;
     }
 
     protected JPanel createLargeDataModelPane() {
@@ -309,10 +311,10 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
      * @param plot
      */
     private void checkRadiusPane(Plot plot) {
-        radiusPane.setVisible(true);
+        radiusPaneWithTitle.setVisible(true);
         if (plot instanceof VanChartPlot){
             if (((VanChartPlot) plot).isInCustom()){
-                radiusPane.setVisible(false);
+                radiusPaneWithTitle.setVisible(false);
             }
         }
     }

designer_chart/src/com/fr/plugin/chart/drillmap/designer/data/comp/DrillMapLayerPane.java

@@ -8,12 +8,13 @@ import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
+import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
 import com.fr.plugin.chart.drillmap.DrillMapHelper;
 import com.fr.plugin.chart.drillmap.VanChartDrillMapPlot;
-import com.fr.plugin.chart.type.MapType;
-import com.fr.plugin.chart.type.ZoomLevel;
 import com.fr.plugin.chart.map.designer.type.VanChartMapSourceChoosePane;
 import com.fr.plugin.chart.map.server.CompatibleGeoJSONTreeHelper;
+import com.fr.plugin.chart.type.MapType;
+import com.fr.plugin.chart.type.ZoomLevel;
 
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -48,29 +49,28 @@ public class DrillMapLayerPane extends BasicScrollPane<ChartCollection> {
     @Override
     protected void layoutContentPane() {
         leftcontentPane = createContentPane();
-        leftcontentPane.setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 10));
+        leftcontentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         this.add(leftcontentPane);
     }
 
     @Override
     protected JPanel createContentPane() {
 
-        if(mapDataTree == null){
+        if (mapDataTree == null) {
             mapDataTree = new MapDataTree(CompatibleGeoJSONTreeHelper.getRootNodeWithoutPara(oldGeoUrl));
             mapDataTree.setRootVisible(true);
         }
 
+        JPanel mapDataTreePanel = new JPanel(new BorderLayout());
+        mapDataTreePanel.add(mapDataTree);
+
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         double[] columnSize = {f};
-        double[] rowSize = {p,p,p,p,p,p};
+        double[] rowSize = {p, p};
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Layer_Tree"))},
+                new Component[]{createTitlePane(Inter.getLocText("Plugin-ChartF_Layer_Tree"), mapDataTreePanel)},
-                new Component[]{new JSeparator()},
+                new Component[]{createTitlePane(Inter.getLocText("Plugin-ChartF_Layer_Detail"), createLayerDetailPane())}
-                new Component[]{mapDataTree},
-                new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Layer_Detail"))},
-                new Component[]{new JSeparator()},
-                new Component[]{createLayerDetailPane()}
         };
 
         JPanel contentPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
@@ -79,21 +79,29 @@ public class DrillMapLayerPane extends BasicScrollPane<ChartCollection> {
         return panel;
     }
 
+    private JPanel createTitlePane (String title, JPanel panel) {
+        JPanel jPanel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(title, panel);
+        panel.setBorder(BorderFactory.createEmptyBorder(10,5,0,0));
+        jPanel.setBorder(BorderFactory.createEmptyBorder(0,5,0,0));
+        return jPanel;
+    }
+
     private JPanel createLayerDetailPane() {
         double p = TableLayout.PREFERRED;
-        double[] columnSize = {p,p,p};
+        double f = TableLayout.FILL;
+        double[] columnSize = {f, p, p};
         double[] rowSize = new double[depth + 1];
         detailComps = new Component[depth + 1][3];
         rowSize[0] = p;
         detailComps[0] = new Component[]{
                 new UILabel(Inter.getLocText("Plugin-Chart_Descriptor")),
-                new UILabel(Inter.getLocText("Plugin-ChartF_Layer_Zoom_Level")),
+                new UILabel(Inter.getLocText("Plugin-ChartF_Zoom_Layer")),
                 new UILabel(Inter.getLocText("Plugin-ChartF_Layer_Map_Type"))
         };
-        for(int i = 0; i < depth; i++){
+        for (int i = 0; i < depth; i++) {
             rowSize[i + 1] = p;
             int d = i + 1;
-            UILabel label = new UILabel(String.format("%s%d%s",Inter.getLocText("Plugin-ChartF_Index1"), d, Inter.getLocText("Plugin-ChartF_Index3")));
+            UILabel label = new UILabel(String.format("%s%d%s", Inter.getLocText("Plugin-ChartF_Index1"), d, Inter.getLocText("Plugin-ChartF_Index3")));
             UIComboBox level = new UIComboBox(VanChartMapSourceChoosePane.ZOOM_LEVELS);
             level.setEnabled(i != 0);
             UIComboBox type = new UIComboBox(TEMP.get(oldMapType));
@@ -112,16 +120,16 @@ public class DrillMapLayerPane extends BasicScrollPane<ChartCollection> {
     public void populateBean(ChartCollection ob) {
         VanChartDrillMapPlot drillMapPlot = DrillMapHelper.getDrillMapPlot(ob);
 
-        if(drillMapPlot != null) {
+        if (drillMapPlot != null) {
             java.util.List<ZoomLevel> levelList = drillMapPlot.getLayerLevelList();
             java.util.List<MapType> mapTypeList = drillMapPlot.getLayerMapTypeList();
 
-            if(detailComps == null || drillMapPlot.getMapType() != oldMapType || !ComparatorUtils.equals(drillMapPlot.getGeoUrl(), oldGeoUrl)){
+            if (detailComps == null || drillMapPlot.getMapType() != oldMapType || !ComparatorUtils.equals(drillMapPlot.getGeoUrl(), oldGeoUrl)) {
                 oldMapType = drillMapPlot.getMapType();
                 oldGeoUrl = drillMapPlot.getGeoUrl();
 
                 DefaultMutableTreeNode root = CompatibleGeoJSONTreeHelper.getNodeByJSONPath(oldGeoUrl);
-                if(root != null){
+                if (root != null) {
                     mapDataTree.changeRootNode(root);
                     depth = root.getDepth() + 1;//根节点也算一层
                 }
@@ -132,18 +140,18 @@ public class DrillMapLayerPane extends BasicScrollPane<ChartCollection> {
 
             //根据层级初始属性,一切以json那边读到的层级为准
             int levelSize = levelList.size();
-            for(int i = levelSize; i < depth; i++){
+            for (int i = levelSize; i < depth; i++) {
                 levelList.add(ZoomLevel.AUTO);
             }
             MapType mapType = drillMapPlot.getMapType() == MapType.POINT ? MapType.POINT : MapType.AREA;
             int typeSize = mapTypeList.size();
-            for(int j = typeSize; j < depth; j++){
+            for (int j = typeSize; j < depth; j++) {
                 mapTypeList.add(mapType);
             }
 
-            for(int i = 0; i < depth; i++){
+            for (int i = 0; i < depth; i++) {
                 Component[] components = detailComps[i + 1];
-                if(components != null) {
+                if (components != null) {
                     UIComboBox level = (UIComboBox) components[1];
                     UIComboBox type = (UIComboBox) components[2];
                     if (level != null) {
@@ -168,11 +176,11 @@ public class DrillMapLayerPane extends BasicScrollPane<ChartCollection> {
     @Override
     public void updateBean(ChartCollection ob) {
         VanChartDrillMapPlot drillMapPlot = DrillMapHelper.getDrillMapPlot(ob);
-        if(drillMapPlot != null && detailComps != null) {
+        if (drillMapPlot != null && detailComps != null) {
             java.util.List<ZoomLevel> levelList = new ArrayList<ZoomLevel>();
             java.util.List<MapType> mapTypeList = new ArrayList<MapType>();
             for (Component[] com : detailComps) {
-                if(com[1] instanceof UIComboBox && com[2] instanceof UIComboBox) {
+                if (com[1] instanceof UIComboBox && com[2] instanceof UIComboBox) {
                     UIComboBox level = (UIComboBox) com[1];
                     UIComboBox type = (UIComboBox) com[2];
                     levelList.add((ZoomLevel) level.getSelectedItem());

designer_chart/src/com/fr/plugin/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java

@@ -33,7 +33,8 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith
     protected JPanel getInteractivePane(VanChartPlot plot){
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
-        double[] columnSize = {p, f};
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+        double[] columnSize = {f, e};
         double[] rowSize = {p, p, p, p, p, p, p, p, p, p, p};
         Component[][] components = new Component[][]{
                 new Component[]{createToolBarPane(new double[]{p, p, p}, columnSize),null},
@@ -49,16 +50,29 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith
 
     private JPanel createDrillToolsPane() {
         openOrClose = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), Inter.getLocText("Plugin-ChartF_Close")});
+        JPanel openOrClosePane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Drill_Dir"), openOrClose);
         textAttrPane = new ChartTextAttrPane(){
+
+            @Override
+            protected JPanel getContentPane (JPanel buttonPane) {
+                double p = TableLayout.PREFERRED;
+                double e = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH;
+                double[] columnSize = {e};
+                double[] rowSize = {p, p};
+
+                return TableLayout4VanChartHelper.createGapTableLayoutPane(getComponents(buttonPane), rowSize, columnSize);
+            }
+
+            @Override
             protected Component[][] getComponents(JPanel buttonPane) {
                 return new Component[][]{
-                        new Component[]{fontNameComboBox, null},
+                        new Component[]{fontNameComboBox},
-                        new Component[]{buttonPane, null}
+                        new Component[]{buttonPane}
                 };
             }
         };
-        backgroundPane = new VanChartBackgroundPane4DrillMap();
+        backgroundPane = new VanChartBackgroundPaneWithOutImageAndShadow();
-        selectBackgroundPane = new VanChartBackgroundPane4DrillMap();
+        selectBackgroundPane = new VanChartBackgroundPaneWithOutImageAndShadow();
         catalogSuperLink = new VanChartCatalogHyperLinkPane();
 
         double p = TableLayout.PREFERRED;
@@ -75,7 +89,7 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith
         drillPane = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
 
         JPanel panel = new JPanel(new BorderLayout());
-        panel.add(openOrClose, BorderLayout.NORTH);
+        panel.add(openOrClosePane, BorderLayout.NORTH);
         panel.add(drillPane, BorderLayout.CENTER);
 
         openOrClose.addChangeListener(new ChangeListener() {
@@ -85,13 +99,15 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith
             }
         });
 
-        JPanel panel1 = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Drill_Dir"), panel);
+        JPanel panel1 = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Drill"), panel);
         panel.setBorder(BorderFactory.createEmptyBorder(10,5,0,0));
         return panel1;
     }
 
     private JPanel createTitlePane(String title, Component component) {
-        return TableLayout4VanChartHelper.createGapTableLayoutPane(title, component);
+        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(title, component, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
+        panel.setBorder(BorderFactory.createEmptyBorder(0,12,0,0));
+        return panel;
     }
 
     private void checkEnable() {
@@ -138,16 +154,4 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith
             catalogSuperLink.update(plot);
         }
     }
-
-    public class VanChartBackgroundPane4DrillMap extends VanChartBackgroundPaneWithOutImageAndShadow{
-        @Override
-        protected Component[][] getPaneComponents() {
-            return  new Component[][]{
-                    new Component[]{null},
-                    new Component[]{typeComboBox},
-                    new Component[]{centerPane},
-                    new Component[]{transparent},
-            };
-        }
-    }
 }

designer_chart/src/com/fr/plugin/chart/gauge/VanChartGaugeSeriesPane.java

@@ -13,11 +13,9 @@ import com.fr.design.style.color.ColorSelectBox;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
 import com.fr.plugin.chart.attr.GaugeDetailStyle;
-import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.base.AttrLabel;
 import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
 import com.fr.plugin.chart.designer.style.series.VanChartAbstractPlotSeriesPane;
-import com.fr.plugin.chart.pie.RadiusCardLayoutPane;
 import com.fr.plugin.chart.type.GaugeStyle;
 import com.fr.stable.Constants;
 
@@ -119,21 +117,21 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane {
                         new Component[]{null, null},
                         getPaneBackgroundColor(),
                         getInnerPaneBackgroundColor(),
-                        new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Radius_Set")),createRadiusPane()}
+                        new Component[]{createRadiusPane(), null}
                 };
             case SLOT:
                 return new Component[][]{
                         new Component[]{null, null},
                         getNeedleColor(),
                         getSlotBackgroundColor(),
-                        new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Radius_Set")),createRadiusPane()}
+                        new Component[]{createRadiusPane(), null}
                 };
             case THERMOMETER:
                 return new Component[][]{
                         new Component[]{null, null},
                         getNeedleColor(),
                         getSlotBackgroundColor(),
-                        new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Radius_Set")),createRadiusPane()}
+                        new Component[]{createRadiusPane(), null}
                 };
             default:
                 return new Component[][]{
@@ -142,16 +140,11 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane {
                         getHingeBackgroundColor(),
                         getNeedleColor(),
                         getPaneBackgroundColor(),
-                        new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Radius_Set")),createRadiusPane()}
+                        new Component[]{createRadiusPane(), null}
                 };
         }
     }
 
-    //半径界面
-    protected RadiusCardLayoutPane initRadiusPane() {
-        return ((VanChartPlot)plot).isInCustom() ? null : new RadiusCardLayoutPane();
-    }
-
     private Component[] getHingeColor() {
         hingeColor = new ColorSelectBox(120);
         return new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Hinge")),hingeColor};

designer_chart/src/com/fr/plugin/chart/heatmap/designer/type/VanChartHeatMapTypePane.java

@@ -64,8 +64,7 @@ public class VanChartHeatMapTypePane extends VanChartMapPlotPane {
         populateSourcePane(plot);
 
         boolean enabled = !CompatibleGEOJSONHelper.isDeprecated(plot.getGeoUrl());
-        //todo@shine9.0
+        GUICoreUtils.setEnabled(this.getTypePane(), enabled);
-        //GUICoreUtils.setEnabled(this.getTypePane(), enabled);
         GUICoreUtils.setEnabled(this.getSourceChoosePane().getSourceComboBox(), enabled);
 
         checkDemosBackground();

designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapPlotPane.java

@@ -93,8 +93,7 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane {
         populateSourcePane(plot);
 
         boolean enabled = !CompatibleGEOJSONHelper.isDeprecated(plot.getGeoUrl());
-        //todo@shine9.0
+        GUICoreUtils.setEnabled(this.getTypePane(), enabled);
-        //GUICoreUtils.setEnabled(this.getTypePane(), enabled);
         GUICoreUtils.setEnabled(this.sourceChoosePane.getSourceComboBox(), enabled);
 
         checkDemosBackground();

designer_chart/src/com/fr/plugin/chart/pie/VanChartPieSeriesPane.java

@@ -10,7 +10,6 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.general.Inter;
 import com.fr.plugin.chart.PiePlot4VanChart;
-import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
 import com.fr.plugin.chart.designer.style.series.VanChartAbstractPlotSeriesPane;
 
@@ -62,7 +61,7 @@ public class VanChartPieSeriesPane extends VanChartAbstractPlotSeriesPane {
                 new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_StartAngle")),startAngle},
                 new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_EndAngle")),endAngle},
                 new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_InnerRadius")),innerRadius},
-                new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Radius_Set")), createRadiusPane()},
+                new Component[]{createRadiusPane(),null},
                 new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Rotation")),supportRotation}
         };
 
@@ -71,12 +70,6 @@ public class VanChartPieSeriesPane extends VanChartAbstractPlotSeriesPane {
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Designer-Widget_Style"), panel);
     }
 
-    //半径界面
-    protected RadiusCardLayoutPane initRadiusPane() {
-        return ((VanChartPlot)plot).isInCustom() ? null : new RadiusCardLayoutPane();
-    }
-
-
     public void populateBean(Plot plot) {
         if(plot == null) {
             return;

designer_chart/src/com/fr/plugin/chart/range/component/LegendLabelFormatPane.java

@@ -33,6 +33,8 @@ public class LegendLabelFormatPane extends JPanel{
                 Inter.getLocText("Plugin-ChartF_Custom")});
         labelFormat = new FormatPaneWithOutFont();
         htmlLabelPane = new VanChartHtmlLabelPaneWithOutWidthAndHeight();
+        htmlLabelPane.setBorder(BorderFactory.createEmptyBorder(0, (int)TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH + TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0));
+
 
         centerPane = new JPanel(new CardLayout()){
             @Override