From 72d06999270da7c1a119a755688637e2496e896f Mon Sep 17 00:00:00 2001
From: mengao <283296419@qq.com>
Date: Thu, 28 Sep 2017 14:18:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E4=BF=9D=E5=AD=98=E5=92=8C=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4svg=E5=9C=B0=E5=9B=BE=E7=9A=84action=E6=94=BE=E5=88=B0?=
 =?UTF-8?q?chart=E4=B8=AD=20=E5=9C=A8=E8=BF=9C=E7=A8=8B=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=EF=BC=8C=E5=A2=9E=E5=88=A0=E6=94=B9svg=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E6=97=B6=EF=BC=8C=E6=9B=B4=E6=96=B0mapattr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_base/src/com/fr/env/RemoteEnv.java   | 38 +++++++++++++++++--
 .../PlotSeries/MapGroupExtensionPane.java     |  4 +-
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/designer_base/src/com/fr/env/RemoteEnv.java b/designer_base/src/com/fr/env/RemoteEnv.java
index 165ed3468a..96835b5738 100644
--- a/designer_base/src/com/fr/env/RemoteEnv.java
+++ b/designer_base/src/com/fr/env/RemoteEnv.java
@@ -56,8 +56,7 @@ import com.fr.stable.xml.XMLTools;
 import com.fr.stable.xml.XMLableReader;
 import com.fr.web.ResourceConstants;
 
-import javax.swing.JOptionPane;
-import javax.swing.UIManager;
+import javax.swing.*;
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerConfigurationException;
@@ -65,7 +64,7 @@ import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-import java.awt.Component;
+import java.awt.*;
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -1537,7 +1536,7 @@ public class RemoteEnv extends AbstractEnv {
         testServerConnection();
 
         HashMap<String, String> para = new HashMap<String, String>();
-        para.put("op", "fr_remote_design");
+        para.put("op", "svgrelate");
         para.put("cmd", "design_save_svg");
         para.put("filePath", svgFile.getFilePath());
         para.put("current_uid", this.createUserID());
@@ -1578,6 +1577,37 @@ public class RemoteEnv extends AbstractEnv {
         return true;
     }
 
+
+    /**
+     * 删除svg文件
+     *
+     * @param filePath svg文件地址
+     * @return 删除成功返回true
+     */
+    public boolean deleteSvg(String filePath) {
+        if (filePath == null) {
+            return false;
+        }
+        try {
+            HashMap<String, String> para = new HashMap<String, String>();
+            para.put("op", "svgrelate");
+            para.put("cmd", "delete_svg");
+            para.put("file_path", filePath);
+
+            HttpClient client = createHttpMethod(para);
+            InputStream input = execute4InputStream(client);
+
+            if (input == null) {
+                return false;
+            }
+
+            return Boolean.valueOf(IOUtils.inputStream2String(input, EncodeConstants.ENCODING_UTF_8));
+        } catch (Exception e) {
+            FRLogger.getLogger().error(e.getMessage());
+        }
+        return false;
+    }
+
     /**
      * 写报表运行环境所需的配置文件
      *
diff --git a/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java b/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java
index 7a4732807b..1bcfc29778 100644
--- a/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java
+++ b/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java
@@ -361,9 +361,9 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver {
 						groupExtensionPane.setValueAtCurrentSelectIndex(newName);
 						fireStateChange();
 						saveMapInfo(newName);
-						FRContext.getCurrentEnv().deleteFile(
+						FRContext.getCurrentEnv().deleteSvg(
 								StableUtils.pathJoin(new String[]{MapSvgXMLHelper.relativeDefaultMapPath(),oldName+SvgProvider.EXTENSION}));
-						FRContext.getCurrentEnv().deleteFile(
+						FRContext.getCurrentEnv().deleteSvg(
 								StableUtils.pathJoin(new String[]{MapSvgXMLHelper.relativeCustomMapPath(),oldName+SvgProvider.EXTENSION}));
 						refresh();
 					}catch (Exception exp){