无jira 解决冲突

3 years ago · ea8b3c3c70
19 changed files with 155 additions and 31 deletions
--- a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
+++ b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
@ -8,6 +8,7 @@ import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.env.DesignerWorkspaceGenerator;
 import com.fr.design.env.DesignerWorkspaceInfo;
+import com.fr.design.env.DesignerWorkspaceInfoContext;
 import com.fr.design.env.DesignerWorkspaceType;
 import com.fr.design.env.RemoteDesignerWorkspaceInfo;
 import com.fr.design.env.RemoteWorkspace;
@ -105,6 +106,7 @@ public class EnvChangeEntrance {
    private boolean switch2Env(final String envName, PopTipStrategy strategy) {
        DesignerEnvManager envManager = DesignerEnvManager.getEnvManager();
        DesignerWorkspaceInfo selectedEnv = envManager.getWorkspaceInfo(envName);
+        DesignerWorkspaceInfoContext.setWorkspaceInfo(selectedEnv);
        WorkspaceConnectionInfo connectionInfo = selectedEnv.getConnection();

        try {
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java
@ -511,7 +511,6 @@ public class JDBCDefPane extends JPanel {
                this.dbtypeComboBox.setSelectedItem(OTHER_DB);
            }
        }
-        this.jdbcDatabase.setIdentity(jdbcDatabase.getIdentity());
        // jdbcDatabase.getDriverSource() 只会是空或者是有值，但是为了保险起见，还是应该做个处理
        String driverSource = jdbcDatabase.getDriverSource();
        if (driverSource == null) {
--- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/CopyableJTable.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/CopyableJTable.java
@ -48,9 +48,17 @@ public class CopyableJTable extends SortableJTable {
    boolean mouseDrag = false;
    boolean headerSelect = false;

-    DefaultTableCellRenderer tableHeaderCellRenderer = new DefaultTableCellRenderer() {
+
+    class CopyableTableHeaderCellRenderer implements TableCellRenderer {
+        TableCellRenderer tableCellRenderer;
+
+        CopyableTableHeaderCellRenderer(TableCellRenderer tableCellRenderer) {
+            this.tableCellRenderer = tableCellRenderer;
+        }
+
+        @Override
        public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
-            JComponent comp = (JComponent) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+            JComponent comp = (JComponent) this.tableCellRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
            if (isChoose(row, column)) {
                comp.setBackground(selectBackGround);
            } else {
@ -58,13 +66,13 @@ public class CopyableJTable extends SortableJTable {
            }
            return comp;
        }
-    };
+    }


    public CopyableJTable(TableSorter tableModel) {
        super(tableModel);
        initListener();
-        this.getTableHeader().setDefaultRenderer(tableHeaderCellRenderer);
+        this.getTableHeader().setDefaultRenderer(new CopyableTableHeaderCellRenderer(this.getTableHeader().getDefaultRenderer()));
    }

    private void initListener() {
--- a/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceInfoContext.java
+++ b/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceInfoContext.java
@ -0,0 +1,20 @@
+package com.fr.design.env;
+
+/**
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/8/24
+ */
+public class DesignerWorkspaceInfoContext {
+
+    private static DesignerWorkspaceInfo workspaceInfo;
+
+    public static DesignerWorkspaceInfo getWorkspaceInfo() {
+        return workspaceInfo;
+    }
+
+    public static void setWorkspaceInfo(DesignerWorkspaceInfo workspaceInfo) {
+        DesignerWorkspaceInfoContext.workspaceInfo = workspaceInfo;
+    }
+}
--- a/designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java
+++ b/designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java
@ -3,6 +3,7 @@ package com.fr.design.env;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralUtils;
 import com.fr.locale.InterProviderFactory;
+import com.fr.stable.CoreConstants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.project.ProjectConstants;
@ -107,7 +108,7 @@ public class LocalDesignerWorkspaceInfo implements DesignerWorkspaceInfo {

        File engineLib = new File(StableUtils.pathJoin(this.path, ProjectConstants.LIB_NAME, REPORT_ENGINE_JAR));
        // 非安装版本允许自由切换
-        boolean notExistLib = !ComparatorUtils.equals(GeneralUtils.readFullBuildNO(), InterProviderFactory.getProvider().getLocText("Fine-Core_Basic_About_No_Build"))
+        boolean notExistLib = !CoreConstants.DOT.equals(StableUtils.getInstallHome())
                && !engineLib.exists();
        if (notExistLib) {
            throw new MainVersionNotMatchException();
--- a/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java
+++ b/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java
@ -83,7 +83,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {

            @Override
            public void mousePressed(MouseEvent evt) {
-                if (evt.getClickCount() == 2) {
+                if (reportletsTree.getPathForLocation(evt.getX(), evt.getY()) != null && evt.getClickCount() == 2) {
                    openFile();
                }
            }
--- a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java
@ -3,6 +3,7 @@ package com.fr.design.gui.controlpane;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.controlpane.shortcutfactory.ShortCutFactory;
+import com.fr.design.gui.ifilechooser.JavaFxNativeFileChooser;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itoolbar.UIToolBarUI;
 import com.fr.design.gui.itoolbar.UIToolbar;
@ -277,6 +278,10 @@ public abstract class UIControlPane extends JControlPane {
                this.requestFocus();
                return;
            }
+            if (JavaFxNativeFileChooser.isShowDialogState()) {
+                JavaFxNativeFileChooser.setShowDialogState(false);
+                return;
+            }
            saveSettings();
            setVisible(false);
            PopupDialogSaveAction saveAction = OSSupportCenter.getAction(PopupDialogSaveAction.class);
--- a/designer-base/src/main/java/com/fr/design/gui/ifilechooser/JavaFxNativeFileChooser.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ifilechooser/JavaFxNativeFileChooser.java
@ -24,6 +24,7 @@ import java.util.List;
 import java.util.concurrent.CountDownLatch;

 public class JavaFxNativeFileChooser implements FileChooserProvider {
+    private static boolean showDialogState = false;
    private File[] selectedFiles = new File[0];
    private FileSelectionMode fileSelectionMode = FileSelectionMode.FILE;
    private String title = Toolkit.i18nText("Fine-Design_Basic_Open");
@ -43,8 +44,17 @@ public class JavaFxNativeFileChooser implements FileChooserProvider {
        return null;
    }

+    public static boolean isShowDialogState() {
+        return showDialogState;
+    }
+
+    public static void setShowDialogState(boolean showDialogState) {
+        JavaFxNativeFileChooser.showDialogState = showDialogState;
+    }
+
    @Override
    public int showDialog(Component parent) {
+        setShowDialogState(true);
        final CountDownLatch latch = new CountDownLatch(1);
        PlatformImpl.startup(() -> {
        });
--- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/CopyAction.java
+++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/CopyAction.java
@ -1,8 +1,7 @@
 package com.fr.design.designer.beans.actions;

-
 import com.fr.design.base.mode.DesignModeContext;
-import com.fr.design.designer.beans.actions.behavior.ComponentEnable;
+import com.fr.design.designer.beans.actions.behavior.CopyableEnable;
 import com.fr.design.mainframe.FormDesigner;

 import javax.swing.KeyStroke;
@ -18,7 +17,7 @@ public class CopyAction extends FormWidgetEditAction {
        this.setMnemonic('C');
        this.setSmallIcon("/com/fr/design/images/m_edit/copy");
        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER));
-        setUpdateBehavior(new ComponentEnable());
+        setUpdateBehavior(new CopyableEnable());
        this.setEnabled(!DesignModeContext.isBanCopyAndCut());
    }

--- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/CutAction.java
+++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/CutAction.java
@ -3,6 +3,7 @@ package com.fr.design.designer.beans.actions;

 import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.designer.beans.actions.behavior.ComponentEnable;
+import com.fr.design.designer.beans.actions.behavior.CutableEnable;
 import com.fr.design.mainframe.FormDesigner;

 import javax.swing.KeyStroke;
@ -18,7 +19,7 @@ public class CutAction extends FormWidgetEditAction {
        this.setMnemonic('T');
        this.setSmallIcon("/com/fr/design/images/m_edit/cut");
        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER));
-        this.setUpdateBehavior(new ComponentEnable());
+        this.setUpdateBehavior(new CutableEnable());
        this.setEnabled(!DesignModeContext.isBanCopyAndCut());
    }

--- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/FormDeleteAction.java
+++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/FormDeleteAction.java
@ -7,9 +7,7 @@ import java.awt.event.KeyEvent;

 import javax.swing.*;

-
-import com.fr.design.designer.beans.actions.behavior.ComponentEnable;
-
+import com.fr.design.designer.beans.actions.behavior.DeletableEnable;
 import com.fr.design.mainframe.FormDesigner;

 /**
@ -26,7 +24,7 @@ public class FormDeleteAction extends FormWidgetEditAction {
        // Richie:删除菜单图标
        this.setSmallIcon("/com/fr/design/images/m_report/delete");
        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0));
-        this.setUpdateBehavior(new ComponentEnable());
+        this.setUpdateBehavior(new DeletableEnable());
    }

    @Override
--- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/behavior/CopyableEnable.java
+++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/behavior/CopyableEnable.java
@ -0,0 +1,16 @@
+package com.fr.design.designer.beans.actions.behavior;
+
+import com.fr.design.designer.beans.actions.FormWidgetEditAction;
+import com.fr.design.mainframe.FormDesigner;
+
+public class CopyableEnable implements UpdateBehavior<FormWidgetEditAction> {
+    @Override
+    public void doUpdate(FormWidgetEditAction action) {
+        FormDesigner designer = action.getEditingComponent();
+        if (designer == null) {
+            action.setEnabled(false);
+            return;
+        }
+        action.setEnabled(designer.isCurrentComponentCopyable());
+    }
+}
--- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/behavior/CutableEnable.java
+++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/behavior/CutableEnable.java
@ -0,0 +1,16 @@
+package com.fr.design.designer.beans.actions.behavior;
+
+import com.fr.design.designer.beans.actions.FormWidgetEditAction;
+import com.fr.design.mainframe.FormDesigner;
+
+public class CutableEnable implements UpdateBehavior<FormWidgetEditAction> {
+    @Override
+    public void doUpdate(FormWidgetEditAction action) {
+        FormDesigner designer = action.getEditingComponent();
+        if (designer == null) {
+            action.setEnabled(false);
+            return;
+        }
+        action.setEnabled(designer.isCurrentComponentCutable());
+    }
+}
--- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/behavior/DeletableEnable.java
+++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/behavior/DeletableEnable.java
@ -0,0 +1,16 @@
+package com.fr.design.designer.beans.actions.behavior;
+
+import com.fr.design.designer.beans.actions.FormWidgetEditAction;
+import com.fr.design.mainframe.FormDesigner;
+
+public class DeletableEnable implements UpdateBehavior<FormWidgetEditAction> {
+    @Override
+    public void doUpdate(FormWidgetEditAction action) {
+        FormDesigner designer = action.getEditingComponent();
+        if (designer == null) {
+            action.setEnabled(false);
+            return;
+        }
+        action.setEnabled(designer.isCurrentComponentDeletable());
+    }
+}
--- a/designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java
+++ b/designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java
@ -745,5 +745,13 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
        return false;
    }

+    @Override
+    public boolean isCurrentComponentCutable() {
+        return !isRootSelected();
+    }

+    @Override
+    public boolean isCurrentComponentCopyable() {
+        return !isRootSelected();
+    }
 }
--- a/designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java
+++ b/designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java
@ -36,6 +36,9 @@ public class FormDesignerUtils {
     * @return
     */
    public static boolean isBodyAbsolute(FormDesigner designer) {
+        if (!designer.getRootComponent().acceptType(XWFitLayout.class)) {
+            return false;
+        }
        WFitLayout root = ((WFitLayout) designer.getRootComponent().toData());
        return root.getBodyLayoutType() == com.fr.form.ui.container.WBodyLayoutType.ABSOLUTE;
    }
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java
@ -1266,6 +1266,11 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
        return isForm || isRoot(getSelectionModel().getSelection().getSelectedCreator());
    }

+    public boolean isParameterSelected() {
+        XCreator xCreator =  getSelectionModel().getSelection().getSelectedCreator();
+        return xCreator != null && xCreator.acceptType(XWParameterLayout.class);
+    }
+
    /**
     * 显示权限编辑界面
     */
@ -1384,6 +1389,18 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
        }
    }

+    public boolean isCurrentComponentCutable() {
+        return !(isRootSelected() || isParameterSelected());
+    }
+
+    public boolean isCurrentComponentCopyable() {
+        return !(isRootSelected() || isParameterSelected());
+    }
+
+    public boolean isCurrentComponentDeletable() {
+        return !isRootSelected();
+    }
+
    // 当前选中控件可以上移一层吗？
    public boolean isCurrentComponentMovableUp() {
        XCreator creator = getSelectionModel().getSelection().getSelectedCreator();
--- a/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java
@ -6,6 +6,7 @@ import com.fr.design.DesignerEnvManager;
 import com.fr.design.EnvChangeEntrance;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.env.DesignerWorkspaceInfo;
+import com.fr.design.env.DesignerWorkspaceInfoContext;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.loghandler.DesignerLogger;
@ -127,9 +128,7 @@ public class DesignerSocketIO {
    }

    private static SSLContext getSSLContext() throws Exception {
-        String currentName = DesignerEnvManager.getEnvManager().getCurEnvName();
-        DesignerWorkspaceInfo info = DesignerEnvManager.getEnvManager().getWorkspaceInfo(currentName);
-        WorkspaceConnectionInfo connection = info.getConnection();
+        WorkspaceConnectionInfo connection = getConnectionInfo();
        String certPath = connection.getCertPath();
        String certSecretKey = connection.getCertSecretKey();
        if (StringUtils.isBlank(certPath) || StringUtils.isBlank(certSecretKey)) {
@ -144,6 +143,16 @@ public class DesignerSocketIO {
                .build();
    }

+    private static WorkspaceConnectionInfo getConnectionInfo() {
+        if (DesignerWorkspaceInfoContext.getWorkspaceInfo() == null) {
+            String currentName = DesignerEnvManager.getEnvManager().getCurEnvName();
+            DesignerWorkspaceInfo info = DesignerEnvManager.getEnvManager().getWorkspaceInfo(currentName);
+            return info.getConnection();
+        } else {
+            return DesignerWorkspaceInfoContext.getWorkspaceInfo().getConnection();
+        }
+    }
+
    private static String[] getSocketUri() throws IOException {
        Workspace current = WorkContext.getCurrent();
        URL url = new URL(current.getPath());
@ -152,10 +161,6 @@ public class DesignerSocketIO {
        // 服务器配置https  webSocket可能是wss也可能是ws webSocket的协议可以单独配置
        WebSocketProtocol webSocketProtocol = WebSocketConfig.getInstance().getProtocol();
        currentProtocol = webSocketProtocol == WebSocketProtocol.PLAIN ? HTTP : HTTPS;
-        if (WebSocketConfig.getInstance().isUsingProxy()) {
-            // 如果配置了代理服务器跟随服务器协议
-            currentProtocol = url.getProtocol();
-        }
        String[] result = new String[ports.length];
        for (int i = 0; i < ports.length; i++) {
            result[i] = String.format("%s://%s:%s%s?%s=%s&%s=%s",
@ -239,7 +244,7 @@ public class DesignerSocketIO {

    private static void showConnectionLostDialog() {
        try {
-            UIUtil.invokeAndWaitIfNeeded(new Runnable() {
+            UIUtil.invokeLaterIfNeeded(new Runnable() {
                @Override
                public void run() {
                    FineJOptionPane.showMessageDialog(
@ -270,7 +275,7 @@ public class DesignerSocketIO {
        for (Object object : objects) {
            if (object instanceof Throwable) {
                Throwable  throwable = (Throwable) object;
-                printEventLog.printThrowable(throwable.getMessage(), throwable);
+                printEventLog.printThrowable(throwable);
            } else {
                printEventLog.print(prefix, object);
            }
@ -278,15 +283,15 @@ public class DesignerSocketIO {
    }

    interface PrintEventLog {
-        void printThrowable(String s, Throwable throwable);
+        void printThrowable(Throwable throwable);
        void print(String s, Object ...object);
    }

    enum PrintEventLogImpl implements PrintEventLog {
        ERROR {
            @Override
-            public void printThrowable(String s, Throwable throwable) {
-                FineLoggerFactory.getLogger().error(s, throwable);
+            public void printThrowable(Throwable throwable) {
+                FineLoggerFactory.getLogger().error(throwable.getMessage(), throwable);
            }

            @Override
@ -297,8 +302,8 @@ public class DesignerSocketIO {

        WARN {
            @Override
-            public void printThrowable(String s, Throwable throwable) {
-                FineLoggerFactory.getLogger().warn(s, throwable);
+            public void printThrowable(Throwable throwable) {
+                FineLoggerFactory.getLogger().warn(throwable.getMessage(), throwable);
            }

            @Override
--- a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java
+++ b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java
@ -62,12 +62,12 @@ public class DesignerWorkspaceProvider extends Activator {
                } else {
                    WorkContext.switchTo(workspace);
                    //在设计器完全启动完成后，对初始环境进行一次服务检测，对主要功能无影响，异常仅做日志提示即可
-                    final DesignerWorkspaceInfo selectEnv = workspaceInfo;
+                    final String selectEnv = current;
                    EventDispatcher.listen(DesignerLaunchStatus.STARTUP_COMPLETE, new Listener<Null>() {
                        @Override
                        public void on(Event event, Null aNull) {
                            try {
-                               VersionCheckUtils.showVersionCheckDialog(selectEnv.getName());
+                               VersionCheckUtils.showVersionCheckDialog(selectEnv);
                            } catch (Exception e) {
                                FineLoggerFactory.getLogger().warn("Check Service Failed");
                            }