jiazhizhong/certimate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: clean code

Browse Source
This commit is contained in:
Fu Diwei
2025-01-05 16:34:15 +08:00
parent 2a68372713
commit dfc192cb68
24 changed files with 73 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ui/src/hooks/useAntdForm.ts
View File

@@ -36,24 +36,24 @@ const useAntdForm = <T extends NonNullable<unknown> = any>({ form, initialValues
return;
}
let temp: Promise<Partial<T>>;
let p: Promise<Partial<T>>;
if (typeof initialValues === "function") {
temp = Promise.resolve(initialValues());
p = Promise.resolve(initialValues());
} else {
temp = Promise.resolve(initialValues);
p = Promise.resolve(initialValues);
}
temp.then((temp) => {
p.then((res) => {
if (!unmounted) {
type FieldName = Parameters<FormInstance<T>["getFieldValue"]>[0];
type FieldsValue = Parameters<FormInstance<T>["setFieldsValue"]>[0];
const obj = { ...temp };
Object.keys(temp).forEach((key) => {
obj[key as keyof T] = formInst!.isFieldTouched(key as FieldName) ? formInst!.getFieldValue(key as FieldName) : temp[key as keyof T];
const obj = { ...res };
Object.keys(res).forEach((key) => {
obj[key as keyof T] = formInst!.isFieldTouched(key as FieldName) ? formInst!.getFieldValue(key as FieldName) : res[key as keyof T];
});
setFormInitialValues(temp);
setFormInitialValues(res);
formInst!.setFieldsValue(obj as FieldsValue);
}
});

8
ui/src/hooks/useTriggerElement.ts
View File

@@ -17,12 +17,12 @@ const useTriggerElement = (trigger: React.ReactNode, options?: UseTriggerElement
return null;
}
const temp = isValidElement(trigger) ? trigger : createElement(Fragment, null, trigger);
return cloneElement(temp, {
...temp.props,
const el = isValidElement(trigger) ? trigger : createElement(Fragment, null, trigger);
return cloneElement(el, {
...el.props,
onClick: (e: MouseEvent) => {
onClick?.(e);
temp.props?.onClick?.(e);
el.props?.onClick?.(e);
},
});
}, [trigger, onClick]);