Merge pull request #11768 in DESIGN/design from feature/10.0 to feature/big-screen

* commit '03e290c5e979f30dcfc385b2ee0fe5f766bcf525':
  REPORT-82787 图表空数据提示配置页面，默认图片需补充繁中版优化import
  REPORT-82787 图表空数据提示配置页面，默认图片需补充繁中版

designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java

@@ -308,7 +308,7 @@ public class EnvChangeEntrance {
         Set<Class> localServiceSet = FineObjectPool.getInstance().getServerPool().keySet();
 
         try {
-            JSONArray serviceArray = new FunctionalHttpRequest(info).getServiceList(info);
+            JSONArray serviceArray = new FunctionalHttpRequest(info).getServiceList();
             for(int i = 0; i < serviceArray.size(); i++){
                 try{
                     Class clazz = Class.forName((String) serviceArray.get(i));

designer-base/src/main/java/com/fr/design/actions/help/SystemInfoPane.java

@@ -41,15 +41,19 @@ public class SystemInfoPane extends JPanel {
         for (int i = 0; i < keys.length; i++) {
             Object[] tableRowData = new Object[2];
             String keyValue = keys[i].toString();
-
-            if (needToShield(keyValue)) {
-                continue;
+            // james:屏蔽掉exe4j的内容
+            if (keyValue.indexOf("exe4j") != -1) {
+            	continue;
             }
-
-            if(keyValue.contains("FineReport")){
-                keys[i] = keyValue.replaceAll("FineReport", ProductConstants.APP_NAME);
+            // james：这个也是exe4j的东东
+            if ("install4j.exeDir".equals(keyValue)) {
+            	continue;
             }
-
+            
+        	if(keyValue.indexOf("FineReport") != -1){
+        		keys[i] = keyValue.replaceAll("FineReport", ProductConstants.APP_NAME);
+        	}
+            
             tableRowData[0] = keys[i];
             tableRowData[1] = properties.getProperty((String) keys[i]);
             tableModel.addRow(tableRowData);
@@ -62,14 +66,4 @@ public class SystemInfoPane extends JPanel {
 
         add(new JScrollPane(table), BorderLayout.CENTER);
     }
-
-    /**
-     * 是否属于需要屏蔽的内容(当前屏蔽掉exe4j与jxbrowser的内容)
-     *
-     * @param keyValue 对应的key值
-     * @return 需要屏蔽则返回true
-     */
-    private boolean needToShield(String keyValue) {
-        return keyValue.contains("exe4j") || keyValue.contains("jxbrowser") || "install4j.exeDir".equals(keyValue);
-    }
 }

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

@@ -129,7 +129,6 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
                     } catch (InterruptedException e) {
                         FineLoggerFactory.getLogger().error(e.getMessage(), e);
                     } catch (ExecutionException e) {
-                        FineLoggerFactory.getLogger().error(e.getMessage(), e);
                         dialog.setSize(new Dimension(380, 142));
                         midPane.setVisible(true);
                         hiddenPanel.setVisible(false);
@@ -340,7 +339,6 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
         if (mainPanel instanceof JDBCDefPane) {
             ActionLabel actionLabel = new ActionLabel(Toolkit.i18nText("Fine-Design_Basic_Advanced_Setup"));
             actionLabel.addActionListener(new ActionListener() {
-                @Override
                 public void actionPerformed(ActionEvent evt) {
                     JDialog wDialog = createJDialog();
                     if (wDialog != null) {

designer-base/src/main/java/com/fr/design/versioncheck/VersionCheckUtils.java

@@ -215,7 +215,7 @@ public class VersionCheckUtils {
         Set<Class> localServiceSet = FineObjectPool.getInstance().getServerPool().keySet();
 
         try {
-            JSONArray serviceArray = new FunctionalHttpRequest(info).getServiceList(info);
+            JSONArray serviceArray = new FunctionalHttpRequest(info).getServiceList();
             for (int i = 0; i < serviceArray.size(); i++) {
                 try {
                     Class clazz = Class.forName((String) serviceArray.get(i));

designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java

@@ -13,6 +13,7 @@ import com.fr.third.springframework.web.context.support.AnnotationConfigWebAppli
 import com.fr.workspace.WorkContext;
 import org.apache.catalina.Context;
 import org.apache.catalina.LifecycleException;
+import org.apache.catalina.Wrapper;
 import org.apache.catalina.loader.WebappLoader;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.webresources.StandardRoot;
@@ -77,6 +78,10 @@ public class FineEmbedServerActivator extends Activator {
         String contextPath = "/" + ProductConstants.getAppFolderName();
         final Context context = tomcat.addContext(contextPath, docBase);
         context.setResources(new StandardRoot(context));
+        Wrapper servlet = Tomcat.addServlet(context, "DruidStatView", "com.fr.third.alibaba.druid.support.http.StatViewServlet");
+        context.addServletMappingDecoded("/druid/*", "DruidStatView");
+        servlet.setLoadOnStartup(1);
+        servlet.setOverridable(true);
         Tomcat.initWebappDefaults(context);
         //覆盖tomcat的WebAppClassLoader
         context.setLoader(new FRTomcatLoader());

designer-chart/src/main/java/com/fr/design/locale/impl/EmptyDataMark.java

@@ -0,0 +1,37 @@
+package com.fr.design.locale.impl;
+
+import com.fr.general.GeneralContext;
+import com.fr.general.IOUtils;
+import com.fr.general.locale.LocaleMark;
+
+import java.awt.image.BufferedImage;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * 根据本地化信息设置服务器图表空数据提示图标
+ *
+ * @author obo
+ * @version 11.0
+ * Created by obo on 2023/3/22
+ */
+public class EmptyDataMark implements LocaleMark<BufferedImage> {
+
+    private Map<Locale, BufferedImage> map = new HashMap<>();
+
+    private static final BufferedImage ZH_EMPTY_DATA = IOUtils.readImage("com/fr/design/images/zh_emptydata.png");
+    private static final BufferedImage US_EMPTY_DATA = IOUtils.readImage("/com/fr/design/images/us_emptydata.png");
+    private static final BufferedImage ZH_TRADITIONAL_EMPTY_DATA = IOUtils.readImage("/com/fr/design/images/zh_traditional_emptydata.png");
+
+    public EmptyDataMark() {
+        map.put(Locale.CHINA, ZH_EMPTY_DATA);
+        map.put(Locale.US, US_EMPTY_DATA);
+        map.put(Locale.TAIWAN, ZH_TRADITIONAL_EMPTY_DATA);
+    }
+    @Override
+    public BufferedImage getValue() {
+        BufferedImage result = map.get(GeneralContext.getLocale());
+        return result == null ? US_EMPTY_DATA : result;
+    }
+}

designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java

@@ -10,12 +10,13 @@ import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.locale.impl.EmptyDataMark;
 import com.fr.design.style.background.image.ImageFileChooser;
 import com.fr.design.style.background.image.ImagePreviewPane;
 import com.fr.design.utils.ImageUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.general.locale.image.LocaleImageFactory;
-import com.fr.general.locale.image.LocaleImageMark;
+import com.fr.general.locale.LocaleCenter;
+import com.fr.general.locale.LocaleMark;
 import com.fr.stable.Constants;
 import com.fr.stable.CoreGraphHelper;
 import com.fr.stable.StringUtils;
@@ -62,11 +63,10 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane {
     private Image emptyDataImage = DEFAULT_EMPTY_DATA_IMAGE;
     private SwingWorker<Void, Void> imageWorker;
 
-    private static final String EMPTY_DATA_IMAGE_PATH = "/com/fr/design/images/emptydata.png";
 
     static {
-        LocaleImageMark localeImageMark = LocaleImageFactory.getOrCreateLocaleMark(EMPTY_DATA_IMAGE_PATH);
-        DEFAULT_EMPTY_DATA_IMAGE = localeImageMark.getValue();
+        LocaleMark<BufferedImage> localeMark = LocaleCenter.getMark(EmptyDataMark.class);
+        DEFAULT_EMPTY_DATA_IMAGE = localeMark.getValue();
     }
 
     @Override

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

@@ -152,23 +152,24 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane {
         setPlot(plot);
         HashMap paneMap = getHyperlinkMap(plot);
 
+        //安装平台内打开插件时,添加相应按钮
+        Set<HyperlinkProvider> providers = ExtraDesignClassManager.getInstance().getArray(HyperlinkProvider.XML_TAG);
         java.util.List<UIMenuNameableCreator> list = refreshList(paneMap);
-        Map<String, NameObjectCreator> creators = new ListMap<>();
         int size = list.size();
+        NameObjectCreator[] creators = new NameObjectCreator[list.size() + providers.size()];
         for (int i = 0; i < size; i++) {
             UIMenuNameableCreator uiMenuNameableCreator = list.get(i);
-            NameObjectCreator creator = new NameObjectCreator(uiMenuNameableCreator.getName(), uiMenuNameableCreator.getObj().getClass(), uiMenuNameableCreator.getPaneClazz());
-            creators.put(uiMenuNameableCreator.getName(), creator);
+            creators[i] = new NameObjectCreator(uiMenuNameableCreator.getName(), uiMenuNameableCreator.getObj().getClass(), uiMenuNameableCreator.getPaneClazz());
         }
-        //安装平台内打开插件时, 添加/替换 相应按钮
-        Set<HyperlinkProvider> providers = ExtraDesignClassManager.getInstance().getArray(HyperlinkProvider.XML_TAG);
         for (HyperlinkProvider provider : providers) {
             NameableCreator creator = provider.createHyperlinkCreator();
             if (creator != null) {
-                creators.put(creator.menuName(), new NameObjectCreator(creator.menuName(), creator.getHyperlink(), creator.getUpdatePane()));
+                creators[size] = new NameObjectCreator(creator.menuName(), creator.getHyperlink(), creator.getUpdatePane());
+                size++;
             }
         }
-        refreshNameableCreator(creators.values().toArray(new NameObjectCreator[0]));
+
+        refreshNameableCreator(creators);
 
         java.util.List<NameObject> nameObjects = new ArrayList<NameObject>();
 
@@ -292,24 +293,12 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane {
             if (template == null) {
                 return false;
             }
-
-            if (template.isJWorkBook()) {
-                // 如果是普通报表单元格，那么没有 FormHyperlink 选项
-                FormHyperlinkProvider formHyperlink = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class);
-                return !ComparatorUtils.equals(clazz, formHyperlink.getClass());
-            } else {
-                // 如果是决策报表
-                if (template.getEditingReportIndex() == BaseJForm.ELEMENTCASE_TAB) {
-                    // 编辑的是决策报表中的报表块，那么没有 ChartHyperRelateFloatLink选项
-                    return !ComparatorUtils.equals(clazz, ChartHyperRelateFloatLink.class);
-                }
-                Class[] classes = new Class[]{ChartHyperRelateCellLink.class, ChartHyperRelateFloatLink.class};
-                for (Class aClass : classes) {
-                    if (template.getEditingReportIndex() == BaseJForm.FORM_TAB) {
-                        // 编辑的是决策报表中的图表，那么没有 ChartHyperRelateFloatLink 和 ChartHyperRelateCellLink 选项
-                        if (ComparatorUtils.equals(aClass, clazz)) {
-                            return false;
-                        }
+            Class[] classes = new Class[]{ChartHyperRelateCellLink.class, ChartHyperRelateFloatLink.class};
+            for (Class aClass : classes) {
+                if (template.getEditingReportIndex() == BaseJForm.FORM_TAB) {
+                    // 编辑的是决策报表中的图表，那么没有ChartHyperRelateFloatLink 和 ChartHyperRelateCellLink 选项，有FormHyperlink 选项
+                    if (ComparatorUtils.equals(aClass, clazz)) {
+                        return false;
                     }
                 }
             }

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

@@ -12,7 +12,6 @@ import com.fr.design.designer.beans.models.SelectionModel;
 import com.fr.design.designer.creator.XButton;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XLayoutContainer;
-import com.fr.design.designer.creator.XWAbsoluteLayout;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.ilable.UILabel;
@@ -28,28 +27,17 @@ import com.fr.form.ui.container.WTabTextDirection;
 import com.fr.form.ui.container.cardlayout.WCardTagLayout;
 import com.fr.form.ui.container.cardlayout.WTabFitLayout;
 import com.fr.general.Background;
+import com.fr.general.act.BorderPacker;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRFont;
-import com.fr.general.act.BorderPacker;
 import com.fr.general.act.TitlePacker;
 import com.fr.general.cardtag.TemplateStyle;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.unit.PT;
 
-import javax.swing.Action;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.JOptionPane;
-import javax.swing.JPopupMenu;
-import javax.swing.SwingUtilities;
+import javax.swing.*;
 import javax.swing.plaf.basic.BasicLabelUI;
-import java.awt.Color;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Point;
+import java.awt.*;
 import java.awt.event.MouseEvent;
 import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
@@ -255,89 +243,65 @@ public class XCardSwitchButton extends XButton {
 
 
 	//SwitchButton对应的XWCardLayout和XWCardTagLayout暂未存到xml中,重新打开时根据父子层关系获取
-	private void initRelateLayout() {
-		this.tagLayout = (XWCardTagLayout) this.getBackupParent();
+	private void initRelateLayout(){
+		this.tagLayout = (XWCardTagLayout)this.getBackupParent();
 		XWCardTitleLayout titleLayout = (XWCardTitleLayout) this.tagLayout.getBackupParent();
-		XWCardMainBorderLayout borderLayout = (XWCardMainBorderLayout) titleLayout.getBackupParent();
+		XWCardMainBorderLayout borderLayout = (XWCardMainBorderLayout)titleLayout.getBackupParent();
 		this.cardLayout = borderLayout.getCardPart();
 	}
 
-	/**
-	 * <p> 是否进入点击关闭按钮区域
-	 * <p> 计算逻辑：
-	 * <p> 先得到鼠标的绝对坐标 -> tab布局的绝对坐标 -> 得到鼠标相对tab的坐标（有参数面板时要减去参数面板的高度）
-	 * <p> 再计算删除区域位置的相对坐标，通过对比判定鼠标是否在点击关闭按钮区域内，即，鼠标的位置(ex,ey)：
-	 * <li> 当前点击tag删除区域的x坐标 < ex < 当前点击tag删除区域的x坐标 + 偏移量</li>
-	 * <li> 当前点击tag删除区域的y坐标 < ey < 当前点击tag删除区域的y坐标 + 偏移量</li>
-	 *
-	 * @param e        鼠标事件
-	 * @param designer 表单编辑对象
-	 * @return true/false 在内/不在
-	 */
-	private boolean isSelectedClose(MouseEvent e, FormDesigner designer) {
+	//是否进入点击关闭按钮区域
+	private boolean isSelectedClose(MouseEvent e, FormDesigner designer){
 
 		int diff = designer.getHorizontalScaleValue();
 
 		// mouse position
-		// 这里是鼠标的绝对位置
 		int ex = e.getX() + diff;
 		int ey = e.getY();
-		// 获取tab布局的位置,鼠标相对于tab按钮的位置
-		double[] tabPositionInBody = getTabAbsolutePositionInBody();
-		// 参数界面对坐标的影响
-		JForm jform = (JForm) HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
-		if (jform.getFormDesign().getParaComponent() != null) {
-			ey -= jform.getFormDesign().getParaHeight();
-		}
-		//减掉tab布局的相对位置
-		ex -= tabPositionInBody[0];
-		ey -= tabPositionInBody[1];
-
-		XLayoutContainer titleLayout = tagLayout.getBackupParent();
-		Point titlePoint = titleLayout.getLocation();
-		// button position
-		XCardSwitchButton button = this;
-		Point position = button.getLocation();
-		int width = button.getWidth();
 
-		// 鼠标进入按钮右侧删除图标区域
-		double recX = position.getX() + titlePoint.getX() + (width - CLOSE_ICON_RIGHT_OFFSET);
-		double recY = position.getY() + titlePoint.getY() + CLOSE_ICON_TOP_OFFSET;
-		// 比较的是相对位置的偏移量是否在一定距离内
-		// 所以要得到鼠标相对于当前tab块的坐标
-		return (recX < ex && ex < recX + CLOSE_ICON_RIGHT_OFFSET && ey < recY && ey > position.getY());
-	}
-
-	/**
-	 * 获取tab布局在body内的绝对位置
-	 *
-	 * @return
-	 */
-	private double[] getTabAbsolutePositionInBody() {
-		// 获取tab布局的位置,鼠标相对于tab按钮的位置
+		//获取tab布局的位置,鼠标相对于tab按钮的位置
 		Container mainLayout = cardLayout.getBackupParent();
-		// 这个point是当前tab布局的相对坐标，是相对于父容器的坐标
-		// 比如父级是一个absolute块，放在左上角，现在得到的point就是(0,0)
 		Point point = mainLayout.getLocation();
 		int y = 0;
 		int x = 0;
-		// 遍历一下，不然是相对位置，嵌套后位置不对
-		// 这里是要得到tab布局的绝对位置，所以要加上父组件的位置
-		while (mainLayout.getParent() != null) {
-			if (mainLayout instanceof XWCardLayout) {
+		//遍历一下，不然是相对位置，嵌套后位置不对
+		while (mainLayout.getParent() != null){
+			if(mainLayout instanceof XWCardLayout){
 				y += mainLayout.getY();
 			}
 
 			mainLayout = mainLayout.getParent();
 
-			if ((mainLayout instanceof XWCardMainBorderLayout) || (mainLayout instanceof XWAbsoluteLayout)) {
+			if(mainLayout instanceof XWCardMainBorderLayout){
 				x += mainLayout.getX();
 				y += mainLayout.getY();
 			}
 		}
 		double mainX = point.getX() + x;
 		double mainY = point.getY() + y;
-		return new double[]{mainX, mainY};
+
+		// 参数界面对坐标的影响
+		JForm jform = (JForm) HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+		if(jform.getFormDesign().getParaComponent() != null){
+			ey -= jform.getFormDesign().getParaHeight();
+		}
+
+		//减掉tab布局的相对位置
+		ex -= mainX;
+		ey -= mainY;
+
+		XLayoutContainer titleLayout = tagLayout.getBackupParent();
+		Point titlePoint = titleLayout.getLocation();
+		// button position
+		XCardSwitchButton button = this;
+		Point position = button.getLocation();
+		int width = button.getWidth();
+
+		// 鼠标进入按钮右侧删除图标区域
+		double recX = position.getX() + titlePoint.getX() +  (width - CLOSE_ICON_RIGHT_OFFSET);
+		double recY = position.getY() + titlePoint.getY() + CLOSE_ICON_TOP_OFFSET;
+
+		return (recX < ex && ex < recX + CLOSE_ICON_RIGHT_OFFSET &&  ey < recY && ey > position.getY());
 	}
 
 	//将当前switchButton改为选中状态
@@ -349,7 +313,7 @@ public class XCardSwitchButton extends XButton {
 		}
 	}
 
-	@Override
+    @Override
 	public void paintComponent(Graphics g) {
         super.paintComponent(g);
         Graphics2D g2d = (Graphics2D) g;

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

@@ -25,24 +25,20 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.mainframe.EditingMouseListener;
 import com.fr.design.mainframe.FormDesigner;
-import com.fr.design.mainframe.FormHierarchyTreePane;
 import com.fr.design.mainframe.WidgetPropertyPane;
-import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.form.ui.CardSwitchButton;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WCardLayout;
 import com.fr.form.ui.container.WTabDisplayPosition;
 import com.fr.form.ui.container.cardlayout.WCardTagLayout;
 import com.fr.form.ui.container.cardlayout.WTabFitLayout;
+import com.fr.general.act.BorderPacker;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRFont;
-import com.fr.general.act.BorderPacker;
 import com.fr.general.cardtag.DefaultTemplateStyle;
 
 import javax.swing.border.Border;
-import java.awt.Dimension;
-import java.awt.FontMetrics;
-import java.awt.Rectangle;
+import java.awt.*;
 import java.awt.event.ContainerEvent;
 import java.awt.event.MouseEvent;
 import java.util.HashMap;
@@ -445,7 +441,7 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
 
     }
 
-    private void fixTitleLayout(XLayoutContainer parent) {
+    private void fixTitleLayout(XLayoutContainer parent){
         FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
         LayoutAdapter layoutAdapter = AdapterBus.searchLayoutAdapter(formDesigner, parent);
         if (layoutAdapter != null) {
@@ -454,31 +450,4 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
         }
     }
 
-    /**
-     * <p> 对于tab组件，WCardMainBorderLayout里面有两个子容器:
-     * <li> WCardTitleLayout，里面包含两个部分，一个是CardAddButton，另一个是WCardTagLayout - tabpane0 </li>
-     * <li> WCardLayout，里面放的是WTabFitLayout - tab00、tab10</li>
-     * <p> 在右侧组件树选择删除WCardTagLayout时（tabpane0），按照现在的产品逻辑，应该删除整个tab组件
-     *
-     * @param creator  组件
-     * @param designer 表单设计器
-     */
-    @Override
-    public void deleteRelatedComponent(XCreator creator, FormDesigner designer) {
-        XWCardTagLayout tagLayout = (XWCardTagLayout) creator;
-        // 先删除所有tab按钮
-        tagLayout.removeAll();
-        //逐层回溯找出最外层的XWCardMainBorderLayout
-        XWCardTitleLayout cardTitleLayout = (XWCardTitleLayout) tagLayout.getBackupParent();
-        XWCardMainBorderLayout mainLayout = (XWCardMainBorderLayout) cardTitleLayout.getBackupParent();
-        // 删除tab布局
-        SelectionModel selectionModel = designer.getSelectionModel();
-        if (mainLayout != null) {
-            selectionModel.setSelectedCreator(mainLayout);
-            selectionModel.deleteSelection();
-        }
-        LayoutUtils.layoutRootContainer(designer.getRootComponent());
-        FormHierarchyTreePane.getInstance().refreshRoot();
-        selectionModel.setSelectedCreator(designer.getRootComponent());
-    }
 }

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

@@ -7,13 +7,16 @@ import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.gui.xpane.CardTagLayoutStylePane;
+import com.fr.design.gui.xpane.LayoutStylePane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.widget.accessibles.AccessibleCardTagWLayoutBorderStyleEditor;
 import com.fr.design.widget.ui.designer.AbstractDataModify;
 import com.fr.form.ui.LayoutBorderStyle;
 import com.fr.form.ui.container.WCardLayout;
 import com.fr.form.ui.container.cardlayout.WCardMainBorderLayout;
 
+
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
@@ -69,9 +72,6 @@ public class WCardMainLayoutDefinePane extends AbstractDataModify<WCardMainBorde
     @Override
     public void populateBean(WCardMainBorderLayout ob) {
         WCardLayout cardLayout = ob.getCardPart();
-        if (cardLayout == null) {
-            return;
-        }
         stylePane.populateBean((LayoutBorderStyle) cardLayout.getBorderStyle());
         setCarousel.setSelected(cardLayout.isCarousel());
         IntervalPane.setVisible(cardLayout.isCarousel());

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

@@ -24,6 +24,7 @@ import com.fr.form.ui.container.cardlayout.WCardTagLayout;
 import com.fr.general.Background;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRFont;
+
 import com.fr.general.cardtag.TemplateStyle;
 
 import javax.swing.BorderFactory;
@@ -106,11 +107,8 @@ public class WCardTagLayoutDefinePane extends AbstractDataModify<WCardTagLayout>
     public void populateBean(WCardTagLayout ob) {
         //标题背景和字体属性设置在WCardLayout上做兼容
         XLayoutContainer topLayout = creator.getTopLayout();
-        if (topLayout.getComponentCount() == 0) {
-            // 没有子组件，不用做处理
-            return;
-        }
         LayoutBorderStyle layoutBorderStyle = (LayoutBorderStyle) ((XWCardMainBorderLayout) topLayout).getCardPart().toData().getBorderStyle();
+
         displayPositionGroup.setSelectedIndex(ob.getDisplayPosition().getType());
         textDirectionGroup.setSelectedIndex(ob.getTextDirection().getType());
         backgroundEditor.setValue(layoutBorderStyle.getTitle().getBackground());