xy-map 1.1.73 → 1.1.75

package/package.json

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

package/xy-map.common.js

@@ -224,7 +224,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".snow[data-v-20664206]{position:absolu
 
 /***/ }),
 
-/***/ 619:
+/***/ 2554:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -238,7 +238,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, ".tools[data-v-4c4ff58c]{position:absolute;left:0;top:0;margin:15px;background-color:hsla(0,0%,100%,.9);padding:14px;border-radius:5px}.tools .tools-bar[data-v-4c4ff58c]{cursor:pointer}.right-fixed[data-v-4c4ff58c]{position:absolute;right:0;top:0;margin:15px}.split-tooltip[data-v-4c4ff58c]{position:fixed;background-color:rgba(0,0,0,.8);color:#fff;padding:5px 10px;border-radius:4px;font-size:12px;pointer-events:none;z-index:1000}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".tools[data-v-782e8856]{position:absolute;left:0;top:0;margin:15px;background-color:hsla(0,0%,100%,.9);padding:14px;border-radius:5px}.tools .tools-bar[data-v-782e8856]{cursor:pointer}.right-fixed[data-v-782e8856]{position:absolute;right:0;top:0;margin:15px}.split-tooltip[data-v-782e8856]{position:fixed;background-color:rgba(0,0,0,.8);color:#fff;padding:5px 10px;border-radius:4px;font-size:12px;pointer-events:none;z-index:1000}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -43505,19 +43505,19 @@ var update = add("4a7b31d4", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 2812:
+/***/ 9936:
 /***/ (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__(619);
+var content = __webpack_require__(2554);
 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("1615f2cd", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("1af20d73", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -121188,8 +121188,8 @@ var mapStyle_component = normalizeComponent(
 )
 
 /* harmony default export */ var mapStyle = (mapStyle_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/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/index.vue?vue&type=template&id=4c4ff58c&scoped=true&
-var drawvue_type_template_id_4c4ff58c_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/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/index.vue?vue&type=template&id=782e8856&scoped=true&
+var drawvue_type_template_id_782e8856_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('div', {
@@ -121355,7 +121355,7 @@ var drawvue_type_template_id_4c4ff58c_scoped_true_render = function render() {
     style: _vm.tooltip.style
   }, [_vm._v(_vm._s(_vm.tooltip.text))]) : _vm._e()]);
 };
-var drawvue_type_template_id_4c4ff58c_scoped_true_staticRenderFns = [];
+var drawvue_type_template_id_782e8856_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/@mapbox/mapbox-gl-draw/dist/mapbox-gl-draw.css
 var dist_mapbox_gl_draw = __webpack_require__(6957);
@@ -122211,26 +122211,50 @@ var shpFile_component = normalizeComponent(
           lines = polygonFeature.geometry.coordinates.map(coords => es_polygon(coords));
         }
         const splitter = lineString(splitLine.geometry.coordinates);
-        let splitResults = [];
+        let splitResults = []; //拆分后的线段
+        let noSplitResults = []; //未拆分线段
+        let isSucess = false; // 是否有效分割
+        console.log('拆分线', lines);
         // 对每条线进行分割
         lines.forEach(line => {
           const split = line_split_dist_es(line, splitter);
-          if (split.features.length == 0) splitResults.push(line); //当线段无法拆分时，返回本身对象
-          else splitResults = splitResults.concat(split.features);
+          if (split.features.length == 0) {
+            //当线段无法拆分时，返回本身对象
+            noSplitResults.push(line);
+          } else {
+            splitResults = splitResults.concat(split.features);
+            isSucess = true;
+          }
         });
+        console.log('拆分线结果', splitResults, noSplitResults);
 
-        // 转换为 Mapbox Draw 格式
-        const newLines = splitResults.map((feature, index) => ({
+        // 拆分后的线段转换为 Mapbox Draw 格式
+        let newLines = splitResults.map((feature, index) => ({
           type: 'Feature',
           id: `${oldFeature.id}_${index}`,
           geometry: feature.geometry,
           properties: Object.assign({}, oldFeature.properties)
         }));
 
+        //未被成功拆分的线段 多线、多面应该自动合并回多线面模式
+        if (noSplitResults.length > 0) {
+          newLines.push({
+            type: 'Feature',
+            id: `${oldFeature.id}_${newLines.length}`,
+            geometry: {
+              coordinates: noSplitResults.length === 1 ? noSplitResults[0].geometry.coordinates : noSplitResults.map(item => item.geometry.coordinates),
+              type: oldFeature.geometry.type
+            },
+            properties: Object.assign({}, oldFeature.properties)
+          });
+        }
+        console.log('拆分线结果', newLines);
+
         // 删除拆分线
         this.draw.delete(splitLine.id);
-        if (newLines.length == 1) {
-          this.$message.error('拆分失败，拆分线之间无交集！');
+        if (!isSucess) {
+          this.$emit('unconbine-fail');
+          this.$message.warning('拆分失败，拆分线之间无交集！');
           return;
         }
 
@@ -122336,9 +122360,9 @@ var shpFile_component = normalizeComponent(
 });
 ;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var package_drawvue_type_script_lang_js_ = (drawvue_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/cli-service/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/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/index.vue?vue&type=style&index=0&id=4c4ff58c&prod&lang=scss&scoped=true&
-var drawvue_type_style_index_0_id_4c4ff58c_prod_lang_scss_scoped_true_ = __webpack_require__(2812);
-;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=style&index=0&id=4c4ff58c&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/cli-service/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/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/index.vue?vue&type=style&index=0&id=782e8856&prod&lang=scss&scoped=true&
+var drawvue_type_style_index_0_id_782e8856_prod_lang_scss_scoped_true_ = __webpack_require__(9936);
+;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=style&index=0&id=782e8856&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/package/draw/index.vue
 
@@ -122351,11 +122375,11 @@ var drawvue_type_style_index_0_id_4c4ff58c_prod_lang_scss_scoped_true_ = __webpa
 
 var draw_component = normalizeComponent(
   package_drawvue_type_script_lang_js_,
-  drawvue_type_template_id_4c4ff58c_scoped_true_render,
-  drawvue_type_template_id_4c4ff58c_scoped_true_staticRenderFns,
+  drawvue_type_template_id_782e8856_scoped_true_render,
+  drawvue_type_template_id_782e8856_scoped_true_staticRenderFns,
   false,
   null,
-  "4c4ff58c",
+  "782e8856",
   null
   
 )

package/xy-map.umd.js

@@ -234,7 +234,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".snow[data-v-20664206]{position:absolu
 
 /***/ }),
 
-/***/ 7994:
+/***/ 3867:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -248,7 +248,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, ".tools[data-v-4c4ff58c]{position:absolute;left:0;top:0;margin:15px;background-color:hsla(0,0%,100%,.9);padding:14px;border-radius:5px}.tools .tools-bar[data-v-4c4ff58c]{cursor:pointer}.right-fixed[data-v-4c4ff58c]{position:absolute;right:0;top:0;margin:15px}.split-tooltip[data-v-4c4ff58c]{position:fixed;background-color:rgba(0,0,0,.8);color:#fff;padding:5px 10px;border-radius:4px;font-size:12px;pointer-events:none;z-index:1000}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".tools[data-v-782e8856]{position:absolute;left:0;top:0;margin:15px;background-color:hsla(0,0%,100%,.9);padding:14px;border-radius:5px}.tools .tools-bar[data-v-782e8856]{cursor:pointer}.right-fixed[data-v-782e8856]{position:absolute;right:0;top:0;margin:15px}.split-tooltip[data-v-782e8856]{position:fixed;background-color:rgba(0,0,0,.8);color:#fff;padding:5px 10px;border-radius:4px;font-size:12px;pointer-events:none;z-index:1000}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -43515,19 +43515,19 @@ var update = add("33a2ac54", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 3685:
+/***/ 4723:
 /***/ (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__(7994);
+var content = __webpack_require__(3867);
 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("38dc8d4d", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("3db8a7f3", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -121206,8 +121206,8 @@ var mapStyle_component = normalizeComponent(
 )
 
 /* harmony default export */ var mapStyle = (mapStyle_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/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/index.vue?vue&type=template&id=4c4ff58c&scoped=true&
-var drawvue_type_template_id_4c4ff58c_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/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/index.vue?vue&type=template&id=782e8856&scoped=true&
+var drawvue_type_template_id_782e8856_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('div', {
@@ -121373,7 +121373,7 @@ var drawvue_type_template_id_4c4ff58c_scoped_true_render = function render() {
     style: _vm.tooltip.style
   }, [_vm._v(_vm._s(_vm.tooltip.text))]) : _vm._e()]);
 };
-var drawvue_type_template_id_4c4ff58c_scoped_true_staticRenderFns = [];
+var drawvue_type_template_id_782e8856_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/@mapbox/mapbox-gl-draw/dist/mapbox-gl-draw.css
 var dist_mapbox_gl_draw = __webpack_require__(5620);
@@ -122229,26 +122229,50 @@ var shpFile_component = normalizeComponent(
           lines = polygonFeature.geometry.coordinates.map(coords => es_polygon(coords));
         }
         const splitter = lineString(splitLine.geometry.coordinates);
-        let splitResults = [];
+        let splitResults = []; //拆分后的线段
+        let noSplitResults = []; //未拆分线段
+        let isSucess = false; // 是否有效分割
+        console.log('拆分线', lines);
         // 对每条线进行分割
         lines.forEach(line => {
           const split = line_split_dist_es(line, splitter);
-          if (split.features.length == 0) splitResults.push(line); //当线段无法拆分时，返回本身对象
-          else splitResults = splitResults.concat(split.features);
+          if (split.features.length == 0) {
+            //当线段无法拆分时，返回本身对象
+            noSplitResults.push(line);
+          } else {
+            splitResults = splitResults.concat(split.features);
+            isSucess = true;
+          }
         });
+        console.log('拆分线结果', splitResults, noSplitResults);
 
-        // 转换为 Mapbox Draw 格式
-        const newLines = splitResults.map((feature, index) => ({
+        // 拆分后的线段转换为 Mapbox Draw 格式
+        let newLines = splitResults.map((feature, index) => ({
           type: 'Feature',
           id: `${oldFeature.id}_${index}`,
           geometry: feature.geometry,
           properties: Object.assign({}, oldFeature.properties)
         }));
 
+        //未被成功拆分的线段 多线、多面应该自动合并回多线面模式
+        if (noSplitResults.length > 0) {
+          newLines.push({
+            type: 'Feature',
+            id: `${oldFeature.id}_${newLines.length}`,
+            geometry: {
+              coordinates: noSplitResults.length === 1 ? noSplitResults[0].geometry.coordinates : noSplitResults.map(item => item.geometry.coordinates),
+              type: oldFeature.geometry.type
+            },
+            properties: Object.assign({}, oldFeature.properties)
+          });
+        }
+        console.log('拆分线结果', newLines);
+
         // 删除拆分线
         this.draw.delete(splitLine.id);
-        if (newLines.length == 1) {
-          this.$message.error('拆分失败，拆分线之间无交集！');
+        if (!isSucess) {
+          this.$emit('unconbine-fail');
+          this.$message.warning('拆分失败，拆分线之间无交集！');
           return;
         }
 
@@ -122354,9 +122378,9 @@ var shpFile_component = normalizeComponent(
 });
 ;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var package_drawvue_type_script_lang_js_ = (drawvue_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/cli-service/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/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/index.vue?vue&type=style&index=0&id=4c4ff58c&prod&lang=scss&scoped=true&
-var drawvue_type_style_index_0_id_4c4ff58c_prod_lang_scss_scoped_true_ = __webpack_require__(3685);
-;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=style&index=0&id=4c4ff58c&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/cli-service/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/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/index.vue?vue&type=style&index=0&id=782e8856&prod&lang=scss&scoped=true&
+var drawvue_type_style_index_0_id_782e8856_prod_lang_scss_scoped_true_ = __webpack_require__(4723);
+;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=style&index=0&id=782e8856&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/package/draw/index.vue
 
@@ -122369,11 +122393,11 @@ var drawvue_type_style_index_0_id_4c4ff58c_prod_lang_scss_scoped_true_ = __webpa
 
 var draw_component = normalizeComponent(
   package_drawvue_type_script_lang_js_,
-  drawvue_type_template_id_4c4ff58c_scoped_true_render,
-  drawvue_type_template_id_4c4ff58c_scoped_true_staticRenderFns,
+  drawvue_type_template_id_782e8856_scoped_true_render,
+  drawvue_type_template_id_782e8856_scoped_true_staticRenderFns,
   false,
   null,
-  "4c4ff58c",
+  "782e8856",
   null
   
 )