balibabu
commited on
Commit
·
6a82296
1
Parent(s):
7f935b7
Feat: Make the scroll bar of the DatasetSettings page appear inside #3221 (#4548)
Browse files### What problem does this PR solve?
Feat: Make the scroll bar of the DatasetSettings page appear inside
#3221
### Type of change
- [x] New Feature (non-breaking change which adds functionality)
web/src/global.less
CHANGED
@@ -2,6 +2,7 @@
|
|
2 |
|
3 |
html {
|
4 |
height: 100%;
|
|
|
5 |
}
|
6 |
|
7 |
body {
|
|
|
2 |
|
3 |
html {
|
4 |
height: 100%;
|
5 |
+
overflow: hidden; // The content of the DatasetSettings page is too high, which will cause scroll bars to appear on the html tags. Setting the maximum height in DatasetSettings does not work either. I don't understand.
|
6 |
}
|
7 |
|
8 |
body {
|
web/src/pages/dataset/index.tsx
CHANGED
@@ -3,7 +3,7 @@ import { SideBar } from './sidebar';
|
|
3 |
|
4 |
export default function DatasetWrapper() {
|
5 |
return (
|
6 |
-
<div className="
|
7 |
<SideBar></SideBar>
|
8 |
<div className="flex-1">
|
9 |
<Outlet />
|
|
|
3 |
|
4 |
export default function DatasetWrapper() {
|
5 |
return (
|
6 |
+
<div className="flex flex-1">
|
7 |
<SideBar></SideBar>
|
8 |
<div className="flex-1">
|
9 |
<Outlet />
|
web/src/pages/dataset/setting/index.tsx
CHANGED
@@ -1,20 +1,24 @@
|
|
1 |
-
import { Card } from '@/components/ui/card';
|
2 |
import AdvancedSettingForm from './advanced-setting-form';
|
3 |
import BasicSettingForm from './basic-setting-form';
|
4 |
|
5 |
export default function DatasetSettings() {
|
6 |
return (
|
7 |
-
<section className="
|
8 |
-
<div className="text-3xl font-bold
|
9 |
-
<Card className="border-0 p-6
|
10 |
-
<
|
11 |
-
<
|
12 |
-
|
|
|
|
|
13 |
</Card>
|
14 |
|
15 |
-
<div className="text-3xl font-bold
|
16 |
-
<Card className="border-0 p-6
|
17 |
-
<
|
|
|
|
|
18 |
</Card>
|
19 |
</section>
|
20 |
);
|
|
|
1 |
+
import { Card, CardContent } from '@/components/ui/card';
|
2 |
import AdvancedSettingForm from './advanced-setting-form';
|
3 |
import BasicSettingForm from './basic-setting-form';
|
4 |
|
5 |
export default function DatasetSettings() {
|
6 |
return (
|
7 |
+
<section className="p-8 overflow-y-scroll max-h-[90vh]">
|
8 |
+
<div className="text-3xl font-bold pb-6">Basic settings</div>
|
9 |
+
<Card className="border-0 p-6 bg-colors-background-inverse-weak">
|
10 |
+
<CardContent>
|
11 |
+
<div className="w-2/5">
|
12 |
+
<BasicSettingForm></BasicSettingForm>
|
13 |
+
</div>
|
14 |
+
</CardContent>
|
15 |
</Card>
|
16 |
|
17 |
+
<div className="text-3xl font-bold pb-6 pt-8">Advanced settings</div>
|
18 |
+
<Card className="border-0 p-6 bg-colors-background-inverse-weak">
|
19 |
+
<CardContent>
|
20 |
+
<AdvancedSettingForm></AdvancedSettingForm>
|
21 |
+
</CardContent>
|
22 |
</Card>
|
23 |
</section>
|
24 |
);
|
web/src/pages/dataset/testing/index.tsx
CHANGED
@@ -16,7 +16,7 @@ export default function RetrievalTesting() {
|
|
16 |
<h2 className="text-3xl font-bold mb-8 px-[10%]">
|
17 |
15 Results from 3 files
|
18 |
</h2>
|
19 |
-
<section className="flex flex-col gap-4 overflow-auto h-[
|
20 |
{list.map((x, idx) => (
|
21 |
<Card
|
22 |
key={idx}
|
|
|
16 |
<h2 className="text-3xl font-bold mb-8 px-[10%]">
|
17 |
15 Results from 3 files
|
18 |
</h2>
|
19 |
+
<section className="flex flex-col gap-4 overflow-auto h-[83vh] px-[10%]">
|
20 |
{list.map((x, idx) => (
|
21 |
<Card
|
22 |
key={idx}
|
web/src/pages/profile-setting/model/index.tsx
CHANGED
@@ -12,36 +12,36 @@ const modelLibraryList = new Array(4).fill(1);
|
|
12 |
|
13 |
export default function ModelManagement() {
|
14 |
return (
|
15 |
-
<section className="p-8 space-y-8">
|
16 |
<div className="flex justify-between items-center ">
|
17 |
<h1 className="text-4xl font-bold">Team management</h1>
|
18 |
-
<Button
|
19 |
-
|
20 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
21 |
</div>
|
22 |
-
<SystemModelSetting></SystemModelSetting>
|
23 |
-
<section>
|
24 |
-
<h2 className="text-2xl font-semibold mb-3">Added model</h2>
|
25 |
-
<div className="grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-4 2xl:grid-cols-4 gap-4">
|
26 |
-
{addedModelList.map((x, idx) => (
|
27 |
-
<AddModelCard key={idx}></AddModelCard>
|
28 |
-
))}
|
29 |
-
</div>
|
30 |
-
</section>
|
31 |
-
<section>
|
32 |
-
<div className="flex justify-between items-center mb-3">
|
33 |
-
<h2 className="text-2xl font-semibold ">Model library</h2>
|
34 |
-
<Input
|
35 |
-
placeholder="search"
|
36 |
-
className="bg-colors-background-inverse-weak w-1/5"
|
37 |
-
></Input>
|
38 |
-
</div>
|
39 |
-
<div className="grid grid-cols-2 lg:grid-cols-4 xl:grid-cols-6 2xl:grid-cols-8 gap-4">
|
40 |
-
{modelLibraryList.map((x, idx) => (
|
41 |
-
<ModelLibraryCard key={idx}></ModelLibraryCard>
|
42 |
-
))}
|
43 |
-
</div>
|
44 |
-
</section>
|
45 |
</section>
|
46 |
);
|
47 |
}
|
|
|
12 |
|
13 |
export default function ModelManagement() {
|
14 |
return (
|
15 |
+
<section className="p-8 space-y-8 ">
|
16 |
<div className="flex justify-between items-center ">
|
17 |
<h1 className="text-4xl font-bold">Team management</h1>
|
18 |
+
<Button>Unfinished</Button>
|
19 |
+
</div>
|
20 |
+
<div className="max-h-[84vh] overflow-auto">
|
21 |
+
<SystemModelSetting></SystemModelSetting>
|
22 |
+
<section className="mt-6">
|
23 |
+
<h2 className="text-2xl font-semibold mb-3">Added model</h2>
|
24 |
+
<div className="grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-4 2xl:grid-cols-4 gap-4">
|
25 |
+
{addedModelList.map((x, idx) => (
|
26 |
+
<AddModelCard key={idx}></AddModelCard>
|
27 |
+
))}
|
28 |
+
</div>
|
29 |
+
</section>
|
30 |
+
<section className="mt-6">
|
31 |
+
<div className="flex justify-between items-center mb-3">
|
32 |
+
<h2 className="text-2xl font-semibold ">Model library</h2>
|
33 |
+
<Input
|
34 |
+
placeholder="search"
|
35 |
+
className="bg-colors-background-inverse-weak w-1/5"
|
36 |
+
></Input>
|
37 |
+
</div>
|
38 |
+
<div className="grid grid-cols-2 lg:grid-cols-4 xl:grid-cols-6 2xl:grid-cols-8 gap-4">
|
39 |
+
{modelLibraryList.map((x, idx) => (
|
40 |
+
<ModelLibraryCard key={idx}></ModelLibraryCard>
|
41 |
+
))}
|
42 |
+
</div>
|
43 |
+
</section>
|
44 |
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
45 |
</section>
|
46 |
);
|
47 |
}
|