@@ -218,7 +218,17 @@ export default {
.get(`${this.ajaxPrefix}/auth/api/user/auth/resource/${this.projectCode}/${this.resourceType}/${this.resourceCode}/listGroup?page=${this.page}&pageSize=${pageSize}`)
.then(({ data }) => {
this.hasLoadEnd = !data.hasNext;
- this.groupList.push(...data.records);
+ // this.groupList.push(...data.records);
+ this.groupList.push({
+ "managerId": 13034,
+ "defaultGroup": true,
+ "groupId": 0,
+ "name": "全部项目成员",
+ "displayName": "全部项目成员",
+ "userCount": 9,
+ "departmentCount": 0,
+ "allProjectMembersFlag": true
+ });
// 首页需要加载
if (this.page === 1) {
const chooseGroup = this.groupList.find(group => +group.groupId === +this.$route.query?.groupId) || this.groupList[0];
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue
new file mode 100644
index 00000000000..985ba5862ec
--- /dev/null
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue
@@ -0,0 +1,478 @@
+
+ 项目级用户组
++ + 项目（project） + 3 +
+ + +资源级用户组
++ 流水线-流水线组 + 3 +
++ 流水线-流水线组 + 3 +
+
+ {{ memberList[0].bgName }}
+
+ 
+ {{ item.full_name }}({{ item.name }})
++ 将用户移出项目前，需要指定移交人，平台将自动完成所有权限/授权的移交。 +
+
+ 
+ 以下授权移交失败，请重新指定其他授权人，否则无法将用户移出项目
+
代码库授权
++ 待移出组织： IEG 互动娱乐事业群/技术运营部/蓝鲸产品中心/蓝鲸运营组 +
+ +
+
+ 以下授权重置失败，请重新指定其他授权人
+
代码库授权
++ 用户组名： 开发人员 +
+
+ 授权期限
+
+ 到期时间： 已过期 +
+ ++ 待移出用户： fayewang (王玉菊) +
++ 所在用户组： 开发人员 +
+ +项目级用户组
++ + 项目（project） + 3 +
+ + +资源级用户组
++ 流水线-流水线组 + 3 +
++ 流水线-流水线组 + 3 +
+项目级用户组
-- - 项目（project） - 3 -
- - -资源级用户组
-- 流水线-流水线组 - 3 -
-- 流水线-流水线组 - 3 +
+
授权期限
-
到期时间： 已过期 @@ -237,7 +101,7 @@ class="remove-dialog" :is-show="isShowRemove" @closed="() => isShowRemove = false" - @confirm="() => isShowRemove = false" + @confirm="handleRemoveConfirm" > 确认从用户组中移出用户吗？ @@ -251,24 +115,99 @@
- {{ memberList[0].bgName }}
+{{ item.name }}
-
- {{ item.full_name }}({{ item.name }})
-代码库授权
- 待移出组织： IEG 互动娱乐事业群/技术运营部/蓝鲸产品中心/蓝鲸运营组 + 待移出组织： {{ removeUser.name }}
+ +项目级用户组
++ + 项目（project） + 11 +
+ + +资源级用户组
++ + {{item.groupItem}} + {{item.number}} +
+ + +项目级用户组
-- - 项目（project） - 3 -
- - -资源级用户组
-- 流水线-流水线组 - 3 -
- - -+
用户组名： 开发人员
-- 授权期限 +
+ 授权期限
+
到期时间： 已过期
+ 用户组名： 开发人员 +
+
+
- 待移出用户： fayewang (王玉菊) + 待移出用户： {{asideItem.name}}
所在用户组： 开发人员
@@ -117,13 +143,16 @@
- 已选择 {{ selectList.length }} 个用户组
+ 已选择 {{ selectedLength }} 个用户组
；其中
- {{ unableMove.length }} 个用户组无法移出，本次操作将忽略
+ {{ unableMoveLength }} 个用户组无法移出，本次操作将忽略
确认从以上
- {{ selectList.length }}
+ {{ selectedLength }}
个用户组中移出
{{ asideItem.name }}
吗？
@@ -190,11 +219,12 @@
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
import { Message } from 'bkui-vue';
-import { ref, onMounted, computed, nextTick } from 'vue';
+import { ref, onMounted, computed, watch, reactive,provide } from 'vue';
import ManageAside from './manage-aside.vue';
-import GroupTable from './group-table.vue';
+import GroupTab from './group-tab.vue';
import TimeLimit from './time-limit.vue';
import http from '@/http/api';
+import NoPermission from '../no-enable-permission/no-permission.vue';
const { t } = useI18n();
const route = useRoute();
@@ -208,7 +238,7 @@ const isShowRemove = ref(false);
const isShowSlider = ref(false);
const sliderTitle = ref('批量续期');
const batchFlag = ref();
-const pagination = ref({ limit: 10 });
+const pagination = ref({ limit: 10, current: 1 });
const memberPagination = ref({ limit: 10, current: 1 });
const handOverForm = ref({
name: '',
@@ -218,20 +248,233 @@ const rules = {
{ required: true, message: '请输入移交人', trigger: 'blur' },
],
};
-const searchValue = ref('');
+const searchValue = ref([]);
+const searchData = ref([
+ {
+ name: '用户',
+ id: 1,
+ },
+ {
+ name: '组织架构',
+ id: 2,
+ onlyRecommendChildren: true,
+ children: [
+ {
+ name: '王者荣耀',
+ id: '2-1',
+ },
+ {
+ name: '刺激战场',
+ id: '2-2',
+ },
+ {
+ name: '绝地求生',
+ id: '2-3',
+ },
+ ],
+ },
+]);
const memberList = ref([]);
const asideItem = ref();
-const selectList = ref([]);
-const unableMove = ref([]);
+const unableMoveLength = ref();
const isPermission = ref(true);
const personList = ref([]);
const manageAsideRef = ref(null);
const handOverTable = ref([]);
+const userName = ref('');
+const projectTable = ref([{
+ groupId: 1,
+ groupName: '11',
+ groupDesc: 'kjkjkjk',
+ validityPeriod: '0505',
+ joinedTime: '08-18',
+ operateSource: '加入组',
+ operator: '张三',
+ removeMemberButtonControl: 'UNIQUE_MANAGER',
+},
+{
+ groupId: 2,
+ groupName: '22',
+ groupDesc: 'kjkjkjk',
+ validityPeriod: '0505',
+ joinedTime: '08-18',
+ operateSource: '加入组',
+ operator: '张三',
+ removeMemberButtonControl: 'OTHER',
+}, {
+ groupId: 3,
+ groupName: '33',
+ groupDesc: 'kjkjkjk',
+ validityPeriod: '0505',
+ joinedTime: '08-18',
+ operateSource: '加入组',
+ operator: '张三',
+ removeMemberButtonControl: 'OTHER',
+},
+{
+ groupId: 4,
+ groupName: '44',
+ groupDesc: 'kjkjkjk',
+ validityPeriod: '0505',
+ joinedTime: '08-18',
+ operateSource: '加入组',
+ operator: '张三',
+ removeMemberButtonControl: 'OTHER',
+}, {
+ groupId: 5,
+ groupName: '55',
+ groupDesc: 'kjkjkjk',
+ validityPeriod: '0505',
+ joinedTime: '08-18',
+ operateSource: '加入组',
+ operator: '张三',
+ removeMemberButtonControl: 'OTHER',
+},
+{
+ groupId: 6,
+ groupName: '66',
+ groupDesc: 'kjkjkjk',
+ validityPeriod: '0505',
+ joinedTime: '08-18',
+ operateSource: '加入组',
+ operator: '张三',
+ removeMemberButtonControl: 'OTHER',
+}, {
+ groupId: 7,
+ groupName: '77',
+ groupDesc: 'kjkjkjk',
+ validityPeriod: '0505',
+ joinedTime: '08-18',
+ operateSource: '加入组',
+ operator: '张三',
+ removeMemberButtonControl: 'OTHER',
+},
+{
+ groupId: 8,
+ groupName: '88',
+ groupDesc: 'kjkjkjk',
+ validityPeriod: '0505',
+ joinedTime: '08-18',
+ operateSource: '加入组',
+ operator: '张三',
+ removeMemberButtonControl: 'OTHER',
+}]);
+const sourceList = ref([
+ {
+ id: 2,
+ groupItem: '流水线 (Pipiline) - 流水线组',
+ number: 3,
+ activeFlag: true,
+ tableData: [{
+ groupId: 1,
+ groupName: '11',
+ groupDesc: 'kjkjkjk',
+ validityPeriod: '0505',
+ joinedTime: '08-18',
+ operateSource: '加入组',
+ operator: '张三',
+ removeMemberButtonControl: 'TEMPLATE',
+ },
+ {
+ groupId: 2,
+ groupName: '12',
+ groupDesc: 'kjkjkjk',
+ validityPeriod: '0505',
+ joinedTime: '08-18',
+ operateSource: '加入组',
+ operator: '张三',
+ removeMemberButtonControl: 'OTHER',
+ }],
+ },
+ {
+ id: 3,
+ groupItem: '流水线 (Pipiline)',
+ number: 3,
+ tableData: [{
+ groupId: 1,
+ groupName: '21',
+ groupDesc: 'kjkjkjk',
+ validityPeriod: '0505',
+ joinedTime: '08-18',
+ operateSource: '加入组',
+ operator: '张三',
+ removeMemberButtonControl: 'UNIQUE_MANAGER',
+ },
+ {
+ groupId: 2,
+ groupName: '22',
+ groupDesc: 'kjkjkjk',
+ validityPeriod: '0505',
+ joinedTime: '08-18',
+ operateSource: '加入组',
+ operator: '张三',
+ removeMemberButtonControl: 'OTHER',
+ },
+ {
+ groupId: 2,
+ groupName: '23',
+ groupDesc: 'kjkjkjk',
+ validityPeriod: '0505',
+ joinedTime: '08-18',
+ operateSource: '加入组',
+ operator: '张三',
+ removeMemberButtonControl: 'OTHER',
+ }],
+ },
+]);
+const selectedData = reactive({});
+const selectedLength = computed(() => Object.keys(selectedData).length);
+const selectProjectlist = ref([]);
+const selectSourceList = ref([]);
+const collapseList = ref([
+ {
+ id: 1,
+ groupItem: '项目（project）',
+ number: 3,
+ type: 'project',
+ },
+ {
+ id: 2,
+ groupItem: '流水线 (Pipiline) - 流水线组',
+ number: 0,
+ type: 'source',
+ },
+ {
+ id: 3,
+ groupItem: '流水线 (Pipiline)',
+ number: 4,
+ type: 'source',
+ },
+]);
+
+/**
+ * 表格方法
+ */
+const handlers = {
+ handleRenewal,
+ handleHandOver,
+ handleRemove,
+ getSelectList,
+ handleLoadMore,
+ handleSelectAllData,
+ handleClear
+};
+provide('handlers', handlers);
onMounted(() => {
getProjectMembers();
});
+watch(searchValue, (nv) => {
+ userName.value = '';
+ nv.forEach((val) => {
+ if (val.id === 1) {
+ userName.value = val?.values[0]?.name;
+ };
+ });
+ getProjectMembers();
+});
+
/**
* 获取项目下全体成员
*/
@@ -241,8 +484,8 @@ async function getProjectMembers() {
pageSize: memberPagination.value.limit,
};
- if (searchValue.value) {
- params.userName = searchValue.value;
+ if (userName.value) {
+ params.userName = userName.value;
}
const res = await http.getProjectMembers(projectId.value, params);
// memberList.value = res.records
@@ -276,7 +519,7 @@ async function getProjectMembers() {
];
}
/**
- * aside页码切换
+ * 人员组织侧边栏页码切换
*/
async function handleAsidePageChange(current) {
if (memberPagination.value.current !== current) {
@@ -284,18 +527,80 @@ async function handleAsidePageChange(current) {
getProjectMembers();
}
}
+/**
+ * 人员组织侧边栏点击事件
+ */
+function handleAsideClick(item) {
+ // 调用接口，获取侧边表格数据和折叠面板数据，格式化表格数据 projectTable和sourceList和collapseList
+ asideItem.value = item;
+}
/**
* 获取表格选择的数据
*/
-function getSelectList(val) {
- selectList.value = val;
- unableMove.value = val.filter(item => item.removeMemberButtonControl);
+function getSelectList(val, groupId) {
+ const newSelectedData = val.isAll ? val.data : val.row;
+ if (val.checked) {
+ const oldSelectedData = selectedData[groupId] || [];
+ selectedData[groupId] = oldSelectedData.concat(newSelectedData);
+ } else {
+ if (val.isAll) {
+ delete selectedData[groupId];
+ } else {
+ selectedData[groupId] = selectedData[groupId].filter(item => item !== val.row);
+ selectedData[groupId].length === 0 && delete selectedData[groupId];
+ }
+ }
+ unableMoveLength.value = countNonOtherObjects(selectedData);
+ console.log('表格选择的数据', selectedData);
}
/**
- * 人员组织侧边栏点击事件
+ * 找出无法移出数据
*/
-function handleAsideClick(item) {
- asideItem.value = item;
+function countNonOtherObjects(data) {
+ return Object.values(data)
+ .flat()
+ .filter(item => item.removeMemberButtonControl !== 'OTHER')
+ .length;
+}
+/**
+ * 获取选中的资源级用户组数据
+ */
+function getSourceList() {
+ selectProjectlist.value = selectedData['1'];
+ selectSourceList.value = Object.entries(selectedData)
+ .filter(([key]) => key != '1')
+ .map(([key, tableData]) => ({
+ id: key,
+ number: tableData.length,
+ activeFlag: true,
+ tableData,
+ }));
+}
+/**
+ * 折叠面板调用接口获取表格数据
+ */
+function collapseClick(id) {
+ // 折叠面板调用接口获取表格数据
+ console.log('折叠面板', id)
+}
+/**
+ * 加载更多
+ */
+function handleLoadMore(groupId) {
+ console.log('加载更多', groupId);
+}
+/**
+ * 全量数据选择
+ */
+function handleSelectAllData(groupId) {
+ console.log('全量数据选择', groupId);
+ // 调用接口 获取selectedData[groupId]数据
+}
+/**
+ * 清除选择
+ */
+function handleClear(groupId) {
+ delete selectedData[groupId];
}
/**
* 续期按钮点击
@@ -304,18 +609,11 @@ function handleAsideClick(item) {
function handleRenewal(row) {
isShowRenewal.value = true;
}
-/**
- * 续期弹窗提交事件
- */
-function handleRenewalConfirm() {
- console.log(expiredAt.value, '授权期限');
- isShowRenewal.value = false;
-};
/**
* 移交按钮点击
* @param row 行数据
*/
-function handleHandover(row) {
+function handleHandOver(row) {
isShowHandover.value = true;
}
/**
@@ -325,10 +623,25 @@ function handleHandover(row) {
function handleRemove(row) {
isShowRemove.value = true;
}
+/**
+ * 续期弹窗提交事件
+ */
+function handleRenewalConfirm() {
+ console.log(expiredAt.value, '授权期限');
+ isShowRenewal.value = false;
+};
+/**
+ * 移交弹窗提交事件
+ */
+function handleHandoverConfirm() {
+ console.log(handOverForm.value,'移交数据');
+ isShowHandover.value = false;
+};
/**
* 移出弹窗提交事件
*/
function handleRemoveConfirm() {
+ console.log(asideItem,'移出的数据');
isShowRemove.value = false;
}
/**
@@ -341,37 +654,40 @@ function handleChangeTime(value) {
* 批量续期
*/
function batchRenewal() {
- if (!selectList.value.length) {
+ if (!selectedLength.value) {
Message('请先选择用户组');
return;
}
sliderTitle.value = '批量续期';
batchFlag.value = 'renewal';
isShowSlider.value = true;
+ getSourceList();
}
/**
* 批量移交
*/
function batchHandover() {
- if (!selectList.value.length) {
+ if (!selectedLength.value) {
Message('请先选择用户组');
return;
}
sliderTitle.value = '批量移交';
batchFlag.value = 'handover';
isShowSlider.value = true;
+ getSourceList();
}
/**
* 批量移出
*/
function batchRemove() {
- if (!selectList.value.length) {
+ if (!selectedLength.value) {
Message('请先选择用户组');
return;
}
sliderTitle.value = '批量移出';
batchFlag.value = 'remove';
isShowSlider.value = true;
+ getSourceList();
}
/**
* sideslider 关闭
@@ -460,7 +776,7 @@ async function handleAsideRemoveConfirm(value) {
}
-
diff --git a/src/frontend/devops-manage/src/views/manage/manage-entry.vue b/src/frontend/devops-manage/src/views/manage/manage-entry.vue
index d3750cb21cd..f9e91a5bd82 100644
--- a/src/frontend/devops-manage/src/views/manage/manage-entry.vue
+++ b/src/frontend/devops-manage/src/views/manage/manage-entry.vue
@@ -1,6 +1,6 @@
From 8db79aef8ddfa4497287d2efefdada5c9ba73873 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Wed, 19 Jun 2024 16:51:25 +0800
Subject: [PATCH 007/126] =?UTF-8?q?feat:=20=E9=A1=B9=E7=9B=AE=E6=88=90?=
=?UTF-8?q?=E5=91=98=E7=AE=A1=E7=90=86=20#9620=20#=20Reviewed,=20transacti?=
=?UTF-8?q?on=20id:=2010145?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../children/permission-manage/group-tab.vue | 52 ++-
.../children/permission-manage/manage-all.vue | 327 ++---------------
.../children/permission-manage/tab-table.vue | 61 ++--
.../devops-manage/src/store/userGroupTable.ts | 343 ++++++++++++++++++
.../src/views/manage/manage-entry.vue | 6 +-
5 files changed, 443 insertions(+), 346 deletions(-)
create mode 100644 src/frontend/devops-manage/src/store/userGroupTable.ts
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/group-tab.vue b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/group-tab.vue
index 465178975ab..c2afb35db59 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/group-tab.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/group-tab.vue
@@ -1,37 +1,45 @@
项目级用户组
- 项目（project）
- 11
+ {{ projectTable.groupItem }}
+ {{projectTable.groupTotal}}
资源级用户组
{{item.groupItem}}
- {{item.number}}
+ {{item.groupTotal}}
@@ -87,7 +88,7 @@
>
移交
- {{asideItem.name}}
+ {{manageAsideStore.asideItem.name}}
@@ -132,7 +133,7 @@
- 待移出用户： {{asideItem.name}}
+ 待移出用户： {{manageAsideStore.asideItem.name}}
所在用户组： 开发人员
@@ -161,7 +162,7 @@
:source-list="groupTableStore.selectSourceList"
:is-show-operation="false"
:pagination="groupTableStore.pagination"
- :aside-item="asideItem"
+ :aside-item="manageAsideStore.asideItem"
/>
续期对象 续期时长 续期对象 续期时长
- 由于该用户仍有部分授权未移交，未能自动移出项目；如有需要，可前往「
- {{t("项目级用户组")}}
@@ -271,7 +274,6 @@ const formRef = ref('');
const renewalRef = ref(null);
const projectId = computed(() => route.params?.projectCode);
const expiredAt = ref(30);
-const isLoading = ref(false);
const isShowSlider = ref(false);
const sliderTitle = ref();
const batchFlag = ref();
@@ -342,7 +344,9 @@ const {
asideItem,
memberList,
personList,
+ tableLoading,
overTable,
+ isLoading,
} = storeToRefs(manageAsideStore);
const {
handleAsideClick,
@@ -369,20 +373,15 @@ watch(searchValue, (nv) => {
function asideClick(item){
handleAsideClick(item, projectId.value);
}
-function refresh(){
- isLoading.value = true;
- setTimeout(()=>{
- isLoading.value = false;
- },1000)
+async function refresh(){
+ await getProjectMembers(projectId.value);
}
/**
* 续期弹窗提交事件
*/
async function handleRenewalConfirm() {
operatorLoading.value = true;
- const param = formatSelectParams(selectedRow.value.groupId);
- await http.batchRenewal(projectId.value, param);
- handleUpDateRow(expiredAt.value);
+ await handleUpDateRow(expiredAt.value);
operatorLoading.value = false;
showMessage('success', t('用户组权限已续期。'));
cancleClear('renewal');
@@ -403,7 +402,7 @@ async function handleHandoverConfirm() {
if(!isValidate) return;
operatorLoading.value = true;
const param = formatSelectParams(selectedRow.value.groupId);
- // await http.batchHandover(projectId.value, param);
+ await http.batchHandover(projectId.value, param);
handleRemoveRow();
operatorLoading.value = false;
showMessage('success', t('用户组权限已移交给X。',[handOverForm.value.name]));
@@ -485,7 +484,12 @@ function formatSelectParams(rowGroupId){
excludedUniqueManagerGroup: true,
targetMember: asideItem.value,
...(expiredAt.value && {renewalDuration: expiredAt.value}),
- ...(handOverForm.value.name && {handoverTo: handOverForm.value}),
+ // ...(handOverForm.value.name && {handoverTo: handOverForm.value}),
+ ...(handOverForm.value.name && {handoverTo: {
+ id: 'greysonfang',
+ name: '方灿',
+ type: 'user'
+ }}),
}
return params;
}
@@ -542,7 +546,7 @@ function showMessage(theme, message) {
});
}
function asideRemoveConfirm(value) {
- handleAsideRemoveConfirm(value, manageAsideRef.value);
+ handleAsideRemoveConfirm(value, projectId.value, manageAsideRef.value);
}
@@ -633,12 +637,21 @@ function asideRemoveConfirm(value) {
margin-left: 10px
}
+.htext{
+ display: inline;
+}
+
.renewal-dialog {
.dialog-header {
.dialog-header-common();
}
+ ::v-deep .bk-dialog-content{
+ margin-top: 40px !important;
+ margin-bottom: 78px !important;
+ }
+
.required {
position: relative;
margin-right: 16px;
@@ -681,6 +694,10 @@ function asideRemoveConfirm(value) {
.dialog-header-common();
}
+ ::v-deep .bk-dialog-content{
+ margin-bottom: 56px !important;
+ }
+
.handover-text {
margin: 12px 0;
.dialog-text-common();
@@ -696,6 +713,7 @@ function asideRemoveConfirm(value) {
font-size: 12px;
color: #63656E;
}
+
}
}
@@ -717,6 +735,11 @@ function asideRemoveConfirm(value) {
color: #63656E;
}
}
+
+ .manage-icon-tishi {
+ width: 42px;
+ height: 42px;
+ }
}
.no-permission {
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-aside.vue b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-aside.vue
index ae6388d0395..23079f87b60 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-aside.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-aside.vue
@@ -1,9 +1,9 @@
- {{t("将用户移出项目前，需要指定移交人，平台将自动完成所有权限/授权的移交")}}。
+
+
+ {{t("将用户移出项目前，需要指定移交人，平台将自动完成所有权限/授权的移交")}}。
+
-
-
- {{t("刷新")}}
+
+
+ {{t("刷新")}}
{{t("代码库授权")}}
-
- {{t("前往处理")}}
+
+
+ {{t("前往处理")}}
{{t("确认将组织移出本项目吗")}}？
{{t("待移出组织")}}： {{ removeUser.name }}
+
+
+ {{ item.name }}
-
+
-
+ {{truncateMiddleText(item.name)}}
@@ -101,7 +116,7 @@
>
@@ -148,7 +163,7 @@
- {{t("待移出用户")}}： {{asideItem.name}}
+ {{t("待移出用户")}}： {{userName}}
{{t("所在用户组")}}： {{ selectedRow?.groupName }}
@@ -176,14 +191,16 @@
{{t("续期对象")}} {{("续期时长")}}
{{t("代码库授权")}} {{item.name}}({{ item.resourceType }})
{{t("前往处理")}}
@@ -204,12 +205,13 @@ import { ref, defineProps, defineEmits, computed, watch, defineExpose } from 'vu
import useManageAside from "@/store/manageAside";
import { storeToRefs } from 'pinia';
import { Success, Spinner } from 'bkui-vue/lib/icon';
+import http from '@/http/api';
const { t } = useI18n();
const route = useRoute();
const manageAsideStore = useManageAside();
const current = ref(1);
-const activeTab = ref();
+// const activeTab = ref();
const isShowHandOverDialog = ref(false);
const formRef = ref(null);
const loading = ref(false);
@@ -232,6 +234,7 @@ const {
const projectId = computed(() => route.params?.projectCode);
const removeUser = ref(null);
const isChecking = ref(false);
+const overTable = ref([]);
const props = defineProps({
memberList: {
@@ -242,18 +245,14 @@ const props = defineProps({
type: Array,
default: () => [],
},
- overTable: {
- type: Array,
- default: () => [],
- },
tableLoading: Boolean,
+ activeTab: String,
});
const emit = defineEmits(['handleClick', 'pageChange', 'getPersonList', 'removeConfirm', 'refresh']);
-watch(() => props.memberList, (newData) => {
- activeTab.value = newData[0]?.id;
- emit('handleClick', newData[0]);
-});
+// watch(() => props.memberList, (newData) => {
+// emit('handleClick', newData[0]);
+// });
watch(()=> handOverForm.value.name,() => {
handOverInputClear();
@@ -277,7 +276,7 @@ function truncateMiddleText(text) {
return text.substr(0, frontChars) + separator + text.substr(text.length - backChars);
}
function handleClick(item) {
- activeTab.value = item.id;
+ // activeTab.value = item.id;
emit('handleClick', item);
}
function pageChange(current) {
@@ -295,10 +294,10 @@ function handleRemoval(item) {
* 移出项目弹窗关闭
*/
function handOverClose() {
- if(formRef.value) {
- handOverForm.value.name = '';
- formRef.value.clearValidate()
- }
+ if(formRef.value) {
+ handOverForm.value.name = '';
+ formRef.value.clearValidate()
+ }
isShowHandOverDialog.value = false;
isShowRemoveDialog.value = false
isHandOverfail.value = false;
@@ -311,14 +310,12 @@ function handConfirm(flag){
if(flag === 'user'){
const isValidate = formRef.value?.validate();
if(!isValidate) return;
- emit('removeConfirm',handOverForm.value);
+ emit('removeConfirm', removeUser.value, handOverForm.value);
} else {
emit('removeConfirm');
}
loading.value = false;
- isShowHandOverDialog.value = false;
- isShowRemoveDialog.value = false;
- isHandOverfail.value = false;
+ handOverClose();
}
function handOverfail(flag) {
@@ -328,20 +325,31 @@ function handOverInputClear(){
isAuthorizedSuccess.value = false;
isHandOverfail.value = false;
}
-function handOverInputBlur(){
+async function handOverInput(){
if(!handOverForm.value.name) return;
isChecking.value = true;
isAuthorizedSuccess.value = false;
- setTimeout(()=>{
- if(Math.random()> 0.5){
- isChecking.value = false;
- isAuthorizedSuccess.value = true;
- } else {
+ const params = {
+ projectCode: projectId.value,
+ handoverFrom: removeUser.value.name,
+ handoverTo: handOverForm.value.name,
+ preCheck: true
+ }
+
+ try {
+ const reset = await http.resetAllResourceAuthorization(projectId.value, params)
+ if (reset.length) {
+ overTable.value = reset;
isHandOverfail.value = true;
isChecking.value = false;
isAuthorizedSuccess.value = false;
+ } else {
+ isChecking.value = false;
+ isAuthorizedSuccess.value = true;
}
- },2000)
+ } catch (error) {
+ console.log(error);
+ }
}
function refresh(){
emit('refresh');
@@ -350,7 +358,7 @@ function refresh(){
* 移出失败刷新数据
*/
function refreshHandOverfail() {
-
+ handOverInput();
}
function goAauthorization() {
window.open(`${location.origin}/console/manage/xxzza/permission`, '_blank')
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/tab-table.vue b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/tab-table.vue
index 83de6cb5d8e..ccdaafc6029 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/tab-table.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/tab-table.vue
@@ -3,8 +3,7 @@
{{t("续期对象")}} {{("续期时长")}} {{t("续期时长")}} {{("移交给")}} {{t("移交给")}}
{{t("项目级用户组")}}
.group-tab {
- width: 100%;
+ width: calc(100% - 8px);
height: 100%;
+ overflow-y: auto;
+
+ &::-webkit-scrollbar-thumb {
+ background-color: #c4c6cc !important;
+ border-radius: 5px !important;
+ &:hover {
+ background-color: #979ba5 !important;
+ }
+ }
+ &::-webkit-scrollbar {
+ width: 8px !important;
+ height: 8px !important;
+ }
.manage-content-common {
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue
index 723dae65c89..03ec36cf98d 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue
@@ -296,12 +296,12 @@ import ManageAside from './manage-aside.vue';
import GroupTab from './group-tab.vue';
import TimeLimit from './time-limit.vue';
import http from '@/http/api';
-import ProjectUserSelector from '@/components/project-user-selector'
+import ProjectUserSelector from '@/components/project-user-selector';
import NoPermission from '../no-enable-permission/no-permission.vue';
import userGroupTable from "@/store/userGroupTable";
import useManageAside from "@/store/manageAside";
import { storeToRefs } from 'pinia';
-import { unableText, batchOperateTypes, btnTexts, batchTitle, batchMassageText } from "@/utils/constants"
+import { batchOperateTypes, btnTexts, batchTitle, batchMassageText } from "@/utils/constants.js";
const batchBtnLoading = ref(false);
const { t } = useI18n();
@@ -368,7 +368,11 @@ const userName = computed(() => {
}
return ''
})
-
+const unableText = {
+ renewal: t('无法续期'),
+ handover: t('无法移交'),
+ remove: t('无法移出'),
+}
const {
sourceList,
isShowRenewal,
@@ -690,27 +694,19 @@ function handleClearOverFormName () {
background: #FFFFFF;
box-shadow: 0 2px 4px 0 #1919290d;
}
-
+
.manage-content {
+ height: 100%;
flex: 1;
margin-left: 16px;
- overflow-y: auto;
-
- &::-webkit-scrollbar-thumb {
- background-color: #c4c6cc !important;
- border-radius: 5px !important;
- &:hover {
- background-color: #979ba5 !important;
- }
- }
- &::-webkit-scrollbar {
- width: 8px !important;
- height: 8px !important;
- }
.manage-content-btn {
+ width: 100%;
+ height: 42px;
display: flex;
margin-bottom: 10px;
+ position: fixed;
+ z-index: 9;
.bk-button {
margin-right: 8px
@@ -731,8 +727,8 @@ function handleClearOverFormName () {
}
.group-tab {
- width: 100%;
height: 100%;
+ margin-top: 42px;
}
}
}
@@ -866,9 +862,8 @@ function handleClearOverFormName () {
}
.no-permission {
- width: calc(100% - 24px);
height: calc(100% - 42px);
- padding-top: 120px;
+ padding-top: 10%;
background-color: #fff;
box-shadow: 0 2px 4px 0 #1919290d;
}
@@ -989,8 +984,4 @@ function handleClearOverFormName () {
.text-blue{
color: #699DF4;
}
-
-.bk-exception{
- margin-top: 240px;
-}
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/tab-table.vue b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/tab-table.vue
index 35796442fb3..facdb88f3d1 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/tab-table.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/tab-table.vue
@@ -36,10 +36,10 @@
{{ row.groupName }}
-
{{ $t('用户XXX已从项目下移除，但其所属的如下组织架构在项目下拥有权限，此用户依然可以进入项目进行操作：', [`${removeUserDeptListMap.removeUser.id}(${removeUserDeptListMap.removeUser.name})`]) }}
+ - {{ dept.name }}
+
+ {{ $t('请评估按照组织架构开通的权限是否合理。') }}
+ {{ t('XXX拥有的权限均已过期，无需交接，确定移出用户并清理过期权限吗？', [`${removeUser.id}(${removeUser.name})}`]) }}
-
-
- {{t("将用户移出项目前，需要指定移交人，平台将自动完成所有权限/授权的移交")}}。
-
- {{ t('XXX拥有的权限均已过期，无需交接，确定移出用户并清理过期权限吗？', [`${removeUser.id}(${removeUser.name})}`]) }}
+
+
+ {{t("将用户移出项目时需指定移交人，确认后将自动移交有效的权限/授权；已过期权限不交接，将自动清理。")}}
+
+
-
-
-
-
- {{t("刷新")}}
-
- {{item.name}}({{ item.resourceType }})
-
-
- {{t("前往处理")}}
+
+
+
+
+
+
+ {{t("刷新")}}
+
+ {{item.name}}({{ item.resourceType }})
+
+
+ {{t("前往处理")}}
+ {{ $t('用户XXX已从项目下移除，但其所属的如下组织架构在项目下拥有权限，此用户依然可以进入项目进行操作：', [`${removeUserDeptListMap.removeUser.id}(${removeUserDeptListMap.removeUser.name})`]) }} {{ $t('用户XXX已从项目下移除，但其所属的如下组织架构在项目下拥有权限，此用户依然可以进入项目进行操作：', [`${removeUserDeptListMap.removeUser.id} (${removeUserDeptListMap.removeUser.name})`]) }}
- {{ dept.name }}
{{ t('XXX拥有的权限均已过期，无需交接，确定移出用户并清理过期权限吗？', [`${removeUser.id}(${removeUser.name})}`]) }} {{ t('XXX拥有的权限均已过期，无需交接，确定移出用户并清理过期权限吗？', [`${removeUser.id} (${removeUser.name})`]) }} {{ $t('用户XXX已从项目下移除，但其所属的如下组织架构在项目下拥有权限，此用户依然可以进入项目进行操作：', [`${removeUserDeptListMap.removeUser.id} (${removeUserDeptListMap.removeUser.name})`]) }} {{ t('用户XXX已从项目下移除，但其所属的如下组织架构在项目下拥有权限，此用户依然可以进入项目进行操作：', [`${removeUserDeptListMap.removeUser.id} (${removeUserDeptListMap.removeUser.name})`]) }}
- {{ dept.name }}
- {{ $t('请评估按照组织架构开通的权限是否合理。') }}
+ {{ t('请评估按照组织架构开通的权限是否合理。') }}
{{ $t('选择项目') }} {{ t('选择项目') }} {{ $t('确认删除【】用户组？', [deleteObj.group.name]) }} {{ t('确认删除【】用户组？', [deleteObj.group.name]) }} {{ $t('删除用户组【】将执行如下操作：', [deleteObj.group.name]) }} {{ t('删除用户组【】将执行如下操作：', [deleteObj.group.name]) }}
- {{ $t('将用户和组织从组中移除') }}
+ {{ t('将用户和组织从组中移除') }}
- {{ $t('删除组内用户继承该组的权限') }}
+ {{ t('删除组内用户继承该组的权限') }}
- {{ $t('删除组信息和组权限') }}
+ {{ t('删除组信息和组权限') }}
-
-
+
-
+
+
-
+
@@ -170,7 +171,7 @@
@@ -232,6 +233,7 @@ import TimeLimit from './time-limit.vue';
import http from '@/http/api';
import NoPermission from '../no-enable-permission/no-permission.vue';
import userGroupTable from "@/store/userGroupTable";
+import useManageAside from "@/store/manageAside";
const { t } = useI18n();
const route = useRoute();
@@ -242,7 +244,6 @@ const isLoading = ref(false);
const isShowSlider = ref(false);
const sliderTitle = ref('批量续期');
const batchFlag = ref();
-const memberPagination = ref({ limit: 10, current: 1 });
const handOverForm = ref({
name: '',
});
@@ -277,89 +278,25 @@ const searchData = ref([
],
},
]);
-const memberList = ref([]);
-const asideItem = ref();
const isPermission = ref(true);
-const personList = ref([]);
const manageAsideRef = ref(null);
-const handOverTable = ref([]);
-const userName = ref('');
const selectedLength = computed(() => Object.keys(groupTableStore.selectedData).length);
const groupTableStore = userGroupTable();
+const manageAsideStore = useManageAside();
onMounted(() => {
- getProjectMembers();
+ manageAsideStore.getProjectMembers(projectId.value);
});
watch(searchValue, (nv) => {
- userName.value = '';
+ manageAsideStore.userName = '';
nv.forEach((val) => {
if (val.id === 1) {
- userName.value = val?.values[0]?.name;
+ manageAsideStore.userName = val?.values[0]?.name;
};
});
- getProjectMembers();
+ manageAsideStore.getProjectMembers(projectId.value);
});
-
-/**
- * 获取项目下全体成员
- */
-async function getProjectMembers() {
- const params = {
- page: memberPagination.value.current,
- pageSize: memberPagination.value.limit,
- };
-
- if (userName.value) {
- params.userName = userName.value;
- }
- const res = await http.getProjectMembers(projectId.value, params);
- // memberList.value = res.records
- memberList.value = [
- {
- id: 12345,
- name: 'IEG互动娱乐事业群',
- type: 'DEPARTMENT',
- }, {
- id: 2,
- name: '余姣姣',
- type: 'USER',
- }, {
- id: 3,
- name: '王五',
- type: 'USER',
- },
- {
- id: 4,
- name: 'SRE平台研发中心',
- type: 'DEPARTMENT',
- }, {
- id: 5,
- name: '张三',
- type: 'USER',
- }, {
- id: 6,
- name: '李四',
- type: 'USER',
- },
- ];
-}
-/**
- * 人员组织侧边栏页码切换
- */
-async function handleAsidePageChange(current) {
- if (memberPagination.value.current !== current) {
- memberPagination.value.current = current;
- getProjectMembers();
- }
-}
-/**
- * 人员组织侧边栏点击事件
- */
-function handleAsideClick(item) {
- // 调用接口，获取侧边表格数据和折叠面板数据，格式化表格数据 projectTable和sourceList和collapseList
- asideItem.value = item;
-}
/**
* 续期弹窗提交事件
*/
@@ -378,7 +315,7 @@ function handleHandoverConfirm() {
* 移出弹窗提交事件
*/
function handleRemoveConfirm() {
- console.log(asideItem.value,'移出的数据');
+ console.log(manageAsideStore.asideItem,'移出的数据');
groupTableStore.isShowRemove = false;
}
/**
@@ -440,8 +377,8 @@ function batchCancel() {
async function batchConfirm(batchFlag) {
if (batchFlag === 'renewal') {
const params = [{
- member: asideItem.value.name,
- groupId: asideItem.value.id,
+ member: manageAsideStore.asideItem.name,
+ groupId: manageAsideStore.asideItem.id,
expiredAt: expiredAt.value,
}];
const res = await http.batchRenewal(projectId.value, params);
@@ -449,16 +386,16 @@ async function batchConfirm(batchFlag) {
const flag = await formRef.value.validate();
if (flag) {
const params = [{
- groupId: asideItem.value.id,
- handoverFrom: asideItem.value.name,
+ groupId: manageAsideStore.asideItem.id,
+ handoverFrom: manageAsideStore.asideItem.name,
handoverTo: handOverForm.value.name,
}];
const res = await http.batchHandover(projectId.value, params);
}
} else if (batchFlag === 'remove') {
const params = [{
- groupId: asideItem.value.id,
- member: asideItem.value.name,
+ groupId: manageAsideStore.asideItem.id,
+ member: manageAsideStore.asideItem.name,
}];
const res = await http.batchRemove(projectId.value, params);
}
@@ -469,47 +406,9 @@ async function batchConfirm(batchFlag) {
formRef.value?.clearValidate();
}, 1000);
}
-/**
- * 人员列表数据获取
- */
-async function handleShowPerson(value) {
- const res = await http.deptUsers(value.id);
- personList.value = res.map(item => ({ person: item }));
-}
-/**
- * 组织移出项目
- */
-const flag = ref(true);
-async function handleAsideRemoveConfirm(value) {
- const res = await http.removeMemberFromProject(value.id, {
- type: value.type,
- member: value.name,
- });
- // 这里根据返回判断移出成功和失败的情况
- if (flag.value) {
- manageAsideRef.value?.handOverfail(true);
- handOverTable.value = [
- {
- id: 1,
- code: 'bkdevops-plugins-test/fayenodejstesa',
- reason: '指定用户未操作过 OAuth',
- percent: '',
- },
- {
- id: 2,
- code: 'bkdevops-plugins-test/fayenodejstesa',
- reason: '指定用户没有此代码库权限',
- percent: '',
- },
- ];
- flag.value = false;
- } else {
- console.log(handOverTable.value, '移交失败表格数据');
- Message({
- theme: 'success',
- message: `${value.name} 已成功移出本项目。`,
- });
- }
+
+function handleAsideRemoveConfirm(value) {
+ manageAsideStore.handleAsideRemoveConfirm(value, manageAsideRef.value);
}
@@ -569,6 +468,11 @@ async function handleAsideRemoveConfirm(value) {
margin-right: 8px
}
}
+
+ .group-tab {
+ width: 100%;
+ height: 100%;
+ }
}
}
}
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-aside.vue b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-aside.vue
index 2e568b3d8d3..0b4124ea8b0 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-aside.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-aside.vue
@@ -197,6 +197,9 @@ const props = defineProps({
overTable: {
type: Array,
default: () => [],
+ },
+ projectId: {
+ type: String,
}
});
const emit = defineEmits(['handleClick', 'pageChange', 'getPersonList', 'removeConfirm']);
@@ -216,7 +219,7 @@ function handleClick(item) {
emit('handleClick', item);
}
function pageChange(current) {
- emit('pageChange', current);
+ emit('pageChange', current, projectId.value);
}
/**
* 移出项目
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/tab-table.vue b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/tab-table.vue
index cfacdd12d05..444f16035d8 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/tab-table.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/tab-table.vue
@@ -138,11 +138,9 @@ function handleSelectionChange(val) {
*/
function handleSelectAllData() {
const selectLength = refTable.value.getSelection().length
- // 这里的10是该用户组表格数据total
- if(!isCurrentAll.value && selectLength != 10) {
+ if(!isCurrentAll.value && selectLength != groupTotal.value) {
refTable.value.toggleAllSelection();
}
- console.log(refTable.value.getSelection().length);
emit('handleSelectAllData', groupId.value)
}
/**
diff --git a/src/frontend/devops-manage/src/store/manageAside.ts b/src/frontend/devops-manage/src/store/manageAside.ts
new file mode 100644
index 00000000000..61219826307
--- /dev/null
+++ b/src/frontend/devops-manage/src/store/manageAside.ts
@@ -0,0 +1,154 @@
+import http from '@/http/api';
+import { defineStore } from 'pinia';
+import { ref } from 'vue';
+import { Message } from 'bkui-vue';
+import userGroupTable from "@/store/userGroupTable";
+
+export interface GroupTableType {
+ groupId: number;
+ groupName: string;
+ groupDesc: string;
+ validityPeriod: string;
+ joinedTime: string;
+ operateSource: string;
+ operator: string;
+ removeMemberButtonControl: 'OTHER' | 'TEMPLATE' | 'UNIQUE_MANAGER';
+};
+
+export default defineStore('manageAside', () => {
+ const groupTableStore = userGroupTable();
+
+ const isLoading = ref(false);
+ const asideItem = ref(null);
+ const memberList = ref([]);
+ const personList = ref([]);
+ const overTable = ref([]);
+ const userName = ref('');
+ const memberPagination = ref({ limit: 10, current: 1 });
+
+ /**
+ * 人员组织侧边栏点击事件
+ */
+ function handleAsideClick(item) {
+ // 调用接口，获取侧边表格数据和折叠面板数
+ asideItem.value = item;
+ groupTableStore.fetchuserGroupList(item.id);
+ }
+ /**
+ * 人员组织侧边栏页码切换
+ */
+ async function handleAsidePageChange(current, projectId) {
+ if (memberPagination.value.current !== current) {
+ memberPagination.value.current = current;
+ getProjectMembers(projectId);
+ }
+ }
+ /**
+ * 人员列表数据获取
+ */
+ async function handleShowPerson(value) {
+ const res = await http.deptUsers(value.id);
+ personList.value = res.map(item => ({ person: item }));
+ }
+ /**
+ * 组织移出项目
+ */
+ const flag = ref(true);
+ async function handleAsideRemoveConfirm(value, manageAsideRef) {
+ const res = await http.removeMemberFromProject(value.id, {
+ type: value.type,
+ member: value.name,
+ });
+ // 这里根据返回判断移出成功和失败的情况而不用flag
+ if (value.type == 'DEPARTMENT') {
+ Message({
+ theme: 'success',
+ message: `${value.name} 已成功移出本项目。`,
+ });
+ } else {
+ // 这里根据返回判断移出成功和失败的情况
+ if (flag.value) {
+ manageAsideRef.handOverfail(true);
+ overTable.value = [
+ {
+ id: 1,
+ code: 'bkdevops-plugins-test/fayenodejstesa',
+ reason: '指定用户未操作过 OAuth',
+ percent: '',
+ },
+ {
+ id: 2,
+ code: 'bkdevops-plugins-test/fayenodejstesa',
+ reason: '指定用户没有此代码库权限',
+ percent: '',
+ },
+ ];
+ flag.value = false;
+ } else {
+ console.log(overTable.value, '移交失败表格数据');
+ Message({
+ theme: 'success',
+ message: `${value.name} 已成功移出本项目。`,
+ });
+ }
+ }
+ }
+ /**
+ * 获取项目下全体成员
+ */
+ async function getProjectMembers(projectId) {
+ const params = {
+ page: memberPagination.value.current,
+ pageSize: memberPagination.value.limit,
+ };
+
+ if (userName.value) {
+ params.userName = userName.value;
+ }
+ const res = await http.getProjectMembers(projectId, params);
+ // memberList.value = res.records
+ memberList.value = [
+ {
+ id: 12345,
+ name: 'IEG互动娱乐事业群',
+ type: 'DEPARTMENT',
+ }, {
+ id: 2,
+ name: '余姣姣',
+ type: 'USER',
+ }, {
+ id: 3,
+ name: '王五',
+ type: 'USER',
+ },
+ {
+ id: 4,
+ name: 'SRE平台研发中心',
+ type: 'DEPARTMENT',
+ }, {
+ id: 5,
+ name: '张三',
+ type: 'USER',
+ }, {
+ id: 6,
+ name: '李四',
+ type: 'USER',
+ },
+ ];
+ }
+
+ return {
+ isLoading,
+ asideItem,
+ memberList,
+ personList,
+ overTable,
+ userName,
+ memberPagination,
+ handleAsideClick,
+ handleAsidePageChange,
+ handleShowPerson,
+ handleAsideRemoveConfirm,
+ getProjectMembers,
+ };
+});
\ No newline at end of file
diff --git a/src/frontend/devops-manage/src/store/userGroupTable.ts b/src/frontend/devops-manage/src/store/userGroupTable.ts
index 7eca78241b9..9b8a506f3f8 100644
--- a/src/frontend/devops-manage/src/store/userGroupTable.ts
+++ b/src/frontend/devops-manage/src/store/userGroupTable.ts
@@ -37,155 +37,10 @@ interface CollapseListType {
}
export default defineStore('userGroupTable', () => {
- const isLoading = ref(false);
+ const isLoading = ref(true);
const pagination = ref({ limit: 10, current: 1 });
- const sourceList = ref
@@ -171,11 +171,11 @@
@@ -205,7 +205,7 @@
确认从以上
{{ selectedLength }}
个用户组中移出
- {{ manageAsideStore.asideItem.name }}
+ {{ asideItem.name }}
吗？
@@ -234,10 +234,12 @@ import http from '@/http/api';
import NoPermission from '../no-enable-permission/no-permission.vue';
import userGroupTable from "@/store/userGroupTable";
import useManageAside from "@/store/manageAside";
+import { storeToRefs } from 'pinia';
const { t } = useI18n();
const route = useRoute();
const formRef = ref('');
+const renewalRef = ref(null);
const projectId = computed(() => route.params?.projectCode);
const expiredAt = ref();
const isLoading = ref(false);
@@ -280,12 +282,51 @@ const searchData = ref([
]);
const isPermission = ref(true);
const manageAsideRef = ref(null);
-const selectedLength = computed(() => Object.keys(groupTableStore.selectedData).length);
const groupTableStore = userGroupTable();
const manageAsideStore = useManageAside();
+const {
+ pagination,
+ sourceList,
+ isShowRenewal,
+ isShowHandover,
+ isShowRemove,
+ selectedData,
+ selectedLength,
+ unableMoveLength,
+ selectProjectlist,
+ selectSourceList,
+ selectedRow,
+ selectedTableGroupId,
+} = storeToRefs(groupTableStore);
+const {
+ handleRenewal,
+ handleHandOver,
+ handleRemove,
+ getSelectList,
+ getSourceList,
+ handleLoadMore,
+ handleSelectAllData,
+ handleClear,
+ collapseClick,
+} = groupTableStore;
+
+const {
+ asideItem,
+ memberList,
+ personList,
+ overTable,
+} = storeToRefs(manageAsideStore);
+const {
+ handleAsideClick,
+ handleAsidePageChange,
+ handleShowPerson,
+ handleAsideRemoveConfirm,
+ getProjectMembers,
+} = manageAsideStore;
+
onMounted(() => {
- manageAsideStore.getProjectMembers(projectId.value);
+ getProjectMembers(projectId.value);
});
watch(searchValue, (nv) => {
@@ -295,13 +336,21 @@ watch(searchValue, (nv) => {
manageAsideStore.userName = val?.values[0]?.name;
};
});
- manageAsideStore.getProjectMembers(projectId.value);
+ getProjectMembers(projectId.value);
});
/**
* 续期弹窗提交事件
*/
function handleRenewalConfirm() {
- console.log(expiredAt.value, '授权期限');
+ console.log(expiredAt.value, '授权期限', selectedRow.value, selectedTableGroupId.value);
+
+ const itemNew = sourceList.value.find(group => group.id === selectedTableGroupId.value).tableData.find(item => item.groupId === selectedRow.value.groupId)
+ if(itemNew){
+ // expiredAt.value需要处理下
+ itemNew.joinedTime = expiredAt.value
+ }
+
+ renewalRef.value.initTime();
groupTableStore.isShowRenewal = false;
};
/**
@@ -315,7 +364,7 @@ function handleHandoverConfirm() {
* 移出弹窗提交事件
*/
function handleRemoveConfirm() {
- console.log(manageAsideStore.asideItem,'移出的数据');
+ console.log(asideItem,'移出的数据');
groupTableStore.isShowRemove = false;
}
/**
@@ -328,40 +377,40 @@ function handleChangeTime(value) {
* 批量续期
*/
function batchRenewal() {
- if (!selectedLength.value) {
+ if (!groupTableStore.selectedLength) {
Message('请先选择用户组');
return;
}
sliderTitle.value = '批量续期';
batchFlag.value = 'renewal';
isShowSlider.value = true;
- groupTableStore.getSourceList();
+ getSourceList();
}
/**
* 批量移交
*/
function batchHandover() {
- if (!selectedLength.value) {
+ if (!groupTableStore.selectedLength) {
Message('请先选择用户组');
return;
}
sliderTitle.value = '批量移交';
batchFlag.value = 'handover';
isShowSlider.value = true;
- groupTableStore.getSourceList();
+ getSourceList();
}
/**
* 批量移出
*/
function batchRemove() {
- if (!selectedLength.value) {
+ if (!groupTableStore.selectedLength) {
Message('请先选择用户组');
return;
}
sliderTitle.value = '批量移出';
batchFlag.value = 'remove';
isShowSlider.value = true;
- groupTableStore.getSourceList();
+ getSourceList();
}
/**
* sideslider 关闭
@@ -377,25 +426,26 @@ function batchCancel() {
async function batchConfirm(batchFlag) {
if (batchFlag === 'renewal') {
const params = [{
- member: manageAsideStore.asideItem.name,
- groupId: manageAsideStore.asideItem.id,
+ member: asideItem.name,
+ groupId: asideItem.id,
expiredAt: expiredAt.value,
}];
const res = await http.batchRenewal(projectId.value, params);
+ renewalRef.value.initTime();
} else if (batchFlag === 'handover') {
const flag = await formRef.value.validate();
if (flag) {
const params = [{
- groupId: manageAsideStore.asideItem.id,
- handoverFrom: manageAsideStore.asideItem.name,
+ groupId: asideItem.id,
+ handoverFrom: asideItem.name,
handoverTo: handOverForm.value.name,
}];
const res = await http.batchHandover(projectId.value, params);
}
} else if (batchFlag === 'remove') {
const params = [{
- groupId: manageAsideStore.asideItem.id,
- member: manageAsideStore.asideItem.name,
+ groupId: asideItem.id,
+ member: asideItem.name,
}];
const res = await http.batchRemove(projectId.value, params);
}
@@ -407,8 +457,8 @@ async function batchConfirm(batchFlag) {
}, 1000);
}
-function handleAsideRemoveConfirm(value) {
- manageAsideStore.handleAsideRemoveConfirm(value, manageAsideRef.value);
+function asideRemoveConfirm(value) {
+ handleAsideRemoveConfirm(value, manageAsideRef.value);
}
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-aside.vue b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-aside.vue
index 0b4124ea8b0..4a870ef573a 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-aside.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-aside.vue
@@ -211,7 +211,8 @@ watch(() => props.memberList, (newData) => {
});
defineExpose({
- handOverfail
+ handOverfail,
+ handOverClose,
});
function handleClick(item) {
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/tab-table.vue b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/tab-table.vue
index 7517db531ca..f2f08979090 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/tab-table.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/tab-table.vue
@@ -40,7 +40,7 @@
@@ -81,7 +84,6 @@
\ No newline at end of file
diff --git a/src/frontend/locale/manage/en-US.json b/src/frontend/locale/manage/en-US.json
index 47491935798..d9489b88726 100644
--- a/src/frontend/locale/manage/en-US.json
+++ b/src/frontend/locale/manage/en-US.json
@@ -138,5 +138,13 @@
"重命名": "Rename",
"项目类型": "Project Type",
"创建项目申请单已撤回": "Creation of project application has been withdrawn",
- "全员": "EveryOne"
+ "全员": "EveryOne",
+ "检测到以下X项授权将无法重置，请前往处理或继续重置其余代码库授权": "The following {0} authorizations cannot be reset. Please {1} or {2} {3} {4}",
+ "前往处理": "navigate to handle them",
+ "继续重置其余": "continue to reset the remaining",
+ "授权": "authorizations",
+ "代码库": "Code Repository",
+ "部署节点": "Deployment Node",
+ "流水线": "Pipeline",
+ "授权已成功重置": "{0} authorization has been successfully reset"
}
diff --git a/src/frontend/locale/manage/zh-CN.json b/src/frontend/locale/manage/zh-CN.json
index 5635b9425e2..d6a5df854d9 100644
--- a/src/frontend/locale/manage/zh-CN.json
+++ b/src/frontend/locale/manage/zh-CN.json
@@ -139,5 +139,30 @@
"重命名": "重命名",
"项目类型": "项目类型",
"创建项目申请单已撤回": "创建项目申请单已撤回",
- "全员": "全员"
+ "全员": "全员",
+ "检测到以下X项授权将无法重置，请前往处理或继续重置其余代码库授权": "检测到以下{0}项授权将无法重置，请{1}或{2}{3}{4}",
+ "前往处理": "前往处理",
+ "继续重置其余": "继续重置其余",
+ "授权": "授权",
+ "代码库": "代码库",
+ "部署节点": "部署节点",
+ "流水线": "流水线",
+ "授权已成功重置": "{0}授权已成功重置",
+ "输入授权人，按回车进行校验": "输入授权人，按回车进行校验",
+ "批量重置": "批量重置",
+ "重置授权人": "重置授权人",
+ "已选择全量数据X条": "已选择全量数据 {0} 条",
+ "清除选择": "清除选择",
+ "已选择X条数据，": "已选择 {0} 条数据，",
+ "选择全量数据X条": "选择全量数据{0}条",
+ "失败原因": "失败原因",
+ "授权校验通过": "授权校验通过",
+ "重置": "重置",
+ "代码库授权": "代码库授权",
+ "流水线执行授权": "流水线执行授权",
+ "部署节点授权": "部署节点授权",
+ "授权人": "授权人",
+ "授权时间": "授权时间",
+ "请先选择数据": "请先选择数据",
+ "已选择X个XX": "已选择{0]个{1}"
}
From 7254dd1b0b4eba506c493ffe7c18f362154acdcd Mon Sep 17 00:00:00 2001
From: v_hwweng
已选择 {{ selectedData[groupId].length }} 条数据，
- 选择全量数据 {{ total }} 条
+ 选择全量数据 {{ groupTotal }} 条
|
清除选择
@@ -69,7 +72,7 @@
text
theme="primary"
:disabled="row.removeMemberButtonControl!='OTHER'"
- @click="handleRemove(row)"
+ @click="handleRemove(row, index)"
>移出
diff --git a/src/frontend/devops-manage/src/http/api.ts b/src/frontend/devops-manage/src/http/api.ts
index 40acb2ba4bf..d65753a8f84 100644
--- a/src/frontend/devops-manage/src/http/api.ts
+++ b/src/frontend/devops-manage/src/http/api.ts
@@ -294,5 +294,15 @@ export default {
}
const serviceUrl = serviceUrlMap[resourceType]
return http.post(`${serviceUrl}`, params)
- }
+ },
+
+ /**
+ * 用户态-iam用户组_同步
+ */
+ syncGroupAndMember (projectId: string) {
+ return http.put(`${IAM_PERFIX}/group/sync/${projectId}/syncGroupAndMember`);
+ },
+ syncGroupMember (projectId: string, groupId: any) {
+ return http.put(`${IAM_PERFIX}/group/sync/${projectId}/${groupId}/syncGroupMember`);
+ },
};
From 7bedacb93db5b09f101c870dcb3fa91e0d06c831 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Fri, 19 Jul 2024 11:55:17 +0800
Subject: [PATCH 035/126] =?UTF-8?q?feat=EF=BC=9A=E6=94=AF=E6=8C=81?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=9F=A5=E7=9C=8B=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E6=88=90=E5=91=98=20#9620=20#=20Reviewed,=20transaction=20id:?=
=?UTF-8?q?=2012547?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../children/permission-manage/group-tab.vue | 4 +
.../children/permission-manage/manage-all.vue | 55 ++--
.../permission-manage/manage-aside.vue | 243 ++++++++++--------
.../children/permission-manage/tab-table.vue | 61 ++---
.../devops-manage/src/css/fonts/iconcool.eot | Bin 6336 -> 7092 bytes
.../devops-manage/src/css/fonts/iconcool.svg | 12 +
.../devops-manage/src/css/fonts/iconcool.ttf | Bin 6168 -> 6924 bytes
.../devops-manage/src/css/fonts/iconcool.woff | Bin 3720 -> 4180 bytes
.../devops-manage/src/css/iconcool.js | 2 +-
.../devops-manage/src/css/iconcool.json | 2 +-
src/frontend/devops-manage/src/css/style.css | 12 +
.../devops-manage/src/css/svg/close.svg | 1 -
.../devops-manage/src/css/svg/warninfo.svg | 1 +
src/frontend/devops-manage/src/http/api.ts | 22 +-
.../devops-manage/src/store/manageAside.ts | 126 +++++----
.../devops-manage/src/store/userGroupTable.ts | 79 +++---
.../devops-manage/src/utils/constants.js | 7 +-
src/frontend/locale/manage/en-US.json | 6 +-
src/frontend/locale/manage/zh-CN.json | 6 +-
19 files changed, 376 insertions(+), 263 deletions(-)
delete mode 100644 src/frontend/devops-manage/src/css/svg/close.svg
create mode 100644 src/frontend/devops-manage/src/css/svg/warninfo.svg
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/group-tab.vue b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/group-tab.vue
index bb8674874b7..1cc344fcfdd 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/group-tab.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/group-tab.vue
@@ -26,6 +26,7 @@
:selected-data="selectedData"
:has-next="projectTable.hasNext"
:group-name="t('用户组')"
+ :scroll-loading="projectTable.scrollLoading"
@handle-renewal="handleRenewal"
@handle-hand-over="handleHandOver"
@handle-remove="handleRemove"
@@ -68,6 +69,7 @@
:has-next="item.hasNext"
:loading="item.tableLoading"
:group-name="item.resourceTypeName"
+ :scroll-loading="item.scrollLoading"
@handle-renewal="handleRenewal"
@handle-hand-over="handleHandOver"
@handle-remove="handleRemove"
@@ -146,6 +148,7 @@ const props = defineProps({
},
selectedData: {
type: Object,
+ default: () => ({})
},
sourceList: {
type: Array,
@@ -153,6 +156,7 @@ const props = defineProps({
},
asideItem: {
type: Object,
+ default: () => ({})
},
});
const emit = defineEmits(['collapseClick']);
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue
index de66c3e732e..08e87c4c602 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue
@@ -1,5 +1,5 @@
-
{{t("续期")}}
{{asideItem.name}}
@@ -95,7 +96,7 @@
@closed="handleHandoverClosed"
>
- {{t("移交")}}
+ {{t("移交")}}
{{asideItem.name}}
@@ -112,6 +113,7 @@
+ {{t("确认从用户组中移出用户吗")}}？
- 组织/用户
+ {{t("组织/用户")}}
- 刷新
+ {{t("刷新")}}
@@ -35,14 +35,14 @@
-
+
+
+
-
+
{{t("确认将组织移出本项目吗")}}？
+
+
-
+
+
{{t("续期")}}
- {{asideItem.name}}
+ {{userName}}
{{t("移交")}}
- {{asideItem.name}}
+ {{userName}}
@@ -310,11 +327,21 @@ const searchData = computed(() => {
return !searchValue.value.find(val => val.id === data.id)
})
});
-const isPermission = ref(true);
const manageAsideRef = ref(null);
const groupTableStore = userGroupTable();
const manageAsideStore = useManageAside();
const operatorLoading = ref(false);
+const unableText = {
+ renewal: t('无法续期'),
+ handover: t('无法移交'),
+ remove: t('无法移出'),
+}
+const userName = computed(() => {
+ if (asideItem.value.type === 'user') {
+ return `${asideItem.value.id}(${asideItem.value.name})`;
+ }
+ return asideItem.value.name;
+})
const {
sourceList,
@@ -326,6 +353,7 @@ const {
unableMoveLength,
selectSourceList,
selectedRow,
+ isPermission,
} = storeToRefs(groupTableStore);
const {
fetchUserGroupList,
@@ -351,6 +379,7 @@ const {
tableLoading,
overTable,
isLoading,
+ activeTab,
} = storeToRefs(manageAsideStore);
const {
handleAsideClick,
@@ -367,13 +396,14 @@ onMounted(() => {
watch(searchValue, (newSearchValue) => {
getProjectMembers(projectId.value, newSearchValue);
});
-
+function handleSearch(value){
+ getProjectMembers(projectId.value, value);
+}
function asideClick(item){
handleAsideClick(item, projectId.value);
}
async function refresh(){
searchValue.value = [];
- await getProjectMembers(projectId.value);
}
/**
* 续期弹窗提交事件
@@ -437,6 +467,19 @@ function handleChangeTime(value) {
function handleSelectAll(resourceType, asideItem){
handleSelectAllData(resourceType, asideItem)
}
+/**
+ * 找出无法移出用户数据
+ */
+function countNonOtherObjects(data, flag) {
+ const items = Object.values(data).flat();
+ const filterConditions = {
+ renewal: item => item.expiredAtDisplay == t('永久') || item.removeMemberButtonControl === 'TEMPLATE',
+ handover: item => item.removeMemberButtonControl == 'TEMPLATE',
+ remove: item => item.removeMemberButtonControl !== 'OTHER',
+ };
+ const filterCondition = filterConditions[flag] || (() => false);
+ return items.filter(filterCondition).length;
+}
/**
* 批量操作
* @param flag 按钮标识
@@ -450,6 +493,7 @@ function batchOperator(flag){
});
return;
}
+ unableMoveLength.value = countNonOtherObjects(selectedData.value, flag);
sliderTitle.value = t(batchTitle[flag]);
batchFlag.value = flag;
isShowSlider.value = true;
@@ -544,8 +588,8 @@ function showMessage(theme, message) {
message: message,
});
}
-function asideRemoveConfirm(value) {
- handleAsideRemoveConfirm(value, projectId.value, manageAsideRef.value);
+function asideRemoveConfirm(removeUser, handOverForm) {
+ handleAsideRemoveConfirm(removeUser, handOverForm, projectId.value);
}
@@ -875,4 +919,12 @@ function asideRemoveConfirm(value) {
}
}
}
+
+.text-blue{
+ color: #699DF4;
+}
+
+.bk-exception{
+ margin-top: 240px;
+}
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-aside.vue b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-aside.vue
index b0a15b29903..9a9dc7f0018 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-aside.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-aside.vue
@@ -3,6 +3,7 @@
{{t("组织/用户")}}
+
{{t("刷新")}}
@@ -104,7 +105,8 @@
:placeholder="t('请输入')"
clearable
@clear="handOverInputClear"
- @blur="handOverInputBlur"
+ @blur="handOverInput"
+ @enter="handOverInput"
/>
@@ -133,9 +135,8 @@
{{t("刷新")}}
-
-
-
+
+
+
@@ -94,7 +106,6 @@
import { useI18n } from 'vue-i18n';
import { ref, defineProps, defineEmits, computed } from 'vue';
import { timeFormatter } from '@/common/util.ts'
-import { TOOLTIPS_CONTENT } from '@/utils/constants'
const props = defineProps({
isShowOperation: {
@@ -113,6 +124,7 @@ const props = defineProps({
hasNext: Boolean,
loading: Boolean,
groupName: String,
+ batchFlag: String,
});
const emit = defineEmits([
'handleRenewal',
@@ -137,6 +149,41 @@ const fixedBottom = {
height: 42,
loading: scrollLoading.value
};
+const TOOLTIPS_CONTENT = {
+ UNIQUE_MANAGER: t('唯一管理员，不可移出。请添加新的管理员后再移出。'),
+ UNIQUE_OWNER: t('唯一拥有者，不可移出。请添加新的拥有者后再移出。'),
+ TEMPLATE: t('通过用户组加入，不可直接移出。如需调整，请编辑用户组。')
+}
+const unableMessage = ref('');
+function shouldShowOverlay(row){
+ if (props.isShowOperation) {
+ return false;
+ }
+
+ switch (props.batchFlag) {
+ case 'renewal':
+ if(row.expiredAtDisplay === t('永久')){
+ unableMessage.value = t("无需续期");
+ } else if (row.removeMemberButtonControl === 'TEMPLATE') {
+ unableMessage.value = t("通过用户组获得权限，请到流水线里续期整个用户组");
+ }
+ return row.expiredAtDisplay === t('永久') || row.removeMemberButtonControl === 'TEMPLATE';
+ case 'handover':
+ unableMessage.value = t("通过用户组获得权限，请到用户组里移出用户");
+ return row.removeMemberButtonControl === 'TEMPLATE';
+ case 'remove':
+ if (row.removeMemberButtonControl === 'UNIQUE_MANAGER') {
+ unableMessage.value = t("唯一管理员，无法移出");
+ } else if (row.removeMemberButtonControl === 'UNIQUE_OWNER') {
+ unableMessage.value = t("唯一拥有者，无法移出");
+ } else if (row.removeMemberButtonControl === 'TEMPLATE') {
+ unableMessage.value = t("通过用户组加入，无法移出");
+ }
+ return row.removeMemberButtonControl !== 'OTHER';
+ default:
+ return false;
+ }
+}
/**
* 当前页全选事件
*/
diff --git a/src/frontend/devops-manage/src/http/api.ts b/src/frontend/devops-manage/src/http/api.ts
index 9bdd2715275..0fc8284609e 100644
--- a/src/frontend/devops-manage/src/http/api.ts
+++ b/src/frontend/devops-manage/src/http/api.ts
@@ -302,9 +302,15 @@ export default {
return http.put(`${IAM_PERFIX}/group/sync/${projectId}/${groupId}/syncGroupMember`);
},
/**
- * 用户移出项目
- */
+ * 用户移出项目
+ */
removeMemberFromProject (projectId: string, params: any) {
return http.put(`${IAM_PERFIX}/member/${projectId}/removeMemberFromProject`, params);
},
+ /**
+ * 重置资源授权管理
+ */
+ resetAllResourceAuthorization (projectId: string, params: any) {
+ return http.post(`${USER_PERFIX}/auth/authorization/${projectId}/resetAllResourceAuthorization`, params);
+ },
};
diff --git a/src/frontend/devops-manage/src/store/manageAside.ts b/src/frontend/devops-manage/src/store/manageAside.ts
index e26ecf0b2f2..a87a85087ed 100644
--- a/src/frontend/devops-manage/src/store/manageAside.ts
+++ b/src/frontend/devops-manage/src/store/manageAside.ts
@@ -1,6 +1,6 @@
import http from '@/http/api';
import { defineStore } from 'pinia';
-import { ref } from 'vue';
+import { onMounted, ref } from 'vue';
import { Message } from 'bkui-vue';
import userGroupTable from "@/store/userGroupTable";
@@ -16,6 +16,14 @@ interface Pagination {
count: number;
}
+interface MemberListParamsType {
+ page: number;
+ pageSize: number;
+ userName?: string;
+ deptName?: string;
+ memberType?: string;
+}
+
export default defineStore('manageAside', () => {
const groupTableStore = userGroupTable();
@@ -27,6 +35,7 @@ export default defineStore('manageAside', () => {
const overTable = ref([]);
const userName = ref('');
const memberPagination = ref
-
-
-
-
-
+
{{ t("剩余X条数据",[remainingCount]) }}
{{t("加载更多")}}
@@ -150,9 +150,9 @@ const fixedBottom = {
loading: scrollLoading.value
};
const TOOLTIPS_CONTENT = {
- UNIQUE_MANAGER: t('唯一管理员，不可移出。请添加新的管理员后再移出。'),
- UNIQUE_OWNER: t('唯一拥有者，不可移出。请添加新的拥有者后再移出。'),
- TEMPLATE: t('通过用户组加入，不可直接移出。如需调整，请编辑用户组。')
+ UNIQUE_MANAGER: t('唯一管理员，不可移出。请添加新的管理员后再移出'),
+ UNIQUE_OWNER: t('唯一拥有者，不可移出。请添加新的拥有者后再移出'),
+ TEMPLATE: t('通过用户组加入，不可直接移出。如需调整，请编辑用户组')
}
const unableMessage = ref('');
function shouldShowOverlay(row){
@@ -173,11 +173,11 @@ function shouldShowOverlay(row){
return row.removeMemberButtonControl === 'TEMPLATE';
case 'remove':
if (row.removeMemberButtonControl === 'UNIQUE_MANAGER') {
- unableMessage.value = t("唯一管理员，无法移出");
+ unableMessage.value = t("唯一管理员，不可移出。请添加新的管理员后再移出");
} else if (row.removeMemberButtonControl === 'UNIQUE_OWNER') {
- unableMessage.value = t("唯一拥有者，无法移出");
+ unableMessage.value = t("唯一拥有者，不可移出。请添加新的拥有者后再移出");
} else if (row.removeMemberButtonControl === 'TEMPLATE') {
- unableMessage.value = t("通过用户组加入，无法移出");
+ unableMessage.value = t("通过用户组加入，不可直接移出。如需调整，请编辑用户组") + `[${row.groupName}]`;
}
return row.removeMemberButtonControl !== 'OTHER';
default:
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/time-limit.vue b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/time-limit.vue
index 6dc031379a7..96045e3116b 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/time-limit.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/time-limit.vue
@@ -59,14 +59,6 @@ function initTime(){
currentActive.value = 30;
customTime.value = 1;
}
-// /**
-// * 传入的值与当前时间戳秒数相加
-// * @param value 传入的值
-// */
-// function formatTimes(value) {
-// const nowSecond = Math.floor(Date.now() / 1000);
-// return Number(value) + nowSecond;
-// }
/**
* 授权期限选择
*/
@@ -113,7 +105,7 @@ const handleChangeCustomTime = (value) => {
}
.custom-time-select {
- width: 110px;
+ width: 100px;
height: 26px;
position: relative;
left: -1px;
diff --git a/src/frontend/devops-manage/src/store/userGroupTable.ts b/src/frontend/devops-manage/src/store/userGroupTable.ts
index a0915293cd9..8feb0ca32c9 100644
--- a/src/frontend/devops-manage/src/store/userGroupTable.ts
+++ b/src/frontend/devops-manage/src/store/userGroupTable.ts
@@ -168,10 +168,10 @@ export default defineStore('userGroupTable', () => {
if(currentRequestId === requestId) {
sourceList.value.forEach(item => {
- if(item.resourceType === "project") {
+ if(item.resourceType === "project" && projectResult) {
item.tableData = projectResult.records;
}
- if(item.resourceType === "pipeline") {
+ if(item.resourceType === "pipeline" && pipelineGroupResult) {
item.tableData = pipelineGroupResult.records;
item.count && (item.activeFlag = true);
}
@@ -179,6 +179,7 @@ export default defineStore('userGroupTable', () => {
isLoading.value = false;
}
} catch (error: any) {
+ isLoading.value = false;
console.error(error);
}
}
diff --git a/src/frontend/locale/manage/en-US.json b/src/frontend/locale/manage/en-US.json
index 6862e4fae57..0704d2db9cf 100644
--- a/src/frontend/locale/manage/en-US.json
+++ b/src/frontend/locale/manage/en-US.json
@@ -178,7 +178,7 @@
"请输入": "Please enter",
"关闭": "Close",
"确认移出": "Confirm Removal",
- "确认从用户组中移出用户吗": "Confirm to remove the user from the user group?",
+ "确认从用户组中移出用户吗": "Confirm to remove the user from the user group",
"待移出用户": "Users to be removed",
"所在用户组": "User Group",
"已选择X个用户组": "Selected {0} user groups",
@@ -228,19 +228,17 @@
"用户组权限已续期": "User group permissions have been renewed",
"用户组权限已移交": "User group permissions have been transferred",
"用户组已移出": "User group has been removed",
- "永久": "Permanent",
- "唯一管理员，不可移出。请添加新的管理员后再移出。": "Only administrator, cannot be removed. Please add a new administrator before removing.",
- "唯一拥有者，不可移出。请添加新的拥有者后再移出。": "Only owner, cannot be removed. Please add a new owner before removing.",
- "通过用户组加入，不可直接移出。如需调整，请编辑用户组。": "Added through user group, cannot be directly removed. If adjustments are needed, please edit the user group.",
+ "永久": "permanent",
+ "唯一管理员，不可移出。请添加新的管理员后再移出": "Only administrator, cannot be removed. Please add a new administrator before removing",
+ "唯一拥有者，不可移出。请添加新的拥有者后再移出": "Only owner, cannot be removed. Please add a new owner before removing",
+ "通过用户组加入，不可直接移出。如需调整，请编辑用户组": "Added through user group, cannot be directly removed. If adjustments are needed, please edit the user group",
"组织/用户": "Organization/User",
"无需续期": "No renewal required",
- "通过用户组加入，无法移出": "Added through user group, cannot be removed",
- "唯一拥有者，无法移出": "Only owner, cannot be removed",
"通过用户组获得权限，请到流水线里续期整个用户组": "Accessed through user group, please renew the entire user group in the pipeline",
"通过用户组获得权限，请到用户组里移出用户": "Accessed through user group, please remove the user from the user group",
- "通过用户组获得权限，请到用户组里移出用": "Accessed through user group, please remove the use from the user group",
"无法续期": "Cannot be renewed",
"无法移交": "Cannot be transferred",
"没有数据": "No data",
- "可以尝试 调整关键词 或 清空筛选条件": "You can try adjusting the keywords or {0}"
+ "可以尝试 调整关键词 或 清空筛选条件": "You can try adjusting the keywords or {0}",
+ "清空筛选条件": "Clear filter conditions"
}
diff --git a/src/frontend/locale/manage/zh-CN.json b/src/frontend/locale/manage/zh-CN.json
index c571a2882e1..8923f22b87c 100644
--- a/src/frontend/locale/manage/zh-CN.json
+++ b/src/frontend/locale/manage/zh-CN.json
@@ -230,18 +230,16 @@
"用户组权限已移交": "用户组权限已移交",
"用户组已移出": "用户组已移出",
"永久": "永久",
- "唯一管理员，不可移出。请添加新的管理员后再移出。": "唯一管理员，不可移出。请添加新的管理员后再移出。",
- "唯一拥有者，不可移出。请添加新的拥有者后再移出。": "唯一拥有者，不可移出。请添加新的拥有者后再移出。",
- "通过用户组加入，不可直接移出。如需调整，请编辑用户组。": "通过用户组加入，不可直接移出。如需调整，请编辑用户组。",
+ "唯一管理员，不可移出。请添加新的管理员后再移出": "唯一管理员，不可移出。请添加新的管理员后再移出",
+ "唯一拥有者，不可移出。请添加新的拥有者后再移出": "唯一拥有者，不可移出。请添加新的拥有者后再移出",
+ "通过用户组加入，不可直接移出。如需调整，请编辑用户组": "通过用户组加入，不可直接移出。如需调整，请编辑用户组",
"组织/用户": "组织/用户",
"无需续期": "无需续期",
- "通过用户组加入，无法移出": "通过用户组加入，无法移出",
- "唯一拥有者，无法移出": "唯一拥有者，无法移出",
"通过用户组获得权限，请到流水线里续期整个用户组": "通过用户组获得权限，请到流水线里续期整个用户组",
"通过用户组获得权限，请到用户组里移出用户": "通过用户组获得权限，请到用户组里移出用户",
- "通过用户组获得权限，请到用户组里移出用": "通过用户组获得权限，请到用户组里移出用",
"无法续期": "无法续期",
"无法移交": "无法移交",
"没有数据": "没有数据",
- "可以尝试 调整关键词 或 清空筛选条件": "可以尝试 调整关键词 或 {0}"
+ "可以尝试 调整关键词 或 清空筛选条件": "可以尝试 调整关键词 或 {0}",
+ "清空筛选条件": "清空筛选条件"
}
From 616e81f2ac2b4ce0e7e5b84aafa3c83a012904e4 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Wed, 24 Jul 2024 10:13:25 +0800
Subject: [PATCH 045/126] =?UTF-8?q?feat=EF=BC=9A=E6=94=AF=E6=8C=81?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=9F=A5=E7=9C=8B=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E6=88=90=E5=91=98=20#9620=20#=20Reviewed,=20transaction=20id:?=
=?UTF-8?q?=2012909?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../children/permission-manage/manage-all.vue | 8 +++---
.../children/permission-manage/tab-table.vue | 27 ++++++++++---------
src/frontend/locale/manage/en-US.json | 4 +--
3 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue
index c626d9754ed..cdd969005af 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue
@@ -244,7 +244,7 @@
@@ -332,9 +332,9 @@ const groupTableStore = userGroupTable();
const manageAsideStore = useManageAside();
const operatorLoading = ref(false);
const unableText = {
- renewal: t('无法续期'),
- handover: t('无法移交'),
- remove: t('无法移出'),
+ renewal: '无法续期',
+ handover: '无法移交',
+ remove: '无法移出',
}
const userName = computed(() => {
if (asideItem.value.type === 'user') {
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/tab-table.vue b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/tab-table.vue
index bf3d7a50859..13a234b0c73 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/tab-table.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/tab-table.vue
@@ -4,13 +4,14 @@
class="table"
ref="refTable"
:max-height="!isShowOperation && '464'"
- :fixed-bottom="fixedBottom"
:data="data"
show-overflow-tooltip
:pagination="pagination"
:border="['row', 'outer']"
remote-pagination
empty-cell-text="--"
+ :fixed-bottom="fixedBottom"
+ :scroll-loading="scrollLoading"
@select-all="handleSelectAll"
@selection-change="handleSelectionChange"
@page-limit-change="pageLimitChange"
@@ -29,12 +30,6 @@
{{t("清除选择")}}
- {{ t("剩余X条数据",[remainingCount]) }}
- {{t("加载更多")}}
-
-
+ {{ t("剩余X条数据",[remainingCount]) }}
+ {{t("加载更多")}}
+
+
@@ -143,7 +144,7 @@ const isCurrentAll = ref(false);
const resourceType = computed(() => props.resourceType);
const groupTotal = computed(() => props.groupTotal);
const remainingCount = computed(()=> props.groupTotal - props.data.length);
-const scrollLoading = computed(()=>props.scrollLoading);
+const scrollLoading = computed(() => props.scrollLoading);
const fixedBottom = {
position: 'relative',
height: 42,
@@ -199,8 +200,10 @@ function handleSelectAll({checked}) {
* 多选事件
*/
function handleSelectionChange() {
- emit('getSelectList', refTable.value.getSelection(), resourceType.value);
- isCurrentAll.value = props.data.length === refTable.value.getSelection()
+ const selectionList = refTable.value.getSelection();
+ console.log("🚀 ~ handleSelectionChange ~ selectionList:", selectionList)
+ emit('getSelectList', selectionList, resourceType.value);
+ isCurrentAll.value = props.data.length === selectionList
};
/**
* 全量数据选择
@@ -265,8 +268,8 @@ function pageValueChange(value) {
}
.prepend {
width: 100%;
- height: 32px;
- line-height: 32px;
+ height: 42px;
+ line-height: 42px;
background: #F0F1F5;
text-align: center;
box-shadow: 0 -1px 0 0 #DCDEE5;
diff --git a/src/frontend/locale/manage/en-US.json b/src/frontend/locale/manage/en-US.json
index 0704d2db9cf..d706993bc46 100644
--- a/src/frontend/locale/manage/en-US.json
+++ b/src/frontend/locale/manage/en-US.json
@@ -236,8 +236,8 @@
"无需续期": "No renewal required",
"通过用户组获得权限，请到流水线里续期整个用户组": "Accessed through user group, please renew the entire user group in the pipeline",
"通过用户组获得权限，请到用户组里移出用户": "Accessed through user group, please remove the user from the user group",
- "无法续期": "Cannot be renewed",
- "无法移交": "Cannot be transferred",
+ "无法续期": "cannot be renewed",
+ "无法移交": "cannot be transferred",
"没有数据": "No data",
"可以尝试 调整关键词 或 清空筛选条件": "You can try adjusting the keywords or {0}",
"清空筛选条件": "Clear filter conditions"
From 5d15bbbec16eca5f9cbf04f6e8abc8ad026db4c4 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Wed, 24 Jul 2024 19:20:03 +0800
Subject: [PATCH 046/126] =?UTF-8?q?feat=EF=BC=9A=E6=94=AF=E6=8C=81?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=9F=A5=E7=9C=8B=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E6=88=90=E5=91=98=20#9620=20#=20Reviewed,=20transaction=20id:?=
=?UTF-8?q?=2013049?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/frontend/devops-manage/package.json | 6 +-
.../permission-manage/group-aside.vue | 1 +
.../children/permission-manage/manage-all.vue | 92 ++++++++-----------
.../permission-manage/manage-aside.vue | 29 ++++--
.../children/permission-manage/tab-table.vue | 15 +--
src/frontend/devops-manage/src/http/api.ts | 6 ++
.../devops-manage/src/store/manageAside.ts | 8 +-
.../devops-manage/src/store/userGroupTable.ts | 4 -
.../devops-manage/src/utils/constants.js | 25 +++++
.../manage/permission/permission-manage.vue | 5 +
10 files changed, 110 insertions(+), 81 deletions(-)
diff --git a/src/frontend/devops-manage/package.json b/src/frontend/devops-manage/package.json
index 140c8edb4fe..ecc3a650678 100644
--- a/src/frontend/devops-manage/package.json
+++ b/src/frontend/devops-manage/package.json
@@ -23,12 +23,14 @@
"license": "ISC",
"dependencies": {
"bk-permission": "^0.0.28",
- "bkui-vue": "2.0.1-beta.38",
+ "bkui-vue": "2.0.1-beta.41",
"dayjs": "^1.11.2",
"pinia": "^2.0.23",
"vue": "^3.2.41",
"vue-i18n": "^9.1.10",
- "vue-router": "^4.1.6"
+ "vue-router": "^4.1.6",
+ "lodash.throttle": "^4.1.1",
+ "@icon-cool/bk-icon-bk-biz-components": "0.0.4"
},
"devDependencies": {
"@blueking/babel-preset-bk": "^2.1.0-beta7",
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/group-aside.vue b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/group-aside.vue
index e174d296f5e..1c36e8e81e2 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/group-aside.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/group-aside.vue
@@ -310,6 +310,7 @@ export default {
const users = data.data.members.filter(i => i.type === 'user')
this.groupList[this.curGroupIndex].departmentCount -= departments.length
this.groupList[this.curGroupIndex].userCount -= users.length
+ this.syncGroupIAM(this.groupList[this.curGroupIndex].groupId)
break;
case 'change_group_detail_tab':
this.$emit('change-group-detail-tab', data.data.tab)
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue
index cdd969005af..30ef160b336 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue
@@ -30,9 +30,9 @@
-
@@ -175,6 +175,7 @@ import ScrollLoadList from './scroll-load-list';
import ajax from './ajax.js';
import { Message } from 'bkui-vue';
import tools from '@/utils/tools';
+import { useI18n } from 'vue-i18n';
export default {
components: {
ScrollLoadList,
@@ -182,7 +183,7 @@ export default {
props: {
activeIndex: {
type: Boolean,
- default: 0,
+ default: 1,
},
showCreateGroup: {
type: Boolean,
@@ -199,6 +200,7 @@ export default {
},
emits: ['choose-group', 'create-group', 'close-manage'],
data() {
+ const { t } = useI18n();
return {
resourceType: 'project',
projectCode: '',
@@ -217,6 +219,7 @@ export default {
renameGroupId: 0,
curGroupIndex: -1,
keyWords: '',
+ t
};
},
computed: {
@@ -258,7 +261,7 @@ export default {
this.groupList.push(...data.records);
// 首页需要加载
if (this.page === 1) {
- const chooseGroup = this.groupList.find(group => +group.groupId === +this.$route.query?.groupId) || this.groupList[0];
+ const chooseGroup = this.groupList.find(group => group.groupId === this.$route.query?.groupId) || this.groupList[1];
this.handleChooseGroup(chooseGroup);
}
this.page += 1
@@ -287,7 +290,7 @@ export default {
this.refreshList();
Message({
theme: 'success',
- message: this.$t('删除成功')
+ message: this.t('删除成功')
});
})
.finally(() => {
@@ -374,7 +377,7 @@ export default {
group.name = this.displayGroupName;
Message({
theme: 'success',
- message: this.$t('修改成功')
+ message: this.t('修改成功')
});
})
.catch((err) => {
diff --git a/src/frontend/devops-permission/src/views/my-permission/user-group/index.vue b/src/frontend/devops-permission/src/views/my-permission/user-group/index.vue
index b94231a0adb..9c6af721d34 100644
--- a/src/frontend/devops-permission/src/views/my-permission/user-group/index.vue
+++ b/src/frontend/devops-permission/src/views/my-permission/user-group/index.vue
@@ -11,7 +11,7 @@
/>
@@ -198,6 +198,37 @@
+
-
@@ -104,7 +110,8 @@
diff --git a/src/frontend/devops-manage/src/store/manageAside.ts b/src/frontend/devops-manage/src/store/manageAside.ts
index 1b5cb6e1090..cb232d08d00 100644
--- a/src/frontend/devops-manage/src/store/manageAside.ts
+++ b/src/frontend/devops-manage/src/store/manageAside.ts
@@ -84,7 +84,7 @@ export default defineStore('manageAside', () => {
manageAsideRef.handOverClose();
getProjectMembers(projectId);
} catch (error) {
-
+ btnLoading.value = false;
}
}
/**
diff --git a/src/frontend/devops-manage/src/store/userGroupTable.ts b/src/frontend/devops-manage/src/store/userGroupTable.ts
index fc07a74db5d..5d3a1ccc9ae 100644
--- a/src/frontend/devops-manage/src/store/userGroupTable.ts
+++ b/src/frontend/devops-manage/src/store/userGroupTable.ts
@@ -338,7 +338,7 @@ export default defineStore('userGroupTable', () => {
item.tableLoading = false;
item.tableData = res.records;
} catch (e) {
- console.error(e)
+ item.tableLoading = false;
}
}
}
diff --git a/src/frontend/locale/manage/en-US.json b/src/frontend/locale/manage/en-US.json
index 8959ad2f7eb..00c2c948ed0 100644
--- a/src/frontend/locale/manage/en-US.json
+++ b/src/frontend/locale/manage/en-US.json
@@ -165,7 +165,7 @@
"请先选择数据": "Please select data first",
"已选择X个XX": "Selected {0} {1}",
"该用户暂无项目权限": "This user has no project permissions",
- "由于该用户仍有部分授权未移交，未能自动移出项目；如有需要，可前往「授权管理」处理": "Since this user still has some authorizations not transferred, they could not be automatically removed from the project; if needed, you can go to \"{0}\" to handle it",
+ "该用户无操作权限，但存在授权，可前往「授权管理」查看处理": "This user has no operation permissions, but there is authorization. You can go to {0} to view and handle it",
"授权管理": "Authorization Management",
"批量续期": "Batch Renew",
"批量移交": "Batch Transfer",
@@ -235,6 +235,8 @@
"组织/用户": "Organization/User",
"无需续期": "No renewal required",
"通过用户组获得权限，请到流水线里续期整个用户组": "Accessed through user group, please renew the entire user group in the pipeline",
+ "通过用户组获得权限，请到": "To obtain permissions through a user group, go to ",
+ "里续期整个用户组": "to renew the entire user group",
"通过用户组获得权限，请到用户组里移出用户": "Accessed through user group, please remove the user from the user group",
"无法续期": "cannot be renewed",
"无法移交": "cannot be transferred",
diff --git a/src/frontend/locale/manage/zh-CN.json b/src/frontend/locale/manage/zh-CN.json
index dfa860669a5..e8f7ae95126 100644
--- a/src/frontend/locale/manage/zh-CN.json
+++ b/src/frontend/locale/manage/zh-CN.json
@@ -166,7 +166,7 @@
"请先选择数据": "请先选择数据",
"已选择X个XX": "已选择{0}个{1}",
"该用户暂无项目权限": "该用户暂无项目权限",
- "由于该用户仍有部分授权未移交，未能自动移出项目；如有需要，可前往「授权管理」处理": "由于该用户仍有部分授权未移交，未能自动移出项目；如有需要，可前往「{0}」处理",
+ "该用户无操作权限，但存在授权，可前往「授权管理」查看处理": "该用户无操作权限，但存在授权，可前往「{0}」查看处理",
"授权管理": "授权管理",
"批量续期": "批量续期",
"批量移交": "批量移交",
@@ -236,6 +236,8 @@
"组织/用户": "组织/用户",
"无需续期": "无需续期",
"通过用户组获得权限，请到流水线里续期整个用户组": "通过用户组获得权限，请到流水线里续期整个用户组",
+ "通过用户组获得权限，请到": "通过用户组获得权限，请到",
+ "里续期整个用户组": "里续期整个用户组",
"通过用户组获得权限，请到用户组里移出用户": "通过用户组获得权限，请到用户组里移出用户",
"无法续期": "无法续期",
"无法移交": "无法移交",
From e8a925e8d70c792632d4478155218b7360911b0e Mon Sep 17 00:00:00 2001
From: v_hwweng
- {{ group.userCount }}
-
-
-
- {{ group.departmentCount }}
-
+
+
+
+ {{ group.userCount }}
+
+
+
{{ group.departmentCount }}
+ 
+
@@ -204,6 +208,7 @@ const isResetSuccess = ref(false);
const isChecking = ref(false);
const canLoading = ref(true);
const projectId = computed(() => route.params?.projectCode);
+const userId = computed(() => route.query?.userId);
const resourceType = ref('repertory');
const isSelectAll = ref(false); // 选择全量数据
const dateTimeRange = ref(['', '']);
@@ -364,10 +369,22 @@ onMounted(() => {
function init () {
pagination.value.current = 1;
tableData.value = [];
- searchValue.value = [];
isSelectAll.value = false;
selectList.value = [];
dateTimeRange.value = [];
+ if (userId.value) {
+ searchValue.value = [
+ {
+ id: 'handoverFrom',
+ name: t('授权人'),
+ values: [
+ { id: userId.value, name: userId.value }
+ ]
+ },
+ ]
+ } else {
+ searchValue.value = [];
+ }
};
function clearSearchValue(){
searchValue.value = [];
@@ -762,4 +779,14 @@ function handleChangeName ({ list }) {
width: 100%;
}
}
+ .content-btn-search {
+ .bk-search-select-container {
+ background: #fff;
+ }
+ }
+ .failed-msg {
+ a {
+ color: #3A84FF;
+ }
+ }
\ No newline at end of file
From 312aeabfebf85b5200fa64e3bdfacdc2d5203fbb Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Wed, 7 Aug 2024 14:18:49 +0800
Subject: [PATCH 109/126] Merge branch 'issue_9620' of
https://github.com/vhwweng/bk-ci into issue_9620 , # Reviewed, transaction
id: 14355
From 8916d1e8cd328f9de9393d418ba1bed1f181755e Mon Sep 17 00:00:00 2001
From: v_hwweng
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/no-enable-permission/no-enable-permission.vue b/src/frontend/devops-manage/src/components/user-group/components/children/no-enable-permission/no-enable-permission.vue
index f681bafe5a8..9280b93f5ab 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/no-enable-permission/no-enable-permission.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/no-enable-permission/no-enable-permission.vue
@@ -22,6 +22,7 @@
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/no-permission/apply-dialog.vue b/src/frontend/devops-manage/src/components/user-group/components/children/no-permission/apply-dialog.vue
index 24237b12595..4da8a953221 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/no-permission/apply-dialog.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/no-permission/apply-dialog.vue
@@ -13,12 +13,12 @@
label-width="100"
>
- {{ $t('day') }}
+ {{ t('day') }}
- {{ newExpiredDisplay }}{{ $t('day')}}
+ {{ newExpiredDisplay }}{{ t('day')}}
@@ -23,35 +23,35 @@
- {{ $t('permissionDetail') }}
+ {{ t('permissionDetail') }}
{{ groupName }}
-
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/tab-table.vue b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/tab-table.vue
index 61a0fda7044..8f9fca305a4 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/tab-table.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/tab-table.vue
@@ -10,6 +10,8 @@
:border="border"
remote-pagination
empty-cell-text="--"
+ selection-key="resourceCode"
+ :checked="selectedResourceCode"
:scroll-loading="scrollLoading"
@select-all="handleSelectAll"
@selection-change="handleSelectionChange"
@@ -112,9 +114,9 @@
{{ $t('pipelineManage') }}
+ {{ t('pipelineManage') }}
@@ -406,9 +406,9 @@ const userName = computed(() => {
return ''
})
const unableText = {
- renewal: t('无法续期'),
- handover: t('无法移交'),
- remove: t('无法移出'),
+ renewal: '无法续期',
+ handover: '无法移交',
+ remove: '无法移出',
}
const {
sourceList,
@@ -494,7 +494,6 @@ async function handleRenewalConfirm() {
operatorLoading.value = false;
showMessage('success', t('用户组权限已续期。'));
cancleClear('renewal');
- // tableRef.value.clearSelection();
isShowRenewal.value = false;
} catch (error) {
operatorLoading.value = false;
@@ -695,7 +694,7 @@ async function getMenuList (item, keyword) {
} else if (item.id === 'department' && keyword) {
query.departName = keyword
}
- const res = await http.getProjectMembers(projectId.value, undefined, query)
+ const res = await http.getProjectMembers(projectId.value, query)
return res.records.map(i => {
return {
...i,
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-aside.vue b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-aside.vue
index d4c899c082f..ac8e999b6ef 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-aside.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-aside.vue
@@ -239,7 +239,7 @@ import { useRoute } from 'vue-router';
import useManageAside from "@/store/manageAside";
import { Success, Spinner } from 'bkui-vue/lib/icon';
import ProjectUserSelector from '@/components/project-user-selector'
-import { ref, defineProps, defineEmits, computed, watch, defineExpose } from 'vue';
+import { ref, defineProps, defineEmits, computed, defineExpose } from 'vue';
const { t } = useI18n();
const route = useRoute();
diff --git a/src/frontend/devops-manage/src/store/manageAside.ts b/src/frontend/devops-manage/src/store/manageAside.ts
index 3d7ae29e77d..bb86c73c3d9 100644
--- a/src/frontend/devops-manage/src/store/manageAside.ts
+++ b/src/frontend/devops-manage/src/store/manageAside.ts
@@ -1,6 +1,6 @@
import http from '@/http/api';
import { defineStore } from 'pinia';
-import { onMounted, ref } from 'vue';
+import { ref } from 'vue';
import { Message } from 'bkui-vue';
import userGroupTable from "@/store/userGroupTable";
diff --git a/src/frontend/devops-manage/src/store/userGroupTable.ts b/src/frontend/devops-manage/src/store/userGroupTable.ts
index 627c25a0ce6..8618ec6061b 100644
--- a/src/frontend/devops-manage/src/store/userGroupTable.ts
+++ b/src/frontend/devops-manage/src/store/userGroupTable.ts
@@ -162,10 +162,6 @@ export default defineStore('userGroupTable', () => {
);
if(currentRequestId === requestId) {
sourceList.value.forEach((item, index) => {
- if(item.resourceType === "project" && results[index]) {
- item.tableData = results[index].records;
- item.activeFlag = true;
- }
if((index === 0 || index === 1) && results[index]) {
item.tableData = results[index].records;
item.activeFlag = true;
From 479fd5f134b28083de52b6e9178fe70490bedb79 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Thu, 1 Aug 2024 16:59:23 +0800
Subject: [PATCH 098/126] =?UTF-8?q?feat=EF=BC=9A=E6=94=AF=E6=8C=81?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=9F=A5=E7=9C=8B=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E6=88=90=E5=91=98=20#9620=20#=20Reviewed,=20transaction=20id:?=
=?UTF-8?q?=2013781?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../children/permission-manage/manage-all.vue | 10 ++++++----
src/frontend/locale/manage/en-US.json | 6 +++---
src/frontend/locale/manage/zh-CN.json | 6 +++---
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue
index 20bd22fc6e2..c7c248578e6 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue
@@ -248,7 +248,9 @@
@@ -406,9 +408,9 @@ const userName = computed(() => {
return ''
})
const unableText = {
- renewal: '无法续期',
- handover: '无法移交',
- remove: '无法移出',
+ renewal: t('无法续期'),
+ handover: t('无法移交'),
+ remove: t('无法移出'),
}
const {
sourceList,
diff --git a/src/frontend/locale/manage/en-US.json b/src/frontend/locale/manage/en-US.json
index e4e27abc8e2..7e5e65697a5 100644
--- a/src/frontend/locale/manage/en-US.json
+++ b/src/frontend/locale/manage/en-US.json
@@ -139,7 +139,7 @@
"项目类型": "Project Type",
"创建项目申请单已撤回": "Creation of project application has been withdrawn",
"全员": "EveryOne",
- "检测到以下X项授权将无法重置，请前往处理或继续重置其余代码库授权": "The following {0} authorizations cannot be reset. Please {1} or {2} {3} {4}",
+ "检测到以下X项授权将无法重置，请前往处理或继续重置其余代码库授权": "The following {0} authorizations cannot be reset. Please {2} or {3} {4} {5}",
"前往处理": "navigate to handle them",
"继续重置其余": "continue to reset the remaining",
"授权": "authorizations",
@@ -182,13 +182,13 @@
"待移出用户": "Users to be removed",
"所在用户组": "User Group",
"已选择X个用户组": "Selected {0} user groups",
- "；其中X个用户组X，本次操作将忽略": "; Among them, {0} user groups {1}, will be ignored in this operation",
+ "；其中X个用户组X，本次操作将忽略": "; Among them, {0} user groups {op}, will be ignored in this operation",
"无法移出": "cannot be removed",
"续期对象": "Renewal Object",
"用户": "User",
"组织架构": "Organization Structure",
"续期时长": "Renewal Duration",
- "确认从以上X个用户组中移出X吗？": "Confirm to remove {1} from the above {0} user groups?",
+ "确认从以上X个用户组中移出X吗？": "Confirm to remove {2} from the above {0} user groups?",
"确定续期": "Confirm Renewal",
"确定移交": "Confirm Transfer",
"确定移出": "Confirm Removal",
diff --git a/src/frontend/locale/manage/zh-CN.json b/src/frontend/locale/manage/zh-CN.json
index 41eb2cd4ff5..f961accc38d 100644
--- a/src/frontend/locale/manage/zh-CN.json
+++ b/src/frontend/locale/manage/zh-CN.json
@@ -140,7 +140,7 @@
"项目类型": "项目类型",
"创建项目申请单已撤回": "创建项目申请单已撤回",
"全员": "全员",
- "检测到以下X项授权将无法重置，请前往处理或继续重置其余代码库授权": "检测到以下{0}项授权将无法重置，请{1}或{2}{3}{4}",
+ "检测到以下X项授权将无法重置，请前往处理或继续重置其余代码库授权": "检测到以下{0}项授权将无法重置，请{2}或{3}{4}{5}",
"前往处理": "前往处理",
"继续重置其余": "继续重置其余",
"授权": "授权",
@@ -183,13 +183,13 @@
"待移出用户": "待移出用户",
"所在用户组": "所在用户组",
"已选择X个用户组": "已选择{0}个用户组",
- "；其中X个用户组X，本次操作将忽略": "；其中{0}个用户组{1}，本次操作将忽略",
+ "；其中X个用户组X，本次操作将忽略": "；其中{0}个用户组{op}，本次操作将忽略",
"无法移出": "无法移出",
"续期对象": "续期对象",
"用户": "用户",
"组织架构": "组织架构",
"续期时长": "续期时长",
- "确认从以上X个用户组中移出X吗？": "确认从以上{0}个用户组中移出{1}吗？",
+ "确认从以上X个用户组中移出X吗？": "确认从以上{0}个用户组中移出{2}吗？",
"确定续期": "确定续期",
"确定移交": "确定移交",
"确定移出": "确定移出",
From 60194cba49c9e0208939b91005631cc6f162df85 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Thu, 1 Aug 2024 17:15:39 +0800
Subject: [PATCH 099/126] =?UTF-8?q?feat=EF=BC=9A=E6=94=AF=E6=8C=81?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=9F=A5=E7=9C=8B=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E6=88=90=E5=91=98=20#9620=20#=20Reviewed,=20transaction=20id:?=
=?UTF-8?q?=2013787?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/components/project-user-selector.vue | 2 +-
.../children/permission-manage/manage-all.vue | 2 +-
.../manage/permission/permission-manage.vue | 18 +++++++++++++-----
src/frontend/locale/manage/en-US.json | 2 +-
src/frontend/locale/manage/zh-CN.json | 2 +-
5 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/frontend/devops-manage/src/components/project-user-selector.vue b/src/frontend/devops-manage/src/components/project-user-selector.vue
index fa4072a3417..6e78f2785e2 100644
--- a/src/frontend/devops-manage/src/components/project-user-selector.vue
+++ b/src/frontend/devops-manage/src/components/project-user-selector.vue
@@ -42,7 +42,7 @@ async function fetchProjectMembers (query) {
const query = {
memberType: 'user',
page: 1,
- pageSize: 200,
+ pageSize: 400,
userName: val
}
fetchProjectMembers(query)
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue
index c7c248578e6..f50862d103d 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/manage-all.vue
@@ -689,7 +689,7 @@ async function getMenuList (item, keyword) {
const query = {
memberType: item.id,
page: 1,
- pageSize: 200
+ pageSize: 400
}
if (item.id === 'user' && keyword) {
query.userName = keyword
diff --git a/src/frontend/devops-manage/src/views/manage/permission/permission-manage.vue b/src/frontend/devops-manage/src/views/manage/permission/permission-manage.vue
index 98274fbf20b..afa62f4c985 100644
--- a/src/frontend/devops-manage/src/views/manage/permission/permission-manage.vue
+++ b/src/frontend/devops-manage/src/views/manage/permission/permission-manage.vue
@@ -125,10 +125,18 @@
diff --git a/src/frontend/devops-manage/src/views/manage/permission/permission-manage.vue b/src/frontend/devops-manage/src/views/manage/permission/permission-manage.vue
index ede37b12ca6..ecec97f4c96 100644
--- a/src/frontend/devops-manage/src/views/manage/permission/permission-manage.vue
+++ b/src/frontend/devops-manage/src/views/manage/permission/permission-manage.vue
@@ -124,8 +124,8 @@
diff --git a/src/frontend/locale/manage/en-US.json b/src/frontend/locale/manage/en-US.json
index 5b9f11f30c0..d10a13bd3ac 100644
--- a/src/frontend/locale/manage/en-US.json
+++ b/src/frontend/locale/manage/en-US.json
@@ -182,7 +182,7 @@
"待移出用户": "Users to be removed",
"所在用户组": "User Group",
"已选择X个用户组": "Selected {0} user groups",
- "；其中X个用户组X，本次操作将忽略": "; Among them, {0} user groups {op}, will be ignored in this operation",
+ "；其中X个用户组X，本次操作将忽略": "; Among them, {0} user groups {1}, will be ignored in this operation",
"无法移出": "cannot be removed",
"续期对象": "Renewal Object",
"用户": "User",
@@ -245,5 +245,5 @@
"清空筛选条件": "Clear filter conditions",
"输入授权人，选中回车进行校验": "Enter the authorizer, select and press Enter to verify",
"已离职": "Resigned",
- "授权校验中": "授权校验中"
+ "授权校验中": "Authorization verification in progress"
}
diff --git a/src/frontend/locale/manage/zh-CN.json b/src/frontend/locale/manage/zh-CN.json
index 81db2dacaa3..297cf41e4f1 100644
--- a/src/frontend/locale/manage/zh-CN.json
+++ b/src/frontend/locale/manage/zh-CN.json
@@ -183,7 +183,7 @@
"待移出用户": "待移出用户",
"所在用户组": "所在用户组",
"已选择X个用户组": "已选择{0}个用户组",
- "；其中X个用户组X，本次操作将忽略": "；其中{0}个用户组{op}，本次操作将忽略",
+ "；其中X个用户组X，本次操作将忽略": "；其中{0}个用户组{1}，本次操作将忽略",
"无法移出": "无法移出",
"续期对象": "续期对象",
"用户": "用户",
From 0ede85818cfce403f78d7e8d008a8c52551a5808 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Fri, 2 Aug 2024 17:59:25 +0800
Subject: [PATCH 105/126] =?UTF-8?q?feat=EF=BC=9A=E6=94=AF=E6=8C=81?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=9F=A5=E7=9C=8B=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E6=88=90=E5=91=98=20#9620=20#=20Reviewed,=20transaction=20id:?=
=?UTF-8?q?=2013930?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../children/permission-manage/group-tab.vue | 1 +
.../children/permission-manage/manage-all.vue | 13 +++++-
.../permission-manage/manage-aside.vue | 8 ++++
.../devops-manage/src/store/manageAside.ts | 2 +-
.../devops-manage/src/store/userGroupTable.ts | 1 +
.../manage/permission/permission-manage.vue | 43 +++++++++++++++----
src/frontend/locale/manage/en-US.json | 3 +-
src/frontend/locale/manage/zh-CN.json | 3 +-
8 files changed, 61 insertions(+), 13 deletions(-)
diff --git a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/group-tab.vue b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/group-tab.vue
index b69783d4833..dd09204dd04 100644
--- a/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/group-tab.vue
+++ b/src/frontend/devops-manage/src/components/user-group/components/children/permission-manage/group-tab.vue
@@ -17,6 +17,7 @@
- {{ t("剩余X条数据",[remainingCount]) }}
+ {{ t("剩余X条数据", [remainingCount]) }}
{{t("加载更多")}}
@@ -162,7 +164,9 @@ const emit = defineEmits([
const route = useRoute();
const { t } = useI18n();
const refTable = ref(null);
+const curSelectedData = ref([]);
const isCurrentAll = ref(false);
+const selectedResourceCode = computed(() => isCurrentAll.value ? tableList.value.map(i => i.resourceCode) : curSelectedData.value.map(i => i.resourceCode));
const resourceType = computed(() => props.resourceType);
const groupTotal = computed(() => props.groupTotal);
const remainingCount = computed(()=> props.groupTotal - props.data.length);
@@ -216,8 +220,9 @@ function getUnableMessage(row){
* 当前页全选事件
*/
function handleSelectAll({checked}) {
- if(checked){
- emit('getSelectList', refTable.value.getSelection(), resourceType.value);
+ if (checked) {
+ emit('getSelectList', tableList.value, resourceType.value);
+ curSelectedData.value = tableList.value;
isCurrentAll.value = false;
} else {
handleClear()
@@ -275,7 +280,7 @@ function handleRemove(row, index) {
* 加载更多
*/
function handleLoadMore() {
- emit('handleLoadMore',resourceType.value);
+ emit('handleLoadMore', resourceType.value);
}
function pageLimitChange(limit) {
@@ -289,13 +294,13 @@ function handleToResourcePage (row) {
if (!(['codecc_task', 'pipeline', 'pipeline_group'].includes(row.resourceType))) return
switch (row.resourceType) {
case 'pipeline':
- window.open(`${location.origin}/console/pipeline/${projectId.value}/${row.resourceCode}/history/permission`)
+ window.open(`${location.origin}/console/pipeline/${projectId.value}/${row.resourceCode}/history/permission/?groupId=${row.groupId}`)
return
case 'pipeline_group':
- window.open(`${location.origin}/console/pipeline/${projectId.value}/list/listAuth/${row.resourceCode}/${row.resourceName}`)
+ window.open(`${location.origin}/console/pipeline/${projectId.value}/list/listAuth/${row.resourceCode}/${row.resourceName}?groupId=${row.groupId}`)
return
case 'codecc_task':
- window.open(`${location.origin}/console/codecc/${projectId.value}/task/${row.resourceCode}/settings/authority`)
+ window.open(`${location.origin}/console/codecc/${projectId.value}/task/${row.resourceCode}/settings/authority?groupId=${row.groupId}`)
return
}
}
diff --git a/src/frontend/devops-manage/src/store/userGroupTable.ts b/src/frontend/devops-manage/src/store/userGroupTable.ts
index 30ca794453c..a3383250bfe 100644
--- a/src/frontend/devops-manage/src/store/userGroupTable.ts
+++ b/src/frontend/devops-manage/src/store/userGroupTable.ts
@@ -292,7 +292,7 @@ export default defineStore('userGroupTable', () => {
item.scrollLoading = true;
const res = await getGroupList(resourceType);
item.scrollLoading = false;
- item.tableData.push(...res.records);
+ item.tableData = [...item.tableData, ...res.records];
if(pagination[2]){
pagination.pop();
}
diff --git a/src/frontend/devops-manage/src/views/manage/permission/permission-manage.vue b/src/frontend/devops-manage/src/views/manage/permission/permission-manage.vue
index f2a40eb95aa..e850f4bc9b1 100644
--- a/src/frontend/devops-manage/src/views/manage/permission/permission-manage.vue
+++ b/src/frontend/devops-manage/src/views/manage/permission/permission-manage.vue
@@ -150,7 +150,11 @@
show-overflow-tooltip
>
{{ group[item] }}
+ {{t('成功移除XX', [`${removeUserDeptListMap.removeUser.id}(${removeUserDeptListMap.removeUser.name})`])}}
+
+
+
+
+
+
+
{{t("确认从用户组中移出用户吗")}}？
@@ -234,6 +265,7 @@
{{t("组织/用户")}}
@@ -88,96 +88,99 @@
:width="640"
@closed="handOverClose"
>
-
- {{ t("移出项目") }}
- {{t("移出用户")}}： {{ removeUser.id }}({{ removeUser.name }})
-
-
-
-
-
@@ -108,7 +108,7 @@
@click="handleCreateGroup">
- {{ $t('新建用户组') }}
+ {{ t('新建用户组') }}
+
- {{ $t('权限角色') }}
+ {{ t('权限角色') }}
-
+
-
-
-
-
-
+
+
{{t('成功移除XX', [`${removeUserDeptListMap.removeUser.id}(${removeUserDeptListMap.removeUser.name})`])}}
@@ -162,23 +162,23 @@
-
- {{t('成功移除XX', [`${removeUserDeptListMap.removeUser.id}(${removeUserDeptListMap.removeUser.name})`])}}
-
-
+
-
-
@@ -157,13 +157,13 @@
:disabled="disableDeleteBtn"
@click="handleDeleteGroup"
>
- {{ $t('删除') }}
+ {{ t('删除') }}
- {{ $t('请先选择一个项目') }}
+ {{ t('请先选择一个项目') }}
+ >
{{ group.name }}
-
+
+
+
{{ group[item] }}
-
-
-
+
{{ group[item] }}