diff --git a/frontend/src/api/modules/setting/system/organizationAndProject.ts b/frontend/src/api/modules/setting/system/organizationAndProject.ts
index 8e459e5afd..ca092c7782 100644
--- a/frontend/src/api/modules/setting/system/organizationAndProject.ts
+++ b/frontend/src/api/modules/setting/system/organizationAndProject.ts
@@ -30,3 +30,9 @@ export function addUserToOrgOrProject(data: AddUserToOrgOrProjectParams) {
export function getUserByOrganizationOrProject(sourceId: string) {
return MSR.get({ url: `${orgUrl.getUserByOrgOrProjectUrl}${sourceId}` });
}
+// 删除组织或项目成员
+export function deleteUserFromOrgOrProject(sourceId: string, userId: string, isOrg = true) {
+ return MSR.get({
+ url: `${isOrg ? orgUrl.getDeleteOrgMemberUrl : orgUrl.getDeleteProjectMemberUrl}${sourceId}/${userId}`,
+ });
+}
diff --git a/frontend/src/components/bussiness/ms-batch-modal/index.vue b/frontend/src/components/bussiness/ms-batch-modal/index.vue
index 1fd3815459..812ae9e771 100644
--- a/frontend/src/components/bussiness/ms-batch-modal/index.vue
+++ b/frontend/src/components/bussiness/ms-batch-modal/index.vue
@@ -197,7 +197,7 @@
};
watch(
() => props.treeData,
- (newVal, oldVal) => {
+ (newVal) => {
treeList.value = newVal;
transferData = getTransferData(treeList.value, []);
},
diff --git a/frontend/src/components/bussiness/ms-remove-button/MsRemoveButton.vue b/frontend/src/components/bussiness/ms-remove-button/MsRemoveButton.vue
new file mode 100644
index 0000000000..8cc8c2c4d5
--- /dev/null
+++ b/frontend/src/components/bussiness/ms-remove-button/MsRemoveButton.vue
@@ -0,0 +1,47 @@
+
+
+ {{ t('common.remove') }}
+
+
+
+
diff --git a/frontend/src/components/bussiness/ms-user-selector/index.vue b/frontend/src/components/bussiness/ms-user-selector/index.vue
index e642fb458d..6173530c87 100644
--- a/frontend/src/components/bussiness/ms-user-selector/index.vue
+++ b/frontend/src/components/bussiness/ms-user-selector/index.vue
@@ -32,7 +32,7 @@
placeholder?: string;
type?: 'organization' | 'usergroup';
sourceId?: string;
- disabledKey?: 'disabled' | 'memberFlag' | 'adminFlag';
+ disabledKey?: 'disabled' | 'memberFlag';
}
export interface UserItem {
@@ -41,7 +41,6 @@
email: string;
disabled?: boolean;
memberFlag?: boolean;
- adminFlag?: boolean;
}
const fieldNames = { value: 'id', label: 'name' };
diff --git a/frontend/src/components/pure/ms-table/useTable.ts b/frontend/src/components/pure/ms-table/useTable.ts
index 65d5498f00..b5db74f1ed 100644
--- a/frontend/src/components/pure/ms-table/useTable.ts
+++ b/frontend/src/components/pure/ms-table/useTable.ts
@@ -190,8 +190,11 @@ export default function useTableProps(
setTableErrorStatus('error');
} finally {
setLoading(false);
- // eslint-disable-next-line no-console
- if (propsRes.value.debug) console.info(propsRes.value);
+ // debug 模式下打印属性
+ if (propsRes.value.debug && import.meta.env.DEV) {
+ // eslint-disable-next-line no-console
+ console.log('Table propsRes: ', propsRes.value);
+ }
}
};
diff --git a/frontend/src/locale/en-US/common.ts b/frontend/src/locale/en-US/common.ts
index bb7ef4279d..36b39cb3f1 100644
--- a/frontend/src/locale/en-US/common.ts
+++ b/frontend/src/locale/en-US/common.ts
@@ -1,3 +1,30 @@
export default {
'common.pleaseSelectMember': 'Please select member',
+ 'common.add': 'Add',
+ 'common.edit': 'Edit',
+ 'common.delete': 'Delete',
+ 'common.save': 'Save',
+ 'common.cancel': 'Cancel',
+ 'common.confirm': 'Confirm',
+ 'common.confirmDelete': 'Confirm delete',
+ 'common.search': 'Search',
+ 'common.reset': 'Reset',
+ 'common.retry': 'Retry',
+ 'common.all': 'All',
+ 'common.operation': 'Operation',
+ 'common.remove': 'Remove',
+ 'common.revoked': 'Revoked',
+ 'common.deleteConfirm': 'Confirm delete?',
+ 'common.deleteSuccess': 'Delete success',
+ 'common.deleteFailed': 'Delete failed',
+ 'common.addSuccess': 'Add success',
+ 'common.addFailed': 'Add failed',
+ 'common.editSuccess': 'Edit success',
+ 'common.editFailed': 'Edit failed',
+ 'common.saveSuccess': 'Save success',
+ 'common.saveFailed': 'Save failed',
+ 'common.operationSuccess': 'Operation success',
+ 'common.operationFailed': 'Operation failed',
+ 'common.removeSuccess': 'Remove success',
+ 'common.removeFailed': 'Remove failed',
};
diff --git a/frontend/src/locale/zh-CN/common.ts b/frontend/src/locale/zh-CN/common.ts
index eaeab0678c..62563c428f 100644
--- a/frontend/src/locale/zh-CN/common.ts
+++ b/frontend/src/locale/zh-CN/common.ts
@@ -1,3 +1,30 @@
export default {
'common.pleaseSelectMember': '请选择成员',
+ 'common.add': '添加',
+ 'common.edit': '编辑',
+ 'common.delete': '删除',
+ 'common.save': '保存',
+ 'common.cancel': '取消',
+ 'common.confirm': '确认',
+ 'common.confirmDelete': '确认删除',
+ 'common.search': '搜索',
+ 'common.reset': '重置',
+ 'common.retry': '重试',
+ 'common.all': '全部',
+ 'common.operation': '操作',
+ 'common.remove': '移除',
+ 'common.revoked': '已撤销',
+ 'common.deleteConfirm': '确认删除?',
+ 'common.deleteSuccess': '删除成功',
+ 'common.deleteFailed': '删除失败',
+ 'common.addSuccess': '添加成功',
+ 'common.addFailed': '添加失败',
+ 'common.editSuccess': '编辑成功',
+ 'common.editFailed': '编辑失败',
+ 'common.saveSuccess': '保存成功',
+ 'common.saveFailed': '保存失败',
+ 'common.operationSuccess': '操作成功',
+ 'common.operationFailed': '操作失败',
+ 'common.removeSuccess': '移除成功',
+ 'common.removeFailed': '移除失败',
};
diff --git a/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue b/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue
index b396e41f18..59f5792d41 100644
--- a/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue
+++ b/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue
@@ -189,7 +189,8 @@
() => props.keyword,
() => {
fetchData();
- }
+ },
+ { immediate: true }
);
diff --git a/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue b/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue
index 09255c5707..fb9125978b 100644
--- a/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue
+++ b/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue
@@ -22,7 +22,11 @@
- {{ t('system.organization.remove') }}
+
@@ -31,7 +35,10 @@