REPORT-51678 复用组件合并主jar国际化

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

@@ -2,9 +2,9 @@ package com.fr.design.mainframe;
 
 import com.fr.base.BaseUtils;
 import com.fr.design.dialog.BasicPane;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.share.constants.ShareEntryKey;
 import com.fr.form.ui.Widget;
-import com.fr.locale.InterProviderFactory;
 import com.fr.stable.Constants;
 import com.fr.stable.bridge.StableFactory;
 
@@ -47,7 +47,7 @@ public class CoverReportPane extends CoverPane{
 
         // 画配置文字
         g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-        g2d.drawString(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_Help_Settings"),x + 30, 17);
+        g2d.drawString(Toolkit.i18nText("Fine-Design_Share_Help_Settings"),x + 30, 17);
         // 画图标
         BufferedImage image = BaseUtils.readImage("com/fr/base/images/share/config.png");
         g2d.drawImage(image, x + 10, 5, image.getWidth(), image.getHeight(), null);

designer-form/src/main/java/com/fr/design/mainframe/share/action/CreateComponentAction.java

@@ -21,7 +21,6 @@ import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.mainframe.FormSelection;
 import com.fr.design.mainframe.JForm;
 import com.fr.design.mainframe.JTemplate;
-import com.fr.design.mainframe.form.FormECCompositeProvider;
 import com.fr.design.mainframe.share.constants.ShareEntryKey;
 import com.fr.design.mainframe.share.select.ComponentTransformerFactory;
 import com.fr.design.parameter.ParameterInputPane;
@@ -36,7 +35,6 @@ import com.fr.form.ui.DictionaryContainer;
 import com.fr.form.ui.ElementCaseEditor;
 import com.fr.form.ui.Widget;
 import com.fr.general.IOUtils;
-import com.fr.locale.InterProviderFactory;
 import com.fr.log.FineLoggerFactory;
 import com.fr.report.cell.DefaultTemplateCellElement;
 import com.fr.report.cell.cellattr.core.group.DSColumn;
@@ -95,7 +93,7 @@ public class CreateComponentAction extends UpdateAction {
 
     public CreateComponentAction(ShareUIAspect aspect) {
         this.putValue(Action.SMALL_ICON, null);
-        this.setName(Toolkit.i18nText("Fine-Plugin_Component_Create"));
+        this.setName(Toolkit.i18nText("Fine-Design_Share_Create"));
         this.aspect = aspect;
     }
 
@@ -116,7 +114,7 @@ public class CreateComponentAction extends UpdateAction {
         // 获取选中的组件
         Triple<Widget, XCreator, Rectangle> sharedTriple = ComponentTransformerFactory.getInstance().transform(selection);
         if (sharedTriple == null) {
-            FineJOptionPane.showMessageDialog(designerFrame, InterProviderFactory.getProvider().getLocText("Fine-Plugin_Select_Error_Tip"),
+            FineJOptionPane.showMessageDialog(designerFrame, Toolkit.i18nText("Fine-Design_Share_Select_Error_Tip"),
                     Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), ERROR_MESSAGE, IOUtils.readIcon("/com/fr/base/images/share/Information_Icon_warning_normal_32x32.png"));
             return;
         }
@@ -149,7 +147,7 @@ public class CreateComponentAction extends UpdateAction {
 //            ShareGuidePane moduleGuidePane = new ShareGuidePane(jt, widget, sharedTriple.getRight(), coverImage, parameterMap, aspect);
             ShareGuidePane.show();
         } catch (Exception e) {
-            FineJOptionPane.showMessageDialog(designerFrame, InterProviderFactory.getProvider().getLocText("Fine-Plugin_Create_Share_Pane_Failed"),
+            FineJOptionPane.showMessageDialog(designerFrame, Toolkit.i18nText("Fine-Design_Share_Create_Share_Pane_Failed"),
                     Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }

designer-form/src/main/java/com/fr/design/mainframe/share/action/InstallComponentAction.java

@@ -37,7 +37,7 @@ public class InstallComponentAction extends UpdateAction {
 
     public InstallComponentAction() {
         this.putValue(Action.SMALL_ICON, null);
-        this.setName(Toolkit.i18nText("Fine-Plugin_Component_Install"));
+        this.setName(Toolkit.i18nText("Fine-Design_Share_Install"));
     }
 
     @Override
@@ -116,7 +116,7 @@ public class InstallComponentAction extends UpdateAction {
             });
             dialog.setVisible(true);
         } else {
-            ShareUIUtils.showErrorMessageDialog(Toolkit.i18nText("Fine-Plugin_Component_Share_Module_Install_Error"));
+            ShareUIUtils.showErrorMessageDialog(Toolkit.i18nText("Fine-Design_Share_Share_Module_Install_Error"));
         }
     }
 

designer-form/src/main/java/com/fr/design/mainframe/share/constants/ComponentTypes.java

@@ -12,7 +12,7 @@ import java.util.Set;
  **/
 public enum ComponentTypes implements ComponentType {
 
-    CHART("Fine-Plugin_Component_Type_Basic_Element") {
+    CHART("Fine-Design_Share_Type_Basic_Element") {
         @Override
         public List<String> children(int device) {
 
@@ -29,7 +29,7 @@ public enum ComponentTypes implements ComponentType {
         }
     },
 
-    REPORT("Fine-Plugin_Component_Type_Report") {
+    REPORT("Fine-Design_Share_Type_Report") {
         @Override
         public List<String> children(int device) {
 
@@ -81,18 +81,18 @@ public enum ComponentTypes implements ComponentType {
 
     private enum ReportChildTypes {
 
-        INDICATOR_CARD("Fine-Plugin_Component_Type_Indicator_Card"),
+        INDICATOR_CARD("Fine-Design_Share_Type_Indicator_Card"),
 
-        TITLE("Fine-Plugin_Component_Type_Title"),
+        TITLE("Fine-Design_Share_Type_Title"),
 
-        DIMENSION_CHANGE("Fine-Plugin_Component_Type_Dimension_Change"),
+        DIMENSION_CHANGE("Fine-Design_Share_Type_Dimension_Change"),
 
-        FILL("Fine-Plugin_Component_Type_Fill", DisplayDevice.MOBILE),
+        FILL("Fine-Design_Share_Type_Fill", DisplayDevice.MOBILE),
 
-        Directory_Navigation("Fine-Plugin_Component_Type_Mobile_Directory_Navigation", DisplayDevice.MOBILE),
+        Directory_Navigation("Fine-Design_Share_Type_Mobile_Directory_Navigation", DisplayDevice.MOBILE),
 
 
-        SPECIAL_CARD("Fine-Plugin_Component_Type_Special_Card");
+        SPECIAL_CARD("Fine-Design_Share_Type_Special_Card");
 
         private String locale;
 
@@ -135,23 +135,23 @@ public enum ComponentTypes implements ComponentType {
 
     private enum ChartChildTypes {
 
-        COLUMN_CHART("File-Plugin_Component_Type_Chart_Column"),
+        COLUMN_CHART("Fine-Design_Share_Type_Chart_Column"),
 
-        PIE_CHART("Fine-Plugin_Component_Type_Chart_Pie"),
+        PIE_CHART("Fine-Design_Share_Type_Chart_Pie"),
 
-        FOLD_LINE_CHART("Fine-Plugin_Component_Type_Chart_Fold_Line"),
+        FOLD_LINE_CHART("Fine-Design_Share_Type_Chart_Fold_Line"),
 
-        COMBINE_CHART("Fine-Plugin_Component_Type_Chart_Combine"),
+        COMBINE_CHART("Fine-Design_Share_Type_Chart_Combine"),
 
-        METER_CHART("Fine-Plugin_Component_Type_Chart_Meter"),
+        METER_CHART("Fine-Design_Share_Type_Chart_Meter"),
 
-        MAP_CHART("Fine-Plugin_Component_Type_Chart_Map"),
+        MAP_CHART("Fine-Design_Share_Type_Chart_Map"),
 
-        OTHERS("Fine-Plugin_Component_Type_Chart_Other"),
+        OTHERS("Fine-Design_Share_Type_Chart_Other"),
 
-        DETAIL_LIST("Fine-Plugin_Component_Type_Detail_List"),
+        DETAIL_LIST("Fine-Design_Share_Type_Detail_List"),
 
-        BASIC_WIDGET("Fine-Plugin_Component_Type_Basic_Widget");
+        BASIC_WIDGET("Fine-Design_Share_Type_Basic_Widget");
 
         private String locale;
 

designer-form/src/main/java/com/fr/design/mainframe/share/constants/StyleTheme.java

@@ -17,11 +17,11 @@ import java.util.List;
  */
 public enum StyleTheme {
 
-    SIMPLE_FRESH("Fine-Plugin_Component_Style_Theme_Simple", "1"),
+    SIMPLE_FRESH("Fine-Design_Share_Style_Theme_Simple", "1"),
-    BUSINESS_STABLE("Fine-Plugin_Component_Style_Theme_Business", "2"),
+    BUSINESS_STABLE("Fine-Design_Share_Style_Theme_Business", "2"),
-    LIVE_GORGEOUS("Fine-Plugin_Component_Style_Theme_Live", "3"),
+    LIVE_GORGEOUS("Fine-Design_Share_Style_Theme_Live", "3"),
-    COOL_TECHNOLOGY("Fine-Plugin_Component_Style_Theme_Cool", "4"),
+    COOL_TECHNOLOGY("Fine-Design_Share_Style_Theme_Cool", "4"),
-    OTHER_THEME("Fine-Plugin_Component_Style_Theme_Other", "5");
+    OTHER_THEME("Fine-Design_Share_Style_Theme_Other", "5");
 
 
     private final String local;

designer-form/src/main/java/com/fr/design/mainframe/share/exception/LackOfValueException.java

@@ -9,6 +9,6 @@ public class LackOfValueException extends RuntimeException{
     
     public LackOfValueException() {
         
-        super(Toolkit.i18nText("Fine-Plugin_Lack_Val"));
+        super(Toolkit.i18nText("Fine-Design_Share_Lack_Val"));
     }
 }

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

@@ -72,7 +72,7 @@ public class ComponentCreator extends AbstractComponentCreatorProcessor {
     @Override
     public String getLoadingText() {
 
-        return Toolkit.i18nText("Fine-Plugin_Component_Generate_Ing");
+        return Toolkit.i18nText("Fine-Design_Share_Generate_Ing");
     }
 
     /**

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

@@ -39,6 +39,6 @@ public class ComponentDesensitize implements ComponentBanner {
     
     @Override
     public String getLoadingText() {
-        return Toolkit.i18nText("Fine-Plugin_Component_Desensitize");
+        return Toolkit.i18nText("Fine-Design_Share_Desensitize");
     }
 }

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

@@ -23,6 +23,6 @@ public class ComponentEncrypt implements ComponentBanner {
     
     @Override
     public String getLoadingText() {
-        return Toolkit.i18nText("Fine-Plugin_Component_Encrypt");
+        return Toolkit.i18nText("Fine-Design_Share_Encrypt");
     }
 }

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

@@ -14,6 +14,6 @@ public class ComponentGenerateComplete implements ComponentBanner {
     @Override
     public String getLoadingText() {
         
-        return Toolkit.i18nText("Fine-Plugin_Component_Generate_Success");
+        return Toolkit.i18nText("Fine-Design_Share_Generate_Success");
     }
 }

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

@@ -14,6 +14,6 @@ public class ComponentUploadComplete implements ComponentBanner {
     
     @Override
     public String getLoadingText() {
-        return Toolkit.i18nText("Fine-Plugin_Component_Upload_Success");
+        return Toolkit.i18nText("Fine-Design_Share_Upload_Success");
     }
 }

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

@@ -74,7 +74,7 @@ public class ComponentUploader implements ComponentBanner {
     @Override
     public String getLoadingText() {
 
-        return Toolkit.i18nText("Fine-Plugin_Component_Encrypt");
+        return Toolkit.i18nText("Fine-Design_Share_Encrypt");
     }
 
     private boolean upload0(String path) throws Exception {

designer-form/src/main/java/com/fr/design/mainframe/share/group/ui/GroupFileDialog.java

@@ -100,7 +100,7 @@ abstract public class GroupFileDialog extends BaseGroupDialog {
         if (isDuplicate(name)) {
             nameField.selectAll();
             // 如果文件名已存在，则灰掉确认按钮
-            warnLabel.setText(Toolkit.i18nText("Fine-Plugin_Component_Group_Repeat_Name_Info"));
+            warnLabel.setText(Toolkit.i18nText("Fine-Design_Share_Group_Repeat_Name_Info"));
             warnLabel.setVisible(true);
             confirmButton.setEnabled(false);
         } else {
@@ -122,7 +122,7 @@ abstract public class GroupFileDialog extends BaseGroupDialog {
 
     private UILabel creteNewNameLabel() {
         // 输入框前提示
-        UILabel newNameLabel = new UILabel(Toolkit.i18nText("Fine-Plugin_Component_Group_Enter_New_Folder_Name"));
+        UILabel newNameLabel = new UILabel(Toolkit.i18nText("Fine-Design_Share_Group_Enter_New_Folder_Name"));
         newNameLabel.setHorizontalAlignment(SwingConstants.RIGHT);
         newNameLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 10));
         newNameLabel.setPreferredSize(new Dimension(84, 16));

designer-form/src/main/java/com/fr/design/mainframe/share/group/ui/GroupMoveDialog.java

@@ -26,7 +26,7 @@ abstract public class GroupMoveDialog extends BaseGroupDialog {
         this.setLayout(new BorderLayout());
         this.setModal(true);
 
-        setTitle(Toolkit.i18nText("Fine-Plugin_Component_Group_Move"));
+        setTitle(Toolkit.i18nText("Fine-Design_Share_Group_Move"));
         // 标签
         UILabel newNameLabel = creteNewNameLabel();
         // 输入框
@@ -65,7 +65,7 @@ abstract public class GroupMoveDialog extends BaseGroupDialog {
 
     private UILabel creteNewNameLabel() {
         // 输入框前提示
-        UILabel newNameLabel = new UILabel(Toolkit.i18nText("Fine-Plugin_Component_Group_Select"));
+        UILabel newNameLabel = new UILabel(Toolkit.i18nText("Fine-Design_Share_Group_Select"));
         newNameLabel.setHorizontalAlignment(SwingConstants.RIGHT);
         newNameLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 10));
         newNameLabel.setPreferredSize(new Dimension(60, 16));

designer-form/src/main/java/com/fr/design/mainframe/share/select/ComponentTransformerImpl.java

@@ -109,7 +109,7 @@ public class ComponentTransformerImpl implements ComponentTransformer {
             selectedWidget = (Widget) selectedWidget.clone();
         } catch (CloneNotSupportedException e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            FineJOptionPane.showMessageDialog(null, Inter.getLocText("FR-Plugin_Share_Module_Failed"));
+            FineJOptionPane.showMessageDialog(null, Inter.getLocText("Fine-Design_Share_Module_Failed"));
         }
         return new ImmutableTriple<>(selectedWidget, selectedCreator, selectedTriple);
     }

designer-form/src/main/java/com/fr/design/mainframe/share/sort/OnlineWidgetSortType.java

@@ -75,7 +75,7 @@ public enum OnlineWidgetSortType implements SortType<OnlineShareWidget> {
 
         @Override
         public String getDisplayName() {
-            return Toolkit.i18nText("Fine-Plugin_Component_Composite");
+            return Toolkit.i18nText("Fine-Design_Share_Composite");
         }
     },
 
@@ -99,7 +99,7 @@ public enum OnlineWidgetSortType implements SortType<OnlineShareWidget> {
 
         @Override
         public String getDisplayName() {
-            return Toolkit.i18nText("Fine-Plugin_Component_Sale");
+            return Toolkit.i18nText("Fine-Design_Share_Sale");
         }
     },
 
@@ -122,7 +122,7 @@ public enum OnlineWidgetSortType implements SortType<OnlineShareWidget> {
 
         @Override
         public String getDisplayName() {
-            return Toolkit.i18nText("Fine-Plugin_Component_New_Product");
+            return Toolkit.i18nText("Fine-Design_Share_New_Product");
         }
     }
     //现在不用，以后可能会用，先注释掉
@@ -146,7 +146,7 @@ public enum OnlineWidgetSortType implements SortType<OnlineShareWidget> {
 
         @Override
         public String getDisplayName() {
-            return Toolkit.i18nText("Fine-Plugin_Component_Price");
+            return Toolkit.i18nText("Fine-Design_Share_Price");
         }
     };*/
 

designer-form/src/main/java/com/fr/design/mainframe/share/sort/WidgetSortType.java

@@ -33,7 +33,7 @@ public enum WidgetSortType implements SortType<SharableWidgetProvider> {
 
         @Override
         public String getDisplayName() {
-            return Toolkit.i18nText("Fine-Plugin_Component_Install_Time");
+            return Toolkit.i18nText("Fine-Design_Share_Install_Time");
         }
     },
     COMPONENT_NAME {
@@ -49,7 +49,7 @@ public enum WidgetSortType implements SortType<SharableWidgetProvider> {
 
         @Override
         public String getDisplayName() {
-            return Toolkit.i18nText("Fine-Plugin_Component_Sort_Name");
+            return Toolkit.i18nText("Fine-Design_Share_Sort_Name");
         }
     }
 }

designer-form/src/main/java/com/fr/design/mainframe/share/ui/base/DownloadProgressPane.java

@@ -48,7 +48,7 @@ public class DownloadProgressPane extends JPanel {
         labelPane.add(closeLabel, BorderLayout.EAST);
         labelPane.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 7));
 
-        UILabel downloadTipLabel = new UILabel(Toolkit.i18nText("Fine-Plugin_Component_Package_Downloading_Tip"));
+        UILabel downloadTipLabel = new UILabel(Toolkit.i18nText("Fine-Design_Share_Package_Downloading_Tip"));
         downloadTipLabel.setPreferredSize(new Dimension(240, 90));
         downloadTipLabel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5));
         downloadTipLabel.setForeground(Color.WHITE);
@@ -103,8 +103,8 @@ public class DownloadProgressPane extends JPanel {
 
 
     private enum ProcessState {
-        DOWNLOADING(Toolkit.i18nText("Fine-Plugin_Component_Package_Downloading")),
+        DOWNLOADING(Toolkit.i18nText("Fine-Design_Share_Package_Downloading")),
-        INSTALLING(Toolkit.i18nText("Fine-Plugin_Component_Package_Installing"));
+        INSTALLING(Toolkit.i18nText("Fine-Design_Share_Package_Installing"));
 
         private final String tip;
 

designer-form/src/main/java/com/fr/design/mainframe/share/ui/base/FailureMessagePane.java

@@ -22,7 +22,7 @@ import java.awt.FlowLayout;
 public class FailureMessagePane extends BasicPane {
     public FailureMessagePane(String str) {
         UILabel imageLabel = new UILabel(IOUtils.readIcon("/com/fr/base/images/share/error_icon.png"));
-        UILabel label = new UILabel(Toolkit.i18nText("Fine-Plugin_Component_Share_Modules_Error"));
+        UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Share_Share_Modules_Error"));
         UITextPane textPane = new UITextPane();
         UIScrollPane jScrollPane = new UIScrollPane(textPane);
         JPanel panel = new JPanel();
@@ -52,7 +52,7 @@ public class FailureMessagePane extends BasicPane {
 
     @Override
     protected String title4PopupWindow() {
-        return Toolkit.i18nText("Fine-Plugin_Component_Dialog_Message");
+        return Toolkit.i18nText("Fine-Design_Share_Dialog_Message");
     }
 
 }

designer-form/src/main/java/com/fr/design/mainframe/share/ui/base/LoadingPane.java

@@ -17,7 +17,7 @@ import java.awt.Dimension;
 public class LoadingPane extends JPanel {
 
     public LoadingPane() {
-        this(Toolkit.i18nText("Fine-Plugin_Component_Online_Loading"));
+        this(Toolkit.i18nText("Fine-Design_Share_Online_Loading"));
     }
 
     public LoadingPane(String message) {

designer-form/src/main/java/com/fr/design/mainframe/share/ui/base/NoMatchPane.java

@@ -27,7 +27,7 @@ public class NoMatchPane extends JPanel {
         picLabel.setIcon(BaseUtils.readIcon("com/fr/base/images/share/no_match_icon.png"));
         picLabel.setHorizontalAlignment(SwingConstants.CENTER);
         picLabel.setPreferredSize(new Dimension(240, 100));
-        UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Plugin_Component_No_Match_Result"), SwingConstants.CENTER);
+        UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Share_No_Match_Result"), SwingConstants.CENTER);
         label.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0));
         label.setForeground(Color.gray);
         label.setPreferredSize(new Dimension(240, 20));

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

@@ -203,7 +203,7 @@ public class LocalWidgetBlock extends PreviewWidgetBlock<DefaultSharableWidget>
             shareId = no.getBindInfo().getId();
             creatorSource = getGroup().getElCaseEditorById(shareId);
             if (creatorSource == null) {
-                ShareUIUtils.showErrorMessageDialog(Toolkit.i18nText("Fine-Plugin_Component_Drag_Error_Info"));
+                ShareUIUtils.showErrorMessageDialog(Toolkit.i18nText("Fine-Design_Share_Drag_Error_Info"));
                 return;
             }
             creatorSource.setWidgetID(UUID.randomUUID().toString());
@@ -265,7 +265,7 @@ public class LocalWidgetBlock extends PreviewWidgetBlock<DefaultSharableWidget>
     private class MoveGroupAction extends UpdateAction {
         public MoveGroupAction() {
             this.putValue(Action.SMALL_ICON, null);
-            this.setName(Toolkit.i18nText("Fine-Plugin_Component_Group_Move"));
+            this.setName(Toolkit.i18nText("Fine-Design_Share_Group_Move"));
         }
 
         @Override
@@ -280,7 +280,7 @@ public class LocalWidgetBlock extends PreviewWidgetBlock<DefaultSharableWidget>
                         ShareWidgetInfoManager.getInstance().saveXmlInfo();
                         LocalWidgetRepoPane.getInstance().refreshShowPanel(false);
                     } else {
-                        ShareUIUtils.showErrorMessageDialog(Toolkit.i18nText("Fine-Plugin_Component_Group_Move_Fail_Message"));
+                        ShareUIUtils.showErrorMessageDialog(Toolkit.i18nText("Fine-Design_Share_Group_Move_Fail_Message"));
                     }
                 }
 
@@ -291,19 +291,19 @@ public class LocalWidgetBlock extends PreviewWidgetBlock<DefaultSharableWidget>
     private class RemoveAction extends UpdateAction {
         public RemoveAction() {
             this.putValue(Action.SMALL_ICON, null);
-            this.setName(Toolkit.i18nText("Fine-Plugin_Component_Remove"));
+            this.setName(Toolkit.i18nText("Fine-Design_Share_Remove"));
         }
 
         @Override
         public void actionPerformed(ActionEvent e) {
             int rv = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
-                    Toolkit.i18nText("Fine-Plugin_Component_Remove_Info"),
+                    Toolkit.i18nText("Fine-Design_Share_Remove_Info"),
-                    Toolkit.i18nText("Fine-Plugin_Component_Group_Confirm"),
+                    Toolkit.i18nText("Fine-Design_Share_Group_Confirm"),
                     FineJOptionPane.YES_NO_OPTION
             );
             if (rv == FineJOptionPane.YES_OPTION) {
                 if (!WidgetSelectedManager.getInstance().unInstallSelect(getGroup().getGroupName(), getWidget().getId())) {
-                    FineJOptionPane.showMessageDialog(null, Toolkit.i18nText("Fine-Plugin_Component_Remove_Failure"));
+                    FineJOptionPane.showMessageDialog(null, Toolkit.i18nText("Fine-Design_Share_Remove_Failure"));
                 }
                 LocalWidgetRepoPane.getInstance().refreshShowPanel(getGroup());
             }

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

@@ -134,7 +134,7 @@ public class OnlineWidgetBlock extends AbstractOnlineWidgetBlock {
             shareId = widget.getUuid();
             creatorSource = ShareUtils.getElCaseEditorById(shareId);
             if (creatorSource == null) {
-                ShareUIUtils.showErrorMessageDialog(Toolkit.i18nText("Fine-Plugin_Component_Drag_Error_Info"));
+                ShareUIUtils.showErrorMessageDialog(Toolkit.i18nText("Fine-Design_Share_Drag_Error_Info"));
                 return;
             }
             creatorSource.setWidgetID(UUID.randomUUID().toString());
@@ -199,7 +199,7 @@ public class OnlineWidgetBlock extends AbstractOnlineWidgetBlock {
                     if (get()) {
                         LocalWidgetRepoPane.getInstance().refreshShowPanel();
                     } else {
-                        ShareUIUtils.showErrorMessageDialog(Toolkit.i18nText("Fine-Plugin_Component_Download_Failed"));
+                        ShareUIUtils.showErrorMessageDialog(Toolkit.i18nText("Fine-Design_Share_Download_Failed"));
                     }
                 } catch (InterruptedException e) {
                     FineLoggerFactory.getLogger().error(e.getMessage(), e);

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

@@ -29,7 +29,7 @@ public class OnlineWidgetPackageBlock extends AbstractOnlineWidgetBlock {
         UILabel label = new UILabel(widget.getName(), UILabel.CENTER);
         label.setToolTipText(widget.getName());
         southPane.add(label, BorderLayout.CENTER);
-        UILabel detailLabel = new UILabel(Toolkit.i18nText("Fine-Plugin_Component_Online_Package_Detail"));
+        UILabel detailLabel = new UILabel(Toolkit.i18nText("Fine-Design_Share_Online_Package_Detail"));
         detailLabel.setForeground(TEXT_COLOR);
         detailLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
         detailLabel.addMouseListener(new MouseClickListener() {

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

@@ -309,12 +309,12 @@ class GroupPane extends JPanel {
         private class RenameAction extends UpdateAction {
             public RenameAction() {
                 this.putValue(Action.SMALL_ICON, null);
-                this.setName(Toolkit.i18nText("Fine-Plugin_Component_Group_Rename"));
+                this.setName(Toolkit.i18nText("Fine-Design_Share_Group_Rename"));
             }
 
             @Override
             public void actionPerformed(ActionEvent e) {
-                new GroupFileDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Plugin_Component_Group_Rename", group.getGroupName())) {
+                new GroupFileDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Share_Group_Rename", group.getGroupName())) {
                     @Override
                     protected void confirmClose() {
                         this.dispose();
@@ -323,7 +323,7 @@ class GroupPane extends JPanel {
                             titleLabel.setText(groupName);
                             repaint();
                         } else {
-                            ShareUIUtils.showErrorMessageDialog(Toolkit.i18nText("Fine-Plugin_Component_Group_Rename_Failure"));
+                            ShareUIUtils.showErrorMessageDialog(Toolkit.i18nText("Fine-Design_Share_Group_Rename_Failure"));
                         }
                     }
 
@@ -339,22 +339,22 @@ class GroupPane extends JPanel {
         private class RemoveAction extends UpdateAction {
             public RemoveAction() {
                 this.putValue(Action.SMALL_ICON, null);
-                this.setName(Toolkit.i18nText("Fine-Plugin_Component_Group_Remove"));
+                this.setName(Toolkit.i18nText("Fine-Design_Share_Group_Remove"));
             }
 
             @Override
             public void actionPerformed(ActionEvent e) {
                 int rv = FineJOptionPane.showConfirmDialog(
                         DesignerContext.getDesignerFrame(),
-                        Toolkit.i18nText("Fine-Plugin_Component_Group_Remove_Info"),
+                        Toolkit.i18nText("Fine-Design_Share_Group_Remove_Info"),
-                        Toolkit.i18nText("Fine-Plugin_Component_Group_Confirm"),
+                        Toolkit.i18nText("Fine-Design_Share_Group_Confirm"),
                         FineJOptionPane.YES_NO_OPTION
                 );
                 if (rv == FineJOptionPane.YES_OPTION) {
                     if (DefaultShareGroupManager.getInstance().removeGroup(group)) {
                         LocalWidgetRepoPane.getInstance().removeGroup(group.getGroupName());
                     } else {
-                        ShareUIUtils.showErrorMessageDialog(Toolkit.i18nText("Fine-Plugin_Component_Group_Remove_Failure"));
+                        ShareUIUtils.showErrorMessageDialog(Toolkit.i18nText("Fine-Design_Share_Group_Remove_Failure"));
                     }
                 }
             }

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

@@ -48,9 +48,9 @@ enum LocalPaneStatus {
             panel.add(picLabel, BorderLayout.CENTER);
 
             JPanel labelPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-            UILabel topLabel = new UILabel(Toolkit.i18nText("Fine-Plugin_Component_Empty_First"), SwingConstants.CENTER);
+            UILabel topLabel = new UILabel(Toolkit.i18nText("Fine-Design_Share_Empty_First"), SwingConstants.CENTER);
             topLabel.setForeground(Color.GRAY);
-            UILabel bottomLabel = new UILabel(Toolkit.i18nText("Fine-Plugin_Component_Empty_Second"), SwingConstants.CENTER);
+            UILabel bottomLabel = new UILabel(Toolkit.i18nText("Fine-Design_Share_Empty_Second"), SwingConstants.CENTER);
             bottomLabel.setForeground(Color.GRAY);
             labelPanel.add(topLabel, BorderLayout.CENTER);
             labelPanel.add(bottomLabel, BorderLayout.SOUTH);
@@ -79,7 +79,7 @@ enum LocalPaneStatus {
     INSTALLING {
         @Override
         public JPanel getPanel() {
-            return new LoadingPane(Toolkit.i18nText("Fine-Plugin_Component_installing"));
+            return new LoadingPane(Toolkit.i18nText("Fine-Design_Share_installing"));
         }
     };
 

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

@@ -261,6 +261,6 @@ public class LocalWidgetRepoPane extends BasicPane {
 
     @Override
     protected String title4PopupWindow() {
-        return Toolkit.i18nText("Fine-Plugin_Component_Local_Widget");
+        return Toolkit.i18nText("Fine-Design_Share_Local_Widget");
     }
 }

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

@@ -96,7 +96,7 @@ class ManagePane extends JPanel implements ShareUIAspect {
      */
     private UIButton createAddComponentButton() {
         return createManageButton(
-                Toolkit.i18nText("Add"),
+                Toolkit.i18nText("Fine-Design_Share_Add"),
                 IOUtils.readIcon("/com/fr/base/images/share/filter_combo.png"),
                 e -> {
                     //创建组件和安装组件的弹窗
@@ -116,7 +116,7 @@ class ManagePane extends JPanel implements ShareUIAspect {
      */
     private UIButton createManageButton() {
         return createManageButton(
-                Toolkit.i18nText("Manage"),
+                Toolkit.i18nText("Fine-Design_Share_Manage"),
                 e -> replacePanel(true)
         );
     }
@@ -126,8 +126,8 @@ class ManagePane extends JPanel implements ShareUIAspect {
      */
     private UIButton createAddGroupButton() {
         return createManageButton(
-                Toolkit.i18nText("Group_Add"),
+                Toolkit.i18nText("Fine-Design_Share_Group_Add"),
-                e -> new GroupFileDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Plugin_Component_Group_Add")) {
+                e -> new GroupFileDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Share_Group_Add")) {
                     @Override
                     protected void confirmClose() {
                         this.dispose();
@@ -151,7 +151,7 @@ class ManagePane extends JPanel implements ShareUIAspect {
 
     private UIButton createCancelButton() {
         return createManageButton(
-                Toolkit.i18nText("Group_Cancel"),
+                Toolkit.i18nText("Fine-Design_Share_Group_Cancel"),
                 e -> replacePanel(false)
         );
     }
@@ -177,13 +177,13 @@ class ManagePane extends JPanel implements ShareUIAspect {
 
     private UIButton createDeleteSelectedButton() {
         return createManageButton(
-                Toolkit.i18nText("Select_Remove"),
+                Toolkit.i18nText("Fine-Design_Share_Select_Remove"),
                 new Color(0xeb1d1f),
                 e -> {
                     int rv = FineJOptionPane.showConfirmDialog(
                             DesignerContext.getDesignerFrame(),
-                            Toolkit.i18nText("Fine-Plugin_Component_Remove_Info"),
+                            Toolkit.i18nText("Fine-Design_Share_Remove_Info"),
-                            Toolkit.i18nText("Fine-Plugin_Component_Group_Confirm"),
+                            Toolkit.i18nText("Fine-Design_Share_Group_Confirm"),
                             FineJOptionPane.YES_NO_OPTION
                     );
                     if (rv == FineJOptionPane.YES_OPTION) {
@@ -200,7 +200,7 @@ class ManagePane extends JPanel implements ShareUIAspect {
 
     private UIButton createMoveGroupButton() {
         return createManageButton(
-                Toolkit.i18nText("Group_Move"),
+                Toolkit.i18nText("Fine-Design_Share_Group_Move"),
                 e -> new GroupMoveDialog(DesignerContext.getDesignerFrame()) {
                     @Override
                     protected void confirmClose() {
@@ -211,7 +211,7 @@ class ManagePane extends JPanel implements ShareUIAspect {
                             replacePanel(false);
                         } else {
                             LocalWidgetRepoPane.getInstance().refreshShowPanel();
-                            ShareUIUtils.showErrorMessageDialog(Toolkit.i18nText("Fine-Plugin_Component_Group_Move_Fail_Message"));
+                            ShareUIUtils.showErrorMessageDialog(Toolkit.i18nText("Fine-Design_Share_Group_Move_Fail_Message"));
                         }
                     }
 

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

@@ -81,7 +81,7 @@ class ToolbarPane extends JPanel {
     private UIButton createSearchButton() {
         return createToolButton(
                 IOUtils.readIcon("/com/fr/base/images/share/search_icon.png"),
-                Toolkit.i18nText("Fine-Plugin_Component_Search"),
+                Toolkit.i18nText("Fine-Design_Share_Search"),
                 e -> {
                     cardLayout.show(centerPane, SEARCH);
                     searchTextField.requestFocus();
@@ -92,7 +92,7 @@ class ToolbarPane extends JPanel {
     private UIButton createSortButton() {
         return createToolButton(
                 IOUtils.readIcon("/com/fr/base/images/share/sort_icon.png"),
-                Toolkit.i18nText("Fine-Plugin_Component_Sort"),
+                Toolkit.i18nText("Fine-Design_Share_Sort"),
                 e -> {
                     UIPopupMenu popupMenu = new UIPopupMenu();
                     popupMenu.setOnlyText(true);

designer-form/src/main/java/com/fr/design/mainframe/share/ui/menu/TemplateStoreMenu.java

@@ -2,11 +2,11 @@ package com.fr.design.mainframe.share.ui.menu;
 
 import com.fr.base.BaseUtils;
 import com.fr.design.actions.UpdateAction;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.share.collect.ComponentCollector;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.design.utils.BrowseUtils;
 import com.fr.general.CloudCenter;
-import com.fr.locale.InterProviderFactory;
 
 import javax.swing.KeyStroke;
 import java.awt.event.ActionEvent;
@@ -29,7 +29,7 @@ public class TemplateStoreMenu extends UpdateAction {
         @Override
         public String getMenuName() {
             
-            return InterProviderFactory.getProvider().getLocText("Fine-Plugin_Template_Store");
+            return Toolkit.i18nText("Fine-Design_Share_Template_Store");
         }
         
         @Override

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

@@ -103,7 +103,7 @@ public class OnlineDownloadPackagePane extends OnlineWidgetSelectPane {
             @Override
             public void mouseClicked(MouseEvent e) {
                 int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
-                        Toolkit.i18nText("Fine-Plugin_Component_Download_Cancel_Confirm"), Toolkit.i18nText("Fine-Plugin_Component_Group_Confirm"),
+                        Toolkit.i18nText("Fine-Design_Share_Download_Cancel_Confirm"), Toolkit.i18nText("Fine-Design_Share_Group_Confirm"),
                         FineJOptionPane.OK_CANCEL_OPTION);
                 if (returnVal == FineJOptionPane.OK_OPTION) {
                     //取消下载线程

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

@@ -50,7 +50,7 @@ public class OnlineWidgetRepoPane extends BasicPane {
 
     @Override
     protected String title4PopupWindow() {
-        return Toolkit.i18nText("Fine-Plugin_Component_Online");
+        return Toolkit.i18nText("Fine-Design_Share_Online");
     }
 
     public OnlineWidgetRepoPane() {
@@ -146,9 +146,9 @@ public class OnlineWidgetRepoPane extends BasicPane {
         imagePanel.setPreferredSize(new Dimension(240, 96));
         imagePanel.setHorizontalAlignment(SwingConstants.CENTER);
         panel.add(imagePanel);
-        UILabel uiLabel = tipLabel(Toolkit.i18nText("Fine-Plugin_Component_Internet_Connect_Failed"));
+        UILabel uiLabel = tipLabel(Toolkit.i18nText("Fine-Design_Share_Internet_Connect_Failed"));
         uiLabel.setForeground(Color.decode("#8F8F92"));
-        UILabel reloadLabel = tipLabel(Toolkit.i18nText("Fine-Plugin_Component_Online_Reload"));
+        UILabel reloadLabel = tipLabel(Toolkit.i18nText("Fine-Design_Share_Online_Reload"));
         reloadLabel.setForeground(Color.decode("#419BF9"));
         reloadLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
         reloadLabel.addMouseListener(new MouseClickListener() {
@@ -160,9 +160,9 @@ public class OnlineWidgetRepoPane extends BasicPane {
         });
 
 
-        UILabel tipLabel1 = tipLabel(Toolkit.i18nText("Fine-Plugin_Component_Internet_Connect_Failed_Tip1"));
+        UILabel tipLabel1 = tipLabel(Toolkit.i18nText("Fine-Design_Share_Internet_Connect_Failed_Tip1"));
         tipLabel1.setForeground(Color.decode("#8F8F92"));
-        UILabel tipLabel2 = tipLabel(Toolkit.i18nText("Fine-Plugin_Component_Internet_Connect_Failed_Tip2"));
+        UILabel tipLabel2 = tipLabel(Toolkit.i18nText("Fine-Design_Share_Internet_Connect_Failed_Tip2"));
         tipLabel2.setForeground(Color.decode("#8F8F92"));
         UILabel tipLabel3 = tipLabel(MARKET_URL);
         tipLabel3.setForeground(Color.decode("#8F8F92"));

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

@@ -15,8 +15,8 @@ import java.awt.CardLayout;
  * Created by kerry on 2020-10-19
  */
 public class OnlineWidgetTabPane extends JPanel {
-    private static final String COMPONENT = com.fr.design.i18n.Toolkit.i18nText("Fine-Plugin_Component");
+    private static final String COMPONENT = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Share");
-    private static final String COMPONENT_PACKAGE = com.fr.design.i18n.Toolkit.i18nText("Fine-Plugin_Component_Package");
+    private static final String COMPONENT_PACKAGE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Share_Package");
     private CardLayout cardLayout;
     private JPanel centerPane;
     private boolean packagePaneCreated = false;

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

@@ -61,14 +61,14 @@ public class OnlineWidgetPackagesShowPane extends AbstractOnlineWidgetShowPane {
                 cardLayout.show(centerPane, WIDGETS_INFO);
             }
         });
-        downloadLabel = createLabel(Toolkit.i18nText("Fine-Plugin_Component_Download_All_Component"), new MouseClickListener() {
+        downloadLabel = createLabel(Toolkit.i18nText("Fine-Design_Share_Download_All_Component"), new MouseClickListener() {
             @Override
             public void mouseClicked(MouseEvent e) {
-                String message = Toolkit.i18nText("Fine-Plugin_Component_Download_All_Component_Message")
+                String message = Toolkit.i18nText("Fine-Design_Share_Download_All_Component_Message")
                         + "\n"
-                        + Toolkit.i18nText("Fine-Plugin_Component_Total")
+                        + Toolkit.i18nText("Fine-Design_Share_Total")
                         + onlineWidgetSelectPane.getSharableWidgetNum()
-                        + Toolkit.i18nText("Fine-Plugin_Component_Piece");
+                        + Toolkit.i18nText("Fine-Design_Share_Piece");
                 int returnValue = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), message, Toolkit.i18nText("Fine-Design_Basic_Confirm"), FineJOptionPane.YES_NO_OPTION);
                 if (returnValue == FineJOptionPane.OK_OPTION && onlineWidgetSelectPane.getSharableWidgetNum() != 0) {
                     downLoadPackage();

designer-form/src/main/java/com/fr/design/mainframe/share/ui/widgetfilter/FilterPane.java

@@ -56,7 +56,7 @@ public class FilterPane extends JPanel {
         jPanel.setBorder(BorderFactory.createLineBorder(Color.decode("#D9DADD")));
         this.add(jPanel, BorderLayout.CENTER);
         jPanel.setBackground(Color.WHITE);
-        this.filterLabel = new UILabel(Toolkit.i18nText("Fine-Plugin_Component_Online_No_Filter"), SwingConstants.LEFT);
+        this.filterLabel = new UILabel(Toolkit.i18nText("Fine-Design_Share_Online_No_Filter"), SwingConstants.LEFT);
         filterLabel.setBorder(BorderFactory.createEmptyBorder(0, 8, 0, 0));
         filterLabel.setPreferredSize(new Dimension(80, 20));
         filterLabel.setForeground(Color.decode("#8F8F92"));
@@ -207,13 +207,13 @@ public class FilterPane extends JPanel {
     }
 
     private void switchToNoFilter() {
-        filterLabel.setText(Toolkit.i18nText("Fine-Plugin_Component_Online_No_Filter"));
+        filterLabel.setText(Toolkit.i18nText("Fine-Design_Share_Online_No_Filter"));
         filterLabel.setForeground(Color.decode("#8F8F92"));
         filterLabel.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
     }
 
     private void switchToClearFilter() {
-        filterLabel.setText(Toolkit.i18nText("Fine-Plugin_Component_Online_Clear_Filter"));
+        filterLabel.setText(Toolkit.i18nText("Fine-Design_Share_Online_Clear_Filter"));
         filterLabel.setForeground(Color.decode("#419BF9"));
         filterLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
     }

designer-form/src/main/java/com/fr/design/mainframe/share/ui/widgetfilter/LocalWidgetFilter.java

@@ -120,19 +120,19 @@ public class LocalWidgetFilter {
 
     private boolean sameType(WidgetFilterInfo filterInfo, DefaultSharableWidget bindInfo) {
         //旧：其他 新：其它图表
-        boolean other = StringUtils.equals(filterInfo.getName(), Toolkit.i18nText("Fine-Plugin_Component_Type_Chart_Other"))
+        boolean other = StringUtils.equals(filterInfo.getName(), Toolkit.i18nText("Fine-Design_Share_Type_Chart_Other"))
-                && (StringUtils.equals(bindInfo.getChildClassify(), Toolkit.i18nText("Fine-Plugin_Component_Type_Chart_Other"))
+                && (StringUtils.equals(bindInfo.getChildClassify(), Toolkit.i18nText("Fine-Design_Share_Type_Chart_Other"))
-                || StringUtils.equals(bindInfo.getChildClassify(), Toolkit.i18nText("Fine-Plugin_Component_Type_Others")));
+                || StringUtils.equals(bindInfo.getChildClassify(), Toolkit.i18nText("Fine-Design_Share_Type_Others")));
 
         //旧：移动维度切换 新：多维度切换
-        boolean dimensionChange = StringUtils.equals(filterInfo.getName(), Toolkit.i18nText("Fine-Plugin_Component_Type_Dimension_Change"))
+        boolean dimensionChange = StringUtils.equals(filterInfo.getName(), Toolkit.i18nText("Fine-Design_Share_Type_Dimension_Change"))
-                && (StringUtils.equals(bindInfo.getChildClassify(), Toolkit.i18nText("Fine-Plugin_Component_Type_Mobile_Dimension_Change"))
+                && (StringUtils.equals(bindInfo.getChildClassify(), Toolkit.i18nText("Fine-Design_Share_Type_Mobile_Dimension_Change"))
-                || StringUtils.equals(bindInfo.getChildClassify(), Toolkit.i18nText("Fine-Plugin_Component_Type_Dimension_Change")));
+                || StringUtils.equals(bindInfo.getChildClassify(), Toolkit.i18nText("Fine-Design_Share_Type_Dimension_Change")));
 
         //旧：移动填报 新：填报
-        boolean fill = StringUtils.equals(filterInfo.getName(), Toolkit.i18nText("Fine-Plugin_Component_Type_Fill"))
+        boolean fill = StringUtils.equals(filterInfo.getName(), Toolkit.i18nText("Fine-Design_Share_Type_Fill"))
-                && (StringUtils.equals(bindInfo.getChildClassify(), Toolkit.i18nText("Fine-Plugin_Component_Type_Fill"))
+                && (StringUtils.equals(bindInfo.getChildClassify(), Toolkit.i18nText("Fine-Design_Share_Type_Fill"))
-                || StringUtils.equals(bindInfo.getChildClassify(), Toolkit.i18nText("Fine-Plugin_Component_Type_Mobile_Fill")));
+                || StringUtils.equals(bindInfo.getChildClassify(), Toolkit.i18nText("Fine-Design_Share_Type_Mobile_Fill")));
 
         return other | dimensionChange | fill;
     }

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

@@ -55,7 +55,7 @@ public class ShareComponentUtils {
         if (WorkContext.getWorkResource().exist(readmePath)) {
             return;
         }
-        String msg = Toolkit.i18nText("Fine-Plugin_Component_Share_Read_Me_Tip");
+        String msg = Toolkit.i18nText("Fine-Design_Share_Share_Read_Me_Tip");
         WorkContext.getWorkResource().write(readmePath, msg.getBytes());
     }
 

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

@@ -153,7 +153,7 @@ public class ShareUIUtils {
     public static void showErrorMessageDialog(String message) {
         FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
                 message,
-                Toolkit.i18nText("Fine-Plugin_Component_Dialog_Message"),
+                Toolkit.i18nText("Fine-Design_Share_Dialog_Message"),
                 FineJOptionPane.ERROR_MESSAGE);
     }
 

designer-realize/src/main/java/com/fr/design/share/ui/config/ShareConfigContentPane.java

@@ -69,17 +69,17 @@ public class ShareConfigContentPane extends JPanel {
 
     private JPanel createPreviewPane() {
 
-        JPanel pane= FRGUIPaneFactory.createTitledBorderPane(Toolkit.i18nText(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_Preview")));
+        JPanel pane= FRGUIPaneFactory.createTitledBorderPane(Toolkit.i18nText(Toolkit.i18nText("Fine-Design_Share_Preview")));
         previewPane = new PreviewPane(getWidget());
         pane.add(previewPane, BorderLayout.CENTER);
         return pane;
     }
 
     private JPanel createInfoPane() {
-        JPanel infoPane = FRGUIPaneFactory.createTitledBorderPane(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_Introduce"));
+        JPanel infoPane = FRGUIPaneFactory.createTitledBorderPane(Toolkit.i18nText("Fine-Design_Share_Introduce"));
         PlaceholderTextArea textArea = new PlaceholderTextArea();
         textArea.setText(this.info);
-        textArea.setPlaceholder(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_No_Introduction"));
+        textArea.setPlaceholder(Toolkit.i18nText("Fine-Design_Share_No_Introduction"));
         textArea.setEditable(false);
         UIScrollPane scrollPane = new UIScrollPane(textArea);
         scrollPane.setPreferredSize(new Dimension(373, 176));
@@ -88,7 +88,7 @@ public class ShareConfigContentPane extends JPanel {
     }
 
     private JPanel createEffectPane() {
-        JPanel effectPane = FRGUIPaneFactory.createTitledBorderPane(Toolkit.i18nText(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_Effects")));
+        JPanel effectPane = FRGUIPaneFactory.createTitledBorderPane(Toolkit.i18nText(Toolkit.i18nText("Fine-Design_Share_Effects")));
         JPanel effectContainer = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, VerticalFlowLayout.TOP,0, 0);
 
         EffectItemGroup effectItemGroup = getEffectItemGroup();

designer-realize/src/main/java/com/fr/design/share/ui/config/ShareConfigPane.java

@@ -9,6 +9,7 @@ import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIButtonUI;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.VerticalFlowLayout;
 import com.fr.design.mainframe.DesignerContext;
@@ -84,7 +85,7 @@ public class ShareConfigPane extends BasicPane {
         naviPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         naviPane.setLayout(new FlowLayout(FlowLayout.LEFT, 5, 0));
 
-        preButton = new UIButton(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_Prev"));
+        preButton = new UIButton(Toolkit.i18nText("Fine-Design_Share_Prev"));
         preButton.setPreferredSize(new Dimension(62, 20));
         preButton.setUI(disabledUIButtonUI);
         preButton.addActionListener(new ActionListener() {
@@ -97,7 +98,7 @@ public class ShareConfigPane extends BasicPane {
         });
         preButton.setEnabled(hasPreview());
 
-        nextButton = new UIButton(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_Next"));
+        nextButton = new UIButton(Toolkit.i18nText("Fine-Design_Share_Next"));
         nextButton.setPreferredSize(new Dimension(62, 20));
         nextButton.setUI(disabledUIButtonUI);
         nextButton.addActionListener(new ActionListener() {
@@ -152,10 +153,10 @@ public class ShareConfigPane extends BasicPane {
     }
 
     private JPanel createInfoPane() {
-        JPanel infoPane = FRGUIPaneFactory.createTitledBorderPane(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_Introduce"));
+        JPanel infoPane = FRGUIPaneFactory.createTitledBorderPane(Toolkit.i18nText("Fine-Design_Share_Introduce"));
         PlaceholderTextArea textArea = new PlaceholderTextArea();
         textArea.setText(this.widget.getDescription());
-        textArea.setPlaceholder(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_No_Introduction"));
+        textArea.setPlaceholder(Toolkit.i18nText("Fine-Design_Share_No_Introduction"));
         textArea.setEditable(false);
         UIScrollPane scrollPane = new UIScrollPane(textArea);
         scrollPane.setPreferredSize(new Dimension(373, 176));
@@ -171,10 +172,10 @@ public class ShareConfigPane extends BasicPane {
     }
 
     private JPanel createEffectEmptyPane() {
-        JPanel effectPane = FRGUIPaneFactory.createTitledBorderPane(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_Effects"));
+        JPanel effectPane = FRGUIPaneFactory.createTitledBorderPane(Toolkit.i18nText("Fine-Design_Share_Effects"));
         effectPane.setLayout(new VerticalFlowLayout(FlowLayout.CENTER,0 , 0));
         effectPane.setPreferredSize(new Dimension(480, 545));
-        UILabel label = new UILabel(InterProviderFactory.getProvider().getLocText(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_Empty")));
+        UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Share_Empty"));
         label.setAlignmentX(Component.CENTER_ALIGNMENT);
         label.setPreferredSize(new Dimension(480, 22));
         label.setHorizontalAlignment(UILabel.CENTER);
@@ -185,7 +186,7 @@ public class ShareConfigPane extends BasicPane {
 
     @Override
     protected String title4PopupWindow() {
-        return InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_Help_Settings");
+        return Toolkit.i18nText("Fine-Design_Share_Help_Settings");
     }
 
     public void show() {

designer-realize/src/main/java/com/fr/design/share/ui/config/table/ConfigItemRender.java

@@ -1,6 +1,7 @@
 package com.fr.design.share.ui.config.table;
 
 import com.fr.base.BaseUtils;
+import com.fr.design.i18n.Toolkit;
 import com.fr.locale.InterProviderFactory;
 import com.fr.stable.StringUtils;
 
@@ -56,10 +57,10 @@ public class ConfigItemRender extends DefaultTableCellRenderer {
             if (!table.isCellEditable(row, column)) {
                 setForeground(PLACEHOLDER_COLOR);
                 setBackground(NO_EDITABLE_BG);
-                setToolTipText(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_Not_Support_Rename"));
+                setToolTipText(Toolkit.i18nText("Fine-Design_Share_Not_Support_Rename"));
             }
             if (StringUtils.isEmpty(value.toString())) {
-                setValue(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_Need_Rename"));
+                setValue(Toolkit.i18nText("Fine-Design_Share_Need_Rename"));
                 setForeground(PLACEHOLDER_COLOR);
             }
         }

designer-realize/src/main/java/com/fr/design/share/ui/config/table/ExpandEffectTable.java

@@ -86,9 +86,9 @@ public class ExpandEffectTable extends JPanel {
 
         // 效果列表
         Object[] columnNames = {
-                InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_From"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Share_From"),
-                InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_Rename"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Share_Rename"),
-                InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_Edit")
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Share_Edit")
         };
         ConfigTableModel tableModel = new ConfigTableModel(effectItems, columnNames);
         table = new JTable(tableModel);

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

@@ -2,9 +2,9 @@ package com.fr.design.share.ui.generate;
 
 import com.fr.base.background.ImageBackground;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.share.ui.base.ImageBackgroundPane;
-import com.fr.locale.InterProviderFactory;
 import com.fr.log.FineLoggerFactory;
 
 import javax.swing.BorderFactory;
@@ -27,7 +27,7 @@ public class CoverUploadPane extends BasicBeanPane<Image> {
 
     @Override
     protected String title4PopupWindow() {
-        return InterProviderFactory.getProvider().getLocText("Fine-Plugin_Select_Upload_Cover");
+        return Toolkit.i18nText("Fine-Design_Share_Select_Upload_Cover");
     }
 
     public CoverUploadPane() {

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

@@ -52,7 +52,7 @@ public class EffectContent extends JPanel {
             this.add(imageContainer, BorderLayout.NORTH);
 
             // 效果列表
-            Object[] columnNames = {InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_From"), InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_Rename")};
+            Object[] columnNames = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Share_From"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Share_Rename")};
             JTable table = new JTable(new EffectTableModel(effectItemGroup, columnNames));
             table.setRowHeight(25);
             table.getColumnModel().getColumn(0).setPreferredWidth(235);

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

@@ -25,10 +25,10 @@ public class PriceExpectPane extends JPanel {
     private UIRadioButton chargeRadio;
 
     public PriceExpectPane() {
-        freeRadio = new UIRadioButton(Toolkit.i18nText("Fine-Plugin_Component_Price_Free"));
+        freeRadio = new UIRadioButton(Toolkit.i18nText("Fine-Design_Share_Price_Free"));
-        chargeRadio = new UIRadioButton(Toolkit.i18nText("Fine-Plugin_Component_Price_Charge"));
+        chargeRadio = new UIRadioButton(Toolkit.i18nText("Fine-Design_Share_Price_Charge"));
         priceFiled = new UITextField();
-        priceFiled.setPlaceholder(Toolkit.i18nText("Fine-Plugin_Component_Price_Charge_Tip"));
+        priceFiled.setPlaceholder(Toolkit.i18nText("Fine-Design_Share_Price_Charge_Tip"));
         ButtonGroup radioGroup = new ButtonGroup();
         radioGroup.add(freeRadio);
         radioGroup.add(chargeRadio);

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

@@ -165,7 +165,7 @@ public class ShareGeneratePane extends BasicPane {
     private JPanel createUploadCheckBox() {
 
         JPanel panel = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
-        String label = Toolkit.i18nText("Fine-Plugin_Upload_Meanwhile");
+        String label = Toolkit.i18nText("Fine-Design_Share_Upload_Meanwhile");
         this.uploadCheckbox = new UICheckBox(label);
         uploadCheckbox.addItemListener(e -> {
             int stateChange = e.getStateChange();
@@ -175,7 +175,7 @@ public class ShareGeneratePane extends BasicPane {
         });
         uploadCheckbox.setSelected(false);
 
-        UILabel tipsLabel = ShareUIUtils.createTipsLabel(Toolkit.i18nText("Fine-Plugin_Upload_Meanwhile_Tips"));
+        UILabel tipsLabel = ShareUIUtils.createTipsLabel(Toolkit.i18nText("Fine-Design_Share_Upload_Meanwhile_Tips"));
         panel.add(uploadCheckbox);
         panel.add(tipsLabel);
         panel.setPreferredSize(new Dimension(585, 30));
@@ -245,7 +245,7 @@ public class ShareGeneratePane extends BasicPane {
                         ShareWidgetInfoManager.getInstance().addCompCreateInfo(provider);
                     }
                 } catch (NetWorkFailedException exception) {
-                    FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), ShareUIUtils.formatWidthString(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_NetWorkError"), 200),
+                    FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), ShareUIUtils.formatWidthString(Toolkit.i18nText("Fine-Design_Share_NetWorkError"), 200),
                             Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
                     return null;
                 } catch (Exception e) {
@@ -255,7 +255,7 @@ public class ShareGeneratePane extends BasicPane {
                     aspect.afterOk();
                 }
                 if (!success) {
-                    FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), InterProviderFactory.getProvider().getLocText("FR-Plugin_Share_Module_Failed"),
+                    FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Share_Module_Failed"),
                             Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
                 }
                 return null;
@@ -298,7 +298,7 @@ public class ShareGeneratePane extends BasicPane {
 
     @Override
     protected String title4PopupWindow() {
-        return InterProviderFactory.getProvider().getLocText("Fine-Plugin_Share_Module_Msg");
+        return Toolkit.i18nText("Fine-Design_Share_Module_Msg");
     }
 
     private Dimension getDialogSize() {

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

@@ -100,7 +100,7 @@ public class ShareMainPane extends JPanel {
 
     private UIScrollPane mainPane = null;
 
-    private UICheckBox pluginCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Plugin_Component_Make_Relate_To_Plugin"));
+    private UICheckBox pluginCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Share_Make_Relate_To_Plugin"));
     private PriceExpectPane priceExpectPane = null;
 
     private UIComboBox parentClassify = null;
@@ -110,8 +110,8 @@ public class ShareMainPane extends JPanel {
 
     private UILabel loginLabel = ShareUIUtils.createCenterRightUILabel(StringUtils.EMPTY);
 
-    private UICheckBox pc = new UICheckBox(Toolkit.i18nText("Fine-Plugin_PC_Device"));
+    private UICheckBox pc = new UICheckBox(Toolkit.i18nText("Fine-Design_Share_PC_Device"));
-    private UICheckBox mobile = new UICheckBox(Toolkit.i18nText("Fine-Plugin_Mobile_Device"));
+    private UICheckBox mobile = new UICheckBox(Toolkit.i18nText("Fine-Design_Share_Mobile_Device"));
 
     private UIComboCheckBox pluginComboCheckBox = null;
 
@@ -172,7 +172,7 @@ public class ShareMainPane extends JPanel {
 
     private JPanel createOverviewPane(boolean upload) {
         JPanel componentPane = createComponentOverviewPane(upload);
-        String title = Toolkit.i18nText("Fine-Plugin_Component_Overview");
+        String title = Toolkit.i18nText("Fine-Design_Share_Overview");
         JPanel overviewPane = FRGUIPaneFactory.createTitledBorderPane(title);
         overviewPane.add(componentPane, BorderLayout.CENTER);
 
@@ -182,35 +182,35 @@ public class ShareMainPane extends JPanel {
 
     private JPanel createBasePane(boolean upload) {
         // 提示
-        UILabel tipsLabel = ShareUIUtils.createTipsLabel(Toolkit.i18nText("Fine-Plugin_Component_Generate_Help_Tips"));
+        UILabel tipsLabel = ShareUIUtils.createTipsLabel(Toolkit.i18nText("Fine-Design_Share_Generate_Help_Tips"));
         tipsLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
         // 组件名称
-        UILabel nameLabel = ShareUIUtils.createTopRightUILabel(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_Name"));
+        UILabel nameLabel = ShareUIUtils.createTopRightUILabel(Toolkit.i18nText("Fine-Design_Share_Name"));
         JPanel symbolTextField = createNameFiledPane();
         //显示封面
-        UILabel coverLabel = ShareUIUtils.createTopRightUILabel(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_Show_Cover"));
+        UILabel coverLabel = ShareUIUtils.createTopRightUILabel(Toolkit.i18nText("Fine-Design_Share_Show_Cover"));
         JPanel coverImagePane = getCoverImagePane();
         //制作者
-        UILabel vendorLabel = ShareUIUtils.createCenterRightUILabel(Toolkit.i18nText("Fine-Plugin_Component_Share_Vendor"));
+        UILabel vendorLabel = ShareUIUtils.createCenterRightUILabel(Toolkit.i18nText("Fine-Design_Share_Share_Vendor"));
         JPanel vendorPane = createVendorPane();
         //适用终端
-        UILabel deviceLabel = ShareUIUtils.createCenterRightUILabel(Toolkit.i18nText("Fine-Plugin_Component_Device"));
+        UILabel deviceLabel = ShareUIUtils.createCenterRightUILabel(Toolkit.i18nText("Fine-Design_Share_Device"));
         JPanel devicePane = createDevicePane();
         //组件分类
-        UILabel classifyLabel = ShareUIUtils.createCenterRightUILabel(Toolkit.i18nText("Fine-Plugin_Component_Classify"));
+        UILabel classifyLabel = ShareUIUtils.createCenterRightUILabel(Toolkit.i18nText("Fine-Design_Share_Classify"));
         JPanel classifyPane = createClassifyPane();
 
         //样式风格
-        UILabel styleThemeLabel = ShareUIUtils.createCenterRightUILabel(Toolkit.i18nText("Fine-Plugin_Component_Style_Theme"));
+        UILabel styleThemeLabel = ShareUIUtils.createCenterRightUILabel(Toolkit.i18nText("Fine-Design_Share_Style_Theme"));
         JPanel styleThemePane = createStyleThemePane();
         //本地分组
-        UILabel localGroupLabel = ShareUIUtils.createCenterRightUILabel(Toolkit.i18nText("Fine-Plugin_Component_Local_Group"));
+        UILabel localGroupLabel = ShareUIUtils.createCenterRightUILabel(Toolkit.i18nText("Fine-Design_Share_Local_Group"));
         JPanel localGroupPane = createLocalGroupPane();
         //使用插件
-        UILabel pluginLabel = ShareUIUtils.createCenterRightUILabel(Toolkit.i18nText("Fine-Plugin_Component_Use_Plugin"));
+        UILabel pluginLabel = ShareUIUtils.createCenterRightUILabel(Toolkit.i18nText("Fine-Design_Share_Use_Plugin"));
         JPanel pluginPane = createPluginPane();
         //期望价格
-        UILabel priceLabel = ShareUIUtils.createCenterRightUILabel(Toolkit.i18nText("Fine-Plugin_Component_Expect_Price"));
+        UILabel priceLabel = ShareUIUtils.createCenterRightUILabel(Toolkit.i18nText("Fine-Design_Share_Expect_Price"));
         JPanel pricePane = createPricePane();
 
         double p = TableLayout.PREFERRED;
@@ -246,7 +246,7 @@ public class ShareMainPane extends JPanel {
             infoPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.HGAP_SMALL, BASEPANE_VERTICAL_GAP);
         }
 
-        String title = Toolkit.i18nText("Fine-Plugin_Component_Base_Info");
+        String title = Toolkit.i18nText("Fine-Design_Share_Base_Info");
         JPanel overviewPane = FRGUIPaneFactory.createTitledBorderPane(title);
 
         innerPane.add(tipsLabel, BorderLayout.NORTH);
@@ -271,7 +271,7 @@ public class ShareMainPane extends JPanel {
     private JPanel createStyleThemePane() {
         JPanel pane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
         PlaceHolderUI<UIComboBox> placeHolderUI = new PlaceHolderUI<UIComboBox>(
-                Toolkit.i18nText("Fine-Plugin_Component_Style_Theme_Place_Holder")) {
+                Toolkit.i18nText("Fine-Design_Share_Style_Theme_Place_Holder")) {
             @Override
             protected boolean validate(UIComboBox uiComboBox) {
                 return styleComboBox.getSelectedItem() != null;
@@ -320,7 +320,7 @@ public class ShareMainPane extends JPanel {
             displays[i] = pairs[i].getFirst();
             values[i] = pairs[i].getSecond();
         }
-        this.pluginComboCheckBox = new DictionaryComboCheckBox(values, displays, "Fine-Plugin_Select_Plugin");
+        this.pluginComboCheckBox = new DictionaryComboCheckBox(values, displays, "Fine-Design_Share_Select_Plugin");
 
         pluginComboCheckBox.setPopupMaxDisplayNumber(10);
         pluginComboCheckBox.setVisible(false);
@@ -348,7 +348,7 @@ public class ShareMainPane extends JPanel {
         this.parentClassify.setPreferredSize(new Dimension(COMBO_WIDTH, COMBO_HEIGHT));
 
         List<String> children = ComponentTypes.CHART.children(-1);
-        final String placeHolderText = Toolkit.i18nText("Fine-Plugin_Select_Type");
+        final String placeHolderText = Toolkit.i18nText("Fine-Design_Share_Select_Type");
         PlaceHolderUI<UIComboBox> placeHolderUI = new PlaceHolderUI<UIComboBox>(placeHolderText) {
             @Override
             protected boolean validate(UIComboBox comboBox) {
@@ -422,7 +422,7 @@ public class ShareMainPane extends JPanel {
 
         String bbsUsername = MarketConfig.getInstance().getBbsUsername();
         if (StringUtils.isEmpty(bbsUsername)) {
-            UILabel unLoginLabel = ShareUIUtils.createHyperlinkLabel(Toolkit.i18nText("Fine-Plugin_Click_Login"));
+            UILabel unLoginLabel = ShareUIUtils.createHyperlinkLabel(Toolkit.i18nText("Fine-Design_Share_Click_Login"));
 
             final UILabel hidden = new ShareLoginLabel(vendorPane, unLoginLabel, loginLabel);
 
@@ -447,13 +447,13 @@ public class ShareMainPane extends JPanel {
     @NotNull
     private JPanel createComponentOverviewPane(boolean upload) {
         //功能介绍
-        UILabel effectLabel = ShareUIUtils.createTopRightUILabel(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_Special_Effects"));
+        UILabel effectLabel = ShareUIUtils.createTopRightUILabel(Toolkit.i18nText("Fine-Design_Share_Special_Effects"));
         JPanel effectPane = createEffectPane(effectItemGroups);
 
         content.setDocument(
                 new LimitedDocument(200, 500)
         );
-        String contentTip = Toolkit.i18nText("Fine-Plugin_Content_Introduction_Placeholder");
+        String contentTip = Toolkit.i18nText("Fine-Design_Share_Content_Introduction_Placeholder");
         content.setAutoscrolls(true);
         content.setPlaceholder(contentTip);
         UIScrollPane contentPane = new UIScrollPane(content);
@@ -463,14 +463,14 @@ public class ShareMainPane extends JPanel {
         help.setDocument(
                 new LimitedDocument(1000)
         );
-        String helpTip = Toolkit.i18nText("Fine-Plugin_Help_Msg_Placeholder");
+        String helpTip = Toolkit.i18nText("Fine-Design_Share_Help_Msg_Placeholder");
         help.setPlaceholder(helpTip);
         UIScrollPane helpPane = new UIScrollPane(help);
         helpPane.setPreferredSize(new Dimension(COLUMN_FIELD_WIDTH, 50));
         helpPane.setBorder(null);
 
-        UILabel helpLabel = ShareUIUtils.createTopRightUILabel(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Help_Msg"));
+        UILabel helpLabel = ShareUIUtils.createTopRightUILabel(Toolkit.i18nText("Fine-Design_Share_Help_Msg"));
-        UILabel contentLabel = ShareUIUtils.createTopRightUILabel(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Content_Introduction"));
+        UILabel contentLabel = ShareUIUtils.createTopRightUILabel(Toolkit.i18nText("Fine-Design_Share_Content_Introduction"));
 
 
         double p = TableLayout.PREFERRED;
@@ -504,7 +504,7 @@ public class ShareMainPane extends JPanel {
 
     private JPanel createNameFiledPane() {
         LimitedDocument nameLimited = new LimitedDocument(NAME_MAX_LENGTH);
-        nameField.setPlaceholder(Toolkit.i18nText("Fine-Plugin_Component_Name_Placeholder"));
+        nameField.setPlaceholder(Toolkit.i18nText("Fine-Design_Share_Name_Placeholder"));
         nameField.setPreferredSize(new Dimension(TEXT_FIELD_WIDTH, TEXT_FIELD_HEIGHT));
         nameField.setDocument(nameLimited);
         JPanel symbolTextFiled = FRGUIPaneFactory.createBorderLayout_S_Pane();
@@ -518,7 +518,7 @@ public class ShareMainPane extends JPanel {
 
     private void initUploadCoverBtn() {
 
-        this.uploadBtn = new UIButton(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Select_Upload_Cover"));
+        this.uploadBtn = new UIButton(Toolkit.i18nText("Fine-Design_Share_Select_Upload_Cover"));
         this.uploadBtn.setPreferredSize(new Dimension(BTN_WIDTH, BTN_HEIGHT));
         uploadBtn.addActionListener(new ActionListener() {
             @Override
@@ -563,37 +563,37 @@ public class ShareMainPane extends JPanel {
         Dialog shareDialog = ShareDialogUtils.getInstance().getShareDialog();
         String name = nameField.getText();
         if (StringUtils.isEmpty(name)) {
-            FineJOptionPane.showMessageDialog(shareDialog, Toolkit.i18nText("Fine-Plugin_Lack_Name"),
+            FineJOptionPane.showMessageDialog(shareDialog, Toolkit.i18nText("Fine-Design_Share_Lack_Name"),
                     Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
             return false;
         }
         if (upload && StringUtils.isEmpty(content.getText())) {
-            FineJOptionPane.showMessageDialog(shareDialog, Toolkit.i18nText("Fine-Plugin_Lack_Content"),
+            FineJOptionPane.showMessageDialog(shareDialog, Toolkit.i18nText("Fine-Design_Share_Lack_Content"),
                     Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
             return false;
         }
         if (upload && StringUtils.isEmpty(loginLabel.getText())) {
-            FineJOptionPane.showMessageDialog(shareDialog, Toolkit.i18nText("Fine-Plugin_Lack_Login"),
+            FineJOptionPane.showMessageDialog(shareDialog, Toolkit.i18nText("Fine-Design_Share_Lack_Login"),
                     Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
             return false;
         }
         if (upload && styleComboBox.getSelectedItem() == null) {
-            FineJOptionPane.showMessageDialog(shareDialog, Toolkit.i18nText("Fine-Plugin_Component_Style_Theme_Tip"),
+            FineJOptionPane.showMessageDialog(shareDialog, Toolkit.i18nText("Fine-Design_Share_Style_Theme_Tip"),
                     Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
             return false;
         }
         if (!pc.isSelected() && !mobile.isSelected()) {
-            FineJOptionPane.showMessageDialog(shareDialog, Toolkit.i18nText("Fine-Plugin_Lack_Device"),
+            FineJOptionPane.showMessageDialog(shareDialog, Toolkit.i18nText("Fine-Design_Share_Lack_Device"),
                     Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
             return false;
         }
         if (pluginCheckBox.isSelected() && ArrayUtils.isEmpty(pluginComboCheckBox.getSelectedValues())) {
-            FineJOptionPane.showMessageDialog(shareDialog, Toolkit.i18nText("Fine-Plugin_Lack_Plugins"),
+            FineJOptionPane.showMessageDialog(shareDialog, Toolkit.i18nText("Fine-Design_Share_Lack_Plugins"),
                     Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
             return false;
         }
         if (!priceExpectPane.check()) {
-            FineJOptionPane.showMessageDialog(shareDialog, Toolkit.i18nText("Fine-Plugin_Lack_Price"),
+            FineJOptionPane.showMessageDialog(shareDialog, Toolkit.i18nText("Fine-Design_Share_Lack_Price"),
                     Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
             return false;
         }
@@ -684,7 +684,7 @@ public class ShareMainPane extends JPanel {
             if (errorLength != -1 && currentLength > errorLength && ++loop >= 5) {
                 this.loop = 0;
                 FineJOptionPane.showMessageDialog(ShareDialogUtils.getInstance().getShareDialog(),
-                        ShareUIUtils.formatWidthString(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_Input_Errors", String.valueOf(errorLength)), 200),
+                        ShareUIUtils.formatWidthString(Toolkit.i18nText("Fine-Design_Share_Input_Errors", String.valueOf(errorLength)), 200),
                         Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
                 //只提示，不报错
             }

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

@@ -2,8 +2,8 @@ package com.fr.design.share.ui.generate.table;
 
 import com.fr.base.BaseUtils;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.locale.InterProviderFactory;
 import com.fr.stable.StringUtils;
 
 import javax.swing.BorderFactory;
@@ -48,7 +48,7 @@ public class EffectItemRender extends DefaultTableCellRenderer {
                 if (!table.isCellEditable(row, column)) {
                     setForeground(PLACEHOLDER_COLOR);
                     setBackground(NO_EDITABLE_BG);
-                    setToolTipText(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_Not_Support_Rename"));
+                    setToolTipText(Toolkit.i18nText("Fine-Design_Share_Not_Support_Rename"));
                 } else {
                     setForeground(Color.black);
                 }
@@ -65,7 +65,7 @@ public class EffectItemRender extends DefaultTableCellRenderer {
                     table.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
                 }
             } else {
-                setValue(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Component_Need_Rename"));
+                setValue(Toolkit.i18nText("Fine-Design_Share_Need_Rename"));
                 setForeground(PLACEHOLDER_COLOR);
             }
             return this;