@vunk/form 2.5.7 → 2.5.9

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');
@@ -61,6 +61,13 @@ const props = {
   defaultExpandAll: {
     type: Boolean,
     default: false
+  },
+  /**
+   * @description 添加记录时的默认值
+   */
+  defaultItemValue: {
+    type: Object,
+    default: () => ({})
   }
 };
 const emits = {
@@ -100,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);
+          }
         };
       });
     });
@@ -117,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, {
@@ -167,7 +182,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
     });
     function handlePlus(index) {
       const data = cloneDeep.cloneDeep(props2.modelValue);
-      data.splice(index + 1, 0, {});
+      data.splice(index + 1, 0, cloneDeep.cloneDeep(props2.defaultItemValue));
       emit("update:modelValue", data);
       setExpandRowKeys([]);
     }
@@ -178,7 +193,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       setExpandRowKeys([]);
     }
     const addToFirst = () => {
-      emit("update:modelValue", [{}, ...(props2.modelValue ?? [])]);
+      emit("update:modelValue", [cloneDeep.cloneDeep(props2.defaultItemValue), ...(props2.modelValue ?? [])]);
       setExpandRowKeys([]);
     };
     const handleFormSetData = e => {
@@ -191,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';
@@ -57,6 +57,13 @@ const props = {
   defaultExpandAll: {
     type: Boolean,
     default: false
+  },
+  /**
+   * @description 添加记录时的默认值
+   */
+  defaultItemValue: {
+    type: Object,
+    default: () => ({})
   }
 };
 const emits = {
@@ -96,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);
+          }
         };
       });
     });
@@ -113,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, {
@@ -163,7 +178,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     });
     function handlePlus(index) {
       const data = cloneDeep(props2.modelValue);
-      data.splice(index + 1, 0, {});
+      data.splice(index + 1, 0, cloneDeep(props2.defaultItemValue));
       emit("update:modelValue", data);
       setExpandRowKeys([]);
     }
@@ -174,7 +189,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       setExpandRowKeys([]);
     }
     const addToFirst = () => {
-      emit("update:modelValue", [{}, ...(props2.modelValue ?? [])]);
+      emit("update:modelValue", [cloneDeep(props2.defaultItemValue), ...(props2.modelValue ?? [])]);
       setExpandRowKeys([]);
     };
     const handleFormSetData = e => {
@@ -187,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/ctx.d.ts

@@ -41,6 +41,13 @@ export declare const props: {
         type: BooleanConstructor;
         default: boolean;
     };
+    /**
+     * @description 添加记录时的默认值
+     */
+    defaultItemValue: {
+        type: PropType<NormalObject>;
+        default: () => {};
+    };
     required: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, undefined, boolean>;
     formItemSize: {
         type: PropType<"default" | "small" | "large">;

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[]>;
@@ -30,6 +30,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: BooleanConstructor;
         default: boolean;
     };
+    defaultItemValue: {
+        type: import("vue").PropType<NormalObject>;
+        default: () => {};
+    };
     required: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, undefined, boolean>;
     formItemSize: {
         type: import("vue").PropType<"default" | "small" | "large">;
@@ -130,6 +134,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: BooleanConstructor;
         default: boolean;
     };
+    defaultItemValue: {
+        type: import("vue").PropType<NormalObject>;
+        default: () => {};
+    };
     required: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, undefined, boolean>;
     formItemSize: {
         type: import("vue").PropType<"default" | "small" | "large">;
@@ -207,6 +215,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     splicable: boolean;
     labelActions: boolean;
     summaryLabel: (data: NormalObject) => string;
+    defaultItemValue: NormalObject;
 }, {}, {
     ElTable: import("element-plus/es/utils").SFCWithInstall<import("vue").DefineComponent<{
         data: {

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.7",
+  "version": "2.5.9",
   "description": "",
   "main": "index.esm.js",
   "scripts": {