gis-common 1.1.17 → 1.1.18

package/dist/resource.min.js

@@ -459,24 +459,29 @@ var MeasureMode = {
      * 异步加载script
      *
      * @param {*} url
-     * @param {function} callback
      */
-    loadScript: function loadScript(url, callback) {
-        var oscript = document.createElement('script');
-        if (oscript.readyState) {
-            // ie8及以下版本
-            oscript.onreadystatechange = function () {
-                if (oscript.readyState === 'complete' || oscript.readyState === 'loaded') {
-                    callback();
+    loadScript: function loadScript(url) {
+        return new Promise(function (resolve, reject) {
+            try {
+                var oscript = document.createElement('script');
+                if (oscript.readyState) {
+                    // ie8及以下版本
+                    oscript.onreadystatechange = function () {
+                        if (oscript.readyState === 'complete' || oscript.readyState === 'loaded') {
+                            resolve(oscript);
+                        }
+                    };
+                } else {
+                    oscript.onload = function () {
+                        resolve(oscript);
+                    };
                 }
-            };
-        } else {
-            oscript.onload = function () {
-                callback();
-            };
-        }
-        oscript.src = url;
-        document.body.appendChild(oscript);
+                oscript.src = url;
+                document.body.appendChild(oscript);
+            } catch (error) {
+                reject(error);
+            }
+        });
     },
 
     /**
@@ -1775,14 +1780,14 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
      * @param {*} n
      * @returns {*}
      */
-    subStringByte: function subStringByte(str, n) {
+    subStringByte: function subStringByte(str, start, n) {
         var r = /[^\x00-\xff]/g;
         if (str.replace(r, 'mm').length <= n) {
             return str;
         }
         var m = Math.floor(n / 2);
         for (var i = m; i < str.length; i++) {
-            var sub = str.substring(0, i);
+            var sub = str.substring(start, i);
             if (sub.replace(r, 'mm').length >= n) {
                 return sub;
             }

package/package.json

@@ -2,7 +2,7 @@
     "name": "gis-common",
     "description": "gis-common",
     "main": "dist/resource.min.js",
-    "version": "1.1.17",
+    "version": "1.1.18",
     "author": "Guo.Yan <luv02@vip.qq.com>",
     "license": "MIT",
     "private": false,