vue-openlayers-plugin 1.0.90 → 1.0.92

package/lib/{MyMarkersDialog-7dd24d9a.mjs → MyMarkersDialog-605a60e2.mjs}

@@ -1,6 +1,6 @@
-import { defineComponent, inject, computed, ref, reactive, onUnmounted, watch, resolveComponent, openBlock, createElementBlock, Fragment, createVNode, withCtx, createElementVNode, unref, normalizeClass, createTextVNode, toDisplayString, renderList, createBlock, withModifiers } from "vue";
-import { i as plus_default, j as folder_opened_default, k as download_default, m as delete_default, s as search_default, n as location_filled_default, o as edit_default, M as MarkerDrawingAdapter, t as toLonLat } from "./index-05da77ba.mjs";
-import { E as ElMessageBox } from "./index-b3c7ea8d.mjs";
+import { defineComponent, inject, computed, ref, reactive, onUnmounted, watch, resolveComponent, openBlock, createElementBlock, Fragment, createVNode, withCtx, createElementVNode, unref, normalizeClass, createTextVNode, toDisplayString, renderList, createBlock, withModifiers, mergeProps } from "vue";
+import { j as plus_default, k as folder_opened_default, m as download_default, n as delete_default, s as search_default, o as location_filled_default, q as edit_default, M as MarkerDrawingAdapter, t as fromLonLat, u as toLonLat } from "./index-7f38e279.mjs";
+import { E as ElMessageBox } from "./index-30b0d26c.mjs";
 import "ol";
 const _hoisted_1 = { class: "markers-content" };
 const _hoisted_2 = { class: "toolbar" };
@@ -49,26 +49,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         color: "#409eff"
       });
     };
-    const confirmAddMarker = () => {
-      var _a;
-      if (!markerForm.name.trim()) {
-        console.warn("请输入标记名称");
-        return;
-      }
-      const newMarker = {
-        id: Date.now().toString(),
-        name: markerForm.name.trim(),
-        category: markerForm.category || "默认",
-        description: ((_a = markerForm.description) == null ? void 0 : _a.trim()) || "",
-        longitude: markerForm.longitude || 117.238548,
-        latitude: markerForm.latitude || 31.806682,
-        color: markerForm.color || "#409eff",
-        createTime: (/* @__PURE__ */ new Date()).toISOString()
-      };
-      markers.value.push(newMarker);
-      cancelAddMarker();
-      console.log("标记添加成功");
-    };
     const categories = computed(() => {
       const cats = [...new Set(markers.value.map((m) => m.category))];
       return cats.filter((cat) => cat);
@@ -143,7 +123,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       });
       const handleDrawingEnd = (drawing) => {
         var _a;
-        const coordinate = drawing.getCoordinate();
+        const coordinate = drawing.getCoordinates();
         if (coordinate) {
           (_a = drawingManager.value) == null ? void 0 : _a.removeDrawing(drawing);
           showMarkerInputDialog(coordinate);
@@ -163,10 +143,28 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       isAddingMarker.value = false;
     };
+    const dialogProps = ref({
+      top: "15vh",
+      left: "50%",
+      enableCache: true
+    });
     const showMarkerInputDialog = (coordinate) => {
       var _a;
       const mapProjection = (_a = map.value) == null ? void 0 : _a.getView().getProjection().getCode();
       const lonLat = mapProjection === "EPSG:4326" || mapProjection === "EPSG:4490" ? coordinate : toLonLat(coordinate);
+      if (map.value) {
+        const pixel = map.value.getPixelFromCoordinate(coordinate);
+        if (pixel) {
+          const mapElement = map.value.getTargetElement();
+          const rect = mapElement.getBoundingClientRect();
+          dialogProps.value = {
+            top: pixel[1] + rect.top + 20 + "px",
+            left: pixel[0] + rect.left - 175 + "px",
+            enableCache: false
+            // 禁用缓存以强制使用新位置
+          };
+        }
+      }
       editingIndex.value = -1;
       Object.assign(markerForm, {
         name: "",
@@ -188,8 +186,55 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         latitude: marker.latitude,
         color: marker.color
       });
+      if (map.value) {
+        const mapProjection = map.value.getView().getProjection().getCode();
+        const coordinate = mapProjection === "EPSG:4326" || mapProjection === "EPSG:4490" ? [marker.longitude, marker.latitude] : fromLonLat([marker.longitude, marker.latitude]);
+        const pixel = map.value.getPixelFromCoordinate(coordinate);
+        if (pixel) {
+          const mapElement = map.value.getTargetElement();
+          const rect = mapElement.getBoundingClientRect();
+          dialogProps.value = {
+            top: pixel[1] + rect.top + 20 + "px",
+            left: pixel[0] + rect.left - 175 + "px",
+            enableCache: false
+          };
+        }
+      }
       showAddDialog.value = true;
     };
+    const saveMarker = () => {
+      var _a;
+      if (!((_a = markerForm.name) == null ? void 0 : _a.trim())) {
+        console.error("请输入标记名称");
+        return;
+      }
+      if (!markerAdapter) {
+        console.error("标记管理器未初始化");
+        return;
+      }
+      const markerData = {
+        id: editingIndex.value >= 0 ? markers.value[editingIndex.value].id : Date.now().toString(),
+        name: markerForm.name,
+        category: markerForm.category || "默认",
+        description: markerForm.description || "",
+        longitude: Number(markerForm.longitude),
+        latitude: Number(markerForm.latitude),
+        color: markerForm.color || "#409eff",
+        createTime: editingIndex.value >= 0 ? markers.value[editingIndex.value].createTime : (/* @__PURE__ */ new Date()).toISOString()
+      };
+      try {
+        if (editingIndex.value >= 0) {
+          markerAdapter.updateMarker(markerData);
+          console.log("标记更新成功");
+        } else {
+          markerAdapter.addMarker(markerData);
+          console.log("标记添加成功");
+        }
+        cancelAddMarker();
+      } catch (error) {
+        console.error("保存标记失败: " + error.message);
+      }
+    };
     const deleteMarker = (index) => {
       ElMessageBox.confirm("确定要删除这个标记吗？", "确认删除", {
         confirmButtonText: "确定",
@@ -313,15 +358,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         markerAdapter = null;
       }
     });
-    watch([() => props.map, () => props.drawingManager], () => {
-      if (props.map && props.drawingManager) {
-        initializeMarkerAdapter();
-        if (markerAdapter) {
-          const existingMarkers = markerAdapter.getAllMarkers();
-          markers.value = existingMarkers;
+    watch(
+      [() => props.map, () => props.drawingManager],
+      () => {
+        if (props.map && props.drawingManager) {
+          initializeMarkerAdapter();
+          if (markerAdapter) {
+            const existingMarkers = markerAdapter.getAllMarkers();
+            markers.value = existingMarkers;
+          }
         }
-      }
-    }, { immediate: true });
+      },
+      { immediate: true }
+    );
     return (_ctx, _cache) => {
       const _component_el_button = resolveComponent("el-button");
       const _component_el_input = resolveComponent("el-input");
@@ -339,9 +388,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => dialogVisible.value = $event),
           title: "我的标记",
           width: "600px",
+          height: "600px",
           "before-close": handleClose,
           "show-modal": false,
-          cacheId: "markers-dialog",
+          "modal-class": ["pointer-events-none"],
+          "cache-id": "markers-dialog",
           class: "markers-dialog"
         }, {
           default: withCtx(() => [
@@ -350,8 +401,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 createVNode(_component_el_button, {
                   type: "primary",
                   icon: unref(plus_default),
-                  onClick: showAddMarker,
-                  class: normalizeClass({ "adding-marker": isAddingMarker.value })
+                  class: normalizeClass({ "adding-marker": isAddingMarker.value }),
+                  onClick: showAddMarker
                 }, {
                   default: withCtx(() => [
                     createTextVNode(toDisplayString(isAddingMarker.value ? "取消添加" : "添加标记"), 1)
@@ -362,7 +413,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   icon: unref(folder_opened_default),
                   onClick: importMarkers
                 }, {
-                  default: withCtx(() => [..._cache[6] || (_cache[6] = [
+                  default: withCtx(() => [..._cache[7] || (_cache[7] = [
                     createTextVNode(" 导入标记 ", -1)
                   ])]),
                   _: 1
@@ -371,17 +422,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   icon: unref(download_default),
                   onClick: exportMarkers
                 }, {
-                  default: withCtx(() => [..._cache[7] || (_cache[7] = [
+                  default: withCtx(() => [..._cache[8] || (_cache[8] = [
                     createTextVNode(" 导出标记 ", -1)
                   ])]),
                   _: 1
                 }, 8, ["icon"]),
                 createVNode(_component_el_button, {
                   icon: unref(delete_default),
-                  onClick: clearAllMarkers,
-                  disabled: markers.value.length === 0
+                  disabled: markers.value.length === 0,
+                  onClick: clearAllMarkers
                 }, {
-                  default: withCtx(() => [..._cache[8] || (_cache[8] = [
+                  default: withCtx(() => [..._cache[9] || (_cache[9] = [
                     createTextVNode(" 清空全部 ", -1)
                   ])]),
                   _: 1
@@ -394,8 +445,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   placeholder: "搜索标记名称或备注...",
                   "prefix-icon": unref(search_default),
                   clearable: "",
-                  onInput: handleSearch,
-                  style: { "width": "300px" }
+                  style: { "width": "300px" },
+                  onInput: handleSearch
                 }, null, 8, ["modelValue", "prefix-icon"]),
                 createVNode(_component_el_select, {
                   modelValue: filterCategory.value,
@@ -423,9 +474,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               createElementVNode("div", _hoisted_4, [
                 createVNode(_component_el_table, {
                   data: filteredMarkers.value,
-                  height: "300",
-                  onRowClick: locateMarker,
-                  class: "markers-table"
+                  height: "100%",
+                  class: "markers-table",
+                  "empty-text": "暂无数据",
+                  onRowClick: locateMarker
                 }, {
                   default: withCtx(() => [
                     createVNode(_component_el_table_column, {
@@ -477,26 +529,26 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         createVNode(_component_el_button, {
                           type: "text",
                           size: "small",
-                          onClick: withModifiers(($event) => editMarker(row, $index), ["stop"]),
-                          icon: unref(edit_default)
+                          icon: unref(edit_default),
+                          onClick: withModifiers(($event) => editMarker(row, $index), ["stop"])
                         }, {
-                          default: withCtx(() => [..._cache[9] || (_cache[9] = [
+                          default: withCtx(() => [..._cache[10] || (_cache[10] = [
                             createTextVNode(" 编辑 ", -1)
                           ])]),
                           _: 2
-                        }, 1032, ["onClick", "icon"]),
+                        }, 1032, ["icon", "onClick"]),
                         createVNode(_component_el_button, {
                           type: "text",
                           size: "small",
-                          onClick: withModifiers(($event) => deleteMarker($index), ["stop"]),
                           icon: unref(delete_default),
-                          class: "delete-btn"
+                          class: "delete-btn",
+                          onClick: withModifiers(($event) => deleteMarker($index), ["stop"])
                         }, {
-                          default: withCtx(() => [..._cache[10] || (_cache[10] = [
+                          default: withCtx(() => [..._cache[11] || (_cache[11] = [
                             createTextVNode(" 删除 ", -1)
                           ])]),
                           _: 2
-                        }, 1032, ["onClick", "icon"])
+                        }, 1032, ["icon", "onClick"])
                       ]),
                       _: 1
                     })
@@ -508,27 +560,26 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ]),
           _: 1
         }, 8, ["modelValue"]),
-        createVNode(_component_EPlusDialog, {
+        createVNode(_component_EPlusDialog, mergeProps({
           modelValue: showAddDialog.value,
-          "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => showAddDialog.value = $event),
+          "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => showAddDialog.value = $event),
           title: "添加标记",
           width: "350px",
           "show-modal": false,
-          "append-to-body": "",
-          cacheId: "marker-form"
-        }, {
+          "append-to-body": ""
+        }, dialogProps.value), {
           footer: withCtx(() => [
             createVNode(_component_el_button, { onClick: cancelAddMarker }, {
-              default: withCtx(() => [..._cache[11] || (_cache[11] = [
+              default: withCtx(() => [..._cache[12] || (_cache[12] = [
                 createTextVNode("取消", -1)
               ])]),
               _: 1
             }),
             createVNode(_component_el_button, {
               type: "primary",
-              onClick: confirmAddMarker
+              onClick: saveMarker
             }, {
-              default: withCtx(() => [..._cache[12] || (_cache[12] = [
+              default: withCtx(() => [..._cache[13] || (_cache[13] = [
                 createTextVNode("确定", -1)
               ])]),
               _: 1
@@ -555,11 +606,36 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   ]),
                   _: 1
                 }),
+                createVNode(_component_el_form_item, { label: "分类" }, {
+                  default: withCtx(() => [
+                    createVNode(_component_el_select, {
+                      modelValue: markerForm.category,
+                      "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => markerForm.category = $event),
+                      filterable: "",
+                      "allow-create": "",
+                      "default-first-option": "",
+                      placeholder: "请选择或输入分类",
+                      style: { "width": "100%" }
+                    }, {
+                      default: withCtx(() => [
+                        (openBlock(true), createElementBlock(Fragment, null, renderList(categories.value, (item) => {
+                          return openBlock(), createBlock(_component_el_option, {
+                            key: item,
+                            label: item,
+                            value: item
+                          }, null, 8, ["label", "value"]);
+                        }), 128))
+                      ]),
+                      _: 1
+                    }, 8, ["modelValue"])
+                  ]),
+                  _: 1
+                }),
                 createVNode(_component_el_form_item, { label: "备注" }, {
                   default: withCtx(() => [
                     createVNode(_component_el_input, {
                       modelValue: markerForm.description,
-                      "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => markerForm.description = $event),
+                      "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => markerForm.description = $event),
                       type: "textarea",
                       rows: 3,
                       placeholder: "请输入备注信息",
@@ -574,7 +650,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }, 8, ["model"])
           ]),
           _: 1
-        }, 8, ["modelValue"])
+        }, 16, ["modelValue"])
       ], 64);
     };
   }

package/lib/{RegionNavigationDialog-0808549f.mjs → RegionNavigationDialog-b0b6f86b.mjs}

@@ -30,7 +30,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   props: {
     modelValue: { type: Boolean }
   },
-  emits: ["update:modelValue", "navigation-action", "flyToRegion", "drawBoundary"],
+  emits: ["update:modelValue", "action", "flyToRegion", "drawBoundary"],
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
@@ -1050,13 +1050,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     };
     const navigateToRegion = (region) => {
-      emit("navigation-action", {
+      emit("action", {
         type: "flyToRegion",
         region,
         center: region.center,
         zoom: region.zoom || 7
       });
-      emit("navigation-action", {
+      emit("action", {
         type: "drawBoundary",
         code: region.code,
         name: region.name,
@@ -1078,14 +1078,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const navigateToDistrict = (district) => {
       selectedDistrict.value = district.code;
-      emit("navigation-action", {
+      emit("action", {
         type: "flyToRegion",
         region: district,
         center: district.center,
         zoom: 12,
         boundary: district.boundary
       });
-      emit("navigation-action", {
+      emit("action", {
         type: "drawBoundary",
         code: district.code,
         name: district.name,
@@ -1118,7 +1118,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         width: "500px",
         "before-close": handleClose,
         "show-modal": false,
-        cacheId: "region-dialog",
+        "modal-class": ["pointer-events-none"],
+        "cache-id": "region-dialog",
         class: "region-dialog"
       }, {
         default: withCtx(() => [
@@ -1126,10 +1127,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             createVNode(_component_el_tabs, {
               modelValue: activeTab.value,
               "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => activeTab.value = $event),
-              onTabClick: handleTabClick,
-              onTabRemove: handleTabRemove,
               type: "card",
-              class: "region-tabs"
+              class: "region-tabs",
+              onTabClick: handleTabClick,
+              onTabRemove: handleTabRemove
             }, {
               default: withCtx(() => [
                 (openBlock(true), createElementBlock(Fragment, null, renderList(tabs.value, (tab, index) => {
@@ -1148,8 +1149,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                               return openBlock(), createBlock(_component_el_button, {
                                 key: region.code,
                                 type: "text",
-                                onClick: ($event) => navigateToRegion(region),
-                                class: "region-btn"
+                                class: "region-btn",
+                                onClick: ($event) => navigateToRegion(region)
                               }, {
                                 default: withCtx(() => [
                                   createTextVNode(toDisplayString(region.name), 1)
@@ -1166,8 +1167,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                               return openBlock(), createBlock(_component_el_button, {
                                 key: region.code,
                                 type: "text",
-                                onClick: ($event) => navigateToRegion(region),
-                                class: "region-btn"
+                                class: "region-btn",
+                                onClick: ($event) => navigateToRegion(region)
                               }, {
                                 default: withCtx(() => [
                                   createTextVNode(toDisplayString(region.name), 1)
@@ -1184,8 +1185,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                               return openBlock(), createBlock(_component_el_button, {
                                 key: region.code,
                                 type: "text",
-                                onClick: ($event) => navigateToRegion(region),
-                                class: "region-btn"
+                                class: "region-btn",
+                                onClick: ($event) => navigateToRegion(region)
                               }, {
                                 default: withCtx(() => [
                                   createTextVNode(toDisplayString(region.name), 1)
@@ -1202,8 +1203,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                               return openBlock(), createBlock(_component_el_button, {
                                 key: region.code,
                                 type: "text",
-                                onClick: ($event) => navigateToRegion(region),
-                                class: "region-btn"
+                                class: "region-btn",
+                                onClick: ($event) => navigateToRegion(region)
                               }, {
                                 default: withCtx(() => [
                                   createTextVNode(toDisplayString(region.name), 1)
@@ -1220,8 +1221,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                               return openBlock(), createBlock(_component_el_button, {
                                 key: region.code,
                                 type: "text",
-                                onClick: ($event) => navigateToRegion(region),
-                                class: "region-btn"
+                                class: "region-btn",
+                                onClick: ($event) => navigateToRegion(region)
                               }, {
                                 default: withCtx(() => [
                                   createTextVNode(toDisplayString(region.name), 1)
@@ -1238,8 +1239,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                               return openBlock(), createBlock(_component_el_button, {
                                 key: region.code,
                                 type: "text",
-                                onClick: ($event) => navigateToRegion(region),
-                                class: "region-btn"
+                                class: "region-btn",
+                                onClick: ($event) => navigateToRegion(region)
                               }, {
                                 default: withCtx(() => [
                                   createTextVNode(toDisplayString(region.name), 1)
@@ -1256,8 +1257,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                               return openBlock(), createBlock(_component_el_button, {
                                 key: region.code,
                                 type: "text",
-                                onClick: ($event) => navigateToRegion(region),
-                                class: "region-btn"
+                                class: "region-btn",
+                                onClick: ($event) => navigateToRegion(region)
                               }, {
                                 default: withCtx(() => [
                                   createTextVNode(toDisplayString(region.name), 1)
@@ -1274,8 +1275,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                               return openBlock(), createBlock(_component_el_button, {
                                 key: region.code,
                                 type: "text",
-                                onClick: ($event) => navigateToRegion(region),
-                                class: "region-btn"
+                                class: "region-btn",
+                                onClick: ($event) => navigateToRegion(region)
                               }, {
                                 default: withCtx(() => [
                                   createTextVNode(toDisplayString(region.name), 1)
@@ -1290,7 +1291,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                           (openBlock(true), createElementBlock(Fragment, null, renderList(tab.districts, (district) => {
                             return openBlock(), createBlock(_component_el_button, {
                               key: district.code,
-                              class: normalizeClass(["district-btn", { active: selectedDistrict.value === district.code }]),
+                              class: normalizeClass([
+                                "district-btn",
+                                { active: selectedDistrict.value === district.code }
+                              ]),
                               onClick: ($event) => navigateToDistrict(district)
                             }, {
                               default: withCtx(() => [