hlyc-web-pack 2.9.2 → 2.9.6

package/lib/GenerateForm/index.d.ts

@@ -7,14 +7,21 @@ import { FormProps, Rule, FormItemProps } from 'antd/es/form';
 import { RateProps } from 'antd/lib/rate';
 import { TreeSelectProps } from 'antd/lib/tree-select';
 import { SelectProps } from 'antd/lib/select';
-import { CascaderValueType } from 'antd/lib/cascader';
 import { CheckboxValueType } from 'antd/lib/checkbox/Group';
 import { DataNode, DefaultValueType } from 'rc-tree-select/es/interface';
-import { CascaderOption } from 'rc-cascader/es/Cascader';
-import { FieldData } from 'rc-field-form/es/interface';
+import { FormInstance } from 'rc-field-form/es/interface';
 import { DatePickerProps, RangePickerProps } from 'antd/es/date-picker';
 import { AnyObjectType, SelectType } from '../unrelated/typings';
 import './index.less';
+export interface DefaultOptionType {
+    value?: string | number;
+    label?: React.ReactNode;
+    disabled?: boolean;
+    isLeaf?: boolean;
+    loading?: boolean;
+    children?: Array<DefaultOptionType>;
+    [key: string]: any;
+}
 declare type remoteValueType = string | undefined;
 declare type remotePromiseType = (value: remoteValueType, other?: any) => Promise<SelectType[]>;
 interface UnionType {
@@ -59,8 +66,8 @@ export declare type FormListType = {
         showSearch?: boolean;
     };
     regionSelectionConfig?: {
-        loadData: CascaderOption[];
-        selectLoad?: (parentId: string) => Promise<CascaderOption[]>;
+        loadData: DefaultOptionType[];
+        selectLoad?: (parentId: string) => Promise<DefaultOptionType[]>;
     };
     rateConfig?: RateProps;
     treeSelectConfig?: {
@@ -87,13 +94,13 @@ export declare type FormListType = {
     switchChange?: (e: boolean, other?: any) => void;
     radioChange?: (e: RadioChangeEvent, other?: any) => void;
     checkboxChange?: (e: CheckboxValueType[], other?: any) => void;
-    cascaderChange?: (e: CascaderValueType, other?: any) => void;
+    cascaderChange?: (e: any, other?: any) => void;
     rateChange?: (e: number, other?: any) => void;
     render?: () => React.ReactElement;
 } & FormItemProps;
 export interface FormCallType {
     getFormValues: (data: string[]) => AnyObjectType;
-    setFormFields: (fields: FieldData[]) => void;
+    setFormFields: FormInstance['setFields'];
     setFormValues: (values: AnyObjectType) => void;
     formSubmit: () => Promise<AnyObjectType>;
     formReset: (fields?: string[]) => void;

package/lib/GenerateTable/EditableCell/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Rule } from 'rc-field-form/lib/interface';
+import { InternalFieldProps } from 'rc-field-form/lib/Field';
 import { SelectType, AnyObjectType } from '../../unrelated/typings';
 declare type remoteValueType = string | undefined;
 declare type remotePromiseType = (value: remoteValueType, record: AnyObjectType) => Promise<SelectType[]>;
@@ -20,7 +20,7 @@ export interface EditableColumnsType {
     };
     /** 可编辑单元格表单验证 */
     formItemProps: {
-        rules: Rule[];
+        rules: InternalFieldProps['rules'];
     };
     /** 自定义渲染值(在原有的内容上增加新的结构)，childNode是原有的内容 */
     controlRender: (record: AnyObjectType, childNode: React.ReactNode) => React.ReactNode;

package/lib/LayoutFormModal/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { FieldData } from 'rc-field-form/es/interface';
+import { FormInstance } from 'rc-field-form/es/interface';
 import { FormProps } from 'antd/es/form';
 import { ColProps } from 'antd/es/col';
 import { FormListType } from '../GenerateForm';
@@ -45,7 +45,7 @@ export interface LayoutFormPropTypes {
 export interface LayoutFormModalCallType {
     setFormLoading: (data: boolean) => void;
     setFormSaveLoading: (data: boolean) => void;
-    setFormFields: (fields: FieldData[]) => void;
+    setFormFields: FormInstance['setFields'];
     getFormValues: (data: string[]) => AnyObjectType | undefined;
     setFormValues: (values: AnyObjectType) => void;
     getFormSubmitValues: () => Promise<AnyObjectType | undefined>;