3h1-ui 3.0.0-next.237 → 3.0.0-next.238

package/es/index.js

@@ -25858,29 +25858,34 @@ const ShyForm = /* @__PURE__ */ defineComponent({
     });
     const tempFormModel = reactive({});
     watch(() => formModel, useDebounceFn$1((val) => {
-      var _a2;
       if (isEqual(toRaw(val), toRaw(tempFormModel)))
         return;
       for (const key2 in val) {
+        let handleSchemas = function(schemas = []) {
+          schemas.forEach((item) => {
+            var _a2, _b;
+            const isComponentProps = item.field === key2 && item.componentProps;
+            if (isComponentProps && !isFunction$5(item.componentProps) && ((_a2 = item.componentProps) == null ? void 0 : _a2.onModelChange)) {
+              item.componentProps.onModelChange(val[key2]);
+            } else if (isComponentProps && isFunction$5(item.componentProps)) {
+              const modelProps = item.componentProps({
+                schema: item,
+                formModel,
+                formActionType,
+                tableAction: props2.tableAction
+              });
+              if (modelProps.onModelChange) {
+                modelProps.onModelChange(val[key2]);
+              }
+            }
+            if (item.component === "Group" && ((_b = item.componentProps) == null ? void 0 : _b.schemas)) {
+              handleSchemas(item.componentProps.schemas);
+            }
+          });
+        };
         if (isEqual(toRaw(val[key2]), toRaw(tempFormModel[key2])))
           continue;
-        (_a2 = unref(getProps).schemas) == null ? void 0 : _a2.forEach((item) => {
-          var _a3;
-          const isComponentProps = item.field === key2 && item.componentProps;
-          if (isComponentProps && !isFunction$5(item.componentProps) && ((_a3 = item.componentProps) == null ? void 0 : _a3.onModelChange)) {
-            item.componentProps.onModelChange(val[key2]);
-          } else if (isComponentProps && isFunction$5(item.componentProps)) {
-            const modelProps = item.componentProps({
-              schema: item,
-              formModel,
-              formActionType,
-              tableAction: props2.tableAction
-            });
-            if (modelProps.onModelChange) {
-              modelProps.onModelChange(val[key2]);
-            }
-          }
-        });
+        handleSchemas(unref(getProps).schemas);
       }
       Object.assign(tempFormModel, cloneDeep(formModel));
       unref(getProps).submitOnChange && handleSubmit();

package/es/ui/src/ShyForm/src/types/form.d.ts

@@ -102,7 +102,7 @@ export interface FormSchema {
     labelWidth?: string | number;
     disabledLabelWidth?: boolean;
     component: ComponentType;
-    componentProps?: ComponentProps;
+    componentProps?: Recordable;
     required?: boolean | ((renderCallbackParams: RenderCallbackParams) => boolean);
     suffix?: string | number | ((values: RenderCallbackParams) => string | number);
     rules?: Rule[];

package/lib/index.js

@@ -25882,29 +25882,34 @@ const ShyForm = /* @__PURE__ */ vue.defineComponent({
     });
     const tempFormModel = vue.reactive({});
     vue.watch(() => formModel, useDebounceFn$1((val) => {
-      var _a2;
       if (isEqual(vue.toRaw(val), vue.toRaw(tempFormModel)))
         return;
       for (const key2 in val) {
+        let handleSchemas = function(schemas = []) {
+          schemas.forEach((item) => {
+            var _a2, _b;
+            const isComponentProps = item.field === key2 && item.componentProps;
+            if (isComponentProps && !isFunction$5(item.componentProps) && ((_a2 = item.componentProps) == null ? void 0 : _a2.onModelChange)) {
+              item.componentProps.onModelChange(val[key2]);
+            } else if (isComponentProps && isFunction$5(item.componentProps)) {
+              const modelProps = item.componentProps({
+                schema: item,
+                formModel,
+                formActionType,
+                tableAction: props2.tableAction
+              });
+              if (modelProps.onModelChange) {
+                modelProps.onModelChange(val[key2]);
+              }
+            }
+            if (item.component === "Group" && ((_b = item.componentProps) == null ? void 0 : _b.schemas)) {
+              handleSchemas(item.componentProps.schemas);
+            }
+          });
+        };
         if (isEqual(vue.toRaw(val[key2]), vue.toRaw(tempFormModel[key2])))
           continue;
-        (_a2 = vue.unref(getProps).schemas) == null ? void 0 : _a2.forEach((item) => {
-          var _a3;
-          const isComponentProps = item.field === key2 && item.componentProps;
-          if (isComponentProps && !isFunction$5(item.componentProps) && ((_a3 = item.componentProps) == null ? void 0 : _a3.onModelChange)) {
-            item.componentProps.onModelChange(val[key2]);
-          } else if (isComponentProps && isFunction$5(item.componentProps)) {
-            const modelProps = item.componentProps({
-              schema: item,
-              formModel,
-              formActionType,
-              tableAction: props2.tableAction
-            });
-            if (modelProps.onModelChange) {
-              modelProps.onModelChange(val[key2]);
-            }
-          }
-        });
+        handleSchemas(vue.unref(getProps).schemas);
       }
       Object.assign(tempFormModel, cloneDeep(formModel));
       vue.unref(getProps).submitOnChange && handleSubmit();

package/lib/ui/src/ShyForm/src/types/form.d.ts

@@ -102,7 +102,7 @@ export interface FormSchema {
     labelWidth?: string | number;
     disabledLabelWidth?: boolean;
     component: ComponentType;
-    componentProps?: ComponentProps;
+    componentProps?: Recordable;
     required?: boolean | ((renderCallbackParams: RenderCallbackParams) => boolean);
     suffix?: string | number | ((values: RenderCallbackParams) => string | number);
     rules?: Rule[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "3.0.0-next.237",
+  "version": "3.0.0-next.238",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",