@vunk/form 2.14.7 → 2.14.9

package/components/fieldset/index.cjs

@@ -15,6 +15,10 @@ const props = {
   labelPosition: {
     type: String,
     default: void 0
+  },
+  labelSuffix: {
+    type: String,
+    default: void 0
   }
 };
 const emits = {};
@@ -84,12 +88,16 @@ var _sfc_main = vue.defineComponent({
     const labelPosition = vue.computed(() => {
       return props2.labelPosition ?? formContext.labelPosition;
     });
+    const labelSuffix = vue.computed(() => {
+      return props2.labelSuffix ?? formContext.labelSuffix;
+    });
     vue.provide(
       elementPlus.formContextKey,
       vue.reactive({
         ...formContext === backupFormContext ? backupFormContext : vue.toRefs(formContext),
         labelWidth,
         labelPosition,
+        labelSuffix,
         ...useFormLabelWidth()
       })
     );

package/components/fieldset/index.mjs

@@ -11,6 +11,10 @@ const props = {
   labelPosition: {
     type: String,
     default: void 0
+  },
+  labelSuffix: {
+    type: String,
+    default: void 0
   }
 };
 const emits = {};
@@ -80,12 +84,16 @@ var _sfc_main = defineComponent({
     const labelPosition = computed(() => {
       return props2.labelPosition ?? formContext.labelPosition;
     });
+    const labelSuffix = computed(() => {
+      return props2.labelSuffix ?? formContext.labelSuffix;
+    });
     provide(
       formContextKey,
       reactive({
         ...formContext === backupFormContext ? backupFormContext : toRefs(formContext),
         labelWidth,
         labelPosition,
+        labelSuffix,
         ...useFormLabelWidth()
       })
     );

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

@@ -8,5 +8,9 @@ export declare const props: {
         type: PropType<"left" | "right" | "top">;
         default: any;
     };
+    labelSuffix: {
+        type: StringConstructor;
+        default: any;
+    };
 };
 export declare const emits: {};

package/components/fieldset/src/index.vue.d.ts

@@ -7,6 +7,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: import("vue").PropType<"left" | "right" | "top">;
         default: any;
     };
+    labelSuffix: {
+        type: StringConstructor;
+        default: any;
+    };
 }>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     labelWidth: {
         type: (StringConstructor | NumberConstructor)[];
@@ -16,8 +20,13 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: import("vue").PropType<"left" | "right" | "top">;
         default: any;
     };
+    labelSuffix: {
+        type: StringConstructor;
+        default: any;
+    };
 }>> & Readonly<{}>, {
     labelWidth: string | number;
     labelPosition: "top" | "left" | "right";
+    labelSuffix: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/components/form-item/index.cjs

@@ -74,7 +74,8 @@ var _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
       default: ""
     },
     formItemTipClass: null,
-    elRef: null
+    elRef: null,
+    label: null
   },
   setup(__props, { expose: __expose }) {
     __expose();
@@ -94,9 +95,8 @@ var _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
   }
 });
 
-const _hoisted_1 = { key: 0 };
-const _hoisted_2 = {
-  key: 2,
+const _hoisted_1 = {
+  key: 1,
   class: "vkf-form-item-label__actions"
 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
@@ -104,7 +104,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ref: $props.elRef,
     class: ["vkf-form-item", {
       "has-label-actions": _ctx.$slots.labelActions
-    }]
+    }],
+    label: $props.label
   }), {
     default: vue.withCtx(() => [
       vue.renderSlot(_ctx.$slots, "before"),
@@ -131,15 +132,17 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ]),
     label: vue.withCtx((e) => [
       vue.renderSlot(_ctx.$slots, "label", vue.normalizeProps(vue.guardReactiveProps(e)), () => [
-        e.label ? (vue.openBlock(), vue.createElementBlock(
+        vue.withDirectives(vue.createElementVNode(
           "span",
-          _hoisted_1,
+          null,
           vue.toDisplayString(e.label),
-          1
-          /* TEXT */
-        )) : vue.createCommentVNode("v-if", true),
+          513
+          /* TEXT, NEED_PATCH */
+        ), [
+          [vue.vShow, $props.label]
+        ]),
         $props.labelTip ? (vue.openBlock(), vue.createBlock($setup["ElTooltip"], {
-          key: 1,
+          key: 0,
           content: $props.labelTip
         }, {
           default: vue.withCtx(() => [
@@ -163,7 +166,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           _: 1
           /* STABLE */
         }, 8, ["content"])) : vue.createCommentVNode("v-if", true),
-        _ctx.$slots.labelActions ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_2, [
+        _ctx.$slots.labelActions ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
           vue.renderSlot(_ctx.$slots, "labelActions")
         ])) : vue.createCommentVNode("v-if", true)
       ])
@@ -173,7 +176,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ]),
     _: 3
     /* FORWARDED */
-  }, 16, ["class"]);
+  }, 16, ["class", "label"]);
 }
 var FormItemCore = /* @__PURE__ */ _pluginVue_exportHelper._export_sfc(_sfc_main$1, [["render", _sfc_render], ["__file", "/home/runner/work/private-vunk-form/private-vunk-form/packages/components/form-item/src/core.vue"]]);
 
@@ -232,6 +235,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       });
       return data;
     });
+    console.log("props.label", props2.label);
     return () => vue.h(FormItemCore, {
       ...formItemBindProps.value,
       elRef: props2.elRef,
@@ -245,7 +249,8 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       rules: rules$1.value,
       formItemTip: props2.formItemTip,
       formItemTipClass: props2.formItemTipClass,
-      labelTip: props2.labelTip
+      labelTip: props2.labelTip,
+      label: props2.label
     }, {
       ...slots,
       ...props2.formItemSlots

package/components/form-item/index.mjs

@@ -1,6 +1,6 @@
 import { formItemProps, ElFormItem, ElTooltip, ElIcon, ElButton, useGlobalConfig } from 'element-plus';
 import { bindPropsFactory } from '@vunk/core/shared/utils-vue';
-import { defineComponent, openBlock, createBlock, mergeProps, withCtx, renderSlot, createElementBlock, normalizeClass, createElementVNode, toDisplayString, createCommentVNode, normalizeProps, guardReactiveProps, createVNode, computed, h } from 'vue';
+import { defineComponent, openBlock, createBlock, mergeProps, withCtx, renderSlot, createElementBlock, normalizeClass, createElementVNode, toDisplayString, createCommentVNode, normalizeProps, guardReactiveProps, withDirectives, vShow, createVNode, computed, h } from 'vue';
 import { createFormItemBindProps } from '@vunk/form/shared/element-plus';
 import { useComputedReadonly } from '@vunk/form/composables';
 import { isPlainObject } from '@vunk/core/shared/utils-object';
@@ -70,7 +70,8 @@ var _sfc_main$1 = /* @__PURE__ */ defineComponent({
       default: ""
     },
     formItemTipClass: null,
-    elRef: null
+    elRef: null,
+    label: null
   },
   setup(__props, { expose: __expose }) {
     __expose();
@@ -90,9 +91,8 @@ var _sfc_main$1 = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1 = { key: 0 };
-const _hoisted_2 = {
-  key: 2,
+const _hoisted_1 = {
+  key: 1,
   class: "vkf-form-item-label__actions"
 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
@@ -100,7 +100,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ref: $props.elRef,
     class: ["vkf-form-item", {
       "has-label-actions": _ctx.$slots.labelActions
-    }]
+    }],
+    label: $props.label
   }), {
     default: withCtx(() => [
       renderSlot(_ctx.$slots, "before"),
@@ -127,15 +128,17 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ]),
     label: withCtx((e) => [
       renderSlot(_ctx.$slots, "label", normalizeProps(guardReactiveProps(e)), () => [
-        e.label ? (openBlock(), createElementBlock(
+        withDirectives(createElementVNode(
           "span",
-          _hoisted_1,
+          null,
           toDisplayString(e.label),
-          1
-          /* TEXT */
-        )) : createCommentVNode("v-if", true),
+          513
+          /* TEXT, NEED_PATCH */
+        ), [
+          [vShow, $props.label]
+        ]),
         $props.labelTip ? (openBlock(), createBlock($setup["ElTooltip"], {
-          key: 1,
+          key: 0,
           content: $props.labelTip
         }, {
           default: withCtx(() => [
@@ -159,7 +162,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           _: 1
           /* STABLE */
         }, 8, ["content"])) : createCommentVNode("v-if", true),
-        _ctx.$slots.labelActions ? (openBlock(), createElementBlock("div", _hoisted_2, [
+        _ctx.$slots.labelActions ? (openBlock(), createElementBlock("div", _hoisted_1, [
           renderSlot(_ctx.$slots, "labelActions")
         ])) : createCommentVNode("v-if", true)
       ])
@@ -169,7 +172,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ]),
     _: 3
     /* FORWARDED */
-  }, 16, ["class"]);
+  }, 16, ["class", "label"]);
 }
 var FormItemCore = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render], ["__file", "/home/runner/work/private-vunk-form/private-vunk-form/packages/components/form-item/src/core.vue"]]);
 
@@ -228,6 +231,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       });
       return data;
     });
+    console.log("props.label", props2.label);
     return () => h(FormItemCore, {
       ...formItemBindProps.value,
       elRef: props2.elRef,
@@ -241,7 +245,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       rules: rules.value,
       formItemTip: props2.formItemTip,
       formItemTipClass: props2.formItemTipClass,
-      labelTip: props2.labelTip
+      labelTip: props2.labelTip,
+      label: props2.label
     }, {
       ...slots,
       ...props2.formItemSlots

package/components/form-item/src/core.vue.d.ts

@@ -9,6 +9,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     };
     formItemTipClass: any;
     elRef: any;
+    label: any;
 }>, {
     readonly ElFormItem: {
         new (...args: any[]): import("vue").CreateComponentPublicInstanceWithMixins<Readonly<import("vue").ExtractPropTypes<{
@@ -1841,10 +1842,12 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     };
     formItemTipClass: any;
     elRef: any;
+    label: any;
 }>> & Readonly<{}>, {
     elRef: any;
     formItemTip: string;
     formItemTipClass: any;
     labelTip: string;
+    label: any;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/components/input-array/index.cjs

@@ -54,6 +54,13 @@ const props = {
   keepLastRow: {
     type: Boolean,
     default: true
+  },
+  /**
+   * @description 顶部按钮添加元素的方式是 push 还是 unshift
+   */
+  buttonAdd: {
+    type: String,
+    default: "unshift"
   }
 };
 const emits = {
@@ -77,7 +84,13 @@ var _sfc_main$1 = /* @__PURE__ */vue.defineComponent({
     const formItemBindProps = formItem._VkfFormItemCtx.createBindProps(props);
     const readonly = composables.useComputedReadonly(props);
     const addToFirst = () => {
-      emit("update:modelValue", [cloneDeep.cloneDeep(props.defaultItemValue), ...(props.modelValue ?? [])]);
+      const data = props.modelValue ? [...props.modelValue] : [];
+      if (props.buttonAdd === "push") {
+        data.push(cloneDeep.cloneDeep(props.defaultItemValue));
+      } else {
+        data.unshift(cloneDeep.cloneDeep(props.defaultItemValue));
+      }
+      emit("update:modelValue", data);
     };
     if (props.modelValue === void 0 && props.defaultModelValue) {
       emit("update:modelValue", props.defaultModelValue);

package/components/input-array/index.mjs

@@ -50,6 +50,13 @@ const props = {
   keepLastRow: {
     type: Boolean,
     default: true
+  },
+  /**
+   * @description 顶部按钮添加元素的方式是 push 还是 unshift
+   */
+  buttonAdd: {
+    type: String,
+    default: "unshift"
   }
 };
 const emits = {
@@ -73,7 +80,13 @@ var _sfc_main$1 = /* @__PURE__ */defineComponent({
     const formItemBindProps = _VkfFormItemCtx.createBindProps(props);
     const readonly = useComputedReadonly(props);
     const addToFirst = () => {
-      emit("update:modelValue", [cloneDeep(props.defaultItemValue), ...(props.modelValue ?? [])]);
+      const data = props.modelValue ? [...props.modelValue] : [];
+      if (props.buttonAdd === "push") {
+        data.push(cloneDeep(props.defaultItemValue));
+      } else {
+        data.unshift(cloneDeep(props.defaultItemValue));
+      }
+      emit("update:modelValue", data);
     };
     if (props.modelValue === void 0 && props.defaultModelValue) {
       emit("update:modelValue", props.defaultModelValue);

package/components/input-array/src/ctx.d.ts

@@ -34,6 +34,13 @@ export declare const props: {
         type: BooleanConstructor;
         default: boolean;
     };
+    /**
+     * @description 顶部按钮添加元素的方式是 push 还是 unshift
+     */
+    buttonAdd: {
+        type: PropType<"push" | "unshift">;
+        default: string;
+    };
     required: {
         readonly type: PropType<boolean>;
         readonly required: false;

package/components/input-array/src/form-template.vue.d.ts

@@ -36,6 +36,10 @@ declare const _default: import("vue").DefineComponent<{}, {
             type: BooleanConstructor;
             default: boolean;
         };
+        buttonAdd: {
+            type: import("vue").PropType<"push" | "unshift">;
+            default: string;
+        };
         required: {
             readonly type: import("vue").PropType<boolean>;
             readonly required: false;
@@ -152,6 +156,10 @@ declare const _default: import("vue").DefineComponent<{}, {
                 type: BooleanConstructor;
                 default: boolean;
             };
+            buttonAdd: {
+                type: import("vue").PropType<"push" | "unshift">;
+                default: string;
+            };
             required: {
                 readonly type: import("vue").PropType<boolean>;
                 readonly required: false;
@@ -749,6 +757,10 @@ declare const _default: import("vue").DefineComponent<{}, {
             type: BooleanConstructor;
             default: boolean;
         };
+        buttonAdd: {
+            type: import("vue").PropType<"push" | "unshift">;
+            default: string;
+        };
         required: {
             readonly type: import("vue").PropType<boolean>;
             readonly required: false;
@@ -862,6 +874,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         defaultItemValue: any;
         source: Record<string, any>;
         keepLastRow: boolean;
+        buttonAdd: "push" | "unshift";
     }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/components/input-array/src/index.vue.d.ts

@@ -25,6 +25,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: BooleanConstructor;
         default: boolean;
     };
+    buttonAdd: {
+        type: import("vue").PropType<"push" | "unshift">;
+        default: string;
+    };
     required: {
         readonly type: import("vue").PropType<boolean>;
         readonly required: false;
@@ -141,6 +145,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             type: BooleanConstructor;
             default: boolean;
         };
+        buttonAdd: {
+            type: import("vue").PropType<"push" | "unshift">;
+            default: string;
+        };
         required: {
             readonly type: import("vue").PropType<boolean>;
             readonly required: false;
@@ -738,6 +746,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: BooleanConstructor;
         default: boolean;
     };
+    buttonAdd: {
+        type: import("vue").PropType<"push" | "unshift">;
+        default: string;
+    };
     required: {
         readonly type: import("vue").PropType<boolean>;
         readonly required: false;
@@ -851,5 +863,6 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     defaultItemValue: any;
     source: Record<string, any>;
     keepLastRow: boolean;
+    buttonAdd: "push" | "unshift";
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/components/input-collection/index.cjs

@@ -69,7 +69,8 @@ const emits = {
 const ROW_KEY = "_row_key";
 var _sfc_main = /* @__PURE__ */vue.defineComponent({
   ...{
-    name: "VkfInputCollection"
+    name: "VkfInputCollection",
+    inheritAttrs: false
   },
   __name: "index",
   props: props,
@@ -314,7 +315,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         default: vue.withCtx(() => [
           vue.createVNode(
             $setup["VkfFormItem"],
-            vue.normalizeProps(vue.guardReactiveProps($setup.formItemBindProps)),
+            vue.normalizeProps(vue.guardReactiveProps({
+              ...$setup.formItemBindProps,
+              ..._ctx.$attrs
+            })),
             vue.createSlots({
               default: vue.withCtx(() => [
                 !$setup.readonly && _ctx.splicable && !_ctx.labelActions ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [

package/components/input-collection/index.mjs

@@ -65,7 +65,8 @@ const emits = {
 const ROW_KEY = "_row_key";
 var _sfc_main = /* @__PURE__ */defineComponent({
   ...{
-    name: "VkfInputCollection"
+    name: "VkfInputCollection",
+    inheritAttrs: false
   },
   __name: "index",
   props: props,
@@ -310,7 +311,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         default: withCtx(() => [
           createVNode(
             $setup["VkfFormItem"],
-            normalizeProps(guardReactiveProps($setup.formItemBindProps)),
+            normalizeProps(guardReactiveProps({
+              ...$setup.formItemBindProps,
+              ..._ctx.$attrs
+            })),
             createSlots({
               default: withCtx(() => [
                 !$setup.readonly && _ctx.splicable && !_ctx.labelActions ? (openBlock(), createElementBlock("div", _hoisted_1, [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vunk/form",
-  "version": "2.14.7",
+  "version": "2.14.9",
   "description": "",
   "main": "index.esm.js",
   "scripts": {