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

🐛 修复工具管理规则编辑失败 #76

Merged
merged 1 commit into from
Nov 22, 2022
Merged

🐛 修复工具管理规则编辑失败 #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion web/packages/login/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"react-i18next": "^11.17.3",
"react-redux": "^7.2.5",
"react-router-dom": "^5.3.0",
"tdesign-react": "0.42.3",
"tdesign-react": "0.42.6",
"universal-cookie": "^4.0.4"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion web/packages/shared/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"react-router-dom": "^5.3.0",
"react-copy-to-clipboard": "^5.0.4",
"react-i18next": "^11.17.3",
"tdesign-react": "0.42.3",
"tdesign-react": "0.42.6",
"typescript": "^4.5.5"
}
}
4 changes: 2 additions & 2 deletions web/packages/shared/util/fetch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,9 @@ export class FetchManager {
...custom,
});

postFile = (url: string, data: any, custom?: FetchCustomParams) => fetch(url, {
postFile = (url: string, data?: any, custom?: FetchCustomParams) => fetch(url, {
method: 'POST',
body: JSON.stringify(data),
body: data ? JSON.stringify(data) : null,
}, {
fileHandler: postFileResultHandler,
...this.custom,
Expand Down
1 change: 0 additions & 1 deletion web/packages/tca-analysis/src/modules/schemes/code-lint/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,6 @@ const CodeLint = (props: CodeLintProps) => {
</div>
<div className={style.footer}>
<a
target="_blank"
href={`${getSchemeBlankRouter(
orgSid,
teamName,
Expand Down
1 change: 0 additions & 1 deletion web/packages/tca-analysis/src/modules/template/code-lint/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,6 @@ const CodeLint = (props: CodeLintProps) => {
</div>
<div className={style.footer}>
<a
target="_blank"
href={`${getTmplBlankRouter(
orgSid,
teamName,
Expand Down
61 changes: 31 additions & 30 deletions web/packages/tca-layout/public/locales/en-US/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,46 +70,21 @@
"工具依赖": "工具依赖",
"节点列表": "节点列表",
"标签列表": "标签列表",
"已更新节点": "已更新节点",
"更新节点": "更新节点",
"已更新该节点进程配置": "已更新该节点进程配置",
"节点信息": "节点信息",
"节点名称": "节点名称",
"节点名称为必填项": "节点名称为必填项",
"节点标签为必选项": "节点标签为必选项",
"节点可用性为必选项": "节点可用性为必选项",
"管理员为必填项": "管理员为必填项",
"管理员": "管理员",
"负责人": "负责人",
"关注人": "关注人",
"IP 地址": "IP 地址",
"节点状态": "节点状态",
"最近上报心跳": "最近上报心跳",
"所属标签": "所属标签",
"节点状态": "节点状态",
"工具进程": "工具进程",
"任务列表": "任务列表",
"执行任务列表": "执行任务列表",
"任务": "任务",
"子任务": "子任务",
"执行状态": "执行状态",
"已更新该节点进程配置": "已更新该节点进程配置",
"节点信息": "节点信息",
"负责人": "负责人",
"节点配置信息": "节点配置信息",
"可用内存:": "可用内存:",
"可用硬盘:": "可用硬盘:",
"节点工具进程配置": "节点工具进程配置",
"保存节点工具进程配置": "保存节点工具进程配置",
"工具": "工具",
"已更新标签信息": "已更新标签信息",
"已创建标签": "已创建标签",
"更新标签": "更新标签",
"添加标签": "添加标签",
"标签名称": "标签名称",
"展示名称": "展示名称",
"展示名称为必填项": "展示名称为必填项",
"类型": "类型",
"标签类型为必选项": "标签类型为必选项",
"标签描述": "标签描述",
"描述": "描述",
"其他操作": "其他操作",
"团队已禁用！": "团队已禁用！",
"禁用": "禁用",
"团队": "团队",
Expand Down Expand Up @@ -225,5 +200,31 @@
"表示该工具可自定义规则": "表示该工具可自定义规则",
"协同": "协同",
"由本团队创建的工具": "由本团队创建的工具",
"自定义": "自定义"
"自定义": "自定义",
"节点列表1": "节点列表1",
"已更新节点": "已更新节点",
"更新节点": "更新节点",
"节点名称为必填项": "节点名称为必填项",
"节点标签为必选项": "节点标签为必选项",
"节点可用性为必选项": "节点可用性为必选项",
"管理员为必填项": "管理员为必填项",
"管理员": "管理员",
"工具进程": "工具进程",
"任务列表": "任务列表",
"执行任务列表": "执行任务列表",
"任务": "任务",
"子任务": "子任务",
"执行状态": "执行状态",
"已更新标签信息": "已更新标签信息",
"已创建标签": "已创建标签",
"更新标签": "更新标签",
"添加标签": "添加标签",
"标签名称": "标签名称",
"展示名称": "展示名称",
"展示名称为必填项": "展示名称为必填项",
"类型": "类型",
"标签类型为必选项": "标签类型为必选项",
"标签描述": "标签描述",
"描述": "描述",
"其他操作": "其他操作"
}
61 changes: 31 additions & 30 deletions web/packages/tca-layout/public/locales/zh-CN/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,46 +70,21 @@
"工具依赖": "工具依赖",
"节点列表": "节点列表",
"标签列表": "标签列表",
"已更新节点": "已更新节点",
"更新节点": "更新节点",
"已更新该节点进程配置": "已更新该节点进程配置",
"节点信息": "节点信息",
"节点名称": "节点名称",
"节点名称为必填项": "节点名称为必填项",
"节点标签为必选项": "节点标签为必选项",
"节点可用性为必选项": "节点可用性为必选项",
"管理员为必填项": "管理员为必填项",
"管理员": "管理员",
"负责人": "负责人",
"关注人": "关注人",
"IP 地址": "IP 地址",
"节点状态": "节点状态",
"最近上报心跳": "最近上报心跳",
"所属标签": "所属标签",
"节点状态": "节点状态",
"工具进程": "工具进程",
"任务列表": "任务列表",
"执行任务列表": "执行任务列表",
"任务": "任务",
"子任务": "子任务",
"执行状态": "执行状态",
"已更新该节点进程配置": "已更新该节点进程配置",
"节点信息": "节点信息",
"负责人": "负责人",
"节点配置信息": "节点配置信息",
"可用内存:": "可用内存:",
"可用硬盘:": "可用硬盘:",
"节点工具进程配置": "节点工具进程配置",
"保存节点工具进程配置": "保存节点工具进程配置",
"工具": "工具",
"已更新标签信息": "已更新标签信息",
"已创建标签": "已创建标签",
"更新标签": "更新标签",
"添加标签": "添加标签",
"标签名称": "标签名称",
"展示名称": "展示名称",
"展示名称为必填项": "展示名称为必填项",
"类型": "类型",
"标签类型为必选项": "标签类型为必选项",
"标签描述": "标签描述",
"描述": "描述",
"其他操作": "其他操作",
"团队已禁用！": "团队已禁用！",
"禁用": "禁用",
"团队": "团队",
Expand Down Expand Up @@ -225,5 +200,31 @@
"表示该工具可自定义规则": "表示该工具可自定义规则",
"协同": "协同",
"由本团队创建的工具": "由本团队创建的工具",
"自定义": "自定义"
"自定义": "自定义",
"节点列表1": "节点列表1",
"已更新节点": "已更新节点",
"更新节点": "更新节点",
"节点名称为必填项": "节点名称为必填项",
"节点标签为必选项": "节点标签为必选项",
"节点可用性为必选项": "节点可用性为必选项",
"管理员为必填项": "管理员为必填项",
"管理员": "管理员",
"工具进程": "工具进程",
"任务列表": "任务列表",
"执行任务列表": "执行任务列表",
"任务": "任务",
"子任务": "子任务",
"执行状态": "执行状态",
"已更新标签信息": "已更新标签信息",
"已创建标签": "已创建标签",
"更新标签": "更新标签",
"添加标签": "添加标签",
"标签名称": "标签名称",
"展示名称": "展示名称",
"展示名称为必填项": "展示名称为必填项",
"类型": "类型",
"标签类型为必选项": "标签类型为必选项",
"标签描述": "标签描述",
"描述": "描述",
"其他操作": "其他操作"
}
6 changes: 4 additions & 2 deletions web/packages/tca-layout/src/modules/nodes/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ import { Tabs } from 'coding-oa-uikit';
import { getTags } from '@src/services/nodes';

// 模块内
import NodeTable from './node-table';
import TagTable from './tag-table';
// import NodeTable from './node-table';
// import TagTable from './tag-table';
import NodeTable from '@plat/modules/nodes/node-table';
import TagTable from '@plat/modules/nodes/tag-table';

const { TabPane } = Tabs;

Expand Down
6 changes: 3 additions & 3 deletions web/packages/tca-layout/src/modules/tools/detail-components/rules/rule-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const CreateRule = (props: CreateRuleProps) => {
}, [visible]);

const onFinish = (formData: any) => {
const data = {
const params = {
...formData,
languages: formData.languages || [],
checkruledesc: {
Expand All @@ -54,7 +54,7 @@ const CreateRule = (props: CreateRuleProps) => {
if (isEdit) {
onUpdate(orgSid, toolId, data.id, {
real_name: data.real_name,
...data,
...params,
}).then(() => {
message.success(t('修改成功'));
callback();
Expand All @@ -64,7 +64,7 @@ const CreateRule = (props: CreateRuleProps) => {
setLoading(false);
});
} else {
onAdd(orgSid, toolId, data).then(() => {
onAdd(orgSid, toolId, params).then(() => {
message.success(t('创建成功'));
callback(DEFAULT_PAGER.pageStart, DEFAULT_PAGER.pageSize);
onClose();
Expand Down
2 changes: 1 addition & 1 deletion web/packages/tca-layout/src/plat/common/api/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ const fetchManager = new FetchManager({
},
});

export const { get, post, put, patch, del } = fetchManager;
export const { get, post, put, patch, del, postFile } = fetchManager;

export const fetchAPIManager = (url: string) => FetchAPIManager.getInstance(url, fetchManager);
53 changes: 53 additions & 0 deletions web/packages/tca-layout/src/plat/common/modules/nodes/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import React, { useState, useEffect, useMemo } from 'react';
import { useParams } from 'react-router-dom';
import { useTranslation } from 'react-i18next';
import { filter } from 'lodash';
import { Tabs } from 'coding-oa-uikit';

// 项目内
import { getTags } from '@src/services/nodes';

// 模块内
import NodeTable from './node-table';
import TagTable from './tag-table';

const { TabPane } = Tabs;

const Nodes = () => {
const { t } = useTranslation();
const [tags, setTags] = useState([]);
const { orgSid }: any = useParams();
const tagOptions = useMemo(() => tags.map((item: any) => ({
label: item.display_name || item.name,
value: item.name,
})), [tags]);

const getData = async () => {
getTags(orgSid, { limit: 1000 }).then((res: any) => {
setTags(filter(res?.results, (item: any) => item?.org_sid === orgSid) || []);
});
};

useEffect(() => {
getData();
}, []);

return (
<>
<div className="px-lg">
<Tabs defaultActiveKey="nodes" size="large">
<TabPane tab={t('节点列表1')} key="nodes">
<NodeTable tagOptions={tagOptions}/>
</TabPane>
<TabPane tab={t('标签列表')} key="tags">
<TagTable tags={tags} reload={() => {
getData();
}} />
</TabPane>
</Tabs>
</div>
</>
);
};

export default Nodes;
0 ...a-layout/src/modules/nodes/node-modal.tsx → .../plat/common/modules/nodes/node-modal.tsx
View file
Open in desktop
File renamed without changes.
0 ...a-layout/src/modules/nodes/node-table.tsx → .../plat/common/modules/nodes/node-table.tsx
View file
Open in desktop
File renamed without changes.
0 ...ut/src/modules/nodes/node-tasks-modal.tsx → ...common/modules/nodes/node-tasks-modal.tsx
View file
Open in desktop
File renamed without changes.
Loading