-
+
+
@@ -8,22 +8,23 @@
- {{ t('project.commonScript.codeSnippet') }}
+ {{ t('project.commonScript.codeSnippet') }}
-
-
-
- {{ item.text }}
-
-
-
+
+
+
+
+ {{ item.text }}
+
+
+
+
-
({{ nodeData.count || 0 }})
+
({{ nodeData.count || 0 }})
diff --git a/frontend/src/components/business/ms-tree/index.vue b/frontend/src/components/business/ms-tree/index.vue
index 765ff979c1..c6352d9cb6 100644
--- a/frontend/src/components/business/ms-tree/index.vue
+++ b/frontend/src/components/business/ms-tree/index.vue
@@ -405,7 +405,7 @@
@apply h-full;
.ms-tree {
.ms-scroll-bar();
- @apply h-full;
+ @apply h-full overflow-auto;
.arco-tree-node {
border-radius: var(--border-radius-small);
&:hover {
@@ -418,6 +418,9 @@
}
}
}
+ .ms-tree-node-count {
+ @apply hidden;
+ }
.ms-tree-node-extra {
@apply visible w-auto;
}
diff --git a/frontend/src/components/pure/ms-code-editor/index.vue b/frontend/src/components/pure/ms-code-editor/index.vue
index bbfcbe8e6f..970729beba 100644
--- a/frontend/src/components/pure/ms-code-editor/index.vue
+++ b/frontend/src/components/pure/ms-code-editor/index.vue
@@ -252,6 +252,10 @@
}
}
}
+ // 获取编码方式对应内容
+ function getEncodingCode() {
+ return editor.getValue();
+ }
const init = () => {
// 注册自定义主题 TODO:自定义主题高亮色还没配置
@@ -351,6 +355,7 @@
undo,
redo,
format,
+ getEncodingCode,
};
},
});
diff --git a/frontend/src/components/pure/navbar/index.vue b/frontend/src/components/pure/navbar/index.vue
index 04fe182217..2cc64335f0 100644
--- a/frontend/src/components/pure/navbar/index.vue
+++ b/frontend/src/components/pure/navbar/index.vue
@@ -265,6 +265,12 @@
function goMessageCenter() {
messageCenterVisible.value = true;
}
+
+ onMounted(() => {
+ if (route.query.task) {
+ goTaskCenter();
+ }
+ });
diff --git a/frontend/src/views/api-test/debug/components/moduleTree.vue b/frontend/src/views/api-test/debug/components/moduleTree.vue
index 85a85177a4..24bd945b3b 100644
--- a/frontend/src/views/api-test/debug/components/moduleTree.vue
+++ b/frontend/src/views/api-test/debug/components/moduleTree.vue
@@ -105,7 +105,7 @@
{{ nodeData.name }}
-
({{ nodeData.count || 0 }})
+
({{ nodeData.count || 0 }})
diff --git a/frontend/src/views/api-test/management/components/management/api/preview/quote.vue b/frontend/src/views/api-test/management/components/management/api/preview/quote.vue
index 48e958b3dc..6722bfdae0 100644
--- a/frontend/src/views/api-test/management/components/management/api/preview/quote.vue
+++ b/frontend/src/views/api-test/management/components/management/api/preview/quote.vue
@@ -50,12 +50,20 @@
dataIndex: 'num',
slotName: 'num',
width: 150,
+ sortable: {
+ sortDirections: ['ascend', 'descend'],
+ sorter: true,
+ },
},
{
title: 'apiTestManagement.resourceName',
dataIndex: 'resourceName',
showTooltip: true,
width: 150,
+ sortable: {
+ sortDirections: ['ascend', 'descend'],
+ sorter: true,
+ },
},
{
title: 'apiTestManagement.resourceType',
@@ -87,6 +95,7 @@
scroll: { x: '100%' },
selectable: false,
heightUsed: 374,
+ showJumpMethod: true,
},
(item) => ({
...item,
diff --git a/frontend/src/views/api-test/management/components/moduleTree.vue b/frontend/src/views/api-test/management/components/moduleTree.vue
index 6a852432a5..bb54e5c3fb 100644
--- a/frontend/src/views/api-test/management/components/moduleTree.vue
+++ b/frontend/src/views/api-test/management/components/moduleTree.vue
@@ -130,7 +130,7 @@
{{ nodeData.name }}
-
({{ modulesCount[nodeData.id] || 0 }})
diff --git a/frontend/src/views/api-test/scenario/components/common/importApiDrawer/moduleTree.vue b/frontend/src/views/api-test/scenario/components/common/importApiDrawer/moduleTree.vue
index 6ee8d8311e..6b6785d97b 100644
--- a/frontend/src/views/api-test/scenario/components/common/importApiDrawer/moduleTree.vue
+++ b/frontend/src/views/api-test/scenario/components/common/importApiDrawer/moduleTree.vue
@@ -48,7 +48,9 @@
{{ nodeData.name }}
-
({{ moduleCountMap[nodeData.id] || 0 }})
+
({{ moduleCountMap[nodeData.id] || 0 }})
diff --git a/frontend/src/views/api-test/scenario/components/operationScenarioModuleTree.vue b/frontend/src/views/api-test/scenario/components/operationScenarioModuleTree.vue
index faaf269fb9..235d56ccf0 100644
--- a/frontend/src/views/api-test/scenario/components/operationScenarioModuleTree.vue
+++ b/frontend/src/views/api-test/scenario/components/operationScenarioModuleTree.vue
@@ -30,7 +30,7 @@
{{ nodeData.name }}
-
({{ nodeData.count || 0 }})
+
({{ nodeData.count || 0 }})
diff --git a/frontend/src/views/api-test/scenario/recycle/recycleTree.vue b/frontend/src/views/api-test/scenario/recycle/recycleTree.vue
index a6c96f3e5f..bb83d4df0b 100644
--- a/frontend/src/views/api-test/scenario/recycle/recycleTree.vue
+++ b/frontend/src/views/api-test/scenario/recycle/recycleTree.vue
@@ -46,7 +46,7 @@
{{ nodeData.name }}
-
({{ nodeData.count || 0 }})
+
({{ nodeData.count || 0 }})
diff --git a/frontend/src/views/bug-management/components/bug-detail-drawer.vue b/frontend/src/views/bug-management/components/bug-detail-drawer.vue
index e36fb6715d..7a4584335e 100644
--- a/frontend/src/views/bug-management/components/bug-detail-drawer.vue
+++ b/frontend/src/views/bug-management/components/bug-detail-drawer.vue
@@ -445,25 +445,32 @@
emit('submit');
}
+ const tabList = [
+ {
+ value: 'detail',
+ label: t('bugManagement.detail.detail'),
+ },
+ {
+ value: 'case',
+ label: t('bugManagement.detail.case'),
+ },
+ {
+ value: 'comment',
+ label: t('bugManagement.detail.comment'),
+ },
+ {
+ value: 'history',
+ label: t('bugManagement.detail.changeHistory'),
+ },
+ ];
+
+ /**
+ * 如果模块没有开启用例管理
+ */
const contentTabList = computed(() => {
- return [
- {
- value: 'detail',
- label: t('bugManagement.detail.detail'),
- },
- {
- value: 'case',
- label: t('bugManagement.detail.case'),
- },
- {
- value: 'comment',
- label: t('bugManagement.detail.comment'),
- },
- {
- value: 'history',
- label: t('bugManagement.detail.changeHistory'),
- },
- ];
+ return appStore.currentMenuConfig.includes('caseManagement')
+ ? tabList
+ : tabList.filter((item) => item.value !== 'case');
});
function updateHandler() {
@@ -784,7 +791,6 @@
// width: 100%;
// word-wrap: break-word;
//}
-
:deep(.arco-form-item-content) {
overflow-wrap: anywhere;
}
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseTree.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseTree.vue
index df3b558406..55a4c991ec 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/caseTree.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/caseTree.vue
@@ -1,5 +1,5 @@
-
+
{{ nodeData.name }}
-
({{ nodeData.count || 0 }})
+
({{ nodeData.count || 0 }})
@@ -343,7 +345,7 @@
};
}
return {
- height: 'calc(100vh - 325px)',
+ height: 'calc(100vh - 335px)',
threshold: 200,
fixedSize: true,
buffer: 15,
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue b/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue
index 1de8114403..20c3a234e0 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue
@@ -52,7 +52,9 @@
{{ nodeData.name }}
-
({{ nodeData.count || 0 }})
+
({{ nodeData.count || 0 }})
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/preAndPostCaseDrawer.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/preAndPostCaseDrawer.vue
index c092ce7682..c1718253ac 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/preAndPostCaseDrawer.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/preAndPostCaseDrawer.vue
@@ -50,7 +50,7 @@
@click="setFocusKey(nodeData)"
>{{ nodeData.name }}
-