Merge pull request #8314 in DESIGN/design from final/11.0 to persist/11.0

* commit '78075c7669abb4dfbd7d51ea3c88c2986014962b': (23 commits)
  REPORT-68175 release合并final
  REPORT-68127 【专题】jdk11的设计器用bat脚本启动失败，exe启动正常
  REPORT-68062 单元格数据列高级设置-格式设置不生效
  REPORT-68061 单元格元素-数据设置-自定义分组设置无法点击确定
  REPORT-68161 填报-模板web属性-切换设置时，编辑行背景设置的点击逻辑确认
  CHART-22972 HyperlinkProvider接口对图表超链不起作用
  CHART-23227 钻取点地图&钻取区域地图切换类型，预览无法展示
  v7的构造函数不能走v6的，会一直创建v6的Chromium进程，先搞个构造函数这样处理下..
  CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine
  Revert "CHART-23172 & CHART-23111 只处理没正确关闭engine"
  CHART-23172 & CHART-23111 只处理没正确关闭engine
  Revert "CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine"
  CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine
  REPORT-68059 js编辑器，自定义按钮触发的弹窗层级不对
  REPORT-67833 富文本-颜色设置：选择主题色后最近使用的颜色处不会更新，需要多次点击
  REPORT-67954 远程设计时数据集面板数据连接空白的问题 提交11
  REPORT-67329 填报-web端预览-10升级11，透明的纸张背景变成了白色
  无JIRA项目 对Install4j方法的调用全部改用反射实现，避免出现引用异常
  REPORT-67224 填报-web端再计算-服务器配置填报行背景色报错
  REPORT-65140 报表块图表块在设计器上改变大小的时候，保存在 xml 里面的 elementcaseEdito 的尺寸依然是初始尺寸
  ...

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

@@ -10,11 +10,10 @@ import com.fr.design.editlock.EditLockUtils;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UILockButton;
 import com.fr.file.ConnectionConfig;
-import com.fr.general.ComparatorUtils;
+import com.fr.report.LockItem;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.connection.DBConnectAuth;
-import com.fr.report.LockItem;
 
 import javax.swing.SwingUtilities;
 import java.awt.Dimension;
@@ -96,6 +95,7 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
                 continue;
             }
             Connection connection = mgr.getConnection(conName);
+            // nameList依赖items方法初始化，父类ItemEditableComboBoxPanel里异步执行item方法
             filterConnection(connection, conName, nameList);
         }
 
@@ -140,12 +140,10 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
         } else {
             String s = DesignerEnvManager.getEnvManager().getRecentSelectedConnection();
             if (StringUtils.isNotBlank(s)) {
-                for (int i = 0; i < this.getConnectionSize(); i++) {
+                // 之前的写法有多线程问题，nameList异步尚未初始化完成的时候，这里可能无法匹配设置数据连接名称，导致DBTableDataPane打开后连接面板空白
-                    String t = this.getConnection(i);
+                // 这里的需求无非是设置上一次使用的数据连接，做个简单检查这个连接是否存在即可，存在就设置
-                    if (ComparatorUtils.equals(s, t)) {
+                if (ConnectionConfig.getInstance().getConnection(s) != null) {
-                        this.setSelectedItem(s);
+                    this.setSelectedItem(s);
-                        break;
-                    }
                 }
             }
             // alex:如果这个ComboBox还是没有选中,那么选中第一个

designer-base/src/main/java/com/fr/design/gui/style/ReportBackgroundSpecialPane.java

@@ -29,7 +29,7 @@ public class ReportBackgroundSpecialPane extends BackgroundPane {
     protected BackgroundQuickPane[] supportKindsOfBackgroundUI() {
         NullBackgroundQuickPane nullBackgroundPane = new NullBackgroundQuickPane();
 
-        ColorBackgroundQuickPane colorBackgroundPane = new ColorBackgroundQuickPane();
+        ColorBackgroundQuickPane colorBackgroundPane = new ColorBackgroundQuickPane(true);
         colorBackgroundPane.registerChangeListener(new UIObserverListener() {
             @Override
             public void doChange() {

designer-base/src/main/java/com/fr/design/javascript/JavaScriptActionPane.java

@@ -42,7 +42,7 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane<JavaScript> {
     protected List<FurtherBasicBeanPane<? extends JavaScript>> initPaneList() {
         List<FurtherBasicBeanPane<? extends JavaScript>> paneList = new ArrayList<FurtherBasicBeanPane<? extends JavaScript>>();
         // JS脚本,表单提交,提交入库,流程管理,发送邮件. 703中去掉表单提交和流程管理
-        paneList.add(new JavaScriptImplPane(getDefaultArgs()));
+        paneList.add(new JavaScriptImplPane(getDefaultArgs(),true));
 //		paneList.add(new FormSubmitJavaScriptPane(this));
         contentDBManiPane = new ArrayList();
         contentDBManiPane.add(createDBManipulationPane());

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

@@ -16,10 +16,9 @@ public class ColorBackgroundQuickPane extends BackgroundQuickPane {
 
     private NewColorSelectBox colorSelectBox;
 
-
+    public ColorBackgroundQuickPane(boolean supportTransparent) {
-    public ColorBackgroundQuickPane() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        colorSelectBox = new NewColorSelectBox(100) {
+        colorSelectBox = new NewColorSelectBox(100, supportTransparent) {
             @Override
             public boolean shouldResponseChangeListener() {
                 // ColorBackgroundQuickPane注册监听器ChangeListenerImpl的逻辑不能丢，因为里面有修改字段backgroundChange的逻辑.
@@ -33,6 +32,10 @@ public class ColorBackgroundQuickPane extends BackgroundQuickPane {
         this.add(colorSelectBox, BorderLayout.NORTH);
     }
 
+    public ColorBackgroundQuickPane() {
+        this(false);
+    }
+
     public void populateBean(Background background) {
         ColorBackground colorBackgroud = (ColorBackground) background;
         populateColor(colorBackgroud.getColor());

designer-base/src/main/java/com/fr/design/startup/Install4jStartupNotificationProvider.java

@@ -1,6 +1,10 @@
 package com.fr.design.startup;
 
-import com.install4j.api.launcher.StartupNotification;
+import com.fr.invoke.Reflect;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
 
 /**
  * @author Starryi
@@ -18,18 +22,47 @@ public class Install4jStartupNotificationProvider implements FineStartupNotifica
 
     @Override
     public void registerStartupListener(Listener listener) {
-        boolean supported = false;
+        Class<?> StartupNotificationListenerClass = null;
+        try {
+            StartupNotificationListenerClass = Reflect.on("com.install4j.api.launcher.StartupNotification$Listener").type();
+        } catch (Exception ignored) {
+        }
+
+        if (StartupNotificationListenerClass == null) {
+            return;
+        }
+
+        ListenerHandler mHandler = new ListenerHandler(listener);
+        Object listenerCallbackInstance = Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] { StartupNotificationListenerClass }, mHandler);
         try {
-            supported = Class.forName("com.install4j.api.launcher.StartupNotification") != null;
+            Reflect.on("com.install4j.api.launcher.StartupNotification").call("registerStartupListener", listenerCallbackInstance);
-        } catch (Throwable ignored) {}
+        } catch (Exception ignored) {
-
-        if (supported) {
-            StartupNotification.registerStartupListener(new StartupNotification.Listener() {
-                @Override
-                public void startupPerformed(String parameters) {
-                    listener.startupPerformed(parameters);
-                }
-            });
         }
     }
+
+    private static class ListenerHandler implements InvocationHandler {
+        private final Listener listener;
+
+        public ListenerHandler(Listener listener) {
+            this.listener = listener;
+        }
+
+        @Override
+        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+            if (args[0] instanceof String) {
+                String parameters = (String) args[0];
+                listener.startupPerformed(parameters);
+            }
+            return null;
+        }
+    }
+
+    public static void main(String[] args) {
+        Install4jStartupNotificationProvider.getInstance().registerStartupListener(new Listener() {
+            @Override
+            public void startupPerformed(String parameters) {
+
+            }
+        });
+    }
 }

designer-base/src/main/java/com/fr/design/style/color/ColorCell.java

@@ -100,11 +100,13 @@ public class ColorCell extends JComponent implements ColorSelectable {
 
         if (e == null || e.getID() == MouseEvent.MOUSE_RELEASED) {
             colorSelectable.setColor(this.getColor());
-            colorSelectable.colorSetted(this);
+            // 先添加最近使用
             if (this.getColor() != null) {
                 int rgb = this.getColor().getRGB();
                 DesignerEnvManager.getEnvManager().getColorConfigManager().addToColorQueue(new Color(rgb));
             }
+            // 这边会获取到最近使用颜色并更新 添加逻辑需要放到前面 否则不会及时更新
+            colorSelectable.colorSetted(this);
         }
 
         if (e != null) {

designer-base/src/main/java/com/fr/design/style/color/NewColorSelectBox.java

@@ -20,13 +20,20 @@ public class NewColorSelectBox extends AbstractSelectBox<Color> implements UIObs
     private static final long serialVersionUID = 2782150678943960557L;
 
     private Color color;
-    private NewColorSelectPane colorPane = new NewColorSelectPane(false);
+    private NewColorSelectPane colorPane;
     private UIObserverListener uiObserverListener;
     private String newColorSelectBoxName = "";
     private GlobalNameListener globalNameListener = null;
+    private boolean supportTransparent;
 
     public NewColorSelectBox(int preferredWidth) {
-    	initBox(preferredWidth);
+    	this(preferredWidth, false);
+    }
+
+    public NewColorSelectBox(int preferredWidth, boolean supportTransparent) {
+        this.colorPane = new NewColorSelectPane(supportTransparent);
+        this.supportTransparent = supportTransparent;
+        initBox(preferredWidth);
         iniListener();
     }
 
@@ -58,7 +65,7 @@ public class NewColorSelectBox extends AbstractSelectBox<Color> implements UIObs
      */
     public JPanel initWindowPane(double preferredWidth) {
     	// 下拉的时候重新生成面板，以刷新最近使用颜色
-    	colorPane = new NewColorSelectPane(false);
+    	colorPane = new NewColorSelectPane(this.supportTransparent);
     	colorPane.setColor(this.getSelectObject());
     	colorPane.addChangeListener(new ChangeListener() {
     		public void stateChanged(ChangeEvent e) {

designer-base/src/main/java/com/fr/design/ui/ModernUIPane.java

@@ -203,6 +203,10 @@ public class ModernUIPane<T> extends BasicPane {
             this.pane = new ModernUIPane<>(browserType);
         }
 
+        public Builder(ModernUIPane<T> pane) {
+            this.pane = pane;
+        }
+
         public Builder<T> prepare(ScriptContextListener contextListener) {
             pane.browser.addScriptContextListener(contextListener);
             return this;

designer-base/src/main/java/com/fr/design/ui/compatible/NewModernUIPane.java

@@ -182,7 +182,7 @@ public class NewModernUIPane<T> extends ModernUIPane<T> {
     public void disposeBrowser() {
 
         if (browser != null) {
-            browser.close();
+            browser.engine().close();
             browser = null;
         }
 
@@ -206,6 +206,10 @@ public class NewModernUIPane<T> extends ModernUIPane<T> {
 
         private NewModernUIPane<T> pane = new NewModernUIPane<>();
 
+        public Builder() {
+            super((ModernUIPane<T>)null);
+        }
+
         public NewModernUIPane.Builder<T> prepare(InjectJsCallback callback) {
             pane.browser.set(InjectJsCallback.class, callback);
             return this;

designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java

@@ -29,6 +29,7 @@ import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.custom.VanChartCustomPlot;
 import com.fr.plugin.chart.vanchart.VanChart;
 
+import com.fr.van.chart.drillmap.designer.data.VanChartDrillMapDataPane;
 import javax.swing.JPanel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
@@ -148,7 +149,12 @@ public class ChartEditPane extends BasicPane implements AttributeChange, Prepare
             ChartInfoCollector.getInstance().updateChartPropertyTime(collection.getSelectedChartProvider(ChartProvider.class));
 
             selectedPane.update(collection);
-
+            for (int i = 0; i < paneList.size(); i++) {
+                if (paneList.get(i) instanceof VanChartDrillMapDataPane && i != tabsHeaderIconPane.getSelectedIndex()) {
+                    paneList.get(i).populateBean(collection);
+                    break;
+                }
+            }
             if (!ComparatorUtils.equals(collection, lastCollection)) {
                 VanChart vanChart = collection.getSelectedChartProvider(VanChart.class);
                 if (vanChart != null) {

designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java

@@ -150,17 +150,19 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane {
 
         //安装平台内打开插件时,添加相应按钮
         Set<HyperlinkProvider> providers = ExtraDesignClassManager.getInstance().getArray(HyperlinkProvider.XML_TAG);
-        for (HyperlinkProvider provider : providers) {
-            NameableCreator nc = provider.createHyperlinkCreator();
-                paneMap.put(nc.getHyperlink(), nc.getUpdatePane());
-        }
-
         java.util.List<UIMenuNameableCreator> list = refreshList(paneMap);
-        NameObjectCreator[] creators = new NameObjectCreator[list.size()];
+        int size = list.size();
-        for (int i = 0; list != null && i < list.size(); i++) {
+        NameObjectCreator[] creators = new NameObjectCreator[size + providers.size()];
+        for (int i = 0; i < size; i++) {
             UIMenuNameableCreator uiMenuNameableCreator = list.get(i);
             creators[i] = new NameObjectCreator(uiMenuNameableCreator.getName(), uiMenuNameableCreator.getObj().getClass(), uiMenuNameableCreator.getPaneClazz());
-
+        }
+        for (HyperlinkProvider provider : providers) {
+            NameableCreator creator = provider.createHyperlinkCreator();
+            if (creator != null) {
+                creators[size] = new NameObjectCreator(creator.menuName(), creator.getHyperlink(), creator.getUpdatePane());
+                size++;
+            }
         }
 
         refreshNameableCreator(creators);

designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java

@@ -4,6 +4,7 @@ import com.fr.design.beans.GroupModel;
 import com.fr.design.designer.beans.ConstraintsGroupModel;
 import com.fr.design.designer.beans.HoverPainter;
 import com.fr.design.designer.beans.models.DraggingModel;
+import com.fr.design.designer.beans.models.StateModel;
 import com.fr.design.designer.beans.painters.FRAbsoluteLayoutPainter;
 import com.fr.design.designer.creator.*;
 import com.fr.design.designer.properties.BoundsGroupModel;
@@ -353,7 +354,10 @@ public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter {
 	public void dragging(DraggingModel model) {
 		FormDesigner designer = model.getDesigner();
 		MouseEvent dragEvent = model.getCurrentDragEvent();
-		designer.getStateModel().dragging(dragEvent);
+		StateModel stateModel = designer.getStateModel();
+		if (stateModel.dragable()) {
+			stateModel.dragging(dragEvent);
+		}
 	}
 
 	@Override

designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java

@@ -764,6 +764,7 @@ public class XWFitLayout extends XLayoutContainer {
 				creator.setBackupBound(creator.getBounds());
 			}
 		}
+		LayoutUtils.layoutContainer(this);
 	}
 
 	private Rectangle recalculateWidgetBounds(Rectangle rec, int[] hors, int[] veris) {
@@ -831,11 +832,7 @@ public class XWFitLayout extends XLayoutContainer {
 		this.remove(oldCreator);
 		this.add(newCreator);
 		dealDirections(newCreator, false);
-		//对于新增的绝对布局的组件，需要更新下内部组件的大小
+		this.updateBoundsWidget();
-		if (newCreator.acceptType(XWAbsoluteLayout.class)){
-			((XWAbsoluteLayout) newCreator).updateBoundsWidget();
-			newCreator.setBackupBound(newCreator.getBounds());
-		}
 		isRefreshing = false;
 		LayoutUtils.layoutContainer(this);
 	}

designer-form/src/main/java/com/fr/design/designer/creator/XWParameterLayout.java

@@ -270,4 +270,16 @@ public class XWParameterLayout extends XWAbsoluteLayout {
     public boolean isTopable() {
         return false;
     }
+
+    /**
+     * 修改form布局的宽度时，需要同时修改表单参数界面的布局的宽度。
+     * */
+    @Override
+    public void doLayout() {
+        layout();
+        if (data != null && data instanceof WParameterLayout) {
+            ((WParameterLayout) data).setDesignWidth(getWidth());
+        }
+    }
+
 }

designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java

@@ -8,6 +8,7 @@ import com.fr.base.ScreenResolution;
 import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.LayoutAdapter;
 import com.fr.design.designer.beans.adapters.layout.FRWCardTagLayoutAdapter;
+import com.fr.design.designer.beans.models.ModelUtil;
 import com.fr.design.designer.beans.models.SelectionModel;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XCreatorUtils;
@@ -136,6 +137,9 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
         WTabFitLayout fitLayout = new WTabFitLayout(widgetName, tabFitIndex, currentCard);
         fitLayout.setTabNameIndex(getTabNameIndex());
         XWTabFitLayout tabFitLayout = new XWTabFitLayout(fitLayout, new Dimension());
+
+        FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
+        ModelUtil.renameWidgetName(formDesigner.getTarget(), tabFitLayout);
         WCardTagLayout layout = (WCardTagLayout) this.toData();
 
         if(!ComparatorUtils.equals(layout.getTemplateStyle().getStyle(), DefaultTemplateStyle.DEFAULT_TEMPLATE_STYLE)){

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

@@ -224,6 +224,9 @@ public class FormDesignerUI extends ComponentUI {
         }
 
         XCreator creator = draggingModel.getCreator();
+        if (!creator.isSupportDrag()) {
+            return false;
+        }
         int leftTopX = draggingModel.getCreatorLeftTopX();
         int leftTopY = draggingModel.getCreatorLeftTopY();
 

designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java

@@ -71,6 +71,7 @@ public class FRFitLayoutDefinePane extends AbstractFRLayoutDefinePane<WFitLayout
                 280, 20,
                 createLayoutPane()
         );
+        layoutExpandablePane.setBorder(BorderFactory.createEmptyBorder(0,0,10,0));
         this.add(layoutExpandablePane, BorderLayout.NORTH);
 
         JPanel advancePane = createAdvancePane();

designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java

@@ -1,16 +1,14 @@
 package com.fr.design.dscolumn;
 
 import com.fr.base.BaseFormula;
-import com.fr.data.util.SortOrder;
 import com.fr.design.border.UITitledBorder;
-import com.fr.design.constants.LayoutConstants;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.formula.CustomVariableResolver;
 import com.fr.design.formula.FormulaFactory;
-import com.fr.design.formula.SortFormulaPane;
 import com.fr.design.formula.UIFormula;
+import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icombobox.UIComboBox;
@@ -30,11 +28,19 @@ import com.fr.report.cell.cellattr.CellExpandAttr;
 import com.fr.report.cell.cellattr.core.group.DSColumn;
 import com.fr.report.cell.cellattr.core.group.SelectCount;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
-import java.awt.*;
+import javax.swing.Box;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.Arrays;
 
 import static com.fr.report.cell.cellattr.core.group.FilterTypeEnum.BOTTOM;
 import static com.fr.report.cell.cellattr.core.group.FilterTypeEnum.SPECIFY;
@@ -512,11 +518,12 @@ public class DSColumnAdvancedPane extends BasicPane {
         }
     }
 
-    public static class FormatAttrPane extends TextFormatPane {
+
+    public static class ReLayoutTextFormatPane extends TextFormatPane {
 
         protected void initLayout() {
-            JComponent[][] components = new JComponent[][]{{typeComboBox, textField, roundingBox}};
+            JComponent[][] components = new JComponent[][] { {typeComboBox, textField, roundingBox} };
-            double[] rowSize = new double[]{TableLayout.FILL};
+            double[] rowSize = new double[] { TableLayout.FILL };
             double[] columnSize = {TableLayout.PREFERRED, 200, TableLayout.PREFERRED};
 
             JPanel settingPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 4, 0);
@@ -542,6 +549,44 @@ public class DSColumnAdvancedPane extends BasicPane {
         }
     }
 
+    public static class FormatAttrPane extends AbstractAttrNoScrollPane {
+        private TextFormatPane formatPane;
+
+        @Override
+        protected JPanel createContentPane() {
+            this.formatPane = new ReLayoutTextFormatPane();
+            return this.formatPane;
+        }
+
+        @Override
+        public Dimension getPreferredSize() {
+            if (formatPane == null) {
+                return super.getPreferredSize();
+            }
+            return formatPane.getPreferredSize();
+        }
+
+        protected void initContentPane() {
+            leftContentPane = createContentPane();
+            if (leftContentPane != null) {
+                leftContentPane.setBorder(BorderFactory.createEmptyBorder());
+                this.add(leftContentPane, BorderLayout.CENTER);
+            }
+        }
+
+        public void populate(CellElement cellElement) {
+            if (cellElement != null && formatPane != null) {
+                formatPane.populateBean(cellElement.getStyle());
+            }
+        }
+
+        public void update(CellElement cellElement) {
+            if (cellElement != null && formatPane != null) {
+                cellElement.setStyle(formatPane.update(cellElement.getStyle()));
+            }
+        }
+    }
+
     private void checkButtonEnabled() {
         if (useMultiplyNumCheckBox.isSelected()) {
             multiNumSpinner.setEnabled(true);

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

@@ -161,6 +161,7 @@ public class WriteToolBarPane extends AbstractEditToolBarPane {
             colorButton.setColor(webWrite.getSelectedColor());
         } else {
             colorBox.setSelected(false);
+            colorButton.setEnabled(false);
         }
 
         if (webWrite.getSheetPosition() == Constants.TOP) {

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

@@ -4,6 +4,7 @@ import com.fr.base.BaseUtils;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.gui.core.WidgetOption;
 import com.fr.design.gui.ibutton.UIColorButton;
+import com.fr.design.gui.ibutton.UINoThemeColorButton;
 import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
@@ -44,7 +45,7 @@ public class WriteWebSettingPane extends WebSettingPane<WebWrite> {
     protected JPanel createOtherSetPane() {
         colorBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Background_Of_Current_Row") + ":");
         colorBox.setSelected(true);
-        colorButton = new UIColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/background.png"));
+        colorButton = new UINoThemeColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/background.png"));
         colorBox.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 colorButton.setEnabled(colorBox.isSelected());
@@ -108,6 +109,7 @@ public class WriteWebSettingPane extends WebSettingPane<WebWrite> {
     protected void setDefault() {
         super.setDefault();
         colorBox.setSelected(false);
+        colorButton.setEnabled(false);
         bottomRadioButton.setSelected(true);
         leftRadioButton.setSelected(true);
         unloadCheck.setSelected(true);
@@ -125,6 +127,7 @@ public class WriteWebSettingPane extends WebSettingPane<WebWrite> {
             colorButton.setColor(webWrite.getSelectedColor());
         } else {
             colorBox.setSelected(false);
+            colorButton.setEnabled(false);
         }
 
         if (webWrite.getSheetPosition() == Constants.TOP) {

designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

@@ -282,7 +282,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
         private  void initComponents(){
             dataPane = new SelectedDataColumnPane(true, true);
             groupPane = new ResultSetGroupDockingPane();
-
+			initListener();
             double[] rowSize = {P}, columnSize = {60, F};
             UILabel uiLabel = FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Report_Filter_Conditions"));
             condition = new DSColumnConditionAction();
@@ -299,6 +299,35 @@ public class CellDSColumnEditor extends CellQuickEditor {
             conditionPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, HGAP, VGAP);
             this.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         }
+		
+		
+        private void initListener() {
+            dataPane.setListener(new ItemListener() {
+                @Override
+                public void itemStateChanged(ItemEvent e) {
+                    if (e.getStateChange() == ItemEvent.SELECTED) {
+                        dataPane.update(cellElement);
+                        fireTargetModified();
+                    }
+                }
+            });
+            groupPane.setListener(new ItemListener() {
+                @Override
+                public void itemStateChanged(ItemEvent e) {
+                    if (e == null) {
+                        //分组-高级-自定义点确定的时候传进来null的e,但是这时候应该触发保存
+                        groupPane.update();
+                        fireTargetModified();
+                        return;
+                    }
+                    if (e.getStateChange() == ItemEvent.DESELECTED) {
+                        groupPane.update();
+                        fireTargetModified();
+                    }
+                }
+            });
+        }
+		
         @Override
         protected AttributeChangeListener getAttributeChangeListener() {
             return new AttributeChangeListener() {