@dinert/element-plus 1.0.7 → 1.1.0

package/lib/src/components/form/src/rate.d.ts

@@ -1,28 +1,27 @@
 import { PropType } from 'vue';
 import type { RewriteFormProps, CustomFormItemProps } from '../types';
-import type { RateProps } from 'element-plus';
 declare const _default: import("vue").DefineComponent<{
     form: {
-        type: PropType<RewriteFormProps<any>>;
+        type: PropType<RewriteFormProps<any, any>>;
         default: () => {};
     };
     formItem: {
-        type: PropType<CustomFormItemProps<Partial<RateProps>, any>>;
+        type: PropType<CustomFormItemProps<any, any[], any>>;
         default: () => {};
     };
 }, {
     options: import("vue").ComputedRef<any>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     form: {
-        type: PropType<RewriteFormProps<any>>;
+        type: PropType<RewriteFormProps<any, any>>;
         default: () => {};
     };
     formItem: {
-        type: PropType<CustomFormItemProps<Partial<RateProps>, any>>;
+        type: PropType<CustomFormItemProps<any, any[], any>>;
         default: () => {};
     };
 }>>, {
-    form: RewriteFormProps<any>;
-    formItem: CustomFormItemProps<Partial<RateProps>, any>;
+    form: RewriteFormProps<any, any>;
+    formItem: CustomFormItemProps<any, any[], any>;
 }, {}>;
 export default _default;

package/lib/src/components/form/src/select.d.ts

@@ -1,29 +1,27 @@
 import { PropType } from 'vue';
 import type { RewriteFormProps, CustomFormItemProps } from '../types';
-import type { ElSelect, SelectOptionProxy } from 'element-plus';
-type FormItem = CustomFormItemProps<Partial<typeof ElSelect>, SelectOptionProxy[]>;
 declare const _default: import("vue").DefineComponent<{
     form: {
-        type: PropType<RewriteFormProps<any>>;
+        type: PropType<RewriteFormProps<any, any>>;
         default: () => {};
     };
     formItem: {
-        type: PropType<FormItem>;
+        type: PropType<CustomFormItemProps<any, any[], any>>;
         default: () => {};
     };
 }, {
-    options: import("vue").ComputedRef<import('../types').RewriteFormItemProps<SelectOptionProxy[]>>;
+    options: import("vue").ComputedRef<any>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     form: {
-        type: PropType<RewriteFormProps<any>>;
+        type: PropType<RewriteFormProps<any, any>>;
         default: () => {};
     };
     formItem: {
-        type: PropType<FormItem>;
+        type: PropType<CustomFormItemProps<any, any[], any>>;
         default: () => {};
     };
 }>>, {
-    form: RewriteFormProps<any>;
-    formItem: FormItem;
+    form: RewriteFormProps<any, any>;
+    formItem: CustomFormItemProps<any, any[], any>;
 }, {}>;
 export default _default;

package/lib/src/components/form/src/switch.d.ts

@@ -1,28 +1,27 @@
 import type { RewriteFormProps, CustomFormItemProps } from '../types';
 import type { PropType } from 'vue';
-import type { SwitchProps } from 'element-plus';
 declare const _default: import("vue").DefineComponent<{
     form: {
-        type: PropType<RewriteFormProps<any>>;
+        type: PropType<RewriteFormProps<any, any>>;
         default: () => {};
     };
     formItem: {
-        type: PropType<CustomFormItemProps<Partial<SwitchProps>, any[]>>;
+        type: PropType<CustomFormItemProps<any, any[], any>>;
         default: () => {};
     };
 }, {
-    options: import("vue").ComputedRef<import('../types').RewriteFormItemProps<any[]>>;
+    options: import("vue").ComputedRef<any>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     form: {
-        type: PropType<RewriteFormProps<any>>;
+        type: PropType<RewriteFormProps<any, any>>;
         default: () => {};
     };
     formItem: {
-        type: PropType<CustomFormItemProps<Partial<SwitchProps>, any[]>>;
+        type: PropType<CustomFormItemProps<any, any[], any>>;
         default: () => {};
     };
 }>>, {
-    form: RewriteFormProps<any>;
-    formItem: CustomFormItemProps<Partial<SwitchProps>, any[]>;
+    form: RewriteFormProps<any, any>;
+    formItem: CustomFormItemProps<any, any[], any>;
 }, {}>;
 export default _default;

package/lib/src/components/form/src/tree-select.d.ts

@@ -2,38 +2,26 @@ import type { RewriteFormProps, CustomFormItemProps } from '../types';
 import type { PropType } from 'vue';
 declare const _default: import("vue").DefineComponent<{
     form: {
-        type: PropType<RewriteFormProps<any>>;
+        type: PropType<RewriteFormProps<any, any>>;
         default: () => {};
     };
     formItem: {
-        type: PropType<CustomFormItemProps<Partial<import("element-plus/es/utils").SFCWithInstall<import("vue").DefineComponent<any, () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-            [key: string]: any;
-        }>, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<any>, {} | {
-            [x: string]: any;
-        }, {}>>>, any[]>>;
+        type: PropType<CustomFormItemProps<any, any[], any>>;
         default: () => {};
     };
 }, {
-    options: import("vue").ComputedRef<import('../types').RewriteFormItemProps<any[]>>;
+    options: import("vue").ComputedRef<any>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     form: {
-        type: PropType<RewriteFormProps<any>>;
+        type: PropType<RewriteFormProps<any, any>>;
         default: () => {};
     };
     formItem: {
-        type: PropType<CustomFormItemProps<Partial<import("element-plus/es/utils").SFCWithInstall<import("vue").DefineComponent<any, () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-            [key: string]: any;
-        }>, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<any>, {} | {
-            [x: string]: any;
-        }, {}>>>, any[]>>;
+        type: PropType<CustomFormItemProps<any, any[], any>>;
         default: () => {};
     };
 }>>, {
-    form: RewriteFormProps<any>;
-    formItem: CustomFormItemProps<Partial<import("element-plus/es/utils").SFCWithInstall<import("vue").DefineComponent<any, () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-        [key: string]: any;
-    }>, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<any>, {} | {
-        [x: string]: any;
-    }, {}>>>, any[]>;
+    form: RewriteFormProps<any, any>;
+    formItem: CustomFormItemProps<any, any[], any>;
 }, {}>;
 export default _default;

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

@@ -0,0 +1,40 @@
+import { ExtractPropTypes } from 'vue';
+import { MergeProp } from './utils';
+import { InputProps, ElInput, SelectOptionProxy, ElSelect, cascaderProps, ElCascader, AutocompleteProps, ElAutocomplete, ElInputNumber, InputNumberProps, SwitchProps, DatePickerProps, ElDatePicker, RadioGroupProps, ElRadioGroup, CheckboxProps, RadioProps, CheckboxGroupProps, ElCheckbox, ElTreeSelect, RateProps, ElRate, CascaderProps, ElTree } from 'element-plus';
+import { TreeOptionProps } from 'element-plus/es/components/tree-v2/src/types';
+import type { SelectProps } from 'element-plus/es/components/select/src/select';
+import { TreeProps } from 'element-plus/es/components/tree-v2/src/types';
+type CommonFn = 'onChange' | 'onClear' | 'onBlur' | 'onFocus';
+export type RewriteInputProps = Partial<InputProps & Pick<typeof ElInput, 'onInput' | CommonFn>>;
+export type RewriteTextareaProps = Partial<InputProps & Pick<typeof ElInput, 'onInput' | CommonFn>>;
+export type RewriteSelectProps<O = any[]> = Partial<Omit<ExtractPropTypes<typeof SelectProps>, 'options'> & {
+    options: O | SelectOptionProxy[];
+    label: string;
+    value: string;
+} & Pick<typeof ElSelect, CommonFn | 'onVisible-change' | 'onRemove-tag'>>;
+export type RewriteCascaderProps<O = any[]> = Partial<Omit<ExtractPropTypes<typeof cascaderProps>, 'options' | 'props'> & {
+    optison: O;
+    props: Partial<MergeProp<CascaderProps, TreeOptionProps>>;
+} & Pick<typeof ElCascader, CommonFn | 'onVisible-change' | 'onRemove-tag'>>;
+export type RewriteAutocompleteProps = Partial<AutocompleteProps & Pick<typeof ElAutocomplete, 'onSelect' | 'onChange'>>;
+export type RewriteInputNumberProps = Partial<InputNumberProps & Pick<typeof ElInputNumber, CommonFn>>;
+export type RewriteSwitchProps = Partial<SwitchProps & Pick<typeof ElInputNumber, 'onChange'>>;
+export type RewriteDatePickerProps = Partial<DatePickerProps & Pick<typeof ElDatePicker, CommonFn | 'onVisible-change' | 'onCalendar-change' | 'onPanel-change'>>;
+export type RewriteRadioGroupProps<O = any[]> = Partial<RadioGroupProps & {
+    options: O | RadioProps[];
+    value: string;
+} & Pick<typeof ElRadioGroup, 'onChange'>>;
+export type RewriteCheckboxGroupProps<O = any[]> = Partial<CheckboxGroupProps & {
+    options: O | CheckboxProps[];
+    value: string;
+} & Pick<typeof ElCheckbox, 'onChange'>>;
+export type RewriteTreeSelectProps<O = any[]> = Partial<Omit<TreeProps, 'props'> & Omit<ExtractPropTypes<typeof SelectProps>, 'options'> & {
+    options: O | SelectOptionProxy[];
+    label: string;
+    value: string;
+    data: O | SelectOptionProxy[];
+} & Pick<typeof ElTreeSelect, CommonFn> & Pick<typeof ElTree, 'onCurrent-change' | 'onCheck' | 'onNode-click' | 'onCurrent-change' | 'onNode-expand' | 'onCheck-change' | 'onNode-click' | 'onNode-contextmenu' | 'onNode-collapse' | 'onNode-drag-start' | 'onNode-drag-end' | 'onNode-drop' | 'onNode-drag-leave' | 'onNode-drag-enter' | 'onNode-drag-over'>>;
+export type RewriteRewriteRateProps<O = any[]> = Partial<Omit<RateProps, 'options'> & {
+    options: O;
+} & Pick<typeof ElRate, 'onChange'>>;
+export {};

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

@@ -1,42 +1,66 @@
-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'> & 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>;
+    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;