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

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/es/ui/src/TablePlus/TableColGroup.vue.d.ts

@@ -8,8 +8,8 @@ declare const _sfc_main: import("vue").DefineComponent<{
     getSwitchShowText: (column: any, row: any) => any;
     handleSortChange: (field: any, type: any) => void;
     filterColumn: (column: any) => any;
-    readonly VxeColumn: import("vxe-table").VXEComponent<import("vxe-table").VxeColumnProps<any>, import("vxe-table").VxeColumnEventProps, import("vxe-table").VxeColumnSlots<any>>;
-    readonly VxeColgroup: import("vxe-table").VXEComponent<import("vxe-table").VxeColgroupProps, import("vxe-table").VxeColgroupEventProps, import("vxe-table").VxeColgroupSlots<any>>;
+    readonly VxeColumn: import("vxe-table").VXEComponent<import("vxe-table").VxeColumnProps, {}>;
+    readonly VxeColgroup: import("vxe-table").VXEComponent<import("vxe-table").VxeColgroupProps, {}>;
     readonly CellComponent: import("vue").FunctionalComponent<{}, {}, any, {}>;
     IconSort: import("vue").DefineComponent<{}, {
         basStyle: {

package/es/ui/src/TablePlus/TablePlus.vue.d.ts

@@ -8,7 +8,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     columns: {
         type: ArrayConstructor;
         required: false;
-        default: () => VxeColumnProps<import("vxe-table").VxeTableDataRow>[];
+        default: () => VxeColumnProps[];
     };
     isShowSeq: {
         type: BooleanConstructor;
@@ -21,7 +21,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         default: boolean;
     };
     actionColumn: {
-        type: any;
+        type: ObjectConstructor;
         required: false;
         default: () => {
             title: string;
@@ -1212,8 +1212,8 @@ declare const _sfc_main: import("vue").DefineComponent<{
         showSubmitButton: boolean;
         rangePickerField: unknown[];
     }, {}>;
-    readonly VxeTable: import("vxe-table").VXEComponent<import("vxe-table").VxeTableProps<any>, import("vxe-table").VxeTableEventProps<any>, import("vxe-table").VxeTableSlots<any>>;
-    readonly VxeColumn: import("vxe-table").VXEComponent<VxeColumnProps<any>, import("vxe-table").VxeColumnEventProps, import("vxe-table").VxeColumnSlots<any>>;
+    readonly VxeTable: import("vxe-table").VXEComponent<import("vxe-table").VxeTableProps<any>, import("vxe-table").VxeTableEventProps>;
+    readonly VxeColumn: import("vxe-table").VXEComponent<VxeColumnProps, {}>;
     readonly Pagination: {
         new (...args: any[]): import("vue").CreateComponentPublicInstance<Readonly<import("vue").ExtractPropTypes<{
             total: NumberConstructor;
@@ -1773,8 +1773,8 @@ declare const _sfc_main: import("vue").DefineComponent<{
         getSwitchShowText: (column: any, row: any) => any;
         handleSortChange: (field: any, type: any) => void;
         filterColumn: (column: any) => any;
-        readonly VxeColumn: import("vxe-table").VXEComponent<VxeColumnProps<any>, import("vxe-table").VxeColumnEventProps, import("vxe-table").VxeColumnSlots<any>>;
-        readonly VxeColgroup: import("vxe-table").VXEComponent<import("vxe-table").VxeColgroupProps, import("vxe-table").VxeColgroupEventProps, import("vxe-table").VxeColgroupSlots<any>>;
+        readonly VxeColumn: import("vxe-table").VXEComponent<VxeColumnProps, {}>;
+        readonly VxeColgroup: import("vxe-table").VXEComponent<import("vxe-table").VxeColgroupProps, {}>;
         readonly CellComponent: import("vue").FunctionalComponent<{}, {}, any, {}>;
         IconSort: import("vue").DefineComponent<{}, {
             basStyle: {
@@ -1850,7 +1850,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     columns: {
         type: ArrayConstructor;
         required: false;
-        default: () => VxeColumnProps<import("vxe-table").VxeTableDataRow>[];
+        default: () => VxeColumnProps[];
     };
     isShowSeq: {
         type: BooleanConstructor;
@@ -1863,7 +1863,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         default: boolean;
     };
     actionColumn: {
-        type: any;
+        type: ObjectConstructor;
         required: false;
         default: () => {
             title: string;
@@ -1958,7 +1958,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     columns: unknown[];
     isShowPagination: boolean;
     beforeFetch: any;
-    actionColumn: any;
+    actionColumn: Record<string, any>;
     searchInfo: any;
     formConfig: any;
     isShowSeq: boolean;

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();