mrxy-yk 1.2.7 → 1.2.8

package/dist/components/coordinate-pickup/CoordinatePickup.d.ts

@@ -11,16 +11,16 @@ type __VLS_Props = {
 };
 declare const _default: DefineComponent<__VLS_Props, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
     change: (...args: any[]) => void;
+    open: (...args: any[]) => void;
     "update:modelValue": (...args: any[]) => void;
     "update:lnglat": (...args: any[]) => void;
     "update:address": (...args: any[]) => void;
-    open: (...args: any[]) => void;
 }, string, PublicProps, Readonly<__VLS_Props> & Readonly<{
     onChange?: (...args: any[]) => any;
+    onOpen?: (...args: any[]) => any;
     "onUpdate:modelValue"?: (...args: any[]) => any;
     "onUpdate:lnglat"?: (...args: any[]) => any;
     "onUpdate:address"?: (...args: any[]) => any;
-    onOpen?: (...args: any[]) => any;
 }>, {
     regeocodeRequired: boolean;
 }, {}, {}, {}, string, ComponentProvideOptions, false, {

package/dist/index.js

@@ -7,7 +7,7 @@ import { useEmptyHooks } from "./components/empty/hooks/index.js";
 import { MatchUnit } from "./utils/match-unit/index.js";
 import { TransitionFade } from "./utils/transition-fade/index.js";
 import { echarts } from "./utils/echarts/index.js";
-import { AMapLoader, useAMapLoader, useAMapMap, useAMapMarkerCluster } from "./utils/amap/index.js";
+import { AMapLoader, newAMapInfoWindow, newAMapMap, newAMapMarkerCluster, useAMapLoader } from "./utils/amap/index.js";
 import { Pages } from "./entity/Pages.js";
 import { BigFloat } from "./entity/BigFloat.js";
 import { RejectError } from "./entity/RejectError.js";
@@ -83,6 +83,9 @@ export {
   integerTag,
   ipRule,
   ipTag,
+  newAMapInfoWindow,
+  newAMapMap,
+  newAMapMarkerCluster,
   numberRule,
   numberTag,
   passwordRule,
@@ -97,8 +100,6 @@ export {
   positiveNumberTag,
   required,
   useAMapLoader,
-  useAMapMap,
-  useAMapMarkerCluster,
   useEChartsRef,
   useEcBarOption,
   useEcBasicOption,

package/dist/styles/index.css

@@ -1 +1 @@
-.yk-position-anchor{position:absolute;width:0;height:0;display:flex}.yk-position-anchor.position-anchor--center{justify-content:center;align-items:center}.yk-position-anchor.position-anchor--top-left{justify-content:left;align-items:flex-start}.yk-position-anchor.position-anchor--top-right{justify-content:right;align-items:flex-start}.yk-position-anchor.position-anchor--bottom-left{justify-content:left;align-items:flex-end}.yk-position-anchor.position-anchor--bottom-right{justify-content:right;align-items:flex-end}.yk-position-anchor.position-anchor--bottom{justify-content:center;align-items:flex-end}.yk-position-anchor.position-anchor--top{justify-content:center;align-items:flex-start}.yk-position-anchor.position-anchor--right{justify-content:flex-end;align-items:center}.yk-position-anchor.position-anchor--left{justify-content:flex-start;align-items:center}.yk-progress-ring{display:block}.yk-progress-ring circle{transform-box:fill-box;transform-origin:center;transition:all var(--duration) ease-in-out}.yk-adaptive-box .adaptive-box__body{overflow:hidden;margin-left:auto;margin-right:auto}.yk-adaptive-box .adaptive-box__content{transform-origin:left top;width:fit-content;--adaptive-height: initial}.yk-coordinate-pickup-autocomplete li{margin-bottom:8px}.yk-coordinate-pickup-autocomplete .autocomplete-subtitle{font-size:12px;color:var(--el-text-color-secondary);line-height:12px}.yk-coordinate-pickup-form .el-form-item{margin-right:16px}.coordinate-pickup{height:50vh;min-height:400px;max-height:920px}.amap-content-body,.amap-content-body .amap-lib-infowindow{background:inherit}.yk-drag-drop-box{position:absolute}.yk-drag-drop-container .drag-drop-content{width:fit-content;height:fit-content}.yk-progress-bar{position:relative;display:flex;align-items:center}.yk-progress-bar .progress-dot{width:0;display:flex;justify-content:center;align-items:center;position:absolute;transition:all .5s}.yk-ys-video .icon--replay{display:flex;align-items:center;justify-content:center;font-size:20px;margin-top:4px}.yk-ys-video .icon--replay .icon--btn{color:#fff}.yk-ys-video .icon--replay .icon--btn.is-active{color:#157edf}.yk-ys-video{overflow:hidden;width:100%;height:100%;position:relative}.yk-ys-video .video-container{width:100%;height:100%}.yk-ys-video .icon--replay{position:absolute;top:0;right:64px}.yk-ys-video .header-controls div:nth-child(2) .theme-icon-item{width:32px!important;display:flex;justify-content:center;align-items:center;padding-top:6px}.yk-ys-video .header-controls div:nth-child(2) .theme-icon-item svg{height:48px!important;width:48px!important}.yk-ys-video .header-controls div:nth-child(2) .theme-icon-item:last-child{padding-left:16px}.yk-ys-video .play-mask{position:absolute;width:100%;height:100%;display:flex;align-items:center;justify-content:center;background-color:#626365;background-repeat:no-repeat;background-size:100% 100%;top:0;left:0}.yk-ys-video .play-mask .header{position:absolute;height:20%;inset:0 auto auto 0;min-height:48px;background:linear-gradient(to bottom,#0008 0,#0006 30%,#0003 50%,#0000);padding:10px 8px;width:100%}.yk-ys-video .play-mask .header .title-box{max-width:50%;height:48px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:#fff}.yk-ys-video .play-mask .play-btn{cursor:pointer}.yk-show-log{background:#fff;border-radius:5px;padding:10px;-webkit-user-select:none;user-select:none;box-shadow:0 2px 4px #ccc;min-width:150px}.yk-show-log.is-min{overflow:hidden}.yk-show-log .show-log__header{display:flex;align-items:center;justify-content:space-between}.yk-show-log .show-log--icon{cursor:pointer}.yk-empty{position:relative;--yk-empty-description-font-size: var(--el-font-size-base, 14px);--yk-empty-description-color: var(--el-text-color-secondary, #909399);--yk-empty-description-margin-top: var(--el-empty-description-margin-top, 20px);--yk-empty-bottom-margin-top: var(--el-empty-bottom-margin-top, 20px);--yk-empty-image-opacity: 1;--yk-empty-image-hue-rotate: 0deg}.yk-empty .empty_content{width:100%;height:100%}.yk-empty .empty_content.is-hide{opacity:0}.yk-empty .empty_error{width:100%;height:100%;position:absolute;z-index:5;display:flex;flex-direction:column;justify-content:center;align-items:center}.yk-empty .empty_error .empty__image{background-repeat:no-repeat;background-position:center;background-size:contain;width:var(--yk-empty-image-size);height:var(--yk-empty-image-size);opacity:var(--yk-empty-image-opacity);filter:hue-rotate(var(--yk-empty-image-hue-rotate))}.yk-empty .empty_error .empty__description{font-size:var(--yk-empty-description-font-size);color:var(--yk-empty-description-color);margin-top:var(--yk-empty-description-margin-top)}.yk-empty .empty_error .empty__bottom{margin-top:var(--yk-empty-bottom-margin-top)}.yk-echarts-canvas{position:relative;container-type:size}.yk-echarts-canvas .echarts-empty{position:absolute;width:100%;height:100%;z-index:999}.yk-echarts-canvas .echarts-slot-default{position:absolute;width:100%;height:100%;top:0}.yk-echarts-canvas .echarts-canvas__inner{width:100%;height:100%;position:absolute;z-index:2}.yk-echarts-canvas .echarts-canvas__inner.is-empty{opacity:0}.yk-scroll-container{overflow:auto}.yk-scroll-container::-webkit-scrollbar{width:0;height:0}.yk-scroll-container .scroll-inner{display:flex;width:100%;flex-direction:column}.yk-pagination{padding:16px 0 8px}.yk-pagination .el-pagination{--el-pagination-bg-color: transparent;--el-pagination-button-disabled-bg-color: transparent}.yk-upload-image{margin-bottom:-8px}.yk-upload-image.limit_is-max .el-upload-list--picture-card .el-upload--picture-card{display:none}.yk-upload-image .el-upload-list--picture-card .el-upload-list__item{width:var(--upload-size-w);height:var(--upload-size-h)}.yk-upload-image .el-upload-list--picture-card .el-upload-list__item.is-success:focus:not(:hover) .el-icon--close-tip{display:none!important}.yk-upload-image .el-upload-list--picture-card .el-upload-list__item.is-success:focus .el-upload-list__item-status-label{display:inline-flex;opacity:1}.yk-upload-image .el-upload-list--picture-card .el-upload--picture-card{margin-bottom:8px;width:var(--upload-size-w);height:var(--upload-size-h)}.yk-upload-files .el-upload.is-drag{width:var(--upload-size-w);height:var(--upload-size-h)}.yk-upload-files .el-upload .el-upload-dragger{padding:unset;height:100%;display:flex;justify-content:center;align-items:center;flex-direction:column}.yk-upload-files .el-upload-list{margin:unset}.yk-upload-files .drag-default{display:flex;justify-content:center;align-items:center;flex-direction:column;width:100%;height:100%}.yk-upload-files .drag-default .tip-text{font-size:12px}.yk-upload-file :deep(.el-upload-list){margin:unset}.yk-images{display:flex;flex-wrap:wrap;gap:8px}.yk-images :deep(.el-image){width:var(--size-w);height:var(--size-h)}
+.yk-position-anchor{position:absolute;width:0;height:0;display:flex}.yk-position-anchor.position-anchor--center{justify-content:center;align-items:center}.yk-position-anchor.position-anchor--top-left{justify-content:left;align-items:flex-start}.yk-position-anchor.position-anchor--top-right{justify-content:right;align-items:flex-start}.yk-position-anchor.position-anchor--bottom-left{justify-content:left;align-items:flex-end}.yk-position-anchor.position-anchor--bottom-right{justify-content:right;align-items:flex-end}.yk-position-anchor.position-anchor--bottom{justify-content:center;align-items:flex-end}.yk-position-anchor.position-anchor--top{justify-content:center;align-items:flex-start}.yk-position-anchor.position-anchor--right{justify-content:flex-end;align-items:center}.yk-position-anchor.position-anchor--left{justify-content:flex-start;align-items:center}.yk-progress-ring{display:block}.yk-progress-ring circle{transform-box:fill-box;transform-origin:center;transition:all var(--duration) ease-in-out}.yk-adaptive-box .adaptive-box__body{overflow:hidden;margin-left:auto;margin-right:auto}.yk-adaptive-box .adaptive-box__content{transform-origin:left top;width:fit-content;--adaptive-height: initial}.yk-coordinate-pickup-autocomplete li{margin-bottom:8px}.yk-coordinate-pickup-autocomplete .autocomplete-subtitle{font-size:12px;color:var(--el-text-color-secondary);line-height:12px}.yk-coordinate-pickup-form .el-form-item{margin-right:16px}.coordinate-pickup{height:50vh;min-height:400px;max-height:920px}.amap-content-body,.amap-content-body .amap-lib-infowindow{background:inherit}.yk-drag-drop-box{position:absolute}.yk-drag-drop-container .drag-drop-content{width:fit-content;height:fit-content}.yk-progress-bar{position:relative;display:flex;align-items:center}.yk-progress-bar .progress-dot{width:0;display:flex;justify-content:center;align-items:center;position:absolute;transition:all .5s}.yk-ys-video .icon--replay{display:flex;align-items:center;justify-content:center;font-size:20px;margin-top:4px}.yk-ys-video .icon--replay .icon--btn{color:#fff}.yk-ys-video .icon--replay .icon--btn.is-active{color:#157edf}.yk-ys-video{overflow:hidden;width:100%;height:100%;position:relative}.yk-ys-video .video-container{width:100%;height:100%}.yk-ys-video .icon--replay{position:absolute;top:0;right:64px}.yk-ys-video .header-controls div:nth-child(2) .theme-icon-item{width:32px!important;display:flex;justify-content:center;align-items:center;padding-top:6px}.yk-ys-video .header-controls div:nth-child(2) .theme-icon-item svg{height:48px!important;width:48px!important}.yk-ys-video .header-controls div:nth-child(2) .theme-icon-item:last-child{padding-left:16px}.yk-ys-video .play-mask{position:absolute;width:100%;height:100%;display:flex;align-items:center;justify-content:center;background-color:#626365;background-repeat:no-repeat;background-size:100% 100%;top:0;left:0}.yk-ys-video .play-mask .header{position:absolute;height:20%;inset:0 auto auto 0;min-height:48px;background:linear-gradient(to bottom,#0008 0,#0006 30%,#0003 50%,#0000);padding:10px 8px;width:100%}.yk-ys-video .play-mask .header .title-box{max-width:50%;height:48px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:#fff}.yk-ys-video .play-mask .play-btn{cursor:pointer}.yk-show-log{background:#fff;border-radius:5px;padding:10px;-webkit-user-select:none;user-select:none;box-shadow:0 2px 4px #ccc;min-width:150px}.yk-show-log.is-min{overflow:hidden}.yk-show-log .show-log__header{display:flex;align-items:center;justify-content:space-between}.yk-show-log .show-log--icon{cursor:pointer}.yk-empty{position:relative;--yk-empty-description-font-size: var(--el-font-size-base, 14px);--yk-empty-description-color: var(--el-text-color-secondary, #909399);--yk-empty-description-margin-top: var(--el-empty-description-margin-top, 20px);--yk-empty-bottom-margin-top: var(--el-empty-bottom-margin-top, 20px);--yk-empty-image-opacity: 1;--yk-empty-image-hue-rotate: 0deg}.yk-empty .empty_content{width:100%;height:100%}.yk-empty .empty_content.is-hide{opacity:0}.yk-empty .empty_error{width:100%;height:100%;position:absolute;z-index:5;display:flex;flex-direction:column;justify-content:center;align-items:center}.yk-empty .empty_error .empty__image{background-repeat:no-repeat;background-position:center;background-size:contain;width:var(--yk-empty-image-size);height:var(--yk-empty-image-size);opacity:var(--yk-empty-image-opacity);filter:hue-rotate(var(--yk-empty-image-hue-rotate))}.yk-empty .empty_error .empty__description{font-size:var(--yk-empty-description-font-size);color:var(--yk-empty-description-color);margin-top:var(--yk-empty-description-margin-top)}.yk-empty .empty_error .empty__bottom{margin-top:var(--yk-empty-bottom-margin-top)}.yk-echarts-canvas{position:relative;container-type:size}.yk-echarts-canvas .echarts-empty{position:absolute;width:100%;height:100%;z-index:999}.yk-echarts-canvas .echarts-slot-default{position:absolute;width:100%;height:100%;top:0}.yk-echarts-canvas .echarts-canvas__inner{width:100%;height:100%;position:absolute;z-index:2}.yk-echarts-canvas .echarts-canvas__inner.is-empty{opacity:0}.yk-scroll-container{overflow:auto}.yk-scroll-container::-webkit-scrollbar{width:0;height:0}.yk-scroll-container .scroll-inner{display:flex;width:100%;flex-direction:column}.yk-pagination{padding:16px 0 8px}.yk-pagination .el-pagination{--el-pagination-bg-color: transparent;--el-pagination-button-disabled-bg-color: transparent}.yk-upload-image{margin-bottom:-8px}.yk-upload-image.limit_is-max .el-upload-list--picture-card .el-upload--picture-card{display:none}.yk-upload-image .el-upload-list--picture-card .el-upload-list__item{width:var(--upload-size-w);height:var(--upload-size-h)}.yk-upload-image .el-upload-list--picture-card .el-upload-list__item.is-success:focus:not(:hover) .el-icon--close-tip{display:none!important}.yk-upload-image .el-upload-list--picture-card .el-upload-list__item.is-success:focus .el-upload-list__item-status-label{display:inline-flex;opacity:1}.yk-upload-image .el-upload-list--picture-card .el-upload--picture-card{margin-bottom:8px;width:var(--upload-size-w);height:var(--upload-size-h)}.yk-upload-files .el-upload.is-drag{width:var(--upload-size-w);height:var(--upload-size-h)}.yk-upload-files .el-upload .el-upload-dragger{padding:unset;height:100%;display:flex;justify-content:center;align-items:center;flex-direction:column}.yk-upload-files .el-upload-list{margin:unset}.yk-upload-files .drag-default{display:flex;justify-content:center;align-items:center;flex-direction:column;width:100%;height:100%}.yk-upload-files .drag-default .tip-text{font-size:12px}.yk-upload-file .el-upload-list{margin:unset}.yk-images{display:flex;flex-wrap:wrap;gap:8px}.yk-images .el-image{width:var(--size-w);height:var(--size-h)}

package/dist/utils/amap/@type/AMap.d.ts

@@ -9,6 +9,7 @@ import { InfoWindow as _InfoWindow } from './InfoWindow';
 import { Icon as _Icon } from './Icon';
 import { MarkerCluster as _MarkerCluster } from './MarkerCluster';
 import { Polyline as _Polyline } from './Polyline';
+import { Weather as _Weather } from './Weather';
 export namespace AMap {
   export class Map extends _Map {}
   export class LngLat extends _LngLat {}
@@ -21,5 +22,6 @@ export namespace AMap {
   export class Icon extends _Icon {}
   export class MarkerCluster extends _MarkerCluster {}
   export class Polyline extends _Polyline {}
+  export class Weather extends _Weather {}
 }
 export type AMap = typeof AMap

package/dist/utils/amap/@type/MarkerCluster.d.ts

@@ -56,7 +56,7 @@ interface MarkerClusterEvent {
   click: { cluster: any, target: any, lnglat: AMap.LngLat, markers: AMap.Marker }
 }
 
-interface RenderMarkerCallbackParams {
+export interface RenderMarkerCallbackParams {
   count: number,
   marker: AMap.Marker,
   data: {

package/dist/utils/amap/@type/Weather.d.ts

@@ -0,0 +1,57 @@
+import { AMap } from './AMap';
+import { Event } from './Event';
+export class Weather extends Event<WeatherEvent> {
+  getLive(city: string, callback: (result: WeatherLiveResult) => void): void
+
+  getForecast(city: string, callback: (result: WeatherForecastResult) => void): void
+}
+
+interface WeatherLiveResult {
+  err: any
+  LiveData : LiveData
+}
+
+interface LiveData {
+  info: string
+  province: string
+  city: string
+  adcode: string
+  weather: string
+  temperature: string
+  windDirection: string
+  windPower: string
+  humidity: string
+  reportTime: string
+}
+
+interface WeatherForecastResult {
+  err: any
+  ForecastData : ForecastData
+}
+
+interface ForecastData {
+  info: string
+  province: string
+  city: string
+  adcode: string
+  reportTime: string
+  forecast: Forecast[]
+}
+
+interface Forecast {
+  date: string
+  week: string
+  dayWeather: string
+  nightWeather: string
+  dayTemp: string
+  nightTemp: string
+  dayWindDir: string
+  dayWindPower: string
+  nightWindPower: string
+}
+
+// region Event
+type WeatherEventType = 'error' | 'complete'
+
+type WeatherEvent = Record<WeatherEventType, unknown>
+// endregion

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

@@ -1,15 +1,38 @@
-import { AMapClassProxy, AMapResolve, LoaderOptions, LoaderOptions1 } from './type';
-import { AMap } from './@type';
+import { AMapClassProxy, LoaderOptions, LoaderOptions1, AMapResolve } from './type';
+import { AMap } from './@type/index';
+import { TemplateRef, ShallowRef } from 'vue';
 export * from './utils';
-export declare function useAMapLoader(options: LoaderOptions): Promise<AMap>;
-export declare function useAMapMap(options: {
-    el: string | HTMLDivElement;
+export declare function useAMapLoader(options?: LoaderOptions): Promise<AMap>;
+/**
+ * 可以在`AMap`不存在的时候先预创建`AMap.Map`对象，
+ * 当`AMapLoader`加载完成获取到`AMap`后调用`setAMap`函数将预创建对象更新成实例对象；
+ * 里面可能对默认配置进行常用性调整；
+ * @param options
+ * @param AMap { AMap } AMap存在时可以传入跳过`setAMap`过程
+ */
+export declare function newAMapMap(options: {
+    el: string | HTMLDivElement | ShallowRef<HTMLDivElement> | TemplateRef<HTMLDivElement>;
     mapStyle?: string;
     opts?: ConstructorParameters<typeof AMap.Map>[1];
-}): AMapClassProxy<AMap.Map>;
-export declare function useAMapMarkerCluster(options: {
+}, AMap?: AMap): AMapClassProxy<AMap.Map>;
+/**
+ * 可以在`AMap`不存在的时候先预创建`AMap.MarkerCluster`对象，
+ * 当`AMapLoader`加载完成获取到`AMap`后调用`setAMap`函数将预创建对象更新成实例对象；
+ * 里面可能对默认配置进行常用性调整；
+ * @param options
+ * @param AMap { AMap } AMap存在时可以传入跳过`setAMap`过程
+ */
+export declare function newAMapMarkerCluster(options: {
     map: AMap.Map;
     dataOptions?: ConstructorParameters<typeof AMap.MarkerCluster>[1];
     markerClusterOptions?: ConstructorParameters<typeof AMap.MarkerCluster>[2];
-}): AMapClassProxy<AMap.MarkerCluster>;
+}, AMap?: AMap): AMapClassProxy<AMap.MarkerCluster>;
+/**
+ * 可以在`AMap`不存在的时候先预创建`AMap.InfoWindow`对象，
+ * 当`AMapLoader`加载完成获取到`AMap`后调用`setAMap`函数将预创建对象更新成实例对象；
+ * 里面可能对默认配置进行常用性调整；
+ * @param options
+ * @param AMap { AMap } AMap存在时可以传入跳过`setAMap`过程
+ */
+export declare function newAMapInfoWindow(options: ConstructorParameters<typeof AMap.InfoWindow>[0], AMap?: AMap): AMapClassProxy<AMap.InfoWindow>;
 export declare function AMapLoader(options: LoaderOptions1): Promise<AMapResolve>;

package/dist/utils/amap/index.js

@@ -1,7 +1,8 @@
 import _AMapLoader from "@amap/amap-jsapi-loader";
 import { AMapConfig } from "../../config/index.js";
+import { toValue } from "vue";
 async function useAMapLoader(options) {
-  const o = options;
+  const o = options || {};
   const win = window;
   win._AMapSecurityConfig = { securityJsCode: o.secret || AMapConfig.mapSecret };
   return await _AMapLoader.load({
@@ -11,12 +12,12 @@ async function useAMapLoader(options) {
     ...o.loadOption
   });
 }
-function proxyAMapClass(createAMapClass) {
-  let proxy = null;
+function createAMapClassProxy(createAMapClass, AMap) {
+  let proxy = AMap ? createAMapClass(AMap) : null;
   return new Proxy({
-    setAMap(AMap) {
+    setAMap(AMap2) {
       if (!proxy) {
-        proxy = createAMapClass(AMap);
+        proxy = createAMapClass(AMap2);
       }
     }
   }, {
@@ -26,29 +27,40 @@ function proxyAMapClass(createAMapClass) {
     set(target, prop, newValue, receiver) {
       proxy[prop] = newValue;
       return true;
+    },
+    getPrototypeOf(target) {
+      return proxy ? proxy.constructor.prototype : null;
     }
   });
 }
-function useAMapMap(options) {
+function newAMapMap(options, AMap) {
   const o = options;
-  return proxyAMapClass((AMap) => {
-    return new AMap.Map(options.el, {
+  return createAMapClassProxy((AMap2) => {
+    return new AMap2.Map(toValue(o.el), {
       mapStyle: o.mapStyle,
       ...o.opts
     });
-  });
+  }, AMap);
 }
-function useAMapMarkerCluster(options) {
+function newAMapMarkerCluster(options, AMap) {
   const o = options;
   const markerClusterOptions = Object.assign({
     gridSize: 50,
     maxZoom: 13
   }, o.markerClusterOptions);
-  return proxyAMapClass((AMap) => {
-    return new AMap.MarkerCluster(o.map, o.dataOptions || [], {
+  return createAMapClassProxy((AMap2) => {
+    return new AMap2.MarkerCluster(o.map, o.dataOptions || [], {
       ...markerClusterOptions
     });
-  });
+  }, AMap);
+}
+function newAMapInfoWindow(options, AMap) {
+  const o = Object.assign({
+    closeWhenClickMap: true
+  }, options);
+  return createAMapClassProxy((AMap2) => {
+    return new AMap2.InfoWindow(o);
+  }, AMap);
 }
 async function AMapLoader(options) {
   const o = options;
@@ -68,7 +80,8 @@ async function AMapLoader(options) {
 }
 export {
   AMapLoader,
-  useAMapLoader,
-  useAMapMap,
-  useAMapMarkerCluster
+  newAMapInfoWindow,
+  newAMapMap,
+  newAMapMarkerCluster,
+  useAMapLoader
 };

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

@@ -1,19 +1,41 @@
 import { AMap, AMapType } from './@type/AMap';
 import { LoadOption } from './@type';
 import { MapOptions } from './@type/Map';
+import { RenderMarkerCallbackParams } from './@type/MarkerCluster';
+type PluginsType = 'AMap.MarkerCluster' | 'AMap.Weather' | string
+
 export type LoaderOptions = {
   // key 高德地图key（缺省使用全局配置）
-  key?: string,
+  key?: string
   // secret 高德地图secret（缺省使用全局配置）
-  secret?: string,
+  secret?: string
   // plugins 插件列表
-  plugins?: string[],
+  plugins?: PluginsType[]
   // loadOption 加载选项
-  loadOption?: LoadOption,
+  loadOption?: LoadOption
 }
 
 export type AMapClassProxy<T> = T & { setAMap (AMap: AMap): void }
 
+// region useAMapHook
+export type UseAMapHookOptions = {
+  el: ShallowRef<HTMLDivElement>
+  mapStyle?: string
+  renderMarker? (e: RenderMarkerCallbackParams): void
+  renderClusterMarker? (count: number, marker: AMap.Marker): void
+  infoWindowContent: ShallowRef<HTMLDivElement>
+  mapOpts?: ConstructorParameters<typeof AMap.Map>[1]
+  markerClusterOpts?: ConstructorParameters<typeof AMap.MarkerCluster>[2]
+}
+
+export type UseAMapHookExample = {
+  map: AMap.Map
+  markerCluster: AMap.MarkerCluster
+  infoWindow: AMap.InfoWindow
+  AMap: AMap
+}
+// endregion
+
 export type LoaderOptions1 = {
   // key 高德地图key（缺省使用全局配置）
   key?: string,

package/dist/utils/fn-periodically/FnBatchPeriodically.d.ts

@@ -11,10 +11,10 @@ export declare class FnBatchPeriodically {
     /**
      * 运行周期任务
      * @param key
-     * @param rightRun
+     * @param immediate 缺省值 true
      * @param arg
      */
-    run(key?: any, rightRun?: boolean, arg?: any[]): void;
+    run(key?: any, immediate?: boolean, arg?: any[]): void;
     /**
      * 停止周期任务
      * @param key

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

@@ -25,14 +25,14 @@ class FnBatchPeriodically {
   /**
    * 运行周期任务
    * @param key
-   * @param rightRun
+   * @param immediate 缺省值 true
    * @param arg
    */
-  run(key, rightRun = true, arg) {
+  run(key, immediate = true, arg) {
     if (key === void 0) {
-      this.fnPeriodicallyMap.forEach((item) => item.run(rightRun, arg));
+      this.fnPeriodicallyMap.forEach((item) => item.run(immediate, arg));
     } else {
-      this.fnPeriodicallyMap.get(key).run(rightRun, arg);
+      this.fnPeriodicallyMap.get(key).run(immediate, arg);
     }
   }
   /**

package/dist/utils/fn-periodically/FnPeriodically.d.ts

@@ -24,6 +24,11 @@ export declare class FnPeriodically {
      * @param arg
      */
     private runId;
+    /**
+     * 手动运行函数，循环周期的起点
+     * @param immediate 是否立即执行 缺省值 true
+     * @param arg
+     */
     run(immediate?: boolean, arg?: any[]): void;
     /**
      * 停止周期执行

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

@@ -51,6 +51,11 @@ class FnPeriodically {
    */
   // 每次运行的唯一标识，保证异步运行的时能够准确找到运行次序
   runId = 0;
+  /**
+   * 手动运行函数，循环周期的起点
+   * @param immediate 是否立即执行 缺省值 true
+   * @param arg
+   */
   run(immediate = true, arg) {
     this.arg = arg || [];
     this.state = 1;

package/dist/utils/fn-periodically/type.d.ts

@@ -9,13 +9,13 @@ export namespace FnPeriodicallyNamespace {
     fn(params?: FnCallbackParams, ...arg: any[]): Promise<unknown>,
     // 每次运行间隔
     delay: number
-    // 立即运行，不等待，否则先等待（timeout）再执行
+    // 立即运行，不等待，否则先等待（timeout）再执行，缺省值：true
     immediate?: boolean
-    // 开始运行
+    // 启动循环，缺省值：false
     run?: boolean
     // 向fn传递的参数
     arg?: any[]
-    // Vue中在onBeforeUnmount事件中销毁
+    // Vue中在onBeforeUnmount事件中销毁，缺省值：false
     isUnmountStop?: boolean
   }
 }
@@ -24,7 +24,7 @@ export namespace FnBatchPeriodicallyNamespace {
   export type AddOption = (FnPeriodically.ConstructorOption & { key?: string })
   export type FnPeriodicallyOptions = FnBatchPeriodicallyNamespace.AddOption[]
   export type ConstructorOption = {
-    // Vue中在onBeforeUnmount事件中销毁
+    // Vue中在onBeforeUnmount事件中销毁，缺省值：false
     isUnmountStop?: boolean
   }
 }

package/dist/utils/match-unit/type.d.ts

@@ -13,7 +13,7 @@ export type MatchStrLenOption = {
   desiredLen: number,
   // 保留的小数点位数
   fractionDigits: number,
-  // 是否包含符号，如"."，"-"
+  // 是否包含符号，如"."，"-"。缺省值：false
   containsSymbol?: boolean
 }
 

package/package.json

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

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "framework": "vue",
   "name": "mrxy-yk",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "js-types-syntax": "typescript",
   "contributions": {
     "html": {