@dinert/element-plus 1.0.8 → 1.1.1

package/lib/src/components/form/types/index.d.ts

@@ -1,42 +1,67 @@
-import { type FormProps, type FormItemProps, type ColProps, type RowProps, type InputProps, type InputNumberProps, type AutocompleteProps, type ElSelect, type SwitchProps, type DatePickerProps, type ElInput, type ElInputNumber, type ElAutocomplete, type ElTreeSelect, ElSwitch, ElRadio, ElDatePicker, RateProps, CheckboxGroupProps, CheckboxProps, SelectOptionProxy, ElCascader, CascaderProps } from 'element-plus';
-import { SelectProps } from 'element-plus/es/components/select-v2/src/defaults';
+import { type FormProps, type FormItemProps, type ColProps, type RowProps } from 'element-plus';
+import { RewriteInputProps, RewriteSelectProps, RewriteTextareaProps, RewriteCascaderProps, RewriteAutocompleteProps, RewriteInputNumberProps, RewriteSwitchProps, RewriteDatePickerProps, RewriteRadioGroupProps, RewriteCheckboxGroupProps, RewriteTreeSelectProps, RewriteRewriteRateProps } from './components';
+import { MergeProp } from './utils';
 type RewriteColProps = Partial<ColProps>;
 type RewriteRowProps = Partial<RowProps>;
-type TypeName = 'input' | 'select' | 'textarea' | 'input-autocomplete' | 'input-number' | 'switch' | 'datetime' | 'date' | 'week' | 'month' | 'year' | 'datetimerange' | 'daterange' | 'monthrange' | 'custom' | 'radio' | 'tree-select' | 'radio-button' | 'rate' | 'checkbox' | 'cascader';
-export interface RewriteFormItemProps<T = any[]> extends Partial<InputProps & InputNumberProps & Omit<typeof SelectProps, 'options' | 'props' | 'valueKey'> & Omit<typeof ElTreeSelect, 'options' | 'data'> & AutocompleteProps & SwitchProps & DatePickerProps & RateProps & CheckboxGroupProps> {
-    data?: T | Partial<CheckboxProps[] & SelectOptionProxy[]>;
-    options?: T | Partial<CheckboxProps[] & SelectOptionProxy[]>;
-    props?: Partial<CascaderProps>;
-    on?: Partial<InstanceType<typeof ElInput & typeof ElInputNumber & typeof ElSelect & typeof ElAutocomplete & typeof ElTreeSelect & typeof ElSwitch & typeof ElRadio & typeof ElDatePicker & typeof ElCascader>>;
+export interface RewriteFormItemPropsMap<O = any[]> {
+    input: RewriteInputProps;
+    select: RewriteSelectProps<O>;
+    'select-v2': RewriteSelectProps<O>;
+    custom: RewriteInputProps;
+    textarea: RewriteTextareaProps;
+    cascader: RewriteCascaderProps<O>;
+    'input-autocomplete': RewriteAutocompleteProps;
+    'input-number': RewriteInputNumberProps;
+    switch: RewriteSwitchProps;
+    datetime: RewriteDatePickerProps;
+    date: RewriteDatePickerProps;
+    dates: RewriteDatePickerProps;
+    week: RewriteDatePickerProps;
+    month: RewriteDatePickerProps;
+    year: RewriteDatePickerProps;
+    years: RewriteDatePickerProps;
+    datetimerange: RewriteDatePickerProps;
+    daterange: RewriteDatePickerProps;
+    monthrange: RewriteDatePickerProps;
+    radio: RewriteRadioGroupProps<O>;
+    checkbox: RewriteCheckboxGroupProps<O>;
+    'checkbox-button': RewriteCheckboxGroupProps<O>;
+    'tree-select': RewriteTreeSelectProps<O>;
+    'radio-button': RewriteRadioGroupProps<O>;
+    'rate': RewriteRewriteRateProps<O>;
 }
-export interface CustomFormItemProps<D = any, O = any[]> extends Partial<FormItemProps> {
+export interface CustomFormItemProps<D = any, O = any[], N extends keyof RewriteFormItemPropsMap = any> extends Partial<FormItemProps> {
     key?: any;
-    type: TypeName;
+    type: N extends keyof RewriteFormItemPropsMap ? N : keyof RewriteFormItemPropsMap;
     show?: boolean | ((model: D) => boolean);
     vif?: boolean | ((model: D) => boolean);
     label: string;
     sort?: number;
-    options?: RewriteFormItemProps<O>;
-    showLabel?: true;
+    options?: RewriteFormItemPropsMap<O>[N];
+    showLabel?: boolean;
     labelDisabled?: boolean;
     labelWrap?: boolean;
     valueDisabled?: boolean;
+    tempValueDisabled?: boolean;
     required?: boolean;
-    disabled?: boolean;
     colLayout?: RewriteColProps;
-    on?: Partial<InstanceType<typeof ElInput & typeof ElInputNumber & typeof ElSelect & typeof ElAutocomplete & typeof ElTreeSelect & typeof ElSwitch & typeof ElRadio & typeof ElDatePicker>>;
 }
-export interface RewriteFormProps<D = any> extends Omit<Partial<FormProps>, 'model'> {
-    model: Partial<D>;
-    formItem: {
-        [key: string]: CustomFormItemProps<D>;
-    };
+type ToModelItem<D, FI> = D extends FI ? D : FI;
+type ToString<T> = {
+    [P in keyof T]: T[P] extends keyof RewriteFormItemPropsMap ? string : T[P];
+};
+type FormItemMap<D, FI> = {
+    [P in keyof ToModelItem<D, FI>]: CustomFormItemProps<MergeProp<D, FI>, any[], ToModelItem<D, FI>[P] extends keyof RewriteFormItemPropsMap ? ToModelItem<D, FI>[P] : keyof RewriteFormItemPropsMap>;
+};
+export interface RewriteFormProps<D = any, FI = any> extends Omit<Partial<FormProps>, 'model'> {
+    model: Partial<MergeProp<D, ToString<FI>>>;
+    formItem: Partial<FormItemMap<D, FI>>;
     colLayout?: RewriteColProps;
     row?: RewriteRowProps;
     showLabel?: boolean;
 }
-export interface DinertFormProps<D = any> {
-    form: RewriteFormProps<D>;
+export interface DinertFormProps<D = any, FI = any> {
+    form: RewriteFormProps<D, FI>;
     search?: boolean;
 }
 export {};

package/lib/src/components/form/types/utils.d.ts

@@ -0,0 +1,5 @@
+type Compute<T> = T extends Function ? T : {
+    [P in keyof T]: T[P];
+};
+export type MergeProp<T extends any, U extends any> = Compute<T & Omit<U, keyof T>>;
+export {};

package/lib/src/components/form/utils/index.d.ts

@@ -1,4 +1,5 @@
 export declare const labelMouseEnter: (e: MouseEvent, item: any, _this: any) => void;
+export declare const findTreeNode: (treeData: any, key: string, value: string) => any[];
 export declare const getTooltipValue: (value: any, item: any) => any;
 export declare const valueMouseEnter: (e: MouseEvent, item: any, value: any, _this: any) => void;
 export declare const customPlaceholder: (customName: any, type?: string, name?: string) => string;

package/lib/src/components/index.d.ts

@@ -5,3 +5,5 @@ export * from './form';
 export * from './form/types';
 export * from './tooltip';
 export * from './tooltip/types';
+export * from './dialog';
+export * from './dialog/types';

package/lib/src/components/table/hooks/index.d.ts

@@ -5,7 +5,7 @@ export declare const allShow: (selectTable: any, tableColumns: RewriteTableColum
 export declare const checkTree: (data: Node, checked: boolean, childChecked: boolean) => void;
 export declare const treeNode: (selectTable: any, treeData2: any) => Promise<void>;
 export declare const allowDrop: (draggingNode: Node, dropNode: Node, type: AllowDropType) => boolean;
-export declare const nodeDragEnd: (node: Node, selectTable: SelectTable) => Promise<void>;
+export declare const nodeDragEnd: (currentNode: Node, targetNode: Node, selectTable: SelectTable) => Promise<void>;
 export declare const resizeTaleHeight: (table: any, header: any, body: any, footer: any, headerFooterRef: any, tableProps: RewriteTableProps) => void;
 export declare const treeProps: {
     children: string;