-
- )
-}
-
-export default SharePage
\ No newline at end of file
+ };
+
+ React.useEffect(() => {
+ init();
+ }, []);
+
+ const handleValueChange = (list: any[]) => {
+ setTableData((p: any) => {
+ const ids = list.map((i: any) => i.id);
+ return p
+ .filter((i: any) => !ids.includes(i.id))
+ .concat(list)
+ .sort((a: any, b: any) => b.id - a.id);
+ });
+ };
+
+ if (loading) return
-
-
-
-
- Metric:
-
- {
- source?.metric?.map((i: any) => (
-
- }
-
- {
- source?.test_type !== 'performance' && source?.show_type !== 'pass_rate' &&
-
-
- {
- cLoading &&
-
-
- 时序分析分享
-
-
-
- {
- source?.test_type === 'performance' &&
-
- {source?.start_time}
-
-
- {i}
))
- }
-
-
- {
- source?.fetchData?.map((i: any) => {
- const _props = {
- key: i.metric,
- fetchData: { ...i, share_id, },
- setLoading: setCLoading,
- provider_env: source?.provider_env,
- valueChange: handleValueChange
- }
-
- return (
- source?.provider_env === "aliyun" ?
-
-
- }
-
- {
- (source?.test_type === 'functional' && source?.case_map) &&
-
-
- }
-
- {
- tableData?.length > 0 &&
-
- { }}
- dataSource={tableData}
- test_type={source?.test_type}
- show_type={source?.show_type}
- />
-
- }
-
- {
- tableData?.length === 0 &&
-
-
- }
-
+
+
+
+
+
+
+ Metric:
+
+ {source?.metric_list?.map((i: any) => (
+
+
+ )}
+
+ {source?.test_type !== 'performance' && source?.show_type !== 'pass_rate' && (
+
+
+ {cLoading &&
+
+ 时序分析分享
+
+
+
+
+ {source?.test_type === 'performance' && (
+
+ {source?.start_time}
+
+
+ {i?.name}
+ ))}
+
+
+ {source?.metric_list?.map((i: any) => {
+ return source?.provider_env === 'aliyun' ? (
+
+
+ )}
+
+ {source?.test_type === 'functional' && source?.case_map && (
+
+
+ )}
+
+ {tableData?.length > 0 && (
+
+ {}}
+ dataSource={tableData}
+ test_type={source?.test_type}
+ show_type={source?.show_type}
+ />
+
+ )}
+
+ {tableData?.length === 0 && (
+
+
+ )}
+
- {i.label}
-
- ))
- }
-
+ {i.label}
+
+ ))}
+
-
+
@@ -79,11 +110,11 @@ export default (props: any) => {
}}
onMouseOver={() => {
if (disabled) {
- setDisabled(false)
+ setDisabled(false);
}
}}
onMouseOut={() => {
- setDisabled(true)
+ setDisabled(true);
}}
>
{'Group1'}
@@ -98,7 +129,7 @@ export default (props: any) => {
maskClosable={false}
destroyOnClose={true}
wrapClassName={styles.job_Modal}
- modalRender={modal => (
+ modalRender={(modal) => (
{
)}
>
- = (props) => {
- const { formatMessage } = useIntl()
- const { name } = props.route
- const { height: layoutHeight, width: layoutWidth } = useClientSize()
- const hasNav = ["TemplatePreview", "TemplateEdit", "JobTypePreview"].includes(name)
+ const { formatMessage } = useIntl();
+ const { name } = props.route;
+ const { height: layoutHeight, width: layoutWidth } = useClientSize();
+ const hasNav = ['TemplatePreview', 'TemplateEdit', 'JobTypePreview'].includes(name);
- const { initialState, setInitialState } = useModel('@@initialState')
+ const { initialState, setInitialState } = useModel('@@initialState');
const { authList } = initialState;
- const { ws_id, jt_id } = useParams() as any
- const { query, state, pathname } = useLocation() as any
+ const { ws_id, jt_id } = useParams() as any;
+ const { query, state, pathname } = useLocation() as any;
const access = useAccess();
- writeDocumentTitle(`Workspace.${name}`)
- const [test_config, setTest_config] = useState([])
- const [detail, setDetail] = useState({ name: '', server_type: '', test_type: '' })
- const [items, setItems] = useState({ basic: {}, env: {}, suite: {}, more: {} })
- const [loading, setLoading] = useState(true)
- const [envErrorFlag, setEnvErrorFlag] = useState(false)
- const [isloading, setIsloading] = useState(false)
- const [disabled, setDisabled] = useState(name === 'TemplatePreview')
- const [modifyTemplate, setModifyTemplate] = useState(false)
- const [templateDatas, setTemplateDatas] = useState({})
- const [templateBtnVisible, setTemplateBtnVisible] = useState(false)
- const moreForm: any = useRef(null)
- const envForm: any = useRef(null)
- const basicForm: any = useRef(null)
- const suiteTable: any = useRef(null)
- const bodyRef: any = useRef(null)
+ const [test_config, setTest_config] = useState([]);
+ const [detail, setDetail] = useState({ name: '', server_type: '', test_type: '' });
+ const [items, setItems] = useState({ basic: {}, env: {}, suite: {}, more: {} });
+ const [loading, setLoading] = useState(true);
+ const [envErrorFlag, setEnvErrorFlag] = useState(false);
+ const [isloading, setIsloading] = useState(false);
+ const [disabled, setDisabled] = useState(name === 'TemplatePreview');
+ const [modifyTemplate, setModifyTemplate] = useState(false);
+ const [templateDatas, setTemplateDatas] = useState({});
+ const [templateBtnVisible, setTemplateBtnVisible] = useState(false);
+ const moreForm: any = useRef(null);
+ const envForm: any = useRef(null);
+ const basicForm: any = useRef(null);
+ const suiteTable: any = useRef(null);
+ const bodyRef: any = useRef(null);
// yaml 回显
- const projectListData: any = useRef(null)
- const baselineListData: any = useRef(null)
- const tagsData: any = useRef(null)
- const reportTemplateData: any = useRef(null)
- const caseData: any = useRef(null)
-
- const saveTemplateDrawer: any = useRef()
- const templateEditForm: any = useRef()
- const [projectId, setProjectId] = useState()
- const [templateEnabel, setTemplateEnable] = useState(false)
- const [fetching, setFetching] = useState(false)
- const [newSaveLoading, setNewSaveLoading] = useState(false)
- const [isReset, setIsReset] = useState(false)
- const [timeTagList, setTimeTagList]: any = useState([])
-
- const [jobInfo, setJobInfo] = useState('')
- const [isYamlFormat, setIsYamlFormat] = useState(false)
- const { data: templateList, run: requestTemplateRun, refresh: templatePopoverRefresh } = useRequest(
- (params: any) => queryTestTemplateList(params),
- {
- initialData: [],
- throttleInterval: 300,
- manual: true,
- }
- )
+ const projectListData: any = useRef(null);
+ const baselineListData: any = useRef(null);
+ const tagsData: any = useRef(null);
+ const reportTemplateData: any = useRef(null);
+ const caseData: any = useRef(null);
+
+ const saveTemplateDrawer: any = useRef();
+ const templateEditForm: any = useRef();
+ const [projectId, setProjectId] = useState();
+ const [templateEnabel, setTemplateEnable] = useState(false);
+ const [fetching, setFetching] = useState(false);
+ const [newSaveLoading, setNewSaveLoading] = useState(false);
+ const [isReset, setIsReset] = useState(false);
+ const [timeTagList, setTimeTagList]: any = useState([]);
+
+ const [jobInfo, setJobInfo] = useState('');
+ const [isYamlFormat, setIsYamlFormat] = useState(false);
+ const {
+ data: templateList,
+ run: requestTemplateRun,
+ refresh: templatePopoverRefresh,
+ } = useRequest((params: any) => queryTestTemplateList(params), {
+ initialData: [],
+ throttleInterval: 300,
+ manual: true,
+ });
const handleModifySetting = () => {
- setDisabled(false)
- setModifyTemplate(true)
- }
+ setDisabled(false);
+ setModifyTemplate(true);
+ };
const goValidate = (form: any) => {
- return new Promise(
- (resolve, reject) => (
- form
- .validateFields()
- .then(resolve)
- .catch(() => {
- reject()
- setFetching(false)
- setNewSaveLoading(false)
- })
- )
- )
- }
+ return new Promise((resolve, reject) =>
+ form
+ .validateFields()
+ .then(resolve)
+ .catch(() => {
+ reject();
+ setFetching(false);
+ setNewSaveLoading(false);
+ }),
+ );
+ };
const getPageData = async () => {
- setLoading(true)
- let job_type_id = jt_id
+ setLoading(true);
+ let job_type_id = jt_id;
if (name === 'TestExport') {
- const { data } = await queryTestExportValues({ job_id: jt_id, ...query })
- setTemplateDatas(data)
- setTest_config(data.test_config)
- job_type_id = data.job_type_id
+ const { data } = await queryTestExportValues({ job_id: jt_id, ...query });
+ setTemplateDatas(data);
+ setTest_config(data.test_config);
+ job_type_id = data.job_type_id;
}
- if (["TestTemplate", "TemplatePreview", "TemplateEdit", "TestJob"].includes(name)) {
- let template_id: any = null
- if (name === 'TestJob' && query.template_id)
- template_id = query.template_id
+ if (['TestTemplate', 'TemplatePreview', 'TemplateEdit', 'TestJob'].includes(name)) {
+ let template_id: any = null;
+ if (name === 'TestJob' && query.template_id) template_id = query.template_id;
- if (["TestTemplate", "TemplatePreview", "TemplateEdit"].includes(name))
- template_id = jt_id
+ if (['TestTemplate', 'TemplatePreview', 'TemplateEdit'].includes(name))
+ template_id = jt_id;
if (template_id) {
- const { code, data } = await queryTestTemplateData({ template_id })
+ const { code, data } = await queryTestTemplateData({ template_id });
if (code === 500) {
- redirectErrorPage(500)
- return
+ redirectErrorPage(500);
+ return;
}
- const [datas] = data
- job_type_id = datas.job_type_id
- setTemplateDatas(datas)
- setTest_config(datas.test_config)
- setTemplateEnable(datas.enable)
- }
- else {
- setTemplateDatas({})
+ const [datas] = data;
+ job_type_id = datas.job_type_id;
+ setTemplateDatas(datas);
+ setTest_config(datas.test_config);
+ setTemplateEnable(datas.enable);
+ } else {
+ setTemplateDatas({});
}
}
- const { data: [jobTypedetail] } = await queryJobTypeList({ jt_id: job_type_id })
- if (!jobTypedetail)
- return redirectErrorPage(404)
- setDetail(jobTypedetail)
- const { data: items } = await queryJobTypeItems({ jt_id: job_type_id })
- filterItems(items)
- setLoading(false)
- if (name === 'TestJob') requestTemplateRun({ ws_id, job_type_id, enable: 'True' })
- }
+ const {
+ data: [jobTypedetail],
+ } = await queryJobTypeList({ jt_id: job_type_id });
+ if (!jobTypedetail) return redirectErrorPage(404);
+ setDetail(jobTypedetail);
+ const { data: items } = await queryJobTypeItems({ jt_id: job_type_id });
+ filterItems(items);
+ setLoading(false);
+ if (name === 'TestJob') requestTemplateRun({ ws_id, job_type_id, enable: 'True' });
+ };
const filterItems = (t: any) => {
- const basic: any = {}, env: any = {}, suite: any = {}, more: any = {}
+ const basic: any = {},
+ env: any = {},
+ suite: any = {},
+ more: any = {};
t?.forEach((i: any) => {
- if (i.config_index === 1) basic[i.name] = i
- if (i.config_index === 2) env[i.name] = i
- if (i.config_index === 3) suite[i.name] = i
- if (i.config_index === 4) more[i.name] = i
- })
+ if (i.config_index === 1) basic[i.name] = i;
+ if (i.config_index === 2) env[i.name] = i;
+ if (i.config_index === 3) suite[i.name] = i;
+ if (i.config_index === 4) more[i.name] = i;
+ });
- setItems({ basic, env, suite, more })
- }
+ setItems({ basic, env, suite, more });
+ };
- const handleCopyText = useCopyText(formatMessage({ id: 'request.copy.success' }))
+ const handleCopyText = useCopyText(formatMessage({ id: 'request.copy.success' }));
const handleReset = (flag = false) => {
- setIsReset(flag)
- setJobInfo('')
- templateEditForm.current?.reset()
- basicForm.current?.reset()
- moreForm.current?.reset()
- envForm.current?.reset()
- suiteTable.current?.reset()
- }
+ setIsReset(flag);
+ setJobInfo('');
+ templateEditForm.current?.reset();
+ basicForm.current?.reset();
+ moreForm.current?.reset();
+ envForm.current?.reset();
+ suiteTable.current?.reset();
+ };
//数据初始化 init hooks //新建job 1 jobType预览 2 模板预览 3 模板测试 4
useEffect(() => {
- handleReset()
- getPageData()
- }, [pathname, query])
+ handleReset();
+ getPageData();
+ }, [pathname, query]);
const compact = (obj: any) => {
- const result: any = {}
- Object.keys(obj).forEach(
- key => {
- const z = obj[key]
- if (z === null || z === undefined || z === '')
- return
- const t = Object.prototype.toString.call(z)
- if (t === '[object Array]') {
- const arrayItem = z.filter(
- (item: any) => {
- let noData = false
- Object.keys(item).forEach(
- ctx => {
- const o = item[ctx]
- if (o === null || o === undefined || o === '')
- noData = true
- }
- )
- if (!noData)
- return item
- }
- )
- if (arrayItem.length !== 0)
- result[key] = arrayItem
- }
- else if (t === '[object Object]') {
- if (JSON.stringify(z) !== '{}')
- result[key] = compact(z)
- }
- else
- result[key] = z
- }
- )
- return Object.assign({}, result)
- }
-
+ const result: any = {};
+ Object.keys(obj).forEach((key) => {
+ const z = obj[key];
+ if (z === null || z === undefined || z === '') return;
+ const t = Object.prototype.toString.call(z);
+ if (t === '[object Array]') {
+ const arrayItem = z.filter((item: any) => {
+ let noData = false;
+ Object.keys(item).forEach((ctx) => {
+ const o = item[ctx];
+ if (o === null || o === undefined || o === '') noData = true;
+ });
+ if (!noData) return item;
+ });
+ if (arrayItem.length !== 0) result[key] = arrayItem;
+ } else if (t === '[object Object]') {
+ if (JSON.stringify(z) !== '{}') result[key] = compact(z);
+ } else result[key] = z;
+ });
+ return Object.assign({}, result);
+ };
const transformDate = async (result: PropsTypes | null = null) => {
- let data: any = {}
- let installKernel = ''
+ let data: any = {};
+ let installKernel = '';
if (name === 'TestTemplate' || name === 'TemplatePreview' || name === 'TemplateEdit') {
- const templateFormVal = result ? result.templateEditFormInfo : await goValidate(templateEditForm.current.form)
- data = Object.assign(data, compact(templateFormVal))
+ const templateFormVal = result
+ ? result.templateEditFormInfo
+ : await goValidate(templateEditForm.current.form);
+ data = Object.assign(data, compact(templateFormVal));
}
if (JSON.stringify(items.basic) !== '{}') {
- const basicVal = result ? result.basicFormInfo : await goValidate(basicForm.current.form)
- data = Object.assign(data, compact(basicVal))
+ const basicVal = result
+ ? result.basicFormInfo
+ : await goValidate(basicForm.current.form);
+ data = Object.assign(data, compact(basicVal));
}
if (JSON.stringify(items.env) !== '{}') {
- const envVal = result ? result.envFormInfo : await goValidate(envForm.current.form)
+ const envVal = result ? result.envFormInfo : await goValidate(envForm.current.form);
const {
- env_info, rpm_info, script_info, moniter_contrl,
- monitor_info, reclone_contrl, app_name, os,
- vm, need_reboot, kernel_version, kernel_install,
- code_repo, code_branch, compile_branch, cpu_arch, commit_id, kernel_packages,
- build_config, build_machine, scripts, kernel, devel, headers, hotfix_install, ...rest
- }: any = envVal
-
- installKernel = kernel_install
- const envStr = env_info
+ env_info,
+ rpm_info,
+ script_info,
+ moniter_contrl,
+ monitor_info,
+ reclone_contrl,
+ app_name,
+ os,
+ vm,
+ need_reboot,
+ kernel_version,
+ kernel_install,
+ code_repo,
+ code_branch,
+ compile_branch,
+ cpu_arch,
+ commit_id,
+ kernel_packages,
+ build_config,
+ build_machine,
+ scripts,
+ kernel,
+ devel,
+ headers,
+ hotfix_install,
+ ...rest
+ }: any = envVal;
+
+ installKernel = kernel_install;
+ const envStr = env_info;
const build_pkg_info = {
- code_repo, code_branch, compile_branch, cpu_arch, commit_id,
- build_config, build_machine, scripts, ...rest
- }
-
- const kernel_info = { hotfix_install, scripts,
- kernel_packages: kernel_packages?.map((item: any)=> item?.trim()), // 去除输入内容两端空格
- }
-
- let scriptInfo = script_info
- let rpmInfo = rpm_info
+ code_repo,
+ code_branch,
+ compile_branch,
+ cpu_arch,
+ commit_id,
+ build_config,
+ build_machine,
+ scripts,
+ ...rest,
+ };
+
+ const kernel_info = {
+ hotfix_install,
+ scripts,
+ kernel_packages: kernel_packages?.map((item: any) => item?.trim()), // 去除输入内容两端空格
+ };
+
+ let scriptInfo = script_info;
+ let rpmInfo = rpm_info;
if (!need_reboot) {
- rpmInfo = rpmInfo ? rpmInfo.map((i: any) => ({ ...i, pos: 'before' })) : undefined
- scriptInfo = scriptInfo ? scriptInfo.map((i: any) => ({ ...i, pos: 'before' })) : undefined
+ rpmInfo = rpmInfo ? rpmInfo.map((i: any) => ({ ...i, pos: 'before' })) : undefined;
+ scriptInfo = scriptInfo
+ ? scriptInfo.map((i: any) => ({ ...i, pos: 'before' }))
+ : undefined;
}
const envProps: any = {
@@ -280,24 +336,26 @@ const TestJob: React.FC = (props) => {
moniter_contrl,
// monitor_info,
reclone_contrl,
- iclone_info: (os || app_name || vm) ? { os, app_name, vm } : undefined,
+ iclone_info: os || app_name || vm ? { os, app_name, vm } : undefined,
need_reboot,
kernel_version,
- }
+ };
- if (code_repo) envProps.build_pkg_info = build_pkg_info
- else envProps.kernel_info = kernel_info
+ if (code_repo) envProps.build_pkg_info = build_pkg_info;
+ else envProps.kernel_info = kernel_info;
- data = Object.assign(data, compact(envProps), { monitor_info })
+ data = Object.assign(data, compact(envProps), { monitor_info });
}
if (JSON.stringify(items.more) !== '{}') {
- const moreVal: any = result ? result.moreFormInfo : await goValidate(moreForm.current.form)
- const email = moreVal.email ? moreVal.email.replace(/\s/g, ',') : null
- data = Object.assign(data, compact({ ...moreVal, email }))
+ const moreVal: any = result
+ ? result.moreFormInfo
+ : await goValidate(moreForm.current.form);
+ const email = moreVal.email ? moreVal.email.replace(/\s/g, ',') : null;
+ data = Object.assign(data, compact({ ...moreVal, email }));
}
- const testConfigData = result ? result.new_test_config : test_config
+ const testConfigData = result ? result.new_test_config : test_config;
if (testConfigData.length > 0) {
const test_conf = testConfigData.map((item: any) => {
@@ -309,8 +367,8 @@ const TestJob: React.FC = (props) => {
priority,
cleanup_info,
run_mode,
- test_case_list: cases
- }: any = item
+ test_case_list: cases,
+ }: any = item;
return {
...compact({
test_suite,
@@ -342,20 +400,24 @@ const TestJob: React.FC = (props) => {
// },
is_instance,
custom_ip,
- custom_channel
- } = ctx
+ custom_channel,
+ } = ctx;
const envs: any = env_info?.filter((i: any) => {
- if (i.name && i.val) return i
- })
- const evnInfoStr = envs?.reduce((i: any, p: any, idx: number) => i.concat(`${idx ? '\n' : ''}${p.name?.trim()}=${p.val}`), '')
-
- let customer_server = undefined
+ if (i.name && i.val) return i;
+ });
+ const evnInfoStr = envs?.reduce(
+ (i: any, p: any, idx: number) =>
+ i.concat(`${idx ? '\n' : ''}${p.name?.trim()}=${p.val}`),
+ '',
+ );
+
+ let customer_server = undefined;
if (custom_channel && custom_ip) {
customer_server = {
custom_channel,
- custom_ip
- }
+ custom_ip,
+ };
}
// console.log(monitor_info)
@@ -378,183 +440,200 @@ const TestJob: React.FC = (props) => {
// ip,
// tag: tag && _.isArray(tag) ? tag.toString() : '',
// },
- customer_server
- })
- })
- }
- })
- data.test_config = test_conf
+ customer_server,
+ });
+ }),
+ };
+ });
+ data.test_config = test_conf;
}
- if (installKernel !== 'install_push')
- data.kernel_version = null
- const report_template = data.report_template
- delete data.report_template
- if ('report_name' in data && _.get(data, 'report_name')) data.report_template = report_template
- return data
- }
+ if (installKernel !== 'install_push') data.kernel_version = null;
+ const report_template = data.report_template;
+ delete data.report_template;
+ if ('report_name' in data && _.get(data, 'report_name'))
+ data.report_template = report_template;
+ return data;
+ };
const handleFormatChange = async (operateType: any = '') => {
- let parmas = {}
- const envVal = envForm && envForm.current ? await goValidate(envForm.current.form) : {}
- const server_provider = detail?.server_type
+ let parmas = {};
+ const envVal = envForm && envForm.current ? await goValidate(envForm.current.form) : {};
+ const server_provider = detail?.server_type;
// operateType !== 'template' && setIsloading(true)
- setIsloading(true)
+ setIsloading(true);
if (!isYamlFormat) {
- const formData = await transformDate()
- const dataCopy = _.cloneDeep(formData)
- const $test_config = _.get(dataCopy, 'test_config')
+ const formData = await transformDate();
+ const dataCopy = _.cloneDeep(formData);
+ const $test_config = _.get(dataCopy, 'test_config');
if (_.isArray($test_config)) {
$test_config.forEach((item: any) => {
- let cases = _.get(item, 'cases')
- const runMode = _.get(item, 'run_mode')
+ let cases = _.get(item, 'cases');
+ const runMode = _.get(item, 'run_mode');
if (_.isArray(cases)) {
cases = cases.map((obj: any) => {
- let server: AnyType = {}
- const objCopy = _.cloneDeep(obj)
- if (_.has(objCopy, 'server_object_id') && objCopy.server_object_id !== undefined) {
+ let server: AnyType = {};
+ const objCopy = _.cloneDeep(obj);
+ if (
+ _.has(objCopy, 'server_object_id') &&
+ objCopy.server_object_id !== undefined
+ ) {
// server = {}
- const is_instance = _.get(objCopy, 'is_instance')
- let key = 'id'
- if (is_instance === 0 && server_provider === 'aliyun') key = 'config'
- if (is_instance === 1 && server_provider === 'aliyun') key = 'instance'
- if (runMode === 'cluster') key = 'cluster'
- server[key] = _.get(objCopy, 'server_object_id')
+ const is_instance = _.get(objCopy, 'is_instance');
+ let key = 'id';
+ if (is_instance === 0 && server_provider === 'aliyun')
+ key = 'config';
+ if (is_instance === 1 && server_provider === 'aliyun')
+ key = 'instance';
+ if (runMode === 'cluster') key = 'cluster';
+ server[key] = _.get(objCopy, 'server_object_id');
}
- if (_.has(objCopy, 'server_tag_id') && objCopy.server_tag_id.length) server = { tag: _.get(objCopy, 'server_tag_id') }
+ if (_.has(objCopy, 'server_tag_id') && objCopy.server_tag_id.length)
+ server = { tag: _.get(objCopy, 'server_tag_id') };
if (_.get(objCopy, 'customer_server')) {
- const customServer = _.get(objCopy, 'customer_server')
- server = { channel_type: customServer.custom_channel, ip: customServer.custom_ip }
+ const customServer = _.get(objCopy, 'customer_server');
+ server = {
+ channel_type: customServer.custom_channel,
+ ip: customServer.custom_ip,
+ };
}
- if (server) obj.server = server
- delete obj.server_object_id
- delete obj.server_tag_id
- delete item.run_mode
- delete obj.is_instance
- delete obj.customer_server
- return obj
- })
- item.cases = cases
+ if (server) obj.server = server;
+ delete obj.server_object_id;
+ delete obj.server_tag_id;
+ delete item.run_mode;
+ delete obj.is_instance;
+ delete obj.customer_server;
+ return obj;
+ });
+ item.cases = cases;
}
- })
+ });
}
- dataCopy.test_config = $test_config
- delete dataCopy.moniter_contrl
- delete dataCopy.reclone_contrl
- if (!dataCopy.kernel_version) delete dataCopy.kernel_version
- parmas = { type: 'json2yaml', json_data: dataCopy, workspace: ws_id }
+ dataCopy.test_config = $test_config;
+ delete dataCopy.moniter_contrl;
+ delete dataCopy.reclone_contrl;
+ if (!dataCopy.kernel_version) delete dataCopy.kernel_version;
+ parmas = { type: 'json2yaml', json_data: dataCopy, workspace: ws_id };
}
- if (isYamlFormat) parmas = { type: 'yaml2json', yaml_data: jobInfo, workspace: ws_id }
+ if (isYamlFormat) parmas = { type: 'yaml2json', yaml_data: jobInfo, workspace: ws_id };
- const { code, msg, data } = await formatYamlToJson(parmas)
+ const { code, msg, data } = await formatYamlToJson(parmas);
// operateType !== 'template' && setIsloading(false)
- setIsloading(false)
- let result = {}
+ setIsloading(false);
+ let result = {};
if (code === 200) {
- if (!isYamlFormat) setJobInfo(data)
+ if (!isYamlFormat) setJobInfo(data);
if (isYamlFormat) {
- const dataCopy = _.cloneDeep(data)
- const { test_config: $suite_list } = data
+ const dataCopy = _.cloneDeep(data);
+ const { test_config: $suite_list } = data;
if (_.isArray($suite_list)) {
$suite_list.forEach((item: any) => {
- let cases = _.get(item, 'cases')
- item.run_mode = 'standalone'
+ let cases = _.get(item, 'cases');
+ item.run_mode = 'standalone';
if (_.isArray(cases)) {
cases = cases.map((obj: any) => {
- const server = _.get(obj, 'server')
+ const server = _.get(obj, 'server');
if (_.has(server, 'id')) {
- obj.server_object_id = _.get(server, 'id')
+ obj.server_object_id = _.get(server, 'id');
}
if (_.get(server, 'config')) {
- obj.server_object_id = _.get(server, 'config')
- obj.is_instance = 0
+ obj.server_object_id = _.get(server, 'config');
+ obj.is_instance = 0;
}
if (_.get(server, 'instance')) {
- obj.server_object_id = _.get(server, 'instance')
- obj.is_instance = 1
+ obj.server_object_id = _.get(server, 'instance');
+ obj.is_instance = 1;
}
if (_.get(server, 'cluster')) {
- obj.server_object_id = _.get(server, 'cluster')
- item.run_mode = 'cluster'
+ obj.server_object_id = _.get(server, 'cluster');
+ item.run_mode = 'cluster';
}
- if (_.get(server, 'tag') && _.get(server, 'tag').length) obj.server_tag_id = _.get(server, 'tag')
+ if (_.get(server, 'tag') && _.get(server, 'tag').length)
+ obj.server_tag_id = _.get(server, 'tag');
if (_.get(server, 'channel_type') && _.get(server, 'ip')) {
- obj.customer_server = { custom_channel: _.get(server, 'channel_type'), custom_ip: _.get(server, 'ip') }
- obj.ip = _.get(server, 'ip')
+ obj.customer_server = {
+ custom_channel: _.get(server, 'channel_type'),
+ custom_ip: _.get(server, 'ip'),
+ };
+ obj.ip = _.get(server, 'ip');
}
if (_.get(server, 'name')) {
- let ip = server.name
- if (_.isArray(ip)) ip = ip.join(',')
- obj.ip = ip
+ let ip = server.name;
+ if (_.isArray(ip)) ip = ip.join(',');
+ obj.ip = ip;
}
- delete obj.server
- return obj
- })
- item.cases = cases
+ delete obj.server;
+ return obj;
+ });
+ item.cases = cases;
}
- })
+ });
}
- dataCopy.test_config = $suite_list?.map((i: any) => ({ ...i, test_suite_id: i.test_suite, cases: i.cases.map((t: any) => ({ ...t, test_case_id: t.test_case })) }))
- dataCopy.moniter_contrl = false
- dataCopy.reclone_contrl = _.get(envVal, 'reclone_contrl') || false
- if (_.get(dataCopy, 'monitor_info')) dataCopy.moniter_contrl = true
+ dataCopy.test_config = $suite_list?.map((i: any) => ({
+ ...i,
+ test_suite_id: i.test_suite,
+ cases: i.cases.map((t: any) => ({ ...t, test_case_id: t.test_case })),
+ }));
+ dataCopy.moniter_contrl = false;
+ dataCopy.reclone_contrl = _.get(envVal, 'reclone_contrl') || false;
+ if (_.get(dataCopy, 'monitor_info')) dataCopy.moniter_contrl = true;
// 以下是表单值的同步
- result = getFormData(dataCopy)
+ result = getFormData(dataCopy);
}
if (operateType !== 'template' && operateType !== 'submit')
- setIsYamlFormat(!isYamlFormat)
+ setIsYamlFormat(!isYamlFormat);
} else {
- requestCodeMessage(code, msg)
+ requestCodeMessage(code, msg);
}
- return { code, result }
- }
+ return { code, result };
+ };
const handleServerChannel = (testConfig: any[]) => {
- const flag = location.search.indexOf('inheriting_machine') !== -1
+ const flag = location.search.indexOf('inheriting_machine') !== -1;
return testConfig.map((item: any) => {
- const cases = _.get(item, 'cases') || []
+ const cases = _.get(item, 'cases') || [];
item.cases = cases.map((ctx: any) => {
- const { customer_server, server_object_id } = ctx || {}
- const channel_type = _.get(customer_server, 'custom_channel')
- const ip = _.get(customer_server, 'custom_ip')
+ const { customer_server, server_object_id } = ctx || {};
+ const channel_type = _.get(customer_server, 'custom_channel');
+ const ip = _.get(customer_server, 'custom_ip');
if (channel_type && ip) {
ctx.server = {
ip,
- channel_type
- }
- delete ctx.customer_server
+ channel_type,
+ };
+ delete ctx.customer_server;
}
if (flag && server_object_id) {
- delete ctx.server_tag_id
+ delete ctx.server_tag_id;
}
- return ctx
- })
+ return ctx;
+ });
- return item
- })
- }
+ return item;
+ });
+ };
const handleSubmit = async () => {
- if (fetching) return
- setEnvErrorFlag(false)
- let formData = {}
- setFetching(true)
+ if (fetching) return;
+ setEnvErrorFlag(false);
+ let formData = {};
+ setFetching(true);
if (isYamlFormat) {
- const { code, result = {} } = await handleFormatChange('submit')
+ const { code, result = {} } = await handleFormatChange('submit');
if (code !== 200) {
- setFetching(false)
- return
+ setFetching(false);
+ return;
}
- formData = await transformDate(result)
+ formData = await transformDate(result);
}
- formData = await transformDate()
+ formData = await transformDate();
let data = {
...formData,
workspace: ws_id,
job_type: detail.id,
- }
+ };
if (name === 'TestTemplate') {
data = {
@@ -562,52 +641,61 @@ const TestJob: React.FC = (props) => {
data_from: 'template',
template_id: templateDatas.id,
job_type: detail.id,
- }
+ };
}
if (name === 'TestExport') {
data = {
...data,
data_from: 'rerun',
- job_id: jt_id
- }
+ job_id: jt_id,
+ };
}
if (isMonitorEmpty(data)) {
- setFetching(false)
- return message.warning(formatMessage({ id: 'ws.test.job.machine.cannot.be.empty' }))
+ setFetching(false);
+ return message.warning(formatMessage({ id: 'ws.test.job.machine.cannot.be.empty' }));
}
if (!data.test_config) {
- setFetching(false)
- return message.warning(formatMessage({ id: 'ws.test.job.suite.cannot.be.empty' }))
+ setFetching(false);
+ return message.warning(formatMessage({ id: 'ws.test.job.suite.cannot.be.empty' }));
}
// console.log(data.test_config)
- const $test_config = handleServerChannel(data.test_config)
- const { code, msg } = await createWsJobTest({ ...data, test_config: $test_config }).catch(()=> setFetching(false))
+ const $test_config = handleServerChannel(data.test_config);
+ const { code, msg } = await createWsJobTest({ ...data, test_config: $test_config }).catch(
+ () => setFetching(false),
+ );
if (code === 200) {
- setInitialState({ ...initialState, refreshMenu: !initialState?.refreshMenu })
- history.push(`/ws/${ws_id}/test_result`)
- message.success(formatMessage({ id: 'ws.test.job.operation.success' }))
+ setInitialState({ ...initialState, refreshMenu: !initialState?.refreshMenu });
+ history.push(`/ws/${ws_id}/test_result`);
+ message.success(formatMessage({ id: 'ws.test.job.operation.success' }));
} else if (code === 1380) {
- setEnvErrorFlag(true)
+ setEnvErrorFlag(true);
} else {
- requestCodeMessage(code, msg)
+ requestCodeMessage(code, msg);
}
- setFetching(false)
- }
+ setFetching(false);
+ };
const isMonitorEmpty = (data: any) => {
- let flag = false
+ let flag = false;
if (data && data.moniter_contrl) {
- const arrData = Array.isArray(data.monitor_info) ? data.monitor_info : []
- flag = arrData.some((item: any) => item && item.monitor_type === 'custom_machine' && !item.server)
+ const arrData = Array.isArray(data.monitor_info) ? data.monitor_info : [];
+ flag = arrData.some(
+ (item: any) => item && item.monitor_type === 'custom_machine' && !item.server,
+ );
}
- return flag
- }
+ return flag;
+ };
const getFormData = (dataCopy: any) => {
- const { template_name, description, enable,
- name, project, baseline,
+ const {
+ template_name,
+ description,
+ enable,
+ name,
+ project,
+ baseline,
monitor_info,
need_reboot,
rpm_info,
@@ -620,12 +708,19 @@ const TestJob: React.FC = (props) => {
reclone_contrl,
moniter_contrl,
test_config,
- cleanup_info, tags, notice_subject, report_name, callback_api, email, ding_token, report_template
- } = dataCopy
- const { os = '', app_name = '' } = iclone_info || {}
- const { branch, ...kernels } = kernel_info || {}
- const templateEditFormInfo = { template_name, description, enable }
- const basicFormInfo = { name, project, baseline }
+ cleanup_info,
+ tags,
+ notice_subject,
+ report_name,
+ callback_api,
+ email,
+ ding_token,
+ report_template,
+ } = dataCopy;
+ const { os = '', app_name = '' } = iclone_info || {};
+ const { branch, ...kernels } = kernel_info || {};
+ const templateEditFormInfo = { template_name, description, enable };
+ const basicFormInfo = { name, project, baseline };
const envFormInfo = {
monitor_info,
rpm_info,
@@ -638,10 +733,10 @@ const TestJob: React.FC = (props) => {
moniter_contrl,
kernel_version,
...kernels,
- ...build_pkg_info
- }
+ ...build_pkg_info,
+ };
- const testConfigInfo = test_config
+ const testConfigInfo = test_config;
const moreFormInfo = {
cleanup_info,
tags,
@@ -650,126 +745,132 @@ const TestJob: React.FC = (props) => {
ding_token,
report_template,
report_name,
- callback_api
- }
- templateEditForm.current?.setVal(templateEditFormInfo)
- basicForm.current?.setVal(basicFormInfo)
- envForm.current?.setVal({ ...envFormInfo, kernel_info, build_pkg_info })
- moreForm.current?.setVal(moreFormInfo)
- const new_test_config = suiteTable.current?.setVal(testConfigInfo) || []
- return { templateEditFormInfo, basicFormInfo, envFormInfo, moreFormInfo, new_test_config }
- }
+ callback_api,
+ };
+ templateEditForm.current?.setVal(templateEditFormInfo);
+ basicForm.current?.setVal(basicFormInfo);
+ envForm.current?.setVal({ ...envFormInfo, kernel_info, build_pkg_info });
+ moreForm.current?.setVal(moreFormInfo);
+ const new_test_config = suiteTable.current?.setVal(testConfigInfo) || [];
+ return { templateEditFormInfo, basicFormInfo, envFormInfo, moreFormInfo, new_test_config };
+ };
const handleSaveTemplateOk = async (vals: any) => {
- if (fetching) return false
- setFetching(true)
- let data = await transformDate()
+ if (fetching) return false;
+ setFetching(true);
+ let data = await transformDate();
if (isMonitorEmpty(data)) {
- setFetching(false)
- return message.warning(formatMessage({ id: 'ws.test.job.machine.cannot.be.empty' }))
+ setFetching(false);
+ return message.warning(formatMessage({ id: 'ws.test.job.machine.cannot.be.empty' }));
}
if (!data.test_config) {
- setFetching(false)
- return message.warning(formatMessage({ id: 'ws.test.job.suite.cannot.be.empty' }))
+ setFetching(false);
+ return message.warning(formatMessage({ id: 'ws.test.job.suite.cannot.be.empty' }));
}
data = {
workspace: ws_id,
...data,
- job_type: detail.id
- }
- const $test_config = handleServerChannel(data.test_config)
- const { code, msg } = await saveTestTemplate({ ...data, test_config: $test_config, ...vals }).catch(()=> setFetching(false))
+ job_type: detail.id,
+ };
+ const $test_config = handleServerChannel(data.test_config);
+ const { code, msg } = await saveTestTemplate({
+ ...data,
+ test_config: $test_config,
+ ...vals,
+ }).catch(() => setFetching(false));
if (code === 200) {
- message.success(formatMessage({ id: 'ws.test.job.operation.success' }))
- saveTemplateDrawer.current.hide()
- templatePopoverRefresh()
- setInitialState({ ...initialState, refreshMenu: !initialState?.refreshMenu })
- }
- else
- requestCodeMessage(code, msg)
- setFetching(false)
- }
+ message.success(formatMessage({ id: 'ws.test.job.operation.success' }));
+ saveTemplateDrawer.current.hide();
+ templatePopoverRefresh();
+ setInitialState({ ...initialState, refreshMenu: !initialState?.refreshMenu });
+ } else requestCodeMessage(code, msg);
+ setFetching(false);
+ };
const handleOpenTemplate = async () => {
- let resultData = {}
+ let resultData = {};
if (isYamlFormat) {
- const { code, result } = await handleFormatChange('template')
- resultData = result
- if (code !== 200) return
+ const { code, result } = await handleFormatChange('template');
+ resultData = result;
+ if (code !== 200) return;
}
- const data = isYamlFormat ? await transformDate(resultData) : await transformDate()
- if (isMonitorEmpty(data)) return message.warning(formatMessage({ id: 'ws.test.job.machine.cannot.be.empty' }))
- if (!data.test_config) return message.warning(formatMessage({ id: 'ws.test.job.suite.cannot.be.empty' }))
- if (name === 'TestJob' || name === 'TestExport')
- saveTemplateDrawer.current.show()
- else
- handleSaveTemplateOk({})
- }
+ const data = isYamlFormat ? await transformDate(resultData) : await transformDate();
+ if (isMonitorEmpty(data))
+ return message.warning(formatMessage({ id: 'ws.test.job.machine.cannot.be.empty' }));
+ if (!data.test_config)
+ return message.warning(formatMessage({ id: 'ws.test.job.suite.cannot.be.empty' }));
+ if (name === 'TestJob' || name === 'TestExport') saveTemplateDrawer.current.show();
+ else handleSaveTemplateOk({});
+ };
const handleChangeTemplateName = ({ target }: any) => {
- requestTemplateRun({ ws_id, job_type_id: detail.id, name: target.value })
- }
+ requestTemplateRun({ ws_id, job_type_id: detail.id, name: target.value });
+ };
const handleTemplateEditFunction = async (data: any) => {
- const $test_config = handleServerChannel(data.test_config)
+ const $test_config = handleServerChannel(data.test_config);
const { code, msg } = await updateTestTemplate({
template_id: templateDatas.id,
workspace: ws_id,
job_type: detail.id,
...data,
- test_config: $test_config
- })
- notification.destroy()
+ test_config: $test_config,
+ });
+ notification.destroy();
if (code === 200) {
- const { data: [datas] } = await queryTestTemplateData({ template_id: templateDatas.id })
- setTemplateDatas(datas)
- setModifyTemplate(false)
- setDisabled(true)
- setTemplateEnable(data.enable)
- message.success(formatMessage({ id: 'operation.success' }))
+ const {
+ data: [datas],
+ } = await queryTestTemplateData({ template_id: templateDatas.id });
+ setTemplateDatas(datas);
+ setModifyTemplate(false);
+ setDisabled(true);
+ setTemplateEnable(data.enable);
+ message.success(formatMessage({ id: 'operation.success' }));
if (name !== 'TemplatePreview')
- history.push({ pathname: `/ws/${ws_id}/job/templates`, state: state || {} })
- }
- else
- requestCodeMessage(code, msg)
- setFetching(false)
- }
+ history.push({ pathname: `/ws/${ws_id}/job/templates`, state: state || {} });
+ } else requestCodeMessage(code, msg);
+ setFetching(false);
+ };
const handleCancelTemplate = (key: any) => {
- notification.close(key)
+ notification.close(key);
// setFetching(false)
// history.push({ pathname: `/ws/${ws_id}/job/templates`, state: state || {} })
- }
+ };
const handleSaveTemplateModify = async () => {
- if (fetching) return
- setFetching(true)
- const data = await transformDate()
+ if (fetching) return;
+ setFetching(true);
+ const data = await transformDate();
if (isMonitorEmpty(data)) {
- setFetching(false)
- return message.warning(formatMessage({ id: 'ws.test.job.machine.cannot.be.empty' }))
+ setFetching(false);
+ return message.warning(formatMessage({ id: 'ws.test.job.machine.cannot.be.empty' }));
}
if (!data.test_config) {
- setFetching(false)
- message.warning(formatMessage({ id: 'ws.test.job.suite.cannot.be.empty' }))
- return
+ setFetching(false);
+ message.warning(formatMessage({ id: 'ws.test.job.suite.cannot.be.empty' }));
+ return;
}
if (!data.baseline) {
- data.baseline = null
+ data.baseline = null;
}
if (!data.baseline_job_id) {
- data.baseline_job_id = null
+ data.baseline_job_id = null;
}
if (!data.cleanup_info) {
- data.cleanup_info = ""
+ data.cleanup_info = '';
}
- if (Object.prototype.toString.call(data) === "[object Object]") {
+ if (Object.prototype.toString.call(data) === '[object Object]') {
const key = `open${Date.now()}`;
const btn = (
-
);
- const res = await queryCheckJobTemplate({ template_id: jt_id })
+ const res = await queryCheckJobTemplate({ template_id: jt_id });
if (res.code === 200 && res.data.length > 0) {
notification.warning({
duration: null,
@@ -787,202 +888,269 @@ const TestJob: React.FC = (props) => {
key,
});
} else {
- handleTemplateEditFunction(data)
+ handleTemplateEditFunction(data);
}
}
- setFetching(false)
- }
+ setFetching(false);
+ };
const handleSaveCreateSubmit = async () => {
- if (newSaveLoading) return
- setNewSaveLoading(true)
+ if (newSaveLoading) return;
+ setNewSaveLoading(true);
- const data = await transformDate()
+ const data = await transformDate();
if (isMonitorEmpty(data)) {
- setNewSaveLoading(false)
- return message.warning(formatMessage({ id: 'ws.test.job.machine.cannot.be.empty' }))
+ setNewSaveLoading(false);
+ return message.warning(formatMessage({ id: 'ws.test.job.machine.cannot.be.empty' }));
}
if (!data.test_config) {
- setNewSaveLoading(false)
- return message.warning(formatMessage({ id: 'ws.test.job.suite.cannot.be.empty' }))
+ setNewSaveLoading(false);
+ return message.warning(formatMessage({ id: 'ws.test.job.suite.cannot.be.empty' }));
}
if (!data.baseline) {
- data.baseline = null
+ data.baseline = null;
}
- const $test_config = handleServerChannel(data.test_config)
+ const $test_config = handleServerChannel(data.test_config);
const { code, msg } = await updateTestTemplate({
template_id: templateDatas.id,
workspace: ws_id,
job_type: detail.id,
...data,
- test_config: $test_config
- })
+ test_config: $test_config,
+ });
if (code === 200) {
- message.success(formatMessage({ id: 'request.save.success' }))
- history.push(`/ws/${ws_id}/test_job/${detail.id}?template_id=${templateDatas.id}`)
- }
- else requestCodeMessage(code, msg)
- setNewSaveLoading(false)
- }
+ message.success(formatMessage({ id: 'request.save.success' }));
+ history.push(`/ws/${ws_id}/test_job/${detail.id}?template_id=${templateDatas.id}`);
+ } else requestCodeMessage(code, msg);
+ setNewSaveLoading(false);
+ };
const handleTemplatePopoverChange = (v: any) => {
- setTemplateBtnVisible(v)
- }
+ setTemplateBtnVisible(v);
+ };
const modalProps = {
- disabled, ws_id,
+ disabled,
+ ws_id,
template: templateDatas,
test_type: detail?.test_type,
business_type: detail?.business_type || '',
server_provider: detail?.server_type,
server_type: detail?.server_type,
- }
+ };
const bodyPaddding = useMemo(() => {
- if (layoutWidth >= 1240) return (1240 - 1000) / 2
- return 20
- }, [layoutWidth])
+ if (layoutWidth >= 1240) return (1240 - 1000) / 2;
+ return 20;
+ }, [layoutWidth]);
- const bodySize = useSize(bodyRef)
+ const bodySize = useSize(bodyRef);
const layoutCss = useMemo(() => {
- const defaultCss = { minHeight: layoutHeight, overflow: 'auto', background: "#f5f5f5" }
- return hasNav ? { ...defaultCss, paddingTop: 50 } : defaultCss
- }, [layoutHeight, hasNav])
+ const defaultCss = { minHeight: layoutHeight, overflow: 'auto', background: '#f5f5f5' };
+ return hasNav ? { ...defaultCss, paddingTop: 50 } : defaultCss;
+ }, [layoutHeight, hasNav]);
const handleTestYaml = async () => {
- const parmas = { yaml_data: jobInfo, workspace: ws_id }
- const { code, msg } = await testYaml(parmas)
- if (code !== 200)
- requestCodeMessage(code, msg)
- else
- message.success(formatMessage({ id: 'operation.success' }))
- }
+ const parmas = { yaml_data: jobInfo, workspace: ws_id };
+ const { code, msg } = await testYaml(parmas);
+ if (code !== 200) requestCodeMessage(code, msg);
+ else message.success(formatMessage({ id: 'operation.success' }));
+ };
const handleClose = () => {
- setIsYamlFormat(false)
- setJobInfo('')
- }
+ setIsYamlFormat(false);
+ setJobInfo('');
+ };
const fakeClick = (obj: any) => {
- const ev = document.createEvent("MouseEvents");
- ev.initMouseEvent("click", true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+ const ev = document.createEvent('MouseEvents');
+ ev.initMouseEvent(
+ 'click',
+ true,
+ false,
+ window,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ false,
+ false,
+ false,
+ false,
+ 0,
+ null,
+ );
obj.dispatchEvent(ev);
- }
+ };
const exportRaw = ($name: string, data: any) => {
const urlObject = window.URL || window.webkitURL || window;
const export_blob = new Blob([data]);
- const save_link: any = document.createElementNS("http://www.w3.org/1999/xhtml", "a")
+ const save_link: any = document.createElementNS('http://www.w3.org/1999/xhtml', 'a');
save_link.href = urlObject.createObjectURL(export_blob);
save_link.download = $name;
fakeClick(save_link);
- }
+ };
const handleDownload = async () => {
// const parmas = { type: 'yaml2json', yaml_data: jobInfo }
// let { code, data } = await formatYamlToJson(parmas)
- const fileName = 'job_' + (+new Date())
+ const fileName = 'job_' + +new Date();
// if (code === 200 && _.get(data, 'name')) fileName = _.get(data, 'name')
exportRaw(`${fileName}.yaml`, jobInfo);
- }
+ };
const queryProjectId = (id: any) => {
- setProjectId(id)
- }
+ setProjectId(id);
+ };
const renderButton = (
<>
- {templateEnabel && }
-
+ {templateEnabel && (
+
+ )}
+
- )
+ );
return (
- 
+
-
+
+
+
-
+
+
+
+ )}
+ {name === 'TemplatePreview' && (
+
+
+ )}
+ {name === 'TemplateEdit' && (
+
+
+ )}
- {
- name === 'TemplatePreview' &&
+ {name === 'TemplatePreview' && (
- {
- modifyTemplate &&
+ {modifyTemplate && (
<>
{renderButton}
- }
- {
- !modifyTemplate &&
+ )}
+ {!modifyTemplate && (
<>
-
- AccessTootip()}> AccessTootip()}>
+
- }
+ )}
- }
- {
- name === 'TemplateEdit' &&
-
- {renderButton}
-
- }
+ )}
+ {name === 'TemplateEdit' && {renderButton} }
- }
+ )}
-
+
+ ) : null}
- {
- hasNav &&
+ {hasNav && (
+
+ {
- if (name === 'JobTypePreview') history.push(`/ws/${ws_id}/job/types`)
- else {
- /* @ts-ignore */
- history.push(access.IsWsSetting() ? { pathname: `/ws/${ws_id}/job/templates`, state: state || {} } : "./")
- }
+ style={{
+ height: 50,
+ width: 50,
+ cursor: 'pointer',
+ display: 'flex',
+ justifyContent: 'center',
+ alignItems: 'center',
+ }}
+ onClick={() => {
+ if (name === 'JobTypePreview')
+ history.push(`/ws/${ws_id}/job/types`);
+ else {
+ /* @ts-ignore */
+ history.push(
+ access.IsWsSetting()
+ ? {
+ pathname: `/ws/${ws_id}/job/templates`,
+ state: state || {},
+ }
+ : './',
+ );
}
- }
+ }}
>
- {name === 'JobTypePreview' &&
-
-
-
+
+
+
{detail.name}
- {
- (name === 'TestJob' && !loading) &&
+ {name === 'TestJob' && !loading && (
= (props) => {
autoComplete="off"
prefix={
- }
+ )}
- {
- detail.server_type &&
-
- {detail.test_type === 'business' ?
-
- ({ basic: {}, pipline: {}, touch: {} })
- const [template, setTemplate] = useState(null)
- const [successData, setSuccessData] = useState(null)
+ const [dataSource, setDataSource] = useState({ basic: {}, pipline: {}, touch: {} });
+ const [template, setTemplate] = useState(null);
+ const [successData, setSuccessData] = useState(null);
// 查询
const getEditTestPlanData = async () => {
- const { data, code } = await queryTestPlanDetails({ ws_id, id: plan_id })
+ const { data, code } = await queryTestPlanDetails({ ws_id, id: plan_id });
if (code === 200) {
- setTemplate(data)
+ setTemplate(data);
// setSuccessData( data )
- setLoading(false)
+ setLoading(false);
}
- }
+ };
useEffect(() => {
- const { name } = route
- if (name !== 'Create')
- getEditTestPlanData()
- }, [route])
+ const { name } = route;
+ if (name !== 'Create') getEditTestPlanData();
+ }, [route]);
const handleStepPre = () => {
- setCurrent(current - 1)
- }
+ setCurrent(current - 1);
+ };
// 校验数据
const checkDataSource = () => {
return new Promise((resolve: any, reject: any) => {
- const pipline = dataSource.pipline
- const { env_prep = {}, test_config = [] } = pipline || {}
- const localStr = formatMessage({ id: 'plan.cannot.be.empty' })
+ const pipline = dataSource.pipline;
+ const { env_prep = {}, test_config = [] } = pipline || {};
+ const localStr = formatMessage({ id: 'plan.cannot.be.empty' });
if (env_prep.machine_info && !env_prep.machine_info.length) {
- message.error(`${env_prep.name}${localStr}`)
- reject()
+ message.error(`${env_prep.name}${localStr}`);
+ reject();
}
if (test_config.length) {
test_config.forEach((item: any) => {
- const { name, template: $template = [] } = item
+ const { name, template: $template = [] } = item;
if (!$template.length) {
- message.error(`${name}${localStr}`)
- reject()
+ message.error(`${name}${localStr}`);
+ reject();
}
- })
+ });
} else {
- message.error(`${env_prep.name}${localStr}`)
- reject()
+ message.error(`${env_prep.name}${localStr}`);
+ reject();
}
- resolve()
- })
- }
+ resolve();
+ });
+ };
const hanleStepNext = async (stepKey: any) => {
- if (pedding) return
- setPedding(true)
+ if (pedding) return;
+ setPedding(true);
try {
if (current === 0) {
- const basicFormValue = await basicSettingRef.current.validate()
- const { headers, devel, hotfix_install, scripts, kernel, build_config, build_machine, code_branch, code_repo,
- commit_id, compile_branch, cpu_arch, product_name, ...formValue
- } = basicFormValue
+ const basicFormValue = await basicSettingRef.current.validate();
+ const {
+ headers,
+ devel,
+ hotfix_install,
+ scripts,
+ kernel,
+ build_config,
+ build_machine,
+ code_branch,
+ code_repo,
+ commit_id,
+ compile_branch,
+ cpu_arch,
+ product_name,
+ ...formValue
+ } = basicFormValue;
setDataSource({
...dataSource,
basic: {
...formValue,
kernel_info: { headers, devel, hotfix_install, kernel, scripts },
build_pkg_info: {
- build_config, build_machine, code_branch, code_repo,
- commit_id, compile_branch, cpu_arch, name: product_name
- }
- }
- })
+ build_config,
+ build_machine,
+ code_branch,
+ code_repo,
+ commit_id,
+ compile_branch,
+ cpu_arch,
+ name: product_name,
+ },
+ },
+ });
}
if (current === 1) {
// 校验各阶段都添加了模版，才能跳到下一步
- await checkDataSource()
+ await checkDataSource();
} else if (current === 2) {
// 校验表单必填项填写了没有
- await reportSettingRef.current.validate()
+ await reportSettingRef.current.validate();
}
// 编辑时通过校验后，可随意跳步骤。
- (route.name === 'Edit' && stepKey !== 'NextStep') ? setCurrent(stepKey) : setCurrent(current + 1)
- }
- catch (err) {
- console.log(err, 8888)
+ route.name === 'Edit' && stepKey !== 'NextStep'
+ ? setCurrent(stepKey)
+ : setCurrent(current + 1);
+ } catch (err) {
+ console.log(err, 8888);
}
- setPedding(false)
- }
+ setPedding(false);
+ };
const handleStepChange = async (key: number) => {
if (key > current) {
- await hanleStepNext(key)
- }
- else setCurrent(key)
- }
+ await hanleStepNext(key);
+ } else setCurrent(key);
+ };
const hanldePrepDataChange = ({ test_config, env_prep }: any) => {
setDataSource({
@@ -147,310 +175,427 @@ const TestPlan = (props: any) => {
pipline: {
env_prep: env_prep.visible ? env_prep : {},
test_config: test_config.map((i: any) => {
- return { ...i, template: i.template.map((t: any) => t.id) }
- })
+ return { ...i, template: i.template.map((t: any) => t.id) };
+ }),
},
- })
+ });
// 将步骤2产生的数据，传给步骤3中
reportSettingRef.current.refreshData(test_config);
- }
+ };
const trhowErrorMsg = (err: any) => {
if (err) {
- const { errorFields } = err
+ const { errorFields } = err;
if (errorFields && _.isArray(errorFields) && errorFields.length > 0) {
- const { errors } = errorFields[0]
- message.error(errors.toString())
+ const { errors } = errorFields[0];
+ message.error(errors.toString());
}
}
- }
+ };
const formatterData = async () => {
- const basic = await basicSettingRef.current.validate()
- const report = await reportSettingRef.current.validate()
- const touch = await touchSettingRef.current.validate()
- const pipline = dataSource.pipline
+ const basic = await basicSettingRef.current.validate();
+ const report = await reportSettingRef.current.validate();
+ const touch = await touchSettingRef.current.validate();
+ const pipline = dataSource.pipline;
const {
- headers, devel, hotfix_install, scripts, kernel, build_config,
- build_machine, code_branch, code_repo, kernel_packages,
- commit_id, compile_branch, cpu_arch, product_name, ...formValue
+ headers,
+ devel,
+ hotfix_install,
+ scripts,
+ kernel,
+ build_config,
+ build_machine,
+ code_branch,
+ code_repo,
+ kernel_packages,
+ commit_id,
+ compile_branch,
+ cpu_arch,
+ product_name,
+ ...formValue
} = basic;
const { base_group_job, base_group_stage, ...reportOther } = report;
// *根据“分组方式”区分“选择基准组”字段的表单值的来源。
- const { group_method } = report
- let reportValues = { ...reportOther }
- if (group_method === "job") {
- const [stage_id, base_group] = base_group_job
- reportValues = Object.assign(reportValues, { stage_id, base_group })
+ const { group_method } = report;
+ let reportValues = { ...reportOther };
+ if (group_method === 'job') {
+ const [stage_id, base_group] = base_group_job;
+ reportValues = Object.assign(reportValues, { stage_id, base_group });
}
- if (group_method === "stage")
- reportValues = Object.assign(reportValues, { base_group: base_group_stage })
+ if (group_method === 'stage')
+ reportValues = Object.assign(reportValues, { base_group: base_group_stage });
return {
...formValue,
kernel_info: { headers, devel, hotfix_install, scripts, kernel, kernel_packages },
build_pkg_info: {
- build_config, build_machine, code_branch, code_repo,
- commit_id, compile_branch, cpu_arch, name: product_name
+ build_config,
+ build_machine,
+ code_branch,
+ code_repo,
+ commit_id,
+ compile_branch,
+ cpu_arch,
+ name: product_name,
},
...reportValues,
...touch,
cron_info: touch?.cron_info ?? dataSource?.cron_info,
- ...pipline
- }
- }
+ ...pipline,
+ };
+ };
const hanldePushTestPlan = async () => {
- if (pedding) return
- setPedding(true)
- const formData = await formatterData()
- const { code, msg, data } = await creatTestPlan({ ...formData, ws_id })
+ if (pedding) return;
+ setPedding(true);
+ const formData = await formatterData();
+ const { code, msg, data } = await creatTestPlan({ ...formData, ws_id });
if (code !== 200) {
- requestCodeMessage(code, msg)
- setPedding(false)
- return
+ requestCodeMessage(code, msg);
+ setPedding(false);
+ return;
}
- setSuccessData(data)
- setIsFormStep(false)
- }
+ setSuccessData(data);
+ setIsFormStep(false);
+ };
const handleTestPlanOption = async (is_save: boolean = false) => {
- if (pedding) return
- setPedding(true)
+ if (pedding) return;
+ setPedding(true);
try {
- const formData = await formatterData()
- const { code, msg } = await runningTestPlan({ ...formData, is_save, ws_id, plan_id })
+ const formData = await formatterData();
+ const { code, msg } = await runningTestPlan({ ...formData, is_save, ws_id, plan_id });
if (code !== 200) {
- requestCodeMessage(code, msg)
- setPedding(false)
+ requestCodeMessage(code, msg);
+ setPedding(false);
return;
}
- history.push(`/ws/${ws_id}/test_plan?${stringify(state)}`)
- }
- catch (err) {
- console.log(err)
- setPedding(false)
- trhowErrorMsg(err)
+ history.push(`/ws/${ws_id}/test_plan?${stringify(state)}`);
+ } catch (err) {
+ console.log(err);
+ setPedding(false);
+ trhowErrorMsg(err);
}
- }
+ };
- const handleBackPlanManage = () => history.push(`/ws/${ws_id}/test_plan?${stringify(state)}`)
+ const handleBackPlanManage = () => history.push(`/ws/${ws_id}/test_plan?${stringify(state)}`);
const hanldeUpdatePlan = async () => {
- if (pedding) return
- setPedding(true)
+ if (pedding) return;
+ setPedding(true);
try {
- const formData = await formatterData()
- const { code, msg } = await updateTestPlan({ ...formData, ws_id, plan_id })
+ const formData = await formatterData();
+ const { code, msg } = await updateTestPlan({ ...formData, ws_id, plan_id });
if (code !== 200) {
- requestCodeMessage(code, msg)
- setPedding(false)
+ requestCodeMessage(code, msg);
+ setPedding(false);
return;
}
- history.push(`/ws/${ws_id}/test_plan?${stringify(state)}`)
+ history.push(`/ws/${ws_id}/test_plan?${stringify(state)}`);
+ } catch (err) {
+ console.log(err);
+ setPedding(false);
+ trhowErrorMsg(err);
}
- catch (err) {
- console.log(err)
- setPedding(false)
- trhowErrorMsg(err)
- }
- }
-
+ };
return (
-
+
+
-
+
-
-
+
- {
- isFormStep ?
- <>
- {/* 左侧 步骤 === 进度显示部分 ==== onChange={setCurrent} */}
-
-
-
-
-
- {/* 右侧 导航 === 操作部分 ==== */}
-
-
-
- {
- route.name === 'Run' &&
- <>
-
-
- AccessTootip()} type="primary">
+
+
+
+
+ {/* 右侧 导航 === 操作部分 ==== */}
+
+
+
+ {route.name === 'Run' && (
+ <>
+
+
+ AccessTootip()}
+ type="primary"
+ >
+
+
-
- }
- {
- route.name === 'Edit' &&
- <>
-
-
- AccessTootip()}>
+
+ )}
+ {route.name === 'Edit' && (
+ <>
+
+
+ AccessTootip()}
+ >
+
+
-
- }
-
+
+ )}
+
+
+
+ {/* 右侧 === 表单部分 === */}
+
+
-
-
- :
-
+
+ ) : (
+
- )
-}
+ );
+};
-export default TestPlan
+export default TestPlan;
diff --git a/src/pages/WorkSpace/TestPlan/PlanView/ViewDetail/index.tsx b/src/pages/WorkSpace/TestPlan/PlanView/ViewDetail/index.tsx
index 46a53d700cbfbcb4425a1c69d479deee8418f06e..36c4f5f4aa9e11a074f7e3a63c98375040a1e3b2 100644
--- a/src/pages/WorkSpace/TestPlan/PlanView/ViewDetail/index.tsx
+++ b/src/pages/WorkSpace/TestPlan/PlanView/ViewDetail/index.tsx
@@ -1,154 +1,161 @@
/* eslint-disable react-hooks/exhaustive-deps */
-import { useState, useEffect, useCallback, useRef } from 'react'
-import { Breadcrumb, Typography, Row, Tag, Button, Spin, Popover } from 'antd'
+import { useState, useEffect, useCallback, useRef } from 'react';
+import { Breadcrumb, Typography, Row, Tag, Button, Spin, Popover } from 'antd';
import { QuestionCircleOutlined } from '@ant-design/icons';
-import styled from 'styled-components'
-import { FormattedMessage, history } from 'umi'
-import { useClientSize, writeDocumentTitle } from '@/utils/hooks'
-import BasicInfoDrawer from './components/BasicInfoDrawer'
-import PipLine from './components/PipLine'
-import ConsoleDrawer from './components/ConsoleDrawer'
-import { queryPlanResultDetail } from './services'
-import { requestCodeMessage } from '@/utils/utils'
-import ViewReport from '@/pages/WorkSpace/TestResult/CompareBar/ViewReport'
+import styled from 'styled-components';
+import { FormattedMessage, history } from 'umi';
+import { useClientSize, DocTitleWrite } from '@/utils/hooks';
+import BasicInfoDrawer from './components/BasicInfoDrawer';
+import PipLine from './components/PipLine';
+import ConsoleDrawer from './components/ConsoleDrawer';
+import { queryPlanResultDetail } from './services';
+import { requestCodeMessage } from '@/utils/utils';
+import ViewReport from '@/pages/WorkSpace/TestResult/CompareBar/ViewReport';
interface ContainerProps {
width: number;
height: number;
}
const SummaryContainer = styled.div`
- width:${props => props.width}px;
- height:${props => props.height}px;
+ width: ${(props) => props.width}px;
+ height: ${(props) => props.height}px;
/* overflow:auto; */
background: #f5f5f5;
-`
+`;
const SummaryHeader = styled.div`
height: 150px;
- width:100%;
- background:#fff;
+ width: 100%;
+ background: #fff;
padding: 20px 20px 12px;
-`
+`;
const SummaryBody = styled.div`
margin-top: 10px;
width: 100%;
- height: calc( 100% - 100px - 20px - 40px);
- background:#fff;
+ height: calc(100% - 100px - 20px - 40px);
+ background: #fff;
overflow: auto;
padding: 29px 20px 20px 20px;
display: flex;
-`
+`;
const LinkSpan = styled.span`
- cursor:pointer;
+ cursor: pointer;
&:hover {
- color : #1890FF;
+ color: #1890ff;
}
-`
+`;
const ViewDetail = (props: any) => {
- const { ws_id, plan_id } = props.match.params
- const { route } = props
-
- writeDocumentTitle(`Workspace.TestPlan.${route.name}`)
+ const { ws_id, plan_id } = props.match.params;
+ const { route } = props;
- const { height: layoutHeight, width: layoutWidth } = useClientSize()
+ const { height: layoutHeight, width: layoutWidth } = useClientSize();
- const [loading, setLoading] = useState(false)
- const [dataSet, setDataSet] = useState({})
+ const [loading, setLoading] = useState(false);
+ const [dataSet, setDataSet] = useState({});
//
- const basicInfoRef: any = useRef(null)
- const consoleRef: any = useRef(null)
-
+ const basicInfoRef: any = useRef(null);
+ const consoleRef: any = useRef(null);
// 1.查询step数据
const getDetailData = async (query: any) => {
try {
- setLoading(true)
- const res = await queryPlanResultDetail(query) || {}
- const { data = {} } = res
+ setLoading(true);
+ const res = (await queryPlanResultDetail(query)) || {};
+ const { data = {} } = res;
// mock
// setDataSet(mockData2.data)
if (res.code === 200) {
- setDataSet(data)
+ setDataSet(data);
} else {
- requestCodeMessage(res.code, res.msg)
+ requestCodeMessage(res.code, res.msg);
}
- setLoading(false)
+ setLoading(false);
} catch (e) {
- setLoading(false)
+ setLoading(false);
}
- }
+ };
useEffect(() => {
if (plan_id) {
- getDetailData({ ws_id, plan_instance_id: plan_id })
+ getDetailData({ ws_id, plan_instance_id: plan_id });
}
- }, [plan_id])
+ }, [plan_id]);
const TagInfo = ({ data }: any) => {
- const { state, start_time, end_time, error_info } = data
- const rowStyle = { display: 'flex', alignItems: 'center' }
- const normalStyle = { background: '#F2F4F6', border: '1px solid #F2F4F6' }
+ const { state, start_time, end_time, error_info } = data;
+ const rowStyle = { display: 'flex', alignItems: 'center' };
+ const normalStyle = { background: '#F2F4F6', border: '1px solid #F2F4F6' };
return (
+
+
- history.push(`/ws/${ws_id}/test_plan/view`)}>
+ history.push(`/ws/${ws_id}/test_plan/view`)}
+ >
@@ -157,12 +164,25 @@ const ViewDetail = (props: any) => {
- {dataSet.name}
+
+ {dataSet.name}
+
@@ -174,7 +194,7 @@ const ViewDetail = (props: any) => {
- )
-}
+ );
+};
-export default ViewDetail
+export default ViewDetail;
diff --git a/src/pages/WorkSpace/TestPlan/PlanView/ViewSummary/index.tsx b/src/pages/WorkSpace/TestPlan/PlanView/ViewSummary/index.tsx
index e641f106c85d0e4793e246d1b275dcab11341f4f..36de7d2a996031d6e86f4a6c8c70fb046ac1b398 100644
--- a/src/pages/WorkSpace/TestPlan/PlanView/ViewSummary/index.tsx
+++ b/src/pages/WorkSpace/TestPlan/PlanView/ViewSummary/index.tsx
@@ -1,73 +1,71 @@
/* eslint-disable react-hooks/exhaustive-deps */
-import { Breadcrumb, Row, Typography } from 'antd'
-import { useState, useEffect } from 'react'
-import styled from 'styled-components'
-import { FormattedMessage, history } from 'umi'
-import { RenderDataRow } from '../components'
-import ViewTable from '../components/ViewTable'
-import { useClientSize, writeDocumentTitle } from '@/utils/hooks'
-import { requestCodeMessage } from '@/utils/utils'
-import { queryPlanViewList } from '@/pages/WorkSpace/TestPlan/PlanView/services'
+import { Breadcrumb, Row, Typography } from 'antd';
+import { useState, useEffect } from 'react';
+import styled from 'styled-components';
+import { FormattedMessage, history } from 'umi';
+import { RenderDataRow } from '../components';
+import ViewTable from '../components/ViewTable';
+import { useClientSize, DocTitleWrite } from '@/utils/hooks';
+import { requestCodeMessage } from '@/utils/utils';
+import { queryPlanViewList } from '@/pages/WorkSpace/TestPlan/PlanView/services';
interface ContainerProps {
- width: number
- height: number
+ width: number;
+ height: number;
}
const DetailContainer = styled.div`
- width:${props => props.width}px;
- min-height:${props => props.height}px;
- overflow:auto;
+ width: ${(props) => props.width}px;
+ min-height: ${(props) => props.height}px;
+ overflow: auto;
background-color: #f5f5f5;
- min-height:100%;
-`
+ min-height: 100%;
+`;
const DetailHeader = styled.div`
// height:182px;
- width:100%;
- background:#fff;
- padding:20px;
-`
+ width: 100%;
+ background: #fff;
+ padding: 20px;
+`;
const DescriptionRow = styled(Row)`
- margin-top:8px;
-`
+ margin-top: 8px;
+`;
const DetailBody = styled.div`
- background:#fff;
- padding:20px;
- margin-top:10px;
-`
+ background: #fff;
+ padding: 20px;
+ margin-top: 10px;
+`;
const LinkSpan = styled.span`
- cursor:pointer;
+ cursor: pointer;
&:hover {
- color : #1890FF;
+ color: #1890ff;
}
-`
+`;
const ViewDetail = (props: any) => {
- const { route, match } = props
- const { plan_id, ws_id } = match.params
- const [data, setData] = useState({})
- writeDocumentTitle(`Workspace.TestPlan.${route.name}`)
+ const { route, match } = props;
+ const { plan_id, ws_id } = match.params;
+ const [data, setData] = useState({});
- const { height: layoutHeight, width: layoutWidth } = useClientSize()
+ const { height: layoutHeight, width: layoutWidth } = useClientSize();
const queryPlanViewListData = async (param: any = { ws_id, plan_id }) => {
- const { data: $data, code, msg } = await queryPlanViewList(param)
- if (code === 200)
- setData($data)
- else
- requestCodeMessage(code, msg)
- }
+ const { data: $data, code, msg } = await queryPlanViewList(param);
+ if (code === 200) setData($data);
+ else requestCodeMessage(code, msg);
+ };
useEffect(() => {
- queryPlanViewListData()
- }, [])
+ queryPlanViewListData();
+ }, []);
return (
-
+
+
@@ -81,19 +79,20 @@ const ViewDetail = (props: any) => {
-
- {data?.name}
-
+ {data?.name}
- {data?.description}
-
+ {data?.description}
-
-
+
- )
-}
+ );
+};
-export default ViewDetail
\ No newline at end of file
+export default ViewDetail;
diff --git a/src/pages/WorkSpace/TestPlan/PlanView/index.tsx b/src/pages/WorkSpace/TestPlan/PlanView/index.tsx
index d103a39d9f95e90106b67a50f8d1416c20e56d22..47816bbfbecae72fa28640ecf3e094a65efd5056 100644
--- a/src/pages/WorkSpace/TestPlan/PlanView/index.tsx
+++ b/src/pages/WorkSpace/TestPlan/PlanView/index.tsx
@@ -1,34 +1,35 @@
-import { Tabs } from 'antd'
-import { FormattedMessage } from 'umi'
-import { ViewContent, ViewLayout, TabContainer } from './styled'
-import ViewCollapse from './components/ViewCollapse'
+import { Tabs } from 'antd';
+import { FormattedMessage } from 'umi';
+import { ViewContent, ViewLayout, TabContainer } from './styled';
+import ViewCollapse from './components/ViewCollapse';
-import { useClientSize, writeDocumentTitle } from '@/utils/hooks'
+import { useClientSize, DocTitleWrite } from '@/utils/hooks';
const PalnView = (props: any) => {
- const { route, match } = props
- const { ws_id } = match.params
+ const { route, match } = props;
+ const { ws_id } = match.params;
- const { height: layoutHeight, width: layoutWidth } = useClientSize()
-
- writeDocumentTitle(`Workspace.TestPlan.${route.name}`)
+ const { height: layoutHeight, width: layoutWidth } = useClientSize();
return (
-
+
+
-
- )
-}
+ );
+};
-export default PalnView
\ No newline at end of file
+export default PalnView;
diff --git a/src/pages/WorkSpace/TestPlan/index.tsx b/src/pages/WorkSpace/TestPlan/index.tsx
index 26cc4c259630dc7a93e067622f70ae13bcda6f8b..e5533c679eed5937218aca19b99e36d7c373e921 100644
--- a/src/pages/WorkSpace/TestPlan/index.tsx
+++ b/src/pages/WorkSpace/TestPlan/index.tsx
@@ -1,188 +1,208 @@
/* eslint-disable react-hooks/exhaustive-deps */
-import { useEffect, useRef, useState } from 'react'
+import { useEffect, useRef, useState } from 'react';
-import { useClientSize, writeDocumentTitle } from '@/utils/hooks'
-import { Space, Tabs, Button, message, Popconfirm, Spin } from 'antd'
-import { history, useIntl, FormattedMessage, Access, useAccess, useParams, useLocation } from 'umi'
-import CommonPagination from '@/components/CommonPagination'
+import { useClientSize, DocTitleWrite } from '@/utils/hooks';
+import { Space, Tabs, Button, message, Popconfirm, Spin } from 'antd';
+import { history, useIntl, FormattedMessage, Access, useAccess, useParams, useLocation } from 'umi';
+import CommonPagination from '@/components/CommonPagination';
-import styled from 'styled-components'
-import PlanSettingDrawer from './components/PlanSettingDrawer'
-import { queryPlanManageList, deleteTestPlan, copyTestPlan } from './services'
-import { getUserFilter, getSearchFilter, getRadioFilter } from '@/components/TableFilters'
-import { requestCodeMessage, AccessTootip } from '@/utils/utils'
-import { ResizeHooksTable } from '@/utils/table.hooks'
-import { tooltipTd } from '../TestResult/Details/components'
+import styled from 'styled-components';
+import PlanSettingDrawer from './components/PlanSettingDrawer';
+import { queryPlanManageList, deleteTestPlan, copyTestPlan } from './services';
+import { getUserFilter, getSearchFilter, getRadioFilter } from '@/components/TableFilters';
+import { requestCodeMessage, AccessTootip } from '@/utils/utils';
+import { ResizeHooksTable } from '@/utils/table.hooks';
+import { tooltipTd } from '../TestResult/Details/components';
interface OptionBtnProp {
- disabled?: boolean
+ disabled?: boolean;
}
const OptButton = styled.span`
- color: #1890FF;
- margin-right: 10 ;
- cursor: pointer ;
- ${props => props.disabled && 'opacity: 0.25;'}
-`
+ color: #1890ff;
+ margin-right: 10;
+ cursor: pointer;
+ ${(props) => props.disabled && 'opacity: 0.25;'}
+`;
const TestPlanManage = (props: any) => {
- const { formatMessage } = useIntl()
- const { route } = props
- const { ws_id } = useParams() as any
- const { query } = useLocation() as any
- const access = useAccess()
- writeDocumentTitle(`Workspace.TestPlan.${route.name}`)
-
- const { height: layoutHeight } = useClientSize()
- const viewSettingRef: any = useRef()
- const [data, setData] = useState([])
- const [loading, setLoading] = useState(true)
- const [pageParams, setPageParams] = useState(query && JSON.stringify(query) !== "{}" ? query : { ws_id, page_num: 1, page_size: 10 })
+ const { formatMessage } = useIntl();
+ const { route } = props;
+ const { ws_id } = useParams() as any;
+ const { query } = useLocation() as any;
+ const access = useAccess();
+
+ const { height: layoutHeight } = useClientSize();
+ const viewSettingRef: any = useRef();
+ const [data, setData] = useState([]);
+ const [loading, setLoading] = useState(true);
+ const [pageParams, setPageParams] = useState(
+ query && JSON.stringify(query) !== '{}' ? query : { ws_id, page_num: 1, page_size: 10 },
+ );
const queryPlanList = async () => {
- const { code, msg, ...rest } = await queryPlanManageList(pageParams)
+ const { code, msg, ...rest } = await queryPlanManageList(pageParams);
if (code === 200) {
- setData(rest)
+ setData(rest);
} else {
- requestCodeMessage(code, msg)
+ requestCodeMessage(code, msg);
}
- setLoading(false)
- }
+ setLoading(false);
+ };
useEffect(() => {
- queryPlanList()
- }, [pageParams])
+ queryPlanList();
+ }, [pageParams]);
const handleRun = async (row: any) => {
if (!row.enable) return;
- history.push(`/ws/${ws_id}/test_plan/${row.id}/run`, pageParams)
- }
+ history.push(`/ws/${ws_id}/test_plan/${row.id}/run`, pageParams);
+ };
const handleView = (row: any) => {
- viewSettingRef.current.show(row)
- }
+ viewSettingRef.current.show(row);
+ };
const handleCopy = async (row: any) => {
- const { code, msg } = await copyTestPlan({ plan_id: row.id, ws_id })
+ const { code, msg } = await copyTestPlan({ plan_id: row.id, ws_id });
if (code !== 200) {
- requestCodeMessage(code, msg)
- return
+ requestCodeMessage(code, msg);
+ return;
}
- message.success(formatMessage({ id: 'request.copy.success' }))
- queryPlanList()
- }
+ message.success(formatMessage({ id: 'request.copy.success' }));
+ queryPlanList();
+ };
const handleEdit = (row: any) => {
- history.push(`/ws/${ws_id}/test_plan/${row.id}/edit`, pageParams)
- }
+ history.push(`/ws/${ws_id}/test_plan/${row.id}/edit`, pageParams);
+ };
const handleDelete = async (row: any) => {
- const { code, msg } = await deleteTestPlan({ plan_id: row.id, ws_id })
- if (code === 200) queryPlanList()
- else requestCodeMessage(code, msg)
- }
+ const { code, msg } = await deleteTestPlan({ plan_id: row.id, ws_id });
+ if (code === 200) queryPlanList();
+ else requestCodeMessage(code, msg);
+ };
const columns: any = [
{
dataIndex: 'name',
title:
- handleRun(row)}>
- handleView(row)}>
- handleCopy(row)}>
+ handleRun(row)}>
+
+ handleView(row)}>
+
+ handleCopy(row)}>
+
- AccessTootip()}>
- AccessTootip()}>
+ AccessTootip()}>
+
+ AccessTootip()}>
+
}
>
- handleEdit(row)}>
- handleEdit(row)}>
+
+
+
- )
- }
- ]
+ ),
+ },
+ ];
return (
-
+
+ {
}
>
- record.id}
+ rowKey={(record) => record.id}
size={'small'}
pagination={false}
/>
{
- const params = { ...pageParams, page_num, page_size }
- setPageParams(params)
- }
- }
+ onPageChange={(page_num, page_size) => {
+ const params = { ...pageParams, page_num, page_size };
+ setPageParams(params);
+ }}
currentPage={data.page_num}
total={data.total}
/>
@@ -223,7 +244,7 @@ const TestPlanManage = (props: any) => {
- )
-}
+ );
+};
-export default TestPlanManage
\ No newline at end of file
+export default TestPlanManage;
diff --git a/src/pages/WorkSpace/TestReport/index.tsx b/src/pages/WorkSpace/TestReport/index.tsx
index 1b671ab786a4444c3519cd47addf2692b73bca88..e901f4d51075747809662691a62077c6572ef282 100644
--- a/src/pages/WorkSpace/TestReport/index.tsx
+++ b/src/pages/WorkSpace/TestReport/index.tsx
@@ -1,67 +1,80 @@
/* eslint-disable react-hooks/exhaustive-deps */
import { useCallback, useState } from 'react';
-import { writeDocumentTitle, useClientSize } from '@/utils/hooks';
+import { DocTitleWrite, useClientSize } from '@/utils/hooks';
import { Button, Layout, Tabs } from 'antd';
import { history, useAccess, FormattedMessage } from 'umi';
-import { ReportBody } from './styled'
-import ReportListTable from './components/ReportListTable'
-import ReportTemplateTable from './components/ReportTemplateTable'
+import { ReportBody } from './styled';
+import ReportListTable from './components/ReportListTable';
+import ReportTemplateTable from './components/ReportTemplateTable';
export default (props: any) => {
- const { match, location } = props
- const { ws_id } = match.params
- const intalMessage = `menu.Workspace.TestReport.${props.route.name}`
- const access = useAccess()
- writeDocumentTitle(intalMessage)
+ const { match, location } = props;
+ const { ws_id } = match.params;
+ const intalMessage = `menu.Workspace.TestReport.${props.route.name}`;
+ const access = useAccess();
- const { height: layoutHeight, width: layoutWidth } = useClientSize()
+ const { height: layoutHeight, width: layoutWidth } = useClientSize();
- const [tab, setTab] = useState(location.query.t || 'list')
+ const [tab, setTab] = useState(location.query.t || 'list');
const handleTabClick = useCallback((t) => {
- setTab(t)
- history.push(location.pathname + `?t=${t}`)
- }, [])
+ setTab(t);
+ history.push(location.pathname + `?t=${t}`);
+ }, []);
const handleCreateReport = useCallback(() => {
- history.push(`/ws/${ws_id}/test_report/compare`)
+ history.push(`/ws/${ws_id}/test_report/compare`);
// window.sessionStorage.setItem(`${ws_id}-compareData`, JSON.stringify([]))
// window.sessionStorage.setItem(`${ws_id}-noGroupJobData`, JSON.stringify([]))
// window.sessionStorage.setItem('originType', 'test_report')
- }, [])
+ }, []);
const hanldeCreateTemplate = useCallback(() => {
- history.push(`/ws/${ws_id}/test_report/template`)
- }, [])
+ history.push(`/ws/${ws_id}/test_report/template`);
+ }, []);
return (
+
- )
-}
\ No newline at end of file
+ );
+};
diff --git a/src/pages/WorkSpace/TestSuiteSearch/List/DefaultPageList/index.tsx b/src/pages/WorkSpace/TestSuiteSearch/List/DefaultPageList/index.tsx
index f1c6ccdbd2ad317fe04bb7e54422d623abe38641..d453df591c5208b5efa063c3db90b21af3e0b52c 100644
--- a/src/pages/WorkSpace/TestSuiteSearch/List/DefaultPageList/index.tsx
+++ b/src/pages/WorkSpace/TestSuiteSearch/List/DefaultPageList/index.tsx
@@ -1,12 +1,12 @@
/* eslint-disable react-hooks/exhaustive-deps */
import React, { useState, useEffect, useRef } from 'react';
-import { history, useIntl, FormattedMessage, useParams } from 'umi'
+import { history, useIntl, FormattedMessage, useParams } from 'umi';
import { Input, Space } from 'antd';
import { SearchOutlined, UpOutlined } from '@ant-design/icons';
import DefaultPageList from './component/DefaultPageTable';
import { queryTotalNum } from '../../service';
import styles from './index.less';
-import { useClientSize, writeDocumentTitle } from '@/utils/hooks';
+import { useClientSize, DocTitleWrite } from '@/utils/hooks';
const { Search } = Input;
/**
@@ -14,101 +14,127 @@ const { Search } = Input;
* @param props
*/
const TestSuiteSearch: React.FC = (props) => {
- const { formatMessage } = useIntl()
- writeDocumentTitle(`Workspace.${props.route.name}`)
- const { ws_id } = useParams() as any
- // 滚动区域可视高度
- // 总数
- const [itemSelected, setItemSelected] = useState('performance');
- const [totalNum, setTotalNum] = useState({ performance_num: 0, functional_num: 0 })
- // 页面滚动到顶部
- const [listScrollTop, setListScrollTop] = useState(0)
- const testSuiteSearch_wrapper = useRef(null)
+ const { formatMessage } = useIntl();
+ const { ws_id } = useParams() as any;
+ // 滚动区域可视高度
+ // 总数
+ const [itemSelected, setItemSelected] = useState('performance');
+ const [totalNum, setTotalNum] = useState({ performance_num: 0, functional_num: 0 });
+ // 页面滚动到顶部
+ const [listScrollTop, setListScrollTop] = useState(0);
+ const testSuiteSearch_wrapper = useRef(null);
- // 1.获取数量
- const getTotalNum = async () => {
- const res = await queryTotalNum({ ws_id, total_num: true }) || {}
- if (res.code === 200 && res.data) {
- const { functional_num, performance_num } = res.data || {}
- setTotalNum({ functional_num, performance_num })
- }
- }
+ // 1.获取数量
+ const getTotalNum = async () => {
+ const res = (await queryTotalNum({ ws_id, total_num: true })) || {};
+ if (res.code === 200 && res.data) {
+ const { functional_num, performance_num } = res.data || {};
+ setTotalNum({ functional_num, performance_num });
+ }
+ };
- useEffect(() => {
- getTotalNum()
- }, [ws_id])
+ useEffect(() => {
+ getTotalNum();
+ }, [ws_id]);
- // 获取页面伸缩变化后尺寸
- const { height } = useClientSize()
+ // 获取页面伸缩变化后尺寸
+ const { height } = useClientSize();
- // 搜索
- const onSearch = (value: string) => {
- if (value) {
- history.push({
- pathname: `/ws/${ws_id}/suite_search/key`,
- query: {
- keyword: value,
+ // 搜索
+ const onSearch = (value: string) => {
+ if (value) {
+ history.push({
+ pathname: `/ws/${ws_id}/suite_search/key`,
+ query: {
+ keyword: value,
+ },
+ });
}
- });
- }
- }
+ };
- // 发起回调
- const handleClick = (params: string) => {
- return () => {
- setItemSelected(params)
- }
- };
+ // 发起回调
+ const handleClick = (params: string) => {
+ return () => {
+ setItemSelected(params);
+ };
+ };
- const handleScroll = () => {
- const top = testSuiteSearch_wrapper.current.scrollTop
- setListScrollTop(top)
- }
- const onScrollBackTop = () => {
- // console.log('scrollTop:');
- testSuiteSearch_wrapper.current.scrollTo(0, 0);
- }
+ const handleScroll = () => {
+ const top = testSuiteSearch_wrapper.current.scrollTop;
+ setListScrollTop(top);
+ };
+ const onScrollBackTop = () => {
+ // console.log('scrollTop:');
+ testSuiteSearch_wrapper.current.scrollTo(0, 0);
+ };
- return (
-
{detail.description}
+
-
+
- {
- (name === 'TestJob' || name === 'TestExport') &&
+ {(name === 'TestJob' || name === 'TestExport') && (
- }
-
= (props) => {
okText={
{/*
@@ -1216,42 +1493,64 @@ const TestJob: React.FC = (props) => {
*/}
-
+
{/** 有时间的系统标签时，二次弹框确认； */}
- {timeTagList.length ?
+ {timeTagList.length ? (
<>
- }
+ )}
-
- )
-}
+
+ );
+};
-export default TestJob
\ No newline at end of file
+export default TestJob;
diff --git a/src/pages/WorkSpace/TestPlan/PlanForm/index.tsx b/src/pages/WorkSpace/TestPlan/PlanForm/index.tsx
index 9bd5bb9b691fc087535c4ecf5ce12a9844998af7..93c350ca047f882df2b6f0b633fe8eab5c30499c 100644
--- a/src/pages/WorkSpace/TestPlan/PlanForm/index.tsx
+++ b/src/pages/WorkSpace/TestPlan/PlanForm/index.tsx
@@ -1,145 +1,173 @@
/* eslint-disable react-hooks/exhaustive-deps */
/* eslint-disable @typescript-eslint/no-unused-expressions */
-import { useState, useRef, useEffect } from 'react'
-import { Breadcrumb, Row, Steps, Button, Result, Col, Space, message, Spin, Badge } from 'antd'
+import { useState, useRef, useEffect } from 'react';
+import { Breadcrumb, Row, Steps, Button, Result, Col, Space, message, Spin, Badge } from 'antd';
-import BasicSetting from './components/BasicSetting'
-import TestSetting from './components/TestSetting'
-import ReportSetting from './components/ReportSetting'
-import TouchSetting from './components/TouchSetting'
+import BasicSetting from './components/BasicSetting';
+import TestSetting from './components/TestSetting';
+import ReportSetting from './components/ReportSetting';
+import TouchSetting from './components/TouchSetting';
-import { useClientSize, writeDocumentTitle } from '@/utils/hooks'
-import { ArrowLeftOutlined, ArrowRightOutlined } from '@ant-design/icons'
+import { useClientSize, DocTitleWrite } from '@/utils/hooks';
+import { ArrowLeftOutlined, ArrowRightOutlined } from '@ant-design/icons';
import {
- CreateContainer, ContainerBody, ContainerBreadcrumb, LeftWrapper,
- RightBody, RightNav, RightWrapper, SuccessDescriptionContainer
-} from './styles'
-import { history, useIntl, FormattedMessage, getLocale, Access, useAccess, useLocation } from 'umi'
-import { runningTestPlan, creatTestPlan, queryTestPlanDetails, updateTestPlan } from '@/pages/WorkSpace/TestPlan/services'
-import styles from './index.less'
-import { requestCodeMessage, AccessTootip } from '@/utils/utils'
-import _ from 'lodash'
-import { stringify } from 'querystring'
+ CreateContainer,
+ ContainerBody,
+ ContainerBreadcrumb,
+ LeftWrapper,
+ RightBody,
+ RightNav,
+ RightWrapper,
+ SuccessDescriptionContainer,
+} from './styles';
+import { history, useIntl, FormattedMessage, getLocale, Access, useAccess, useLocation } from 'umi';
+import {
+ runningTestPlan,
+ creatTestPlan,
+ queryTestPlanDetails,
+ updateTestPlan,
+} from '@/pages/WorkSpace/TestPlan/services';
+import styles from './index.less';
+import { requestCodeMessage, AccessTootip } from '@/utils/utils';
+import _ from 'lodash';
+import { stringify } from 'querystring';
-/**
+/**
* 计划管理/新建计划（新）
* */
const TestPlan = (props: any) => {
- const { formatMessage } = useIntl()
- const enLocale = getLocale() === 'en-US'
+ const { formatMessage } = useIntl();
+ const enLocale = getLocale() === 'en-US';
const access = useAccess();
- const { height: layoutHeight } = useClientSize()
- const { state } = useLocation() as any
+ const { height: layoutHeight } = useClientSize();
+ const { state } = useLocation() as any;
- const { route } = props
+ const { route } = props;
// console.log('route.name:', route.name)
- writeDocumentTitle(`Workspace.TestPlan.${route.name}`)
- const { ws_id, plan_id } = props.match.params
- const [current, setCurrent] = useState(0)
+ const { ws_id, plan_id } = props.match.params;
+ const [current, setCurrent] = useState(0);
- const [loading, setLoading] = useState(route.name !== 'Create')
- const [isFormStep, setIsFormStep] = useState(true) //填表阶段
- const [pedding, setPedding] = useState(false)
+ const [loading, setLoading] = useState(route.name !== 'Create');
+ const [isFormStep, setIsFormStep] = useState(true); //填表阶段
+ const [pedding, setPedding] = useState(false);
- const basicSettingRef: any = useRef()
- const touchSettingRef: any = useRef()
- const reportSettingRef: any = useRef()
+ const basicSettingRef: any = useRef();
+ const touchSettingRef: any = useRef();
+ const reportSettingRef: any = useRef();
- const [dataSource, setDataSource] = useState
+ )}
+
|
}
- {name === 'TestExport' && |
}
- {
- (name === 'TemplatePreview' || name === 'TemplateEdit' || name === 'TestTemplate') &&
- |
- }
+ {name === 'TestJob' && (
+
+
+ )}
+ {name === 'TestExport' && (
+
+
+ )}
+ {(name === 'TemplatePreview' ||
+ name === 'TemplateEdit' ||
+ name === 'TestTemplate') && (
+
+
+ )}
- }
- {
- JSON.stringify(items.basic) !== '{}' &&
+ )}
+ {JSON.stringify(items.basic) !== '{}' && (
= (props) => {
{...modalProps}
/>
- }
- {
- JSON.stringify(items.env) !== '{}' &&
+ )}
+ {JSON.stringify(items.env) !== '{}' && (
= (props) => {
{...modalProps}
/>
- }
- {
- detail.test_type &&
+ )}
+ {detail.test_type && (
= (props) => {
setTest_config(data)}
+ handleData={(data: any) =>
+ setTest_config(data)
+ }
contrl={items.suite}
onRef={suiteTable}
setPageLoading={setLoading}
@@ -1146,12 +1404,13 @@ const TestJob: React.FC = (props) => {
/>
- }
- {
- JSON.stringify(items.more) !== '{}' &&
+ )}
+ {JSON.stringify(items.more) !== '{}' && (
= (props) => {
callback={setTimeTagList}
/>
- }
+ )}
- {
- isYamlFormat &&
-
- {
- (name === 'TestJob' || name === 'TestTemplate' || name === 'TestExport') &&
+ {(name === 'TestJob' || name === 'TestTemplate' || name === 'TestExport') && (
-
-
-
- *
+
+
+ *
+
@@ -1138,7 +1394,9 @@ const TestJob: React.FC
-
-
+ {isYamlFormat && (
+
+
- handleCopyText(jobInfo.replace('---', ''))} style={{ marginLeft: 10 }}>
+
+ handleCopyText(jobInfo.replace('---', ''))
+ }
+ style={{ marginLeft: 10 }}
+ >
-
+
- setJobInfo(
- value
- )}
+ onChange={(value: any) => setJobInfo(value)}
/>
- }
+ )}
- {
- current === 0 ? null : (
- <>
-
-
+ {current === 0 ? null : (
+ <>
+
+ hanleStepNext('NextStep')}>
- {
- current < 3 &&
- <>
-
- {
- current === 3 &&
+ hanleStepNext('NextStep')}
+ >
+ {current < 3 && (
<>
- {
- route.name === 'Create' &&
-
- }
+
+
-
+ {current === 3 && (
+ <>
+ {route.name === 'Create' && (
+
+ )}
+
+ )}
+
- {/* 计划成功部分 */}
-
-
- {
- successData?.name &&
-
-
-
- }
- {
- successData?.cron_info &&
-
-
-
- }
- {
- successData?.enable &&
-
-
-
- }
- {
- successData?.next_time &&
-
-
-
- }
-
-
-
-
- }
+
+ {/* 计划成功部分 */}
+
+
+ {successData?.name && (
+
+
+
+
+ )}
+ {successData?.cron_info && (
+
+
+
+
+ )}
+ {successData?.enable && (
+
+
+
+
+ )}
+ {successData?.next_time && (
+
+
+
+
+ )}
+
+
+
+
+ )}
{state === 'pending' && (
- Pending
+
+ Pending
+
)}
{state === 'running' && (
- Running
+
+ Running
+
)}
{state === 'fail' && (
Complete
+
+ Complete
+
)}
{!!start_time && (
-
+
)}
{!!end_time && (
-
+
)}
- )
- }
-
+ );
+ };
// 基础配置
const BasicSettingClick = useCallback((data) => {
- basicInfoRef.current?.show('add', data)
- }, [])
+ basicInfoRef.current?.show('add', data);
+ }, []);
// 回调函数
function prepareCallback(info: any) {
- const { data } = info
- consoleRef.current?.show('show', data)
+ const { data } = info;
+ consoleRef.current?.show('show', data);
}
function basicInfoCallback(info: any) {
- const { data, editFn } = info
- editFn({ ws_id, plan_instance_id: plan_id, note: data })
+ const { data, editFn } = info;
+ editFn({ ws_id, plan_instance_id: plan_id, note: data });
}
return (
-
- Fail
-
-
+ Fail
+
+
+
)}
{state === 'success' && (
-
-
-
-
-
-
- = (props) => {
- const { formatMessage } = useIntl()
- writeDocumentTitle(`Workspace.${props.route.name}`)
- const { ws_id } = useParams() as any
- // 滚动区域可视高度
- // 总数
- const [itemSelected, setItemSelected] = useState('performance');
- const [totalNum, setTotalNum] = useState({ performance_num: 0, functional_num: 0 })
- const [initialStyle, setInitialStyle] = useState({ marginTop: 200, width: 700, show: false });
- const [showInitialList, setShowInitialList] = useState(true);
- // 搜索栏
- const [loading, setLoading] = useState(false)
- const [refresh, setRefresh] = useState(new Date().getTime())
- const [tabKey, setTabKey] = useState('all');
- const [itemTotal, setItemTotal] = useState({
- "total_num": 0,
- "suite_num": 0,
- "conf_num": 0,
- "domain_num": 0,
- })
- const [listScrollTop, setListScrollTop] = useState(0)
- const testSuiteSearch_wrapper = useRef(null)
+ const { formatMessage } = useIntl();
+ const { ws_id } = useParams() as any;
+ // 滚动区域可视高度
+ // 总数
+ const [itemSelected, setItemSelected] = useState('performance');
+ const [totalNum, setTotalNum] = useState({ performance_num: 0, functional_num: 0 });
+ const [initialStyle, setInitialStyle] = useState({
+ marginTop: 200,
+ width: 700,
+ show: false,
+ });
+ const [showInitialList, setShowInitialList] = useState(true);
+ // 搜索栏
+ const [loading, setLoading] = useState(false);
+ const [refresh, setRefresh] = useState(new Date().getTime());
+ const [tabKey, setTabKey] = useState('all');
+ const [itemTotal, setItemTotal] = useState({
+ total_num: 0,
+ suite_num: 0,
+ conf_num: 0,
+ domain_num: 0,
+ });
+ const [listScrollTop, setListScrollTop] = useState(0);
+ const testSuiteSearch_wrapper = useRef(null);
- // 1.获取数量
- const getTotalNum = async () => {
- const res = await queryTotalNum({ ws_id, total_num: true }) || {}
- if (res.code === 200 && res.data) {
- const { functional_num, performance_num } = res.data || {}
- setTotalNum({ functional_num, performance_num })
- }
- }
+ // 1.获取数量
+ const getTotalNum = async () => {
+ const res = (await queryTotalNum({ ws_id, total_num: true })) || {};
+ if (res.code === 200 && res.data) {
+ const { functional_num, performance_num } = res.data || {};
+ setTotalNum({ functional_num, performance_num });
+ }
+ };
- // 2.获取搜索结果数量
- const getSearchListQuantity = async (query: any) => {
- const res = await querySearchListQuantity(query) || {}
- if (res.code === 200 && res.data && Object.keys(res.data).length) {
- setItemTotal({ ...res.data })
- }
- }
+ // 2.获取搜索结果数量
+ const getSearchListQuantity = async (query: any) => {
+ const res = (await querySearchListQuantity(query)) || {};
+ if (res.code === 200 && res.data && Object.keys(res.data).length) {
+ setItemTotal({ ...res.data });
+ }
+ };
- useEffect(() => {
- getTotalNum()
- }, [ws_id])
+ useEffect(() => {
+ getTotalNum();
+ }, [ws_id]);
- // 获取页面伸缩变化后尺寸
- const { height } = useClientSize()
+ // 获取页面伸缩变化后尺寸
+ const { height } = useClientSize();
- // 搜索
- const onSearch = (value: string) => {
- if (value) {
- if (!initialStyle.show) {
- setInitialStyle({ marginTop: 20, minWidth: 800, width: '70%', show: true });
- setShowInitialList(false);
- }
- getSearchListQuantity({ search_key: value, ws_id })
- setRefresh(new Date().getTime())
- history.push({
- pathname: `/ws/${ws_id}/suite_search/key`,
- query: {
- keyword: value,
+ // 搜索
+ const onSearch = (value: string) => {
+ if (value) {
+ if (!initialStyle.show) {
+ setInitialStyle({ marginTop: 20, minWidth: 800, width: '70%', show: true });
+ setShowInitialList(false);
+ }
+ getSearchListQuantity({ search_key: value, ws_id });
+ setRefresh(new Date().getTime());
+ history.push({
+ pathname: `/ws/${ws_id}/suite_search/key`,
+ query: {
+ keyword: value,
+ },
+ });
}
- });
- }
- }
+ };
- const onTabsChange = ($key: string) => {
- setTabKey($key)
- }
+ const onTabsChange = ($key: string) => {
+ setTabKey($key);
+ };
- // 发起回调
- const handleClick = (params: string) => {
- return () => {
- setItemSelected(params)
- }
- };
+ // 发起回调
+ const handleClick = (params: string) => {
+ return () => {
+ setItemSelected(params);
+ };
+ };
- const handleScroll = () => {
- const top = testSuiteSearch_wrapper.current.scrollTop
- setListScrollTop(top)
- }
- const onScrollBackTop = () => {
- // console.log('scrollTop:');
- testSuiteSearch_wrapper.current.scrollTo(0, 0);
- }
+ const handleScroll = () => {
+ const top = testSuiteSearch_wrapper.current.scrollTop;
+ setListScrollTop(top);
+ };
+ const onScrollBackTop = () => {
+ // console.log('scrollTop:');
+ testSuiteSearch_wrapper.current.scrollTo(0, 0);
+ };
- const tabList = [
- { name: formatMessage({ id: 'test.suite.all' }), key: 'all', fieldName: 'total_num' },
- { name: 'Suite', key: 'suite', fieldName: 'suite_num' },
- { name: 'Conf', key: 'conf', fieldName: 'conf_num' },
- { name: formatMessage({ id: 'test.suite.domain' }), key: 'domain', fieldName: 'domain_num' },
- ]
- const selectedStyle = { backgroundColor: '#E6F7FF', color: '#1890FF', marginTop: -3 }
- const othersStyle = { backgroundColor: '#0000000a', color: '#000', marginTop: -3 }
+ const tabList = [
+ { name: formatMessage({ id: 'test.suite.all' }), key: 'all', fieldName: 'total_num' },
+ { name: 'Suite', key: 'suite', fieldName: 'suite_num' },
+ { name: 'Conf', key: 'conf', fieldName: 'conf_num' },
+ {
+ name: formatMessage({ id: 'test.suite.domain' }),
+ key: 'domain',
+ fieldName: 'domain_num',
+ },
+ ];
+ const selectedStyle = { backgroundColor: '#E6F7FF', color: '#1890FF', marginTop: -3 };
+ const othersStyle = { backgroundColor: '#0000000a', color: '#000', marginTop: -3 };
- return (
-
-
-
- );
+ );
};
export default TestSuiteSearch;
diff --git a/src/pages/WorkSpace/TestSuiteSearch/index.tsx b/src/pages/WorkSpace/TestSuiteSearch/index.tsx
index 62b50af7313238601642b7eb0909e50dd25864e6..0942e6088e0a6db65f2cff6e917726880fd2d33b 100644
--- a/src/pages/WorkSpace/TestSuiteSearch/index.tsx
+++ b/src/pages/WorkSpace/TestSuiteSearch/index.tsx
@@ -2,13 +2,13 @@
import React, { useState, useEffect, useRef } from 'react';
import { Spin, Input, Tabs, Space, Badge } from 'antd';
import { SearchOutlined, UpOutlined } from '@ant-design/icons';
-import { useIntl, FormattedMessage, useParams, history } from 'umi'
+import { useIntl, FormattedMessage, useParams, history } from 'umi';
import DefaultPageList from './List/DefaultPageList/component/DefaultPageTable';
import SearchPageList from './List/SearchPageList/SearchPageTable';
import { queryTotalNum, querySearchListQuantity } from './service';
import styles from './index.less';
-import { useClientSize, writeDocumentTitle } from '@/utils/hooks'
+import { useClientSize, DocTitleWrite } from '@/utils/hooks';
const { Search } = Input;
const { TabPane } = Tabs;
@@ -17,158 +17,214 @@ const { TabPane } = Tabs;
* @param props
*/
const TestSuiteSearch: React.FC
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- 200 ? 'block' : 'none', paddingTop: 7 }}
+ >
+
-
-
-
200 ? 'block' : 'none', paddingTop: 7 }}>
-
-
-
- (1)
-
- const detectZoom = () => {
- var ratio: number = 0,
- screen: any = window.screen,
- ua: any = navigator.userAgent.toLowerCase();
-
- if (window.devicePixelRatio !== undefined) {
- ratio = window.devicePixelRatio;
- }
- else if (~ua.indexOf('msie')) {
- if (screen.deviceXDPI && screen.logicalXDPI) {
- ratio = screen.deviceXDPI / screen.logicalXDPI;
- }
- }
- else if (window.outerWidth !== undefined && window.innerWidth !== undefined) {
- ratio = window.outerWidth / window.innerWidth;
- }
-
- if (ratio) {
- ratio = 1.5 / ratio
- }
- setRatio(ratio)
+ const [ratio, setRatio] = useState(1);
+
+ const detectZoom = () => {
+ var ratio: number = 0,
+ screen: any = window.screen,
+ ua: any = navigator.userAgent.toLowerCase();
+
+ if (window.devicePixelRatio !== undefined) {
+ ratio = window.devicePixelRatio;
+ } else if (~ua.indexOf('msie')) {
+ if (screen.deviceXDPI && screen.logicalXDPI) {
+ ratio = screen.deviceXDPI / screen.logicalXDPI;
+ }
+ } else if (window.outerWidth !== undefined && window.innerWidth !== undefined) {
+ ratio = window.outerWidth / window.innerWidth;
}
- useEffect(() => {
- detectZoom()
- window.addEventListener('resize', detectZoom);
- return () => {
- window.removeEventListener('resize', detectZoom);
- }
- }, []);
+ if (ratio) {
+ ratio = 1.5 / ratio;
+ }
+ setRatio(ratio);
+ };
- return ratio
-}
+ useEffect(() => {
+ detectZoom();
+ window.addEventListener('resize', detectZoom);
+ return () => {
+ window.removeEventListener('resize', detectZoom);
+ };
+ }, []);
+
+ return ratio;
+};
export const useClientSize = () => {
- const [layout, setLayout] = useState({ height: innerHeight, width: innerWidth })
- const onResize = useCallback(
- () => {
- setLayout({
- height: innerHeight,
- width: innerWidth
- })
- }, []
- )
-
- useEffect(() => {
- window.addEventListener('resize', onResize)
- return () => {
- window.removeEventListener('resize', onResize)
- }
- }, [])
-
- return layout
-}
+ const [layout, setLayout] = useState({ height: innerHeight, width: innerWidth });
+ const onResize = useCallback(() => {
+ setLayout({
+ height: innerHeight,
+ width: innerWidth,
+ });
+ }, []);
+
+ useEffect(() => {
+ window.addEventListener('resize', onResize);
+ return () => {
+ window.removeEventListener('resize', onResize);
+ };
+ }, []);
+
+ return layout;
+};
export const useRemoveElementTitle = () => {
- useLayoutEffect(() => {
- document.querySelectorAll('td').forEach((el: any) => el.removeAttribute('title'))
- document.querySelectorAll('label').forEach((el: any) => el.removeAttribute('title'))
- document.querySelectorAll('a').forEach((el: any) => el.removeAttribute('title'))
- document.querySelectorAll('svg title').forEach((el: any) => el.innerHTML = '')
- }, [location.pathname])
-}
-
-export const writeDocumentTitle = function (title: string) {
- const intl = useIntl()
- document.title = `${intl.messages[title]} - T-One`
-}
+ useLayoutEffect(() => {
+ document.querySelectorAll('td').forEach((el: any) => el.removeAttribute('title'));
+ document.querySelectorAll('label').forEach((el: any) => el.removeAttribute('title'));
+ document.querySelectorAll('a').forEach((el: any) => el.removeAttribute('title'));
+ document.querySelectorAll('svg title').forEach((el: any) => (el.innerHTML = ''));
+ }, [location.pathname]);
+};
+
+export const DocTitleWrite: any = ({ id }: any) => {
+ const intl = useIntl();
+ return (
+
+ {intl.formatMessage({ id })} - T-One
+
+ );
+};
type ListProps = {
- name: string,
- id: string
-}
+ name: string;
+ id: string;
+};
type ResultProps = {
- job_id: string | number,
- style?: React.CSSProperties;
- ws_id?: string;
-}
-
-export const listRender: React.FC = ({ name, id }) => {name}
+ job_id: string | number;
+ style?: React.CSSProperties;
+ ws_id?: string;
+};
+
+export const listRender: React.FC = ({ name, id }) => (
+
+ {name}
+
+);
export const textRender = (name: any) => {
- return {name}
-}
+ return (
+
+ {name}
+
+ );
+};
export const enumer = (name: any) => {
- const list: any = {
- system: '公共镜像',
- self: '自定义镜像',
- others: '共享镜像'
- }
- return list[name];
-}
+ const list: any = {
+ system: '公共镜像',
+ self: '自定义镜像',
+ others: '共享镜像',
+ PRIVATE_IMAGE: '私有镜像',
+ PUBLIC_IMAGE: '公共镜像',
+ SHARED_IMAGE: '共享镜像',
+ };
+ return list[name];
+};
export const getTextByJs = (obj: any) => {
- let str = "";
- let len = Object.keys(obj).length
- Object.keys(obj).map((k: any, i: number) => {
- if (i === len - 1) {
- str += `${k}=${obj[k]}`
- } else {
- str += `${k}=${obj[k]}\n`
- }
- })
- return str;
-}
-
-export const JumpResult: React.FC = ({ job_id, style, ws_id }) => {
- const { ws_id: wsid } = useParams() as any
-
- const id = ws_id || wsid
- if (job_id && id) {
- return (
-
- { = ({ job_id, style, ws_id }) => {
+ const { ws_id: wsid } = useParams() as any;
+
+ const id = ws_id || wsid;
+ if (job_id && id) {
+ return (
+
+ {
-
+ );
};
export default TestSuiteSearch;
diff --git a/src/utils/hooks.tsx b/src/utils/hooks.tsx
index d06795f8ff610efd9853b0b32a451393438b85cd..b9013c03bf69e3d91a3ebca3f32323b0e0868c12 100644
--- a/src/utils/hooks.tsx
+++ b/src/utils/hooks.tsx
@@ -1,177 +1,186 @@
-import React, { useEffect, useState, useLayoutEffect, useCallback } from 'react'
+import React, { useEffect, useState, useLayoutEffect, useCallback } from 'react';
import { ReactComponent as IconLink } from '@/assets/svg/Report/IconLink.svg';
-import { useIntl, useParams } from 'umi'
-import { Tooltip, message } from 'antd'
-import Clipboard from 'clipboard'
+import { Helmet, useIntl, useParams } from 'umi';
+import { Tooltip, message } from 'antd';
+import Clipboard from 'clipboard';
import { enterWorkspaceHistroy } from '@/services/Workspace';
-import { queryWorkspaceHistory } from '@/services/Workspace'
+import { queryWorkspaceHistory } from '@/services/Workspace';
-const { document, location }: any = window
+const { document, location }: any = window;
export const enterWsAndGetList = async (ws_id: any) => {
- try {
- const { data } = await enterWorkspaceHistroy({ ws_id }) || {}
- const { code, ...historyWorkspaces } = await queryWorkspaceHistory({
- page_num: 1,
- page_size: 20,
- call_page: 'menu',
- ws_id
- })
- if (code !== 200) return
- return {
- wsList: { ...historyWorkspaces },
- first_entry: data?.first_entry
- }
- }
- catch (err) {
- console.log(err)
- }
- return
-}
+ try {
+ const { data } = (await enterWorkspaceHistroy({ ws_id })) || {};
+ const { code, ...historyWorkspaces } = await queryWorkspaceHistory({
+ page_num: 1,
+ page_size: 20,
+ call_page: 'menu',
+ ws_id,
+ });
+ if (code !== 200) return;
+ return {
+ wsList: { ...historyWorkspaces },
+ first_entry: data?.first_entry,
+ };
+ } catch (err) {
+ console.log(err);
+ }
+ return;
+};
export const useDetectZoom = () => {
- const [ratio, setRatio] = useState
-
-
-
- );
+
-
-
-
-
-
-
-
-
+
- ) : (
-
+
-
+
+
+
+ ) : (
+
+
+
+
+
+
+
+
+
+
+ {tabList.map((item) => (
+
+ {item.name}{' '}
+
+
+
+
+ )}
-
- {tabList.map((item) => (
- {item.name}
-
-
-
- )
- }
- 200 ? 'block' : 'none', paddingTop: 7 }}>
-
- 200 ? 'block' : 'none', paddingTop: 7 }}
+ >
+
+