@fe-free/core 6.0.3 → 6.0.4
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 +8 -0
- package/package.json +3 -3
- package/src/value_type_map/date.tsx +3 -2
- package/src/value_type_map/index.tsx +7 -7
- package/src/value_type_map/json.tsx +1 -1
- package/src/value_type_map/json_modal.tsx +1 -1
- package/src/value_type_map/markdown_modal.tsx +2 -2
- package/src/value_type_map/switch.tsx +2 -2
package/CHANGELOG.md
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fe-free/core",
|
|
3
|
-
"version": "6.0.
|
|
3
|
+
"version": "6.0.4",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "./src/index.ts",
|
|
6
6
|
"author": "",
|
|
@@ -52,8 +52,8 @@
|
|
|
52
52
|
"i18next-icu": "^2.4.1",
|
|
53
53
|
"react": "^19.2.0",
|
|
54
54
|
"react-i18next": "^16.4.0",
|
|
55
|
-
"@fe-free/
|
|
56
|
-
"@fe-free/
|
|
55
|
+
"@fe-free/tool": "6.0.4",
|
|
56
|
+
"@fe-free/icons": "6.0.4"
|
|
57
57
|
},
|
|
58
58
|
"scripts": {
|
|
59
59
|
"i18n-extract": "rm -rf ./src/locales/zh-CN && npx i18next-cli extract"
|
|
@@ -15,9 +15,10 @@ const renderMap = {
|
|
|
15
15
|
},
|
|
16
16
|
};
|
|
17
17
|
|
|
18
|
-
const
|
|
18
|
+
const formItemRenderMap = {
|
|
19
19
|
dateRange: (_, props) => {
|
|
20
20
|
// @ts-ignore onBlur 类型错误
|
|
21
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
21
22
|
const { onBlur, fieldProps, ...rest } = props;
|
|
22
23
|
|
|
23
24
|
return (
|
|
@@ -38,6 +39,6 @@ const renderFormItemMap = {
|
|
|
38
39
|
},
|
|
39
40
|
};
|
|
40
41
|
|
|
41
|
-
const dateRender = { renderMap,
|
|
42
|
+
const dateRender = { renderMap, formItemRenderMap };
|
|
42
43
|
|
|
43
44
|
export { dateRender };
|
|
@@ -26,31 +26,31 @@ enum CustomValueTypeEnum {
|
|
|
26
26
|
const customValueTypeMap: Record<string, ProRenderFieldPropsType> = {
|
|
27
27
|
[CustomValueTypeEnum.CustomDateTimeAndDateRange]: {
|
|
28
28
|
render: dateRender.renderMap.dateTime,
|
|
29
|
-
formItemRender: dateRender.
|
|
29
|
+
formItemRender: dateRender.formItemRenderMap.dateRange,
|
|
30
30
|
},
|
|
31
31
|
[CustomValueTypeEnum.CustomDateAndDateRange]: {
|
|
32
32
|
render: dateRender.renderMap.date,
|
|
33
|
-
formItemRender: dateRender.
|
|
33
|
+
formItemRender: dateRender.formItemRenderMap.dateRange,
|
|
34
34
|
},
|
|
35
35
|
[CustomValueTypeEnum.CustomJSON]: {
|
|
36
36
|
render: jsonRender.render,
|
|
37
|
-
formItemRender: jsonRender.
|
|
37
|
+
formItemRender: jsonRender.formItemRender,
|
|
38
38
|
},
|
|
39
39
|
[CustomValueTypeEnum.CustomJSONModal]: {
|
|
40
40
|
render: jsonModalRender.render,
|
|
41
|
-
formItemRender: jsonModalRender.
|
|
41
|
+
formItemRender: jsonModalRender.formItemRender,
|
|
42
42
|
},
|
|
43
43
|
[CustomValueTypeEnum.CustomMarkdownModal]: {
|
|
44
44
|
render: markdownModalRender.render,
|
|
45
|
-
formItemRender: markdownModalRender.
|
|
45
|
+
formItemRender: markdownModalRender.formItemRender,
|
|
46
46
|
},
|
|
47
47
|
[CustomValueTypeEnum.CustomSwitchNumber]: {
|
|
48
48
|
render: switchNumberRender.render,
|
|
49
|
-
formItemRender: switchNumberRender.
|
|
49
|
+
formItemRender: switchNumberRender.formItemRender,
|
|
50
50
|
},
|
|
51
51
|
[CustomValueTypeEnum.CustomSwitchOptions]: {
|
|
52
52
|
render: switchOptionsRender.render,
|
|
53
|
-
formItemRender: switchOptionsRender.
|
|
53
|
+
formItemRender: switchOptionsRender.formItemRender,
|
|
54
54
|
},
|
|
55
55
|
[CustomValueTypeEnum.CustomSerialNumber]: {
|
|
56
56
|
render: () => <></>,
|
|
@@ -13,7 +13,7 @@ function Render(text) {
|
|
|
13
13
|
<>
|
|
14
14
|
<div onClick={() => setShow(true)} className="flex cursor-pointer items-center">
|
|
15
15
|
<div className="flex-1 truncate">{text}</div>
|
|
16
|
-
<span className="min-w-0
|
|
16
|
+
<span className="text-primary min-w-0">查看</span>
|
|
17
17
|
</div>
|
|
18
18
|
{show && (
|
|
19
19
|
<Modal
|
|
@@ -39,7 +39,7 @@ function Render(text) {
|
|
|
39
39
|
|
|
40
40
|
const markdownModalRender = {
|
|
41
41
|
render: Render,
|
|
42
|
-
|
|
42
|
+
formItemRender: () => <></>,
|
|
43
43
|
};
|
|
44
44
|
|
|
45
45
|
export { markdownModalRender };
|
|
@@ -11,7 +11,7 @@ const switchNumberRender = {
|
|
|
11
11
|
|
|
12
12
|
return <SwitchNumber value={text} />;
|
|
13
13
|
},
|
|
14
|
-
|
|
14
|
+
formItemRender: (_, props) => {
|
|
15
15
|
return <ProFormSwitchNumber {...props} />;
|
|
16
16
|
},
|
|
17
17
|
};
|
|
@@ -23,7 +23,7 @@ const switchOptionsRender = {
|
|
|
23
23
|
|
|
24
24
|
return <SwitchOptions value={text} {...props.fieldProps} />;
|
|
25
25
|
},
|
|
26
|
-
|
|
26
|
+
formItemRender: (_, props) => {
|
|
27
27
|
return <ProFormSwitchOptions {...props} />;
|
|
28
28
|
},
|
|
29
29
|
};
|