Pull request #5840: CHART-19792 大屏模板屏蔽全局参数菜单项 && CHART-20662 fix:数据集字段拖入单元格 白色文字

Merge in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0

* commit '42a85a9cb3e72dc15ded98b3d4e0ac5447a9869d':
  add executeJavaScriptAndReturnValue function
  CHART-20662 fix:数据集字段拖入单元格 白色文字
  CHART-19792 大屏模板屏蔽全局参数菜单项

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

@@ -40,6 +40,7 @@ import com.fr.design.actions.server.GlobalParameterAction;
 import com.fr.design.actions.server.GlobalTableDataAction;
 import com.fr.design.actions.server.PlatformManagerAction;
 import com.fr.design.actions.server.PluginManagerAction;
+import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.file.NewTemplatePane;
 import com.fr.design.fun.MenuHandler;
 import com.fr.design.fun.OemProcessor;
@@ -491,10 +492,12 @@ public abstract class ToolBarMenuDock {
 
         if (!DesignerMode.isAuthorityEditing()) {
             addPluginManagerAction(menuDef);
-            menuDef.addShortCut(
+            menuDef.addShortCut(new FunctionManagerAction());
-                    new FunctionManagerAction(),
+
-                    new GlobalParameterAction()
+            if (!DesignModeContext.isDuchampMode()) {
-            );
+                menuDef.addShortCut(new GlobalParameterAction());
+            }
+
         }
 
 

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

@@ -11,7 +11,6 @@ import com.fr.web.struct.AssembleComponent;
 import com.teamdev.jxbrowser.browser.callback.InjectJsCallback;
 import com.teamdev.jxbrowser.chromium.Browser;
 import com.teamdev.jxbrowser.chromium.BrowserType;
-import com.teamdev.jxbrowser.chromium.JSObject;
 import com.teamdev.jxbrowser.chromium.JSValue;
 import com.teamdev.jxbrowser.chromium.events.LoadListener;
 import com.teamdev.jxbrowser.chromium.events.ScriptContextAdapter;
@@ -23,11 +22,11 @@ import com.teamdev.jxbrowser.event.Observer;
 import javax.swing.JDialog;
 import javax.swing.SwingUtilities;
 import javax.swing.WindowConstants;
-import java.util.Map;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.Map;
 
 /**
  * @author richie
@@ -180,12 +179,10 @@ public class ModernUIPane<T> extends BasicPane {
         }
     }
 
-    public JSObject getEmptyJSObjectV6() {
+    public JSValue executeJavaScriptAndReturnValue(String javaScript) {
-
         if (browser != null) {
-            return browser.executeJavaScriptAndReturnValue("var __empty_props__ = {};__empty_props__").asObject();
+            return browser.executeJavaScriptAndReturnValue(javaScript);
         }
-
         return null;
     }
 

designer-realize/src/main/java/com/fr/design/present/ConditionAttributesGroupPane.java

@@ -7,6 +7,7 @@ import com.fr.design.gui.controlpane.NameableCreator;
 import com.fr.design.gui.controlpane.UIListControlPane;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.ElementCasePane;
+import com.fr.design.utils.gui.AdjustWorkBookDefaultStyleUtils;
 import com.fr.general.NameObject;
 import com.fr.grid.selection.CellSelection;
 import com.fr.grid.selection.Selection;
@@ -83,6 +84,7 @@ public class ConditionAttributesGroupPane extends UIListControlPane {
 		editCellElement = tplEC.getTemplateCellElement(cs.getColumn(), cs.getRow());
 		if (editCellElement == null) {
 			editCellElement = new DefaultTemplateCellElement(cs.getColumn(), cs.getRow());
+			AdjustWorkBookDefaultStyleUtils.adjustCellElement(editCellElement);
 		}
 
 		SheetUtils.calculateDefaultParent(tplEC);  // 不知道这行代码的作用，怕去掉之后会出问题，先放在这里

designer-realize/src/main/java/com/fr/grid/dnd/ElementCasePaneDropTarget.java

@@ -5,6 +5,7 @@ import com.fr.design.actions.UpdateAction;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.mainframe.ElementCasePane;
+import com.fr.design.utils.gui.AdjustWorkBookDefaultStyleUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.data.TableDataColumn;
 import com.fr.grid.Grid;
@@ -251,7 +252,7 @@ public class ElementCasePaneDropTarget extends DropTargetAdapter {
             cellExPandAttr.setDirection(Constants.TOP_TO_BOTTOM);
             if (curCellElement == null) {
                 curCellElement = new DefaultTemplateCellElement(cs.getColumn(), cs.getRow(), cs.getColumnSpan(), cs.getRowSpan(), newLinearDSColumn);
-
+                AdjustWorkBookDefaultStyleUtils.adjustCellElement(curCellElement);
                 report.addCellElement(curCellElement);
             } else {
                 // marks:直接覆盖值