npm - xy-map - Versions diffs - 1.1.67 → 1.1.68 - Mend

xy-map 1.1.67 → 1.1.68

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/package.json CHANGED Viewed

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

package/xy-map.common.js CHANGED Viewed

@@ -266,7 +266,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".upload[data-v-5a5f8c5d]{position:rela
 /***/ }),
-/***/ 2570:
+/***/ 4619:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 "use strict";
@@ -280,7 +280,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-48c3ad34]{position:relative}.upload input[data-v-48c3ad34]{position:absolute;width:100%;height:100%;left:0;top:0;opacity:0}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".upload[data-v-ccd339a4]{position:relative}.upload input[data-v-ccd339a4]{position:absolute;width:100%;height:100%;left:0;top:0;opacity:0}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
@@ -42923,19 +42923,19 @@ var update = add("44d9d48a", content, true, {"sourceMap":false,"shadowMode":fals
 /***/ }),
-/***/ 6416:
+/***/ 7248:
 /***/ (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__(2570);
+var content = __webpack_require__(4619);
 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("1d9140da", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("117f2b6c", content, true, {"sourceMap":false,"shadowMode":false});
 /***/ }),
@@ -120940,8 +120940,8 @@ var jsonFile_component = normalizeComponent(
 )
 /* 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/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/shpFile.vue?vue&type=template&id=48c3ad34&scoped=true&
-var shpFilevue_type_template_id_48c3ad34_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/shpFile.vue?vue&type=template&id=ccd339a4&scoped=true&
+var shpFilevue_type_template_id_ccd339a4_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-button', {
@@ -120962,7 +120962,7 @@ var shpFilevue_type_template_id_48c3ad34_scoped_true_render = function render()
     }
   })]);
 };
-var shpFilevue_type_template_id_48c3ad34_scoped_true_staticRenderFns = [];
+var shpFilevue_type_template_id_ccd339a4_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/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=script&lang=js&
@@ -121060,9 +121060,11 @@ const shapeFile = __webpack_require__(1393);
      * @param {File} dbfFile - DBF 文件对象
      */
     readWithDbf(shpFile, dbfFile) {
-      Promise.all([this.readFileAsArrayBuffer(shpFile), this.readFileAsArrayBuffer(dbfFile)]).then(([shpBuffer, dbfBuffer]) => {
+      Promise.all([this.readFileAsArrayBuffer(shpFile), this.readFileAsArrayBuffer(dbfFile)]).then(async ([shpBuffer, dbfBuffer]) => {
+        let encoding = this.detectEncoding(dbfBuffer);
+        console.log('encoding', encoding, this.encoding);
         shapeFile.open(shpBuffer, dbfBuffer, {
-          encoding: this.encoding
+          encoding: encoding || this.encoding
         }).then(source => {
           const features = [];
           const read = () => {
@@ -121099,14 +121101,33 @@ const shapeFile = __webpack_require__(1393);
           this.$message.error('读取文件失败，请检查文件格式是否正确');
         });
       });
+    },
+    /**
+    * 读取文件编码格式
+    */
+    detectEncoding(dbfBuffer) {
+      //方法一： 读取 LDID（第 29 字节）
+      const ldid = new Uint8Array(dbfBuffer)[29];
+      const ldidMap = {
+        0x57: 'gb2312',
+        // 简体中文
+        0xc8: 'latin1',
+        // Windows-1252
+        0x4d: 'utf-8',
+        // UTF-8
+        0x03: 'cp437' // OEM
+      };
+      let encoding = ldidMap[ldid];
+      return encoding;
     }
   }
 });
 ;// 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/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/shpFile.vue?vue&type=style&index=0&id=48c3ad34&prod&lang=scss&scoped=true&
-var shpFilevue_type_style_index_0_id_48c3ad34_prod_lang_scss_scoped_true_ = __webpack_require__(6416);
-;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue?vue&type=style&index=0&id=48c3ad34&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/shpFile.vue?vue&type=style&index=0&id=ccd339a4&prod&lang=scss&scoped=true&
+var shpFilevue_type_style_index_0_id_ccd339a4_prod_lang_scss_scoped_true_ = __webpack_require__(7248);
+;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue?vue&type=style&index=0&id=ccd339a4&prod&lang=scss&scoped=true&
 ;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue
@@ -121119,11 +121140,11 @@ var shpFilevue_type_style_index_0_id_48c3ad34_prod_lang_scss_scoped_true_ = __we
 var shpFile_component = normalizeComponent(
   draw_shpFilevue_type_script_lang_js_,
-  shpFilevue_type_template_id_48c3ad34_scoped_true_render,
-  shpFilevue_type_template_id_48c3ad34_scoped_true_staticRenderFns,
+  shpFilevue_type_template_id_ccd339a4_scoped_true_render,
+  shpFilevue_type_template_id_ccd339a4_scoped_true_staticRenderFns,
   false,
   null,
-  "48c3ad34",
+  "ccd339a4",
   null
 )

package/xy-map.umd.js CHANGED Viewed

@@ -276,7 +276,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".upload[data-v-5a5f8c5d]{position:rela
 /***/ }),
-/***/ 5730:
+/***/ 8158:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 "use strict";
@@ -290,7 +290,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-48c3ad34]{position:relative}.upload input[data-v-48c3ad34]{position:absolute;width:100%;height:100%;left:0;top:0;opacity:0}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".upload[data-v-ccd339a4]{position:relative}.upload input[data-v-ccd339a4]{position:absolute;width:100%;height:100%;left:0;top:0;opacity:0}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
@@ -42933,19 +42933,19 @@ var update = add("469bd03b", content, true, {"sourceMap":false,"shadowMode":fals
 /***/ }),
-/***/ 729:
+/***/ 8965:
 /***/ (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__(5730);
+var content = __webpack_require__(8158);
 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("22f2c94c", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("6f94766c", content, true, {"sourceMap":false,"shadowMode":false});
 /***/ }),
@@ -120958,8 +120958,8 @@ var jsonFile_component = normalizeComponent(
 )
 /* 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/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/shpFile.vue?vue&type=template&id=48c3ad34&scoped=true&
-var shpFilevue_type_template_id_48c3ad34_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/shpFile.vue?vue&type=template&id=ccd339a4&scoped=true&
+var shpFilevue_type_template_id_ccd339a4_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-button', {
@@ -120980,7 +120980,7 @@ var shpFilevue_type_template_id_48c3ad34_scoped_true_render = function render()
     }
   })]);
 };
-var shpFilevue_type_template_id_48c3ad34_scoped_true_staticRenderFns = [];
+var shpFilevue_type_template_id_ccd339a4_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/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=script&lang=js&
@@ -121078,9 +121078,11 @@ const shapeFile = __webpack_require__(4952);
      * @param {File} dbfFile - DBF 文件对象
      */
     readWithDbf(shpFile, dbfFile) {
-      Promise.all([this.readFileAsArrayBuffer(shpFile), this.readFileAsArrayBuffer(dbfFile)]).then(([shpBuffer, dbfBuffer]) => {
+      Promise.all([this.readFileAsArrayBuffer(shpFile), this.readFileAsArrayBuffer(dbfFile)]).then(async ([shpBuffer, dbfBuffer]) => {
+        let encoding = this.detectEncoding(dbfBuffer);
+        console.log('encoding', encoding, this.encoding);
         shapeFile.open(shpBuffer, dbfBuffer, {
-          encoding: this.encoding
+          encoding: encoding || this.encoding
         }).then(source => {
           const features = [];
           const read = () => {
@@ -121117,14 +121119,33 @@ const shapeFile = __webpack_require__(4952);
           this.$message.error('读取文件失败，请检查文件格式是否正确');
         });
       });
+    },
+    /**
+    * 读取文件编码格式
+    */
+    detectEncoding(dbfBuffer) {
+      //方法一： 读取 LDID（第 29 字节）
+      const ldid = new Uint8Array(dbfBuffer)[29];
+      const ldidMap = {
+        0x57: 'gb2312',
+        // 简体中文
+        0xc8: 'latin1',
+        // Windows-1252
+        0x4d: 'utf-8',
+        // UTF-8
+        0x03: 'cp437' // OEM
+      };
+      let encoding = ldidMap[ldid];
+      return encoding;
     }
   }
 });
 ;// 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/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/shpFile.vue?vue&type=style&index=0&id=48c3ad34&prod&lang=scss&scoped=true&
-var shpFilevue_type_style_index_0_id_48c3ad34_prod_lang_scss_scoped_true_ = __webpack_require__(729);
-;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue?vue&type=style&index=0&id=48c3ad34&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/shpFile.vue?vue&type=style&index=0&id=ccd339a4&prod&lang=scss&scoped=true&
+var shpFilevue_type_style_index_0_id_ccd339a4_prod_lang_scss_scoped_true_ = __webpack_require__(8965);
+;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue?vue&type=style&index=0&id=ccd339a4&prod&lang=scss&scoped=true&
 ;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue
@@ -121137,11 +121158,11 @@ var shpFilevue_type_style_index_0_id_48c3ad34_prod_lang_scss_scoped_true_ = __we
 var shpFile_component = normalizeComponent(
   draw_shpFilevue_type_script_lang_js_,
-  shpFilevue_type_template_id_48c3ad34_scoped_true_render,
-  shpFilevue_type_template_id_48c3ad34_scoped_true_staticRenderFns,
+  shpFilevue_type_template_id_ccd339a4_scoped_true_render,
+  shpFilevue_type_template_id_ccd339a4_scoped_true_staticRenderFns,
   false,
   null,
-  "48c3ad34",
+  "ccd339a4",
   null
 )