ele-admin-plus 1.5.1-beta.4 → 1.6.0-beta.2

package/lib/ele-map-picker/components/map-view.cjs

@@ -1,41 +1,44 @@
 "use strict";
 const vue = require("vue");
-const AMapLoader = require("@amap/amap-jsapi-loader");
 const elementPlus = require("element-plus");
 const index = require("../../icons/index");
 const hook = require("../../utils/hook");
 const EleLoading = require("../../ele-loading/index");
+const util = require("../util");
 const props = require("../props");
 const _hoisted_1 = { class: "ele-map-view-body" };
 const _hoisted_2 = ["src"];
 const _hoisted_3 = { class: "ele-map-suggest-item" };
-const _hoisted_4 = { class: "ele-map-suggest-title" };
-const _hoisted_5 = { class: "ele-map-suggest-text" };
+const _hoisted_4 = ["title"];
+const _hoisted_5 = ["title"];
 const _hoisted_6 = {
   key: 0,
   class: "ele-map-view-message"
 };
 const _hoisted_7 = ["onClick"];
 const _hoisted_8 = { class: "ele-map-view-item-body" };
-const _hoisted_9 = {
+const _hoisted_9 = { class: "ele-map-view-item-title" };
+const _hoisted_10 = {
   key: 0,
-  class: "ele-map-view-item-title"
+  class: "ele-map-view-item-text"
 };
-const _hoisted_10 = { class: "ele-map-view-item-title" };
-const _hoisted_11 = {
+const _hoisted_11 = { key: 0 };
+const _hoisted_12 = { key: 1 };
+const _hoisted_13 = { key: 2 };
+const _hoisted_14 = { class: "ele-map-view-item-title" };
+const _hoisted_15 = {
   key: 0,
   class: "ele-map-view-item-text"
 };
-const _hoisted_12 = {
+const _hoisted_16 = {
   key: 0,
   class: "ele-map-view-empty"
 };
-const _hoisted_13 = { class: "ele-map-view-extra" };
-const _hoisted_14 = {
+const _hoisted_17 = { class: "ele-map-view-extra" };
+const _hoisted_18 = {
   key: 0,
   class: "ele-map-view-message"
 };
-const ICON_CLASS = "ele-map-view-body-icon";
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   ...{ name: "MapView" },
   __name: "map-view",
@@ -48,21 +51,21 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   setup(__props, { expose: __expose, emit: __emit }) {
     const props2 = __props;
     const emit = __emit;
-    const state = { context: vue.inject(hook.modalItemContextKey, null) };
     const mapRef = vue.ref(null);
     const autocompleteRef = vue.ref(null);
     const listRef = vue.ref(null);
+    const mapPoiCenterIconRef = vue.ref(null);
     const loading = vue.ref(true);
     const poiLoading = vue.ref(false);
     const confirmLoading = vue.ref(false);
     const data = vue.ref([]);
     const suggestionData = vue.ref([]);
-    const centerIconClass = vue.ref([ICON_CLASS]);
     const keywords = vue.ref("");
     const current = vue.ref(null);
     const confirmDisabled = vue.computed(() => props2.required && !current.value);
     const keywordMode = vue.computed(() => "keyword" === props2.mode);
     const poiMode = vue.computed(() => "poi" === props2.mode);
+    const state = { context: vue.inject(hook.modalItemContextKey, null) };
     const getInitSelected = () => {
       if (props2.selected != null) {
         const { lng, lat } = props2.selected;
@@ -83,21 +86,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       result[index2] = poi;
       return result;
     };
-    const isNullCity = (city) => {
-      if (city == null || typeof city !== "object" || city.province == null && city.city == null && city.district == null && city.citycode == null) {
-        return true;
-      }
-      return false;
-    };
-    const formatPOI = (d) => {
-      const name = d.name || "";
-      const addr = Array.isArray(d.address) ? d.address[0] : d.address;
-      const address = addr || "";
-      const { lat, lng } = d.location;
-      const city = isNullCity(d.city) ? void 0 : d.city;
-      const key = [name, address, lat, lng].join(",");
-      return { ...d, name, address, lat, lng, city, key };
-    };
     const scrollToTop = () => {
       const listEl = listRef.value;
       if (listEl) {
@@ -125,52 +113,19 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         }
       }
     };
-    const searchKeywords = (keyword) => {
-      return new Promise((resolve, reject) => {
-        if (!state.autoCompleteIns) {
-          reject(new Error("AutoComplete instance is null"));
-          return;
-        }
-        state.autoCompleteIns.search(keyword, (status, result) => {
-          if (status === "error") {
-            const msg = `${status} ${result ? JSON.stringify(result) : ""}`;
-            reject(new Error(msg));
-            return;
-          }
-          if (!result?.tips) {
-            resolve([]);
-            return;
-          }
-          const tips = result.tips.filter((d) => !!d.location);
-          resolve(tips.map((d) => formatPOI(d)));
-        });
-      });
-    };
-    const searchNearBy = (lng, lat) => {
-      return new Promise((resolve, reject) => {
-        if (!state.placeSearchIns) {
-          reject(new Error("PlaceSearch instance is null"));
-          return;
-        }
-        state.placeSearchIns.searchNearBy(
-          props2.poiKeywords,
-          [lng, lat],
-          props2.poiRadius,
-          (status, result) => {
-            if (status === "complete" && result?.poiList?.pois) {
-              const ps = result.poiList.pois.filter((d) => !!d.location);
-              resolve(ps.map((d) => formatPOI(d)));
-              return;
-            }
-            if (status === "no_data") {
-              resolve([]);
-              return;
-            }
-            const msg = `${status} ${result ? JSON.stringify(result) : ""}`;
-            reject(new Error(msg));
-          }
-        );
+    const searchNearBy = async (lng, lat) => {
+      const mapPluginIns = state.mapPluginIns;
+      if (!mapPluginIns || lng == null || lat == null) {
+        return [];
+      }
+      const data2 = await mapPluginIns.searchNearBy({
+        lng,
+        lat,
+        poiKeywords: props2.poiKeywords,
+        poiRadius: props2.poiRadius,
+        poiType: props2.poiType
       });
+      return data2;
     };
     const searchPOI = (lng, lat) => {
       loading.value = true;
@@ -199,80 +154,23 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       });
     };
     const bounceIcon = () => {
-      centerIconClass.value = [ICON_CLASS];
-      vue.nextTick(() => {
-        setTimeout(() => {
-          centerIconClass.value = [ICON_CLASS, "ele-map-view-anim-bounce"];
-        }, 0);
-      });
-    };
-    const removeCenterMarker = () => {
-      if (state.centerMarker && state.mapIns) {
-        state.mapIns.remove(state.centerMarker);
-      }
-    };
-    const showCenterMarker = (lng, lat) => {
-      if (!state.centerMarker) {
-        console.error("centerMarker is null");
-        return;
-      }
-      if (!state.mapIns) {
-        console.error("map instance is null");
-        return;
-      }
-      removeCenterMarker();
-      if (lng != null && lat != null) {
-        state.centerMarker.setPosition([lng, lat]);
-        state.mapIns.add(state.centerMarker);
-      }
-    };
-    const setMapCenter = (lng, lat, zoom) => {
-      if (state.mapIns && lng != null && lat != null) {
-        if (zoom == null) {
-          state.mapIns.setCenter([lng, lat]);
-        } else {
-          state.mapIns.setZoomAndCenter(zoom, [lng, lat]);
-        }
-      }
-    };
-    const getMapCenter = (returnRegions) => {
-      return new Promise((resolve, reject) => {
-        if (!state.mapIns) {
-          reject(new Error("map instance is null"));
-          return;
-        }
-        const result = state.mapIns.getCenter();
-        if (!returnRegions) {
-          resolve(result || {});
-          return;
-        }
-        state.mapIns.getCity((city) => {
-          resolve({ ...result || {}, city });
-        });
-      });
-    };
-    const changeMapStyle = (style) => {
-      if (state.mapIns) {
-        if (typeof style === "boolean") {
-          if (style) {
-            state.mapIns.setMapStyle("amap://styles/dark");
-          } else {
-            state.mapIns.setMapStyle("amap://styles/normal");
-          }
-        } else if (style) {
-          state.mapIns.setMapStyle(style);
-        }
+      const iconEl = mapPoiCenterIconRef.value;
+      if (iconEl) {
+        iconEl.animate(
+          [
+            { transform: "translateY(0)" },
+            { transform: "translateY(-20px)" },
+            { transform: "translateY(0)" }
+          ],
+          { duration: 600 }
+        );
       }
     };
-    const destroyMap = () => {
-      state.mapIns && state.mapIns.destroy();
-      state.centerMarker = null;
-      state.placeSearchIns = null;
-      state.autoCompleteIns = null;
-      state.mapIns = null;
-    };
     const destroyAll = () => {
-      destroyMap();
+      if (state.mapPluginIns) {
+        state.mapPluginIns.destroyMap();
+        state.mapPluginIns = null;
+      }
       state.lastSuggestion = "";
       state.selectedSuggestion = null;
       state.isItemClickMove = false;
@@ -282,101 +180,130 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       setSelected(null);
     };
     const renderMap = () => {
-      if (!props2.mapKey || state.mapIns) {
+      destroyAll();
+      if (!props2.mapPlugin || !mapRef.value) {
         return;
       }
-      AMapLoader.load({
-        key: props2.mapKey,
-        version: props2.mapVersion,
-        plugins: ["AMap.PlaceSearch", "AMap.AutoComplete"]
-      }).then((AMap) => {
-        destroyAll();
-        state.centerMarker = new AMap.Marker({
-          icon: new AMap.Icon({
-            image: props2.markerSrc,
-            size: new AMap.Size(26, 36.5),
-            imageSize: new AMap.Size(26, 36.5)
-          }),
-          offset: new AMap.Pixel(-13, -36.5)
-        });
-        state.autoCompleteIns = new AMap.AutoComplete({
-          city: props2.suggestionCity
-        });
-        state.placeSearchIns = new AMap.PlaceSearch({
-          type: props2.poiType,
-          pageSize: props2.poiLimit,
-          pageIndex: 1
-        });
-        const selected = getInitSelected();
-        const selCenter = selected ? [selected.lng, selected.lat] : void 0;
-        const defaultStyle = props2.darkMode ? "amap://styles/dark" : void 0;
-        state.mapIns = new AMap.Map(mapRef.value, {
-          zoom: selected == null ? props2.zoom : props2.selectedZoom,
-          // 初缩放级别
-          center: selCenter || props2.center,
-          // 初始中心点
-          resizeEnable: true,
-          // 监控地图容器尺寸变化
-          mapStyle: props2.mapStyle || defaultStyle
-        });
-        state.mapIns.on("complete", () => {
-          const selected2 = getInitSelected();
-          if (selected2 != null) {
-            setSelected(selected2);
+      const initSel = getInitSelected();
+      const selCenter = initSel ? [initSel.lng, initSel.lat] : void 0;
+      state.mapPluginIns = new props2.mapPlugin();
+      state.mapPluginIns.renderMap(mapRef.value, {
+        mapKey: props2.mapKey,
+        mapVersion: props2.mapVersion,
+        zoom: initSel == null ? props2.zoom : props2.selectedZoom,
+        center: selCenter || props2.center,
+        mapStyle: props2.mapStyle,
+        darkMode: props2.darkMode,
+        suggestionCity: props2.suggestionCity,
+        poiType: props2.poiType,
+        poiLimit: props2.poiLimit,
+        markerSrc: props2.markerSrc,
+        onComplete: () => {
+          const mapPluginIns = state.mapPluginIns;
+          if (!mapPluginIns) {
+            return;
+          }
+          if (initSel != null) {
+            setSelected(initSel);
             if (!poiMode.value) {
-              const { lng, lat } = selected2;
-              showCenterMarker(lng, lat);
+              mapPluginIns.showCenterMarker(initSel.lng, initSel.lat);
             }
           }
           if (poiMode.value || keywordMode.value) {
-            state.selectedSuggestion = selected2;
-            const { lng, lat } = state.mapIns.getCenter();
-            searchPOI(lng, lat);
+            state.selectedSuggestion = initSel;
+            mapPluginIns.getMapCenter().then(({ lng, lat }) => {
+              searchPOI(lng, lat);
+            }).catch((e) => {
+              console.error(e);
+            });
             return;
           }
           loading.value = false;
-        });
-        state.mapIns.on("moveend", () => {
-          if (state.isItemClickMove || !poiMode.value) {
+        },
+        onMoveend: () => {
+          if (state.isItemClickMove || !poiMode.value || !state.mapPluginIns) {
             state.isItemClickMove = false;
             return;
           }
           bounceIcon();
-          const { lng, lat } = state.mapIns.getCenter();
-          searchPOI(lng, lat);
-        });
-        state.mapIns.on("click", (e) => {
+          state.mapPluginIns.getMapCenter().then(({ lng, lat }) => {
+            searchPOI(lng, lat);
+          }).catch((e) => {
+            console.error(e);
+          });
+        },
+        onDragend: () => {
+          if (!poiMode.value || !state.mapPluginIns) {
+            return;
+          }
+          bounceIcon();
+          state.mapPluginIns.getMapCenter().then(({ lng, lat }) => {
+            searchPOI(lng, lat);
+          }).catch((e) => {
+            console.error(e);
+          });
+        },
+        onClick: (e) => {
           if (poiMode.value || keywordMode.value) {
             return;
           }
-          if (e.lnglat == null || typeof e.lnglat !== "object") {
+          if (e.lnglat == null || typeof e.lnglat !== "object" || !state.mapPluginIns) {
             console.error(e);
             return;
           }
           const { lng, lat } = e.lnglat;
-          setSelected(formatPOI({ location: { lat, lng } }), true);
-          setMapCenter(lng, lat, props2.selectedZoom);
-          showCenterMarker(lng, lat);
-        });
-        emit("mapDone", state.mapIns);
-      }).catch((e) => {
-        console.error(e);
+          setSelected(
+            {
+              name: "",
+              address: "",
+              lat,
+              lng,
+              key: [lat, lng].join(),
+              location: { lat, lng }
+            },
+            true
+          );
+          state.mapPluginIns.setMapCenter(lng, lat, props2.selectedZoom);
+          state.mapPluginIns.showCenterMarker(lng, lat);
+        },
+        onRendered: (mapIns) => {
+          emit("mapDone", mapIns);
+        },
+        onResizeend: () => {
+          if (current.value && poiMode.value && state.mapPluginIns) {
+            const { lng, lat } = current.value;
+            state.mapPluginIns.setMapCenter(lng, lat);
+          }
+        },
+        onZoomend: () => {
+          if (current.value && poiMode.value && state.mapPluginIns) {
+            const { lng, lat } = current.value;
+            state.mapPluginIns.setMapCenter(lng, lat);
+          }
+        }
       });
     };
     const getMapIns = () => {
-      return state.mapIns;
+      if (state.mapPluginIns) {
+        return state.mapPluginIns.getMapInstance();
+      }
+    };
+    const checkResize = () => {
+      state.mapPluginIns?.checkResize && state.mapPluginIns.checkResize();
     };
     const showInitSelected = () => {
       const selected = getInitSelected();
-      if (state.mapIns == null || selected == null) {
+      if (selected == null) {
         return;
       }
       setSelected(selected);
       const { lng, lat } = selected;
       state.isItemClickMove = true;
-      setMapCenter(lng, lat, props2.selectedZoom);
-      if (!poiMode.value) {
-        showCenterMarker(lng, lat);
+      if (state.mapPluginIns) {
+        state.mapPluginIns.setMapCenter(lng, lat, props2.selectedZoom);
+        if (!poiMode.value) {
+          state.mapPluginIns.showCenterMarker(lng, lat);
+        }
       }
       if ((keywordMode.value || poiMode.value) && !data.value.includes(selected)) {
         data.value = addFirstPOI(selected, data.value);
@@ -386,7 +313,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       });
     };
     const handleSearch = (keyword, callback) => {
-      if (!keyword || state.lastSuggestion === keyword) {
+      if (!keyword || state.lastSuggestion === keyword || !state.mapPluginIns) {
         callback && callback(suggestionData.value);
         return;
       }
@@ -394,12 +321,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       if (keywordMode.value) {
         poiLoading.value = true;
       }
-      searchKeywords(keyword).then((result) => {
+      state.mapPluginIns.searchKeyword(keyword).then((result) => {
         if (keywordMode.value) {
           data.value = result;
           poiLoading.value = false;
           setSelected(null, true);
-          removeCenterMarker();
+          state.mapPluginIns && state.mapPluginIns.removeCenterMarker();
           scrollToTop();
           return;
         }
@@ -421,36 +348,41 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         return;
       }
       if (!poiMode.value) {
-        showCenterMarker(lng, lat);
-        setMapCenter(lng, lat, props2.selectedZoom);
+        if (state.mapPluginIns) {
+          state.mapPluginIns.showCenterMarker(lng, lat);
+          state.mapPluginIns.setMapCenter(lng, lat, props2.selectedZoom);
+        }
         setSelected(item, true);
         return;
       }
       loading.value = true;
       state.selectedSuggestion = item;
       state.isItemClickMove = true;
-      setMapCenter(lng, lat, props2.selectedZoom);
+      state.mapPluginIns && state.mapPluginIns.setMapCenter(lng, lat, props2.selectedZoom);
       bounceIcon();
       searchPOI(lng, lat);
     };
     const handleItemClick = (item) => {
       state.isItemClickMove = true;
       setSelected(item, true);
+      if (!state.mapPluginIns) {
+        return;
+      }
       const { lng, lat } = item;
-      setMapCenter(lng, lat, props2.selectedZoom);
+      state.mapPluginIns.setMapCenter(lng, lat, props2.selectedZoom);
       if (poiMode.value) {
         bounceIcon();
         return;
       }
-      showCenterMarker(lng, lat);
+      state.mapPluginIns.showCenterMarker(lng, lat);
     };
     const handleConfirm = () => {
-      if (!state.context?.label) {
+      if (!state.mapPluginIns || !state.context?.label) {
         return;
       }
       if (!current.value) {
         confirmLoading.value = true;
-        getMapCenter(props2.returnRegions).then((result) => {
+        state.mapPluginIns.getMapCenter(props2.returnRegions).then((result) => {
           confirmLoading.value = false;
           emit("done", result);
         }).catch((e) => {
@@ -460,14 +392,14 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         });
         return;
       }
-      if (!props2.returnRegions || !isNullCity(current.value.city)) {
+      if (!props2.returnRegions || !util.isNullCity(current.value.city)) {
         emit("done", current.value);
         return;
       }
       confirmLoading.value = true;
       state.isItemClickMove = true;
-      setMapCenter(current.value.lng, current.value.lat);
-      getMapCenter(true).then(({ city }) => {
+      state.mapPluginIns.setMapCenter(current.value.lng, current.value.lat);
+      state.mapPluginIns.getMapCenter(true).then(({ city }) => {
         confirmLoading.value = false;
         emit("done", { ...current.value || {}, city });
       }).catch((e) => {
@@ -486,7 +418,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       () => props2.darkMode,
       (darkMode) => {
         if (!props2.mapStyle) {
-          changeMapStyle(darkMode);
+          state.mapPluginIns && state.mapPluginIns.setMapStyle(darkMode);
         }
       }
     );
@@ -494,7 +426,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       () => props2.mapStyle,
       (mapStyle) => {
         if (mapStyle) {
-          changeMapStyle(mapStyle);
+          state.mapPluginIns && state.mapPluginIns.setMapStyle(mapStyle);
         }
       }
     );
@@ -505,29 +437,30 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         suggestionData.value = [];
         state.selectedSuggestion = null;
         state.lastSuggestion = "";
-        removeCenterMarker();
-        if (mode !== "poi" && current.value) {
-          const { lng, lat } = current.value.location;
-          showCenterMarker(lng, lat);
+        state.mapPluginIns && state.mapPluginIns.removeCenterMarker();
+        if (mode !== "poi" && current.value && state.mapPluginIns) {
+          const { lng, lat } = current.value;
+          state.mapPluginIns.showCenterMarker(lng, lat);
         }
         if (!data.value.length && (mode === "poi" || mode === "keyword")) {
           if (current.value) {
-            const { lng, lat } = current.value.location;
-            searchPOI(lng, lat);
-          } else {
-            const { lng, lat } = state.mapIns.getCenter();
+            const { lng, lat } = current.value;
             searchPOI(lng, lat);
+          } else if (state.mapPluginIns) {
+            state.mapPluginIns.getMapCenter().then((centerPoint) => {
+              const { lng, lat } = centerPoint || {};
+              searchPOI(lng, lat);
+            }).catch((e) => {
+              console.error(e);
+            });
           }
         }
       }
     );
-    vue.watch(
-      () => props2.mapKey,
-      () => {
-        destroyAll();
-        renderMap();
-      }
-    );
+    vue.watch([() => props2.mapKey, () => props2.mapPlugin], () => {
+      destroyAll();
+      renderMap();
+    });
     vue.onMounted(() => {
       renderMap();
     });
@@ -537,7 +470,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     __expose({
       autocompleteRef,
       getMapIns,
-      showInitSelected
+      showInitSelected,
+      checkResize
     });
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createBlock(EleLoading, {
@@ -550,7 +484,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             vue.createElementVNode("div", {
               ref_key: "mapRef",
               ref: mapRef,
-              style: { height: "100%" }
+              style: { height: "100%", width: "100%" }
             }, null, 512),
             poiMode.value ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
               vue.createVNode(vue.unref(elementPlus.ElIcon), { class: "ele-map-view-icon-plus" }, {
@@ -560,9 +494,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 _: 1
               }),
               vue.createElementVNode("img", {
-                src: _ctx.markerSrc,
-                class: vue.normalizeClass(centerIconClass.value)
-              }, null, 10, _hoisted_2)
+                ref_key: "mapPoiCenterIconRef",
+                ref: mapPoiCenterIconRef,
+                src: _ctx.markerSrc ?? vue.unref(util.defaultMarkerSrc),
+                class: "ele-map-view-body-icon"
+              }, null, 8, _hoisted_2)
             ], 64)) : vue.createCommentVNode("", true),
             _ctx.filterable && !keywordMode.value ? (vue.openBlock(), vue.createElementBlock("div", {
               key: 1,
@@ -591,8 +527,14 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 ]),
                 default: vue.withCtx(({ item }) => [
                   vue.createElementVNode("div", _hoisted_3, [
-                    vue.createElementVNode("div", _hoisted_4, vue.toDisplayString(item.name), 1),
-                    vue.createElementVNode("div", _hoisted_5, vue.toDisplayString(item.district), 1)
+                    vue.createElementVNode("div", {
+                      class: "ele-map-suggest-title",
+                      title: item.name
+                    }, vue.toDisplayString(item.name), 9, _hoisted_4),
+                    vue.createElementVNode("div", {
+                      class: "ele-map-suggest-text",
+                      title: item.district
+                    }, vue.toDisplayString(item.district), 9, _hoisted_5)
                   ])
                 ]),
                 _: 1
@@ -654,13 +596,20 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                       _: 1
                     }),
                     vue.createElementVNode("div", _hoisted_8, [
-                      !item.name && !item.address ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_9, [
-                        vue.createElementVNode("span", null, vue.toDisplayString(item.lng), 1),
-                        _cache[2] || (_cache[2] = vue.createElementVNode("span", null, ",", -1)),
-                        vue.createElementVNode("span", null, vue.toDisplayString(item.lat), 1)
-                      ])) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 1 }, [
-                        vue.createElementVNode("div", _hoisted_10, vue.toDisplayString(item.name), 1),
-                        item.address ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_11, vue.toDisplayString(item.address), 1)) : vue.createCommentVNode("", true)
+                      !item.name && !item.address ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
+                        vue.createElementVNode("div", _hoisted_9, [
+                          vue.createElementVNode("span", null, vue.toDisplayString(item.lng), 1),
+                          _cache[2] || (_cache[2] = vue.createElementVNode("span", null, ",", -1)),
+                          vue.createElementVNode("span", null, vue.toDisplayString(item.lat), 1)
+                        ]),
+                        item.city && (item.city.province || item.city.city || item.city.district) ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_10, [
+                          item.city.province ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_11, vue.toDisplayString(item.city.province), 1)) : vue.createCommentVNode("", true),
+                          item.city.city ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_12, vue.toDisplayString(item.city.city), 1)) : vue.createCommentVNode("", true),
+                          item.city.district ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_13, vue.toDisplayString(item.city.district), 1)) : vue.createCommentVNode("", true)
+                        ])) : vue.createCommentVNode("", true)
+                      ], 64)) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 1 }, [
+                        vue.createElementVNode("div", _hoisted_14, vue.toDisplayString(item.name), 1),
+                        item.address ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_15, vue.toDisplayString(item.address), 1)) : vue.createCommentVNode("", true)
                       ], 64))
                     ]),
                     vue.createVNode(vue.unref(elementPlus.ElIcon), { class: "ele-map-view-item-radio" }, {
@@ -671,12 +620,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                     })
                   ], 10, _hoisted_7);
                 }), 128)),
-                !data.value || !data.value.length ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_12, [
+                !data.value || !data.value.length ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_16, [
                   vue.createVNode(vue.unref(elementPlus.ElEmpty), vue.mergeProps({ imageSize: 80 }, _ctx.emptyProps || {}), null, 16)
                 ])) : vue.createCommentVNode("", true)
               ], 512),
-              vue.createElementVNode("div", _hoisted_13, [
-                confirmDisabled.value && _ctx.message ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_14, vue.toDisplayString(_ctx.message), 1)) : (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElButton), {
+              vue.createElementVNode("div", _hoisted_17, [
+                confirmDisabled.value && _ctx.message ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_18, vue.toDisplayString(_ctx.message), 1)) : (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElButton), {
                   key: 1,
                   type: "primary",
                   loading: confirmLoading.value,