Browse Source

fix: 流水线组件保持输入参数的顺序

pull/145/head
cp3hnu 1 year ago
parent
commit
07d906b857
10 changed files with 27 additions and 10 deletions
  1. BIN
      react-ui/public/assets/images/component-icon-9-Failed.png
  2. BIN
      react-ui/public/assets/images/component-icon-9-Omitted.png
  3. BIN
      react-ui/public/assets/images/component-icon-9-Pending.png
  4. BIN
      react-ui/public/assets/images/component-icon-9-Running.png
  5. BIN
      react-ui/public/assets/images/component-icon-9-Skipped.png
  6. BIN
      react-ui/public/assets/images/component-icon-9-Succeeded.png
  7. BIN
      react-ui/public/assets/images/component-icon-9.png
  8. +5
    -0
      react-ui/src/pages/ModelDeployment/ServiceInfo/index.tsx
  9. +2
    -2
      react-ui/src/pages/ModelDeployment/components/BasicInfo/index.tsx
  10. +20
    -8
      react-ui/src/pages/Pipeline/components/PipelineNodeDrawer/index.tsx

BIN
react-ui/public/assets/images/component-icon-9-Failed.png View File

Before After
Width: 108  |  Height: 108  |  Size: 4.0 kB

BIN
react-ui/public/assets/images/component-icon-9-Omitted.png View File

Before After
Width: 108  |  Height: 108  |  Size: 3.8 kB

BIN
react-ui/public/assets/images/component-icon-9-Pending.png View File

Before After
Width: 108  |  Height: 108  |  Size: 4.0 kB

BIN
react-ui/public/assets/images/component-icon-9-Running.png View File

Before After
Width: 108  |  Height: 108  |  Size: 3.8 kB

BIN
react-ui/public/assets/images/component-icon-9-Skipped.png View File

Before After
Width: 108  |  Height: 108  |  Size: 3.8 kB

BIN
react-ui/public/assets/images/component-icon-9-Succeeded.png View File

Before After
Width: 108  |  Height: 108  |  Size: 4.1 kB

BIN
react-ui/public/assets/images/component-icon-9.png View File

Before After
Width: 72  |  Height: 72  |  Size: 2.3 kB

+ 5
- 0
react-ui/src/pages/ModelDeployment/ServiceInfo/index.tsx View File

@@ -117,6 +117,11 @@ function ServiceInfo() {
const [res] = await to(getServiceVersionsReq(params)); const [res] = await to(getServiceVersionsReq(params));
if (res && res.data) { if (res && res.data) {
const { content = [], totalElements = 0 } = res.data; const { content = [], totalElements = 0 } = res.data;
content.forEach((item: ServiceVersionData) => {
if (item.model && !item.model.show_value) {
item.model.show_value = `${item.model.name}:${item.model.version}`;
}
});
setTableData(content); setTableData(content);
setTotal(totalElements); setTotal(totalElements);
} }


+ 2
- 2
react-ui/src/pages/ModelDeployment/components/BasicInfo/index.tsx View File

@@ -27,7 +27,7 @@ function BasicInfo({ info }: BasicInfoProps) {
}; };


const formatCodeConfig = () => { const formatCodeConfig = () => {
if (info && info.code_config) {
if (info && info.code_config && info.code_config.code_path) {
const { code_path, branch } = info.code_config; const { code_path, branch } = info.code_config;
const url = getGitUrl(code_path, branch); const url = getGitUrl(code_path, branch);
return ( return (
@@ -36,7 +36,7 @@ function BasicInfo({ info }: BasicInfoProps) {
</a> </a>
); );
} }
return undefined;
return '--';
}; };


const formatResource = () => { const formatResource = () => {


+ 20
- 8
react-ui/src/pages/Pipeline/components/PipelineNodeDrawer/index.tsx View File

@@ -43,22 +43,34 @@ const PipelineNodeParameter = forwardRef(({ onFormChange }: PipelineNodeParamete
if (!open) { if (!open) {
// eslint-disable-next-line @typescript-eslint/no-unused-vars // eslint-disable-next-line @typescript-eslint/no-unused-vars
const [_values, error] = await to(form.validateFields()); const [_values, error] = await to(form.validateFields());
// 不管是否验证成功,都需要获取表单数据
const fields = form.getFieldsValue(); const fields = form.getFieldsValue();
const control_strategy = JSON.stringify(fields.control_strategy);
const in_parameters = JSON.stringify(fields.in_parameters);
const out_parameters = JSON.stringify(fields.out_parameters);

// 保存字段顺序
const control_strategy = {
...stagingItem.control_strategy,
...fields.control_strategy,
};
const in_parameters = {
...stagingItem.in_parameters,
...fields.in_parameters,
};
const out_parameters = {
...stagingItem.out_parameters,
...fields.out_parameters,
};

// console.log('getFieldsValue', fields); // console.log('getFieldsValue', fields);


const res = { const res = {
...stagingItem, ...stagingItem,
...fields, ...fields,
control_strategy: control_strategy,
in_parameters: in_parameters,
out_parameters: out_parameters,
control_strategy: JSON.stringify(control_strategy),
in_parameters: JSON.stringify(in_parameters),
out_parameters: JSON.stringify(out_parameters),
formError: !!error, formError: !!error,
}; };

console.log('res', res);
// console.log('res', res);
onFormChange(res); onFormChange(res);
} }
}; };


Loading…
Cancel
Save