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

Author: Yuki-Zhao

build/jsdocs/template/typeLinkExt.js

@@ -1,4 +1,4 @@
-var olapi = "https://openlayers.org/en/v6.1.1/apidoc/";
+var olapi = "https://openlayers.org/en/v6.4.3/apidoc/";
 var lfapi = "https://leafletjs.com/reference-1.7.1.html";
 var mbglapi = "https://www.mapbox.com/mapbox-gl-js/api/";
 var mapv = "https://github.com/huiyan-fe/mapv/blob/master/src/";

dist/classic/iclient-classic-es6.js

@@ -3,7 +3,7 @@
  *          iclient-classic.(https://iclient.supermap.io)
  *          Copyright© 2000 - 2020 SuperMap Software Co.Ltd
  *          license: Apache-2.0
- *          version: v10.1.0-beta
+ *          version: v10.1.0
  *         
  */
 /******/ (function(modules) { // webpackBootstrap
@@ -5586,7 +5586,9 @@ var GeometryType = SuperMap.GeometryType = {
     /** RECTANGLE */
     RECTANGLE: "RECTANGLE",
     /** UNKNOWN */
-    UNKNOWN: "UNKNOWN"
+    UNKNOWN: "UNKNOWN",
+    /** GEOCOMPOUND */
+    GEOCOMPOUND:"GEOCOMPOUND"
 };
 
 
@@ -6892,6 +6894,75 @@ var DataItemType = SuperMap.DataItemType = {
     JSON: "JSON"
 }
 
+
+/**
+ * @enum WebExportFormatType
+ * @memberOf SuperMap
+ * @description Web 打印输出的格式。
+ * @version 10.0.1
+ * @type {string}
+ */
+var WebExportFormatType = SuperMap.WebExportFormatType = {
+    /** png */
+    PNG: "PNG",
+    /** pdf */
+    PDF: "PDF"
+}
+
+
+/**
+ * @enum WebScaleOrientationType
+ * @memberOf SuperMap
+ * @description Web 比例尺的方位样式。
+ * @version 10.0.1
+ * @type {string}
+ */
+var WebScaleOrientationType = SuperMap.WebScaleOrientationType = {
+    /** horizontal labels below */
+    HORIZONTALLABELSBELOW: "HORIZONTALLABELSBELOW",
+    /** horizontal labels above */
+    HORIZONTALLABELSABOVE: "HORIZONTALLABELSABOVE",
+    /** vertical labels left */
+    VERTICALLABELSLEFT: "VERTICALLABELSLEFT",
+    /** vertical labels right */
+    VERTICALLABELSRIGHT: "VERTICALLABELSRIGHT"
+}
+
+
+/**
+ * @enum WebScaleType
+ * @memberOf SuperMap
+ * @description Web 比例尺的样式。
+ * @version 10.0.1
+ * @type {string}
+ */
+var WebScaleType = SuperMap.WebScaleType = {
+    /** line */
+    LINE: "LINE",
+    /** bar */
+    BAR: "BAR",
+    /** bar sub */
+    BAR_SUB: "BAR_SUB"
+}
+
+
+/**
+ * @enum WebScaleUnit
+ * @memberOf SuperMap
+ * @description Web 比例尺的单位制。
+ * @version 10.0.1
+ * @type {string}
+ */
+var WebScaleUnit = SuperMap.WebScaleUnit = {
+    /** meter */
+    METER: "METER",
+    /** foot */
+    FOOT: "FOOT",
+    /** degrees */
+    DEGREES: "DEGREES"
+}
+
+
 // CONCATENATED MODULE: ./src/common/iServer/DatasourceConnectionInfo.js
 /* Copyright© 2000 - 2020 SuperMap Software Co.Ltd. All rights reserved.
  * This program are made available under the terms of the Apache License, Version 2.0

dist/classic/iclient-classic-es6.min.js

@@ -3,7 +3,7 @@
  *          iclient-classic.(https://iclient.supermap.io)
  *          Copyright© 2000 - 2020 SuperMap Software Co.Ltd
  *          license: Apache-2.0
- *          version: v10.1.0-beta
+ *          version: v10.1.0
  *         
  */
 /******/ (function(modules) { // webpackBootstrap
@@ -6103,7 +6103,10 @@ var GeometryType = SuperMap.GeometryType = {
   RECTANGLE: "RECTANGLE",
 
   /** UNKNOWN */
-  UNKNOWN: "UNKNOWN"
+  UNKNOWN: "UNKNOWN",
+
+  /** GEOCOMPOUND */
+  GEOCOMPOUND: "GEOCOMPOUND"
 };
 
 /**
@@ -7680,6 +7683,82 @@ var DataItemType = SuperMap.DataItemType = {
   JSON: "JSON"
 };
 
+/**
+ * @enum WebExportFormatType
+ * @memberOf SuperMap
+ * @description Web 打印输出的格式。
+ * @version 10.0.1
+ * @type {string}
+ */
+
+var WebExportFormatType = SuperMap.WebExportFormatType = {
+  /** png */
+  PNG: "PNG",
+
+  /** pdf */
+  PDF: "PDF"
+};
+
+/**
+ * @enum WebScaleOrientationType
+ * @memberOf SuperMap
+ * @description Web 比例尺的方位样式。
+ * @version 10.0.1
+ * @type {string}
+ */
+
+var WebScaleOrientationType = SuperMap.WebScaleOrientationType = {
+  /** horizontal labels below */
+  HORIZONTALLABELSBELOW: "HORIZONTALLABELSBELOW",
+
+  /** horizontal labels above */
+  HORIZONTALLABELSABOVE: "HORIZONTALLABELSABOVE",
+
+  /** vertical labels left */
+  VERTICALLABELSLEFT: "VERTICALLABELSLEFT",
+
+  /** vertical labels right */
+  VERTICALLABELSRIGHT: "VERTICALLABELSRIGHT"
+};
+
+/**
+ * @enum WebScaleType
+ * @memberOf SuperMap
+ * @description Web 比例尺的样式。
+ * @version 10.0.1
+ * @type {string}
+ */
+
+var WebScaleType = SuperMap.WebScaleType = {
+  /** line */
+  LINE: "LINE",
+
+  /** bar */
+  BAR: "BAR",
+
+  /** bar sub */
+  BAR_SUB: "BAR_SUB"
+};
+
+/**
+ * @enum WebScaleUnit
+ * @memberOf SuperMap
+ * @description Web 比例尺的单位制。
+ * @version 10.0.1
+ * @type {string}
+ */
+
+var WebScaleUnit = SuperMap.WebScaleUnit = {
+  /** meter */
+  METER: "METER",
+
+  /** foot */
+  FOOT: "FOOT",
+
+  /** degrees */
+  DEGREES: "DEGREES"
+};
+
 // CONCATENATED MODULE: ./src/common/iServer/DatasourceConnectionInfo.js
 function DatasourceConnectionInfo_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }