Merge pull request #1018 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit 'eae894964b3c5cca7a84f9f3b8eff046a43e975a':
  update
  update
  REPORT-20267 非简繁英日韩 海外版本设计器默认语言问题 && MOBILE-22490 链接修改

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

@@ -24,6 +24,7 @@ import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogFormatter;
 import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
+import com.fr.general.SupportLocale;
 import com.fr.general.locale.LocaleCenter;
 import com.fr.general.locale.LocaleMark;
 import com.fr.general.xml.GeneralXMLTools;
@@ -186,7 +187,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         if (designerEnvManager == null) {
             designerEnvManager = new DesignerEnvManager();
             //REPORT-15332有一个国际化调用比较早,需要在这边就设置好locale,由于后台GeneralContext默认是China
-            GeneralContext.setLocale(designerEnvManager.getLanguage());
+            GeneralContext.setLocale(DesignerEnvManager.designerEnvManager.checkLocale(designerEnvManager.getLanguage()));
             try {
                 XMLTools.readFileXML(designerEnvManager, designerEnvManager.getDesignerEnvFile());
             } catch (Exception e) {
@@ -1316,7 +1317,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         String tmpVal;
         if ((tmpVal = reader.getElementValue()) != null) {
             if (!CommonUtils.isNumber(tmpVal)) {
-                setLanguage(CommonUtils.stringToLocale(tmpVal));
+                setLanguage(checkLocale(CommonUtils.stringToLocale(tmpVal)));
             } else {
                 // 用于兼容10.0之前的版本
                 int value = Integer.parseInt(tmpVal);
@@ -1365,6 +1366,16 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         }
     }
 
+    /**
+     * 对国际化进行校验
+     * 非简繁英日韩的默认环境 设计器全部默认为英文版本
+     * @param locale
+     * @return
+     */
+    private Locale checkLocale(Locale locale) {
+        return SupportLocale.getInstance().isSupport(locale) ? locale : Locale.US;
+    }
+
     private void readReportLengthUnit(XMLableReader reader) {
         String tmpVal;
         if (StringUtils.isNotBlank(tmpVal = reader.getElementValue())) {

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ParaMobileDefinePane.java

@@ -19,6 +19,7 @@ import com.fr.design.mainframe.MobileWidgetListPane;
 import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.form.ui.container.WParameterLayout;
 import com.fr.form.ui.container.WSortLayout;
+import com.fr.general.CloudCenter;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.SiteCenter;
 import com.fr.log.FineLoggerFactory;
@@ -87,9 +88,7 @@ public class ParaMobileDefinePane extends MobileWidgetDefinePane {
         double[] rowSize = {p, p};
         double[] columnSize = {p, f};
         int[][] rowCount = {{1, 1}, {1, 1}};
-        if (ExtraReportClassManager.getInstance().getArray(MobileParamStyleProvider.MARK_STRING).size() != 0) {
-            tipLabel = null;
-        } else {
+        if (ExtraReportClassManager.getInstance().getArray(MobileParamStyleProvider.MARK_STRING).isEmpty()) {
             ((WParameterLayout) (paraCreator.toData())).setProvider((MobileParamStyleProvider) ((Item) paramLocationComboBox.getItemAt(0)).getValue());
         }
         Component[][] components = new Component[][]{
@@ -127,10 +126,9 @@ public class ParaMobileDefinePane extends MobileWidgetDefinePane {
             @Override
             public void mouseClicked(MouseEvent e) {
                 try {
-                    //todo 添加对应插件下载地址
-                    Desktop.getDesktop().browse(new URI(SiteCenter.getInstance().acquireUrlByKind("plugin.download")));
+                    Desktop.getDesktop().browse(new URI(CloudCenter.getInstance().acquireUrlByKind("plugin.mobile.style")));
                 } catch (Exception exp) {
-
+                    FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
                 }
             }
             @Override