3h1-ui 3.0.0-next.242 → 3.0.0-next.244

package/es/index.js

@@ -12614,20 +12614,37 @@ function useFormEvents({
       return;
     }
     const schema = [];
-    unref(getSchema).forEach((val) => {
-      let _val;
-      updateData.forEach((item) => {
-        if (val.field === item.field) {
-          _val = item;
+    function processSchemas(schemas, context = {}) {
+      return schemas.map((schemaItem) => {
+        const matched = updateData.find(
+          (item) => item.field === schemaItem.field
+        );
+        const merged = matched ? deepMerge$2(schemaItem, matched) : { ...schemaItem };
+        let originalProps = merged.componentProps;
+        if (typeof originalProps === "function" && merged.component === "Group") {
+          const resultProps = originalProps(context);
+          if (Array.isArray(resultProps == null ? void 0 : resultProps.schemas)) {
+            processSchemas(resultProps.schemas, context);
+            merged.componentProps = (ctx) => {
+              const finalProps = originalProps(ctx);
+              return {
+                ...finalProps,
+                schemas: processSchemas(finalProps.schemas || [], ctx)
+              };
+            };
+          }
+        }
+        if (typeof originalProps === "object" && merged.component === "Group" && Array.isArray(originalProps == null ? void 0 : originalProps.schemas)) {
+          merged.componentProps = {
+            ...originalProps,
+            schemas: processSchemas(originalProps.schemas, context)
+          };
         }
+        return merged;
       });
-      if (_val !== void 0 && val.field === _val.field) {
-        const newSchema = deepMerge$2(val, _val);
-        schema.push(newSchema);
-      } else {
-        schema.push(val);
-      }
-    });
+    }
+    const rawSchemas = unref(getSchema);
+    schema.push(...processSchemas(rawSchemas));
     _setDefaultValue(schema);
     schemaRef.value = uniqBy(schema, "field");
   }
@@ -25866,28 +25883,27 @@ const ShyForm = /* @__PURE__ */ defineComponent({
       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]);
-              }
+            const isTargetField = item.field === key2;
+            context.schema = item;
+            const rawComponentProps = item.componentProps;
+            const resolvedProps = isFunction$5(rawComponentProps) ? rawComponentProps(context) : rawComponentProps;
+            if (isTargetField && (resolvedProps == null ? void 0 : resolvedProps.onModelChange)) {
+              resolvedProps.onModelChange(val[key2]);
             }
-            if (item.component === "Group" && ((_b = item.componentProps) == null ? void 0 : _b.schemas)) {
-              handleSchemas(item.componentProps.schemas);
+            if (item.component === "Group" && resolvedProps && Array.isArray(resolvedProps.schemas)) {
+              handleSchemas(resolvedProps.schemas);
             }
           });
         };
         if (isEqual(toRaw(val[key2]), toRaw(tempFormModel[key2])))
           continue;
+        const context = {
+          schema: {},
+          // 每次赋值
+          formModel,
+          formActionType,
+          tableAction: props2.tableAction
+        };
         handleSchemas(unref(getProps).schemas);
       }
       Object.assign(tempFormModel, cloneDeep(formModel));

package/lib/index.js

@@ -12638,20 +12638,37 @@ function useFormEvents({
       return;
     }
     const schema = [];
-    vue.unref(getSchema).forEach((val) => {
-      let _val;
-      updateData.forEach((item) => {
-        if (val.field === item.field) {
-          _val = item;
+    function processSchemas(schemas, context = {}) {
+      return schemas.map((schemaItem) => {
+        const matched = updateData.find(
+          (item) => item.field === schemaItem.field
+        );
+        const merged = matched ? utils$1.deepMerge(schemaItem, matched) : { ...schemaItem };
+        let originalProps = merged.componentProps;
+        if (typeof originalProps === "function" && merged.component === "Group") {
+          const resultProps = originalProps(context);
+          if (Array.isArray(resultProps == null ? void 0 : resultProps.schemas)) {
+            processSchemas(resultProps.schemas, context);
+            merged.componentProps = (ctx) => {
+              const finalProps = originalProps(ctx);
+              return {
+                ...finalProps,
+                schemas: processSchemas(finalProps.schemas || [], ctx)
+              };
+            };
+          }
+        }
+        if (typeof originalProps === "object" && merged.component === "Group" && Array.isArray(originalProps == null ? void 0 : originalProps.schemas)) {
+          merged.componentProps = {
+            ...originalProps,
+            schemas: processSchemas(originalProps.schemas, context)
+          };
         }
+        return merged;
       });
-      if (_val !== void 0 && val.field === _val.field) {
-        const newSchema = utils$1.deepMerge(val, _val);
-        schema.push(newSchema);
-      } else {
-        schema.push(val);
-      }
-    });
+    }
+    const rawSchemas = vue.unref(getSchema);
+    schema.push(...processSchemas(rawSchemas));
     _setDefaultValue(schema);
     schemaRef.value = uniqBy(schema, "field");
   }
@@ -25890,28 +25907,27 @@ const ShyForm = /* @__PURE__ */ vue.defineComponent({
       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]);
-              }
+            const isTargetField = item.field === key2;
+            context.schema = item;
+            const rawComponentProps = item.componentProps;
+            const resolvedProps = isFunction$5(rawComponentProps) ? rawComponentProps(context) : rawComponentProps;
+            if (isTargetField && (resolvedProps == null ? void 0 : resolvedProps.onModelChange)) {
+              resolvedProps.onModelChange(val[key2]);
             }
-            if (item.component === "Group" && ((_b = item.componentProps) == null ? void 0 : _b.schemas)) {
-              handleSchemas(item.componentProps.schemas);
+            if (item.component === "Group" && resolvedProps && Array.isArray(resolvedProps.schemas)) {
+              handleSchemas(resolvedProps.schemas);
             }
           });
         };
         if (isEqual(vue.toRaw(val[key2]), vue.toRaw(tempFormModel[key2])))
           continue;
+        const context = {
+          schema: {},
+          // 每次赋值
+          formModel,
+          formActionType,
+          tableAction: props2.tableAction
+        };
         handleSchemas(vue.unref(getProps).schemas);
       }
       Object.assign(tempFormModel, cloneDeep(formModel));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "3.0.0-next.242",
+  "version": "3.0.0-next.244",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -29,9 +29,9 @@
     "vue-json-pretty": "^2.2.3",
     "vxe-table": "4.3.6",
     "xe-utils": "^3.5.7",
+    "@shy-plugins/utils": "1.0.0-next.1",
     "@shy-plugins/use": "1.0.1-next.5",
-    "@shy-plugins/tinymce": "^1.0.6",
-    "@shy-plugins/utils": "1.0.0-next.1"
+    "@shy-plugins/tinymce": "^1.0.6"
   },
   "types": "es/ui/index.d.ts",
   "devDependencies": {