|
|
@ -4,6 +4,7 @@ |
|
|
|
package com.fr.design.designer.creator; |
|
|
|
package com.fr.design.designer.creator; |
|
|
|
|
|
|
|
|
|
|
|
import com.fr.base.chart.BaseChartCollection; |
|
|
|
import com.fr.base.chart.BaseChartCollection; |
|
|
|
|
|
|
|
import com.fr.base.svg.IconUtils; |
|
|
|
import com.fr.base.theme.FineColorSynchronizer; |
|
|
|
import com.fr.base.theme.FineColorSynchronizer; |
|
|
|
import com.fr.base.theme.FormTheme; |
|
|
|
import com.fr.base.theme.FormTheme; |
|
|
|
import com.fr.base.theme.TemplateTheme; |
|
|
|
import com.fr.base.theme.TemplateTheme; |
|
|
@ -72,7 +73,6 @@ import com.fr.form.ui.container.cardlayout.WCardTitleLayout; |
|
|
|
import com.fr.form.ui.container.cardlayout.WTabFitLayout; |
|
|
|
import com.fr.form.ui.container.cardlayout.WTabFitLayout; |
|
|
|
import com.fr.general.ComparatorUtils; |
|
|
|
import com.fr.general.ComparatorUtils; |
|
|
|
import com.fr.general.GeneralContext; |
|
|
|
import com.fr.general.GeneralContext; |
|
|
|
import com.fr.general.IOUtils; |
|
|
|
|
|
|
|
import com.fr.invoke.Reflect; |
|
|
|
import com.fr.invoke.Reflect; |
|
|
|
import com.fr.log.FineLoggerFactory; |
|
|
|
import com.fr.log.FineLoggerFactory; |
|
|
|
import com.fr.plugin.context.PluginContext; |
|
|
|
import com.fr.plugin.context.PluginContext; |
|
|
@ -85,13 +85,13 @@ import com.fr.report.fit.ReportFitAttr; |
|
|
|
import com.fr.report.fit.ReportFitConfig; |
|
|
|
import com.fr.report.fit.ReportFitConfig; |
|
|
|
import com.fr.stable.StringUtils; |
|
|
|
import com.fr.stable.StringUtils; |
|
|
|
import com.fr.third.javax.annotation.Nonnull; |
|
|
|
import com.fr.third.javax.annotation.Nonnull; |
|
|
|
import java.util.Set; |
|
|
|
|
|
|
|
import org.jetbrains.annotations.Nullable; |
|
|
|
import org.jetbrains.annotations.Nullable; |
|
|
|
|
|
|
|
|
|
|
|
import javax.swing.Icon; |
|
|
|
import javax.swing.Icon; |
|
|
|
import java.awt.Container; |
|
|
|
import java.awt.Container; |
|
|
|
import java.awt.Dimension; |
|
|
|
import java.awt.Dimension; |
|
|
|
import java.util.List; |
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
import java.util.Set; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* XCreator的相关处理 |
|
|
|
* XCreator的相关处理 |
|
|
@ -363,7 +363,7 @@ public class XCreatorUtils { |
|
|
|
if (StringUtils.isEmpty(iconPath)) { |
|
|
|
if (StringUtils.isEmpty(iconPath)) { |
|
|
|
return null; |
|
|
|
return null; |
|
|
|
} |
|
|
|
} |
|
|
|
return IOUtils.readIcon(iconPath); |
|
|
|
return IconUtils.readIcon(iconPath); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public static boolean containComponent(Container ancestor, Container xCreator) { |
|
|
|
public static boolean containComponent(Container ancestor, Container xCreator) { |
|
|
|