@tmagic/form 1.7.5 → 1.7.6

package/dist/tmagic-form.js

@@ -235,6 +235,18 @@ const sortChange = (data, { prop, order }) => {
     data.sort((a, b) => b[prop] - a[prop]);
   }
 };
+const createObjectProp = (prop, key, name) => {
+  if (prop === "") {
+    return key;
+  }
+  const itemPath = `${prop}`.split(".");
+  if (name) {
+    if (`${itemPath[itemPath.length - 1]}` === `${name}`) {
+      return `${[...itemPath.slice(0, -1), key].join(".")}`;
+    }
+  }
+  return `${[...itemPath, key].join(".")}`;
+};
 
 const _hoisted_1$e = {
   key: 0,
@@ -473,11 +485,7 @@ const _sfc_main$A = /* @__PURE__ */ defineComponent({
         value = filterHandler(filter, v);
         if (typeof onChange === "function") {
           const setModel = (key2, value2) => {
-            if (props.config.name) {
-              newChangeRecords.push({ propPath: itemProp.value.replace(`${props.config.name}`, key2), value: value2 });
-            } else {
-              newChangeRecords.push({ propPath: itemProp.value, value: value2 });
-            }
+            newChangeRecords.push({ propPath: createObjectProp(itemProp.value, key2, props.config.name), value: value2 });
           };
           const setFormValue = (key2, value2) => {
             newChangeRecords.push({ propPath: key2, value: value2 });
@@ -5890,4 +5898,4 @@ const index = {
   }
 };
 
-export { _sfc_main$q as MCascader, _sfc_main$p as MCheckbox, _sfc_main$o as MCheckboxGroup, _sfc_main$n as MColorPicker, _sfc_main$A as MContainer, _sfc_main$m as MDate, _sfc_main$k as MDateTime, _sfc_main$l as MDaterange, _sfc_main$j as MDisplay, _sfc_main$i as MDynamicField, _sfc_main$z as MFieldset, _sfc_main$y as MFlexLayout, _sfc_main$g as MForm, _sfc_main as MFormBox, _sfc_main$f as MFormDialog, _sfc_main$1 as MFormDrawer, _sfc_main$w as MGroupList, _sfc_main$h as MHidden, _sfc_main$e as MLink, _sfc_main$d as MNumber, _sfc_main$c as MNumberRange, _sfc_main$v as MPanel, _sfc_main$b as MRadioGroup, _sfc_main$t as MRow, _sfc_main$a as MSelect, _sfc_main$9 as MSwitch, _sfc_main$2 as MTable, _sfc_main$r as MTabs, _sfc_main$8 as MText, _sfc_main$7 as MTextarea, _sfc_main$6 as MTime, _sfc_main$5 as MTimerange, createForm, createValues, datetimeFormatter, index as default, display, filterFunction, getDataByPage, getRules, initValue, sortArray, sortChange, useAddField };
+export { _sfc_main$q as MCascader, _sfc_main$p as MCheckbox, _sfc_main$o as MCheckboxGroup, _sfc_main$n as MColorPicker, _sfc_main$A as MContainer, _sfc_main$m as MDate, _sfc_main$k as MDateTime, _sfc_main$l as MDaterange, _sfc_main$j as MDisplay, _sfc_main$i as MDynamicField, _sfc_main$z as MFieldset, _sfc_main$y as MFlexLayout, _sfc_main$g as MForm, _sfc_main as MFormBox, _sfc_main$f as MFormDialog, _sfc_main$1 as MFormDrawer, _sfc_main$w as MGroupList, _sfc_main$h as MHidden, _sfc_main$e as MLink, _sfc_main$d as MNumber, _sfc_main$c as MNumberRange, _sfc_main$v as MPanel, _sfc_main$b as MRadioGroup, _sfc_main$t as MRow, _sfc_main$a as MSelect, _sfc_main$9 as MSwitch, _sfc_main$2 as MTable, _sfc_main$r as MTabs, _sfc_main$8 as MText, _sfc_main$7 as MTextarea, _sfc_main$6 as MTime, _sfc_main$5 as MTimerange, createForm, createObjectProp, createValues, datetimeFormatter, index as default, display, filterFunction, getDataByPage, getRules, initValue, sortArray, sortChange, useAddField };

package/dist/tmagic-form.umd.cjs

@@ -3165,6 +3165,18 @@
       data.sort((a, b) => b[prop] - a[prop]);
     }
   };
+  const createObjectProp = (prop, key, name) => {
+    if (prop === "") {
+      return key;
+    }
+    const itemPath = `${prop}`.split(".");
+    if (name) {
+      if (`${itemPath[itemPath.length - 1]}` === `${name}`) {
+        return `${[...itemPath.slice(0, -1), key].join(".")}`;
+      }
+    }
+    return `${[...itemPath, key].join(".")}`;
+  };
 
   const _hoisted_1$e = {
     key: 0,
@@ -3403,11 +3415,7 @@
           value = filterHandler(filter, v);
           if (typeof onChange === "function") {
             const setModel = (key2, value2) => {
-              if (props.config.name) {
-                newChangeRecords.push({ propPath: itemProp.value.replace(`${props.config.name}`, key2), value: value2 });
-              } else {
-                newChangeRecords.push({ propPath: itemProp.value, value: value2 });
-              }
+              newChangeRecords.push({ propPath: createObjectProp(itemProp.value, key2, props.config.name), value: value2 });
             };
             const setFormValue = (key2, value2) => {
               newChangeRecords.push({ propPath: key2, value: value2 });
@@ -8853,6 +8861,7 @@
   exports.MTime = _sfc_main$6;
   exports.MTimerange = _sfc_main$5;
   exports.createForm = createForm;
+  exports.createObjectProp = createObjectProp;
   exports.createValues = createValues;
   exports.datetimeFormatter = datetimeFormatter;
   exports.default = index;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.7.5",
+  "version": "1.7.6",
   "name": "@tmagic/form",
   "type": "module",
   "sideEffects": [
@@ -51,9 +51,9 @@
   "peerDependencies": {
     "vue": "^3.5.24",
     "typescript": "^5.9.3",
-    "@tmagic/design": "1.7.5",
-    "@tmagic/form-schema": "1.7.5",
-    "@tmagic/utils": "1.7.5"
+    "@tmagic/utils": "1.7.6",
+    "@tmagic/form-schema": "1.7.6",
+    "@tmagic/design": "1.7.6"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/containers/Container.vue

@@ -180,7 +180,7 @@ import type {
   FormValue,
   ToolTipConfigType,
 } from '../schema';
-import { display as displayFunction, filterFunction, getRules } from '../utils/form';
+import { createObjectProp, display as displayFunction, filterFunction, getRules } from '../utils/form';
 
 import FormLabel from './FormLabel.vue';
 
@@ -416,11 +416,7 @@ const onChangeHandler = async function (v: any, eventData: ContainerChangeEventD
 
     if (typeof onChange === 'function') {
       const setModel = (key: string, value: any) => {
-        if (props.config.name) {
-          newChangeRecords.push({ propPath: itemProp.value.replace(`${props.config.name}`, key), value });
-        } else {
-          newChangeRecords.push({ propPath: itemProp.value, value });
-        }
+        newChangeRecords.push({ propPath: createObjectProp(itemProp.value, key, props.config.name), value });
       };
 
       const setFormValue = (key: string, value: any) => {

package/src/utils/form.ts

@@ -366,3 +366,18 @@ export const sortChange = (data: any[], { prop, order }: SortProp) => {
     data.sort((a: any, b: any) => b[prop] - a[prop]);
   }
 };
+
+export const createObjectProp = (prop: string, key: string, name?: string | number) => {
+  if (prop === '') {
+    return key;
+  }
+
+  const itemPath = `${prop}`.split('.');
+
+  if (name) {
+    if (`${itemPath[itemPath.length - 1]}` === `${name}`) {
+      return `${[...itemPath.slice(0, -1), key].join('.')}`;
+    }
+  }
+  return `${[...itemPath, key].join('.')}`;
+};

package/types/index.d.ts

@@ -31,6 +31,7 @@ declare const datetimeFormatter: (v: string | Date, defaultValue?: string, forma
 declare const getDataByPage: (data: any[] | undefined, pagecontext: number, pagesize: number) => any[];
 declare const sortArray: (data: any[], newIndex: number, oldIndex: number, sortKey?: string) => any[];
 declare const sortChange: (data: any[], { prop, order }: SortProp) => void;
+declare const createObjectProp: (prop: string, key: string, name?: string | number) => string;
 
 declare const useAddField: (prop?: string) => void;
 
@@ -1330,5 +1331,5 @@ declare const _default: {
     install(app: App, opt?: FormInstallOptions): void;
 };
 
-export { _default$2 as MCascader, _default$c as MCheckbox, _default$7 as MCheckboxGroup, _default$8 as MColorPicker, _default$s as MContainer, _default$f as MDate, _default$e as MDateTime, _default$a as MDaterange, _default$5 as MDisplay, _default$1 as MDynamicField, _default$r as MFieldset, _default$q as MFlexLayout, _default$w as MForm, _default$t as MFormBox, _default$v as MFormDialog, _default$u as MFormDrawer, _default$l as MGroupList, _default$g as MHidden, _default$4 as MLink, _default$j as MNumber, _default$i as MNumberRange, _default$p as MPanel, _default$6 as MRadioGroup, _default$o as MRow, _default$3 as MSelect, _default$b as MSwitch, _default$m as MTable, _default$n as MTabs, _default$k as MText, _default$h as MTextarea, _default$d as MTime, _default$9 as MTimerange, createForm, createValues, datetimeFormatter, _default as default, display, filterFunction, getDataByPage, getRules, initValue, sortArray, sortChange, useAddField };
+export { _default$2 as MCascader, _default$c as MCheckbox, _default$7 as MCheckboxGroup, _default$8 as MColorPicker, _default$s as MContainer, _default$f as MDate, _default$e as MDateTime, _default$a as MDaterange, _default$5 as MDisplay, _default$1 as MDynamicField, _default$r as MFieldset, _default$q as MFlexLayout, _default$w as MForm, _default$t as MFormBox, _default$v as MFormDialog, _default$u as MFormDrawer, _default$l as MGroupList, _default$g as MHidden, _default$4 as MLink, _default$j as MNumber, _default$i as MNumberRange, _default$p as MPanel, _default$6 as MRadioGroup, _default$o as MRow, _default$3 as MSelect, _default$b as MSwitch, _default$m as MTable, _default$n as MTabs, _default$k as MText, _default$h as MTextarea, _default$d as MTime, _default$9 as MTimerange, createForm, createObjectProp, createValues, datetimeFormatter, _default as default, display, filterFunction, getDataByPage, getRules, initValue, sortArray, sortChange, useAddField };
 export type { ChangeRecord, ContainerChangeEventData, FormInstallOptions, ValidateError };