jky-component-lib 0.0.96 → 0.0.97

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

@@ -28,7 +28,6 @@ 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,16 +31,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
     icon: {},
     offset: {},
     visible: { type: Boolean, default: true },
-    updateMode: { default: "full" },
-    cluster: { type: Boolean, default: false },
-    clusterOptions: {}
+    updateMode: { default: "full" }
   },
   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();
@@ -50,22 +47,6 @@ 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) {
@@ -145,11 +126,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
             cleanupFn();
             contentCleanupFns.delete(marker);
           }
-          if (props.cluster && clusterManager.value) {
-            clusterManager.value.removeMarker(marker);
-          } else {
-            mapInstance == null ? void 0 : mapInstance.remove(marker);
-          }
+          mapInstance == null ? void 0 : mapInstance.remove(marker);
         }
       });
       const markersToAdd = newMarkers.filter((data) => {
@@ -161,11 +138,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
           const marker = createMarker(data);
           if (marker) {
             newMarkersList.push(marker);
-            if (props.cluster && clusterManager.value) {
-              clusterManager.value.addMarker(marker);
-            } else {
-              mapInstance == null ? void 0 : mapInstance.add(marker);
-            }
+            mapInstance == null ? void 0 : mapInstance.add(marker);
           }
         });
         markers.value.push(...newMarkersList);
@@ -175,19 +148,12 @@ 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);
-            if (props.cluster && clusterManager.value) {
-              clusterManager.value.addMarker(marker);
-            } else {
-              mapInstance == null ? void 0 : mapInstance.add(marker);
-            }
+            mapInstance == null ? void 0 : mapInstance.add(marker);
           }
         });
       }
@@ -195,9 +161,6 @@ 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);
@@ -215,16 +178,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
         const marker = createMarker(singleMarker);
         if (marker) {
           markers.value.push(marker);
-          if (props.cluster && clusterManager.value) {
-            clusterManager.value.addMarker(marker);
-          } else {
-            mapInstance == null ? void 0 : mapInstance.add(marker);
-          }
+          mapInstance == null ? void 0 : mapInstance.add(marker);
         }
       }
     }
     function removeMarkers() {
-      if (markers.value.length === 0)
+      if (!mapInstance || markers.value.length === 0)
         return;
       markers.value.forEach((marker) => {
         const cleanupFn = contentCleanupFns.get(marker);
@@ -232,17 +191,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
           cleanupFn();
           contentCleanupFns.delete(marker);
         }
-        if (props.cluster && clusterManager.value) {
-          clusterManager.value.removeMarker(marker);
-        } else if (mapInstance) {
-          mapInstance.remove(marker);
-        }
+        mapInstance == null ? void 0 : mapInstance.remove(marker);
       });
       markers.value = [];
-      if (props.cluster && clusterManager.value) {
-        clusterManager.value.clearMarkers();
-        clusterManager.value = null;
-      }
     }
     __expose({
       getMarkers: () => markers.value,

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

@@ -72,7 +72,6 @@ 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 },
@@ -133,7 +132,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
       "onValidate",
       "onSubmit",
       "onReset",
-      "className",
       "grid",
       "showCount"
     ];
@@ -142,7 +140,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
         Object.entries(props).filter(([key]) => !JKY_FORM_PROPS.includes(key))
       );
       const _a = attrs, { class: _, style } = _a, restAttrs = __objRest(_a, ["class", "style"]);
-      return __spreadValues(__spreadValues({}, formProps), restAttrs);
+      return __spreadValues(__spreadValues({ class: props.className || attrs.className || "" }, formProps), restAttrs);
     });
     const formClass = computed(() => {
       return [
@@ -155,7 +153,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
       if (props.inline && props.grid) {
         classes.push("jky-form--grid");
       }
-      return [...classes, props.formClass || ""];
+      return [...classes, props.className || attrs.className || ""];
     });
     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.96";
+const version = "0.0.97";
 export {
   version
 };

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

@@ -37,13 +37,12 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-import { defineComponent, ref, watch, useModel, computed, onMounted, resolveComponent, resolveDirective, openBlock, createElementBlock, normalizeClass, createBlock, unref, withCtx, createVNode, mergeProps, createElementVNode, createTextVNode, toDisplayString, createCommentVNode, resolveDynamicComponent, withDirectives, Fragment, renderList, renderSlot, normalizeStyle, mergeModels } from "vue";
+import { defineComponent, ref, watch, useModel, computed, onMounted, resolveDirective, openBlock, createElementBlock, normalizeClass, createBlock, unref, withCtx, createVNode, mergeProps, createCommentVNode, resolveDynamicComponent, withDirectives, Fragment, renderList, renderSlot, createTextVNode, toDisplayString, normalizeStyle, mergeModels } from "vue";
 import { useFullscreen } from "@vueuse/core";
 import { ElCard, ElTable, ElTableColumn, ElScrollbar, ElPagination } from "element-plus";
 import { JkyForm } from "../form/index.js";
 import _sfc_main$1 from "./Toolbar.vue.js";
 /* empty css             */
-const _hoisted_1 = { class: "jky-page-table__filter-actions" };
 const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({}, {
   name: "JkyPageTable"
 }), {
@@ -315,7 +314,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
     );
     return (_ctx, _cache) => {
       var _a, _b, _c;
-      const _component_ElButton = resolveComponent("ElButton");
       const _directive_loading = resolveDirective("loading");
       return openBlock(), createElementBlock("div", {
         ref_key: "pageTableRef",
@@ -333,28 +331,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
             }, __spreadValues({ inline: true }, __props.formProps), {
               modelValue: form.value,
               "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => form.value = $event),
-              "show-footer": false,
+              "show-footer": true,
               items: __props.filterItems,
-              disabled: isLoading.value
-            }), null, 16, ["modelValue", "items", "disabled"]),
-            createElementVNode("div", _hoisted_1, [
-              createVNode(_component_ElButton, {
-                type: "primary",
-                loading: isLoading.value,
-                onClick: handleSearch
-              }, {
-                default: withCtx(() => [
-                  createTextVNode(toDisplayString(__props.searchText), 1)
-                ]),
-                _: 1
-              }, 8, ["loading"]),
-              createVNode(_component_ElButton, { onClick: handleReset }, {
-                default: withCtx(() => [
-                  createTextVNode(toDisplayString(__props.resetText), 1)
-                ]),
-                _: 1
-              })
-            ])
+              disabled: isLoading.value,
+              "submit-text": "搜索",
+              "cancel-text": "重置",
+              onReset: handleReset,
+              onSubmit: handleSearch
+            }), null, 16, ["modelValue", "items", "disabled"])
           ]),
           _: 1
         })) : createCommentVNode("", true),

package/dist/es/style.css

@@ -1789,6 +1789,10 @@
     column-gap: calc(var(--spacing) * 2);
   }
 
+  .gap-x-3 {
+    column-gap: calc(var(--spacing) * 3);
+  }
+
   :where(.space-x-4 > :not(:last-child)) {
     --tw-space-x-reverse: 0;
     margin-inline-start: calc(calc(var(--spacing) * 4) * var(--tw-space-x-reverse));

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

@@ -28,7 +28,6 @@ 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,16 +33,13 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
     icon: {},
     offset: {},
     visible: { type: Boolean, default: true },
-    updateMode: { default: "full" },
-    cluster: { type: Boolean, default: false },
-    clusterOptions: {}
+    updateMode: { default: "full" }
   },
   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();
@@ -52,22 +49,6 @@ 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) {
@@ -147,11 +128,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
             cleanupFn();
             contentCleanupFns.delete(marker);
           }
-          if (props.cluster && clusterManager.value) {
-            clusterManager.value.removeMarker(marker);
-          } else {
-            mapInstance == null ? void 0 : mapInstance.remove(marker);
-          }
+          mapInstance == null ? void 0 : mapInstance.remove(marker);
         }
       });
       const markersToAdd = newMarkers.filter((data) => {
@@ -163,11 +140,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
           const marker = createMarker(data);
           if (marker) {
             newMarkersList.push(marker);
-            if (props.cluster && clusterManager.value) {
-              clusterManager.value.addMarker(marker);
-            } else {
-              mapInstance == null ? void 0 : mapInstance.add(marker);
-            }
+            mapInstance == null ? void 0 : mapInstance.add(marker);
           }
         });
         markers.value.push(...newMarkersList);
@@ -177,19 +150,12 @@ 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);
-            if (props.cluster && clusterManager.value) {
-              clusterManager.value.addMarker(marker);
-            } else {
-              mapInstance == null ? void 0 : mapInstance.add(marker);
-            }
+            mapInstance == null ? void 0 : mapInstance.add(marker);
           }
         });
       }
@@ -197,9 +163,6 @@ 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);
@@ -217,16 +180,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
         const marker = createMarker(singleMarker);
         if (marker) {
           markers.value.push(marker);
-          if (props.cluster && clusterManager.value) {
-            clusterManager.value.addMarker(marker);
-          } else {
-            mapInstance == null ? void 0 : mapInstance.add(marker);
-          }
+          mapInstance == null ? void 0 : mapInstance.add(marker);
         }
       }
     }
     function removeMarkers() {
-      if (markers.value.length === 0)
+      if (!mapInstance || markers.value.length === 0)
         return;
       markers.value.forEach((marker) => {
         const cleanupFn = contentCleanupFns.get(marker);
@@ -234,17 +193,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
           cleanupFn();
           contentCleanupFns.delete(marker);
         }
-        if (props.cluster && clusterManager.value) {
-          clusterManager.value.removeMarker(marker);
-        } else if (mapInstance) {
-          mapInstance.remove(marker);
-        }
+        mapInstance == null ? void 0 : mapInstance.remove(marker);
       });
       markers.value = [];
-      if (props.cluster && clusterManager.value) {
-        clusterManager.value.clearMarkers();
-        clusterManager.value = null;
-      }
     }
     __expose({
       getMarkers: () => markers.value,

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

@@ -74,7 +74,6 @@ 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 },
@@ -135,7 +134,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
       "onValidate",
       "onSubmit",
       "onReset",
-      "className",
       "grid",
       "showCount"
     ];
@@ -144,7 +142,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
         Object.entries(props).filter(([key]) => !JKY_FORM_PROPS.includes(key))
       );
       const _a = attrs, { class: _, style } = _a, restAttrs = __objRest(_a, ["class", "style"]);
-      return __spreadValues(__spreadValues({}, formProps), restAttrs);
+      return __spreadValues(__spreadValues({ class: props.className || attrs.className || "" }, formProps), restAttrs);
     });
     const formClass = vue.computed(() => {
       return [
@@ -157,7 +155,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
       if (props.inline && props.grid) {
         classes.push("jky-form--grid");
       }
-      return [...classes, props.formClass || ""];
+      return [...classes, props.className || attrs.className || ""];
     });
     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.96";
+const version = "0.0.97";
 exports.version = version;

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

@@ -45,7 +45,6 @@ const ElementPlus = require("element-plus");
 const index = require("../form/index.js");
 const Toolbar_vue_vue_type_script_setup_true_lang = require("./Toolbar.vue.js");
 ;/* empty css              */
-const _hoisted_1 = { class: "jky-page-table__filter-actions" };
 const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValues({}, {
   name: "JkyPageTable"
 }), {
@@ -317,7 +316,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
     );
     return (_ctx, _cache) => {
       var _a, _b, _c;
-      const _component_ElButton = vue.resolveComponent("ElButton");
       const _directive_loading = vue.resolveDirective("loading");
       return vue.openBlock(), vue.createElementBlock("div", {
         ref_key: "pageTableRef",
@@ -335,28 +333,14 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
             }, __spreadValues({ inline: true }, __props.formProps), {
               modelValue: form.value,
               "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => form.value = $event),
-              "show-footer": false,
+              "show-footer": true,
               items: __props.filterItems,
-              disabled: isLoading.value
-            }), null, 16, ["modelValue", "items", "disabled"]),
-            vue.createElementVNode("div", _hoisted_1, [
-              vue.createVNode(_component_ElButton, {
-                type: "primary",
-                loading: isLoading.value,
-                onClick: handleSearch
-              }, {
-                default: vue.withCtx(() => [
-                  vue.createTextVNode(vue.toDisplayString(__props.searchText), 1)
-                ]),
-                _: 1
-              }, 8, ["loading"]),
-              vue.createVNode(_component_ElButton, { onClick: handleReset }, {
-                default: vue.withCtx(() => [
-                  vue.createTextVNode(vue.toDisplayString(__props.resetText), 1)
-                ]),
-                _: 1
-              })
-            ])
+              disabled: isLoading.value,
+              "submit-text": "搜索",
+              "cancel-text": "重置",
+              onReset: handleReset,
+              onSubmit: handleSearch
+            }), null, 16, ["modelValue", "items", "disabled"])
           ]),
           _: 1
         })) : vue.createCommentVNode("", true),

package/dist/lib/style.css

@@ -1789,6 +1789,10 @@
     column-gap: calc(var(--spacing) * 2);
   }
 
+  .gap-x-3 {
+    column-gap: calc(var(--spacing) * 3);
+  }
+
   :where(.space-x-4 > :not(:last-child)) {
     --tw-space-x-reverse: 0;
     margin-inline-start: calc(calc(var(--spacing) * 4) * var(--tw-space-x-reverse));

package/package.json

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