Merge pull request #3658 in DESIGN/design from feature/10.0 to research/10.0

* commit '2e4e6d5cb6fe91a10209c139e9e9138c50e90c58': CHART-18181 设置启动参数 REPORT-48354 【10.0.14二轮冒烟】本地打开模板，切换到远程环境，预览模板保存成功后未跳到预览页面 REPORT-47885 设计器的埋点回传支持回传本地服务器的数据无JIRA任务解决冲突
4 years ago · e69e9477e5
5 changed files with 47 additions and 23 deletions
--- a/designer-base/src/main/java/com/fr/design/actions/file/WebPreviewUtils.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/WebPreviewUtils.java
@ -73,6 +73,22 @@ public final class WebPreviewUtils {
        FILE currentTemplate = jt.getEditingFILE();
        // carl:是否是保存在运行环境下的模板，不是就不能被预览
        if (currentTemplate instanceof FileNodeFILE) {
+            // 判断下模板是否存在 不存在先提示
+            if (!currentTemplate.exists()) {
+                int selVal = showConfirmDialog(
+                        DesignerContext.getDesignerFrame(),
+                        Toolkit.i18nText("Fine-Design_Basic_Web_Preview_Message"),
+                        Toolkit.i18nText("Fine-Design_Basic_Preview_Tool_Tips"),
+                        OK_CANCEL_OPTION,
+                        WARNING_MESSAGE
+                );
+                if (OK_OPTION == selVal) {
+                    if (!jt.saveAsTemplate()) {
+                        return;
+                    }
+                }
+                currentTemplate = jt.getEditingFILE();
+            }
            browseUrl(currentTemplate, baseRoute, map, actionType, jt);
        } else {
            // 说明模板没有保存在报表运行环境下面,提示用户
--- a/designer-base/src/main/java/com/fr/design/ui/Assistant.java
+++ b/designer-base/src/main/java/com/fr/design/ui/Assistant.java
@ -3,6 +3,7 @@ package com.fr.design.ui;
 import com.fr.stable.StringUtils;
 import com.teamdev.jxbrowser.chromium.Browser;
 import com.teamdev.jxbrowser.chromium.BrowserContext;
+import com.teamdev.jxbrowser.chromium.BrowserPreferences;
 import com.teamdev.jxbrowser.chromium.ProtocolService;
 import com.teamdev.jxbrowser.chromium.URLResponse;

@ -12,6 +13,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;

 /**
 * @author richie
@ -20,6 +23,14 @@ import java.nio.file.Path;
 */
 public class Assistant {

+    public static void addChromiumSwitches(String... switches) {
+
+        List<String> list = BrowserPreferences.getChromiumSwitches();
+        Collections.addAll(list, switches);
+
+        BrowserPreferences.setChromiumSwitches((list.toArray(new String[0])));
+    }
+
    public static URLResponse inputStream2Response(InputStream inputStream, String filePath) throws Exception {
        URLResponse response = new URLResponse();
        DataInputStream stream = new DataInputStream(inputStream);
--- a/designer-base/src/main/java/com/fr/design/ui/ModernUIPane.java
+++ b/designer-base/src/main/java/com/fr/design/ui/ModernUIPane.java
@ -8,18 +8,18 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.web.struct.AssembleComponent;
 import com.teamdev.jxbrowser.chromium.Browser;
-import com.teamdev.jxbrowser.chromium.BrowserPreferences;
 import com.teamdev.jxbrowser.chromium.JSValue;
-import com.teamdev.jxbrowser.chromium.events.FinishLoadingEvent;
-import com.teamdev.jxbrowser.chromium.events.LoadAdapter;
 import com.teamdev.jxbrowser.chromium.events.LoadListener;
 import com.teamdev.jxbrowser.chromium.events.ScriptContextAdapter;
 import com.teamdev.jxbrowser.chromium.events.ScriptContextEvent;
 import com.teamdev.jxbrowser.chromium.events.ScriptContextListener;
 import com.teamdev.jxbrowser.chromium.swing.BrowserView;

-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JDialog;
+import javax.swing.SwingUtilities;
+import javax.swing.WindowConstants;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Map;
@ -44,7 +44,7 @@ public class ModernUIPane<T> extends BasicPane {
    private void initialize() {
        if (browser == null) {
            setLayout(new BorderLayout());
-            BrowserPreferences.setChromiumSwitches("--disable-google-traffic");
+            Assistant.addChromiumSwitches("--disable-google-traffic");
            if (DesignerEnvManager.getEnvManager().isOpenDebug()) {
                UIToolbar toolbar = new UIToolbar();
                add(toolbar, BorderLayout.NORTH);
@ -75,7 +75,7 @@ public class ModernUIPane<T> extends BasicPane {
                        SwingUtilities.getWindowAncestor(ModernUIPane.this).setVisible(false);
                    }
                });
-                BrowserPreferences.setChromiumSwitches("--remote-debugging-port=9222");
+                Assistant.addChromiumSwitches("--remote-debugging-port=9222");
                initializeBrowser();
                add(new BrowserView(browser), BorderLayout.CENTER);
            } else {
--- a/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/solid/SolidCollector.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/solid/SolidCollector.java
@ -40,9 +40,6 @@ public class SolidCollector {
     * 回传文件给云中心，并删除服务端本地文件
     */
    public void sendToCloudCenterAndDeleteFile() {
-        if (WorkContext.getCurrent().isLocal()) {
-            return;
-        }
        String url = CloudCenter.getInstance().acquireConf("design.solid", "https://cloud.fanruan.com/api/solid/upload");
        if (StringUtils.isEmpty(url)) {
            FineLoggerFactory.getLogger().info("failed to get solid content upload url...");
--- a/designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java
+++ b/designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java
@ -310,9 +310,9 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
        // 单元格组要记录下之前的选中情况
        private CellSelection oriCellSelection = null;

-        private List<String> newAdd = new ArrayList<String>();
+        private List<ColumnRow> newAdd = new ArrayList<>();

-        private List<String> oldAdd = new ArrayList<String>();
+        private List<ColumnRow> oldAdd = new ArrayList<>();

        public SmartJTablePane4DB(KeyColumnTableModel model, ElementCasePane actionReportPane) {
            this(model, actionReportPane, false);
@ -433,7 +433,8 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
                    if (!allColumnRow.contains(columnRow.toString())) {
                        add.addColumnRow(columnRow);
                    }
-
+                    // 重新更换区域框选单元格后 清理历史框选
+                    oldAdd.clear();
                }

                if (add.getSize() > 0) {
@ -459,10 +460,11 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
                        TemplateCellElement cellElement = ePane.getEditingElementCase().getTemplateCellElement(c + i, r + j);
                        if (cellElement != null && ((i + c) != 0 || (r + j) != 0)) {
                            String value = cellElement.toString();
-                            if (!newAdd.contains(value) && !allColumnRow.contains(value)) {
-                                add.addColumnRow(ColumnRow.valueOf(value));
+                            ColumnRow columnRow = ColumnRow.valueOf(value);
+                            if (!newAdd.contains(columnRow) && !allColumnRow.contains(value)) {
+                                add.addColumnRow(columnRow);
                            }
-                            newAdd.add(value);
+                            newAdd.add(columnRow);
                        }

                        if (cellElement == null) {
@ -470,16 +472,14 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
                            if (!allColumnRow.contains(columnRow.toString())) {
                                add.addColumnRow(columnRow);
                            }
-                            newAdd.add(columnRow.toString());
+                            newAdd.add(columnRow);
                        }
                    }
                }
-                int oldSize = oldAdd.size();
-                int newSize = newAdd.size();
-                if (oldSize > newSize && oldAdd.containsAll(newAdd)) {
-                    int diff = oldSize - newSize;
-                    newValue.splice(newValue.getSize() - diff, diff);
-                }
+                // 计算出前后两次选中的差值
+                oldAdd.removeAll(newAdd);
+                // 移除差值部分
+                newValue.removeAll(oldAdd);
                oldAdd.clear();
                oldAdd.addAll(newAdd);
            }