@fe-free/core 1.4.7 → 1.4.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +14 -0
- package/package.json +2 -2
- package/src/crud/crud.tsx +17 -6
- package/src/crud/crud_detail.tsx +21 -6
- package/src/crud/types.tsx +2 -0
package/CHANGELOG.md
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fe-free/core",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.9",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "./src/index.ts",
|
|
6
6
|
"author": "",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"react-syntax-highlighter": "^15.5.0",
|
|
36
36
|
"vanilla-jsoneditor": "^0.23.1",
|
|
37
37
|
"zustand": "^4.5.4",
|
|
38
|
-
"@fe-free/tool": "1.4.
|
|
38
|
+
"@fe-free/tool": "1.4.9"
|
|
39
39
|
},
|
|
40
40
|
"peerDependencies": {
|
|
41
41
|
"@ant-design/pro-components": "^2.8.7",
|
package/src/crud/crud.tsx
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { ActionType } from '@ant-design/pro-components';
|
|
2
|
-
import { Button, Space } from 'antd';
|
|
2
|
+
import { Button, message, Space } from 'antd';
|
|
3
|
+
import { isString } from 'lodash-es';
|
|
3
4
|
import { forwardRef, useCallback, useImperativeHandle, useMemo, useRef } from 'react';
|
|
4
5
|
import type { TableProps } from '../table';
|
|
5
6
|
import { Table } from '../table';
|
|
@@ -28,16 +29,14 @@ function CRUDComponent<
|
|
|
28
29
|
createProps,
|
|
29
30
|
requestCreateByValues,
|
|
30
31
|
updateProps,
|
|
31
|
-
requestUpdateById
|
|
32
|
-
requestUpdateByValues
|
|
32
|
+
requestUpdateById,
|
|
33
|
+
requestUpdateByValues,
|
|
33
34
|
detailFormInstance,
|
|
34
35
|
batchActions,
|
|
35
36
|
} = props;
|
|
36
37
|
|
|
37
38
|
useTips(props);
|
|
38
39
|
|
|
39
|
-
const requestUpdateById = originalRequestUpdateByValues || originalRequestUpdateById;
|
|
40
|
-
|
|
41
40
|
const actionRef = useRef<ActionType | undefined>(undefined);
|
|
42
41
|
|
|
43
42
|
useImperativeHandle(ref, () => {
|
|
@@ -52,6 +51,7 @@ function CRUDComponent<
|
|
|
52
51
|
requestGetByRecord,
|
|
53
52
|
requestCreateByValues,
|
|
54
53
|
requestUpdateById,
|
|
54
|
+
requestUpdateByValues,
|
|
55
55
|
detailFormInstance,
|
|
56
56
|
createProps,
|
|
57
57
|
readProps,
|
|
@@ -62,6 +62,7 @@ function CRUDComponent<
|
|
|
62
62
|
requestGetByRecord,
|
|
63
63
|
requestCreateByValues,
|
|
64
64
|
requestUpdateById,
|
|
65
|
+
requestUpdateByValues,
|
|
65
66
|
detailFormInstance,
|
|
66
67
|
createProps,
|
|
67
68
|
readProps,
|
|
@@ -73,7 +74,17 @@ function CRUDComponent<
|
|
|
73
74
|
(record) => {
|
|
74
75
|
return () => {
|
|
75
76
|
if (requestDeleteByRecord) {
|
|
77
|
+
let content = '删除成功';
|
|
78
|
+
if (deleteProps?.successText) {
|
|
79
|
+
content = isString(deleteProps.successText)
|
|
80
|
+
? deleteProps.successText
|
|
81
|
+
: deleteProps.successText();
|
|
82
|
+
}
|
|
76
83
|
return requestDeleteByRecord(record).then(() => {
|
|
84
|
+
message.open({
|
|
85
|
+
type: 'success',
|
|
86
|
+
content,
|
|
87
|
+
});
|
|
77
88
|
actionRef.current?.reload();
|
|
78
89
|
});
|
|
79
90
|
}
|
|
@@ -81,7 +92,7 @@ function CRUDComponent<
|
|
|
81
92
|
throw new Error('没有传 requestDeleteByRecord');
|
|
82
93
|
};
|
|
83
94
|
},
|
|
84
|
-
[requestDeleteByRecord],
|
|
95
|
+
[deleteProps, requestDeleteByRecord],
|
|
85
96
|
);
|
|
86
97
|
|
|
87
98
|
const handleReload = useCallback(() => {
|
package/src/crud/crud_detail.tsx
CHANGED
|
@@ -24,6 +24,7 @@ interface CRUDDetailProps
|
|
|
24
24
|
| 'requestCreateByValues'
|
|
25
25
|
| 'updateProps'
|
|
26
26
|
| 'requestUpdateById'
|
|
27
|
+
| 'requestUpdateByValues'
|
|
27
28
|
| 'detailForm'
|
|
28
29
|
| 'detailFormInstance'
|
|
29
30
|
> {
|
|
@@ -49,6 +50,7 @@ function CRUDDetail(props: CRUDDetailProps) {
|
|
|
49
50
|
requestCreateByValues,
|
|
50
51
|
updateProps,
|
|
51
52
|
requestUpdateById,
|
|
53
|
+
requestUpdateByValues,
|
|
52
54
|
detailFormInstance,
|
|
53
55
|
} = props;
|
|
54
56
|
const [isOpen, setIsOpen] = useState(false);
|
|
@@ -74,11 +76,15 @@ function CRUDDetail(props: CRUDDetailProps) {
|
|
|
74
76
|
content,
|
|
75
77
|
});
|
|
76
78
|
}
|
|
77
|
-
if (action === 'update' && requestUpdateById) {
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
79
|
+
if (action === 'update' && (requestUpdateById || requestUpdateByValues)) {
|
|
80
|
+
if (requestUpdateByValues) {
|
|
81
|
+
result = await requestUpdateByValues(values);
|
|
82
|
+
} else if (requestUpdateById) {
|
|
83
|
+
result = await requestUpdateById({
|
|
84
|
+
...values,
|
|
85
|
+
id,
|
|
86
|
+
});
|
|
87
|
+
}
|
|
82
88
|
|
|
83
89
|
let content = '更新成功';
|
|
84
90
|
if (updateProps?.successText) {
|
|
@@ -108,7 +114,16 @@ function CRUDDetail(props: CRUDDetailProps) {
|
|
|
108
114
|
}, 10);
|
|
109
115
|
}
|
|
110
116
|
},
|
|
111
|
-
[
|
|
117
|
+
[
|
|
118
|
+
action,
|
|
119
|
+
requestCreateByValues,
|
|
120
|
+
requestUpdateById,
|
|
121
|
+
requestUpdateByValues,
|
|
122
|
+
onSuccess,
|
|
123
|
+
createProps,
|
|
124
|
+
id,
|
|
125
|
+
updateProps,
|
|
126
|
+
],
|
|
112
127
|
);
|
|
113
128
|
|
|
114
129
|
const handleOpenChange = useCallback(
|