mrxy-yk 1.6.0-beta.7 → 1.6.0

package/dist/components/coordinate-pickup/CoordinatePickup.vue.js

@@ -30,14 +30,14 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     const mapKey = props.mapKey || AMapConfig.mapKey;
     const mapSecret = props.mapSecret || AMapConfig.mapSecret;
     watch(() => props.modelValue, (nv) => {
-      if (nv && !aMapHook.value.map) {
+      if (nv && !aMapHook.map) {
         nextTick(() => {
           loadAMap();
         });
       } else {
         placeSearch.clear();
         showMarker(props.lnglat, props.address);
-        emits("open", aMapHook.value.map);
+        emits("open", aMapHook.map);
       }
     });
     const changeDialogCustomer = computed({
@@ -74,8 +74,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }, loadAMap);
     function loadAMap() {
-      const AMap = aMapHook.value.AMap;
-      const map = aMapHook.value.map;
+      const AMap = aMapHook.AMap;
+      const map = aMapHook.map;
       satelliteLayer = new AMap["TileLayer"].Satellite();
       map.on("click", clickHandler);
       autoComplete = new AMap["Autocomplete"]({ city: "全国" });
@@ -92,7 +92,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       showMarker(lnglat, address);
     };
     onUnmounted(function() {
-      const map = aMapHook.value.map;
+      const map = aMapHook.map;
       if (map) {
         map.off("click", clickHandler);
         map.destroy();
@@ -166,7 +166,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     }
     let marker = null;
     function showMarker(lnglat, address) {
-      const { map, AMap } = aMapHook.value;
+      const { map, AMap } = aMapHook;
       if (lnglat) {
         const position = lnglat.split(",");
         if (marker) {
@@ -186,7 +186,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     let satelliteLayer = null;
     const isSatelliteLayer = ref(false);
     function setSatelliteLayer() {
-      const { map } = aMapHook.value;
+      const { map } = aMapHook;
       if (isSatelliteLayer.value) {
         map.add(satelliteLayer);
       } else {

package/dist/utils/amap/index.d.ts

@@ -1,6 +1,6 @@
 import { AMapClassProxy, LoaderOptions, UseAMapHookExample, UseAMapHookOptions } from './type';
 import { AMap } from './@type/index';
-import { TemplateRef, ShallowRef } from 'vue';
+import { ShallowRef, TemplateRef } from 'vue';
 export * from './utils';
 export declare function useAMapLoader(options?: LoaderOptions): Promise<AMap>;
 /**
@@ -41,4 +41,4 @@ export declare function newAMapInfoWindow(options: ConstructorParameters<typeof
  * @param options
  * @param callback
  */
-export declare function useAMapClassicHook(options: UseAMapHookOptions, callback?: (res: ShallowRef<UseAMapHookExample>) => void): ShallowRef<UseAMapHookExample>;
+export declare function useAMapClassicHook(options: UseAMapHookOptions, callback?: (res: UseAMapHookExample) => void): UseAMapHookExample;

package/dist/utils/amap/index.js

@@ -1,6 +1,6 @@
 import AMapLoader from "@amap/amap-jsapi-loader";
 import { AMapConfig } from "../../config/index.js";
-import { shallowRef, onMounted, useTemplateRef, onBeforeUnmount, toValue } from "vue";
+import { onMounted, shallowRef, useTemplateRef, onBeforeUnmount, toValue } from "vue";
 async function useAMapLoader(options) {
   const o = options || {};
   const win = window;
@@ -64,7 +64,7 @@ function newAMapInfoWindow(options, AMap) {
 }
 function useAMapClassicHook(options, callback) {
   const o = options;
-  const retRes = shallowRef({});
+  const retRes = {};
   let map = null;
   onMounted(async () => {
     const mapPlugins = /* @__PURE__ */ new Set(["AMap.MarkerCluster", ...o?.plugins || [], ...o?.loaderOptions?.plugins || []]);
@@ -72,7 +72,7 @@ function useAMapClassicHook(options, callback) {
       ...o?.loaderOptions,
       plugins: [...mapPlugins]
     });
-    retRes.value.AMap = AMap;
+    retRes.AMap = AMap;
     let elRef = shallowRef();
     if (typeof o.el === "string") {
       elRef = useTemplateRef(o.el);
@@ -85,8 +85,9 @@ function useAMapClassicHook(options, callback) {
       mapStyle: o.mapStyle,
       opts: mapOptions
     }, AMap);
+    retRes.map = map;
     const markerClusterOptions = typeof o?.markerClusterOpts === "function" ? o.markerClusterOpts() : o.markerClusterOpts;
-    const markerCluster = newAMapMarkerCluster({
+    retRes.markerCluster = newAMapMarkerCluster({
       map,
       markerClusterOptions: {
         renderMarker: o.renderMarker,
@@ -103,18 +104,12 @@ function useAMapClassicHook(options, callback) {
       }
     }
     const infoWindowOptions = typeof o?.infoWindowOpts === "function" ? o.infoWindowOpts() : o.infoWindowOpts;
-    const infoWindow = newAMapInfoWindow({
+    retRes.infoWindow = newAMapInfoWindow({
       isCustom: true,
       closeWhenClickMap: true,
       content: infoRef.value,
       ...infoWindowOptions
     }, AMap);
-    retRes.value = {
-      map,
-      markerCluster,
-      infoWindow,
-      AMap
-    };
     callback?.(retRes);
   });
   onBeforeUnmount(() => {

package/dist/utils/fn-periodically/FnPeriodically.js

@@ -20,8 +20,9 @@ class FnPeriodically {
   // Vue中在onBeforeUnmount事件中销毁
   isUnmountStop = false;
   constructor(option) {
-    Object.assign(this, option);
-    if (option.run === true) this.state = 1;
+    const { run, ...rest } = option;
+    Object.assign(this, rest);
+    if (run === true) this.state = 1;
     if (this.state === 1) this.run(this.immediate, this.arg);
     if (this.isUnmountStop) {
       onBeforeUnmount(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mrxy-yk",
-  "version": "1.6.0-beta.7",
+  "version": "1.6.0",
   "private": false,
   "type": "module",
   "description": "A collection of Vue 3 components and utilities",