Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[INLONG-10449][Dashboard] The field template for selecting a new data #10460

Merged
merged 7 commits into from
Jun 21, 2024
Merged

[INLONG-10449][Dashboard] The field template for selecting a new data #10460

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
941aa72
[INLONG-10449][Dashboard] The field template for selecting a new data…
wohainilaodou Jun 19, 2024
b3a2605
[INLONG-10449][Dashboard] template allow search and clear select, if …
wohainilaodou Jun 19, 2024
ccaf973
[INLONG-10449][Dashboard] template not show version, and url exclude /
wohainilaodou Jun 20, 2024
83b1acf
[INLONG-10449][Dashboard] Modify the template style of the source dat…
wohainilaodou Jun 20, 2024
7a563bb
[INLONG-10449][Dashboard] Modify the template style of the source dat…
wohainilaodou Jun 20, 2024
6f515f8
[INLONG-10449][Dashboard] Modify the template style of the source dat…
wohainilaodou Jun 20, 2024
30b9e19
[INLONG-10449][Dashboard] Modify the template style of the source dat…
wohainilaodou Jun 20, 2024
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
1 change: 1 addition & 0 deletions inlong-dashboard/src/plugins/groups/common/GroupDataTemplateInfo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ export class GroupDataTemplateInfo implements DataWithBackend, RenderRow, Render
@FieldDecorator({
type: 'input',
initialValue: 0,
hidden: true,
rules: [{ required: true }],
})
@I18n('pages.GroupDataTemplate.Version')
Expand Down
13 changes: 9 additions & 4 deletions inlong-dashboard/src/plugins/streams/common/StreamDefaultInfo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,15 @@ export class StreamDefaultInfo implements DataWithBackend, RenderRow, RenderList
dataSeparator: string;
@FieldDecorator({
type: 'select',
props: {
filterOption: true,
visible: values => {
return !Boolean(values.id);
},
props: values => ({
showSearch: true,
optionFilterProp: 'label',
allowClear: true,
options: {
requestTrigger: ['onOpen', 'onSearch'],
requestTrigger: ['onOpen'],
requestService: keyword => ({
url: '/template/list',
method: 'POST',
Expand All @@ -247,7 +252,7 @@ export class StreamDefaultInfo implements DataWithBackend, RenderRow, RenderList
},
},
},
},
}),
rules: [],
})
@I18n('meta.Stream.SourceDataField.Template')
Expand Down
2 changes: 1 addition & 1 deletion inlong-dashboard/src/ui/pages/GroupDataTemplate/CreateModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const Comp: React.FC<Props> = ({ id, templateName, ...modalProps }) => {

const { data: savedData, run: getData } = useRequest(
() => ({
url: `/template/get/`,
url: `/template/get`,
method: 'GET',
params: {
templateName: templateName,
Expand Down
4 changes: 2 additions & 2 deletions inlong-dashboard/src/ui/pages/GroupDetail/DataStream/StreamItemModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@ const Comp: React.FC<Props> = ({ inlongGroupId, inlongStreamId, mqType, ...modal
{
manual: true,
onSuccess: result => {
savedData.fieldList = result['fieldList'];
form.setFieldsValue(dataToValues(savedData));
const temp = { ...savedData, fieldList: result.fieldList };
form.setFieldsValue(dataToValues(temp));
},
},
);
Expand Down
Loading