Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~wei/design into release/11.0

designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

@@ -574,8 +574,11 @@ public abstract class ToolBarMenuDock {
         }
 
         shortCuts.add(new EnvDetectorAction());
-        //服务平台
+        //服务平台(仅针对中国大陆)
-        shortCuts.add(new ServicePlatformAction());
+        if (GeneralContext.getLocale().equals(Locale.CHINA)) {
+            shortCuts.add(new ServicePlatformAction());
+        }
+
 
         shortCuts.add(SeparatorDef.DEFAULT);
         if (DesignerEnvManager.getEnvManager().isOpenDebug()) {

designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java

@@ -488,7 +488,7 @@ public class UpdateMainDialog extends UIDialog {
                                 continue;
                             }
                         }
-                        if (isValidLogInfo(updateInfo[UpdateInfoTable.UPDATE_TITLE_INDEX]) && curJarDate != null) {
+                        if (isValid(updateInfo, GeneralUtils.objectToString(curJarDate))) {
                             updateInfoList.add(new Object[]{UPDATELOG_FORMAT.format(updateTime), updateInfo[UpdateInfoTable.UPDATE_VERSION_INDEX], updateInfo[UpdateInfoTable.UPDATE_TITLE_INDEX], updateTime.after(curJarDate)});
                         }
                     }
@@ -499,6 +499,11 @@ public class UpdateMainDialog extends UIDialog {
         }
     }
 
+
+    private boolean isValid(String[] updateInfo, String curJarDate) {
+        return isValidLogInfo(updateInfo[UpdateInfoTable.UPDATE_TITLE_INDEX]) && curJarDate != null && curJarDate.compareTo(updateInfo[UpdateInfoTable.UPDATE_DATE_INDEX]) <= 0;
+    }
+
     private void updateCachedInfoFile(JSONArray jsonArray) throws Exception {
         String cacheDirPath = StableUtils.pathJoin(WorkContext.getCurrent().getPath(), "resources", "offlineres");
         File cacheFileDir = new File(cacheDirPath);
@@ -554,13 +559,18 @@ public class UpdateMainDialog extends UIDialog {
                     continue;
                 }
             }
-            if (isValidLogInfo(updateTitle)) {
+            Date curDate = UPDATE_INFO_TABLE_FORMAT.parse(currentNO, new ParsePosition(currentNO.indexOf("-") + 1));
+            if (isValid4GenerateInfo(updateTitle, GeneralUtils.objectToString(curDate), updateTimeStr)) {
                 updateInfoList.add(new Object[]{updateTimeStr, updateVersionStr, updateTitle, updateTime.after(curJarDate)});
             }
         }
         return new ArrayList<>(updateInfoList);
     }
 
+    private boolean isValid4GenerateInfo(String updateTitle, String curDate, String updateTimeStr) {
+        return isValidLogInfo(updateTitle) && curDate.compareTo(updateTimeStr) <= 0;
+    }
+
     private boolean containsKeyword(String str, String keyword) {
         return str.toUpperCase().contains(keyword.toUpperCase());
     }

designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormSingleWidgetCardPane.java

@@ -28,9 +28,11 @@ import com.fr.design.widget.Operator;
 import com.fr.design.widget.ui.designer.component.WidgetAbsoluteBoundPane;
 import com.fr.design.widget.ui.designer.component.WidgetBoundPane;
 import com.fr.design.widget.ui.designer.component.WidgetCardTagBoundPane;
+import com.fr.form.main.WidgetUtil;
 import com.fr.form.ui.ChartEditor;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WScaleLayout;
+import com.fr.form.ui.container.WSortLayout;
 import com.fr.form.ui.container.WTitleLayout;
 import com.fr.form.ui.widget.CRBoundsWidget;
 import com.fr.general.ComparatorUtils;
@@ -241,7 +243,12 @@ public class FormSingleWidgetCardPane extends FormWidgetCardPane {
                 showNameInvalidDialog(Toolkit.i18nText("Fine-Design_Form_Chart_Widget_Rename_Failure"));
                 return;
             }
+            String oldName = widget.getWidgetName();
             widgetPropertyPane.update(widget);
+            Widget innerWidget = WidgetUtil.getInnerWidget(widget);
+            if (!StringUtils.equals(oldName, innerWidget.getWidgetName())) {
+                innerWidget.setMobileOldWidgetName(oldName);
+            }
             // 上面一行更新了组件 这里必须重新调用getWidgetName
             xCreator.resetCreatorName(widget.getWidgetName());
             xCreator.resetVisible(widget.isVisible());

designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java

@@ -496,7 +496,6 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
             this.repeatTitleRowPane.populateBean(defaultFT);
             this.repeatTitleRowPane.setEnabled(false);
             usePageHeadFrozenRCheckBox.setEnabled(false);
-            usePageFootFrozenRCheckBox.setEnabled(false);
         } else {
             this.repeatTitleRowPane.populateBean(ft);
             useRepeatTitleRCheckBox.setSelected(true);
@@ -507,6 +506,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
             this.repeatFinisRowPane.populateBean(defaultFT);
             this.repeatFinisRowPane.setEnabled(false);
             useRepeatFinisRCheckBox.setSelected(false);
+            usePageFootFrozenRCheckBox.setEnabled(false);
         } else {
             this.repeatFinisRowPane.populateBean(ft);
             useRepeatFinisRCheckBox.setSelected(true);
@@ -523,7 +523,6 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
             this.repeatTitleColPane.populateBean(defaultFT);
             this.repeatTitleColPane.setEnabled(false);
             usePageHeadFrozenCCheckBox.setEnabled(false);
-            usePageFootFrozenCCheckBox.setEnabled(false);
         } else {
             this.repeatTitleColPane.populateBean(ft);
             useRepeatTitleCCheckBox.setSelected(true);
@@ -534,6 +533,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
             this.repeatFinisColPane.populateBean(defaultFT);
             this.repeatFinisColPane.setEnabled(false);
             useRepeatFinisCCheckBox.setSelected(false);
+            usePageFootFrozenCCheckBox.setEnabled(false);
         } else {
             this.repeatFinisColPane.populateBean(ft);
             useRepeatFinisCCheckBox.setSelected(true);