@vunk/form 1.4.2 → 1.4.4

package/components/input-collection/index.cjs

@@ -2083,13 +2083,24 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
   }) {
     const formItemBindProps = formItem._VkfFormItemCtx.createBindProps(props2);
     const readonly = composables.useComputedReadonly(props2);
+    const formData = vue.computed(() => {
+      if (!props2.prop || props2.prop.length === 0) {
+        return props2.modelValue;
+      }
+      const data = {};
+      core.ensetData(data, {
+        k: props2.prop,
+        v: props2.modelValue
+      });
+      return data;
+    });
     const fullColumns = vue.computed(() => {
       return props2.columns.map(column => {
         return {
           ...column,
           slots: e => vue.createVNode(formItemRenderer.VkfFormItemRenderer, {
             "source": [{
-              prop: [e.$index, column.prop].flat(),
+              prop: [props2.prop ?? [], e.$index, column.prop].flat(),
               templateType: column.templateType,
               readonly: readonly.value,
               ...column.templateProps,
@@ -2130,9 +2141,9 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       emit("update:modelValue", [{}, ...props2.modelValue]);
     };
     const handleFormSetData = e => {
-      const data = cloneDeep(props2.modelValue);
+      const data = cloneDeep(formData.value);
       core.ensetData(data, e);
-      emit("update:modelValue", data);
+      emit("update:modelValue", core.getValue(data, props2.prop));
     };
     return {
       addToFirst,
@@ -2140,7 +2151,8 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       readonly,
       fullColumns,
       buttonsColumn,
-      handleFormSetData
+      handleFormSetData,
+      formData
     };
   }
 });
@@ -2159,7 +2171,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return vue.openBlock(), vue.createBlock(_component_VkfTemplateInstancesProvider, null, {
     default: vue.withCtx(() => [
       vue.createVNode(_component_VkfTemplatesDefault, {
-        data: _ctx.modelValue,
+        data: _ctx.formData,
         onSetData: _ctx.handleFormSetData
       }, null, 8, ["data", "onSetData"]),
       vue.createVNode(

package/components/input-collection/index.mjs

@@ -6,7 +6,7 @@ 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 } from '@vunk/core';
+import { ensetData, getValue as getValue$1 } from '@vunk/core';
 import { p as plus_default, f as minus_default } from '../index2.mjs';
 import { _ as _export_sfc } from '../_plugin-vue_export-helper.mjs';
 
@@ -2079,13 +2079,24 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
   }) {
     const formItemBindProps = _VkfFormItemCtx.createBindProps(props2);
     const readonly = useComputedReadonly(props2);
+    const formData = computed(() => {
+      if (!props2.prop || props2.prop.length === 0) {
+        return props2.modelValue;
+      }
+      const data = {};
+      ensetData(data, {
+        k: props2.prop,
+        v: props2.modelValue
+      });
+      return data;
+    });
     const fullColumns = computed(() => {
       return props2.columns.map(column => {
         return {
           ...column,
           slots: e => createVNode(VkfFormItemRenderer, {
             "source": [{
-              prop: [e.$index, column.prop].flat(),
+              prop: [props2.prop ?? [], e.$index, column.prop].flat(),
               templateType: column.templateType,
               readonly: readonly.value,
               ...column.templateProps,
@@ -2126,9 +2137,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       emit("update:modelValue", [{}, ...props2.modelValue]);
     };
     const handleFormSetData = e => {
-      const data = cloneDeep(props2.modelValue);
+      const data = cloneDeep(formData.value);
       ensetData(data, e);
-      emit("update:modelValue", data);
+      emit("update:modelValue", getValue$1(data, props2.prop));
     };
     return {
       addToFirst,
@@ -2136,7 +2147,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       readonly,
       fullColumns,
       buttonsColumn,
-      handleFormSetData
+      handleFormSetData,
+      formData
     };
   }
 });
@@ -2155,7 +2167,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createBlock(_component_VkfTemplateInstancesProvider, null, {
     default: withCtx(() => [
       createVNode(_component_VkfTemplatesDefault, {
-        data: _ctx.modelValue,
+        data: _ctx.formData,
         onSetData: _ctx.handleFormSetData
       }, null, 8, ["data", "onSetData"]),
       createVNode(

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

@@ -1,12 +1,13 @@
 import { __VkTableColumns } from '@vunk/plus/components/table-columns';
 import { SetDataEvent } from '@vunk/core';
+import { NormalObject } from '@vunk/shared';
 declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     columns: {
         type: import("vue").PropType<import("./types").Column<any>[]>;
         default: () => any[];
     };
     modelValue: {
-        type: import("vue").PropType<import("@vunk/shared").NormalObject[]>;
+        type: import("vue").PropType<NormalObject[]>;
         default: () => any[];
     };
     readonly: {
@@ -69,6 +70,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     fullColumns: import("vue").ComputedRef<__VkTableColumns.Source<import("@vunk/core").NormalObject>[]>;
     buttonsColumn: import("vue").ComputedRef<__VkTableColumns.Source<import("@vunk/core").NormalObject>>;
     handleFormSetData: (e: SetDataEvent) => void;
+    formData: import("vue").ComputedRef<NormalObject | NormalObject[]>;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     'update:modelValue': any;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
@@ -77,7 +79,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         default: () => any[];
     };
     modelValue: {
-        type: import("vue").PropType<import("@vunk/shared").NormalObject[]>;
+        type: import("vue").PropType<NormalObject[]>;
         default: () => any[];
     };
     readonly: {
@@ -145,7 +147,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     labelWidth: import("element-plus/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
     inlineMessage: import("element-plus/es/utils").EpPropMergeType<readonly [StringConstructor, BooleanConstructor], unknown, unknown>;
     showMessage: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
-    modelValue: import("@vunk/shared").NormalObject[];
+    modelValue: NormalObject[];
     columns: import("./types").Column<any>[];
     splicable: boolean;
 }, {}, {

package/package.json

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