diff --git a/frontend/config/plugin/arcoStyleImport.ts b/frontend/config/plugin/arcoStyleImport.ts
index 3f166aa7de..ee75367f57 100644
--- a/frontend/config/plugin/arcoStyleImport.ts
+++ b/frontend/config/plugin/arcoStyleImport.ts
@@ -9,7 +9,7 @@ import { vitePluginForArco } from '@arco-plugins/vite-vue';
export default function configArcoStyleImportPlugin() {
// 按需加载主题样式
const arcoResolverPlugin = vitePluginForArco({
- theme: '@arco-themes/vue-ms-theme-default',
+ theme: '@arco-themes/vue-metersphere-v3',
});
return arcoResolverPlugin;
}
diff --git a/frontend/package.json b/frontend/package.json
index 46444a751c..d2bac26eb7 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -38,8 +38,8 @@
"dependencies": {
"@7polo/kity": "2.0.8",
"@7polo/kityminder-core": "1.4.53",
- "@arco-design/web-vue": "^2.55.0",
- "@arco-themes/vue-ms-theme-default": "^0.0.30",
+ "@arco-design/web-vue": "^2.55.1",
+ "@arco-themes/vue-metersphere-v3": "^0.0.1",
"@form-create/arco-design": "^3.1.23",
"@halo-dev/richtext-editor": "0.0.0-alpha.33",
"@tanstack/vue-query": "^5.17.15",
diff --git a/frontend/src/components/business/ms-tree/index.vue b/frontend/src/components/business/ms-tree/index.vue
index 6d6c14cfdd..ecd82b1af3 100644
--- a/frontend/src/components/business/ms-tree/index.vue
+++ b/frontend/src/components/business/ms-tree/index.vue
@@ -479,16 +479,6 @@
@apply flex-1 overflow-hidden;
}
}
- .arco-tree-node-drag-icon {
- @apply hidden;
-
- // top: 50%;
- // right: 16px;
- // transform: translateY(-50%);
- // .arco-icon {
- // font-size: 14px;
- // }
- }
}
.arco-tree-node-title-block {
width: 60%;
@@ -582,4 +572,8 @@
}
}
}
+ // 为了让挂载在 body 下非 app 内的树节点生效
+ .arco-tree-node-drag-icon {
+ @apply hidden;
+ }
diff --git a/frontend/src/components/pure/ms-table/base-table.vue b/frontend/src/components/pure/ms-table/base-table.vue
index 26e041cbc7..0ad257cee1 100644
--- a/frontend/src/components/pure/ms-table/base-table.vue
+++ b/frontend/src/components/pure/ms-table/base-table.vue
@@ -233,7 +233,7 @@
{{ t('msTable.batch.clear') }}
-
+
-
+
{{ t('msTable.batch.selected', { count: props.selectRowCount }) }}
-
-
-
+
+
+ {{ t(element.label as string) }}
+
+
{{ t(element.label as string) }}
-
-
- {{ t(element.label as string) }}
-
-
-
-
- {{ t(item.label as string) }}
-
-
+
+
+
+
+ {{ t(item.label as string) }}
+
-
-
-
-
-
+
+
+
+
+
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index eb13f4e3c3..94af1d707c 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -1,7 +1,7 @@
/* eslint-disable simple-import-sort/imports */
import { createApp } from 'vue';
import ArcoVue from '@arco-design/web-vue';
-import '@arco-themes/vue-ms-theme-default/index.less';
+import '@arco-themes/vue-metersphere-v3/index.less';
import MsIcon from '@/components/pure/ms-icon-font/index.vue';
import SvgIcon from '@/components/pure/svg-icon/index.vue';
diff --git a/frontend/src/views/api-test/management/components/import.vue b/frontend/src/views/api-test/management/components/import.vue
index 37b343fd1a..c710db10c0 100644
--- a/frontend/src/views/api-test/management/components/import.vue
+++ b/frontend/src/views/api-test/management/components/import.vue
@@ -42,9 +42,10 @@
@@ -247,7 +248,7 @@
mapTree(props.moduleTree, (node) => ({ ...node, draggable: false })));
const syncFrequencyOptions = [
{ label: t('apiTestManagement.timeTaskHour'), value: '0 0 0/1 * * ?' },
{ label: t('apiTestManagement.timeTaskSixHour'), value: '0 0 0/6 * * ?' },
diff --git a/frontend/src/views/api-test/management/components/management/api/index.vue b/frontend/src/views/api-test/management/components/management/api/index.vue
index 212e4b6254..741a0b05a9 100644
--- a/frontend/src/views/api-test/management/components/management/api/index.vue
+++ b/frontend/src/views/api-test/management/components/management/api/index.vue
@@ -57,7 +57,6 @@
diff --git a/frontend/src/views/api-test/management/components/management/api/preview/index.vue b/frontend/src/views/api-test/management/components/management/api/preview/index.vue
index befd58e945..79ab833186 100644
--- a/frontend/src/views/api-test/management/components/management/api/preview/index.vue
+++ b/frontend/src/views/api-test/management/components/management/api/preview/index.vue
@@ -68,17 +68,14 @@
import { RequestParam } from '@/views/api-test/components/requestComposition/index.vue';
import { toggleFollowDefinition } from '@/api/modules/api-test/management';
- import { findNodeByKey } from '@/utils';
import { ProtocolItem } from '@/models/apiTest/common';
- import { ModuleTreeNode } from '@/models/common';
import { RequestMethods } from '@/enums/apiEnum';
import { getValidRequestTableParams } from '@/views/api-test/components/utils';
const props = defineProps<{
detail: RequestParam;
- moduleTree: ModuleTreeNode[];
protocols: ProtocolItem[];
}>();
const emit = defineEmits(['updateFollow']);
@@ -140,7 +137,7 @@
{
key: 'belongModule',
locale: 'apiTestManagement.belongModule',
- value: findNodeByKey(props.moduleTree, previewDetail.value.moduleId, 'id')?.path,
+ value: previewDetail.value.path,
},
{
key: 'creator',
diff --git a/frontend/src/views/api-test/management/index.vue b/frontend/src/views/api-test/management/index.vue
index b650911e51..05a5c3f7af 100644
--- a/frontend/src/views/api-test/management/index.vue
+++ b/frontend/src/views/api-test/management/index.vue
@@ -79,13 +79,12 @@
import { getTrashModuleCount } from '@/api/modules/api-test/management';
import { useI18n } from '@/hooks/useI18n';
+ import useAppStore from '@/store/modules/app';
import { ApiDefinitionGetModuleParams } from '@/models/apiTest/management';
import { ModuleTreeNode } from '@/models/common';
import { ApiTestRouteEnum } from '@/enums/routeEnum';
- import useAppStore from '../../../store/modules/app';
-
const route = useRoute();
const { t } = useI18n();
const router = useRouter();
@@ -100,9 +99,9 @@
const managementRef = ref>();
function handleModuleInit(tree: ModuleTreeNode[], _protocol: string, pathMap: Record) {
- // folderTree.value = tree;
+ folderTree.value = tree;
protocol.value = _protocol;
- // folderTreePathMap.value = pathMap;
+ folderTreePathMap.value = pathMap;
}
function newApi() {