diff --git a/frontend/src/components/business/ms-case-associate/index.vue b/frontend/src/components/business/ms-case-associate/index.vue index d695251106..8f3fa71a60 100644 --- a/frontend/src/components/business/ms-case-associate/index.vue +++ b/frontend/src/components/business/ms-case-associate/index.vue @@ -490,29 +490,30 @@ getCaseLevelColumn(); }); - const { propsRes, propsEvent, loadList, setLoadListParams, resetSelector, setTableSelected } = useTable( - props.getTableFunc, - { - columns, - scroll: { x: '100%' }, - showSetting: false, - selectable: true, - showSelectAll: true, - heightUsed: 310, - showSelectorAll: !props.selectorAll, - }, - (record) => { - return { - ...record, - tags: (record.tags || []).map((item: string, i: number) => { - return { - id: `${record.id}-${i}`, - name: item, - }; - }), - }; - } - ); + const { propsRes, propsEvent, loadList, setLoadListParams, resetSelector, setTableSelected, resetFilterParams } = + useTable( + props.getTableFunc, + { + columns, + scroll: { x: '100%' }, + showSetting: false, + selectable: true, + showSelectAll: true, + heightUsed: 310, + showSelectorAll: !props.selectorAll, + }, + (record) => { + return { + ...record, + tags: (record.tags || []).map((item: string, i: number) => { + return { + id: `${record.id}-${i}`, + name: item, + }; + }), + }; + } + ); // 用例等级 // TODO: 这个版本用例和接口以及场景不存在用例等级 不展示等级内容 @@ -740,6 +741,7 @@ () => props.visible, (val) => { if (val) { + resetFilterParams(); if (!props.hideProjectSelect) { initProjectList(true); } else { @@ -761,6 +763,7 @@ if (!props.hideProjectSelect) { initProjectList(true); } + resetFilterParams(); initModules(true); searchCase(); initFilter(); @@ -771,6 +774,7 @@ (val) => { if (val) { resetSelector(); + resetFilterParams(); initModules(true); searchCase(); initFilter(); diff --git a/frontend/src/components/pure/ms-form-create/formcreate-password.vue b/frontend/src/components/pure/ms-form-create/formcreate-password.vue index 9c256b970c..cc67533e9a 100644 --- a/frontend/src/components/pure/ms-form-create/formcreate-password.vue +++ b/frontend/src/components/pure/ms-form-create/formcreate-password.vue @@ -2,7 +2,7 @@
{{ item.label }}
-
{{ item.count || 0 }}
-
{{ item.rote || 0 }}
+
{{ item.count || 0 }}
+
{{ item.rote || 0 }}
diff --git a/frontend/src/views/api-test/report/component/caseReportCom.vue b/frontend/src/views/api-test/report/component/caseReportCom.vue index 8ba66f76f2..358be94c6a 100644 --- a/frontend/src/views/api-test/report/component/caseReportCom.vue +++ b/frontend/src/views/api-test/report/component/caseReportCom.vue @@ -258,12 +258,24 @@ series: { name: '', type: 'pie', - radius: ['65%', '80%'], + radius: ['62%', '80%'], avoidLabelOverlap: false, label: { show: false, position: 'center', }, + itemStyle: { + normal: { + borderWidth: 2, + borderColor: '#ffffff', + }, + emphasis: { + borderWidth: 0, + shadowBlur: 0, + shadowOffsetX: 0, + shadowColor: 'rgba(0, 0, 0, 0.5)', + }, + }, emphasis: { label: { show: false, diff --git a/frontend/src/views/api-test/report/component/scenarioCom.vue b/frontend/src/views/api-test/report/component/scenarioCom.vue index fa137b9159..ad91897c48 100644 --- a/frontend/src/views/api-test/report/component/scenarioCom.vue +++ b/frontend/src/views/api-test/report/component/scenarioCom.vue @@ -264,12 +264,24 @@ series: { name: '', type: 'pie', - radius: ['65%', '80%'], + radius: ['62%', '80%'], avoidLabelOverlap: false, label: { show: false, position: 'center', }, + itemStyle: { + normal: { + borderWidth: 2, + borderColor: '#ffffff', + }, + emphasis: { + borderWidth: 0, + shadowBlur: 0, + shadowOffsetX: 0, + shadowColor: 'rgba(0, 0, 0, 0.5)', + }, + }, emphasis: { label: { show: false, diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue index e5bd8da2ab..5a3679eae1 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue @@ -850,10 +850,12 @@ currentSelectCount: 0, }); - const conditionParams = ref({ - keyword: '', - filter: {}, - combine: {}, + const conditionParams = computed(() => { + return { + keyword: keyword.value, + filter: propsRes.value.filter, + combine: batchParams.value.condition, + }; }); async function initTableParams() { @@ -865,11 +867,6 @@ moduleIds = [...featureCaseStore.moduleId, ...props.offspringIds]; } } - conditionParams.value = { - keyword: keyword.value, - filter: propsRes.value.filter, - combine: batchParams.value.condition, - }; return { moduleIds, diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/tabDefect.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/tabDefect.vue index 7ac79e20c5..ed1b5f1be1 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/tabDefect.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/tabDefect.vue @@ -222,6 +222,15 @@ ellipsis: true, showDrag: false, }, + { + title: 'common.creator', + slotName: 'createUserName', + dataIndex: 'createUserName', + showInTable: true, + showTooltip: true, + width: 200, + ellipsis: true, + }, { title: 'caseManagement.featureCase.updateUser', slotName: 'handleUserName', diff --git a/frontend/src/views/setting/organization/serviceIntegration/components/configModal.vue b/frontend/src/views/setting/organization/serviceIntegration/components/configModal.vue index 48660f2b0b..55b01f6f1b 100644 --- a/frontend/src/views/setting/organization/serviceIntegration/components/configModal.vue +++ b/frontend/src/views/setting/organization/serviceIntegration/components/configModal.vue @@ -18,8 +18,16 @@ @@ -203,4 +211,4 @@ }); - \ No newline at end of file + diff --git a/frontend/src/views/setting/organization/serviceIntegration/locale/en-US.ts b/frontend/src/views/setting/organization/serviceIntegration/locale/en-US.ts index ecfbe90c4d..e4ce67d58f 100644 --- a/frontend/src/views/setting/organization/serviceIntegration/locale/en-US.ts +++ b/frontend/src/views/setting/organization/serviceIntegration/locale/en-US.ts @@ -1,7 +1,11 @@ export default { 'organization.service.searchPlugin': 'Search by plug-in name', 'system.service.statusEnableTip': 'Open: Projects can be integrated with the platform', - 'system.service.statusDisableTip': 'Shutdown: Projects cannot integrate with the platform', + 'organization.service.statusJiraEnableTip': + 'Open: can integrate with the platform and generate default templates for the platform', + 'system.service.statusDisableTip': 'Off: Projects cannot integrate with the platform', + 'organization.service.statusJiraDisableTip': + 'Off: The project cannot be integrated with the platform and the platform default template is not available', 'organization.service.headerTip': 'Service integration usage guidelines', 'organization.service.integrationList': 'Integration of List', 'organization.service.packUp': 'Pack Up', diff --git a/frontend/src/views/setting/organization/serviceIntegration/locale/zh-CN.ts b/frontend/src/views/setting/organization/serviceIntegration/locale/zh-CN.ts index de5845d60e..a1525d96cc 100644 --- a/frontend/src/views/setting/organization/serviceIntegration/locale/zh-CN.ts +++ b/frontend/src/views/setting/organization/serviceIntegration/locale/zh-CN.ts @@ -1,7 +1,9 @@ export default { 'organization.service.searchPlugin': '通过插件名称搜索', 'organization.service.statusEnableTip': '开启：项目可以与该平台集成', + 'organization.service.statusJiraEnableTip': '开启：项目可以与该平台集成并生成该平台的默认模板', 'organization.service.statusDisableTip': '关闭：项目无法与该平台集成', + 'organization.service.statusJiraDisableTip': '关闭：项目无法与该平台集成且该平台默认模板不可用', 'organization.service.headerTip': '服务集成 使用指引', 'organization.service.integrationList': '集成列表', 'organization.service.packUp': '收起', diff --git a/frontend/src/views/test-plan/report/component/reportList.vue b/frontend/src/views/test-plan/report/component/reportList.vue index 515ed60210..d426546fef 100644 --- a/frontend/src/views/test-plan/report/component/reportList.vue +++ b/frontend/src/views/test-plan/report/component/reportList.vue @@ -93,7 +93,7 @@