3h1-ui 3.0.0-next.246 → 3.0.0-next.248

package/es/index.js

@@ -11737,7 +11737,7 @@ const FormItem$2 = /* @__PURE__ */ defineComponent({
         schema: schema2,
         tableAction: tableAction2,
         formModel,
-        formActionType: formActionType2
+        formActionType
       } = props2;
       let {
         componentProps = {}
@@ -11747,7 +11747,7 @@ const FormItem$2 = /* @__PURE__ */ defineComponent({
           schema: schema2,
           tableAction: tableAction2,
           formModel,
-          formActionType: formActionType2
+          formActionType
         }) ?? {};
       }
       if (schema2.component === "Divider") {
@@ -12410,7 +12410,6 @@ function useFormValues({
   }
   return { handleFormValues, initDefault };
 }
-const formActionType = inject("formActionType");
 function useFormEvents({
   emit,
   getProps,
@@ -12419,8 +12418,7 @@ function useFormEvents({
   defaultValueRef,
   formElRef,
   schemaRef,
-  handleFormValues,
-  tableAction: tableAction2
+  handleFormValues
 }) {
   async function resetFields() {
     const { resetFunc, submitOnReset } = unref(getProps);
@@ -12616,41 +12614,20 @@ function useFormEvents({
       return;
     }
     const schema = [];
-    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 };
-        const rawComponentProps = merged.componentProps;
-        if (typeof rawComponentProps === "function" && merged.component === "Group") {
-          merged.componentProps = (ctx) => {
-            const originalResult = rawComponentProps(ctx);
-            const rawSchemas2 = originalResult.schemas || [];
-            const updatedSchemas = processSchemas(rawSchemas2, ctx);
-            return {
-              ...originalResult,
-              schemas: updatedSchemas
-            };
-          };
-        }
-        if (typeof rawComponentProps === "object" && merged.component === "Group" && Array.isArray(rawComponentProps == null ? void 0 : rawComponentProps.schemas)) {
-          merged.componentProps = {
-            ...rawComponentProps,
-            schemas: processSchemas(rawComponentProps.schemas, context)
-          };
+    unref(getSchema).forEach((val) => {
+      let _val;
+      updateData.forEach((item) => {
+        if (val.field === item.field) {
+          _val = item;
         }
-        return merged;
       });
-    }
-    const rawSchemas = unref(getSchema);
-    schema.push(
-      ...processSchemas(rawSchemas, {
-        formModel,
-        formActionType,
-        tableAction: tableAction2
-      })
-    );
+      if (_val !== void 0 && val.field === _val.field) {
+        const newSchema = deepMerge$2(val, _val);
+        schema.push(newSchema);
+      } else {
+        schema.push(val);
+      }
+    });
     _setDefaultValue(schema);
     schemaRef.value = uniqBy(schema, "field");
   }
@@ -25849,8 +25826,7 @@ const ShyForm = /* @__PURE__ */ defineComponent({
       formElRef,
       //@ts-ignore
       schemaRef,
-      handleFormValues,
-      tableAction: props2.tableAction
+      handleFormValues
     });
     createFormContext({
       resetAction: resetFields,
@@ -25890,27 +25866,28 @@ const ShyForm = /* @__PURE__ */ defineComponent({
       for (const key2 in val) {
         let handleSchemas = function(schemas = []) {
           schemas.forEach((item) => {
-            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]);
+            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" && resolvedProps && Array.isArray(resolvedProps.schemas)) {
-              handleSchemas(resolvedProps.schemas);
+            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;
-        const context = {
-          schema: {},
-          // 每次赋值
-          formModel,
-          formActionType: formActionType2,
-          tableAction: props2.tableAction
-        };
         handleSchemas(unref(getProps).schemas);
       }
       Object.assign(tempFormModel, cloneDeep(formModel));
@@ -25947,7 +25924,7 @@ const ShyForm = /* @__PURE__ */ defineComponent({
           ;
       }
     }
-    const formActionType2 = {
+    const formActionType = {
       getFieldsValue,
       setFieldsValue,
       resetFields,
@@ -25962,7 +25939,7 @@ const ShyForm = /* @__PURE__ */ defineComponent({
       validate,
       scrollToField
     };
-    provide("formActionType", formActionType2);
+    provide("formActionType", formActionType);
     const isTableForm = computed(() => {
       return !!unref(getBindValue).tableAction;
     });
@@ -26052,7 +26029,7 @@ const ShyForm = /* @__PURE__ */ defineComponent({
     };
     onMounted(() => {
       initDefault();
-      emit("register", formActionType2);
+      emit("register", formActionType);
     });
     return () => {
       const ignoreKeys = ["resetBefore", "submitBefore", "advanceBefore", "advanceAfter", "advancedSearch"];
@@ -26090,7 +26067,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": formActionType2,
+          "formActionType": formActionType,
           "schema": schema,
           "formProps": getProps.value,
           "allDefaultValues": defaultValueRef.value,
@@ -28270,7 +28247,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, formActionType2) => {
+const useAdvancedSearch = (schemas, formActionType) => {
   const getSchemaOptions = (type4) => {
     switch (type4) {
       case "number":
@@ -28358,7 +28335,7 @@ const useAdvancedSearch = (schemas, formActionType2) => {
       removeSchemaByField,
       updateSchema,
       setFieldsValue
-    } = formActionType2;
+    } = formActionType;
     const {
       schemas: [operatorSchema, valueSchema]
     } = componentProps;
@@ -32086,7 +32063,7 @@ const ShyFormTable = /* @__PURE__ */ defineComponent({
     const {
       prefixCls: prefixCls2
     } = useDesign$1("ant-form-table-children");
-    const formActionType2 = inject("formActionType");
+    const formActionType = inject("formActionType");
     const tableWrapperRef = ref();
     const tableElRef = ref();
     const curIndex = ref(0);
@@ -32412,7 +32389,7 @@ const ShyFormTable = /* @__PURE__ */ defineComponent({
               column: column2,
               record,
               ...args
-            }, formActionType2);
+            }, formActionType);
           } catch (error2) {
             rulesRef[errKey].show = true;
             rulesRef[errKey].msg = error2;
@@ -35750,7 +35727,7 @@ const Group = /* @__PURE__ */ defineComponent({
         schema,
         tableAction: tableAction2,
         formModel,
-        formActionType: formActionType2
+        formActionType
       } = props2;
       let {
         componentProps: _componentProps,
@@ -35762,7 +35739,7 @@ const Group = /* @__PURE__ */ defineComponent({
           schema,
           tableAction: tableAction2,
           formModel,
-          formActionType: formActionType2
+          formActionType
         }) ?? {};
       }
       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));
@@ -35913,7 +35890,7 @@ const FormItem = /* @__PURE__ */ defineComponent({
       const {
         schema,
         formModel,
-        formActionType: formActionType2
+        formActionType
       } = props2;
       let {
         componentProps = {}
@@ -35922,7 +35899,7 @@ const FormItem = /* @__PURE__ */ defineComponent({
         componentProps = componentProps({
           schema,
           formModel,
-          formActionType: formActionType2
+          formActionType
         }) ?? {};
       }
       if (schema.component === "Divider") {
@@ -49543,7 +49520,7 @@ const Descriptions = /* @__PURE__ */ defineComponent({
           model: data,
           values: data,
           schema: item,
-          transformValue
+          transformValue: unref(transformValue)
         };
       };
     });

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

@@ -10,9 +10,8 @@ interface UseFormActionContext {
     formElRef: Ref<FormActionType>;
     schemaRef: Ref<FormSchema[]>;
     handleFormValues: Fn;
-    tableAction?: any;
 }
-export declare function useFormEvents({ emit, getProps, formModel, getSchema, defaultValueRef, formElRef, schemaRef, handleFormValues, tableAction }: UseFormActionContext): {
+export declare function useFormEvents({ emit, getProps, formModel, getSchema, defaultValueRef, formElRef, schemaRef, handleFormValues }: 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: formActionType2
+        formActionType
       } = props2;
       let {
         componentProps = {}
@@ -11771,7 +11771,7 @@ const FormItem$2 = /* @__PURE__ */ vue.defineComponent({
           schema: schema2,
           tableAction: tableAction2,
           formModel,
-          formActionType: formActionType2
+          formActionType
         }) ?? {};
       }
       if (schema2.component === "Divider") {
@@ -12434,7 +12434,6 @@ function useFormValues({
   }
   return { handleFormValues, initDefault };
 }
-const formActionType = vue.inject("formActionType");
 function useFormEvents({
   emit,
   getProps,
@@ -12443,8 +12442,7 @@ function useFormEvents({
   defaultValueRef,
   formElRef,
   schemaRef,
-  handleFormValues,
-  tableAction: tableAction2
+  handleFormValues
 }) {
   async function resetFields() {
     const { resetFunc, submitOnReset } = vue.unref(getProps);
@@ -12640,41 +12638,20 @@ function useFormEvents({
       return;
     }
     const schema = [];
-    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 };
-        const rawComponentProps = merged.componentProps;
-        if (typeof rawComponentProps === "function" && merged.component === "Group") {
-          merged.componentProps = (ctx) => {
-            const originalResult = rawComponentProps(ctx);
-            const rawSchemas2 = originalResult.schemas || [];
-            const updatedSchemas = processSchemas(rawSchemas2, ctx);
-            return {
-              ...originalResult,
-              schemas: updatedSchemas
-            };
-          };
-        }
-        if (typeof rawComponentProps === "object" && merged.component === "Group" && Array.isArray(rawComponentProps == null ? void 0 : rawComponentProps.schemas)) {
-          merged.componentProps = {
-            ...rawComponentProps,
-            schemas: processSchemas(rawComponentProps.schemas, context)
-          };
+    vue.unref(getSchema).forEach((val) => {
+      let _val;
+      updateData.forEach((item) => {
+        if (val.field === item.field) {
+          _val = item;
         }
-        return merged;
       });
-    }
-    const rawSchemas = vue.unref(getSchema);
-    schema.push(
-      ...processSchemas(rawSchemas, {
-        formModel,
-        formActionType,
-        tableAction: tableAction2
-      })
-    );
+      if (_val !== void 0 && val.field === _val.field) {
+        const newSchema = utils$1.deepMerge(val, _val);
+        schema.push(newSchema);
+      } else {
+        schema.push(val);
+      }
+    });
     _setDefaultValue(schema);
     schemaRef.value = uniqBy(schema, "field");
   }
@@ -25873,8 +25850,7 @@ const ShyForm = /* @__PURE__ */ vue.defineComponent({
       formElRef,
       //@ts-ignore
       schemaRef,
-      handleFormValues,
-      tableAction: props2.tableAction
+      handleFormValues
     });
     createFormContext({
       resetAction: resetFields,
@@ -25914,27 +25890,28 @@ const ShyForm = /* @__PURE__ */ vue.defineComponent({
       for (const key2 in val) {
         let handleSchemas = function(schemas = []) {
           schemas.forEach((item) => {
-            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]);
+            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" && resolvedProps && Array.isArray(resolvedProps.schemas)) {
-              handleSchemas(resolvedProps.schemas);
+            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;
-        const context = {
-          schema: {},
-          // 每次赋值
-          formModel,
-          formActionType: formActionType2,
-          tableAction: props2.tableAction
-        };
         handleSchemas(vue.unref(getProps).schemas);
       }
       Object.assign(tempFormModel, cloneDeep(formModel));
@@ -25971,7 +25948,7 @@ const ShyForm = /* @__PURE__ */ vue.defineComponent({
           ;
       }
     }
-    const formActionType2 = {
+    const formActionType = {
       getFieldsValue,
       setFieldsValue,
       resetFields,
@@ -25986,7 +25963,7 @@ const ShyForm = /* @__PURE__ */ vue.defineComponent({
       validate,
       scrollToField
     };
-    vue.provide("formActionType", formActionType2);
+    vue.provide("formActionType", formActionType);
     const isTableForm = vue.computed(() => {
       return !!vue.unref(getBindValue).tableAction;
     });
@@ -26076,7 +26053,7 @@ const ShyForm = /* @__PURE__ */ vue.defineComponent({
     };
     vue.onMounted(() => {
       initDefault();
-      emit("register", formActionType2);
+      emit("register", formActionType);
     });
     return () => {
       const ignoreKeys = ["resetBefore", "submitBefore", "advanceBefore", "advanceAfter", "advancedSearch"];
@@ -26114,7 +26091,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": formActionType2,
+          "formActionType": formActionType,
           "schema": schema,
           "formProps": getProps.value,
           "allDefaultValues": defaultValueRef.value,
@@ -28294,7 +28271,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, formActionType2) => {
+const useAdvancedSearch = (schemas, formActionType) => {
   const getSchemaOptions = (type4) => {
     switch (type4) {
       case "number":
@@ -28382,7 +28359,7 @@ const useAdvancedSearch = (schemas, formActionType2) => {
       removeSchemaByField,
       updateSchema,
       setFieldsValue
-    } = formActionType2;
+    } = formActionType;
     const {
       schemas: [operatorSchema, valueSchema]
     } = componentProps;
@@ -32110,7 +32087,7 @@ const ShyFormTable = /* @__PURE__ */ vue.defineComponent({
     const {
       prefixCls: prefixCls2
     } = use.useDesign("ant-form-table-children");
-    const formActionType2 = vue.inject("formActionType");
+    const formActionType = vue.inject("formActionType");
     const tableWrapperRef = vue.ref();
     const tableElRef = vue.ref();
     const curIndex = vue.ref(0);
@@ -32436,7 +32413,7 @@ const ShyFormTable = /* @__PURE__ */ vue.defineComponent({
               column: column2,
               record,
               ...args
-            }, formActionType2);
+            }, formActionType);
           } catch (error2) {
             rulesRef[errKey].show = true;
             rulesRef[errKey].msg = error2;
@@ -35774,7 +35751,7 @@ const Group = /* @__PURE__ */ vue.defineComponent({
         schema,
         tableAction: tableAction2,
         formModel,
-        formActionType: formActionType2
+        formActionType
       } = props2;
       let {
         componentProps: _componentProps,
@@ -35786,7 +35763,7 @@ const Group = /* @__PURE__ */ vue.defineComponent({
           schema,
           tableAction: tableAction2,
           formModel,
-          formActionType: formActionType2
+          formActionType
         }) ?? {};
       }
       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));
@@ -35937,7 +35914,7 @@ const FormItem = /* @__PURE__ */ vue.defineComponent({
       const {
         schema,
         formModel,
-        formActionType: formActionType2
+        formActionType
       } = props2;
       let {
         componentProps = {}
@@ -35946,7 +35923,7 @@ const FormItem = /* @__PURE__ */ vue.defineComponent({
         componentProps = componentProps({
           schema,
           formModel,
-          formActionType: formActionType2
+          formActionType
         }) ?? {};
       }
       if (schema.component === "Divider") {
@@ -49567,7 +49544,7 @@ const Descriptions = /* @__PURE__ */ vue.defineComponent({
           model: data,
           values: data,
           schema: item,
-          transformValue
+          transformValue: vue.unref(transformValue)
         };
       };
     });

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

@@ -10,9 +10,8 @@ interface UseFormActionContext {
     formElRef: Ref<FormActionType>;
     schemaRef: Ref<FormSchema[]>;
     handleFormValues: Fn;
-    tableAction?: any;
 }
-export declare function useFormEvents({ emit, getProps, formModel, getSchema, defaultValueRef, formElRef, schemaRef, handleFormValues, tableAction }: UseFormActionContext): {
+export declare function useFormEvents({ emit, getProps, formModel, getSchema, defaultValueRef, formElRef, schemaRef, handleFormValues }: 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.246",
+  "version": "3.0.0-next.248",
   "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/utils": "1.0.0-next.1",
+    "@shy-plugins/tinymce": "^1.0.6",
     "@shy-plugins/use": "1.0.1-next.5"
   },
   "types": "es/ui/index.d.ts",