From e65a75cab791b193bd9fbf569527c2f165638843 Mon Sep 17 00:00:00 2001 From: zheng Date: Wed, 4 Jul 2018 20:47:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?CHART-2534=20=E7=82=B9=E5=9C=B0=E5=9B=BE=20?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=9B=BE=E7=89=87=E6=A0=87=E8=AE=B0?= =?UTF-8?q?=E7=82=B9=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designer/component/marker/VanChartImageMarkerPane.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer-chart/src/com/fr/van/chart/designer/component/marker/VanChartImageMarkerPane.java b/designer-chart/src/com/fr/van/chart/designer/component/marker/VanChartImageMarkerPane.java index 0f4881dce..7d94c2712 100644 --- a/designer-chart/src/com/fr/van/chart/designer/component/marker/VanChartImageMarkerPane.java +++ b/designer-chart/src/com/fr/van/chart/designer/component/marker/VanChartImageMarkerPane.java @@ -1,6 +1,7 @@ package com.fr.van.chart.designer.component.marker; import com.fr.base.background.ImageBackground; +import com.fr.base.background.ImageFileBackground; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; @@ -98,7 +99,7 @@ public class VanChartImageMarkerPane extends BasicBeanPane { public void updateBean(VanChartAttrMarker marker) { marker.setCommon(false); marker.setMarkerType(MarkerType.MARKER_NULL); - ImageBackground background = (ImageBackground) imageBackgroundPane.updateBean(); + ImageFileBackground background = (ImageFileBackground) imageBackgroundPane.updateBean(); background.setLayout(Constants.IMAGE_EXTEND); marker.setImageBackground(background); marker.setWidth(width.getValue()); From d1890ddeb209c591ad548ecc4c723fd339a9d878 Mon Sep 17 00:00:00 2001 From: zheng Date: Thu, 5 Jul 2018 20:44:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?CHART-2556=20=E5=9C=B0=E5=9B=BE=E5=9B=BE?= =?UTF-8?q?=E5=B1=82xml=20=E5=A2=9E=E5=88=A0=E6=94=B9=E6=B2=A1=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BA=86=20=E9=BB=98=E8=AE=A4=E5=80=BC=E8=BF=98?= =?UTF-8?q?=E6=9C=89=E7=82=B9=E9=97=AE=E9=A2=98=20=E6=98=8E=E5=A4=A9?= =?UTF-8?q?=E9=97=AE=E4=B8=8Bable=E6=94=B9=E5=A5=BD=E4=BA=86=E5=86=8D?= =?UTF-8?q?=E6=94=BE=E5=88=B0core=E9=87=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designer/type/VanChartMapSourceChoosePane.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/designer-chart/src/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java b/designer-chart/src/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java index b53628f6f..05a5f02a8 100644 --- a/designer-chart/src/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java +++ b/designer-chart/src/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java @@ -119,7 +119,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { private String[] oldParams; private UIObserverListener listener; - private String[] layers = MapLayerConfigManager.getInstance().getLayerItems(); + private String[] layers = MapLayerConfigManager.getLayerItems(); /** * 给组件登记一个观察者监听事件 * @@ -261,7 +261,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { gisLayer.removeAllItems(); - for(String item : MapLayerConfigManager.getInstance().getLayerItems()){ + for (String item : MapLayerConfigManager.getLayerItems()) { gisLayer.addItem(item); } @@ -286,9 +286,9 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { @Override public Dimension getPreferredSize() { String itemName = Utils.objectToString(gisLayer.getSelectedItem()); - if(MapLayerConfigManager.getInstance().isCustomLayer(itemName)){ + if (MapLayerConfigManager.isCustomLayer(itemName)) { return tileLyaerPane.getPreferredSize(); - }else if(MapLayerConfigManager.getInstance().isCustomWmsLayer(itemName)){ + } else if (MapLayerConfigManager.isCustomWmsLayer(itemName)) { return wmsLayerPane.getPreferredSize(); } return new Dimension(0,0); @@ -297,9 +297,9 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { for(String itemName : layers){ JPanel pane = new JPanel(); - if(MapLayerConfigManager.getInstance().isCustomLayer(itemName)){ + if (MapLayerConfigManager.isCustomLayer(itemName)) { pane = tileLyaerPane; - }else if(MapLayerConfigManager.getInstance().isCustomWmsLayer(itemName)){ + } else if (MapLayerConfigManager.isCustomWmsLayer(itemName)) { pane = wmsLayerPane; } @@ -681,7 +681,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { String layerName = Utils.objectToString(gisLayer.getSelectedItem()); layer.setLayerName(layerName); - layer.setGisLayerType(MapLayerConfigManager.getInstance().getGisLayerType(layerName)); + layer.setGisLayerType(MapLayerConfigManager.getGisLayerType(layerName)); switch (layer.getGisLayerType()){ case CUSTOM_WMS_LAYER: From 57e534796370f9151d9d4fd5276bfacedbc76611 Mon Sep 17 00:00:00 2001 From: kerry Date: Fri, 6 Jul 2018 12:04:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-9437=E3=80=9010.0=E4=B8=80=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92=E3=80=91=E8=AE=BE=E8=AE=A1=E5=99=A8=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=A0=8F-=E6=9C=8D=E5=8A=A1=E5=99=A8-=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8=E9=85=8D=E7=BD=AE=E4=B8=AD=E5=8E=BB=E5=8B=BE?= =?UTF-8?q?=E9=80=89=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/webattr/WriteToolBarPane.java | 5 +++-- .../src/com/fr/design/webattr/WriteWebSettingPane.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/designer-realize/src/com/fr/design/webattr/WriteToolBarPane.java b/designer-realize/src/com/fr/design/webattr/WriteToolBarPane.java index 99bbc8e92..f08f6e0cf 100644 --- a/designer-realize/src/com/fr/design/webattr/WriteToolBarPane.java +++ b/designer-realize/src/com/fr/design/webattr/WriteToolBarPane.java @@ -155,7 +155,7 @@ public class WriteToolBarPane extends AbstractEditToolBarPane { webContent = new WebWrite(); } WebWrite webWrite = (WebWrite) webContent; - if (webWrite.getSelectedColor() != null) { + if (webWrite.isEditRowColor()) { colorBox.setSelected(true); colorButton.setColor(webWrite.getSelectedColor()); } else { @@ -205,9 +205,10 @@ public class WriteToolBarPane extends AbstractEditToolBarPane { } if (colorBox.isSelected()) { + webWrite.setEditRowColor(true); webWrite.setSelectedColor(colorButton.getColor()); } else { - webWrite.setSelectedColor(null); + webWrite.setEditRowColor(false); } webWrite.setUnloadCheck(unloadCheck.isSelected()); diff --git a/designer-realize/src/com/fr/design/webattr/WriteWebSettingPane.java b/designer-realize/src/com/fr/design/webattr/WriteWebSettingPane.java index 6d5b068ba..b23e4c3b2 100644 --- a/designer-realize/src/com/fr/design/webattr/WriteWebSettingPane.java +++ b/designer-realize/src/com/fr/design/webattr/WriteWebSettingPane.java @@ -120,7 +120,7 @@ public class WriteWebSettingPane extends WebSettingPane { if (webWrite == null) { webWrite = new WebWrite(); } - if (webWrite.getSelectedColor() != null) { + if (webWrite.isEditRowColor()) { colorBox.setSelected(true); colorButton.setColor(webWrite.getSelectedColor()); } else { @@ -148,9 +148,10 @@ public class WriteWebSettingPane extends WebSettingPane { protected WebWrite updateSubWebSettingBean() { WebWrite webWrite = new WebWrite(); if (colorBox.isSelected()) { + webWrite.setEditRowColor(true); webWrite.setSelectedColor(colorButton.getColor()); } else { - webWrite.setSelectedColor(null); + webWrite.setEditRowColor(false); } if (topRadioButton.isSelected()) { webWrite.setSheetPosition(Constants.TOP);