jky-component-lib 0.0.95 → 0.0.97

package/dist/es/amap/style.css

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

package/dist/es/amap/style2.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/form/Form.vue.js

@@ -132,7 +132,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
       "onValidate",
       "onSubmit",
       "onReset",
-      "className",
       "grid",
       "showCount"
     ];
@@ -141,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 [
@@ -154,7 +153,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
       if (props.inline && props.grid) {
         classes.push("jky-form--grid");
       }
-      return classes;
+      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.95";
+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",
@@ -324,7 +322,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({
@@ -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/style.css

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

package/dist/lib/amap/style2.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/form/Form.vue.js

@@ -134,7 +134,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
       "onValidate",
       "onSubmit",
       "onReset",
-      "className",
       "grid",
       "showCount"
     ];
@@ -143,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 [
@@ -156,7 +155,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent(__spreadProps(__spreadValu
       if (props.inline && props.grid) {
         classes.push("jky-form--grid");
       }
-      return classes;
+      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.95";
+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",
@@ -326,7 +324,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({
@@ -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.95",
+  "version": "0.0.97",
   "publishConfig": {
     "access": "public"
   },