jky-component-lib 0.0.144 → 0.0.146

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/dist/es/amap/AClusterMarker/AClusterMarker.vue.js +48 -64
  2. package/dist/es/amap/style.css +13 -2
  3. package/dist/es/amap/style2.css +2 -13
  4. package/dist/es/package.json.js +1 -1
  5. package/dist/es/resolver.js +4 -1
  6. package/dist/lib/amap/AClusterMarker/AClusterMarker.vue.js +47 -63
  7. package/dist/lib/amap/style.css +13 -2
  8. package/dist/lib/amap/style2.css +2 -13
  9. package/dist/lib/package.json.js +1 -1
  10. package/dist/lib/resolver.js +4 -1
  11. package/package.json +1 -1
package/dist/es/amap/AClusterMarker/AClusterMarker.vue.js CHANGED
@@ -17,13 +17,14 @@ var __spreadValues = (a, b) => {
17
17
  return a;
18
18
  };
19
19
  var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
20
- import { defineComponent, useModel, inject, onMounted, watch, onUnmounted, renderSlot, mergeModels } from "vue";
20
+ import { defineComponent, useModel, inject, computed, ref, onMounted, watch, onUnmounted, renderSlot, mergeModels } from "vue";
21
21
  const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({}, {
22
22
  name: "JkyAClusterMarker",
23
23
  inheritAttrs: false
24
24
  }), {
25
25
  __name: "AClusterMarker",
26
26
  props: /* @__PURE__ */ mergeModels({
27
+ map: {},
27
28
  points: {},
28
29
  gridSize: { default: 60 },
29
30
  styles: {},
@@ -44,25 +45,27 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
44
45
  const props = __props;
45
46
  const emit = __emit;
46
47
  const modelValue = useModel(__props, "modelValue");
47
- const amapContext = inject("amapContext");
48
- let clusterInstance = null;
49
- let mapInstance = null;
48
+ const amapContext = inject("amapContext", null);
49
+ const mapInstance = computed(() => {
50
+ return props.map || (amapContext == null ? void 0 : amapContext.getMapInstance()) || null;
51
+ });
52
+ const clusterInstance = ref(null);
50
53
  onMounted(() => {
51
- if ((amapContext == null ? void 0 : amapContext.map) && props.enable) {
52
- initCluster(amapContext.map);
54
+ if (mapInstance.value && props.enable) {
55
+ initCluster();
53
56
  }
54
57
  });
55
- function initCluster(map) {
58
+ function initCluster() {
59
+ const map = mapInstance.value;
56
60
  if (!map || !window.AMap)
57
61
  return;
58
- mapInstance = map;
59
62
  if (!window.AMap.MarkerCluster) {
60
63
  console.warn("AMap.MarkerCluster 插件未加载，请先加载插件");
61
64
  return;
62
65
  }
63
- if (clusterInstance) {
64
- clusterInstance.setMap(null);
65
- clusterInstance = null;
66
+ if (clusterInstance.value) {
67
+ clusterInstance.value.setMap(null);
68
+ clusterInstance.value = null;
66
69
  }
67
70
  const points = preparePoints();
68
71
  const clusterOptions = {
@@ -71,7 +74,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
71
74
  minClusterSize: props.minClusterSize,
72
75
  averageCenter: props.averageCenter
73
76
  };
74
- if (props.styles && props.styles.length > 0) {
77
+ if (props.renderClusterMarker || props.renderMarker) {
78
+ clusterOptions.renderClusterMarker = props.renderClusterMarker;
79
+ clusterOptions.renderMarker = props.renderMarker;
80
+ } else if (props.styles && props.styles.length > 0) {
75
81
  clusterOptions.styles = props.styles.map((style) => ({
76
82
  url: style.url,
77
83
  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({
80
86
  textSize: style.textSize
81
87
  }));
82
88
  }
83
- if (props.renderClusterMarker) {
84
- clusterOptions.renderClusterMarker = props.renderClusterMarker;
85
- }
86
- if (props.renderMarker) {
87
- clusterOptions.renderMarker = props.renderMarker;
88
- }
89
- clusterInstance = new window.AMap.MarkerCluster(map, points, clusterOptions);
90
- clusterInstance.on("click", (cluster) => {
89
+ clusterInstance.value = new window.AMap.MarkerCluster(map, points, clusterOptions);
90
+ clusterInstance.value.on("click", (cluster) => {
91
91
  emit("click", cluster);
92
92
  });
93
- clusterInstance.on("mouseover", (cluster) => {
93
+ clusterInstance.value.on("mouseover", (cluster) => {
94
94
  emit("mouseover", cluster);
95
95
  });
96
- clusterInstance.on("mouseout", (cluster) => {
96
+ clusterInstance.value.on("mouseout", (cluster) => {
97
97
  emit("mouseout", cluster);
98
98
  });
99
- emit("ready", clusterInstance);
99
+ emit("ready", clusterInstance.value);
100
100
  }
101
101
  function preparePoints() {
102
102
  const points = props.points || modelValue.value || [];
@@ -107,86 +107,70 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
107
107
  }, point.data));
108
108
  }
109
109
  function updatePoints(newPoints) {
110
- if (!clusterInstance)
110
+ if (!mapInstance.value)
111
111
  return;
112
- clusterInstance.setMap(null);
113
- const points = newPoints.map((point) => __spreadValues({
114
- lnglat: point.lnglat,
115
- title: point.title,
116
- content: point.content
117
- }, point.data));
118
- clusterInstance.addMarkers(points);
112
+ modelValue.value = newPoints;
113
+ initCluster();
119
114
  }
120
115
  function clearClusters() {
121
- if (clusterInstance) {
122
- clusterInstance.setMap(null);
116
+ if (clusterInstance.value) {
117
+ clusterInstance.value.setMap(null);
123
118
  }
124
119
  }
125
120
  function destroy() {
126
- if (clusterInstance) {
127
- clusterInstance.setMap(null);
128
- clusterInstance = null;
121
+ if (clusterInstance.value) {
122
+ clusterInstance.value.setMap(null);
123
+ clusterInstance.value = null;
129
124
  }
130
125
  }
131
126
  __expose({
132
127
  updatePoints,
133
128
  clearClusters,
134
129
  destroy,
135
- getClusterInstance: () => clusterInstance
130
+ getClusterInstance: () => clusterInstance.value
136
131
  });
137
132
  watch(
138
133
  () => props.points,
139
134
  (newPoints) => {
140
- if (clusterInstance && newPoints) {
135
+ if (clusterInstance.value && newPoints) {
141
136
  updatePoints(newPoints);
142
137
  }
143
- },
144
- { deep: true }
138
+ console.warn("points 变化", newPoints);
139
+ }
140
+ // { deep: true },
145
141
  );
146
142
  watch(
147
143
  () => modelValue.value,
148
144
  (newValue) => {
149
- if (clusterInstance && newValue) {
145
+ if (clusterInstance.value && newValue) {
150
146
  updatePoints(newValue);
151
147
  }
152
- },
153
- { deep: true }
148
+ console.warn("modelValue 变化", newValue);
149
+ }
150
+ // { deep: true },
154
151
  );
155
152
  watch(
156
153
  () => props.gridSize,
157
154
  () => {
158
- if (mapInstance && props.enable) {
159
- initCluster(mapInstance);
155
+ if (mapInstance.value && props.enable) {
156
+ initCluster();
160
157
  }
158
+ console.warn("gridSize 变化", props.gridSize);
161
159
  }
162
160
  );
163
161
  watch(
164
162
  () => props.styles,
165
163
  () => {
166
- if (mapInstance && props.enable) {
167
- initCluster(mapInstance);
168
- }
169
- },
170
- { deep: true }
171
- );
172
- watch(
173
- () => props.renderClusterMarker,
174
- () => {
175
- if (mapInstance && props.enable) {
176
- initCluster(mapInstance);
177
- }
178
- }
179
- );
180
- watch(
181
- () => props.renderMarker,
182
- () => {
183
- if (mapInstance && props.enable) {
184
- initCluster(mapInstance);
164
+ if (mapInstance.value && props.enable) {
165
+ initCluster();
185
166
  }
167
+ console.warn("styles 变化", props.styles);
186
168
  }
169
+ // { deep: true },
187
170
  );
188
171
  onUnmounted(() => {
189
172
  destroy();
173
+ console.warn("组件卸载时清理聚合实例");
190
174
  });
191
175
  return (_ctx, _cache) => {
192
176
  return renderSlot(_ctx.$slots, "default");
package/dist/es/amap/style.css CHANGED
@@ -1,3 +1,14 @@
1
+ /* AMap 高德地图组件样式 */
2
+ .jky-amap-container {
3
+ /* 地图容器样式 */
4
+ position: relative;
5
+ overflow: hidden;
1
6
 
2
- /* 轨迹回放组件不需要额外样式 */
3
- /* 所有样式通过 TailwindCSS 工具类或外部组件控制 */
7
+ /* 隐藏高德地图的 logo 和版权信息（注意：商业使用请遵守高德地图条款） */
8
+ .amap-logo {
9
+ display: none !important;
10
+ }
11
+ .amap-copyright {
12
+ display: none !important;
13
+ }
14
+ }
package/dist/es/amap/style2.css CHANGED
@@ -1,14 +1,3 @@
1
- /* AMap 高德地图组件样式 */
2
- .jky-amap-container {
3
- /* 地图容器样式 */
4
- position: relative;
5
- overflow: hidden;
6
1
 
7
- /* 隐藏高德地图的 logo 和版权信息（注意：商业使用请遵守高德地图条款） */
8
- .amap-logo {
9
- display: none !important;
10
- }
11
- .amap-copyright {
12
- display: none !important;
13
- }
14
- }
2
+ /* 轨迹回放组件不需要额外样式 */
3
+ /* 所有样式通过 TailwindCSS 工具类或外部组件控制 */
package/dist/es/package.json.js CHANGED
@@ -1,4 +1,4 @@
1
- const version = "0.0.144";
1
+ const version = "0.0.146";
2
2
  export {
3
3
  version
4
4
  };
package/dist/es/resolver.js CHANGED
@@ -6,7 +6,10 @@ const defaultExcludeStyleList = [
6
6
  "ATrackPlayback",
7
7
  // Form 相关子组件，共用 form 目录的样式
8
8
  "FormItem",
9
- "AMapPickerItem"
9
+ "AMapPickerItem",
10
+ // 常见拼写变体（防止误写）
11
+ "AMarkerCluster"
12
+ // AClusterMarker 的常见误写
10
13
  ];
11
14
  function JkyComponentLibResolver(options = {}) {
12
15
  const { excludeStyleList = [] } = options;
package/dist/lib/amap/AClusterMarker/AClusterMarker.vue.js CHANGED
@@ -26,6 +26,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
26
26
  }), {
27
27
  __name: "AClusterMarker",
28
28
  props: /* @__PURE__ */ vue.mergeModels({
29
+ map: {},
29
30
  points: {},
30
31
  gridSize: { default: 60 },
31
32
  styles: {},
@@ -46,25 +47,27 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
46
47
  const props = __props;
47
48
  const emit = __emit;
48
49
  const modelValue = vue.useModel(__props, "modelValue");
49
- const amapContext = vue.inject("amapContext");
50
- let clusterInstance = null;
51
- let mapInstance = null;
50
+ const amapContext = vue.inject("amapContext", null);
51
+ const mapInstance = vue.computed(() => {
52
+ return props.map || (amapContext == null ? void 0 : amapContext.getMapInstance()) || null;
53
+ });
54
+ const clusterInstance = vue.ref(null);
52
55
  vue.onMounted(() => {
53
- if ((amapContext == null ? void 0 : amapContext.map) && props.enable) {
54
- initCluster(amapContext.map);
56
+ if (mapInstance.value && props.enable) {
57
+ initCluster();
55
58
  }
56
59
  });
57
- function initCluster(map) {
60
+ function initCluster() {
61
+ const map = mapInstance.value;
58
62
  if (!map || !window.AMap)
59
63
  return;
60
- mapInstance = map;
61
64
  if (!window.AMap.MarkerCluster) {
62
65
  console.warn("AMap.MarkerCluster 插件未加载，请先加载插件");
63
66
  return;
64
67
  }
65
- if (clusterInstance) {
66
- clusterInstance.setMap(null);
67
- clusterInstance = null;
68
+ if (clusterInstance.value) {
69
+ clusterInstance.value.setMap(null);
70
+ clusterInstance.value = null;
68
71
  }
69
72
  const points = preparePoints();
70
73
  const clusterOptions = {
@@ -73,7 +76,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
73
76
  minClusterSize: props.minClusterSize,
74
77
  averageCenter: props.averageCenter
75
78
  };
76
- if (props.styles && props.styles.length > 0) {
79
+ if (props.renderClusterMarker || props.renderMarker) {
80
+ clusterOptions.renderClusterMarker = props.renderClusterMarker;
81
+ clusterOptions.renderMarker = props.renderMarker;
82
+ } else if (props.styles && props.styles.length > 0) {
77
83
  clusterOptions.styles = props.styles.map((style) => ({
78
84
  url: style.url,
79
85
  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
82
88
  textSize: style.textSize
83
89
  }));
84
90
  }
85
- if (props.renderClusterMarker) {
86
- clusterOptions.renderClusterMarker = props.renderClusterMarker;
87
- }
88
- if (props.renderMarker) {
89
- clusterOptions.renderMarker = props.renderMarker;
90
- }
91
- clusterInstance = new window.AMap.MarkerCluster(map, points, clusterOptions);
92
- clusterInstance.on("click", (cluster) => {
91
+ clusterInstance.value = new window.AMap.MarkerCluster(map, points, clusterOptions);
92
+ clusterInstance.value.on("click", (cluster) => {
93
93
  emit("click", cluster);
94
94
  });
95
- clusterInstance.on("mouseover", (cluster) => {
95
+ clusterInstance.value.on("mouseover", (cluster) => {
96
96
  emit("mouseover", cluster);
97
97
  });
98
- clusterInstance.on("mouseout", (cluster) => {
98
+ clusterInstance.value.on("mouseout", (cluster) => {
99
99
  emit("mouseout", cluster);
100
100
  });
101
- emit("ready", clusterInstance);
101
+ emit("ready", clusterInstance.value);
102
102
  }
103
103
  function preparePoints() {
104
104
  const points = props.points || modelValue.value || [];
@@ -109,86 +109,70 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
109
109
  }, point.data));
110
110
  }
111
111
  function updatePoints(newPoints) {
112
- if (!clusterInstance)
112
+ if (!mapInstance.value)
113
113
  return;
114
- clusterInstance.setMap(null);
115
- const points = newPoints.map((point) => __spreadValues({
116
- lnglat: point.lnglat,
117
- title: point.title,
118
- content: point.content
119
- }, point.data));
120
- clusterInstance.addMarkers(points);
114
+ modelValue.value = newPoints;
115
+ initCluster();
121
116
  }
122
117
  function clearClusters() {
123
- if (clusterInstance) {
124
- clusterInstance.setMap(null);
118
+ if (clusterInstance.value) {
119
+ clusterInstance.value.setMap(null);
125
120
  }
126
121
  }
127
122
  function destroy() {
128
- if (clusterInstance) {
129
- clusterInstance.setMap(null);
130
- clusterInstance = null;
123
+ if (clusterInstance.value) {
124
+ clusterInstance.value.setMap(null);
125
+ clusterInstance.value = null;
131
126
  }
132
127
  }
133
128
  __expose({
134
129
  updatePoints,
135
130
  clearClusters,
136
131
  destroy,
137
- getClusterInstance: () => clusterInstance
132
+ getClusterInstance: () => clusterInstance.value
138
133
  });
139
134
  vue.watch(
140
135
  () => props.points,
141
136
  (newPoints) => {
142
- if (clusterInstance && newPoints) {
137
+ if (clusterInstance.value && newPoints) {
143
138
  updatePoints(newPoints);
144
139
  }
145
- },
146
- { deep: true }
140
+ console.warn("points 变化", newPoints);
141
+ }
142
+ // { deep: true },
147
143
  );
148
144
  vue.watch(
149
145
  () => modelValue.value,
150
146
  (newValue) => {
151
- if (clusterInstance && newValue) {
147
+ if (clusterInstance.value && newValue) {
152
148
  updatePoints(newValue);
153
149
  }
154
- },
155
- { deep: true }
150
+ console.warn("modelValue 变化", newValue);
151
+ }
152
+ // { deep: true },
156
153
  );
157
154
  vue.watch(
158
155
  () => props.gridSize,
159
156
  () => {
160
- if (mapInstance && props.enable) {
161
- initCluster(mapInstance);
157
+ if (mapInstance.value && props.enable) {
158
+ initCluster();
162
159
  }
160
+ console.warn("gridSize 变化", props.gridSize);
163
161
  }
164
162
  );
165
163
  vue.watch(
166
164
  () => props.styles,
167
165
  () => {
168
- if (mapInstance && props.enable) {
169
- initCluster(mapInstance);
170
- }
171
- },
172
- { deep: true }
173
- );
174
- vue.watch(
175
- () => props.renderClusterMarker,
176
- () => {
177
- if (mapInstance && props.enable) {
178
- initCluster(mapInstance);
179
- }
180
- }
181
- );
182
- vue.watch(
183
- () => props.renderMarker,
184
- () => {
185
- if (mapInstance && props.enable) {
186
- initCluster(mapInstance);
166
+ if (mapInstance.value && props.enable) {
167
+ initCluster();
187
168
  }
169
+ console.warn("styles 变化", props.styles);
188
170
  }
171
+ // { deep: true },
189
172
  );
190
173
  vue.onUnmounted(() => {
191
174
  destroy();
175
+ console.warn("组件卸载时清理聚合实例");
192
176
  });
193
177
  return (_ctx, _cache) => {
194
178
  return vue.renderSlot(_ctx.$slots, "default");
package/dist/lib/amap/style.css CHANGED
@@ -1,3 +1,14 @@
1
+ /* AMap 高德地图组件样式 */
2
+ .jky-amap-container {
3
+ /* 地图容器样式 */
4
+ position: relative;
5
+ overflow: hidden;
1
6
 
2
- /* 轨迹回放组件不需要额外样式 */
3
- /* 所有样式通过 TailwindCSS 工具类或外部组件控制 */
7
+ /* 隐藏高德地图的 logo 和版权信息（注意：商业使用请遵守高德地图条款） */
8
+ .amap-logo {
9
+ display: none !important;
10
+ }
11
+ .amap-copyright {
12
+ display: none !important;
13
+ }
14
+ }
package/dist/lib/amap/style2.css CHANGED
@@ -1,14 +1,3 @@
1
- /* AMap 高德地图组件样式 */
2
- .jky-amap-container {
3
- /* 地图容器样式 */
4
- position: relative;
5
- overflow: hidden;
6
1
 
7
- /* 隐藏高德地图的 logo 和版权信息（注意：商业使用请遵守高德地图条款） */
8
- .amap-logo {
9
- display: none !important;
10
- }
11
- .amap-copyright {
12
- display: none !important;
13
- }
14
- }
2
+ /* 轨迹回放组件不需要额外样式 */
3
+ /* 所有样式通过 TailwindCSS 工具类或外部组件控制 */
package/dist/lib/package.json.js CHANGED
@@ -1,4 +1,4 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
3
- const version = "0.0.144";
3
+ const version = "0.0.146";
4
4
  exports.version = version;
package/dist/lib/resolver.js CHANGED
@@ -8,7 +8,10 @@ const defaultExcludeStyleList = [
8
8
  "ATrackPlayback",
9
9
  // Form 相关子组件，共用 form 目录的样式
10
10
  "FormItem",
11
- "AMapPickerItem"
11
+ "AMapPickerItem",
12
+ // 常见拼写变体（防止误写）
13
+ "AMarkerCluster"
14
+ // AClusterMarker 的常见误写
12
15
  ];
13
16
  function JkyComponentLibResolver(options = {}) {
14
17
  const { excludeStyleList = [] } = options;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "jky-component-lib",
3
3
  "type": "module",
4
- "version": "0.0.144",
4
+ "version": "0.0.146",
5
5
  "publishConfig": {
6
6
  "access": "public"
7
7
  },