From e212c80a3d10db8e62c8b3a838e355b684a49450 Mon Sep 17 00:00:00 2001 From: teukkk Date: Tue, 25 Jun 2024 18:13:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=A8=E6=A0=BC=E7=BB=84=E4=BB=B6enab?= =?UTF-8?q?leDrag=E5=AD=97=E6=AE=B5=E6=9B=BF=E6=8D=A2=E6=88=90draggable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/pure/ms-table/useTable.ts | 6 ------ frontend/src/views/bug-management/components/bugCaseTab.vue | 1 - .../caseManagementFeature/components/addStep.vue | 2 +- .../caseManagementFeature/components/caseTable.vue | 2 +- .../caseManagementFeature/components/recycleCaseTable.vue | 2 +- .../components/tabContent/tabBug/bugList.vue | 1 - .../components/tabContent/tabBug/linkDefectDrawer.vue | 1 - .../components/tabContent/tabBug/tabDefect.vue | 2 +- .../components/tabContent/tabCase/tabCaseTable.vue | 1 - .../components/tabContent/tabCaseReview.vue | 2 +- .../components/tabContent/tabChangeHistory.vue | 1 - .../components/tabContent/tabDependency/tabDependency.vue | 1 - .../components/tabContent/tabTestPlan.vue | 1 - .../environmental/components/envParams/HttpTab.vue | 2 +- .../environmental/components/envParams/popUp/domain.vue | 1 - .../project-management/taskCenter/component/apiCase.vue | 1 - .../taskCenter/component/scheduledTask.vue | 1 - .../project-management/taskCenter/component/testPlan.vue | 1 - .../template/components/caseTemplateLeftContent.vue | 1 - .../testPlan/detail/bugManagement/caseCountPopover.vue | 1 - .../views/test-plan/testPlan/detail/bugManagement/index.vue | 1 - .../detail/featureCase/components/bugCountPopover.vue | 1 - 22 files changed, 6 insertions(+), 27 deletions(-) diff --git a/frontend/src/components/pure/ms-table/useTable.ts b/frontend/src/components/pure/ms-table/useTable.ts index ad8c43ea95..9de498bd1d 100644 --- a/frontend/src/components/pure/ms-table/useTable.ts +++ b/frontend/src/components/pure/ms-table/useTable.ts @@ -66,7 +66,6 @@ export default function useTableProps( selectorStatus: SelectAllEnum.NONE, // 选择器状态 showSelectorAll: true, // 是否显示全选 /** end */ - enableDrag: false, // 是否可拖拽 showSetting: false, // 是否展示列选择器 columnResizable: true, pagination: false, // 禁用 arco-table 的分页 @@ -114,11 +113,6 @@ export default function useTableProps( }; } - // 是否可拖拽 - if (propsRes.value.enableDrag) { - propsRes.value.draggable = { type: 'handle' }; - } - // 加载效果 const setLoading = (status: boolean) => { propsRes.value.loading = status; diff --git a/frontend/src/views/bug-management/components/bugCaseTab.vue b/frontend/src/views/bug-management/components/bugCaseTab.vue index 134116254b..e68c43b6a6 100644 --- a/frontend/src/views/bug-management/components/bugCaseTab.vue +++ b/frontend/src/views/bug-management/components/bugCaseTab.vue @@ -191,7 +191,6 @@ columns, scroll: { x: '100%' }, heightUsed: 310, - enableDrag: false, }); const innerVisible = ref(false); diff --git a/frontend/src/views/case-management/caseManagementFeature/components/addStep.vue b/frontend/src/views/case-management/caseManagementFeature/components/addStep.vue index 67c7ab023c..6ef42f5806 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/addStep.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/addStep.vue @@ -218,7 +218,7 @@ size: 'default', showSetting: false, showPagination: false, - enableDrag: true, + draggable: { type: 'handle' }, }); // 复制步骤 diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue index 5c81e70c35..fa1d1de747 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue @@ -838,7 +838,7 @@ selectable: true, showSetting: true, heightUsed: 236, - enableDrag: true, + draggable: { type: 'handle' }, showSubdirectory: true, paginationSize: 'mini', }, diff --git a/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue b/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue index 4f0c946d9d..cb1d19aba0 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue @@ -232,7 +232,7 @@ selectable: true, showSetting: true, heightUsed: 380, - enableDrag: true, + draggable: { type: 'handle' }, showSubdirectory: true, }, (record) => ({ diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/bugList.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/bugList.vue index 8638b5560c..d1deabc8dc 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/bugList.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/bugList.vue @@ -99,7 +99,6 @@ columns: props.bugColumns, scroll: { x: '100%' }, heightUsed: 340, - enableDrag: false, }); const innerKeyword = useVModel(props, 'keyword', emit); diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/linkDefectDrawer.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/linkDefectDrawer.vue index 35d18d4935..585de84268 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/linkDefectDrawer.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/linkDefectDrawer.vue @@ -149,7 +149,6 @@ selectable: true, showSelectorAll: props.showSelectorAll, heightUsed: 340, - enableDrag: false, }, (record) => { return { 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 2ab2609c2b..733b5604c2 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 @@ -295,7 +295,7 @@ } = useTable(getLinkedCaseBugList, { columns: testPlanColumns, heightUsed: 354, - enableDrag: true, + draggable: { type: 'handle' }, }); function initTableParams() { diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabCase/tabCaseTable.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabCase/tabCaseTable.vue index 519100d14b..ee1460662d 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabCase/tabCaseTable.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabCase/tabCaseTable.vue @@ -181,7 +181,6 @@ scroll: { x: '100%' }, showSelectorAll: false, heightUsed: 340, - enableDrag: false, }); const innerVisible = ref(false); diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabCaseReview.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabCaseReview.vue index 40925e5b92..3be3258dda 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabCaseReview.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabCaseReview.vue @@ -133,7 +133,7 @@ tableKey: TableKeyEnum.CASE_MANAGEMENT_TAB_REVIEW, scroll: { x: '100%' }, heightUsed: 360, - enableDrag: true, + draggable: { type: 'handle' }, }); async function initData() { diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabChangeHistory.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabChangeHistory.vue index 35b311ccbf..dba9559169 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabChangeHistory.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabChangeHistory.vue @@ -159,7 +159,6 @@ scroll: { x: '100%' }, selectable: false, heightUsed: 340, - enableDrag: false, }); const form = ref({ diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/tabDependency.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/tabDependency.vue index abaa76b732..24caf9dcfe 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/tabDependency.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/tabDependency.vue @@ -162,7 +162,6 @@ selectable: false, noDisable: true, showSetting: false, - enableDrag: false, }); function getParams() { diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabTestPlan.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabTestPlan.vue index bbe7af118b..a07a9dd9ff 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabTestPlan.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabTestPlan.vue @@ -144,7 +144,6 @@ tableKey: TableKeyEnum.CASE_MANAGEMENT_TAB_TEST_PLAN, scroll: { x: '100%' }, heightUsed: 340, - enableDrag: false, }, (item) => { return { diff --git a/frontend/src/views/project-management/environmental/components/envParams/HttpTab.vue b/frontend/src/views/project-management/environmental/components/envParams/HttpTab.vue index bc07a40e27..b1dda068db 100644 --- a/frontend/src/views/project-management/environmental/components/envParams/HttpTab.vue +++ b/frontend/src/views/project-management/environmental/components/envParams/HttpTab.vue @@ -178,7 +178,7 @@ noDisable: true, showSetting: true, showPagination: false, - enableDrag: true, + draggable: { type: 'handle' }, showMode: false, heightUsed: 644, debug: true, diff --git a/frontend/src/views/project-management/environmental/components/envParams/popUp/domain.vue b/frontend/src/views/project-management/environmental/components/envParams/popUp/domain.vue index 5ed2cf343a..866918c5c4 100644 --- a/frontend/src/views/project-management/environmental/components/envParams/popUp/domain.vue +++ b/frontend/src/views/project-management/environmental/components/envParams/popUp/domain.vue @@ -104,7 +104,6 @@ noDisable: true, showSetting: false, showPagination: false, - enableDrag: false, showMode: false, heightUsed: 644, debug: true, diff --git a/frontend/src/views/project-management/taskCenter/component/apiCase.vue b/frontend/src/views/project-management/taskCenter/component/apiCase.vue index 4e2ebadcf2..3422980962 100644 --- a/frontend/src/views/project-management/taskCenter/component/apiCase.vue +++ b/frontend/src/views/project-management/taskCenter/component/apiCase.vue @@ -394,7 +394,6 @@ showSetting: true, selectable: hasOperationPermission.value, heightUsed: 330, - enableDrag: false, showSelectAll: true, } ); diff --git a/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue b/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue index 2c97efb688..c3a61d7dfe 100644 --- a/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue +++ b/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue @@ -432,7 +432,6 @@ showSetting: true, selectable: hasOperationPermission.value, heightUsed: 300, - enableDrag: false, showSelectorAll: true, }, // eslint-disable-next-line no-return-assign diff --git a/frontend/src/views/project-management/taskCenter/component/testPlan.vue b/frontend/src/views/project-management/taskCenter/component/testPlan.vue index 86a1e066df..6c27a7b3fa 100644 --- a/frontend/src/views/project-management/taskCenter/component/testPlan.vue +++ b/frontend/src/views/project-management/taskCenter/component/testPlan.vue @@ -346,7 +346,6 @@ showSetting: true, selectable: hasOperationPermission.value, heightUsed: 330, - enableDrag: false, showSelectAll: true, } ); diff --git a/frontend/src/views/setting/organization/template/components/caseTemplateLeftContent.vue b/frontend/src/views/setting/organization/template/components/caseTemplateLeftContent.vue index 62ff90db4e..a2d064ffbf 100644 --- a/frontend/src/views/setting/organization/template/components/caseTemplateLeftContent.vue +++ b/frontend/src/views/setting/organization/template/components/caseTemplateLeftContent.vue @@ -169,7 +169,6 @@ size: 'default', showSetting: true, showPagination: false, - enableDrag: false, }); const addStep = () => {}; diff --git a/frontend/src/views/test-plan/testPlan/detail/bugManagement/caseCountPopover.vue b/frontend/src/views/test-plan/testPlan/detail/bugManagement/caseCountPopover.vue index 5f2faac121..f2a74b2e8f 100644 --- a/frontend/src/views/test-plan/testPlan/detail/bugManagement/caseCountPopover.vue +++ b/frontend/src/views/test-plan/testPlan/detail/bugManagement/caseCountPopover.vue @@ -56,7 +56,6 @@ scroll: { x: '100%' }, showSelectorAll: false, heightUsed: 340, - enableDrag: false, showPagination: false, }); diff --git a/frontend/src/views/test-plan/testPlan/detail/bugManagement/index.vue b/frontend/src/views/test-plan/testPlan/detail/bugManagement/index.vue index 1bfb243a04..086be6ca80 100644 --- a/frontend/src/views/test-plan/testPlan/detail/bugManagement/index.vue +++ b/frontend/src/views/test-plan/testPlan/detail/bugManagement/index.vue @@ -144,7 +144,6 @@ scroll: { x: '100%' }, showSelectorAll: false, heightUsed: 340, - enableDrag: false, }); const count = computed(() => { diff --git a/frontend/src/views/test-plan/testPlan/detail/featureCase/components/bugCountPopover.vue b/frontend/src/views/test-plan/testPlan/detail/featureCase/components/bugCountPopover.vue index c546c82333..6906655cb8 100644 --- a/frontend/src/views/test-plan/testPlan/detail/featureCase/components/bugCountPopover.vue +++ b/frontend/src/views/test-plan/testPlan/detail/featureCase/components/bugCountPopover.vue @@ -76,7 +76,6 @@ scroll: { x: '100%' }, showSelectorAll: false, heightUsed: 340, - enableDrag: false, showPagination: false, }); const { propsRes, propsEvent, setLoading } = useTable(undefined, tableProps.value);