From 4246d954df4917130607f00d996905b9ec517c8c Mon Sep 17 00:00:00 2001 From: hades Date: Mon, 10 May 2021 09:53:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-51305=20=E6=89=93=E5=BC=80/=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=A8=A1=E6=9D=BF=E6=97=B6=E5=88=87=E6=8D=A2=E6=97=B6?= =?UTF-8?q?=20=E5=8F=B3=E4=BE=A7=E9=9D=A2=E6=9D=BF=E5=8F=AF=E7=94=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20+=20=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=89=93?= =?UTF-8?q?=E5=BC=80=E6=97=B6=E5=8A=A0=E8=BD=BD=E5=8A=A8=E7=94=BB=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/mainframe/DesktopCardPane.java | 3 +++ .../src/main/java/com/fr/design/worker/open/OpenWorker.java | 4 +--- .../src/main/java/com/fr/design/worker/save/SaveWorker.java | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java b/designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java index 22a10d3ba..9558d44d6 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java @@ -89,6 +89,7 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener private void checkLoadingPane() { if (layeredPane.getComponent(LOADING_LAYER) != loadingPane) { layeredPane.add(loadingPane, LOADING_LAYER); + component.setVisible(false); } } @@ -108,11 +109,13 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener transparentPane.start(); layeredPane.moveToFront(transparentPane); DesignerContext.getDesignerFrame().refreshUIToolBar(); + EastRegionContainerPane.getInstance().updateAllPropertyPane(); } public void hideCover() { transparentPane.stop(); layeredPane.moveToFront(component); + EastRegionContainerPane.getInstance().updateAllPropertyPane(); } protected JTemplate getSelectedJTemplate() { diff --git a/designer-base/src/main/java/com/fr/design/worker/open/OpenWorker.java b/designer-base/src/main/java/com/fr/design/worker/open/OpenWorker.java index f556eb612..819660a99 100644 --- a/designer-base/src/main/java/com/fr/design/worker/open/OpenWorker.java +++ b/designer-base/src/main/java/com/fr/design/worker/open/OpenWorker.java @@ -6,7 +6,6 @@ import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrameFileDealerPane; -import com.fr.design.mainframe.EastRegionContainerPane; import com.fr.design.mainframe.JTemplate; import com.fr.design.worker.WorkerManager; import com.fr.exception.DecryptTemplateException; @@ -99,11 +98,10 @@ public class OpenWorker extends SwingWorker { currentTemplate.whenClose(); DesignerContext.getDesignerFrame().addAndActivateJTemplate(book); HistoryTemplateListCache.getInstance().replaceCurrentEditingTemplate(book); - EastRegionContainerPane.getInstance().updateAllPropertyPane(); } else { // 当前tab页是其他模板 for (int i = 0, len = HistoryTemplateListCache.getInstance().getHistoryCount(); i < len; i++) { - JTemplate template = HistoryTemplateListCache.getInstance().get(i); + JTemplate template = HistoryTemplateListCache.getInstance().getTemplate(i); if (ComparatorUtils.equals(template.getEditingFILE(), book.getEditingFILE())) { template.whenClose(); HistoryTemplateListCache.getInstance().getHistoryList().set(i, book); diff --git a/designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java b/designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java index f6c21f208..cc60f2dc8 100644 --- a/designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java +++ b/designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java @@ -68,7 +68,6 @@ public class SaveWorker extends SwingWorker { this.template.setSaving(false); // 恢复界面 if (slowly && ComparatorUtils.equals(this.template.getName(), HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getName())) { - EastRegionContainerPane.getInstance().updateAllPropertyPane(); DesignerContext.getDesignerFrame().refreshUIToolBar(); DesignerContext.getDesignerFrame().getCenterTemplateCardPane().hideCover(); } From a3e89e1e1752ee9c94f7742e87c1201d384c03c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Mon, 10 May 2021 16:26:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?CHART-19174=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89wms=E5=B8=A6token=E6=97=A0=E6=95=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/map/designer/type/WMSLayerPane.java | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/WMSLayerPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/WMSLayerPane.java index 19afd688f..67369d826 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/WMSLayerPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/WMSLayerPane.java @@ -1,6 +1,6 @@ package com.fr.van.chart.map.designer.type; -import com.fr.decision.webservice.v10.map.WMSFactory; +import com.fr.decision.webservice.v10.map.MapEditService; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; @@ -11,7 +11,6 @@ import com.fr.design.gui.itextarea.UITextArea; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.http.HttpClient; import com.fr.plugin.chart.base.GisLayer; import com.fr.plugin.chart.map.layer.WMSLayer; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -85,21 +84,13 @@ public class WMSLayerPane extends JPanel implements UIObserver { public void actionPerformed(ActionEvent e) { new SwingWorker() { - private java.util.List list = new ArrayList<>(); + private List list = new ArrayList<>(); @Override protected Void doInBackground() { - HttpClient httpClient = new HttpClient(wmsUrl.getText() + "service=WMS&request=GetCapabilities"); - httpClient.asGet(); - - if (!httpClient.isServerAlive()) { - return null; - } - - String res = httpClient.getResponseText(); - List layers = WMSFactory.readLayers(res); + List wmsNames = MapEditService.getInstance().getWMSNames(wmsUrl.getText()); list.clear(); - for (String layer : layers) { + for (String layer : wmsNames) { list.add(new WMSLayer(layer, false)); } return null; @@ -108,9 +99,8 @@ public class WMSLayerPane extends JPanel implements UIObserver { @Override protected void done() { connectButton.setText(Toolkit.i18nText("Fine-Design_Chart_Connect_WMP")); - if (list != null && list.size() > 0) { - resetWMSLayerPane(list); - } else { + resetWMSLayerPane(list); + if (list == null || list.isEmpty()) { FineJOptionPane.showMessageDialog(null, Toolkit.i18nText("Fine-Design_Chart_Invalid_WMS")); } }