Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@kne-components/components-admin",
"version": "1.1.23",
"version": "1.1.24",
"description": "用于实现一个后台管理系统的必要组件",
"scripts": {
"init": "husky",
Expand Down Expand Up @@ -65,7 +65,7 @@
},
"devDependencies": {
"@craco/craco": "^7.1.0",
"@kne/modules-dev": "^2.1.18",
"@kne/modules-dev": "^2.1.19",
"@kne/react-fetch": "^1.4.3",
"@kne/react-form-antd": "^4.0.2",
"@kne/remote-loader": "^1.2.3",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Admin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const BaseExample = createWithRemoteLoader({
/>
}
/>
<Route path="/Admin/*" element={<Navigate to="/Admin/admin/user" replace />} />
<Route path="*" element={<Navigate to="/Admin/admin/user" replace />} />
</Routes>
</Layout>
</PureGlobal>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Admin/doc/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const BaseExample = createWithRemoteLoader({
/>
}
/>
<Route path="/Admin/*" element={<Navigate to="/Admin/admin/user" replace />} />
<Route path="*" element={<Navigate to="/Admin/admin/user" replace />} />
</Routes>
</Layout>
</PureGlobal>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Task/AllTask/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ const AllTask = createWithRemoteLoader({
</>
}
page={{
...pageProps,
filter: {
value: filter,
onChange: setFilter,
Expand Down Expand Up @@ -196,7 +195,8 @@ const AllTask = createWithRemoteLoader({
]
},
titleExtra: <SearchInput name="targetName" label={formatMessage({ id: 'TargetName' })} />,
menu: <Menu baseUrl={baseUrl} />
menu: <Menu baseUrl={baseUrl} />,
...pageProps
}}
/>
);
Expand Down
4 changes: 2 additions & 2 deletions src/components/Task/MyTask/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ const MyTask = createWithRemoteLoader({
}
}}
page={{
...pageProps,
filter: {
value: filter,
onChange: setFilter,
Expand Down Expand Up @@ -146,7 +145,8 @@ const MyTask = createWithRemoteLoader({
]
},
titleExtra: <SearchInput name="targetName" label={formatMessage({ id: 'TargetName' })} />,
menu: <Menu baseUrl={baseUrl} />
menu: <Menu baseUrl={baseUrl} />,
...pageProps,
}}
/>
);
Expand Down
8 changes: 5 additions & 3 deletions src/components/Task/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const BaseExample = createWithRemoteLoader({
</Task>
}
/>
<Route path="/Task/*" element={<Navigate to="/Task/task" replace />} />
<Route path="*" element={<Navigate to="/Task/task" replace />} />
</Routes>
</Layout>
</PureGlobal>
Expand Down Expand Up @@ -103,8 +103,9 @@ const MyTaskExample = createWithRemoteLoader({
baseUrl="/Task"
getManualTaskAction={getManualTaskAction}
pageProps={{
menuOpen:false,
menuFixed: false
menuOpen: false,
menuFixed: false,
menu: null
}}
/>
</Layout>
Expand Down Expand Up @@ -137,6 +138,7 @@ const AllTaskExample = createWithRemoteLoader({
<AllTask
baseUrl="/Task"
pageProps={{
menu: null,
menuOpen: false,
menuFixed: false
}}
Expand Down
1 change: 1 addition & 0 deletions src/components/Task/doc/all-task.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const AllTaskExample = createWithRemoteLoader({
<AllTask
baseUrl="/Task"
pageProps={{
menu: null,
menuOpen: false,
menuFixed: false
}}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Task/doc/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const BaseExample = createWithRemoteLoader({
</Task>
}
/>
<Route path="/Task/*" element={<Navigate to="/Task/task" replace />} />
<Route path="*" element={<Navigate to="/Task/task" replace />} />
</Routes>
</Layout>
</PureGlobal>
Expand Down
5 changes: 3 additions & 2 deletions src/components/Task/doc/my-task.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ const MyTaskExample = createWithRemoteLoader({
baseUrl="/Task"
getManualTaskAction={getManualTaskAction}
pageProps={{
menuOpen:false,
menuFixed: false
menuOpen: false,
menuFixed: false,
menu: null
}}
/>
</Layout>
Expand Down
Loading