jky-component-lib 0.0.94 → 0.0.96

package/dist/es/amap/AMarker.vue.d.ts

@@ -28,6 +28,7 @@ declare const __VLS_component: import('vue').DefineComponent<AMapMarkerProps, {
     draggable: boolean;
     visible: boolean;
     updateMode: "incremental" | "full";
+    cluster: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
 export default _default;

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

@@ -31,13 +31,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
     icon: {},
     offset: {},
     visible: { type: Boolean, default: true },
-    updateMode: { default: "full" }
+    updateMode: { default: "full" },
+    cluster: { type: Boolean, default: false },
+    clusterOptions: {}
   },
   emits: ["click", "dragend", "mouseover", "mouseout"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emit = __emit;
     const markers = ref([]);
+    const clusterManager = ref(null);
     const amapContext = inject("amapContext", null);
     const mapInstance = (amapContext == null ? void 0 : amapContext.getMapInstance()) || null;
     const contentCleanupFns = /* @__PURE__ */ new WeakMap();
@@ -47,6 +50,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
       render(vnode, container);
       return container.firstElementChild || container;
     }
+    function createClusterManager() {
+      const AMap = window.AMap;
+      if (!AMap || !mapInstance)
+        return;
+      if (clusterManager.value) {
+        clusterManager.value.clearMarkers();
+        clusterManager.value = null;
+      }
+      const options = {
+        map: mapInstance
+      };
+      if (props.clusterOptions) {
+        Object.assign(options, props.clusterOptions);
+      }
+      clusterManager.value = new AMap.MarkerCluster(options);
+    }
     function createMarker(data) {
       const AMap = window.AMap;
       if (!AMap || !mapInstance) {
@@ -126,7 +145,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
             cleanupFn();
             contentCleanupFns.delete(marker);
           }
-          mapInstance == null ? void 0 : mapInstance.remove(marker);
+          if (props.cluster && clusterManager.value) {
+            clusterManager.value.removeMarker(marker);
+          } else {
+            mapInstance == null ? void 0 : mapInstance.remove(marker);
+          }
         }
       });
       const markersToAdd = newMarkers.filter((data) => {
@@ -138,7 +161,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
           const marker = createMarker(data);
           if (marker) {
             newMarkersList.push(marker);
-            mapInstance == null ? void 0 : mapInstance.add(marker);
+            if (props.cluster && clusterManager.value) {
+              clusterManager.value.addMarker(marker);
+            } else {
+              mapInstance == null ? void 0 : mapInstance.add(marker);
+            }
           }
         });
         markers.value.push(...newMarkersList);
@@ -148,12 +175,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
       if (!mapInstance)
         return;
       removeMarkers();
+      if (props.cluster && !clusterManager.value) {
+        createClusterManager();
+      }
       if (newMarkers && newMarkers.length > 0) {
         newMarkers.forEach((data) => {
           const marker = createMarker(data);
           if (marker) {
             markers.value.push(marker);
-            mapInstance == null ? void 0 : mapInstance.add(marker);
+            if (props.cluster && clusterManager.value) {
+              clusterManager.value.addMarker(marker);
+            } else {
+              mapInstance == null ? void 0 : mapInstance.add(marker);
+            }
           }
         });
       }
@@ -161,6 +195,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
     function addMarkers() {
       if (!mapInstance)
         return;
+      if (props.cluster && !clusterManager.value) {
+        createClusterManager();
+      }
       if (props.markers && props.markers.length > 0) {
         if (props.updateMode === "full") {
           fullUpdate(props.markers);
@@ -178,12 +215,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
         const marker = createMarker(singleMarker);
         if (marker) {
           markers.value.push(marker);
-          mapInstance == null ? void 0 : mapInstance.add(marker);
+          if (props.cluster && clusterManager.value) {
+            clusterManager.value.addMarker(marker);
+          } else {
+            mapInstance == null ? void 0 : mapInstance.add(marker);
+          }
         }
       }
     }
     function removeMarkers() {
-      if (!mapInstance || markers.value.length === 0)
+      if (markers.value.length === 0)
         return;
       markers.value.forEach((marker) => {
         const cleanupFn = contentCleanupFns.get(marker);
@@ -191,9 +232,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
           cleanupFn();
           contentCleanupFns.delete(marker);
         }
-        mapInstance == null ? void 0 : mapInstance.remove(marker);
+        if (props.cluster && clusterManager.value) {
+          clusterManager.value.removeMarker(marker);
+        } else if (mapInstance) {
+          mapInstance.remove(marker);
+        }
       });
       markers.value = [];
+      if (props.cluster && clusterManager.value) {
+        clusterManager.value.clearMarkers();
+        clusterManager.value = null;
+      }
     }
     __expose({
       getMarkers: () => markers.value,
@@ -228,20 +277,26 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
     });
     watch(
       () => props.markers,
-      (newMarkers, _oldMarkers) => {
+      (newMarkers, oldMarkers) => {
         if (!mapInstance)
           return;
         if (!newMarkers) {
           removeMarkers();
           return;
         }
+        const isSameArray = newMarkers === oldMarkers;
+        const isLengthIncreased = oldMarkers && newMarkers.length > oldMarkers.length;
+        if (isSameArray && isLengthIncreased) {
+          incrementalUpdate(newMarkers);
+          return;
+        }
         if (props.updateMode === "full") {
           fullUpdate(newMarkers);
         } else {
           incrementalUpdate(newMarkers);
         }
       },
-      { immediate: true }
+      { immediate: true, deep: true }
     );
     return (_ctx, _cache) => {
       return renderSlot(_ctx.$slots, "default");

package/dist/es/form/Form.vue.js

@@ -72,6 +72,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
     responsive: { type: Boolean, default: true },
     grid: { type: [Boolean, Object], default: false },
     className: {},
+    formClass: {},
     readonly: { type: Boolean },
     disabled: { type: Boolean },
     watchDeep: { type: Boolean, default: true },
@@ -154,7 +155,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
       if (props.inline && props.grid) {
         classes.push("jky-form--grid");
       }
-      return classes;
+      return [...classes, props.formClass || ""];
     });
     const _gridStyle = computed(() => {
       if (!props.inline || !props.grid || typeof props.grid === "boolean") {

package/dist/es/package.json.js

@@ -1,4 +1,4 @@
-const version = "0.0.94";
+const version = "0.0.96";
 export {
   version
 };

package/dist/es/page-layout/PageLayout.vue.js

@@ -278,7 +278,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
               closable: true
             }, null, 8, ["store", "cachable", "round"])),
             (openBlock(), createBlock(resolveDynamicComponent(props.mainWithCard ? unref(ElCard) : "div"), {
-              class: normalizeClass(["jky-page-layout__content flex-1 min-h-0 overflow-hidden", props.contentClass]),
+              class: normalizeClass(["jky-page-layout__content flex-1 min-h-0 max-h-0 overflow-hidden", props.contentClass]),
               "body-class": props.mainWithScrollbar ? "" : "pb-0!"
             }, {
               default: withCtx(() => [

package/dist/es/page-table/PageTable.vue.js

@@ -324,7 +324,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
       }, [
         __props.filterItems && __props.filterItems.length > 0 ? (openBlock(), createBlock(unref(ElCard), {
           key: 0,
-          class: "mb-4 jky-page-table__filter-card"
+          class: "mb-3 jky-page-table__filter-card"
         }, {
           default: withCtx(() => [
             createVNode(unref(JkyForm), mergeProps({

package/dist/es/style.css

@@ -1566,6 +1566,10 @@
     height: 100vh;
   }
 
+  .max-h-0 {
+    max-height: calc(var(--spacing) * 0);
+  }
+
   .min-h-0 {
     min-height: calc(var(--spacing) * 0);
   }

package/dist/lib/amap/AMarker.vue.d.ts

@@ -28,6 +28,7 @@ declare const __VLS_component: import('vue').DefineComponent<AMapMarkerProps, {
     draggable: boolean;
     visible: boolean;
     updateMode: "incremental" | "full";
+    cluster: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
 export default _default;

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

@@ -33,13 +33,16 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
     icon: {},
     offset: {},
     visible: { type: Boolean, default: true },
-    updateMode: { default: "full" }
+    updateMode: { default: "full" },
+    cluster: { type: Boolean, default: false },
+    clusterOptions: {}
   },
   emits: ["click", "dragend", "mouseover", "mouseout"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emit = __emit;
     const markers = vue.ref([]);
+    const clusterManager = vue.ref(null);
     const amapContext = vue.inject("amapContext", null);
     const mapInstance = (amapContext == null ? void 0 : amapContext.getMapInstance()) || null;
     const contentCleanupFns = /* @__PURE__ */ new WeakMap();
@@ -49,6 +52,22 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
       vue.render(vnode, container);
       return container.firstElementChild || container;
     }
+    function createClusterManager() {
+      const AMap = window.AMap;
+      if (!AMap || !mapInstance)
+        return;
+      if (clusterManager.value) {
+        clusterManager.value.clearMarkers();
+        clusterManager.value = null;
+      }
+      const options = {
+        map: mapInstance
+      };
+      if (props.clusterOptions) {
+        Object.assign(options, props.clusterOptions);
+      }
+      clusterManager.value = new AMap.MarkerCluster(options);
+    }
     function createMarker(data) {
       const AMap = window.AMap;
       if (!AMap || !mapInstance) {
@@ -128,7 +147,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
             cleanupFn();
             contentCleanupFns.delete(marker);
           }
-          mapInstance == null ? void 0 : mapInstance.remove(marker);
+          if (props.cluster && clusterManager.value) {
+            clusterManager.value.removeMarker(marker);
+          } else {
+            mapInstance == null ? void 0 : mapInstance.remove(marker);
+          }
         }
       });
       const markersToAdd = newMarkers.filter((data) => {
@@ -140,7 +163,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
           const marker = createMarker(data);
           if (marker) {
             newMarkersList.push(marker);
-            mapInstance == null ? void 0 : mapInstance.add(marker);
+            if (props.cluster && clusterManager.value) {
+              clusterManager.value.addMarker(marker);
+            } else {
+              mapInstance == null ? void 0 : mapInstance.add(marker);
+            }
           }
         });
         markers.value.push(...newMarkersList);
@@ -150,12 +177,19 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
       if (!mapInstance)
         return;
       removeMarkers();
+      if (props.cluster && !clusterManager.value) {
+        createClusterManager();
+      }
       if (newMarkers && newMarkers.length > 0) {
         newMarkers.forEach((data) => {
           const marker = createMarker(data);
           if (marker) {
             markers.value.push(marker);
-            mapInstance == null ? void 0 : mapInstance.add(marker);
+            if (props.cluster && clusterManager.value) {
+              clusterManager.value.addMarker(marker);
+            } else {
+              mapInstance == null ? void 0 : mapInstance.add(marker);
+            }
           }
         });
       }
@@ -163,6 +197,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
     function addMarkers() {
       if (!mapInstance)
         return;
+      if (props.cluster && !clusterManager.value) {
+        createClusterManager();
+      }
       if (props.markers && props.markers.length > 0) {
         if (props.updateMode === "full") {
           fullUpdate(props.markers);
@@ -180,12 +217,16 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
         const marker = createMarker(singleMarker);
         if (marker) {
           markers.value.push(marker);
-          mapInstance == null ? void 0 : mapInstance.add(marker);
+          if (props.cluster && clusterManager.value) {
+            clusterManager.value.addMarker(marker);
+          } else {
+            mapInstance == null ? void 0 : mapInstance.add(marker);
+          }
         }
       }
     }
     function removeMarkers() {
-      if (!mapInstance || markers.value.length === 0)
+      if (markers.value.length === 0)
         return;
       markers.value.forEach((marker) => {
         const cleanupFn = contentCleanupFns.get(marker);
@@ -193,9 +234,17 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
           cleanupFn();
           contentCleanupFns.delete(marker);
         }
-        mapInstance == null ? void 0 : mapInstance.remove(marker);
+        if (props.cluster && clusterManager.value) {
+          clusterManager.value.removeMarker(marker);
+        } else if (mapInstance) {
+          mapInstance.remove(marker);
+        }
       });
       markers.value = [];
+      if (props.cluster && clusterManager.value) {
+        clusterManager.value.clearMarkers();
+        clusterManager.value = null;
+      }
     }
     __expose({
       getMarkers: () => markers.value,
@@ -230,20 +279,26 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
     });
     vue.watch(
       () => props.markers,
-      (newMarkers, _oldMarkers) => {
+      (newMarkers, oldMarkers) => {
         if (!mapInstance)
           return;
         if (!newMarkers) {
           removeMarkers();
           return;
         }
+        const isSameArray = newMarkers === oldMarkers;
+        const isLengthIncreased = oldMarkers && newMarkers.length > oldMarkers.length;
+        if (isSameArray && isLengthIncreased) {
+          incrementalUpdate(newMarkers);
+          return;
+        }
         if (props.updateMode === "full") {
           fullUpdate(newMarkers);
         } else {
           incrementalUpdate(newMarkers);
         }
       },
-      { immediate: true }
+      { immediate: true, deep: true }
     );
     return (_ctx, _cache) => {
       return vue.renderSlot(_ctx.$slots, "default");

package/dist/lib/form/Form.vue.js

@@ -74,6 +74,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
     responsive: { type: Boolean, default: true },
     grid: { type: [Boolean, Object], default: false },
     className: {},
+    formClass: {},
     readonly: { type: Boolean },
     disabled: { type: Boolean },
     watchDeep: { type: Boolean, default: true },
@@ -156,7 +157,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
       if (props.inline && props.grid) {
         classes.push("jky-form--grid");
       }
-      return classes;
+      return [...classes, props.formClass || ""];
     });
     const _gridStyle = vue.computed(() => {
       if (!props.inline || !props.grid || typeof props.grid === "boolean") {

package/dist/lib/package.json.js

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

package/dist/lib/page-layout/PageLayout.vue.js

@@ -280,7 +280,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
               closable: true
             }, null, 8, ["store", "cachable", "round"])),
             (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(props.mainWithCard ? vue.unref(ElementPlus.ElCard) : "div"), {
-              class: vue.normalizeClass(["jky-page-layout__content flex-1 min-h-0 overflow-hidden", props.contentClass]),
+              class: vue.normalizeClass(["jky-page-layout__content flex-1 min-h-0 max-h-0 overflow-hidden", props.contentClass]),
               "body-class": props.mainWithScrollbar ? "" : "pb-0!"
             }, {
               default: vue.withCtx(() => [

package/dist/lib/page-table/PageTable.vue.js

@@ -326,7 +326,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
       }, [
         __props.filterItems && __props.filterItems.length > 0 ? (vue.openBlock(), vue.createBlock(vue.unref(ElementPlus.ElCard), {
           key: 0,
-          class: "mb-4 jky-page-table__filter-card"
+          class: "mb-3 jky-page-table__filter-card"
         }, {
           default: vue.withCtx(() => [
             vue.createVNode(vue.unref(index.JkyForm), vue.mergeProps({

package/dist/lib/style.css

@@ -1566,6 +1566,10 @@
     height: 100vh;
   }
 
+  .max-h-0 {
+    max-height: calc(var(--spacing) * 0);
+  }
+
   .min-h-0 {
     min-height: calc(var(--spacing) * 0);
   }

package/package.json

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