wargerm 0.7.96 → 0.7.98

package/dist/components/ModalForm/index.d.ts

@@ -1,12 +1,12 @@
 import React, { MutableRefObject } from 'react';
-import { FormInstance } from 'antd';
+import { FormInstance, ModalProps } from 'antd';
 import { WFormProps } from '../WForm';
 export interface IFormInstance extends MutableRefObject<FormInstance> {
     handleSubmit?: () => void;
     resetFields?: () => void;
     setFieldsValue?: (record?: Record<string, any>) => void;
 }
-interface IProps extends WFormProps {
+interface Props extends WFormProps {
     open: boolean;
     setOpen: (value: any) => void;
     modalFormOpend?: (value: any) => void;
@@ -19,5 +19,5 @@ interface IProps extends WFormProps {
     modalFooterSlot?: React.ReactNode;
     formProps?: Omit<WFormProps, 'columns'>;
 }
-declare const _default: React.ForwardRefExoticComponent<IProps & React.RefAttributes<unknown>>;
+declare const _default: React.ForwardRefExoticComponent<Props & ModalProps & React.RefAttributes<unknown>>;
 export default _default;

package/dist/components/TabelCard/index.d.ts

@@ -1,7 +1,7 @@
 import React, { MutableRefObject } from 'react';
 import { ReactNode } from 'react';
 import { ProTableProps } from '@ant-design/pro-table';
-import { ColumnProps, IColumnProps, Isearch } from '../WForm';
+import { GroupColumnType, IColumnProps, Isearch, XOR } from '../WForm';
 type CustomType = {
     type: 'custom';
     title: ReactNode;
@@ -33,8 +33,18 @@ interface ItableBarCustom {
 interface IoptionColumnConfig extends IColumnProps {
     showMoreNum?: number;
 }
+export interface ITableColumnProps extends IColumnProps {
+    hideInModalForm?: boolean;
+    hiddenInModalForm?: boolean;
+    notInitialValueInSearch?: boolean;
+    onlyShowInView?: boolean;
+    renderColumn?: (column: TableColumnProps, config: Record<string, any>) => TableColumnProps;
+}
+export type TableColumnProps = XOR<ITableColumnProps, GroupColumnType & {
+    children: ITableColumnProps[];
+}>;
 interface ITableCard extends Omit<ProTableProps<Record<string, any>[], Record<string, any>>, 'columns'> {
-    columns: ColumnProps[];
+    columns: TableColumnProps[];
     modalFormSearch?: Isearch;
     search?: Isearch;
     modalConfig?: Record<string, any>;
@@ -45,7 +55,7 @@ interface ITableCard extends Omit<ProTableProps<Record<string, any>[], Record<st
     filterAction?: (record: Record<string, any>, item: Record<string, any>) => boolean;
     renderTableBar?: Array<ItableBar | ItableBarCustom>;
     renderTableBarDeps?: any;
-    extraColumns?: Array<any>;
+    extraColumns?: TableColumnProps[];
     onFormChange?: (changedValues: Record<string, any>, allValues: Record<string, any>, form: any) => void;
     noBordered?: boolean;
     searchTableSlot?: ReactNode;

package/dist/components/WForm/index.d.ts

@@ -26,17 +26,17 @@ export interface IColumnProps extends ColumnType<Record<string, any>> {
     render?: (text: string, record: Record<string, any>, index: number) => ReactNode;
     renderFormItem?: (item: any, { formItemProps, fieldProps, ...rest }: any, form: any) => ReactNode;
 }
-type GroupType = {
+export type GroupColumnType = {
     title?: string;
     type: 'group';
-    groupNode?: ReactNode;
+    groupNode?: (children: ReactNode) => ReactNode;
     children: IColumnProps[];
 };
 type Without<T, U> = {
     [P in Exclude<keyof T, keyof U>]?: never;
 };
-type XOR<T, U> = T | U extends object ? (Without<T, U> & U) | (Without<U, T> & T) : T | U;
-export type ColumnProps = XOR<GroupType, IColumnProps>;
+export type XOR<T, U> = T | U extends object ? (Without<T, U> & U) | (Without<U, T> & T) : T | U;
+export type ColumnProps = XOR<GroupColumnType, IColumnProps>;
 type defaultColConfig = {
     xs: 24;
     sm: 24;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "wargerm",
-  "version": "0.7.96",
+  "version": "0.7.98",
   "scripts": {
     "dev": "dumi dev",
     "docs:build": "dumi build",