@vunk/form 2.16.1 → 2.16.3

package/components/dialog/index.cjs

@@ -44,7 +44,8 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const hasFooterSlot = vue.computed(() => !!slots.footer);
     vue.watch(() => props.modelValue, () => {
       props.modelValue && vue.nextTick(() => {
-        formsRef.value?.forms.forEach(({ form }) => form.resetFields?.());
+        console.log("reset forms", formsRef.value?.forms);
+        formsRef.value?.forms.forEach(({ form }) => form.clearValidate?.());
       });
     });
     async function validate() {

package/components/dialog/index.mjs

@@ -40,7 +40,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     const hasFooterSlot = computed(() => !!slots.footer);
     watch(() => props.modelValue, () => {
       props.modelValue && nextTick(() => {
-        formsRef.value?.forms.forEach(({ form }) => form.resetFields?.());
+        console.log("reset forms", formsRef.value?.forms);
+        formsRef.value?.forms.forEach(({ form }) => form.clearValidate?.());
       });
     });
     async function validate() {

package/components/radio/index.cjs

@@ -2,12 +2,14 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var vue = require('vue');
 var formItem = require('@vunk/form/components/form-item');
+var utilsVue = require('@vunk/core/shared/utils-vue');
 var elementPlus = require('element-plus');
-var vue = require('vue');
 var elementPlus$1 = require('@vunk/form/shared/element-plus');
 var utilsObject = require('@vunk/core/shared/utils-object');
 var composables = require('@vunk/form/composables');
+var object = require('@vunk/shared/object');
 var _pluginVue_exportHelper = require('../_plugin-vue_export-helper.cjs');
 
 const props = {
@@ -17,25 +19,138 @@ const props = {
     type: Array,
     default: () => []
   },
+  /**
+   * @description Radio 组件的风格类型 
+   */
   type: {
     type: String,
-    default: "default"
+    default: "radio"
   },
   modelValue: {
     type: [String, Number]
-  }
+  },
+  slots: null
 };
 const emits = {
   ...elementPlus.radioGroupEmits
 };
+const createOnEmits = utilsVue.onEmitsFactory(emits);
 
-var _sfc_main = vue.defineComponent({
-  name: "VkfRadio",
+var _sfc_main$2 = /* @__PURE__ */ vue.defineComponent({
+  __name: "option",
+  props: {
+    type: {
+      type: String,
+      default: "radio"
+    },
+    item: {
+      type: Object,
+      required: true
+    },
+    modelValue: null
+  },
+  emits: [
+    "update:modelValue"
+  ],
+  setup(__props, { expose: __expose }) {
+    __expose();
+    const props = __props;
+    const coreProps = vue.computed(() => {
+      const obj = object.pickObject(props.item, {
+        excludes: ["label", "value"]
+      });
+      if (elementPlus$1.isGte2_6_0) {
+        obj.value = props.item.value;
+      } else {
+        obj.label = props.item.value;
+      }
+      return obj;
+    });
+    const __returned__ = { props, coreProps, get ElCard() {
+      return elementPlus.ElCard;
+    }, get ElRadioButton() {
+      return elementPlus.ElRadioButton;
+    }, get ElRadio() {
+      return elementPlus.ElRadio;
+    } };
+    Object.defineProperty(__returned__, "__isScriptSetup", { enumerable: false, value: true });
+    return __returned__;
+  }
+});
+
+const _hoisted_1 = { class: "vkf-radio-option-card__content" };
+function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
+  return $props.type === "button" ? (vue.openBlock(), vue.createBlock(
+    $setup["ElRadioButton"],
+    vue.normalizeProps(vue.mergeProps({ key: 0 }, $setup.coreProps)),
+    {
+      default: vue.withCtx(() => [
+        vue.renderSlot(_ctx.$slots, "option", vue.normalizeProps(vue.guardReactiveProps($props.item)), () => [
+          vue.createTextVNode(
+            vue.toDisplayString($props.item.label ?? $props.item.value),
+            1
+            /* TEXT */
+          )
+        ])
+      ]),
+      _: 3
+      /* FORWARDED */
+    },
+    16
+    /* FULL_PROPS */
+  )) : $props.type === "card" ? (vue.openBlock(), vue.createBlock($setup["ElCard"], {
+    key: 1,
+    shadow: "hover",
+    class: vue.normalizeClass(["vkf-radio-option-card", { "is-checked": $props.modelValue === $props.item.value }]),
+    onClick: _cache[0] || (_cache[0] = ($event) => _ctx.$emit("update:modelValue", $props.item.value))
+  }, {
+    default: vue.withCtx(() => [
+      vue.createElementVNode("div", _hoisted_1, [
+        vue.renderSlot(_ctx.$slots, "option", vue.normalizeProps(vue.guardReactiveProps($props.item)), () => [
+          vue.createTextVNode(
+            vue.toDisplayString($props.item.label ?? $props.item.value),
+            1
+            /* TEXT */
+          )
+        ])
+      ]),
+      vue.createVNode(
+        $setup["ElRadio"],
+        vue.mergeProps($setup.coreProps, { border: false }),
+        null,
+        16
+        /* FULL_PROPS */
+      )
+    ]),
+    _: 3
+    /* FORWARDED */
+  }, 8, ["class"])) : (vue.openBlock(), vue.createBlock(
+    $setup["ElRadio"],
+    vue.normalizeProps(vue.mergeProps({ key: 2 }, $setup.coreProps)),
+    {
+      default: vue.withCtx(() => [
+        vue.renderSlot(_ctx.$slots, "option", vue.normalizeProps(vue.guardReactiveProps($props.item)), () => [
+          vue.createTextVNode(
+            vue.toDisplayString($props.item.label ?? $props.item.value),
+            1
+            /* TEXT */
+          )
+        ])
+      ]),
+      _: 3
+      /* FORWARDED */
+    },
+    16
+    /* FULL_PROPS */
+  ));
+}
+var OptionView = /* @__PURE__ */ _pluginVue_exportHelper._export_sfc(_sfc_main$2, [["render", _sfc_render$1], ["__file", "/home/runner/work/private-vunk-form/private-vunk-form/packages/components/radio/src/option.vue"]]);
+
+var _sfc_main$1 = vue.defineComponent({
   components: {
     VkfFormItem: formItem.VkfFormItem,
-    ElRadio: elementPlus.ElRadio,
     ElRadioGroup: elementPlus.ElRadioGroup,
-    ElRadioButton: elementPlus.ElRadioButton
+    OptionView
   },
   props,
   emits,
@@ -70,6 +185,7 @@ var _sfc_main = vue.defineComponent({
 });
 
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_OptionView = vue.resolveComponent("OptionView");
   const _component_ElRadioGroup = vue.resolveComponent("ElRadioGroup");
   const _component_VkfFormItem = vue.resolveComponent("VkfFormItem");
   return vue.openBlock(), vue.createBlock(
@@ -88,50 +204,62 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             (vue.openBlock(true), vue.createElementBlock(
               vue.Fragment,
               null,
-              vue.renderList(_ctx.options, (item) => {
-                return vue.openBlock(), vue.createBlock(
-                  vue.resolveDynamicComponent(_ctx.type === "button" ? "ElRadioButton" : "ElRadio"),
-                  vue.mergeProps({
-                    key: item.value
-                  }, { ref_for: true }, _ctx.pickRadioProps(item)),
-                  {
-                    default: vue.withCtx(() => [
-                      vue.createTextVNode(
-                        vue.toDisplayString(item.label ?? item.value),
-                        1
-                        /* TEXT */
-                      )
-                    ]),
-                    _: 2
-                    /* DYNAMIC */
-                  },
-                  1040
-                  /* FULL_PROPS, DYNAMIC_SLOTS */
-                );
+              vue.renderList(_ctx.options, (item, index) => {
+                return vue.openBlock(), vue.createBlock(_component_OptionView, {
+                  key: `${item.value || item.label || index}`,
+                  type: _ctx.type,
+                  item,
+                  "model-value": _ctx.modelValue,
+                  "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.$emit("update:modelValue", $event))
+                }, {
+                  option: vue.withCtx((optionProps) => [
+                    vue.renderSlot(_ctx.$slots, "option", vue.mergeProps({ ref_for: true }, optionProps))
+                  ]),
+                  _: 2
+                  /* DYNAMIC */
+                }, 1032, ["type", "item", "model-value"]);
               }),
               128
               /* KEYED_FRAGMENT */
             ))
           ]),
-          _: 1
-          /* STABLE */
+          _: 3
+          /* FORWARDED */
         }, 16, ["class", "disabled"])
       ]),
-      _: 1
-      /* STABLE */
+      _: 3
+      /* FORWARDED */
     },
     16
     /* FULL_PROPS */
   );
 }
-var VkfRadio = /* @__PURE__ */ _pluginVue_exportHelper._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "/home/runner/work/private-vunk-form/private-vunk-form/packages/components/radio/src/index.vue"]]);
+var Core = /* @__PURE__ */ _pluginVue_exportHelper._export_sfc(_sfc_main$1, [["render", _sfc_render], ["__file", "/home/runner/work/private-vunk-form/private-vunk-form/packages/components/radio/src/index.vue"]]);
+
+var _sfc_main = vue.defineComponent({
+  name: "VkfRadio",
+  props,
+  emits,
+  setup(props2, { emit, slots }) {
+    const coreEmits = createOnEmits(emit);
+    return () => vue.h(Core, {
+      ...props2,
+      ...utilsVue.vOn(coreEmits)
+    }, {
+      ...props2.slots,
+      ...slots
+    });
+  }
+});
+
+var VkfRadio = /* @__PURE__ */ _pluginVue_exportHelper._export_sfc(_sfc_main, [["__file", "/home/runner/work/private-vunk-form/private-vunk-form/packages/components/radio/src/wraper.vue"]]);
 
 var types = /*#__PURE__*/Object.freeze({
   __proto__: null
 });
 
 VkfRadio.install = (app) => {
-  app.component(VkfRadio.name, VkfRadio);
+  app.component(VkfRadio.name || "VkfRadio", VkfRadio);
 };
 
 exports.VkfRadio = VkfRadio;

package/components/radio/index.css

@@ -1,3 +1,19 @@
+.vkf-radio-option-card.is-checked {
+  border-color: var(--el-color-primary);
+}
+.vkf-radio-option-card{
+  font-size: var(--el-font-size-base);
+  cursor: pointer;
+}
+.vkf-radio-option-card:not(:last-child) {
+  margin-right: 30px;
+}
+.vkf-radio-option-card > .el-card__body{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: max-content;
+}
 .el-radio-group.is-readonly,
 .el-radio-group.is-readonly .el-radio-button{
   --el-readonly-cursor: auto;

package/components/radio/index.d.ts

@@ -1,4 +1,4 @@
-import VkfRadio from './src/index.vue';
+import VkfRadio from './src/wraper.vue';
 export * as __VkfRadio from './src/types';
 export { VkfRadio, };
 export default VkfRadio;

package/components/radio/index.mjs

@@ -1,9 +1,11 @@
+import { defineComponent, computed, openBlock, createBlock, normalizeProps, mergeProps, withCtx, renderSlot, guardReactiveProps, createTextVNode, toDisplayString, normalizeClass, createElementVNode, createVNode, resolveComponent, toHandlers, createElementBlock, Fragment, renderList, h } from 'vue';
 import { _VkfFormItemCtx, VkfFormItem } from '@vunk/form/components/form-item';
-import { radioGroupProps, radioGroupEmits, ElRadio, ElRadioGroup, ElRadioButton } from 'element-plus';
-import { defineComponent, computed, resolveComponent, openBlock, createBlock, normalizeProps, guardReactiveProps, withCtx, createVNode, mergeProps, toHandlers, createElementBlock, Fragment, renderList, resolveDynamicComponent, createTextVNode, toDisplayString } from 'vue';
-import { createRadioGroupBindProps, createRadioGroupOnEmits, isGte2_6_0 } from '@vunk/form/shared/element-plus';
-import { pickObject } from '@vunk/core/shared/utils-object';
+import { onEmitsFactory, vOn } from '@vunk/core/shared/utils-vue';
+import { radioGroupProps, radioGroupEmits, ElCard, ElRadioButton, ElRadio, ElRadioGroup } from 'element-plus';
+import { isGte2_6_0, createRadioGroupBindProps, createRadioGroupOnEmits } from '@vunk/form/shared/element-plus';
+import { pickObject as pickObject$1 } from '@vunk/core/shared/utils-object';
 import { useComputedReadonly } from '@vunk/form/composables';
+import { pickObject } from '@vunk/shared/object';
 import { _ as _export_sfc } from '../_plugin-vue_export-helper.mjs';
 
 const props = {
@@ -13,25 +15,138 @@ const props = {
     type: Array,
     default: () => []
   },
+  /**
+   * @description Radio 组件的风格类型 
+   */
   type: {
     type: String,
-    default: "default"
+    default: "radio"
   },
   modelValue: {
     type: [String, Number]
-  }
+  },
+  slots: null
 };
 const emits = {
   ...radioGroupEmits
 };
+const createOnEmits = onEmitsFactory(emits);
 
-var _sfc_main = defineComponent({
-  name: "VkfRadio",
+var _sfc_main$2 = /* @__PURE__ */ defineComponent({
+  __name: "option",
+  props: {
+    type: {
+      type: String,
+      default: "radio"
+    },
+    item: {
+      type: Object,
+      required: true
+    },
+    modelValue: null
+  },
+  emits: [
+    "update:modelValue"
+  ],
+  setup(__props, { expose: __expose }) {
+    __expose();
+    const props = __props;
+    const coreProps = computed(() => {
+      const obj = pickObject(props.item, {
+        excludes: ["label", "value"]
+      });
+      if (isGte2_6_0) {
+        obj.value = props.item.value;
+      } else {
+        obj.label = props.item.value;
+      }
+      return obj;
+    });
+    const __returned__ = { props, coreProps, get ElCard() {
+      return ElCard;
+    }, get ElRadioButton() {
+      return ElRadioButton;
+    }, get ElRadio() {
+      return ElRadio;
+    } };
+    Object.defineProperty(__returned__, "__isScriptSetup", { enumerable: false, value: true });
+    return __returned__;
+  }
+});
+
+const _hoisted_1 = { class: "vkf-radio-option-card__content" };
+function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
+  return $props.type === "button" ? (openBlock(), createBlock(
+    $setup["ElRadioButton"],
+    normalizeProps(mergeProps({ key: 0 }, $setup.coreProps)),
+    {
+      default: withCtx(() => [
+        renderSlot(_ctx.$slots, "option", normalizeProps(guardReactiveProps($props.item)), () => [
+          createTextVNode(
+            toDisplayString($props.item.label ?? $props.item.value),
+            1
+            /* TEXT */
+          )
+        ])
+      ]),
+      _: 3
+      /* FORWARDED */
+    },
+    16
+    /* FULL_PROPS */
+  )) : $props.type === "card" ? (openBlock(), createBlock($setup["ElCard"], {
+    key: 1,
+    shadow: "hover",
+    class: normalizeClass(["vkf-radio-option-card", { "is-checked": $props.modelValue === $props.item.value }]),
+    onClick: _cache[0] || (_cache[0] = ($event) => _ctx.$emit("update:modelValue", $props.item.value))
+  }, {
+    default: withCtx(() => [
+      createElementVNode("div", _hoisted_1, [
+        renderSlot(_ctx.$slots, "option", normalizeProps(guardReactiveProps($props.item)), () => [
+          createTextVNode(
+            toDisplayString($props.item.label ?? $props.item.value),
+            1
+            /* TEXT */
+          )
+        ])
+      ]),
+      createVNode(
+        $setup["ElRadio"],
+        mergeProps($setup.coreProps, { border: false }),
+        null,
+        16
+        /* FULL_PROPS */
+      )
+    ]),
+    _: 3
+    /* FORWARDED */
+  }, 8, ["class"])) : (openBlock(), createBlock(
+    $setup["ElRadio"],
+    normalizeProps(mergeProps({ key: 2 }, $setup.coreProps)),
+    {
+      default: withCtx(() => [
+        renderSlot(_ctx.$slots, "option", normalizeProps(guardReactiveProps($props.item)), () => [
+          createTextVNode(
+            toDisplayString($props.item.label ?? $props.item.value),
+            1
+            /* TEXT */
+          )
+        ])
+      ]),
+      _: 3
+      /* FORWARDED */
+    },
+    16
+    /* FULL_PROPS */
+  ));
+}
+var OptionView = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$1], ["__file", "/home/runner/work/private-vunk-form/private-vunk-form/packages/components/radio/src/option.vue"]]);
+
+var _sfc_main$1 = defineComponent({
   components: {
     VkfFormItem,
-    ElRadio,
     ElRadioGroup,
-    ElRadioButton
+    OptionView
   },
   props,
   emits,
@@ -44,7 +159,7 @@ var _sfc_main = defineComponent({
     });
     const readonly = useComputedReadonly(props2);
     const pickRadioProps = (item) => {
-      const obj = pickObject(item, {
+      const obj = pickObject$1(item, {
         excludes: ["label", "value"]
       });
       if (isGte2_6_0) {
@@ -66,6 +181,7 @@ var _sfc_main = defineComponent({
 });
 
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_OptionView = resolveComponent("OptionView");
   const _component_ElRadioGroup = resolveComponent("ElRadioGroup");
   const _component_VkfFormItem = resolveComponent("VkfFormItem");
   return openBlock(), createBlock(
@@ -84,50 +200,62 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             (openBlock(true), createElementBlock(
               Fragment,
               null,
-              renderList(_ctx.options, (item) => {
-                return openBlock(), createBlock(
-                  resolveDynamicComponent(_ctx.type === "button" ? "ElRadioButton" : "ElRadio"),
-                  mergeProps({
-                    key: item.value
-                  }, { ref_for: true }, _ctx.pickRadioProps(item)),
-                  {
-                    default: withCtx(() => [
-                      createTextVNode(
-                        toDisplayString(item.label ?? item.value),
-                        1
-                        /* TEXT */
-                      )
-                    ]),
-                    _: 2
-                    /* DYNAMIC */
-                  },
-                  1040
-                  /* FULL_PROPS, DYNAMIC_SLOTS */
-                );
+              renderList(_ctx.options, (item, index) => {
+                return openBlock(), createBlock(_component_OptionView, {
+                  key: `${item.value || item.label || index}`,
+                  type: _ctx.type,
+                  item,
+                  "model-value": _ctx.modelValue,
+                  "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.$emit("update:modelValue", $event))
+                }, {
+                  option: withCtx((optionProps) => [
+                    renderSlot(_ctx.$slots, "option", mergeProps({ ref_for: true }, optionProps))
+                  ]),
+                  _: 2
+                  /* DYNAMIC */
+                }, 1032, ["type", "item", "model-value"]);
               }),
               128
               /* KEYED_FRAGMENT */
             ))
           ]),
-          _: 1
-          /* STABLE */
+          _: 3
+          /* FORWARDED */
         }, 16, ["class", "disabled"])
       ]),
-      _: 1
-      /* STABLE */
+      _: 3
+      /* FORWARDED */
     },
     16
     /* FULL_PROPS */
   );
 }
-var VkfRadio = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "/home/runner/work/private-vunk-form/private-vunk-form/packages/components/radio/src/index.vue"]]);
+var Core = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render], ["__file", "/home/runner/work/private-vunk-form/private-vunk-form/packages/components/radio/src/index.vue"]]);
+
+var _sfc_main = defineComponent({
+  name: "VkfRadio",
+  props,
+  emits,
+  setup(props2, { emit, slots }) {
+    const coreEmits = createOnEmits(emit);
+    return () => h(Core, {
+      ...props2,
+      ...vOn(coreEmits)
+    }, {
+      ...props2.slots,
+      ...slots
+    });
+  }
+});
+
+var VkfRadio = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "/home/runner/work/private-vunk-form/private-vunk-form/packages/components/radio/src/wraper.vue"]]);
 
 var types = /*#__PURE__*/Object.freeze({
   __proto__: null
 });
 
 VkfRadio.install = (app) => {
-  app.component(VkfRadio.name, VkfRadio);
+  app.component(VkfRadio.name || "VkfRadio", VkfRadio);
 };
 
 export { VkfRadio, types as __VkfRadio, VkfRadio as default };

package/components/radio/src/ctx.d.ts

@@ -5,13 +5,17 @@ export declare const props: {
         type: PropType<RadioProps[]>;
         default: () => any[];
     };
+    /**
+     * @description Radio 组件的风格类型
+     */
     type: {
-        type: PropType<"button" | "default">;
+        type: PropType<"button" | "radio" | "card">;
         default: string;
     };
     modelValue: {
         type: PropType<string | number>;
     };
+    slots: any;
     ariaLabel: StringConstructor;
     id: {
         readonly type: PropType<string>;
@@ -155,3 +159,7 @@ export declare const emits: {
     "update:modelValue": (val: string | number | boolean | undefined) => val is string | number | boolean;
     change: (val: string | number | boolean | undefined) => val is string | number | boolean;
 };
+export declare const createOnEmits: <T2 extends import("@vunk/core").AnyFunc, EX extends ("update:modelValue" | "change")[]>(emit: T2, excludes?: EX) => { [P in EX extends (infer KE)[] ? Exclude<"update:modelValue", KE> | Exclude<"change", KE> : "update:modelValue" | "change"]: {
+    "update:modelValue": (...e: import("@vunk/core").RestParameters<T2>) => void;
+    change: (...e: import("@vunk/core").RestParameters<T2>) => void;
+}[P]; };