Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/10.0

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

@@ -867,6 +867,14 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         designerLoginConfigManager.setPluginRemindOnFirstLaunch(pluginRemindOnFirstLaunch);
     }
 
+    public boolean isUseOldVersionLogin() {
+        return designerLoginConfigManager.isUseOldVersionLogin();
+    }
+
+    public void setUseOldVersionLogin(boolean useOldVersionLogin) {
+        designerLoginConfigManager.setUseOldVersionLogin(useOldVersionLogin);
+    }
+
     /**
      * 内置服务器是否使用时启动
      *

designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java

@@ -12,7 +12,6 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrameFileDealerPane;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.mainframe.JVirtualTemplate;
-import com.fr.design.module.DesignModuleFactory;
 import com.fr.design.ui.util.UIUtil;
 import com.fr.file.FILE;
 import com.fr.file.FileNodeFILE;
@@ -361,22 +360,30 @@ public class HistoryTemplateListCache implements CallbackEvent {
         int size = historyList.size();
         for (int i = 0; i < size; i++) {
             JTemplate<?, ?> template = historyList.get(i);
-            FILE file = template.getEditingFILE();
+            FILE file = templateToStashFile(template);
-            try {
+            if (file != null) {
-                ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+                stashFILEMap.put(i, file);
-                BaseBook target = template.getTarget();
-                if (target != null) {
-                    target.export(outputStream);
-                    stashFILEMap.put(i, new StashedFILE(file, outputStream.toByteArray()));
-                }
-                // 如果 target == null 那么这个模板是被模板内存优化功能处理过的，不用处理
-            } catch (Exception e) {
-                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
         FineLoggerFactory.getLogger().info("Env Change Template Stashed.");
     }
 
+    private FILE templateToStashFile(JTemplate<?, ?> template) {
+        FILE file = template.getEditingFILE();
+        try {
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+            BaseBook target = template.getTarget();
+            if (target != null) {
+                target.export(outputStream);
+                return new StashedFILE(file, outputStream.toByteArray(), template.suffix());
+            }
+            // 如果 target == null 那么这个模板是被模板内存优化功能处理过的，不用处理
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+        return null;
+    }
+
     private boolean checkStash() {
         try {
             return stashWorker.get();
@@ -458,18 +465,10 @@ public class HistoryTemplateListCache implements CallbackEvent {
             FILE file = template.getEditingFILE();
             boolean needReload = context == null || needReloadTemplate(context, template);
             if (needReload) {
-                try {
+                FILE stashFile = templateToStashFile(template);
-                    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+                if (stashFile != null) {
-                    BaseBook target = template.getTarget();
+                    FineLoggerFactory.getLogger().info("{} is being reloaded", file.getName());
-                    if (target != null) {
+                    template.refreshResource(stashFile);
-                        FineLoggerFactory.getLogger().info("{} is being reloaded", file.getName());
-                        target.export(outputStream);
-                        FILE stashedFile = new StashedFILE(file, outputStream.toByteArray());
-                        template.refreshResource(stashedFile);
-                    }
-                    // 如果 target == null 那么这个模板是被模板内存优化功能处理过的，不用处理
-                } catch (Exception e) {
-                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
                 }
             }
         }

designer-base/src/main/java/com/fr/design/login/DesignerLoginHelper.java

@@ -47,7 +47,7 @@ public class DesignerLoginHelper {
     }
 
     public static void showLoginDialog(DesignerLoginSource source, Map<String, String> params, Window window) {
-        if (!SupportOSImpl.DESIGNER_LOGIN.support()) {
+        if (!SupportOSImpl.DESIGNER_LOGIN.support() || DesignerEnvManager.getEnvManager().isUseOldVersionLogin()) {
             WebViewDlgHelper.createLoginDialog(window);
             return;
         }

designer-base/src/main/java/com/fr/design/login/config/DesignerLoginConfigManager.java

@@ -70,6 +70,10 @@ public class DesignerLoginConfigManager implements XMLReadable, XMLWriter {
      * 插件管理第一次启动时的提醒
      */
     private boolean pluginRemindOnFirstLaunch = true;
+    /**
+     * 使用旧版登录
+     */
+    private boolean useOldVersionLogin = false;
 
     private DesignerLoginConfigManager() {
 
@@ -98,6 +102,7 @@ public class DesignerLoginConfigManager implements XMLReadable, XMLWriter {
             this.setLastLoginAccount(reader.getAttrAsString("lastLoginAccount", StringUtils.EMPTY));
             this.setLoginRemindBeforeJumpBBS(reader.getAttrAsBoolean("loginRemindBeforeJumpBBS", true));
             this.setPluginRemindOnFirstLaunch(reader.getAttrAsBoolean("pluginRemindOnFirstLaunch", true));
+            this.setUseOldVersionLogin(reader.getAttrAsBoolean("useOldVersionLogin", false));
         }
     }
 
@@ -117,6 +122,7 @@ public class DesignerLoginConfigManager implements XMLReadable, XMLWriter {
         writer.attr("lastLoginAccount", lastLoginAccount);
         writer.attr("loginRemindBeforeJumpBBS", loginRemindBeforeJumpBBS);
         writer.attr("pluginRemindOnFirstLaunch", pluginRemindOnFirstLaunch);
+        writer.attr("useOldVersionLogin", useOldVersionLogin);
         writer.end();
     }
 
@@ -223,4 +229,12 @@ public class DesignerLoginConfigManager implements XMLReadable, XMLWriter {
     public void setPluginRemindOnFirstLaunch(boolean pluginRemindOnFirstLaunch) {
         this.pluginRemindOnFirstLaunch = pluginRemindOnFirstLaunch;
     }
+
+    public boolean isUseOldVersionLogin() {
+        return useOldVersionLogin;
+    }
+
+    public void setUseOldVersionLogin(boolean useOldVersionLogin) {
+        this.useOldVersionLogin = useOldVersionLogin;
+    }
 }

designer-base/src/main/java/com/fr/design/login/guide/DesignerGuideHelper.java

@@ -8,9 +8,7 @@ import com.fr.design.login.utils.DesignerLoginUtils;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.os.impl.SupportOSImpl;
 import com.fr.design.update.push.DesignerPushUpdateManager;
-import com.fr.general.CloudCenter;
+import com.fr.log.FineLoggerFactory;
-import com.fr.general.CloudCenterConfig;
-import com.fr.general.http.HttpToolbox;
 import com.fr.stable.StringUtils;
 import javax.swing.WindowConstants;
 
@@ -39,7 +37,11 @@ public class DesignerGuideHelper {
 
     public static void prepareShowGuideDialog() {
         // 如果存在更新升级的弹窗，则不显示引导页面
-        if (!DesignerLoginUtils.isOnline() || !SupportOSImpl.DESIGNER_LOGIN.support() || !FRContext.isChineseEnv() || DesignerPushUpdateManager.getInstance().isShouldPopUp()) {
+        if (!DesignerLoginUtils.isOnline()
+                || !SupportOSImpl.DESIGNER_LOGIN.support()
+                || !FRContext.isChineseEnv()
+                || DesignerPushUpdateManager.getInstance().isShouldPopUp()
+                || DesignerEnvManager.getEnvManager().isUseOldVersionLogin()) {
             return;
         }
         if (isActivatedForOneWeek()) {
@@ -52,7 +54,11 @@ public class DesignerGuideHelper {
             DesignerContext.getDesignerFrame().addDesignerOpenedListener(new DesignerOpenedListener() {
                 @Override
                 public void designerOpened() {
-                    showGuideDialog();
+                    try {
+                        showGuideDialog();
+                    } catch (Throwable t) {
+                        FineLoggerFactory.getLogger().warn(t.getMessage(), t);
+                    }
                 }
             });
         }

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

@@ -406,8 +406,11 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     }
 
     private void setTargetByFile(FILE file) {
-        this.template = JTemplateFactory.asIOFile(file, this.suffix());
+        T newTemplate = JTemplateFactory.asIOFile(file, this.suffix());
-        setTarget(this.template);
+        if (newTemplate != null) {
+            this.template = newTemplate;
+            setTarget(this.template);
+        }
     }
 
     private void addCenterPane() {

designer-base/src/main/java/com/fr/design/versioncheck/VersionCheckUtils.java

@@ -64,6 +64,11 @@ public class VersionCheckUtils {
     private static final String ID = "id";
     private static final String VERSION = "version";
     private static final String NAME = "name";
+    private static final String RUNNING = "running";
+    private static final String SYNC = "sync";
+    private static final String GROUP = "group";
+    private static final String BI = "bi";
+    private static final String BIPREFIX = "com.finebi";
     private static final Set<String> pluginsNeedIgnore = new HashSet<>();
     static {
         pluginsNeedIgnore.addAll(Arrays.asList(
@@ -263,13 +268,10 @@ public class VersionCheckUtils {
         Map<String, String> pluginsNameMap = ReportHelper.getPluginNameMap();
         for (int i = 0; i < remotePlugins.size(); i++) {
             remotePlugin = remotePlugins.getJSONObject(i);
-            if (ComparatorUtils.equals(remotePlugin.getString("running"), "false") || (remotePlugin.containsKey("sync") && !remotePlugin.getBoolean("sync"))) {
+            if (isPluginNeedIgnore(remotePlugin)) {
                 continue;
             }
             String remotePluginID = remotePlugin.getString(ID);
-            if (pluginsNeedIgnore.contains(remotePluginID)) {
-                continue;
-            }
             if (localPluginsMap.containsKey(remotePluginID)) {
                 if (ComparatorUtils.equals(localPluginsMap.get(remotePluginID).getVersion(), remotePlugin.getString(VERSION))) {
                     continue;
@@ -290,6 +292,12 @@ public class VersionCheckUtils {
         return differentPlugins;
     }
 
+    private static boolean isPluginNeedIgnore(JSONObject remotePlugin) {
+        return ComparatorUtils.equals(remotePlugin.getString(RUNNING), "false") || (remotePlugin.containsKey(SYNC) && !remotePlugin.getBoolean(SYNC))
+                || (remotePlugin.containsKey(GROUP) && ComparatorUtils.equals(remotePlugin.containsKey(GROUP), BI) || remotePlugin.getString(ID).startsWith(BIPREFIX)
+                || pluginsNeedIgnore.contains(remotePlugin.getString(ID)));
+    }
+
     public static JSONArray syncPlugins(JSONArray differentPlugins) {
         Set<String> uninstallFailed = uninstallPlugins(differentPlugins);
         List<PluginMarker> plugins = getSyncPlugins(differentPlugins, uninstallFailed);

designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java

@@ -1,6 +1,10 @@
 package com.fr.design.widget.component;
 
+import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.beans.ErrorMsgTextFieldAdapter;
+import com.fr.design.beans.UITextFieldAdapter;
 import com.fr.design.designer.IntervalConstants;
+import com.fr.design.fun.TextFieldAdapterProvider;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
@@ -9,6 +13,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.form.ui.NumberEditor;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.AssistUtils;
 import com.fr.stable.StringUtils;
 
@@ -35,7 +40,7 @@ public class NumberEditorValidatePane extends JPanel {
     private UISpinner minValueSpinner;
     private UISpinner decimalLength;
     private JPanel limitNumberPane;
-    private UITextField errorMsgTextField;
+    private ErrorMsgTextFieldAdapter errorMsgTextField;
     private JPanel errorMsgTextFieldPane;
 
     private ActionListener allowDecimalsListener;
@@ -100,9 +105,20 @@ public class NumberEditorValidatePane extends JPanel {
     }
 
     private void initErrorMsgPane() {
-        errorMsgTextField = new UITextField();
+        TextFieldAdapterProvider provider = ExtraDesignClassManager.getInstance().getSingle(TextFieldAdapterProvider.XML_TAG);
+        if (provider != null) {
+            try {
+                errorMsgTextField = provider.createTextFieldAdapter();
+            } catch (Exception e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                errorMsgTextField = new UITextFieldAdapter();
+            }
+        } else {
+            errorMsgTextField = new UITextFieldAdapter();
+        }
+
         errorMsgTextFieldPane = TableLayoutHelper.createGapTableLayoutPane(
-                new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Error_Tip")), errorMsgTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
+                new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Error_Tip")), errorMsgTextField.getErrorMsgTextField()}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
     }
 
 

designer-base/src/main/java/com/fr/file/StashedFILE.java

@@ -1,5 +1,9 @@
 package com.fr.file;
 
+import com.fr.base.io.XMLEncryptUtils;
+import com.fr.io.EncryptUtils;
+import com.fr.io.FineEncryptUtils;
+import com.fr.stable.StringUtils;
 import javax.swing.Icon;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
@@ -11,10 +15,16 @@ public class StashedFILE extends AbstractFILE {
 
     private FILE file;
     private byte[] content;
+    private String suffix;
 
     public StashedFILE(FILE file, byte[] content) {
+        this(file, content, null);
+    }
+
+    public StashedFILE(FILE file, byte[] content, String suffix) {
         this.file = file;
         this.content = content;
+        this.suffix = suffix;
     }
 
     @Override
@@ -54,7 +64,12 @@ public class StashedFILE extends AbstractFILE {
 
     @Override
     public InputStream asInputStream() throws Exception {
-        return new ByteArrayInputStream(content);
+        ByteArrayInputStream in = new ByteArrayInputStream(content);
+        return needDecode() ? XMLEncryptUtils.decodeInputStream(EncryptUtils.decodeInputStream(FineEncryptUtils.decode(in))) : in;
+    }
+
+    private boolean needDecode() {
+        return StringUtils.isNotEmpty(suffix) && (suffix.endsWith(".cpt") || suffix.endsWith(".frm"));
     }
 
     @Override

designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties

@@ -1,7 +1,7 @@
 com.fr.design.mainframe.check.CheckButton=230*118
 com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=550*185
 com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=490*35
-com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=490*280
+com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=550*280
 com.fr.env.RemoteEnvPane.dialog=458*132
 com.fr.design.version.check.dialog=450*95
 com.fr.design.version.detail.label=700*30

designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartImageMarkerPane.java

@@ -31,8 +31,8 @@ public class VanChartImageMarkerPane extends BasicBeanPane<VanChartAttrMarker> {
     public VanChartImageMarkerPane() {
         imageBackgroundPane = new ImageBackgroundQuickPane(false);
         imageBackgroundPane.setPreferredSize(getImageBackgroundPreferredSize(imageBackgroundPane.getPreferredSize()));
-        width = new UISpinnerWithPx(0, 100, 0.5, 30);
+        width = new UISpinnerWithPx(0, Integer.MAX_VALUE, 0.5, 30);
-        height = new UISpinnerWithPx(0, 100, 0.5, 30);
+        height = new UISpinnerWithPx(0, Integer.MAX_VALUE, 0.5, 30);
 
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;

designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java

@@ -64,21 +64,18 @@ public class FRCardMainBorderLayoutAdapter extends FRBorderLayoutAdapter {
     private boolean isBeyondMinConstraint(int minConstraint, int value) {
         if (minConstraint > value) {
             FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Beyond_Tablayout_Bounds"));
-            if (container.getBackupBound() != null) {
+            JTemplate<?, ?> jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
-                // 手动拖动导致变矮的场景
+            if (jt != null && jt.getUndoManager().canUndo()) {
-                container.setSize(container.getBackupBound().getSize());
+                // 自适应布局平分高度导致变矮的场景，优先做撤销
-            } else {
-                // 自适应布局平分高度导致变矮的场景
                 UIUtil.invokeLaterIfNeeded(new Runnable() {
                     @Override
                     public void run() {
-                        JTemplate<?, ?> jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+                        jt.undo();
-                        if (jt != null) {
-                            jt.undo();
-                        }
                     }
                 });
-
+            } else if (container.getBackupBound() != null) {
+                // 手动拖动导致变矮的场景
+                container.setSize(container.getBackupBound().getSize());
             }
             return true;
         } else {

designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java

@@ -115,6 +115,7 @@ public class DesignerSocketIO {
 
     private static IO.Options createOptions() {
         IO.Options options = new IO.Options();
+        options.path = WebSocketConfig.getInstance().getSocketContext();
         try {
             if (ComparatorUtils.equals(currentProtocol, HTTPS)) {
                 options.sslContext = getSSLContext();