jky-component-lib 0.0.145 → 0.0.147

package/dist/es/amap/AClusterMarker/AClusterMarker.vue.js

@@ -17,13 +17,14 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-import { defineComponent, useModel, inject, onMounted, watch, onUnmounted, renderSlot, mergeModels } from "vue";
+import { defineComponent, useModel, inject, computed, ref, onMounted, watch, onUnmounted, renderSlot, mergeModels } from "vue";
 const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({}, {
   name: "JkyAClusterMarker",
   inheritAttrs: false
 }), {
   __name: "AClusterMarker",
   props: /* @__PURE__ */ mergeModels({
+    map: {},
     points: {},
     gridSize: { default: 60 },
     styles: {},
@@ -44,25 +45,27 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
     const props = __props;
     const emit = __emit;
     const modelValue = useModel(__props, "modelValue");
-    const amapContext = inject("amapContext");
-    let clusterInstance = null;
-    let mapInstance = null;
+    const amapContext = inject("amapContext", null);
+    const mapInstance = computed(() => {
+      return props.map || (amapContext == null ? void 0 : amapContext.getMapInstance()) || null;
+    });
+    const clusterInstance = ref(null);
     onMounted(() => {
-      if ((amapContext == null ? void 0 : amapContext.map) && props.enable) {
-        initCluster(amapContext.map);
+      if (mapInstance.value && props.enable) {
+        initCluster();
       }
     });
-    function initCluster(map) {
+    function initCluster() {
+      const map = mapInstance.value;
       if (!map || !window.AMap)
         return;
-      mapInstance = map;
       if (!window.AMap.MarkerCluster) {
         console.warn("AMap.MarkerCluster 插件未加载，请先加载插件");
         return;
       }
-      if (clusterInstance) {
-        clusterInstance.setMap(null);
-        clusterInstance = null;
+      if (clusterInstance.value) {
+        clusterInstance.value.setMap(null);
+        clusterInstance.value = null;
       }
       const points = preparePoints();
       const clusterOptions = {
@@ -71,7 +74,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
         minClusterSize: props.minClusterSize,
         averageCenter: props.averageCenter
       };
-      if (props.styles && props.styles.length > 0) {
+      if (props.renderClusterMarker || props.renderMarker) {
+        clusterOptions.renderClusterMarker = props.renderClusterMarker;
+        clusterOptions.renderMarker = props.renderMarker;
+      } else if (props.styles && props.styles.length > 0) {
         clusterOptions.styles = props.styles.map((style) => ({
           url: style.url,
           size: style.size ? new window.AMap.Size(style.size[0], style.size[1]) : void 0,
@@ -80,23 +86,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
           textSize: style.textSize
         }));
       }
-      if (props.renderClusterMarker) {
-        clusterOptions.renderClusterMarker = props.renderClusterMarker;
-      }
-      if (props.renderMarker) {
-        clusterOptions.renderMarker = props.renderMarker;
-      }
-      clusterInstance = new window.AMap.MarkerCluster(map, points, clusterOptions);
-      clusterInstance.on("click", (cluster) => {
+      clusterInstance.value = new window.AMap.MarkerCluster(map, points, clusterOptions);
+      clusterInstance.value.on("click", (cluster) => {
         emit("click", cluster);
       });
-      clusterInstance.on("mouseover", (cluster) => {
+      clusterInstance.value.on("mouseover", (cluster) => {
         emit("mouseover", cluster);
       });
-      clusterInstance.on("mouseout", (cluster) => {
+      clusterInstance.value.on("mouseout", (cluster) => {
         emit("mouseout", cluster);
       });
-      emit("ready", clusterInstance);
+      emit("ready", clusterInstance.value);
     }
     function preparePoints() {
       const points = props.points || modelValue.value || [];
@@ -107,81 +107,70 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
       }, point.data));
     }
     function updatePoints(newPoints) {
-      if (!mapInstance)
+      if (!mapInstance.value)
         return;
       modelValue.value = newPoints;
-      initCluster(mapInstance);
+      initCluster();
     }
     function clearClusters() {
-      if (clusterInstance) {
-        clusterInstance.setMap(null);
+      if (clusterInstance.value) {
+        clusterInstance.value.setMap(null);
       }
     }
     function destroy() {
-      if (clusterInstance) {
-        clusterInstance.setMap(null);
-        clusterInstance = null;
+      if (clusterInstance.value) {
+        clusterInstance.value.setMap(null);
+        clusterInstance.value = null;
       }
     }
     __expose({
       updatePoints,
       clearClusters,
       destroy,
-      getClusterInstance: () => clusterInstance
+      getClusterInstance: () => clusterInstance.value
     });
     watch(
       () => props.points,
       (newPoints) => {
-        if (clusterInstance && newPoints) {
+        if (clusterInstance.value && newPoints) {
           updatePoints(newPoints);
         }
-      },
-      { deep: true }
+        console.warn("points 变化", newPoints);
+      }
+      // { deep: true },
     );
     watch(
       () => modelValue.value,
       (newValue) => {
-        if (clusterInstance && newValue) {
+        if (clusterInstance.value && newValue) {
           updatePoints(newValue);
         }
-      },
-      { deep: true }
+        console.warn("modelValue 变化", newValue);
+      }
+      // { deep: true },
     );
     watch(
       () => props.gridSize,
       () => {
-        if (mapInstance && props.enable) {
-          initCluster(mapInstance);
+        if (mapInstance.value && props.enable) {
+          initCluster();
         }
+        console.warn("gridSize 变化", props.gridSize);
       }
     );
     watch(
       () => props.styles,
       () => {
-        if (mapInstance && props.enable) {
-          initCluster(mapInstance);
-        }
-      },
-      { deep: true }
-    );
-    watch(
-      () => props.renderClusterMarker,
-      () => {
-        if (mapInstance && props.enable) {
-          initCluster(mapInstance);
-        }
-      }
-    );
-    watch(
-      () => props.renderMarker,
-      () => {
-        if (mapInstance && props.enable) {
-          initCluster(mapInstance);
+        if (mapInstance.value && props.enable) {
+          initCluster();
         }
+        console.warn("styles 变化", props.styles);
       }
+      // { deep: true },
     );
     onUnmounted(() => {
       destroy();
+      console.warn("组件卸载时清理聚合实例");
     });
     return (_ctx, _cache) => {
       return renderSlot(_ctx.$slots, "default");

package/dist/es/amap/style.css

@@ -1,7 +1,14 @@
+/* AMap 高德地图组件样式 */
+.jky-amap-container {
+  /* 地图容器样式 */
+  position: relative;
+  overflow: hidden;
 
-/* JkyAMarker 组件样式 - 参考高德官方示例 */
-.amap-icon img,
-.amap-marker-content img {
-  width: 25px;
-  height: 34px;
+  /* 隐藏高德地图的 logo 和版权信息（注意：商业使用请遵守高德地图条款） */
+.amap-logo {
+    display: none !important;
+}
+.amap-copyright {
+    display: none !important;
+}
 }

package/dist/es/amap/style2.css

@@ -1,3 +1,7 @@
 
-/* 轨迹回放组件不需要额外样式 */
-/* 所有样式通过 TailwindCSS 工具类或外部组件控制 */
+/* JkyAMarker 组件样式 - 参考高德官方示例 */
+.amap-icon img,
+.amap-marker-content img {
+  width: 25px;
+  height: 34px;
+}

package/dist/es/amap/style3.css

@@ -1,14 +1,3 @@
-/* AMap 高德地图组件样式 */
-.jky-amap-container {
-  /* 地图容器样式 */
-  position: relative;
-  overflow: hidden;
 
-  /* 隐藏高德地图的 logo 和版权信息（注意：商业使用请遵守高德地图条款） */
-.amap-logo {
-    display: none !important;
-}
-.amap-copyright {
-    display: none !important;
-}
-}
+/* 轨迹回放组件不需要额外样式 */
+/* 所有样式通过 TailwindCSS 工具类或外部组件控制 */

package/dist/es/package.json.js

@@ -1,4 +1,4 @@
-const version = "0.0.145";
+const version = "0.0.147";
 export {
   version
 };

package/dist/es/resolver.d.ts

@@ -2,5 +2,7 @@ import { ComponentResolver } from 'unplugin-vue-components';
 export interface JkyComponentLibResolverOptions {
     /** 不自动加载样式的组件白名单（组件名，不带 Jky 前缀） */
     excludeStyleList?: string[];
+    /** 自定义样式映射 */
+    styleMap?: Record<string, string>;
 }
 export declare function JkyComponentLibResolver(options?: JkyComponentLibResolverOptions): ComponentResolver;

package/dist/es/resolver.js

@@ -1,3 +1,19 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
 const defaultExcludeStyleList = [
   // AMap 相关子组件，共用 amap 目录的样式
   "AMapPicker",
@@ -11,9 +27,13 @@ const defaultExcludeStyleList = [
   "AMarkerCluster"
   // AClusterMarker 的常见误写
 ];
+const defaultStyleMap = {
+  AnimatedTransition: "animated"
+};
 function JkyComponentLibResolver(options = {}) {
-  const { excludeStyleList = [] } = options;
+  const { excludeStyleList = [], styleMap = {} } = options;
   const excludeStyleSet = /* @__PURE__ */ new Set([...defaultExcludeStyleList, ...excludeStyleList]);
+  const styleMapLib = __spreadValues(__spreadValues({}, defaultStyleMap), styleMap);
   return {
     type: "component",
     resolve: (name) => {
@@ -27,11 +47,12 @@ function JkyComponentLibResolver(options = {}) {
             // 白名单中的组件不自动加载样式
           };
         }
+        const stylePath = styleMapLib[componentName] || kebabName;
         return {
           name,
           from: "jky-component-lib",
           sideEffects: [
-            `jky-component-lib/dist/es/${kebabName}/style.css`
+            `jky-component-lib/dist/es/${stylePath}/style.css`
           ]
         };
       }

package/dist/lib/amap/AClusterMarker/AClusterMarker.vue.js

@@ -26,6 +26,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
 }), {
   __name: "AClusterMarker",
   props: /* @__PURE__ */ vue.mergeModels({
+    map: {},
     points: {},
     gridSize: { default: 60 },
     styles: {},
@@ -46,25 +47,27 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
     const props = __props;
     const emit = __emit;
     const modelValue = vue.useModel(__props, "modelValue");
-    const amapContext = vue.inject("amapContext");
-    let clusterInstance = null;
-    let mapInstance = null;
+    const amapContext = vue.inject("amapContext", null);
+    const mapInstance = vue.computed(() => {
+      return props.map || (amapContext == null ? void 0 : amapContext.getMapInstance()) || null;
+    });
+    const clusterInstance = vue.ref(null);
     vue.onMounted(() => {
-      if ((amapContext == null ? void 0 : amapContext.map) && props.enable) {
-        initCluster(amapContext.map);
+      if (mapInstance.value && props.enable) {
+        initCluster();
       }
     });
-    function initCluster(map) {
+    function initCluster() {
+      const map = mapInstance.value;
       if (!map || !window.AMap)
         return;
-      mapInstance = map;
       if (!window.AMap.MarkerCluster) {
         console.warn("AMap.MarkerCluster 插件未加载，请先加载插件");
         return;
       }
-      if (clusterInstance) {
-        clusterInstance.setMap(null);
-        clusterInstance = null;
+      if (clusterInstance.value) {
+        clusterInstance.value.setMap(null);
+        clusterInstance.value = null;
       }
       const points = preparePoints();
       const clusterOptions = {
@@ -73,7 +76,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
         minClusterSize: props.minClusterSize,
         averageCenter: props.averageCenter
       };
-      if (props.styles && props.styles.length > 0) {
+      if (props.renderClusterMarker || props.renderMarker) {
+        clusterOptions.renderClusterMarker = props.renderClusterMarker;
+        clusterOptions.renderMarker = props.renderMarker;
+      } else if (props.styles && props.styles.length > 0) {
         clusterOptions.styles = props.styles.map((style) => ({
           url: style.url,
           size: style.size ? new window.AMap.Size(style.size[0], style.size[1]) : void 0,
@@ -82,23 +88,17 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
           textSize: style.textSize
         }));
       }
-      if (props.renderClusterMarker) {
-        clusterOptions.renderClusterMarker = props.renderClusterMarker;
-      }
-      if (props.renderMarker) {
-        clusterOptions.renderMarker = props.renderMarker;
-      }
-      clusterInstance = new window.AMap.MarkerCluster(map, points, clusterOptions);
-      clusterInstance.on("click", (cluster) => {
+      clusterInstance.value = new window.AMap.MarkerCluster(map, points, clusterOptions);
+      clusterInstance.value.on("click", (cluster) => {
         emit("click", cluster);
       });
-      clusterInstance.on("mouseover", (cluster) => {
+      clusterInstance.value.on("mouseover", (cluster) => {
         emit("mouseover", cluster);
       });
-      clusterInstance.on("mouseout", (cluster) => {
+      clusterInstance.value.on("mouseout", (cluster) => {
         emit("mouseout", cluster);
       });
-      emit("ready", clusterInstance);
+      emit("ready", clusterInstance.value);
     }
     function preparePoints() {
       const points = props.points || modelValue.value || [];
@@ -109,81 +109,70 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
       }, point.data));
     }
     function updatePoints(newPoints) {
-      if (!mapInstance)
+      if (!mapInstance.value)
         return;
       modelValue.value = newPoints;
-      initCluster(mapInstance);
+      initCluster();
     }
     function clearClusters() {
-      if (clusterInstance) {
-        clusterInstance.setMap(null);
+      if (clusterInstance.value) {
+        clusterInstance.value.setMap(null);
       }
     }
     function destroy() {
-      if (clusterInstance) {
-        clusterInstance.setMap(null);
-        clusterInstance = null;
+      if (clusterInstance.value) {
+        clusterInstance.value.setMap(null);
+        clusterInstance.value = null;
       }
     }
     __expose({
       updatePoints,
       clearClusters,
       destroy,
-      getClusterInstance: () => clusterInstance
+      getClusterInstance: () => clusterInstance.value
     });
     vue.watch(
       () => props.points,
       (newPoints) => {
-        if (clusterInstance && newPoints) {
+        if (clusterInstance.value && newPoints) {
           updatePoints(newPoints);
         }
-      },
-      { deep: true }
+        console.warn("points 变化", newPoints);
+      }
+      // { deep: true },
     );
     vue.watch(
       () => modelValue.value,
       (newValue) => {
-        if (clusterInstance && newValue) {
+        if (clusterInstance.value && newValue) {
           updatePoints(newValue);
         }
-      },
-      { deep: true }
+        console.warn("modelValue 变化", newValue);
+      }
+      // { deep: true },
     );
     vue.watch(
       () => props.gridSize,
       () => {
-        if (mapInstance && props.enable) {
-          initCluster(mapInstance);
+        if (mapInstance.value && props.enable) {
+          initCluster();
         }
+        console.warn("gridSize 变化", props.gridSize);
       }
     );
     vue.watch(
       () => props.styles,
       () => {
-        if (mapInstance && props.enable) {
-          initCluster(mapInstance);
-        }
-      },
-      { deep: true }
-    );
-    vue.watch(
-      () => props.renderClusterMarker,
-      () => {
-        if (mapInstance && props.enable) {
-          initCluster(mapInstance);
-        }
-      }
-    );
-    vue.watch(
-      () => props.renderMarker,
-      () => {
-        if (mapInstance && props.enable) {
-          initCluster(mapInstance);
+        if (mapInstance.value && props.enable) {
+          initCluster();
         }
+        console.warn("styles 变化", props.styles);
       }
+      // { deep: true },
     );
     vue.onUnmounted(() => {
       destroy();
+      console.warn("组件卸载时清理聚合实例");
     });
     return (_ctx, _cache) => {
       return vue.renderSlot(_ctx.$slots, "default");

package/dist/lib/amap/style.css

@@ -1,7 +1,14 @@
+/* AMap 高德地图组件样式 */
+.jky-amap-container {
+  /* 地图容器样式 */
+  position: relative;
+  overflow: hidden;
 
-/* JkyAMarker 组件样式 - 参考高德官方示例 */
-.amap-icon img,
-.amap-marker-content img {
-  width: 25px;
-  height: 34px;
+  /* 隐藏高德地图的 logo 和版权信息（注意：商业使用请遵守高德地图条款） */
+.amap-logo {
+    display: none !important;
+}
+.amap-copyright {
+    display: none !important;
+}
 }

package/dist/lib/amap/style2.css

@@ -1,3 +1,7 @@
 
-/* 轨迹回放组件不需要额外样式 */
-/* 所有样式通过 TailwindCSS 工具类或外部组件控制 */
+/* JkyAMarker 组件样式 - 参考高德官方示例 */
+.amap-icon img,
+.amap-marker-content img {
+  width: 25px;
+  height: 34px;
+}

package/dist/lib/amap/style3.css

@@ -1,14 +1,3 @@
-/* AMap 高德地图组件样式 */
-.jky-amap-container {
-  /* 地图容器样式 */
-  position: relative;
-  overflow: hidden;
 
-  /* 隐藏高德地图的 logo 和版权信息（注意：商业使用请遵守高德地图条款） */
-.amap-logo {
-    display: none !important;
-}
-.amap-copyright {
-    display: none !important;
-}
-}
+/* 轨迹回放组件不需要额外样式 */
+/* 所有样式通过 TailwindCSS 工具类或外部组件控制 */

package/dist/lib/package.json.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const version = "0.0.145";
+const version = "0.0.147";
 exports.version = version;

package/dist/lib/resolver.d.ts

@@ -2,5 +2,7 @@ import { ComponentResolver } from 'unplugin-vue-components';
 export interface JkyComponentLibResolverOptions {
     /** 不自动加载样式的组件白名单（组件名，不带 Jky 前缀） */
     excludeStyleList?: string[];
+    /** 自定义样式映射 */
+    styleMap?: Record<string, string>;
 }
 export declare function JkyComponentLibResolver(options?: JkyComponentLibResolverOptions): ComponentResolver;

package/dist/lib/resolver.js

@@ -1,4 +1,20 @@
 "use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const defaultExcludeStyleList = [
   // AMap 相关子组件，共用 amap 目录的样式
@@ -13,9 +29,13 @@ const defaultExcludeStyleList = [
   "AMarkerCluster"
   // AClusterMarker 的常见误写
 ];
+const defaultStyleMap = {
+  AnimatedTransition: "animated"
+};
 function JkyComponentLibResolver(options = {}) {
-  const { excludeStyleList = [] } = options;
+  const { excludeStyleList = [], styleMap = {} } = options;
   const excludeStyleSet = /* @__PURE__ */ new Set([...defaultExcludeStyleList, ...excludeStyleList]);
+  const styleMapLib = __spreadValues(__spreadValues({}, defaultStyleMap), styleMap);
   return {
     type: "component",
     resolve: (name) => {
@@ -29,11 +49,12 @@ function JkyComponentLibResolver(options = {}) {
             // 白名单中的组件不自动加载样式
           };
         }
+        const stylePath = styleMapLib[componentName] || kebabName;
         return {
           name,
           from: "jky-component-lib",
           sideEffects: [
-            `jky-component-lib/dist/es/${kebabName}/style.css`
+            `jky-component-lib/dist/es/${stylePath}/style.css`
           ]
         };
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jky-component-lib",
   "type": "module",
-  "version": "0.0.145",
+  "version": "0.0.147",
   "publishConfig": {
     "access": "public"
   },