3h1-ui 3.0.0-next.243 → 3.0.0-next.245

package/es/index.js

@@ -11737,7 +11737,7 @@ const FormItem$2 = /* @__PURE__ */ defineComponent({
         schema: schema2,
         tableAction: tableAction2,
         formModel,
-        formActionType
+        formActionType: formActionType2
       } = props2;
       let {
         componentProps = {}
@@ -11747,7 +11747,7 @@ const FormItem$2 = /* @__PURE__ */ defineComponent({
           schema: schema2,
           tableAction: tableAction2,
           formModel,
-          formActionType
+          formActionType: formActionType2
         }) ?? {};
       }
       if (schema2.component === "Divider") {
@@ -12410,6 +12410,7 @@ function useFormValues({
   }
   return { handleFormValues, initDefault };
 }
+const formActionType = inject("formActionType");
 function useFormEvents({
   emit,
   getProps,
@@ -12418,7 +12419,8 @@ function useFormEvents({
   defaultValueRef,
   formElRef,
   schemaRef,
-  handleFormValues
+  handleFormValues,
+  tableAction: tableAction2
 }) {
   async function resetFields() {
     const { resetFunc, submitOnReset } = unref(getProps);
@@ -12619,32 +12621,38 @@ function useFormEvents({
         const matched = updateData.find(
           (item) => item.field === schemaItem.field
         );
-        let merged = matched ? deepMerge$2(schemaItem, matched) : schemaItem;
-        const originalProps = merged.componentProps;
-        if (typeof originalProps === "function") {
+        const merged = matched ? deepMerge$2(schemaItem, matched) : { ...schemaItem };
+        let originalProps = merged.componentProps;
+        if (typeof originalProps === "function" && merged.component === "Group") {
           const resultProps = originalProps(context);
-          if (merged.component === "Group" && resultProps && Array.isArray(resultProps.schemas)) {
-            const processedSchemas = processSchemas(
-              resultProps.schemas,
-              context
-            );
-            merged.componentProps = (ctx) => ({
-              ...originalProps(ctx),
-              schemas: processedSchemas
-            });
+          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 (merged.componentProps && typeof originalProps === "object" && merged.component === "Group" && Array.isArray(originalProps.schemas)) {
-          merged.componentProps.schemas = processSchemas(
-            originalProps.schemas,
-            context
-          );
+        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;
       });
     }
     const rawSchemas = unref(getSchema);
-    schema.push(...processSchemas(rawSchemas));
+    schema.push(
+      ...processSchemas(rawSchemas, {
+        formModel,
+        formActionType,
+        tableAction: tableAction2
+      })
+    );
     _setDefaultValue(schema);
     schemaRef.value = uniqBy(schema, "field");
   }
@@ -25843,7 +25851,8 @@ const ShyForm = /* @__PURE__ */ defineComponent({
       formElRef,
       //@ts-ignore
       schemaRef,
-      handleFormValues
+      handleFormValues,
+      tableAction: props2.tableAction
     });
     createFormContext({
       resetAction: resetFields,
@@ -25901,7 +25910,7 @@ const ShyForm = /* @__PURE__ */ defineComponent({
           schema: {},
           // 每次赋值
           formModel,
-          formActionType,
+          formActionType: formActionType2,
           tableAction: props2.tableAction
         };
         handleSchemas(unref(getProps).schemas);
@@ -25940,7 +25949,7 @@ const ShyForm = /* @__PURE__ */ defineComponent({
           ;
       }
     }
-    const formActionType = {
+    const formActionType2 = {
       getFieldsValue,
       setFieldsValue,
       resetFields,
@@ -25955,7 +25964,7 @@ const ShyForm = /* @__PURE__ */ defineComponent({
       validate,
       scrollToField
     };
-    provide("formActionType", formActionType);
+    provide("formActionType", formActionType2);
     const isTableForm = computed(() => {
       return !!unref(getBindValue).tableAction;
     });
@@ -26045,7 +26054,7 @@ const ShyForm = /* @__PURE__ */ defineComponent({
     };
     onMounted(() => {
       initDefault();
-      emit("register", formActionType);
+      emit("register", formActionType2);
     });
     return () => {
       const ignoreKeys = ["resetBefore", "submitBefore", "advanceBefore", "advanceAfter", "advancedSearch"];
@@ -26083,7 +26092,7 @@ const ShyForm = /* @__PURE__ */ defineComponent({
         const realSpan = (((_a2 = schema.colProps) == null ? void 0 : _a2.span) ?? ((_c = (_b = unref(getBindValue)) == null ? void 0 : _b.baseColProps) == null ? void 0 : _c.span)) / (unref(ROW_SLICE2) + unref(ACTION_COL2));
         return createVNode(FormItem$2, {
           "tableAction": props2.tableAction,
-          "formActionType": formActionType,
+          "formActionType": formActionType2,
           "schema": schema,
           "formProps": getProps.value,
           "allDefaultValues": defaultValueRef.value,
@@ -28263,7 +28272,7 @@ const EQUAL_OPERATOR_OPTIONS = ALL_OPERATOR_OPTION.filter(
 const CONTAIN_OPERATOR_OPTIONS = ALL_OPERATOR_OPTION.filter(
   (item) => ["ct"].includes(item.value)
 );
-const useAdvancedSearch = (schemas, formActionType) => {
+const useAdvancedSearch = (schemas, formActionType2) => {
   const getSchemaOptions = (type4) => {
     switch (type4) {
       case "number":
@@ -28351,7 +28360,7 @@ const useAdvancedSearch = (schemas, formActionType) => {
       removeSchemaByField,
       updateSchema,
       setFieldsValue
-    } = formActionType;
+    } = formActionType2;
     const {
       schemas: [operatorSchema, valueSchema]
     } = componentProps;
@@ -32079,7 +32088,7 @@ const ShyFormTable = /* @__PURE__ */ defineComponent({
     const {
       prefixCls: prefixCls2
     } = useDesign$1("ant-form-table-children");
-    const formActionType = inject("formActionType");
+    const formActionType2 = inject("formActionType");
     const tableWrapperRef = ref();
     const tableElRef = ref();
     const curIndex = ref(0);
@@ -32405,7 +32414,7 @@ const ShyFormTable = /* @__PURE__ */ defineComponent({
               column: column2,
               record,
               ...args
-            }, formActionType);
+            }, formActionType2);
           } catch (error2) {
             rulesRef[errKey].show = true;
             rulesRef[errKey].msg = error2;
@@ -35743,7 +35752,7 @@ const Group = /* @__PURE__ */ defineComponent({
         schema,
         tableAction: tableAction2,
         formModel,
-        formActionType
+        formActionType: formActionType2
       } = props2;
       let {
         componentProps: _componentProps,
@@ -35755,7 +35764,7 @@ const Group = /* @__PURE__ */ defineComponent({
           schema,
           tableAction: tableAction2,
           formModel,
-          formActionType
+          formActionType: formActionType2
         }) ?? {};
       }
       const realSpan = (((_a2 = schema.colProps) == null ? void 0 : _a2.span) ?? ((_c = (_b = unref(contextBindValue)) == null ? void 0 : _b.baseColProps) == null ? void 0 : _c.span)) / (unref(ROW_SLICE) + unref(ACTION_COL));
@@ -35906,7 +35915,7 @@ const FormItem = /* @__PURE__ */ defineComponent({
       const {
         schema,
         formModel,
-        formActionType
+        formActionType: formActionType2
       } = props2;
       let {
         componentProps = {}
@@ -35915,7 +35924,7 @@ const FormItem = /* @__PURE__ */ defineComponent({
         componentProps = componentProps({
           schema,
           formModel,
-          formActionType
+          formActionType: formActionType2
         }) ?? {};
       }
       if (schema.component === "Divider") {

package/es/ui/src/ShyForm/src/hooks/useFormEvents.d.ts

@@ -10,8 +10,9 @@ interface UseFormActionContext {
     formElRef: Ref<FormActionType>;
     schemaRef: Ref<FormSchema[]>;
     handleFormValues: Fn;
+    tableAction?: any;
 }
-export declare function useFormEvents({ emit, getProps, formModel, getSchema, defaultValueRef, formElRef, schemaRef, handleFormValues }: UseFormActionContext): {
+export declare function useFormEvents({ emit, getProps, formModel, getSchema, defaultValueRef, formElRef, schemaRef, handleFormValues, tableAction }: UseFormActionContext): {
     handleSubmit: (e?: Event) => Promise<void>;
     clearValidate: (name?: string | string[]) => Promise<void>;
     validate: (nameList?: NamePath[] | undefined) => Promise<any>;

package/lib/index.js

@@ -11761,7 +11761,7 @@ const FormItem$2 = /* @__PURE__ */ vue.defineComponent({
         schema: schema2,
         tableAction: tableAction2,
         formModel,
-        formActionType
+        formActionType: formActionType2
       } = props2;
       let {
         componentProps = {}
@@ -11771,7 +11771,7 @@ const FormItem$2 = /* @__PURE__ */ vue.defineComponent({
           schema: schema2,
           tableAction: tableAction2,
           formModel,
-          formActionType
+          formActionType: formActionType2
         }) ?? {};
       }
       if (schema2.component === "Divider") {
@@ -12434,6 +12434,7 @@ function useFormValues({
   }
   return { handleFormValues, initDefault };
 }
+const formActionType = vue.inject("formActionType");
 function useFormEvents({
   emit,
   getProps,
@@ -12442,7 +12443,8 @@ function useFormEvents({
   defaultValueRef,
   formElRef,
   schemaRef,
-  handleFormValues
+  handleFormValues,
+  tableAction: tableAction2
 }) {
   async function resetFields() {
     const { resetFunc, submitOnReset } = vue.unref(getProps);
@@ -12643,32 +12645,38 @@ function useFormEvents({
         const matched = updateData.find(
           (item) => item.field === schemaItem.field
         );
-        let merged = matched ? utils$1.deepMerge(schemaItem, matched) : schemaItem;
-        const originalProps = merged.componentProps;
-        if (typeof originalProps === "function") {
+        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 (merged.component === "Group" && resultProps && Array.isArray(resultProps.schemas)) {
-            const processedSchemas = processSchemas(
-              resultProps.schemas,
-              context
-            );
-            merged.componentProps = (ctx) => ({
-              ...originalProps(ctx),
-              schemas: processedSchemas
-            });
+          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 (merged.componentProps && typeof originalProps === "object" && merged.component === "Group" && Array.isArray(originalProps.schemas)) {
-          merged.componentProps.schemas = processSchemas(
-            originalProps.schemas,
-            context
-          );
+        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;
       });
     }
     const rawSchemas = vue.unref(getSchema);
-    schema.push(...processSchemas(rawSchemas));
+    schema.push(
+      ...processSchemas(rawSchemas, {
+        formModel,
+        formActionType,
+        tableAction: tableAction2
+      })
+    );
     _setDefaultValue(schema);
     schemaRef.value = uniqBy(schema, "field");
   }
@@ -25867,7 +25875,8 @@ const ShyForm = /* @__PURE__ */ vue.defineComponent({
       formElRef,
       //@ts-ignore
       schemaRef,
-      handleFormValues
+      handleFormValues,
+      tableAction: props2.tableAction
     });
     createFormContext({
       resetAction: resetFields,
@@ -25925,7 +25934,7 @@ const ShyForm = /* @__PURE__ */ vue.defineComponent({
           schema: {},
           // 每次赋值
           formModel,
-          formActionType,
+          formActionType: formActionType2,
           tableAction: props2.tableAction
         };
         handleSchemas(vue.unref(getProps).schemas);
@@ -25964,7 +25973,7 @@ const ShyForm = /* @__PURE__ */ vue.defineComponent({
           ;
       }
     }
-    const formActionType = {
+    const formActionType2 = {
       getFieldsValue,
       setFieldsValue,
       resetFields,
@@ -25979,7 +25988,7 @@ const ShyForm = /* @__PURE__ */ vue.defineComponent({
       validate,
       scrollToField
     };
-    vue.provide("formActionType", formActionType);
+    vue.provide("formActionType", formActionType2);
     const isTableForm = vue.computed(() => {
       return !!vue.unref(getBindValue).tableAction;
     });
@@ -26069,7 +26078,7 @@ const ShyForm = /* @__PURE__ */ vue.defineComponent({
     };
     vue.onMounted(() => {
       initDefault();
-      emit("register", formActionType);
+      emit("register", formActionType2);
     });
     return () => {
       const ignoreKeys = ["resetBefore", "submitBefore", "advanceBefore", "advanceAfter", "advancedSearch"];
@@ -26107,7 +26116,7 @@ const ShyForm = /* @__PURE__ */ vue.defineComponent({
         const realSpan = (((_a2 = schema.colProps) == null ? void 0 : _a2.span) ?? ((_c = (_b = vue.unref(getBindValue)) == null ? void 0 : _b.baseColProps) == null ? void 0 : _c.span)) / (vue.unref(ROW_SLICE2) + vue.unref(ACTION_COL2));
         return vue.createVNode(FormItem$2, {
           "tableAction": props2.tableAction,
-          "formActionType": formActionType,
+          "formActionType": formActionType2,
           "schema": schema,
           "formProps": getProps.value,
           "allDefaultValues": defaultValueRef.value,
@@ -28287,7 +28296,7 @@ const EQUAL_OPERATOR_OPTIONS = ALL_OPERATOR_OPTION.filter(
 const CONTAIN_OPERATOR_OPTIONS = ALL_OPERATOR_OPTION.filter(
   (item) => ["ct"].includes(item.value)
 );
-const useAdvancedSearch = (schemas, formActionType) => {
+const useAdvancedSearch = (schemas, formActionType2) => {
   const getSchemaOptions = (type4) => {
     switch (type4) {
       case "number":
@@ -28375,7 +28384,7 @@ const useAdvancedSearch = (schemas, formActionType) => {
       removeSchemaByField,
       updateSchema,
       setFieldsValue
-    } = formActionType;
+    } = formActionType2;
     const {
       schemas: [operatorSchema, valueSchema]
     } = componentProps;
@@ -32103,7 +32112,7 @@ const ShyFormTable = /* @__PURE__ */ vue.defineComponent({
     const {
       prefixCls: prefixCls2
     } = use.useDesign("ant-form-table-children");
-    const formActionType = vue.inject("formActionType");
+    const formActionType2 = vue.inject("formActionType");
     const tableWrapperRef = vue.ref();
     const tableElRef = vue.ref();
     const curIndex = vue.ref(0);
@@ -32429,7 +32438,7 @@ const ShyFormTable = /* @__PURE__ */ vue.defineComponent({
               column: column2,
               record,
               ...args
-            }, formActionType);
+            }, formActionType2);
           } catch (error2) {
             rulesRef[errKey].show = true;
             rulesRef[errKey].msg = error2;
@@ -35767,7 +35776,7 @@ const Group = /* @__PURE__ */ vue.defineComponent({
         schema,
         tableAction: tableAction2,
         formModel,
-        formActionType
+        formActionType: formActionType2
       } = props2;
       let {
         componentProps: _componentProps,
@@ -35779,7 +35788,7 @@ const Group = /* @__PURE__ */ vue.defineComponent({
           schema,
           tableAction: tableAction2,
           formModel,
-          formActionType
+          formActionType: formActionType2
         }) ?? {};
       }
       const realSpan = (((_a2 = schema.colProps) == null ? void 0 : _a2.span) ?? ((_c = (_b = vue.unref(contextBindValue)) == null ? void 0 : _b.baseColProps) == null ? void 0 : _c.span)) / (vue.unref(ROW_SLICE) + vue.unref(ACTION_COL));
@@ -35930,7 +35939,7 @@ const FormItem = /* @__PURE__ */ vue.defineComponent({
       const {
         schema,
         formModel,
-        formActionType
+        formActionType: formActionType2
       } = props2;
       let {
         componentProps = {}
@@ -35939,7 +35948,7 @@ const FormItem = /* @__PURE__ */ vue.defineComponent({
         componentProps = componentProps({
           schema,
           formModel,
-          formActionType
+          formActionType: formActionType2
         }) ?? {};
       }
       if (schema.component === "Divider") {

package/lib/ui/src/ShyForm/src/hooks/useFormEvents.d.ts

@@ -10,8 +10,9 @@ interface UseFormActionContext {
     formElRef: Ref<FormActionType>;
     schemaRef: Ref<FormSchema[]>;
     handleFormValues: Fn;
+    tableAction?: any;
 }
-export declare function useFormEvents({ emit, getProps, formModel, getSchema, defaultValueRef, formElRef, schemaRef, handleFormValues }: UseFormActionContext): {
+export declare function useFormEvents({ emit, getProps, formModel, getSchema, defaultValueRef, formElRef, schemaRef, handleFormValues, tableAction }: UseFormActionContext): {
     handleSubmit: (e?: Event) => Promise<void>;
     clearValidate: (name?: string | string[]) => Promise<void>;
     validate: (nameList?: NamePath[] | undefined) => Promise<any>;

package/package.json

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