REPORT-51678 复用组件插件合并主jar

designer-form/src/main/java/com/fr/design/mainframe/share/collect/ComponentCollector.java

@@ -7,7 +7,7 @@ import com.fr.form.share.DefaultSharableWidget;
 import com.fr.form.share.SharableWidgetProvider;
 import com.fr.form.share.constants.ComponentPath;
 import com.fr.form.share.group.DefaultShareGroupManager;
-import com.fr.form.share.group.Group;
+import com.fr.form.share.Group;
 import com.fr.form.share.group.filter.DirFilter;
 import com.fr.form.share.group.filter.ReuFilter;
 import com.fr.general.ComparatorUtils;

designer-form/src/main/java/com/fr/design/mainframe/share/generate/task/ComponentCreator.java

@@ -8,7 +8,7 @@ import com.fr.design.mainframe.share.generate.impl.AbstractComponentCreatorProce
 import com.fr.form.main.Form;
 import com.fr.form.main.WidgetGatherAdapter;
 import com.fr.form.share.DefaultSharableWidget;
-import com.fr.form.share.EmbeddedConverter;
+import com.fr.form.share.ShareEmbeddedConverter;
 import com.fr.form.share.bean.ComponentReuBean;
 import com.fr.form.share.editor.DefaultSharableEditor;
 import com.fr.form.share.editor.PlainSharableEditor;
@@ -92,7 +92,7 @@ public class ComponentCreator extends AbstractComponentCreatorProcessor {
         }
 
 //        //内置数据集
-        EmbeddedConverter embeddedConverter = WorkContext.getCurrent().get(EmbeddedConverter.class);
+        ShareEmbeddedConverter embeddedConverter = WorkContext.getCurrent().get(ShareEmbeddedConverter.class);
         embeddedConverter.convertToEmbeddedTableData(tpl, paraMap);
 
         return tpl;

designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/LocalWidgetBlock.java

@@ -24,7 +24,7 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.form.share.DefaultSharableWidget;
 import com.fr.form.share.SharableWidgetProvider;
 import com.fr.form.share.constants.ShareComponentConstants;
-import com.fr.form.share.group.Group;
+import com.fr.form.share.Group;
 import com.fr.form.share.record.ShareWidgetInfoManager;
 import com.fr.form.ui.AbstractBorderStyleWidget;
 import com.fr.form.ui.Widget;

designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/OnlineWidgetBlock.java

@@ -23,7 +23,7 @@ import com.fr.form.share.SharableWidgetProvider;
 import com.fr.form.share.bean.OnlineShareWidget;
 import com.fr.form.share.constants.ShareComponentConstants;
 import com.fr.form.share.group.DefaultShareGroupManager;
-import com.fr.form.share.group.Group;
+import com.fr.form.share.Group;
 import com.fr.form.share.utils.ShareUtils;
 import com.fr.form.ui.AbstractBorderStyleWidget;
 import com.fr.form.ui.Widget;

designer-form/src/main/java/com/fr/design/mainframe/share/ui/local/GroupPane.java

@@ -16,7 +16,7 @@ import com.fr.design.mainframe.share.util.ShareUIUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.form.share.SharableWidgetProvider;
 import com.fr.form.share.group.DefaultShareGroupManager;
-import com.fr.form.share.group.Group;
+import com.fr.form.share.Group;
 import com.fr.general.IOUtils;
 import com.fr.stable.StringUtils;
 

designer-form/src/main/java/com/fr/design/mainframe/share/ui/local/LocalWidgetRepoPane.java

@@ -10,7 +10,7 @@ import com.fr.design.mainframe.share.ui.widgetfilter.LocalWidgetFilter;
 import com.fr.design.mainframe.share.util.InstallComponentHelper;
 import com.fr.design.mainframe.share.util.ShareComponentUtils;
 import com.fr.form.share.group.DefaultShareGroupManager;
-import com.fr.form.share.group.Group;
+import com.fr.form.share.Group;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 

designer-form/src/main/java/com/fr/design/mainframe/share/ui/local/LocalWidgetSelectPane.java

@@ -5,7 +5,7 @@ import com.fr.design.mainframe.share.ui.block.LocalWidgetBlock;
 import com.fr.form.share.DefaultSharableWidget;
 import com.fr.form.share.SharableWidgetProvider;
 import com.fr.form.share.constants.ShareComponentConstants;
-import com.fr.form.share.group.Group;
+import com.fr.form.share.Group;
 import com.fr.form.share.record.ShareWidgetInfoManager;
 import com.fr.general.ComparatorUtils;
 import com.fr.stable.ArrayUtils;

designer-form/src/main/java/com/fr/design/mainframe/share/ui/local/ManagePane.java

@@ -16,7 +16,7 @@ import com.fr.design.mainframe.share.ui.base.PopupMenuItem;
 import com.fr.design.mainframe.share.util.ShareUIUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.form.share.group.DefaultShareGroupManager;
-import com.fr.form.share.group.Group;
+import com.fr.form.share.Group;
 import com.fr.general.IOUtils;
 import com.fr.stable.StringUtils;
 

designer-form/src/main/java/com/fr/design/mainframe/share/ui/local/WidgetSelectedManager.java

@@ -1,7 +1,7 @@
 package com.fr.design.mainframe.share.ui.local;
 
 import com.fr.form.share.group.DefaultShareGroupManager;
-import com.fr.form.share.group.Group;
+import com.fr.form.share.Group;
 
 import java.util.HashMap;
 import java.util.List;

designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineDownloadPackagePane.java

@@ -15,7 +15,7 @@ import com.fr.design.mainframe.share.util.DownloadUtils;
 import com.fr.design.mainframe.share.util.InstallUtils;
 import com.fr.design.mainframe.share.util.ShareComponentUtils;
 import com.fr.form.share.bean.OnlineShareWidget;
-import com.fr.form.share.group.Group;
+import com.fr.form.share.Group;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StableUtils;
 import org.jetbrains.annotations.Nullable;

designer-form/src/main/java/com/fr/design/mainframe/share/util/InstallUtils.java

@@ -2,7 +2,7 @@ package com.fr.design.mainframe.share.util;
 
 import com.fr.form.share.group.DefaultShareGroup;
 import com.fr.form.share.group.DefaultShareGroupManager;
-import com.fr.form.share.group.Group;
+import com.fr.form.share.Group;
 import com.fr.form.share.group.TempFileOperator;
 import com.fr.form.share.utils.ReuxUtils;
 import com.fr.form.share.utils.ShareUtils;

designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareGeneratePane.java

@@ -25,10 +25,9 @@ import com.fr.design.share.utils.ShareDialogUtils;
 import com.fr.form.share.DefaultSharableWidget;
 import com.fr.form.share.config.ComponentReuseConfigManager;
 import com.fr.form.share.group.DefaultShareGroupManager;
-import com.fr.form.share.group.Group;
+import com.fr.form.share.Group;
 import com.fr.form.share.record.ShareWidgetInfoManager;
 import com.fr.form.ui.Widget;
-import com.fr.locale.InterProviderFactory;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 

designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareMainPane.java

@@ -34,8 +34,7 @@ import com.fr.form.share.DefaultSharableWidget;
 import com.fr.form.share.bean.StyleThemeBean;
 import com.fr.form.share.constants.ShareComponentConstants;
 import com.fr.form.share.group.DefaultShareGroupManager;
-import com.fr.form.share.group.Group;
-import com.fr.locale.InterProviderFactory;
+import com.fr.form.share.Group;
 import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.manage.PluginFilter;
 import com.fr.plugin.manage.PluginManager;