xy-map 1.1.29 → 1.1.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xy-map",
-  "version": "1.1.29",
+  "version": "1.1.30",
   "description": "雄越地图",
   "main": "xy-map.umd.min.js",
   "scripts": {

package/xy-map.common.js

@@ -266,7 +266,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".tools[data-v-551ff8b1]{position:absol
 
 /***/ }),
 
-/***/ 8313:
+/***/ 6732:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -280,14 +280,14 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".upload[data-v-4613ea90]{position:relative}.upload input[data-v-4613ea90]{position:absolute;width:100%;height:100%;left:0;top:0;opacity:0}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".upload[data-v-57aca7b6]{position:relative}.upload input[data-v-57aca7b6]{position:absolute;width:100%;height:100%;left:0;top:0;opacity:0}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
 
 /***/ }),
 
-/***/ 524:
+/***/ 56:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -301,7 +301,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".upload[data-v-056c0144]{position:relative}.upload input[data-v-056c0144]{position:absolute;width:100%;height:100%;left:0;top:0;opacity:0}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".upload[data-v-3bd5e448]{position:relative}.upload input[data-v-3bd5e448]{position:absolute;width:100%;height:100%;left:0;top:0;opacity:0}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -24468,35 +24468,35 @@ var update = add("18261548", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 6657:
+/***/ 9993:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(8313);
+var content = __webpack_require__(6732);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(7037)/* ["default"] */ .Z)
-var update = add("43a456d1", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("31c9ba70", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
-/***/ 850:
+/***/ 6054:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(524);
+var content = __webpack_require__(56);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(7037)/* ["default"] */ .Z)
-var update = add("6be18715", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("0cdb53b5", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -60243,8 +60243,8 @@ var mapbox_gl_draw = __webpack_require__(5884);
 var mapbox_gl_draw_default = /*#__PURE__*/__webpack_require__.n(mapbox_gl_draw);
 // EXTERNAL MODULE: ./node_modules/@mapbox/mapbox-gl-draw/dist/mapbox-gl-draw.css
 var dist_mapbox_gl_draw = __webpack_require__(6957);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/jsonFile.vue?vue&type=template&id=4613ea90&scoped=true&
-var jsonFilevue_type_template_id_4613ea90_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/jsonFile.vue?vue&type=template&id=57aca7b6&scoped=true&
+var jsonFilevue_type_template_id_57aca7b6_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-button', {
@@ -60264,7 +60264,7 @@ var jsonFilevue_type_template_id_4613ea90_scoped_true_render = function render()
     }
   })]);
 };
-var jsonFilevue_type_template_id_4613ea90_scoped_true_staticRenderFns = [];
+var jsonFilevue_type_template_id_57aca7b6_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/jsonFile.vue?vue&type=script&lang=js&
 
@@ -60283,14 +60283,14 @@ var jsonFilevue_type_template_id_4613ea90_scoped_true_staticRenderFns = [];
           let json = f.target.result;
           if (json) {
             json = JSON.parse(json);
+            if (!json.features) {
+              json = arcGisToGeoJson(json);
+            }
             const bbox = es(json);
             if (bbox.length > 0 && bbox[0] > 180) {
               // 墨卡托坐标需要转换
               return this.$message.error('不属于WGS84坐标系，请使用其他工具进行数据转换');
             }
-            if (!json.features) {
-              json = arcGisToGeoJson(json);
-            }
             this.$emit('upload', json);
           }
         };
@@ -60300,9 +60300,9 @@ var jsonFilevue_type_template_id_4613ea90_scoped_true_staticRenderFns = [];
 });
 ;// CONCATENATED MODULE: ./src/package/draw/jsonFile.vue?vue&type=script&lang=js&
  /* harmony default export */ var draw_jsonFilevue_type_script_lang_js_ = (jsonFilevue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/jsonFile.vue?vue&type=style&index=0&id=4613ea90&prod&lang=scss&scoped=true&
-var jsonFilevue_type_style_index_0_id_4613ea90_prod_lang_scss_scoped_true_ = __webpack_require__(6657);
-;// CONCATENATED MODULE: ./src/package/draw/jsonFile.vue?vue&type=style&index=0&id=4613ea90&prod&lang=scss&scoped=true&
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/jsonFile.vue?vue&type=style&index=0&id=57aca7b6&prod&lang=scss&scoped=true&
+var jsonFilevue_type_style_index_0_id_57aca7b6_prod_lang_scss_scoped_true_ = __webpack_require__(9993);
+;// CONCATENATED MODULE: ./src/package/draw/jsonFile.vue?vue&type=style&index=0&id=57aca7b6&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/package/draw/jsonFile.vue
 
@@ -60315,18 +60315,18 @@ var jsonFilevue_type_style_index_0_id_4613ea90_prod_lang_scss_scoped_true_ = __w
 
 var jsonFile_component = normalizeComponent(
   draw_jsonFilevue_type_script_lang_js_,
-  jsonFilevue_type_template_id_4613ea90_scoped_true_render,
-  jsonFilevue_type_template_id_4613ea90_scoped_true_staticRenderFns,
+  jsonFilevue_type_template_id_57aca7b6_scoped_true_render,
+  jsonFilevue_type_template_id_57aca7b6_scoped_true_staticRenderFns,
   false,
   null,
-  "4613ea90",
+  "57aca7b6",
   null
   
 )
 
 /* harmony default export */ var jsonFile = (jsonFile_component.exports);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=template&id=056c0144&scoped=true&
-var shpFilevue_type_template_id_056c0144_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=template&id=3bd5e448&scoped=true&
+var shpFilevue_type_template_id_3bd5e448_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-button', {
@@ -60346,7 +60346,7 @@ var shpFilevue_type_template_id_056c0144_scoped_true_render = function render()
     }
   })]);
 };
-var shpFilevue_type_template_id_056c0144_scoped_true_staticRenderFns = [];
+var shpFilevue_type_template_id_3bd5e448_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=script&lang=js&
 
@@ -60368,14 +60368,15 @@ const shapeFile = __webpack_require__(1393); // 导入shpfile.js
           if (result) {
             shapeFile.read(result).then(json => {
               const bbox = es(json);
+              if (!json.features) {
+                json = arcGisToGeoJson(json);
+              }
               if (bbox.length > 0 && bbox[0] > 180) {
                 // 墨卡托坐标需要转换
                 // json = mercatorTolonlat(json)
+                console.log(json);
                 return this.$message.error('不属于WGS84坐标系，请使用其他工具进行数据转换');
               }
-              if (!json.features) {
-                json = arcGisToGeoJson(json);
-              }
               this.$emit('upload', json);
             });
           }
@@ -60386,9 +60387,9 @@ const shapeFile = __webpack_require__(1393); // 导入shpfile.js
 });
 ;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue?vue&type=script&lang=js&
  /* harmony default export */ var draw_shpFilevue_type_script_lang_js_ = (shpFilevue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=style&index=0&id=056c0144&prod&lang=scss&scoped=true&
-var shpFilevue_type_style_index_0_id_056c0144_prod_lang_scss_scoped_true_ = __webpack_require__(850);
-;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue?vue&type=style&index=0&id=056c0144&prod&lang=scss&scoped=true&
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=style&index=0&id=3bd5e448&prod&lang=scss&scoped=true&
+var shpFilevue_type_style_index_0_id_3bd5e448_prod_lang_scss_scoped_true_ = __webpack_require__(6054);
+;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue?vue&type=style&index=0&id=3bd5e448&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue
 
@@ -60401,11 +60402,11 @@ var shpFilevue_type_style_index_0_id_056c0144_prod_lang_scss_scoped_true_ = __we
 
 var shpFile_component = normalizeComponent(
   draw_shpFilevue_type_script_lang_js_,
-  shpFilevue_type_template_id_056c0144_scoped_true_render,
-  shpFilevue_type_template_id_056c0144_scoped_true_staticRenderFns,
+  shpFilevue_type_template_id_3bd5e448_scoped_true_render,
+  shpFilevue_type_template_id_3bd5e448_scoped_true_staticRenderFns,
   false,
   null,
-  "056c0144",
+  "3bd5e448",
   null
   
 )
@@ -60899,8 +60900,8 @@ var point_component = normalizeComponent(
 )
 
 /* harmony default export */ var draw_point = (point_component.exports);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/line.vue?vue&type=template&id=10d683d1&
-var linevue_type_template_id_10d683d1_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/line.vue?vue&type=template&id=efb89606&
+var linevue_type_template_id_efb89606_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -60955,7 +60956,7 @@ var linevue_type_template_id_10d683d1_render = function render() {
     }
   }, [_vm._v("保存")]), _vm._t("default")], 2)])], 1);
 };
-var linevue_type_template_id_10d683d1_staticRenderFns = [];
+var linevue_type_template_id_efb89606_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/line.vue?vue&type=script&lang=js&
 
@@ -61055,8 +61056,9 @@ var linevue_type_template_id_10d683d1_staticRenderFns = [];
     drawUpdate(data, autoZoom = false) {
       if (!data) return;
       this.geoJson = data;
-      console.log(data);
-      this.position = data.features.map(item => item.geometry.coordinates);
+      this.position = data.features.map(item => item.geometry.coordinates.flat(Infinity));
+      this.position = spArray(2, ...this.position); // 数组分割，两两一组
+
       if (this.autoZoom || autoZoom) {
         // 开启缩放动画
         this.$nextTick(() => {
@@ -61100,8 +61102,8 @@ var linevue_type_template_id_10d683d1_staticRenderFns = [];
 ;
 var line_component = normalizeComponent(
   draw_linevue_type_script_lang_js_,
-  linevue_type_template_id_10d683d1_render,
-  linevue_type_template_id_10d683d1_staticRenderFns,
+  linevue_type_template_id_efb89606_render,
+  linevue_type_template_id_efb89606_staticRenderFns,
   false,
   null,
   null,
@@ -61110,8 +61112,8 @@ var line_component = normalizeComponent(
 )
 
 /* harmony default export */ var line = (line_component.exports);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/polygon.vue?vue&type=template&id=6410b496&
-var polygonvue_type_template_id_6410b496_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/polygon.vue?vue&type=template&id=2d709a6c&
+var polygonvue_type_template_id_2d709a6c_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -61166,7 +61168,7 @@ var polygonvue_type_template_id_6410b496_render = function render() {
     }
   }, [_vm._v("保存")]), _vm._t("default")], 2)])], 1);
 };
-var polygonvue_type_template_id_6410b496_staticRenderFns = [];
+var polygonvue_type_template_id_2d709a6c_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/polygon.vue?vue&type=script&lang=js&
 
@@ -61266,7 +61268,8 @@ var polygonvue_type_template_id_6410b496_staticRenderFns = [];
     drawUpdate(data, autoZoom = false) {
       if (!data) return;
       this.geoJson = data;
-      this.position = data.features.map(item => item.geometry.coordinates[0]);
+      this.position = data.features.map(item => item.geometry.coordinates.flat(Infinity));
+      this.position = spArray(2, ...this.position);
       if (this.autoZoom || autoZoom) {
         this.$nextTick(() => {
           let bounds = es(data);
@@ -61309,8 +61312,8 @@ var polygonvue_type_template_id_6410b496_staticRenderFns = [];
 ;
 var polygon_component = normalizeComponent(
   draw_polygonvue_type_script_lang_js_,
-  polygonvue_type_template_id_6410b496_render,
-  polygonvue_type_template_id_6410b496_staticRenderFns,
+  polygonvue_type_template_id_2d709a6c_render,
+  polygonvue_type_template_id_2d709a6c_staticRenderFns,
   false,
   null,
   null,

package/xy-map.umd.js

@@ -276,7 +276,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".tools[data-v-551ff8b1]{position:absol
 
 /***/ }),
 
-/***/ 7087:
+/***/ 9653:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -290,14 +290,14 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".upload[data-v-4613ea90]{position:relative}.upload input[data-v-4613ea90]{position:absolute;width:100%;height:100%;left:0;top:0;opacity:0}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".upload[data-v-57aca7b6]{position:relative}.upload input[data-v-57aca7b6]{position:absolute;width:100%;height:100%;left:0;top:0;opacity:0}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
 
 /***/ }),
 
-/***/ 2130:
+/***/ 3517:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -311,7 +311,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".upload[data-v-056c0144]{position:relative}.upload input[data-v-056c0144]{position:absolute;width:100%;height:100%;left:0;top:0;opacity:0}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".upload[data-v-3bd5e448]{position:relative}.upload input[data-v-3bd5e448]{position:absolute;width:100%;height:100%;left:0;top:0;opacity:0}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -24478,35 +24478,35 @@ var update = add("65613f70", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 6518:
+/***/ 8947:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(7087);
+var content = __webpack_require__(9653);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(208)/* ["default"] */ .Z)
-var update = add("296961d1", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("663fa470", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
-/***/ 3130:
+/***/ 6760:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(2130);
+var content = __webpack_require__(3517);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(208)/* ["default"] */ .Z)
-var update = add("f5255bd6", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("26671eb5", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -60261,8 +60261,8 @@ var mapbox_gl_draw = __webpack_require__(1512);
 var mapbox_gl_draw_default = /*#__PURE__*/__webpack_require__.n(mapbox_gl_draw);
 // EXTERNAL MODULE: ./node_modules/@mapbox/mapbox-gl-draw/dist/mapbox-gl-draw.css
 var dist_mapbox_gl_draw = __webpack_require__(5620);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/jsonFile.vue?vue&type=template&id=4613ea90&scoped=true&
-var jsonFilevue_type_template_id_4613ea90_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/jsonFile.vue?vue&type=template&id=57aca7b6&scoped=true&
+var jsonFilevue_type_template_id_57aca7b6_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-button', {
@@ -60282,7 +60282,7 @@ var jsonFilevue_type_template_id_4613ea90_scoped_true_render = function render()
     }
   })]);
 };
-var jsonFilevue_type_template_id_4613ea90_scoped_true_staticRenderFns = [];
+var jsonFilevue_type_template_id_57aca7b6_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/jsonFile.vue?vue&type=script&lang=js&
 
@@ -60301,14 +60301,14 @@ var jsonFilevue_type_template_id_4613ea90_scoped_true_staticRenderFns = [];
           let json = f.target.result;
           if (json) {
             json = JSON.parse(json);
+            if (!json.features) {
+              json = arcGisToGeoJson(json);
+            }
             const bbox = es(json);
             if (bbox.length > 0 && bbox[0] > 180) {
               // 墨卡托坐标需要转换
               return this.$message.error('不属于WGS84坐标系，请使用其他工具进行数据转换');
             }
-            if (!json.features) {
-              json = arcGisToGeoJson(json);
-            }
             this.$emit('upload', json);
           }
         };
@@ -60318,9 +60318,9 @@ var jsonFilevue_type_template_id_4613ea90_scoped_true_staticRenderFns = [];
 });
 ;// CONCATENATED MODULE: ./src/package/draw/jsonFile.vue?vue&type=script&lang=js&
  /* harmony default export */ var draw_jsonFilevue_type_script_lang_js_ = (jsonFilevue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/jsonFile.vue?vue&type=style&index=0&id=4613ea90&prod&lang=scss&scoped=true&
-var jsonFilevue_type_style_index_0_id_4613ea90_prod_lang_scss_scoped_true_ = __webpack_require__(6518);
-;// CONCATENATED MODULE: ./src/package/draw/jsonFile.vue?vue&type=style&index=0&id=4613ea90&prod&lang=scss&scoped=true&
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/jsonFile.vue?vue&type=style&index=0&id=57aca7b6&prod&lang=scss&scoped=true&
+var jsonFilevue_type_style_index_0_id_57aca7b6_prod_lang_scss_scoped_true_ = __webpack_require__(8947);
+;// CONCATENATED MODULE: ./src/package/draw/jsonFile.vue?vue&type=style&index=0&id=57aca7b6&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/package/draw/jsonFile.vue
 
@@ -60333,18 +60333,18 @@ var jsonFilevue_type_style_index_0_id_4613ea90_prod_lang_scss_scoped_true_ = __w
 
 var jsonFile_component = normalizeComponent(
   draw_jsonFilevue_type_script_lang_js_,
-  jsonFilevue_type_template_id_4613ea90_scoped_true_render,
-  jsonFilevue_type_template_id_4613ea90_scoped_true_staticRenderFns,
+  jsonFilevue_type_template_id_57aca7b6_scoped_true_render,
+  jsonFilevue_type_template_id_57aca7b6_scoped_true_staticRenderFns,
   false,
   null,
-  "4613ea90",
+  "57aca7b6",
   null
   
 )
 
 /* harmony default export */ var jsonFile = (jsonFile_component.exports);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=template&id=056c0144&scoped=true&
-var shpFilevue_type_template_id_056c0144_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=template&id=3bd5e448&scoped=true&
+var shpFilevue_type_template_id_3bd5e448_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-button', {
@@ -60364,7 +60364,7 @@ var shpFilevue_type_template_id_056c0144_scoped_true_render = function render()
     }
   })]);
 };
-var shpFilevue_type_template_id_056c0144_scoped_true_staticRenderFns = [];
+var shpFilevue_type_template_id_3bd5e448_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=script&lang=js&
 
@@ -60386,14 +60386,15 @@ const shapeFile = __webpack_require__(4952); // 导入shpfile.js
           if (result) {
             shapeFile.read(result).then(json => {
               const bbox = es(json);
+              if (!json.features) {
+                json = arcGisToGeoJson(json);
+              }
               if (bbox.length > 0 && bbox[0] > 180) {
                 // 墨卡托坐标需要转换
                 // json = mercatorTolonlat(json)
+                console.log(json);
                 return this.$message.error('不属于WGS84坐标系，请使用其他工具进行数据转换');
               }
-              if (!json.features) {
-                json = arcGisToGeoJson(json);
-              }
               this.$emit('upload', json);
             });
           }
@@ -60404,9 +60405,9 @@ const shapeFile = __webpack_require__(4952); // 导入shpfile.js
 });
 ;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue?vue&type=script&lang=js&
  /* harmony default export */ var draw_shpFilevue_type_script_lang_js_ = (shpFilevue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=style&index=0&id=056c0144&prod&lang=scss&scoped=true&
-var shpFilevue_type_style_index_0_id_056c0144_prod_lang_scss_scoped_true_ = __webpack_require__(3130);
-;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue?vue&type=style&index=0&id=056c0144&prod&lang=scss&scoped=true&
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=style&index=0&id=3bd5e448&prod&lang=scss&scoped=true&
+var shpFilevue_type_style_index_0_id_3bd5e448_prod_lang_scss_scoped_true_ = __webpack_require__(6760);
+;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue?vue&type=style&index=0&id=3bd5e448&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue
 
@@ -60419,11 +60420,11 @@ var shpFilevue_type_style_index_0_id_056c0144_prod_lang_scss_scoped_true_ = __we
 
 var shpFile_component = normalizeComponent(
   draw_shpFilevue_type_script_lang_js_,
-  shpFilevue_type_template_id_056c0144_scoped_true_render,
-  shpFilevue_type_template_id_056c0144_scoped_true_staticRenderFns,
+  shpFilevue_type_template_id_3bd5e448_scoped_true_render,
+  shpFilevue_type_template_id_3bd5e448_scoped_true_staticRenderFns,
   false,
   null,
-  "056c0144",
+  "3bd5e448",
   null
   
 )
@@ -60917,8 +60918,8 @@ var point_component = normalizeComponent(
 )
 
 /* harmony default export */ var draw_point = (point_component.exports);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/line.vue?vue&type=template&id=10d683d1&
-var linevue_type_template_id_10d683d1_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/line.vue?vue&type=template&id=efb89606&
+var linevue_type_template_id_efb89606_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -60973,7 +60974,7 @@ var linevue_type_template_id_10d683d1_render = function render() {
     }
   }, [_vm._v("保存")]), _vm._t("default")], 2)])], 1);
 };
-var linevue_type_template_id_10d683d1_staticRenderFns = [];
+var linevue_type_template_id_efb89606_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/line.vue?vue&type=script&lang=js&
 
@@ -61073,8 +61074,9 @@ var linevue_type_template_id_10d683d1_staticRenderFns = [];
     drawUpdate(data, autoZoom = false) {
       if (!data) return;
       this.geoJson = data;
-      console.log(data);
-      this.position = data.features.map(item => item.geometry.coordinates);
+      this.position = data.features.map(item => item.geometry.coordinates.flat(Infinity));
+      this.position = spArray(2, ...this.position); // 数组分割，两两一组
+
       if (this.autoZoom || autoZoom) {
         // 开启缩放动画
         this.$nextTick(() => {
@@ -61118,8 +61120,8 @@ var linevue_type_template_id_10d683d1_staticRenderFns = [];
 ;
 var line_component = normalizeComponent(
   draw_linevue_type_script_lang_js_,
-  linevue_type_template_id_10d683d1_render,
-  linevue_type_template_id_10d683d1_staticRenderFns,
+  linevue_type_template_id_efb89606_render,
+  linevue_type_template_id_efb89606_staticRenderFns,
   false,
   null,
   null,
@@ -61128,8 +61130,8 @@ var line_component = normalizeComponent(
 )
 
 /* harmony default export */ var line = (line_component.exports);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/polygon.vue?vue&type=template&id=6410b496&
-var polygonvue_type_template_id_6410b496_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/polygon.vue?vue&type=template&id=2d709a6c&
+var polygonvue_type_template_id_2d709a6c_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -61184,7 +61186,7 @@ var polygonvue_type_template_id_6410b496_render = function render() {
     }
   }, [_vm._v("保存")]), _vm._t("default")], 2)])], 1);
 };
-var polygonvue_type_template_id_6410b496_staticRenderFns = [];
+var polygonvue_type_template_id_2d709a6c_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/polygon.vue?vue&type=script&lang=js&
 
@@ -61284,7 +61286,8 @@ var polygonvue_type_template_id_6410b496_staticRenderFns = [];
     drawUpdate(data, autoZoom = false) {
       if (!data) return;
       this.geoJson = data;
-      this.position = data.features.map(item => item.geometry.coordinates[0]);
+      this.position = data.features.map(item => item.geometry.coordinates.flat(Infinity));
+      this.position = spArray(2, ...this.position);
       if (this.autoZoom || autoZoom) {
         this.$nextTick(() => {
           let bounds = es(data);
@@ -61327,8 +61330,8 @@ var polygonvue_type_template_id_6410b496_staticRenderFns = [];
 ;
 var polygon_component = normalizeComponent(
   draw_polygonvue_type_script_lang_js_,
-  polygonvue_type_template_id_6410b496_render,
-  polygonvue_type_template_id_6410b496_staticRenderFns,
+  polygonvue_type_template_id_2d709a6c_render,
+  polygonvue_type_template_id_2d709a6c_staticRenderFns,
   false,
   null,
   null,