diff --git a/frontend/src/assets/style/global.less b/frontend/src/assets/style/global.less index 76506cd2e4..c19da3720f 100644 --- a/frontend/src/assets/style/global.less +++ b/frontend/src/assets/style/global.less @@ -216,3 +216,11 @@ body { } } } + +// 表格选中行样式 +.selected-row-class.arco-table-tr { + background: var(--color-fill-1) !important; + .arco-table-td { + background: var(--color-fill-1) !important; + } +} diff --git a/frontend/src/components/business/ms-batch-form/index.vue b/frontend/src/components/business/ms-batch-form/index.vue index 442248dfaf..25192bc219 100644 --- a/frontend/src/components/business/ms-batch-form/index.vue +++ b/frontend/src/components/business/ms-batch-form/index.vue @@ -194,15 +194,16 @@ class="minus" :class="[ 'flex', - 'h-full', + 'h-[32px]', 'w-[32px]', 'cursor-pointer', 'items-center', 'justify-center', 'text-[var(--color-text-4)]', - 'mt-[8px]', + 'hover:bg-[var(--color-text-n9)]', + 'rounded', ]" - :style="{ 'margin-top': index === 0 && !props.isShowDrag ? '36px' : '' }" + :style="{ 'margin-top': index === 0 && !props.isShowDrag ? '30px' : '' }" @click="removeField(index)" > diff --git a/frontend/src/components/pure/ms-drawer/index.vue b/frontend/src/components/pure/ms-drawer/index.vue index 119eadeb33..7204cac7da 100644 --- a/frontend/src/components/pure/ms-drawer/index.vue +++ b/frontend/src/components/pure/ms-drawer/index.vue @@ -19,8 +19,8 @@ - - + + {{ props.title }} diff --git a/frontend/src/views/setting/organization/project/components/userDrawer.vue b/frontend/src/views/setting/organization/project/components/userDrawer.vue index c76baf1779..cb835b853e 100644 --- a/frontend/src/views/setting/organization/project/components/userDrawer.vue +++ b/frontend/src/views/setting/organization/project/components/userDrawer.vue @@ -8,6 +8,17 @@ :mask="false" @cancel="handleCancel" > + + + + ( + + {{ props.currentName }} + + ) + + + (); diff --git a/frontend/src/views/setting/organization/project/orgProject.vue b/frontend/src/views/setting/organization/project/orgProject.vue index 4dfe668727..09147c1670 100644 --- a/frontend/src/views/setting/organization/project/orgProject.vue +++ b/frontend/src/views/setting/organization/project/orgProject.vue @@ -17,7 +17,7 @@ @clear="fetchData" > - + @@ -271,6 +271,7 @@ const currentUserDrawer = reactive({ visible: false, projectId: '', + currentName: '', }); const tableActions: ActionsItem[] = [ @@ -339,10 +340,16 @@ const showUserDrawer = (record: TableData) => { currentUserDrawer.visible = true; currentUserDrawer.projectId = record.id; + currentUserDrawer.currentName = record.name; }; + function getRowClass(record: TableData) { + return record.id === currentUserDrawer.projectId ? 'selected-row-class' : ''; + } + const handleUserDrawerCancel = () => { currentUserDrawer.visible = false; + currentUserDrawer.projectId = ''; }; const handleAddProjectModalCancel = (shouldSearch: boolean) => { diff --git a/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue b/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue index 71d287b2fd..19424128fc 100644 --- a/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue +++ b/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue @@ -1,5 +1,5 @@ - + @@ -325,8 +325,13 @@ currentUserDrawer.currentName = record.name; }; + function getRowClass(record: TableData) { + return record.id === currentUserDrawer.organizationId ? 'selected-row-class' : ''; + } + const handleUserDrawerCancel = () => { currentUserDrawer.visible = false; + currentUserDrawer.organizationId = ''; }; const handleAddOrgModalCancel = (shouldSearch: boolean) => { diff --git a/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue b/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue index b6f5a8ca5a..4ffbf4be71 100644 --- a/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue +++ b/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue @@ -1,5 +1,5 @@ - + @@ -292,6 +292,10 @@ currentUserDrawer.currentName = record.name; }; + function getRowClass(record: TableData) { + return record.id === currentUserDrawer.projectId ? 'selected-row-class' : ''; + } + const handleUserDrawerCancel = () => { currentUserDrawer.visible = false; currentUserDrawer.projectId = ''; diff --git a/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue b/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue index 5443706a6c..01e8fd9242 100644 --- a/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue +++ b/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue @@ -9,6 +9,17 @@ :title="t('system.memberList')" @cancel="handleCancel" > + + + + ( + + {{ props.currentName }} + + ) + + +