提交标绘面板和demo

hhyu1 · hhyu1 · commit d3e2a32f148e · 2024-09-09T16:46:44.000+08:00
diff --git a/dist/leaflet/include-leaflet.js b/dist/leaflet/include-leaflet.js
@@ -147,11 +147,11 @@
             inputCSS(disturl + '/leaflet/iclient-leaflet.min.css');
         }
         if (inArray(includes, 'iclient-plot-leaflet')) {
-            inputCSS(libsurl + '/plotting/leaflet/11.2.0/iclient-plot-leaflet.css');
+            inputCSS(libsurl + '/plotting/leaflet/11.2.1/iclient-plot-leaflet.css');
             if (supportES6()) {
-                inputScript(libsurl + '/plotting/leaflet/11.2.0/iclient-plot-leaflet-es6.min.js');
+                inputScript(libsurl + '/plotting/leaflet/11.2.1/iclient-plot-leaflet-es6.min.js');
             } else {
-                inputScript(libsurl + '/plotting/leaflet/11.2.0/iclient-plot-leaflet.min.js');
+                inputScript(libsurl + '/plotting/leaflet/11.2.1/iclient-plot-leaflet.min.js');
             }
         }
         if (inArray(includes, 'ant-design-vue')) {
diff --git a/examples/js/plottingPanel/PlotMapPanel.js b/examples/js/plottingPanel/PlotMapPanel.js
@@ -87,7 +87,7 @@ L.supermap.plotting.initPlotMapPanel = function(div, plotMapManager){
 
         var activePlottingLayer = document.createElement("li");
         activePlottingLayer.id="activePlottingLayer";
-        activePlottingLayer.innerText = resource.text_active;
+        activePlottingLayer.innerText = resources.text_active;
         activePlottingLayer.style.margin = '1px 0';
         activePlottingLayer.style.padding = '0 5px';
         activePlottingLayer.style.cursor = 'pointer';
@@ -105,7 +105,7 @@ L.supermap.plotting.initPlotMapPanel = function(div, plotMapManager){
 
         var activeChildPlotLayer = document.createElement("li");
         activeChildPlotLayer.id="activeChildPlotLayer";
-        activeChildPlotLayer.innerText = resource.text_active;
+        activeChildPlotLayer.innerText = resources.text_active;
         activeChildPlotLayer.style.margin = '1px 0';
         activeChildPlotLayer.style.padding = '0 5px';
         activeChildPlotLayer.style.cursor = 'pointer';
diff --git a/examples/js/plottingPanel/PublicStyleFunction.js b/examples/js/plottingPanel/PublicStyleFunction.js
diff --git a/examples/js/plottingPanel/StylePanel.js b/examples/js/plottingPanel/StylePanel.js
diff --git a/examples/leaflet/plot_filetransfer.html b/examples/leaflet/plot_filetransfer.html
@@ -67,7 +67,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_filetransfer" sty
    function getSMLInfosSucess(evt){
        L.supermap.plotting.initSMLInfosPanel("filetree", evt.smlInfoList, function(clickSmlFileName){
            var result = sitDataManager.downloadSmlFileURL(clickSmlFileName);
-           document.getElementById("downloadUrl").value = serverUrl + result;
+           document.getElementById("downloadUrl").value = result;
            document.getElementById("smlFileName").value =clickSmlFileName;
            sitDataManager.openSmlFileOnServer(clickSmlFileName);
        })
diff --git a/examples/locales/en-US/resources.js b/examples/locales/en-US/resources.js
@@ -2510,7 +2510,8 @@ window.examplesResources = {
         "text_subLayer":"subLayer",
         "text_setCurrentMapScaleToMintVisibleScale":"set current map scale to min visible scale",
         "text_setCurrentMapScaleToMaxVisibleScale":"set current map scale to max visible scale",
-        "text_clearVisibleScaleSet":"clear visible scale set"
+        "text_clearVisibleScaleSet":"clear visible scale set",
+		"text_symbolAnnotations":"symbolAnnotations"
     }
 };
 
diff --git a/examples/locales/zh-CN/resources.js b/examples/locales/zh-CN/resources.js
@@ -2485,7 +2485,8 @@ window.examplesResources = {
         "text_subLayer":"子图层",
         "text_setCurrentMapScaleToMintVisibleScale":"设置当前地图比例尺为最小可见比例尺",
         "text_setCurrentMapScaleToMaxVisibleScale":"设置当前地图比例尺为最大可见比例尺",
-        "text_clearVisibleScaleSet":"清除可见比例尺设置"
+        "text_clearVisibleScaleSet":"清除可见比例尺设置",
+		"text_symbolAnnotations":"多注记"
         
 
     }

Original file line number	Diff line number	Diff line change
`@@ -147,11 +147,11 @@`
`147`	`147`	`inputCSS(disturl + '/leaflet/iclient-leaflet.min.css');`
`148`	`148`	`}`
`149`	`149`	`if (inArray(includes, 'iclient-plot-leaflet')) {`
`150`		`- inputCSS(libsurl + '/plotting/leaflet/11.2.0/iclient-plot-leaflet.css');`
	`150`	`+ inputCSS(libsurl + '/plotting/leaflet/11.2.1/iclient-plot-leaflet.css');`
`151`	`151`	`if (supportES6()) {`
`152`		`- inputScript(libsurl + '/plotting/leaflet/11.2.0/iclient-plot-leaflet-es6.min.js');`
	`152`	`+ inputScript(libsurl + '/plotting/leaflet/11.2.1/iclient-plot-leaflet-es6.min.js');`
`153`	`153`	`} else {`
`154`		`- inputScript(libsurl + '/plotting/leaflet/11.2.0/iclient-plot-leaflet.min.js');`
	`154`	`+ inputScript(libsurl + '/plotting/leaflet/11.2.1/iclient-plot-leaflet.min.js');`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`	`if (inArray(includes, 'ant-design-vue')) {`
Original file line number	Diff line number	Diff line change
`@@ -2510,7 +2510,8 @@ window.examplesResources = {`
`2510`	`2510`	`"text_subLayer":"subLayer",`
`2511`	`2511`	`"text_setCurrentMapScaleToMintVisibleScale":"set current map scale to min visible scale",`
`2512`	`2512`	`"text_setCurrentMapScaleToMaxVisibleScale":"set current map scale to max visible scale",`
`2513`		`- "text_clearVisibleScaleSet":"clear visible scale set"`
	`2513`	`+ "text_clearVisibleScaleSet":"clear visible scale set",`
	`2514`	`+ "text_symbolAnnotations":"symbolAnnotations"`
`2514`	`2515`	`}`
`2515`	`2516`	`};`
`2516`	`2517`
Original file line number	Diff line number	Diff line change
`@@ -2485,7 +2485,8 @@ window.examplesResources = {`
`2485`	`2485`	`"text_subLayer":"子图层",`
`2486`	`2486`	`"text_setCurrentMapScaleToMintVisibleScale":"设置当前地图比例尺为最小可见比例尺",`
`2487`	`2487`	`"text_setCurrentMapScaleToMaxVisibleScale":"设置当前地图比例尺为最大可见比例尺",`
`2488`		`- "text_clearVisibleScaleSet":"清除可见比例尺设置"`
	`2488`	`+ "text_clearVisibleScaleSet":"清除可见比例尺设置",`
	`2489`	`+ "text_symbolAnnotations":"多注记"`
`2489`	`2490`
`2490`	`2491`
`2491`	`2492`	`}`