Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript

hhyu1 · hhyu1 · commit 902b42961d58 · 2022-04-21T10:32:50.000+08:00
diff --git a/examples/3dwebgl/editor.html b/examples/3dwebgl/editor.html
@@ -24,7 +24,7 @@
     $('.wrapper').load("../template/editor.html", function () {
         var navigation = {
             nav: {
-                title: "SuperMap iClient 10i(2021)",
+                title: "SuperMap iClient 11i(2022)",
                 path: "../../web/",
                 isLocal: window.isLocal
             }
diff --git a/examples/3dwebgl/examples.html b/examples/3dwebgl/examples.html
@@ -26,7 +26,7 @@
     $('.wrapper').load("../template/example.html", function () {
         var navigation = {
             nav: {
-                title: "SuperMap iClient 10i(2021)",
+                title: "SuperMap iClient 11i(2022)",
                 path: "../../web/",
                 isLocal: window.isLocal
             }
diff --git a/examples/classic/editor-wechat.html b/examples/classic/editor-wechat.html
@@ -44,7 +44,7 @@
       $('.wrapper').load('../template/editor.html', function() {
         var navigation = {
           nav: {
-            title: 'SuperMap iClient 10i(2021)',
+            title: 'SuperMap iClient 11i(2022)',
             path: '../../web/',
             isLocal: window.isLocal
           }
diff --git a/examples/classic/editor.html b/examples/classic/editor.html
@@ -24,7 +24,7 @@
     $('.wrapper').load("../template/editor.html", function () {
         var navigation = {
             nav: {
-                title: "SuperMap iClient 10i(2021)",
+                title: "SuperMap iClient 11i(2022)",
                 path: "../../web/",
                 isLocal: window.isLocal
             }
diff --git a/examples/classic/examples-wechat.html b/examples/classic/examples-wechat.html
@@ -66,7 +66,7 @@
       $('.wrapper').load('../template/example.html', function() {
         var navigation = {
           nav: {
-            title: 'SuperMap iClient 10i(2021)',
+            title: 'SuperMap iClient 11i(2022)',
             path: '../../web/',
             isLocal: window.isLocal
           }
diff --git a/examples/classic/examples.html b/examples/classic/examples.html
@@ -26,7 +26,7 @@
     $('.wrapper').load("../template/example.html", function () {
         var navigation = {
             nav: {
-                title: "SuperMap iClient 10i(2021)",
+                title: "SuperMap iClient 11i(2022)",
                 path: "../../web/",
                 isLocal: window.isLocal
             }
diff --git a/examples/component/editor-wechat.html b/examples/component/editor-wechat.html
@@ -51,7 +51,7 @@
       $('.wrapper').load('../template/editor.html', function() {
         var navigation = {
           nav: {
-            title: 'SuperMap iClient 10i(2021)',
+            title: 'SuperMap iClient 11i(2022)',
             path: '../../web/',
             isLocal: window.isLocal
           }
diff --git a/examples/component/editor.html b/examples/component/editor.html
@@ -24,7 +24,7 @@
     $('.wrapper').load("../template/editor.html", function () {
         var navigation = {
             nav: {
-                title: "SuperMap iClient 10i(2021)",
+                title: "SuperMap iClient 11i(2022)",
                 path: "../../web/",
                 isLocal: window.isLocal
             }
diff --git a/examples/component/examples-wechat.html b/examples/component/examples-wechat.html
@@ -66,7 +66,7 @@
       $('.wrapper').load('../template/example.html', function() {
         var navigation = {
           nav: {
-            title: 'SuperMap iClient 10i(2021)',
+            title: 'SuperMap iClient 11i(2022)',
             path: '../../web/',
             isLocal: window.isLocal
           }
diff --git a/examples/component/examples.html b/examples/component/examples.html
@@ -27,7 +27,7 @@
             $('.wrapper').load('../template/example.html', function() {
                 var navigation = {
                     nav: {
-                        title: 'SuperMap iClient 10i(2021)',
+                        title: 'SuperMap iClient 11i(2022)',
                         path: '../../web/',
                         isLocal: window.isLocal
                     }
diff --git a/examples/component/templates.html b/examples/component/templates.html
@@ -27,7 +27,7 @@
             $('.wrapper').load('../template/example.html', function() {
                 var navigation = {
                     nav: {
-                        title: 'SuperMap iClient 10i(2021)',
+                        title: 'SuperMap iClient 11i(2022)',
                         path: '../../web/',
                         isLocal: window.isLocal
                     }
diff --git a/examples/js/tokengenerator.js b/examples/js/tokengenerator.js
@@ -1 +1,2 @@
-window.exampleToken = "PisX2NS9DsMKnnNzs6lg5WzjwZqvH2zXcizVYuBG0L0MvPrnBafdbATturwemCbsdUMHvIfItEBVCAcgubl-UNDHMsJU_XJWanQN65xaOUj_xMCsSTkKn26WFWLgvKBy"
+window.exampleToken = "PisX2NS9DsMKnnNzs6lg5WzjwZqvH2zXcizVYuBG0L0MvPrnBafdbATturwemCbsdUMHvIfItEBVCAcgubl-UNDHMsJU_XJWanQN65xaOUj_xMCsSTkKn26WFWLgvKBy";
+window.iportalToken ="MFEKl8kVmkvEDrDFcgnjoewTQ_fLs-UanFbjOUKhasv8VlbBi8ji89EJ7r0opUTrH4dusdbxXbQN3-Hmu2AbzQ.."
diff --git a/examples/leaflet/editor-wechat.html b/examples/leaflet/editor-wechat.html
@@ -47,7 +47,7 @@
       $('.wrapper').load('../template/editor.html', function() {
         var navigation = {
           nav: {
-            title: 'SuperMap iClient 10i(2021)',
+            title: 'SuperMap iClient 11i(2022)',
             path: '../../web/',
             isLocal: window.isLocal
           }
diff --git a/examples/leaflet/editor.html b/examples/leaflet/editor.html
@@ -24,7 +24,7 @@
     $('.wrapper').load("../template/editor.html", function () {
         var navigation = {
             nav: {
-                title: "SuperMap iClient 10i(2021)",
+                title: "SuperMap iClient 11i(2022)",
                 path: "../../web/",
                 isLocal: window.isLocal
             }
diff --git a/examples/leaflet/examples-wechat.html b/examples/leaflet/examples-wechat.html
@@ -87,7 +87,7 @@
       $('.wrapper').load('../template/example.html', function() {
         var navigation = {
           nav: {
-            title: 'SuperMap iClient 10i(2021)',
+            title: 'SuperMap iClient 11i(2022)',
             path: '../../web/',
             isLocal: window.isLocal
           }
diff --git a/examples/leaflet/examples.html b/examples/leaflet/examples.html
@@ -26,7 +26,7 @@
     $('.wrapper').load("../template/example.html", function () {
         var navigation = {
             nav: {
-                title: "SuperMap iClient 10i(2021)",
+                title: "SuperMap iClient 11i(2022)",
                 path: "../../web/",
                 isLocal: window.isLocal
             }
diff --git a/examples/leaflet/iPortalBatchAddResource.html b/examples/leaflet/iPortalBatchAddResource.html
@@ -102,7 +102,7 @@ <h5 data-i18n="resources.title_share_setting"></h5>
     //iportal的URL地址 或根据情况添加自己的本地iportal地址：http://localhost:8091/iportal
     var iPortalUrl = "https://iportal.supermap.io/iportal";
     // iptl的admin1用户的token，模拟admin1用户登录状态
-    var token = "MFEKl8kVmkvEDrDFcgnjodlPCudIO83mBSwvdjiUlWNnySGD-FCEyYEk4CsY2WnSCujfAs8HI0ZkSL6Vxa-njg..";
+    var token = window.iportalToken;
     //默认请求资源类型
     var resourceType = "MAP";
     //共享设置
diff --git a/examples/leaflet/iPortalPublishData.html b/examples/leaflet/iPortalPublishData.html
@@ -135,7 +135,7 @@ <h4 class="modal-title" id="myModalLabel" data-i18n="resources.text_publish_data
 <script>
     //iportal的URL地址 或根据情况添加自己的本地iportal地址：http://localhost:8190/iportal
     var iPortalUrl = "https://iportal.supermap.io/iportal";
-    var token = "MFEKl8kVmkvEDrDFcgnjodlPCudIO83mBSwvdjiUlWNnySGD-FCEyYEk4CsY2WnSCujfAs8HI0ZkSL6Vxa-njg..";
+    var token = window.iportalToken;
     var queryParams = new L.supermap.iPortalQueryParam({
         resourceType: "DATA",
         pageSize: 12,
diff --git a/examples/leaflet/iPortalQueryMyResources.html b/examples/leaflet/iPortalQueryMyResources.html
@@ -247,7 +247,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_iPortalQueryMyRes
 <script>
     //iportal的URL地址 或根据情况添加自己的本地iportal地址：http://localhost:8091/iportal
     var iPortalUrl = "https://iportal.supermap.io/iportal";
-    var token = "MFEKl8kVmkvEDrDFcgnjodlPCudIO83mBSwvdjiUlWNnySGD-FCEyYEk4CsY2WnSCujfAs8HI0ZkSL6Vxa-njg..";
+    var token = window.iportalToken;
     //默认请求资源类型
     var resourceType = "MAP";
     //全局变量，承载请求后，一共有多少页数
diff --git a/examples/leaflet/iPortalRegisterData.html b/examples/leaflet/iPortalRegisterData.html
@@ -53,7 +53,7 @@ <h5 data-i18n="resources.detail_iPortal_tags"></h5>
 <script>
     //iportal的URL地址 或根据情况添加自己的本地iportal地址：http://localhost:8190/iportal
     var iPortalUrl = "https://iportal.supermap.io/iportal";
-    var token = "MFEKl8kVmkvEDrDFcgnjodlPCudIO83mBSwvdjiUlWNnySGD-FCEyYEk4CsY2WnSCujfAs8HI0ZkSL6Vxa-njg..";
+    var token = window.iportalToken;
     //数据类型
     var dataType;
 
diff --git a/examples/leaflet/iPortalUploadData.html b/examples/leaflet/iPortalUploadData.html
@@ -99,7 +99,7 @@ <h5 data-i18n="resources.text_file_encoding"></h5>
 <script>
     //iportal的URL地址 或根据情况添加自己的本地iportal地址：http://localhost:8190/iportal
     var iPortalUrl = "https://iportal.supermap.io/iportal";
-    var token = "MFEKl8kVmkvEDrDFcgnjodlPCudIO83mBSwvdjiUlWNnySGD-FCEyYEk4CsY2WnSCujfAs8HI0ZkSL6Vxa-njg..";
+    var token = window.iportalToken;
     //上传文件的一些变量（文件对象 文件格式 数据类型 上传的文件名称）
     var file,fileFormats,dataType,uploadDataFileName;
     //excel csv解析（回调重定向对象 x坐标区域 y坐标区域）
diff --git a/examples/mapboxgl/editor-wechat.html b/examples/mapboxgl/editor-wechat.html
@@ -44,7 +44,7 @@
       $('.wrapper').load('../template/editor.html', function() {
         var navigation = {
           nav: {
-            title: 'SuperMap iClient 10i(2021)',
+            title: 'SuperMap iClient 11i(2022)',
             path: '../../web/',
             isLocal: window.isLocal
           }
diff --git a/examples/mapboxgl/editor.html b/examples/mapboxgl/editor.html
@@ -24,7 +24,7 @@
     $('.wrapper').load("../template/editor.html", function () {
         var navigation = {
             nav: {
-                title: "SuperMap iClient 10i(2021)",
+                title: "SuperMap iClient 11i(2022)",
                 path: "../../web/",
                 isLocal: window.isLocal
             }
diff --git a/examples/mapboxgl/examples-wechat.html b/examples/mapboxgl/examples-wechat.html
@@ -66,7 +66,7 @@
       $('.wrapper').load('../template/example.html', function() {
         var navigation = {
           nav: {
-            title: 'SuperMap iClient 10i(2021)',
+            title: 'SuperMap iClient 11i(2022)',
             path: '../../web/',
             isLocal: window.isLocal
           }
diff --git a/examples/mapboxgl/examples.html b/examples/mapboxgl/examples.html
@@ -26,7 +26,7 @@
     $('.wrapper').load("../template/example.html", function () {
         var navigation = {
             nav: {
-                title: "SuperMap iClient 10i(2021)",
+                title: "SuperMap iClient 11i(2022)",
                 path: "../../web/",
                 isLocal: window.isLocal
             }
diff --git a/examples/openlayers/editor-wechat.html b/examples/openlayers/editor-wechat.html
@@ -38,7 +38,7 @@
       $('.wrapper').load('../template/editor.html', function() {
         var navigation = {
           nav: {
-            title: 'SuperMap iClient 10i(2021)',
+            title: 'SuperMap iClient 11i(2022)',
             path: '../../web/',
             isLocal: window.isLocal
           }
diff --git a/examples/openlayers/editor.html b/examples/openlayers/editor.html
@@ -24,7 +24,7 @@
     $('.wrapper').load("../template/editor.html", function () {
         var navigation = {
             nav: {
-                title: "SuperMap iClient 10i(2021)",
+                title: "SuperMap iClient 11i(2022)",
                 path: "../../web/",
                 isLocal: window.isLocal
             }
diff --git a/examples/openlayers/examples-wechat.html b/examples/openlayers/examples-wechat.html
@@ -66,7 +66,7 @@
       $('.wrapper').load('../template/example.html', function() {
         var navigation = {
           nav: {
-            title: 'SuperMap iClient 10i(2021)',
+            title: 'SuperMap iClient 11i(2022)',
             path: '../../web/',
             isLocal: window.isLocal
           }
diff --git a/examples/openlayers/examples.html b/examples/openlayers/examples.html
@@ -26,7 +26,7 @@
     $('.wrapper').load("../template/example.html", function () {
         var navigation = {
             nav: {
-                title: "SuperMap iClient 10i(2021)",
+                title: "SuperMap iClient 11i(2022)",
                 path: "../../web/",
                 isLocal: window.isLocal
             }
diff --git a/examples/openlayers/iPortalBatchAddResource.html b/examples/openlayers/iPortalBatchAddResource.html
@@ -101,7 +101,7 @@ <h5 data-i18n="resources.title_share_setting"></h5>
     //iportal的URL地址 或根据情况添加自己的本地iportal地址：http://localhost:8091/iportal
     var iPortalUrl = "https://iportal.supermap.io/iportal";
     // iptl的admin1用户的token，模拟admin1用户登录状态
-    var token = "MFEKl8kVmkvEDrDFcgnjodlPCudIO83mBSwvdjiUlWNnySGD-FCEyYEk4CsY2WnSCujfAs8HI0ZkSL6Vxa-njg..";
+    var token = window.iportalToken;
     //默认请求资源类型
     var resourceType = "MAP";
     //共享设置
diff --git a/examples/openlayers/iPortalPublishData.html b/examples/openlayers/iPortalPublishData.html
@@ -135,7 +135,7 @@ <h4 class="modal-title" id="myModalLabel" data-i18n="resources.text_publish_data
 <script>
     //iportal的URL地址 或根据情况添加自己的本地iportal地址：http://localhost:8190/iportal
     var iPortalUrl = "https://iportal.supermap.io/iportal";
-    var token = "MFEKl8kVmkvEDrDFcgnjodlPCudIO83mBSwvdjiUlWNnySGD-FCEyYEk4CsY2WnSCujfAs8HI0ZkSL6Vxa-njg..";
+    var token = window.iportalToken;
     var queryParams = new ol.supermap.iPortalQueryParam({
         resourceType: "DATA",
         pageSize: 12,
diff --git a/examples/openlayers/iPortalQueryMyResources.html b/examples/openlayers/iPortalQueryMyResources.html
@@ -248,7 +248,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_iPortalQueryMyRes
 <script>
     //iportal的URL地址 或根据情况添加自己的本地iportal地址：http://localhost:8091/iportal
     var iPortalUrl = "https://iportal.supermap.io/iportal";
-    var token = "MFEKl8kVmkvEDrDFcgnjodlPCudIO83mBSwvdjiUlWNnySGD-FCEyYEk4CsY2WnSCujfAs8HI0ZkSL6Vxa-njg..";
+    var token = window.iportalToken;
     //默认请求资源类型
     var resourceType = "MAP";
     //全局变量，承载请求后，一共有多少页数
diff --git a/examples/openlayers/iPortalRegisterData.html b/examples/openlayers/iPortalRegisterData.html
@@ -53,7 +53,7 @@ <h5 data-i18n="resources.detail_iPortal_tags"></h5>
 <script>
     //iportal的URL地址 或根据情况添加自己的本地iportal地址：http://localhost:8190/iportal
     var iPortalUrl = "https://iportal.supermap.io/iportal";
-    var token = "MFEKl8kVmkvEDrDFcgnjodlPCudIO83mBSwvdjiUlWNnySGD-FCEyYEk4CsY2WnSCujfAs8HI0ZkSL6Vxa-njg..";
+    var token = window.iportalToken;
     //数据类型
     var dataType;
 
diff --git a/examples/openlayers/iPortalUploadData.html b/examples/openlayers/iPortalUploadData.html
@@ -99,7 +99,7 @@ <h5 data-i18n="resources.text_file_encoding"></h5>
 <script>
     //iportal的URL地址 或根据情况添加自己的本地iportal地址：http://localhost:8190/iportal
     var iPortalUrl = "https://iportal.supermap.io/iportal";
-    var token = "MFEKl8kVmkvEDrDFcgnjodlPCudIO83mBSwvdjiUlWNnySGD-FCEyYEk4CsY2WnSCujfAs8HI0ZkSL6Vxa-njg..";
+    var token = window.iportalToken;
     //上传文件的一些变量（文件对象 文件格式 数据类型 上传的文件名称）
     var file,fileFormats,dataType,uploadDataFileName;
     //excel csv解析（回调重定向对象 x坐标区域 y坐标区域）
diff --git a/examples/template/header.html b/examples/template/header.html
@@ -6,7 +6,7 @@
         <div class="navbar-header">
             <div class="navbar-title">
                 <a class="navbar-brand" target="_blank" href="../../web/index.html">
-                    <span class="project-title vm" id="title">SuperMap iClient 10i(2021)</span>
+                    <span class="project-title vm" id="title">SuperMap iClient 11i(2022)</span>
                     <span style="vertical-align:super; font-size:14px; color:#ffffff; margin-left:5px;" id="version">{{
                         nav.version
                     }}</span>

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`$('.wrapper').load("../template/editor.html", function () {`
`25`	`25`	`var navigation = {`
`26`	`26`	`nav: {`
`27`		`- title: "SuperMap iClient 10i(2021)",`
	`27`	`+ title: "SuperMap iClient 11i(2022)",`
`28`	`28`	`path: "../../web/",`
`29`	`29`	`isLocal: window.isLocal`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`$('.wrapper').load("../template/example.html", function () {`
`27`	`27`	`var navigation = {`
`28`	`28`	`nav: {`
`29`		`- title: "SuperMap iClient 10i(2021)",`
	`29`	`+ title: "SuperMap iClient 11i(2022)",`
`30`	`30`	`path: "../../web/",`
`31`	`31`	`isLocal: window.isLocal`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@`
`44`	`44`	`$('.wrapper').load('../template/editor.html', function() {`
`45`	`45`	`var navigation = {`
`46`	`46`	`nav: {`
`47`		`- title: 'SuperMap iClient 10i(2021)',`
	`47`	`+ title: 'SuperMap iClient 11i(2022)',`
`48`	`48`	`path: '../../web/',`
`49`	`49`	`isLocal: window.isLocal`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@`
`66`	`66`	`$('.wrapper').load('../template/example.html', function() {`
`67`	`67`	`var navigation = {`
`68`	`68`	`nav: {`
`69`		`- title: 'SuperMap iClient 10i(2021)',`
	`69`	`+ title: 'SuperMap iClient 11i(2022)',`
`70`	`70`	`path: '../../web/',`
`71`	`71`	`isLocal: window.isLocal`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@`
`51`	`51`	`$('.wrapper').load('../template/editor.html', function() {`
`52`	`52`	`var navigation = {`
`53`	`53`	`nav: {`
`54`		`- title: 'SuperMap iClient 10i(2021)',`
	`54`	`+ title: 'SuperMap iClient 11i(2022)',`
`55`	`55`	`path: '../../web/',`
`56`	`56`	`isLocal: window.isLocal`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`$('.wrapper').load('../template/example.html', function() {`
`28`	`28`	`var navigation = {`
`29`	`29`	`nav: {`
`30`		`- title: 'SuperMap iClient 10i(2021)',`
	`30`	`+ title: 'SuperMap iClient 11i(2022)',`
`31`	`31`	`path: '../../web/',`
`32`	`32`	`isLocal: window.isLocal`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-window.exampleToken = "PisX2NS9DsMKnnNzs6lg5WzjwZqvH2zXcizVYuBG0L0MvPrnBafdbATturwemCbsdUMHvIfItEBVCAcgubl-UNDHMsJU_XJWanQN65xaOUj_xMCsSTkKn26WFWLgvKBy"`
	`1`	`+window.exampleToken = "PisX2NS9DsMKnnNzs6lg5WzjwZqvH2zXcizVYuBG0L0MvPrnBafdbATturwemCbsdUMHvIfItEBVCAcgubl-UNDHMsJU_XJWanQN65xaOUj_xMCsSTkKn26WFWLgvKBy";`
	`2`	`+window.iportalToken ="MFEKl8kVmkvEDrDFcgnjoewTQ_fLs-UanFbjOUKhasv8VlbBi8ji89EJ7r0opUTrH4dusdbxXbQN3-Hmu2AbzQ.."`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@`
`47`	`47`	`$('.wrapper').load('../template/editor.html', function() {`
`48`	`48`	`var navigation = {`
`49`	`49`	`nav: {`
`50`		`- title: 'SuperMap iClient 10i(2021)',`
	`50`	`+ title: 'SuperMap iClient 11i(2022)',`
`51`	`51`	`path: '../../web/',`
`52`	`52`	`isLocal: window.isLocal`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@`
`87`	`87`	`$('.wrapper').load('../template/example.html', function() {`
`88`	`88`	`var navigation = {`
`89`	`89`	`nav: {`
`90`		`- title: 'SuperMap iClient 10i(2021)',`
	`90`	`+ title: 'SuperMap iClient 11i(2022)',`
`91`	`91`	`path: '../../web/',`
`92`	`92`	`isLocal: window.isLocal`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`$('.wrapper').load('../template/editor.html', function() {`
`39`	`39`	`var navigation = {`
`40`	`40`	`nav: {`
`41`		`- title: 'SuperMap iClient 10i(2021)',`
	`41`	`+ title: 'SuperMap iClient 11i(2022)',`
`42`	`42`	`path: '../../web/',`
`43`	`43`	`isLocal: window.isLocal`
`44`	`44`	`}`