@vunk/form 2.5.8 → 2.5.9

package/components/date-picker/src/ctx.d.ts

@@ -162,7 +162,7 @@ export declare const props: {
     };
     isRange: BooleanConstructor;
 };
-export declare const createBindProps: <T2 extends import("@vunk/core").NormalObject, EX extends (Extract<"size", keyof T2> | Extract<"type", keyof T2> | Extract<"required", keyof T2> | Extract<"formItemSize", keyof T2> | Extract<"formItemSlots", keyof T2> | Extract<"elRef", keyof T2> | Extract<"inline", keyof T2> | Extract<"readonly", keyof T2> | Extract<"formItemTip", keyof T2> | Extract<"formItemTipClass", keyof T2> | Extract<"labelTip", keyof T2> | Extract<"information", keyof T2> | Extract<"label", keyof T2> | Extract<"labelWidth", keyof T2> | Extract<"labelPosition", keyof T2> | Extract<"prop", keyof T2> | Extract<"rules", keyof T2> | Extract<"error", keyof T2> | Extract<"validateStatus", keyof T2> | Extract<"for", keyof T2> | Extract<"inlineMessage", keyof T2> | Extract<"showMessage", keyof T2> | Extract<"disabled", keyof T2> | Extract<"id", keyof T2> | Extract<"ariaLabel", keyof T2> | Extract<"popperClass", keyof T2> | Extract<"fallbackPlacements", keyof T2> | Extract<"placement", keyof T2> | Extract<"popperOptions", keyof T2> | Extract<"name", keyof T2> | Extract<"modelValue", keyof T2> | Extract<"clearable", keyof T2> | Extract<"placeholder", keyof T2> | Extract<"cellClassName", keyof T2> | Extract<"emptyValues", keyof T2> | Extract<"valueOnClear", keyof T2> | Extract<"validateEvent", keyof T2> | Extract<"tabindex", keyof T2> | Extract<"datePickerSlots", keyof T2> | Extract<"showNow", keyof T2> | Extract<"disabledDate", keyof T2> | Extract<"shortcuts", keyof T2> | Extract<"arrowControl", keyof T2> | Extract<"unlinkPanels", keyof T2> | Extract<"disabledHours", keyof T2> | Extract<"disabledMinutes", keyof T2> | Extract<"disabledSeconds", keyof T2> | Extract<"format", keyof T2> | Extract<"valueFormat", keyof T2> | Extract<"dateFormat", keyof T2> | Extract<"timeFormat", keyof T2> | Extract<"clearIcon", keyof T2> | Extract<"editable", keyof T2> | Extract<"prefixIcon", keyof T2> | Extract<"rangeSeparator", keyof T2> | Extract<"startPlaceholder", keyof T2> | Extract<"endPlaceholder", keyof T2> | Extract<"defaultValue", keyof T2> | Extract<"defaultTime", keyof T2> | Extract<"isRange", keyof T2>)[]>(propsArg: T2, excludes?: EX) => import("vue").ComputedRef<{ [P in EX extends (infer KE)[] ? Exclude<Extract<"size" | "type" | "required" | "formItemSize" | "formItemSlots" | "elRef" | "inline" | "readonly" | "formItemTip" | "formItemTipClass" | "labelTip" | "information" | "label" | "labelWidth" | "labelPosition" | "prop" | "rules" | "error" | "validateStatus" | "for" | "inlineMessage" | "showMessage" | "disabled" | "id" | "ariaLabel" | "popperClass" | "fallbackPlacements" | "placement" | "popperOptions" | "name" | "modelValue" | "clearable" | "placeholder" | "cellClassName" | "emptyValues" | "valueOnClear" | "validateEvent" | "tabindex" | "datePickerSlots" | "showNow" | "disabledDate" | "shortcuts" | "arrowControl" | "unlinkPanels" | "disabledHours" | "disabledMinutes" | "disabledSeconds" | "format" | "valueFormat" | "dateFormat" | "timeFormat" | "clearIcon" | "editable" | "prefixIcon" | "rangeSeparator" | "startPlaceholder" | "endPlaceholder" | "defaultValue" | "defaultTime" | "isRange", keyof T2>, KE> : Extract<"size" | "type" | "required" | "formItemSize" | "formItemSlots" | "elRef" | "inline" | "readonly" | "formItemTip" | "formItemTipClass" | "labelTip" | "information" | "label" | "labelWidth" | "labelPosition" | "prop" | "rules" | "error" | "validateStatus" | "for" | "inlineMessage" | "showMessage" | "disabled" | "id" | "ariaLabel" | "popperClass" | "fallbackPlacements" | "placement" | "popperOptions" | "name" | "modelValue" | "clearable" | "placeholder" | "cellClassName" | "emptyValues" | "valueOnClear" | "validateEvent" | "tabindex" | "datePickerSlots" | "showNow" | "disabledDate" | "shortcuts" | "arrowControl" | "unlinkPanels" | "disabledHours" | "disabledMinutes" | "disabledSeconds" | "format" | "valueFormat" | "dateFormat" | "timeFormat" | "clearIcon" | "editable" | "prefixIcon" | "rangeSeparator" | "startPlaceholder" | "endPlaceholder" | "defaultValue" | "defaultTime" | "isRange", keyof T2>]: { [k in Extract<"size" | "type" | "required" | "formItemSize" | "formItemSlots" | "elRef" | "inline" | "readonly" | "formItemTip" | "formItemTipClass" | "labelTip" | "information" | "label" | "labelWidth" | "labelPosition" | "prop" | "rules" | "error" | "validateStatus" | "for" | "inlineMessage" | "showMessage" | "disabled" | "id" | "ariaLabel" | "popperClass" | "fallbackPlacements" | "placement" | "popperOptions" | "name" | "modelValue" | "clearable" | "placeholder" | "cellClassName" | "emptyValues" | "valueOnClear" | "validateEvent" | "tabindex" | "datePickerSlots" | "showNow" | "disabledDate" | "shortcuts" | "arrowControl" | "unlinkPanels" | "disabledHours" | "disabledMinutes" | "disabledSeconds" | "format" | "valueFormat" | "dateFormat" | "timeFormat" | "clearIcon" | "editable" | "prefixIcon" | "rangeSeparator" | "startPlaceholder" | "endPlaceholder" | "defaultValue" | "defaultTime" | "isRange", keyof T2>]: T2[k]; }[P]; }>;
+export declare const createBindProps: <T2 extends import("@vunk/core").NormalObject, EX extends (Extract<"size", keyof T2> | Extract<"type", keyof T2> | Extract<"required", keyof T2> | Extract<"formItemSize", keyof T2> | Extract<"formItemSlots", keyof T2> | Extract<"elRef", keyof T2> | Extract<"inline", keyof T2> | Extract<"readonly", keyof T2> | Extract<"formItemTip", keyof T2> | Extract<"formItemTipClass", keyof T2> | Extract<"labelTip", keyof T2> | Extract<"information", keyof T2> | Extract<"label", keyof T2> | Extract<"labelWidth", keyof T2> | Extract<"labelPosition", keyof T2> | Extract<"prop", keyof T2> | Extract<"rules", keyof T2> | Extract<"error", keyof T2> | Extract<"validateStatus", keyof T2> | Extract<"for", keyof T2> | Extract<"inlineMessage", keyof T2> | Extract<"showMessage", keyof T2> | Extract<"disabled", keyof T2> | Extract<"id", keyof T2> | Extract<"ariaLabel", keyof T2> | Extract<"popperClass", keyof T2> | Extract<"fallbackPlacements", keyof T2> | Extract<"placement", keyof T2> | Extract<"popperOptions", keyof T2> | Extract<"name", keyof T2> | Extract<"modelValue", keyof T2> | Extract<"clearable", keyof T2> | Extract<"placeholder", keyof T2> | Extract<"cellClassName", keyof T2> | Extract<"emptyValues", keyof T2> | Extract<"valueOnClear", keyof T2> | Extract<"validateEvent", keyof T2> | Extract<"tabindex", keyof T2> | Extract<"showNow", keyof T2> | Extract<"disabledDate", keyof T2> | Extract<"shortcuts", keyof T2> | Extract<"arrowControl", keyof T2> | Extract<"unlinkPanels", keyof T2> | Extract<"disabledHours", keyof T2> | Extract<"disabledMinutes", keyof T2> | Extract<"disabledSeconds", keyof T2> | Extract<"format", keyof T2> | Extract<"valueFormat", keyof T2> | Extract<"dateFormat", keyof T2> | Extract<"timeFormat", keyof T2> | Extract<"clearIcon", keyof T2> | Extract<"editable", keyof T2> | Extract<"prefixIcon", keyof T2> | Extract<"rangeSeparator", keyof T2> | Extract<"startPlaceholder", keyof T2> | Extract<"endPlaceholder", keyof T2> | Extract<"defaultValue", keyof T2> | Extract<"defaultTime", keyof T2> | Extract<"isRange", keyof T2> | Extract<"datePickerSlots", keyof T2>)[]>(propsArg: T2, excludes?: EX) => import("vue").ComputedRef<{ [P in EX extends (infer KE)[] ? Exclude<Extract<"size" | "type" | "required" | "formItemSize" | "formItemSlots" | "elRef" | "inline" | "readonly" | "formItemTip" | "formItemTipClass" | "labelTip" | "information" | "label" | "labelWidth" | "labelPosition" | "prop" | "rules" | "error" | "validateStatus" | "for" | "inlineMessage" | "showMessage" | "disabled" | "id" | "ariaLabel" | "popperClass" | "fallbackPlacements" | "placement" | "popperOptions" | "name" | "modelValue" | "clearable" | "placeholder" | "cellClassName" | "emptyValues" | "valueOnClear" | "validateEvent" | "tabindex" | "showNow" | "disabledDate" | "shortcuts" | "arrowControl" | "unlinkPanels" | "disabledHours" | "disabledMinutes" | "disabledSeconds" | "format" | "valueFormat" | "dateFormat" | "timeFormat" | "clearIcon" | "editable" | "prefixIcon" | "rangeSeparator" | "startPlaceholder" | "endPlaceholder" | "defaultValue" | "defaultTime" | "isRange" | "datePickerSlots", keyof T2>, KE> : Extract<"size" | "type" | "required" | "formItemSize" | "formItemSlots" | "elRef" | "inline" | "readonly" | "formItemTip" | "formItemTipClass" | "labelTip" | "information" | "label" | "labelWidth" | "labelPosition" | "prop" | "rules" | "error" | "validateStatus" | "for" | "inlineMessage" | "showMessage" | "disabled" | "id" | "ariaLabel" | "popperClass" | "fallbackPlacements" | "placement" | "popperOptions" | "name" | "modelValue" | "clearable" | "placeholder" | "cellClassName" | "emptyValues" | "valueOnClear" | "validateEvent" | "tabindex" | "showNow" | "disabledDate" | "shortcuts" | "arrowControl" | "unlinkPanels" | "disabledHours" | "disabledMinutes" | "disabledSeconds" | "format" | "valueFormat" | "dateFormat" | "timeFormat" | "clearIcon" | "editable" | "prefixIcon" | "rangeSeparator" | "startPlaceholder" | "endPlaceholder" | "defaultValue" | "defaultTime" | "isRange" | "datePickerSlots", keyof T2>]: { [k in Extract<"size" | "type" | "required" | "formItemSize" | "formItemSlots" | "elRef" | "inline" | "readonly" | "formItemTip" | "formItemTipClass" | "labelTip" | "information" | "label" | "labelWidth" | "labelPosition" | "prop" | "rules" | "error" | "validateStatus" | "for" | "inlineMessage" | "showMessage" | "disabled" | "id" | "ariaLabel" | "popperClass" | "fallbackPlacements" | "placement" | "popperOptions" | "name" | "modelValue" | "clearable" | "placeholder" | "cellClassName" | "emptyValues" | "valueOnClear" | "validateEvent" | "tabindex" | "showNow" | "disabledDate" | "shortcuts" | "arrowControl" | "unlinkPanels" | "disabledHours" | "disabledMinutes" | "disabledSeconds" | "format" | "valueFormat" | "dateFormat" | "timeFormat" | "clearIcon" | "editable" | "prefixIcon" | "rangeSeparator" | "startPlaceholder" | "endPlaceholder" | "defaultValue" | "defaultTime" | "isRange" | "datePickerSlots", keyof T2>]: T2[k]; }[P]; }>;
 export declare const emits: {
     'update:modelValue': any;
     change: any;

package/components/date-picker/src/index.vue.d.ts

@@ -408,7 +408,6 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     valueOnClear: import("element-plus/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor, BooleanConstructor, FunctionConstructor], unknown, unknown>;
     validateEvent: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     tabindex: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown>;
-    datePickerSlots: import("./types").DatePickerSlots;
     showNow: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     shortcuts: unknown[];
     arrowControl: boolean;
@@ -417,6 +416,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     prefixIcon: "";
     rangeSeparator: string;
     isRange: boolean;
+    datePickerSlots: import("./types").DatePickerSlots;
 }, {}, {
     VkfFormItem: {
         new (...args: any[]): any;

package/components/date-picker-range/src/ctx.d.ts

@@ -124,10 +124,6 @@ export declare const props: {
     valueOnClear: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, NumberConstructor, BooleanConstructor, FunctionConstructor], unknown, unknown, undefined, boolean>;
     validateEvent: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     tabindex: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown, 0, boolean>;
-    datePickerSlots: {
-        type: PropType<import("@vunk/form/components/date-picker/src/types").DatePickerSlots>;
-        default: any;
-    };
     showNow: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     disabledDate: {
         readonly type: import("vue").PropType<Function>;
@@ -181,6 +177,10 @@ export declare const props: {
         __epPropKey: true;
     };
     isRange: BooleanConstructor;
+    datePickerSlots: {
+        type: PropType<import("@vunk/form/components/date-picker/src/types").DatePickerSlots>;
+        default: any;
+    };
 };
 export declare const emits: {
     'update:startValue': any;

package/components/date-picker-range/src/index.vue.d.ts

@@ -124,10 +124,6 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     valueOnClear: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, NumberConstructor, BooleanConstructor, FunctionConstructor], unknown, unknown, undefined, boolean>;
     validateEvent: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     tabindex: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown, 0, boolean>;
-    datePickerSlots: {
-        type: import("vue").PropType<import("@vunk/form/components/date-picker/src/types").DatePickerSlots>;
-        default: any;
-    };
     showNow: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     disabledDate: {
         readonly type: import("vue").PropType<Function>;
@@ -181,6 +177,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         __epPropKey: true;
     };
     isRange: BooleanConstructor;
+    datePickerSlots: {
+        type: import("vue").PropType<import("@vunk/form/components/date-picker/src/types").DatePickerSlots>;
+        default: any;
+    };
 }>, {
     coreProps: import("vue").ComputedRef<{}>;
     coreEmits: {
@@ -329,10 +329,6 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     valueOnClear: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, NumberConstructor, BooleanConstructor, FunctionConstructor], unknown, unknown, undefined, boolean>;
     validateEvent: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     tabindex: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown, 0, boolean>;
-    datePickerSlots: {
-        type: import("vue").PropType<import("@vunk/form/components/date-picker/src/types").DatePickerSlots>;
-        default: any;
-    };
     showNow: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     disabledDate: {
         readonly type: import("vue").PropType<Function>;
@@ -386,6 +382,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         __epPropKey: true;
     };
     isRange: BooleanConstructor;
+    datePickerSlots: {
+        type: import("vue").PropType<import("@vunk/form/components/date-picker/src/types").DatePickerSlots>;
+        default: any;
+    };
 }>> & Readonly<{
     onFocus?: (...args: any[] | unknown[]) => any;
     onChange?: (...args: any[] | unknown[]) => any;
@@ -421,7 +421,6 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     valueOnClear: import("element-plus/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor, BooleanConstructor, FunctionConstructor], unknown, unknown>;
     validateEvent: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     tabindex: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown>;
-    datePickerSlots: import("@vunk/form/components/date-picker/src/types").DatePickerSlots;
     showNow: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     shortcuts: unknown[];
     arrowControl: boolean;
@@ -433,6 +432,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     startPlaceholder: string;
     endPlaceholder: string;
     isRange: boolean;
+    datePickerSlots: import("@vunk/form/components/date-picker/src/types").DatePickerSlots;
     startValue: string;
     endValue: string;
     selectOptions: import("./types").SelectMedia[];

package/components/input-collection/index.cjs

@@ -3,17 +3,17 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var vue = require('vue');
+var index = require('../index2.cjs');
+var core = require('@vunk/core');
+var fieldset = require('@vunk/form/components/fieldset');
 var formItem = require('@vunk/form/components/form-item');
-var tableColumns = require('@vunk/plus/components/table-columns');
-var elementPlus = require('element-plus');
-var composables = require('@vunk/form/composables');
-var templatesDefault = require('@vunk/form/components/templates-default');
-var templateInstancesProvider = require('@vunk/form/components/template-instances-provider');
 var formItemRenderer = require('@vunk/form/components/form-item-renderer');
-var core = require('@vunk/core');
-var index = require('../index2.cjs');
 var rendererData = require('@vunk/form/components/renderer-data');
-var fieldset = require('@vunk/form/components/fieldset');
+var templateInstancesProvider = require('@vunk/form/components/template-instances-provider');
+var templatesDefault = require('@vunk/form/components/templates-default');
+var composables = require('@vunk/form/composables');
+var tableColumns = require('@vunk/plus/components/table-columns');
+var elementPlus = require('element-plus');
 var cloneDeep = require('../cloneDeep.cjs');
 var _pluginVue_exportHelper = require('../_plugin-vue_export-helper.cjs');
 require('../isObject.cjs');
@@ -107,15 +107,21 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       return props2.columns.map(column => {
         return {
           ...column,
-          slots: e => vue.createVNode(formItemRenderer.VkfFormItemRenderer, {
-            "source": [{
-              prop: [props2.prop ?? [], e.$index, column.prop].flat(),
-              templateType: column.templateType,
+          slots: e => {
+            const prop = [props2.prop ?? [], e.$index, column.prop].flat();
+            const formItemProps = {
+              prop,
               readonly: readonly.value,
-              templateProps: column.templateProps,
-              ...column.createTemplateProps?.(e)
-            }]
-          }, null)
+              templateType: column.templateType,
+              templateProps: column.templateProps
+            };
+            return vue.createVNode(formItemRenderer.VkfFormItemRenderer, {
+              "source": [{
+                ...formItemProps,
+                ...column.createTemplateProps?.(e, formItemProps)
+              }]
+            }, null);
+          }
         };
       });
     });
@@ -124,14 +130,16 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       type: "expand",
       slots: e => {
         const source = expandFormItemRaws.value.map(column => {
-          return {
-            prop: [props2.prop ?? [], e.$index, column.prop].flat(),
-            label: column.label,
-            templateType: column.templateType,
+          const prop = [props2.prop ?? [], e.$index, column.prop].flat();
+          const formItemProps = {
+            prop,
             readonly: readonly.value,
-            ...column.templateProps,
-            ...column.createTemplateProps?.(e),
-            class: "vk-input-collection__expand-form-item"
+            templateType: column.templateType,
+            templateProps: column.templateProps
+          };
+          return {
+            ...formItemProps,
+            ...column.createTemplateProps?.(e, formItemProps)
           };
         });
         return vue.createVNode(fieldset.VkfFieldset, {
@@ -198,7 +206,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       return props2.modelValue?.map((e, index) => {
         return {
           ...e,
-          [ROW_KEY]: index + ""
+          [ROW_KEY]: `${index}`
         };
       });
     });

package/components/input-collection/index.css

@@ -9,12 +9,12 @@
 .vkf-input-collection-table .vkf-form-item {
   margin-bottom: 0;
 }
-.vkf-input-collection-table .vk-input-collection__expand-form-item {
-  margin-bottom: 18px;
-}
 .vk-input-collection__expand-fieldset{
   padding: 8px;
 }
+.vk-input-collection__expand-fieldset .vkf-form-item{
+  margin-bottom: 18px;
+}
 .vk-input-collection__buttons .cell{
   padding: 0;
 }

package/components/input-collection/index.mjs

@@ -1,15 +1,15 @@
 import { defineComponent, computed, createVNode, Fragment, ref, resolveComponent, openBlock, createBlock, withCtx, normalizeProps, guardReactiveProps, createSlots, createElementBlock, createTextVNode, createCommentVNode, renderSlot } from 'vue';
+import { p as plus_default, b as minus_default } from '../index2.mjs';
+import { ensetData, getValue } from '@vunk/core';
+import { VkfFieldset } from '@vunk/form/components/fieldset';
 import { _VkfFormItemCtx, VkfFormItem } from '@vunk/form/components/form-item';
-import { VkTableColumns } from '@vunk/plus/components/table-columns';
-import { ElTable, ElButton } from 'element-plus';
-import { useComputedReadonly } from '@vunk/form/composables';
-import { VkfTemplatesDefault } from '@vunk/form/components/templates-default';
-import { VkfTemplateInstancesProvider } from '@vunk/form/components/template-instances-provider';
 import { VkfFormItemRenderer } from '@vunk/form/components/form-item-renderer';
-import { ensetData, getValue } from '@vunk/core';
-import { p as plus_default, b as minus_default } from '../index2.mjs';
 import { VkfRendererData } from '@vunk/form/components/renderer-data';
-import { VkfFieldset } from '@vunk/form/components/fieldset';
+import { VkfTemplateInstancesProvider } from '@vunk/form/components/template-instances-provider';
+import { VkfTemplatesDefault } from '@vunk/form/components/templates-default';
+import { useComputedReadonly } from '@vunk/form/composables';
+import { VkTableColumns } from '@vunk/plus/components/table-columns';
+import { ElTable, ElButton } from 'element-plus';
 import { c as cloneDeep } from '../cloneDeep.mjs';
 import { _ as _export_sfc } from '../_plugin-vue_export-helper.mjs';
 import '../isObject.mjs';
@@ -103,15 +103,21 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       return props2.columns.map(column => {
         return {
           ...column,
-          slots: e => createVNode(VkfFormItemRenderer, {
-            "source": [{
-              prop: [props2.prop ?? [], e.$index, column.prop].flat(),
-              templateType: column.templateType,
+          slots: e => {
+            const prop = [props2.prop ?? [], e.$index, column.prop].flat();
+            const formItemProps = {
+              prop,
               readonly: readonly.value,
-              templateProps: column.templateProps,
-              ...column.createTemplateProps?.(e)
-            }]
-          }, null)
+              templateType: column.templateType,
+              templateProps: column.templateProps
+            };
+            return createVNode(VkfFormItemRenderer, {
+              "source": [{
+                ...formItemProps,
+                ...column.createTemplateProps?.(e, formItemProps)
+              }]
+            }, null);
+          }
         };
       });
     });
@@ -120,14 +126,16 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       type: "expand",
       slots: e => {
         const source = expandFormItemRaws.value.map(column => {
-          return {
-            prop: [props2.prop ?? [], e.$index, column.prop].flat(),
-            label: column.label,
-            templateType: column.templateType,
+          const prop = [props2.prop ?? [], e.$index, column.prop].flat();
+          const formItemProps = {
+            prop,
             readonly: readonly.value,
-            ...column.templateProps,
-            ...column.createTemplateProps?.(e),
-            class: "vk-input-collection__expand-form-item"
+            templateType: column.templateType,
+            templateProps: column.templateProps
+          };
+          return {
+            ...formItemProps,
+            ...column.createTemplateProps?.(e, formItemProps)
           };
         });
         return createVNode(VkfFieldset, {
@@ -194,7 +202,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       return props2.modelValue?.map((e, index) => {
         return {
           ...e,
-          [ROW_KEY]: index + ""
+          [ROW_KEY]: `${index}`
         };
       });
     });

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

@@ -1,6 +1,6 @@
-import { __VkTableColumns } from '@vunk/plus/components/table-columns';
-import { SetDataEvent } from '@vunk/core';
-import { NormalObject } from '@vunk/shared';
+import type { SetDataEvent } from '@vunk/core';
+import type { __VkTableColumns } from '@vunk/plus/components/table-columns';
+import type { NormalObject } from '@vunk/shared';
 declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     columns: {
         type: import("vue").PropType<any[]>;

package/components/input-collection/src/types.d.ts

@@ -1,9 +1,9 @@
-import { __VkTableColumns } from '@vunk/plus/components/table-columns';
-import { __VkfTemplatesDefault } from '@vunk/form/components/templates-default';
-import { Keyof, NormalObject, VueComponentPropsType } from '@vunk/shared';
-import { BasicSource } from '@vunk/form/shared';
-import Core from './index.vue';
-import { TableColumnCtx } from 'element-plus';
+import type { __VkfTemplatesDefault } from '@vunk/form/components/templates-default';
+import type { BasicSource } from '@vunk/form/shared';
+import type { __VkTableColumns } from '@vunk/plus/components/table-columns';
+import type { Keyof, NormalObject, VueComponentPropsType } from '@vunk/shared';
+import type { TableColumnCtx } from 'element-plus';
+import type Core from './index.vue';
 export interface Source<P extends string = string> extends VueComponentPropsType<typeof Core>, BasicSource {
     prop?: P | P[];
     templateType: 'VkfInputCollection';
@@ -12,9 +12,12 @@ export type Column<R extends NormalObject = NormalObject, SourceType extends Nor
     templateType: SourceType['templateType'];
     templateProps?: Partial<SourceType>;
     expandVisible?: boolean;
-    createTemplateProps?: (e: {
+    createTemplateProps?: (columnSlotEvent: {
         row: R;
         column: TableColumnCtx<R>;
         $index: number;
+    }, formItemProps: {
+        prop: Array<string | number>;
+        readonly: boolean;
     }) => Partial<SourceType>;
 };

package/index.css

@@ -252,12 +252,12 @@
 .vkf-input-collection-table .vkf-form-item {
   margin-bottom: 0;
 }
-.vkf-input-collection-table .vk-input-collection__expand-form-item {
-  margin-bottom: 18px;
-}
 .vk-input-collection__expand-fieldset{
   padding: 8px;
 }
+.vk-input-collection__expand-fieldset .vkf-form-item{
+  margin-bottom: 18px;
+}
 .vk-input-collection__buttons .cell{
   padding: 0;
 }

package/package.json

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