From 47d3c0d7ffe9cb7db677a45175e2c30ebfb45517 Mon Sep 17 00:00:00 2001 From: "xinxin.wu" Date: Tue, 20 Feb 2024 15:11:30 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=94=A8=E4=BE=8B=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E4=BE=8B=E8=A1=A8=E6=A0=BC=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=92=8C=E5=AF=8C=E6=96=87=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pure/ms-rich-text/MsRichText.vue | 44 +++++++++---------- .../router/routes/modules/caseManagement.ts | 4 +- .../components/caseTable.vue | 1 - .../components/tabContent/settingDrawer.vue | 19 ++++---- .../tabDependency/tabDependency.vue | 6 ++- 5 files changed, 36 insertions(+), 38 deletions(-) diff --git a/frontend/src/components/pure/ms-rich-text/MsRichText.vue b/frontend/src/components/pure/ms-rich-text/MsRichText.vue index 644b2ecca8..b9795bd0ad 100644 --- a/frontend/src/components/pure/ms-rich-text/MsRichText.vue +++ b/frontend/src/components/pure/ms-rich-text/MsRichText.vue @@ -245,21 +245,21 @@ types: ['heading', 'paragraph'], }), ExtensionUnderline, - ExtensionTable.configure({ - resizable: true, - }), + // ExtensionTable.configure({ + // resizable: true, + // }), ExtensionSubscript, ExtensionSuperscript, ExtensionPlaceholder.configure({ placeholder: '输入 / 以选择输入类型', }), ExtensionHighlight, - ExtensionVideo, - ExtensionAudio, + // ExtensionVideo, + // ExtensionAudio, ExtensionCodeBlock.configure({ lowlight, }), - ExtensionIframe, + // ExtensionIframe, ExtensionColor, ExtensionFontSize, ExtensionIndent, @@ -300,26 +300,26 @@ // }, // ]; // }, - getToolbarItems({ editors }: { editors: Editor }) { - return { - priority: 1000, - component: markRaw(ToolbarItem), - props: { - editor, - isActive: showSidebar.value, - title: t(''), - action: () => { - showSidebar.value = !showSidebar.value; - }, - }, - }; - }, + // getToolbarItems({ editors }: { editors: Editor }) { + // return { + // priority: 1000, + // component: markRaw(ToolbarItem), + // props: { + // editor, + // isActive: showSidebar.value, + // title: t(''), + // action: () => { + // showSidebar.value = !showSidebar.value; + // }, + // }, + // }; + // }, }; }, }), ExtensionDraggable, - ExtensionColumns, - ExtensionColumn, + // ExtensionColumns, + // ExtensionColumn, ExtensionNodeSelected, ExtensionTrailingNode, Mention.configure({ diff --git a/frontend/src/router/routes/modules/caseManagement.ts b/frontend/src/router/routes/modules/caseManagement.ts index 7a711ebaad..1988e2b8ac 100644 --- a/frontend/src/router/routes/modules/caseManagement.ts +++ b/frontend/src/router/routes/modules/caseManagement.ts @@ -34,7 +34,7 @@ const CaseManagement: AppRouteRecordRaw = { component: () => import('@/views/case-management/caseManagementFeature/components/caseDetail.vue'), meta: { locale: 'menu.caseManagement.featureCaseDetail', - roles: ['FUNCTIONAL_CASE:READ+ADD'], + roles: ['FUNCTIONAL_CASE:READ+ADD', 'FUNCTIONAL_CASE:READ+UPDATE'], breadcrumbs: [ { name: CaseManagementRouteEnum.CASE_MANAGEMENT_CASE, @@ -66,7 +66,7 @@ const CaseManagement: AppRouteRecordRaw = { component: () => import('@/views/case-management/caseManagementFeature/components/recycleCaseTable.vue'), meta: { locale: 'menu.caseManagement.featureCaseRecycle', - roles: ['FUNCTIONAL_CASE:READ+ADD'], + roles: ['FUNCTIONAL_CASE:READ'], breadcrumbs: [ { name: CaseManagementRouteEnum.CASE_MANAGEMENT_CASE, diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue index 235bac2814..5dc02225a4 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue @@ -1060,7 +1060,6 @@ ...columns.slice(columns.length - 1, columns.length), ]; await tableStore.initColumn(TableKeyEnum.CASE_MANAGEMENT_TABLE, fullColumns, 'drawer'); - tableRef.value?.initColumn(fullColumns); } // 如果是用例等级 diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/settingDrawer.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/settingDrawer.vue index 1d497a4b61..14fe85e074 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/settingDrawer.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/settingDrawer.vue @@ -104,17 +104,14 @@ // let testPlanTab: TabItemType[] = []; function getTabList() { - if (licenseStore.hasLicense()) { - return [ - { - key: 'changeHistory', - title: 'caseManagement.featureCase.changeHistory', - enable: true, - total: 0, - }, - ]; - } - return []; + return [ + { + key: 'changeHistory', + title: 'caseManagement.featureCase.changeHistory', + enable: true, + total: 0, + }, + ]; } const tabDefaultSettingList = 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 f76c2d2a8f..ff5f051a24 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 @@ -192,8 +192,10 @@ watch( () => showType.value, - () => { - initData(); + (val) => { + if (val) { + initData(); + } } );