diff --git a/frontend/.prettierignore b/frontend/.prettierignore index 9dfa85ffbf..eb091a859d 100644 --- a/frontend/.prettierignore +++ b/frontend/.prettierignore @@ -4,4 +4,5 @@ /node_modules/** **/*.svg -**/*.sh \ No newline at end of file +**/*.sh +src/auto-imports.js \ No newline at end of file diff --git a/frontend/src/api/modules/project-management/menuManagement.ts b/frontend/src/api/modules/project-management/menuManagement.ts index 23eb4e822c..70804ebae4 100644 --- a/frontend/src/api/modules/project-management/menuManagement.ts +++ b/frontend/src/api/modules/project-management/menuManagement.ts @@ -30,7 +30,7 @@ export function postUpdateMenu(data: MenuTableListParams) { suffix = 'test-plan'; break; case MenuEnum.bugManagement: - suffix = 'issue'; + suffix = 'bug'; break; case MenuEnum.caseManagement: suffix = 'case'; @@ -58,7 +58,7 @@ export function getConfigByMenuItem(data: MenuTableListParams) { suffix = 'test-plan'; break; case MenuEnum.bugManagement: - suffix = 'issue'; + suffix = 'bug'; break; case MenuEnum.caseManagement: suffix = 'case'; diff --git a/frontend/src/assets/style/arco-reset.less b/frontend/src/assets/style/arco-reset.less index 3cb51e3a60..f4ed4cd55c 100644 --- a/frontend/src/assets/style/arco-reset.less +++ b/frontend/src/assets/style/arco-reset.less @@ -210,7 +210,7 @@ .arco-select-view-single, .arco-select { border: 1px solid var(--color-text-input-border); - background-color: var(--color-text-fff) !important; + background-color: var(--color-text-fff); &:not(:disabled):hover { border-color: rgb(var(--primary-5)); } diff --git a/frontend/src/components/pure/ms-rich-text/MsRichText.vue b/frontend/src/components/pure/ms-rich-text/MsRichText.vue index 586b41e9d7..06d4598e4e 100644 --- a/frontend/src/components/pure/ms-rich-text/MsRichText.vue +++ b/frontend/src/components/pure/ms-rich-text/MsRichText.vue @@ -115,6 +115,7 @@ ], onUpdate: () => { content.value = `${editor.value?.getHTML()}`; + console.log(content.value); }, }); diff --git a/frontend/src/components/pure/ms-table/base-table.vue b/frontend/src/components/pure/ms-table/base-table.vue index cfe35cb164..1566e17043 100644 --- a/frontend/src/components/pure/ms-table/base-table.vue +++ b/frontend/src/components/pure/ms-table/base-table.vue @@ -408,6 +408,9 @@ initColumn(); batchLeft.value = getBatchLeft(); }); + defineExpose({ + initColumn, + }); diff --git a/frontend/src/components/pure/ms-time-selector/locale/en-US.ts b/frontend/src/components/pure/ms-time-selector/locale/en-US.ts index ff8b4c5632..b3a1011e86 100644 --- a/frontend/src/components/pure/ms-time-selector/locale/en-US.ts +++ b/frontend/src/components/pure/ms-time-selector/locale/en-US.ts @@ -1 +1,6 @@ -export default {}; +export default { + 'msTimeSelector.hour': 'Hour', + 'msTimeSelector.day': 'Day', + 'msTimeSelector.month': 'Month', + 'msTimeSelector.year': 'Year', +}; diff --git a/frontend/src/components/pure/ms-time-selector/locale/zh-CN.ts b/frontend/src/components/pure/ms-time-selector/locale/zh-CN.ts index ff8b4c5632..f9a2bfa5f1 100644 --- a/frontend/src/components/pure/ms-time-selector/locale/zh-CN.ts +++ b/frontend/src/components/pure/ms-time-selector/locale/zh-CN.ts @@ -1 +1,6 @@ -export default {}; +export default { + 'msTimeSelector.hour': '小时', + 'msTimeSelector.day': '天', + 'msTimeSelector.month': '月', + 'msTimeSelector.year': '年', +}; diff --git a/frontend/src/router/routes/modules/projectManagement.ts b/frontend/src/router/routes/modules/projectManagement.ts index 82faabb818..f633879e79 100644 --- a/frontend/src/router/routes/modules/projectManagement.ts +++ b/frontend/src/router/routes/modules/projectManagement.ts @@ -41,7 +41,7 @@ const ProjectManagement: AppRouteRecordRaw = { { path: 'menuManagement', name: ProjectManagementRouteEnum.PROJECT_MANAGEMENT_PERMISSION_MENU_MANAGEMENT, - component: () => import('@/views/project-management/projectAndPermission/menuManagement/index.vue'), + component: () => import('@/views/project-management/projectAndPermission/menuManagement/menuManagement.vue'), meta: { locale: 'project.permission.menuManagement', roles: ['*'], diff --git a/frontend/src/views/bug-management/index.vue b/frontend/src/views/bug-management/index.vue index cacd098ca1..782fab7973 100644 --- a/frontend/src/views/bug-management/index.vue +++ b/frontend/src/views/bug-management/index.vue @@ -12,7 +12,9 @@ @select="onSelect" @ok="onOk" /> - + + +
value: {{ timeValue }}
@@ -20,6 +22,8 @@ import MsPagination from '@/components/pure/ms-pagination/index'; import MsCard from '@/components/pure/ms-card/index.vue'; import MsRichText from '@/components/pure/ms-rich-text/MsRichText.vue'; + import MsTimeSelector from '@/components/pure/ms-time-selector/MsTimeSelector.vue'; const content = ref(''); + const timeValue = ref('3M'); diff --git a/frontend/src/views/project-management/projectAndPermission/menuManagement/locale/zh-CN.ts b/frontend/src/views/project-management/projectAndPermission/menuManagement/locale/zh-CN.ts index e80962325e..c7e0197166 100644 --- a/frontend/src/views/project-management/projectAndPermission/menuManagement/locale/zh-CN.ts +++ b/frontend/src/views/project-management/projectAndPermission/menuManagement/locale/zh-CN.ts @@ -23,9 +23,8 @@ export default { 'project.menu.API_SYNC_CASE': '变更同步CASE', 'project.menu.CASE_PUBLIC': '公共用例库', - 'project.menu.CASE_RE_REVIEW': '关联需求', - 'project.menu.CASE_RELATED': '重新提审', - 'project.menu.CASE_ENABLE': '接口测试待更新同步规则', + 'project.menu.CASE_RE_REVIEW': '重新提审', + 'project.menu.CASE_ENABLE': '关联需求', 'project.menu.ISSUE_SYNC': '同步缺陷', 'project.menu.CRON_EXPRESSION': '同步频率', 'project.menu.SYNC_ENABLE': '状态', diff --git a/frontend/src/views/project-management/projectAndPermission/menuManagement/index.vue b/frontend/src/views/project-management/projectAndPermission/menuManagement/menuManagement.vue similarity index 87% rename from frontend/src/views/project-management/projectAndPermission/menuManagement/index.vue rename to frontend/src/views/project-management/projectAndPermission/menuManagement/menuManagement.vue index 64583ab46d..e906e1523b 100644 --- a/frontend/src/views/project-management/projectAndPermission/menuManagement/index.vue +++ b/frontend/src/views/project-management/projectAndPermission/menuManagement/menuManagement.vue @@ -32,11 +32,11 @@
- +
- +
@@ -47,28 +47,28 @@ {{ t('project.menu.row3') }}
-
+
{{ t('project.menu.row4') }}
{{ t('project.menu.rr') }}
-
+
{{ t('project.menu.row5') }}
- + {{ t('project.menu.row6') }}
- +
- - + +
- +
@@ -77,7 +77,7 @@
- +
@@ -86,8 +86,8 @@
- - + +
{{ t('project.menu.far') }}
@@ -98,15 +98,15 @@
{{ t('project.menu.row7') }}
- +
- +
- +
@@ -115,15 +115,15 @@
- +
- +
- +
@@ -134,14 +134,13 @@ @@ -161,6 +160,9 @@ import { MenuTableListItem } from '@/models/projectManagement/menuManagement'; import { MenuEnum } from '@/enums/commonEnum'; import { Message, TableData } from '@arco-design/web-vue'; + import MsTimeSelectorVue from '@/components/pure/ms-time-selector/MsTimeSelector.vue'; + import MsDrawer from '@/components/pure/ms-drawer/index.vue'; + import DefectSync from './components/defectSync.vue'; const appStore = useAppStore(); const currentProjectId = computed(() => appStore.currentProjectId);