jky-component-lib 0.0.117 → 0.0.122

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/style3.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/form/Form.vue.js

@@ -37,14 +37,13 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-import { defineComponent, useModel, provide, useAttrs, ref, computed, watch, resolveComponent, openBlock, createBlock, unref, mergeProps, withCtx, createElementBlock, Fragment, renderList, createElementVNode, normalizeClass, createTextVNode, toDisplayString, createCommentVNode, createVNode, mergeModels } from "vue";
+import { defineComponent, useSlots, useModel, provide, useAttrs, ref, computed, watch, resolveComponent, openBlock, createBlock, unref, mergeProps, withCtx, createElementBlock, Fragment, renderList, renderSlot, createElementVNode, normalizeClass, createTextVNode, toDisplayString, createCommentVNode, createVNode, mergeModels } from "vue";
 import { ElForm } from "element-plus";
-import { omit } from "lodash-es";
 import _sfc_main$1 from "./FormItem.vue.js";
 /* empty css              */
 const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({}, {
-  name: "JkyForm"
-  // inheritAttrs: false,
+  name: "JkyForm",
+  inheritAttrs: false
 }), {
   __name: "Form",
   props: /* @__PURE__ */ mergeModels({
@@ -91,8 +90,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emit = __emit;
+    useSlots();
     const modelValue = useModel(__props, "modelValue");
-    const customProps = ["items", "showTitle", "title", "gutter", "defaultSpan", "responsive", "watchDeep", "grid", "showFooter", "submitText", "cancelText", "submitDisabled", "cancelDisabled", "showCount"];
     provide("formModel", modelValue);
     const attrs = useAttrs();
     const formRef = ref();
@@ -109,23 +108,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
     const _showMoreButton = computed(() => {
       return props.items && props.items.length > props.showCount;
     });
+    const innerProps = computed(() => {
+      const _attrs = attrs["form-props"] || attrs.formProps || {};
+      return __spreadValues(__spreadValues(__spreadValues({}, attrs), _attrs), props.formProps);
+    });
     function toggleShowMore() {
       showAllItems.value = !showAllItems.value;
     }
-    const _gridStyle = computed(() => {
-      if (!attrs.inline || !props.grid || typeof props.grid === "boolean") {
-        return {};
-      }
-      const style = {};
-      const breakpoints = ["xs", "sm", "md", "lg", "xl", "2xl", "3xl"];
-      breakpoints.forEach((breakpoint) => {
-        const columns = props.grid[breakpoint];
-        if (columns !== void 0) {
-          style[`--jky-form-grid-cols-${breakpoint}`] = columns;
-        }
-      });
-      return style;
-    });
     watch(
       () => modelValue.value,
       (newVal, oldVal) => {
@@ -185,74 +174,93 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
       }
     });
     return (_ctx, _cache) => {
-      const _component_ElButton = resolveComponent("ElButton");
       const _component_ElFormItem = resolveComponent("ElFormItem");
+      const _component_ElButton = resolveComponent("ElButton");
       return openBlock(), createBlock(unref(ElForm), mergeProps({
         ref_key: "formRef",
-        ref: formRef
-      }, unref(omit)(props, customProps), {
-        class: ["jky-form", [_ctx.$attrs.inline && "jky-form--inline", props.grid && "jky-form--grid"]],
+        ref: formRef,
+        class: "jky-form",
         model: modelValue.value,
-        style: [_gridStyle.value]
-      }), {
+        inline: props.inline
+      }, innerProps.value), {
         default: withCtx(() => [
           (openBlock(true), createElementBlock(Fragment, null, renderList(_visibleItems.value, (item) => {
-            return openBlock(), createBlock(_sfc_main$1, {
-              key: item.field,
-              field: item.field,
-              config: item,
-              model: modelValue.value,
-              readonly: typeof __props.readonly === "function" ? __props.readonly({ model: modelValue.value, field: item.field, $form: modelValue.value }) : __props.readonly,
-              disabled: __props.disabled
-            }, null, 8, ["field", "config", "model", "readonly", "disabled"]);
+            return openBlock(), createElementBlock(Fragment, {
+              key: item.field
+            }, [
+              item.slot ? (openBlock(), createBlock(_component_ElFormItem, {
+                key: 0,
+                label: item.label,
+                prop: item.field,
+                "label-width": item.labelWidth,
+                disabled: __props.disabled
+              }, {
+                default: withCtx(() => [
+                  renderSlot(_ctx.$slots, item.slot, {
+                    model: modelValue.value,
+                    field: item.field
+                  })
+                ]),
+                _: 2
+              }, 1032, ["label", "prop", "label-width", "disabled"])) : (openBlock(), createBlock(_sfc_main$1, {
+                key: 1,
+                field: item.field,
+                config: item,
+                model: modelValue.value,
+                disabled: __props.disabled
+              }, null, 8, ["field", "config", "model", "disabled"]))
+            ], 64);
           }), 128)),
           _showMoreButton.value || props.showFooter ? (openBlock(), createBlock(_component_ElFormItem, {
             key: 0,
             "label-width": 0
           }, {
-            default: withCtx(() => [
-              createElementVNode("div", {
-                class: normalizeClass(["w-full flex gap-2", [props.grid && _ctx.$attrs.inline ? "justify-center" : "justify-end", props.footerClass]])
-              }, [
-                _showMoreButton.value ? (openBlock(), createBlock(_component_ElButton, {
-                  key: 0,
-                  type: "primary",
-                  onClick: toggleShowMore
-                }, {
-                  default: withCtx(() => [
-                    createTextVNode(toDisplayString(showAllItems.value ? "收起" : `展开 (${props.items.length - props.showCount})`), 1)
-                  ]),
-                  _: 1
-                })) : createCommentVNode("", true),
-                props.showFooter ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-                  createVNode(_component_ElButton, {
-                    disabled: __props.cancelDisabled || __props.disabled,
-                    onClick: handleCancel
-                  }, {
-                    default: withCtx(() => [
-                      createTextVNode(toDisplayString(__props.cancelText), 1)
-                    ]),
-                    _: 1
-                  }, 8, ["disabled"]),
-                  createVNode(_component_ElButton, {
+            default: withCtx(() => {
+              var _a;
+              return [
+                createElementVNode("div", {
+                  class: normalizeClass(["w-full flex gap-2", [__props.inline ? "justify-start" : "justify-end", __props.footerClass]])
+                }, [
+                  _showMoreButton.value ? (openBlock(), createBlock(_component_ElButton, {
+                    key: 0,
                     type: "primary",
-                    disabled: __props.submitDisabled || __props.disabled,
-                    loading: false,
-                    onClick: handleSubmit
+                    onClick: toggleShowMore
                   }, {
                     default: withCtx(() => [
-                      createTextVNode(toDisplayString(__props.submitText), 1)
+                      createTextVNode(toDisplayString(showAllItems.value ? "收起" : `展开 (${props.items.length - props.showCount})`), 1)
                     ]),
                     _: 1
-                  }, 8, ["disabled"])
-                ], 64)) : createCommentVNode("", true)
-              ], 2)
-            ]),
+                  })) : createCommentVNode("", true),
+                  props.showFooter ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+                    createVNode(_component_ElButton, {
+                      disabled: (_a = props.cancelDisabled) != null ? _a : props.disabled,
+                      onClick: handleCancel
+                    }, {
+                      default: withCtx(() => [
+                        createTextVNode(toDisplayString(__props.cancelText), 1)
+                      ]),
+                      _: 1
+                    }, 8, ["disabled"]),
+                    createVNode(_component_ElButton, {
+                      type: "primary",
+                      disabled: props.submitDisabled || props.disabled,
+                      loading: false,
+                      onClick: handleSubmit
+                    }, {
+                      default: withCtx(() => [
+                        createTextVNode(toDisplayString(__props.submitText), 1)
+                      ]),
+                      _: 1
+                    }, 8, ["disabled"])
+                  ], 64)) : createCommentVNode("", true)
+                ], 2)
+              ];
+            }),
             _: 1
           })) : createCommentVNode("", true)
         ]),
-        _: 1
-      }, 16, ["model", "class", "style"]);
+        _: 3
+      }, 16, ["model", "inline"]);
     };
   }
 }));

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

@@ -51,7 +51,7 @@ var __async = (__this, __arguments, generator) => {
 };
 import { defineComponent, ref, watch, computed, openBlock, createElementBlock, createBlock, unref, mergeProps, withCtx, createElementVNode, resolveDynamicComponent, Fragment, createTextVNode, toDisplayString, createCommentVNode, createSlots, h } from "vue";
 import { Plus, CircleCloseFilled, CircleCheckFilled, WarningFilled, QuestionFilled } from "@element-plus/icons-vue";
-import { ElFormItem, ElDivider, ElInput, ElUpload, ElButton, ElIcon, ElInputNumber, ElRate, ElTransfer, ElSelectV2, ElMention, ElInputTag, ElColorPickerPanel, ElColorPicker, ElTreeSelect, ElCascader, ElSlider, ElSwitch, ElCheckboxGroup, ElCheckbox, ElRadioGroup, ElRadio, ElTimeSelect, ElTimePicker, ElDatePicker, ElAutocomplete, ElSelect, ElTooltip } from "element-plus";
+import { ElFormItem, ElDivider, ElInput, ElUpload, ElButton, ElIcon, ElInputNumber, ElRate, ElTransfer, ElSelectV2, ElMention, ElInputTag, ElColorPickerPanel, ElColorPicker, ElTreeSelect, ElCascader, ElSlider, ElSwitch, ElCheckboxGroup, ElCheckbox, ElRadioGroup, ElRadioButton, ElRadio, ElTimeSelect, ElTimePicker, ElDatePicker, ElAutocomplete, ElSelect, ElTooltip } from "element-plus";
 import { JkyAddInput } from "../add-input/index.js";
 import { JkyCodeMirrorEditor } from "../code-mirror-editor/index.js";
 import { JkyRichEditor } from "../rich-editor/index.js";
@@ -223,49 +223,63 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
       }, componentProps.value), {
         "class": ["w-full min-w-25", componentProps.value.class]
       });
+      const { slots: componentSlots } = componentProps.value;
+      const _componentSlotsObj = typeof componentSlots === "function" ? componentSlots({
+        model: props.model,
+        field: props.field,
+        $form: props.model
+      }) : componentSlots;
       switch (type) {
         case "input":
-          return h(ElInput, __spreadProps(__spreadValues({}, commonProps), {
-            placeholder: commonProps.placeholder || "请输入",
-            prefixIcon: props.config.prefixIcon,
-            suffixIcon: props.config.suffixIcon
-          }));
+          return h(
+            ElInput,
+            __spreadProps(__spreadValues({}, commonProps), {
+              placeholder: commonProps.placeholder || "请输入",
+              prefixIcon: props.config.prefixIcon,
+              suffixIcon: props.config.suffixIcon
+            }),
+            _componentSlotsObj
+          );
         case "textarea":
-          return h(ElInput, __spreadProps(__spreadValues({}, commonProps), {
-            placeholder: commonProps.placeholder || "请输入",
-            type: "textarea",
-            rows: 4
-          }));
+          return h(
+            ElInput,
+            __spreadProps(__spreadValues({}, commonProps), {
+              placeholder: commonProps.placeholder || "请输入",
+              type: "textarea",
+              rows: 4
+            }),
+            _componentSlotsObj
+          );
         case "select": {
           const selectProps = __spreadValues(__spreadProps(__spreadValues({}, commonProps), {
             placeholder: commonProps.placeholder || "请选择"
           }), componentProps.value);
-          return h(ElSelect, selectProps);
+          return h(ElSelect, selectProps, _componentSlotsObj);
         }
         case "autocomplete": {
           const autocompleteProps = __spreadValues(__spreadProps(__spreadValues({}, commonProps), {
             placeholder: commonProps.placeholder || "请输入"
           }), componentProps.value);
-          return h(ElAutocomplete, autocompleteProps);
+          return h(ElAutocomplete, autocompleteProps, _componentSlotsObj);
         }
         case "datepicker":
-          return h(ElDatePicker, __spreadValues(__spreadValues({}, commonProps), componentProps.value));
+          return h(ElDatePicker, __spreadValues(__spreadValues({}, commonProps), componentProps.value), _componentSlotsObj);
         case "datetime-picker":
-          return h(ElDatePicker, __spreadValues(__spreadValues({}, commonProps), componentProps.value));
+          return h(ElDatePicker, __spreadValues(__spreadValues({}, commonProps), componentProps.value), _componentSlotsObj);
         case "time-picker":
-          return h(ElTimePicker, __spreadValues(__spreadValues({}, commonProps), componentProps.value));
+          return h(ElTimePicker, __spreadValues(__spreadValues({}, commonProps), componentProps.value), _componentSlotsObj);
         case "time-select":
-          return h(ElTimeSelect, __spreadValues(__spreadValues({}, commonProps), componentProps.value));
+          return h(ElTimeSelect, __spreadValues(__spreadValues({}, commonProps), componentProps.value), _componentSlotsObj);
         case "radio-group": {
           const radioGroupProps = __spreadValues(__spreadValues({}, commonProps), componentProps.value);
           return h(
             ElRadioGroup,
             radioGroupProps,
-            {
+            __spreadValues({
               default: () => {
                 const options = componentProps.value.options || props.config.options || [];
                 return options.map(
-                  (option) => h(ElRadio, {
+                  (option) => h(radioGroupProps.button ? ElRadioButton : ElRadio, {
                     key: option.value,
                     value: option.value,
                     disabled: option.disabled
@@ -274,7 +288,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
                   })
                 );
               }
-            }
+            }, _componentSlotsObj)
           );
         }
         case "checkbox-group": {
@@ -285,7 +299,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
           return h(
             ElCheckboxGroup,
             checkboxGroupProps,
-            {
+            __spreadValues({
               default: () => {
                 const options = componentProps.value.options || props.config.options || [];
                 return options.map(
@@ -298,30 +312,30 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
                   })
                 );
               }
-            }
+            }, _componentSlotsObj)
           );
         }
         case "switch":
-          return h(ElSwitch, __spreadValues(__spreadValues({}, commonProps), componentProps.value));
+          return h(ElSwitch, __spreadValues(__spreadValues({}, commonProps), componentProps.value), _componentSlotsObj);
         case "slider":
-          return h(ElSlider, __spreadValues(__spreadValues({}, commonProps), componentProps.value));
+          return h(ElSlider, __spreadValues(__spreadValues({}, commonProps), componentProps.value), _componentSlotsObj);
         case "cascader": {
           const cascaderProps = __spreadValues(__spreadProps(__spreadValues({}, commonProps), {
             placeholder: commonProps.placeholder || "请选择"
           }), componentProps.value);
-          return h(ElCascader, cascaderProps);
+          return h(ElCascader, cascaderProps, _componentSlotsObj);
         }
         case "tree-select": {
           const treeSelectProps = __spreadValues(__spreadProps(__spreadValues({}, commonProps), {
             placeholder: commonProps.placeholder || "请选择"
           }), componentProps.value);
-          return h(ElTreeSelect, treeSelectProps);
+          return h(ElTreeSelect, treeSelectProps, _componentSlotsObj);
         }
         case "color-picker":
-          return h(ElColorPicker, __spreadValues(__spreadValues({}, commonProps), componentProps.value));
+          return h(ElColorPicker, __spreadValues(__spreadValues({}, commonProps), componentProps.value), _componentSlotsObj);
         // 颜色选择器面板
         case "color-picker-panel":
-          return h(ElColorPickerPanel, __spreadValues(__spreadValues({}, commonProps), componentProps.value));
+          return h(ElColorPickerPanel, __spreadValues(__spreadValues({}, commonProps), componentProps.value), _componentSlotsObj);
         // 标签输入框
         case "input-tag": {
           const inputTagProps = __spreadValues(__spreadProps(__spreadValues({}, commonProps), {
@@ -330,7 +344,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
               props.model[props.field] = val;
             }
           }), componentProps.value);
-          return h(ElInputTag, inputTagProps);
+          return h(ElInputTag, inputTagProps, _componentSlotsObj);
         }
         // 提及组件
         case "mention": {
@@ -340,7 +354,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
               props.model[props.field] = val;
             }
           }), componentProps.value);
-          return h(ElMention, mentionProps);
+          return h(ElMention, mentionProps, _componentSlotsObj);
         }
         // 虚拟化选择器
         case "select-v2": {
@@ -351,7 +365,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
             },
             "options": componentProps.value.options || []
           }), componentProps.value);
-          return h(ElSelectV2, selectV2Props);
+          return h(ElSelectV2, selectV2Props, _componentSlotsObj);
         }
         // 穿梭框
         case "transfer": {
@@ -362,15 +376,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
             },
             "data": componentProps.value.data || []
           }), componentProps.value);
-          return h(ElTransfer, transferProps);
+          return h(ElTransfer, transferProps, _componentSlotsObj);
         }
         // 表格选择器
         case "select-table":
           return h(_sfc_main$1, __spreadProps(__spreadValues(__spreadValues({}, commonProps), componentProps.value), {
             labelWidth: formItemProps.value.labelWidth
-          }));
+          }), _componentSlotsObj);
         case "rate":
-          return h(ElRate, __spreadValues(__spreadValues({}, commonProps), componentProps.value));
+          return h(ElRate, __spreadValues(__spreadValues({}, commonProps), componentProps.value), _componentSlotsObj);
         case "input-number": {
           const numberModelValue = modelValue.value === "" || modelValue.value === null || modelValue.value === void 0 ? null : Number(modelValue.value);
           const inputNumberProps = __spreadValues(__spreadProps(__spreadValues({}, commonProps), {
@@ -380,7 +394,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
               props.model[props.field] = val;
             }
           }), componentProps.value);
-          return h(ElInputNumber, inputNumberProps);
+          return h(ElInputNumber, inputNumberProps, _componentSlotsObj);
         }
         // 图片上传
         case "image-upload": {
@@ -392,18 +406,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
             "onRemove": componentProps.value.onRemove
           }), componentProps.value);
           if (uploadProps["list-type"] === "picture-card") {
-            return h(ElUpload, uploadProps, {
+            return h(ElUpload, uploadProps, __spreadValues({
               default: () => h("div", { class: "el-upload__picture-card-wrapper" }, [
                 h(ElIcon, { size: 24 }, { default: () => h(Plus) })
               ])
-            });
+            }, _componentSlotsObj));
           }
           if (uploadProps["list-type"] === "picture") {
-            return h(ElUpload, uploadProps, {
+            return h(ElUpload, uploadProps, __spreadValues({
               default: () => h(ElButton, { type: "primary" }, { default: () => "点击上传" })
-            });
+            }, _componentSlotsObj));
           }
-          return h(ElUpload, uploadProps);
+          return h(ElUpload, uploadProps, _componentSlotsObj);
         }
         // 文件上传
         case "file-upload": {
@@ -415,26 +429,26 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
             "onRemove": componentProps.value.onRemove
           }), componentProps.value);
           if (uploadProps["list-type"] === "text") {
-            return h(ElUpload, uploadProps, {
+            return h(ElUpload, uploadProps, __spreadValues({
               default: () => h(ElButton, { type: "primary" }, { default: () => "点击上传" })
-            });
+            }, _componentSlotsObj));
           }
-          return h(ElUpload, uploadProps);
+          return h(ElUpload, uploadProps, _componentSlotsObj);
         }
         // CodeMirror 编辑器
         case "code-mirror-editor": {
           const codeMirrorProps = __spreadValues(__spreadValues({}, commonProps), componentProps.value);
-          return h(JkyCodeMirrorEditor, codeMirrorProps);
+          return h(JkyCodeMirrorEditor, codeMirrorProps, _componentSlotsObj);
         }
         // RichEditor 富文本编辑器
         case "rich-editor": {
           const richEditorProps = __spreadValues(__spreadValues({}, commonProps), componentProps.value);
-          return h(JkyRichEditor, richEditorProps);
+          return h(JkyRichEditor, richEditorProps, _componentSlotsObj);
         }
         // AddInput 动态键值对输入框
         case "add-input": {
           const addInputProps = __spreadValues(__spreadValues({}, commonProps), componentProps.value);
-          return h(JkyAddInput, addInputProps);
+          return h(JkyAddInput, addInputProps, _componentSlotsObj);
         }
         case "custom":
           return (_b = (_a = props.config).render) == null ? void 0 : _b.call(_a, commonProps);

package/dist/es/form/style.css

@@ -4,15 +4,6 @@
   --jky-form-item-border-width: 4px;
   --jky-form-item-border-color: var(--el-color-primary);
   --jky-form-item-bg-color: rgba(var(--el-color-primary-rgb), 0.5);
-  
-  /* Grid 布局默认列数（可通过响应式变量覆盖） */
-  --jky-form-grid-cols-xs: 1;
-  --jky-form-grid-cols-sm: 2;
-  --jky-form-grid-cols-md: 2;
-  --jky-form-grid-cols-lg: 3;
-  --jky-form-grid-cols-xl: 3;
-  --jky-form-grid-cols-2xl: 4;
-  --jky-form-grid-cols-3xl: 4;
 }
 
 
@@ -20,50 +11,3 @@
 .jky-form {
   /* 表单容器样式 */
 }
-
-
-/* Grid 布局模式 */
-.jky-form--grid {
-  display: grid;
-  grid-template-columns: repeat(var(--jky-form-grid-cols-xs), minmax(0, 1fr));
-  gap: var(--el-form-item-gutter, 16px);
-}
-.el-form--inline.jky-form--grid .el-form-item {
-  margin-right: 0;
-.el-form-item__content {
-    align-items: flex-start;
-}
-}
-
-
-/* 响应式断点 */
-@media (min-width: 640px) {
-.jky-form--grid {
-    grid-template-columns: repeat(var(--jky-form-grid-cols-sm, var(--jky-form-grid-cols-xs)), minmax(0, 1fr));
-}
-}
-@media (min-width: 768px) {
-.jky-form--grid {
-    grid-template-columns: repeat(var(--jky-form-grid-cols-md, var(--jky-form-grid-cols-sm)), minmax(0, 1fr));
-}
-}
-@media (min-width: 1024px) {
-.jky-form--grid {
-    grid-template-columns: repeat(var(--jky-form-grid-cols-lg, var(--jky-form-grid-cols-md)), minmax(0, 1fr));
-}
-}
-@media (min-width: 1280px) {
-.jky-form--grid {
-    grid-template-columns: repeat(var(--jky-form-grid-cols-xl, var(--jky-form-grid-cols-lg)), minmax(0, 1fr));
-}
-}
-@media (min-width: 1536px) {
-.jky-form--grid {
-    grid-template-columns: repeat(var(--jky-form-grid-cols-2xl, var(--jky-form-grid-cols-xl)), minmax(0, 1fr));
-}
-}
-@media (min-width: 1920px) {
-.jky-form--grid {
-    grid-template-columns: repeat(var(--jky-form-grid-cols-3xl, var(--jky-form-grid-cols-2xl)), minmax(0, 1fr));
-}
-}

package/dist/es/modal/Modal.vue.js

@@ -83,7 +83,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
       modelValue.value = false;
     }
     function handleConfirm() {
-      handleClose();
       emit("confirm");
     }
     function handleCancel() {

package/dist/es/package.json.js

@@ -1,4 +1,4 @@
-const version = "0.0.117";
+const version = "0.0.122";
 export {
   version
 };

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

@@ -388,7 +388,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
             createVNode(unref(JkyForm), mergeProps({
               ref_key: "formRef",
               ref: formRef
-            }, __spreadValues({ inline: true, grid: true }, __props.formProps), {
+            }, __spreadValues({ inline: true }, __props.formProps), {
               modelValue: form.value,
               "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => form.value = $event),
               "show-footer": true,

package/dist/es/style.css

@@ -1899,6 +1899,10 @@
     justify-content: flex-end;
   }
 
+  .justify-start {
+    justify-content: flex-start;
+  }
+
   .gap-1 {
     gap: calc(var(--spacing) * 1);
   }
@@ -3047,6 +3051,12 @@
       grid-template-columns: repeat(4, minmax(0, 1fr));
     }
   }
+
+  @media (min-width: 80rem) {
+    .xl\:grid-cols-2 {
+      grid-template-columns: repeat(2, minmax(0, 1fr));
+    }
+  }
 }
 
 @property --tw-translate-x {