Merge pull request #2640 from TencentBlueKing/develop

v1.10.27
TencentBlueKing · Apr 25, 2024 · d468057 · d468057
2 parents 62cdcee + 3ef0914
commit d468057
Show file tree

Hide file tree

Showing 32 changed files with 1,056 additions and 256 deletions.
diff --git a/frontend/src/components/nav/index.vue b/frontend/src/components/nav/index.vue
@@ -500,7 +500,6 @@
         this.selectCls = 'hide-iam-nav-select-cls';
         if (value) {
           this.selectCls = 'iam-nav-select-dropdown-content';
-          this.handleClearSearch();
           this.resetPagination();
           this.resetSubPagination();
           await this.resetRoleList('handleClearSearch');
@@ -573,6 +572,9 @@
       // 刷新一、二级管理员列表和设置当前页捕获不到的数据
       async resetRoleList (payload) {
         const { role } = this.user;
+        if (payload === 'handleClearSearch') {
+          this[payload]();
+        }
         if (this.$refs.selectTree) {
           const curNode = this.$refs.selectTree.getNodeById(role.id);
           if (!curNode && this.$refs.select && this.isSearch) {
@@ -586,9 +588,6 @@
           if (curNode && curNode.data && curNode.data.has_subset_manager) {
             await this.handleExpandNode(curNode || this.curRoleData);
           }
-          if (payload === 'handleClearSearch') {
-            this[payload]();
-          }
         }
       },
       

diff --git a/frontend/src/components/render-perm/index.vue b/frontend/src/components/render-perm/index.vue
@@ -103,7 +103,7 @@
       handleExpanded () {
         this.isExpanded = !this.isExpanded;
         this.$emit('update:expanded', true);
-        this.$emit('on-expanded', true);
+        this.$emit('on-expanded', this.isExpanded);
       }
     }
   };

diff --git a/frontend/src/language/lang/en.js b/frontend/src/language/lang/en.js
@@ -102,6 +102,7 @@ export const m = {
         '加入时间': 'Joined at',
         '成员': 'member',
         '位成员': 'member(s)',
+        '个人员模板': 'member templates',
         '设置新用户加入': 'Set up new users to join',
         '用户组的有效期': 'The expiration date of the group',
         '设置新用户加入用户组的有效期': 'Set the expiration date for new users joining the group {value}',
@@ -417,6 +418,9 @@ export const m = {
         '这些成员将不再继承该组的权限': 'these members will no longer inherit the permissions of the group',
         '该组将不再继承该模板的权限': 'The group will no longer inherit the permissions of the template',
         '这些成员将不再关联该用户组的权限': 'These members will no longer be associated with the permissions of this user group',
+        '相关人员将不再关联该用户组的权限': 'The relevant members will no longer be associated with the permissions of this user group',
+        '人员模板关联的该用户组将不再存在续期': 'The user group associated with the member template will no longer have renewals',
+        '这些人员模板关联的该用户组将不再存在续期': 'The user group associated with these member templates will no longer have renewals',
         '解除成功': 'Lifted',
         '当前用户将不再继承该模板权限': 'The current user will no longer inherit the template permissions',
         '退出成功': 'Quit successfully',
@@ -1086,8 +1090,7 @@ export const m = {
         '暂无将过期的权限': 'No permission will expire',
         '续期申请提交成功': 'Renewal application submitted',
         '续期成功': 'Renewal successful',
-        '即将过期的用户/组织': 'Expiring Users/Organizations',
-        '请选择即将过期的用户/组织': 'Please select the user/organization that will expire soon',
+        '请选择用户/组织或人员模板': 'Please select user/organization or member templates',
         '该成员在该用户组将不再存在续期': 'This member will no longer have a renewal in this user group',
         '这些成员在该用户组将不再存在续期': 'These members will no longer have renewals in this user group',
         '没有需要续期的权限': 'No permission to renew',

diff --git a/frontend/src/language/lang/zh.js b/frontend/src/language/lang/zh.js
@@ -101,6 +101,7 @@ export const m = {
         '加入时间': '加入时间',
         '成员': '成员',
         '位成员': '位成员',
+        '个人员模板': '个人员模板',
         '设置新用户加入': '设置新用户加入',
         '用户组的有效期': '用户组的有效期',
         '当前版本': '当前版本',
@@ -417,6 +418,9 @@ export const m = {
         '这些成员将不再继承该组的权限': '这些成员将不再继承该组的权限',
         '该组将不再继承该模板的权限': '该组将不再继承该模板的权限',
         '这些成员将不再关联该用户组的权限': '这些成员将不再关联该用户组的权限',
+        '相关人员将不再关联该用户组的权限': '相关人员将不再关联该用户组的权限',
+        '人员模板关联的该用户组将不再存在续期': '人员模板关联的该用户组将不再存在续期',
+        '这些人员模板关联的该用户组将不再存在续期': '这些人员模板关联的该用户组将不再存在续期',
         '解除成功': '解除成功',
         '当前用户将不再继承该模板权限': '当前用户将不再继承该模板权限',
         '退出成功': '退出成功',
@@ -1086,8 +1090,7 @@ export const m = {
         '暂无将过期的权限': '暂无将过期的权限',
         '续期申请提交成功': '续期申请提交成功',
         '续期成功': '续期成功',
-        '即将过期的用户/组织': '即将过期的用户/组织',
-        '请选择即将过期的用户/组织': '请选择即将过期的用户/组织',
+        '请选择用户/组织或人员模板': '请选择用户/组织或人员模板',
         '该成员在该用户组将不再存在续期': '该成员在该用户组将不再存在续期',
         '这些成员在该用户组将不再存在续期': '这些成员在该用户组将不再存在续期',
         '没有需要续期的权限': '没有需要续期的权限',

diff --git a/frontend/src/views/group/components/attribute.vue b/frontend/src/views/group/components/attribute.vue
@@ -302,7 +302,7 @@
           // this.attrValueListMap[this.curOperateData.id].shift();
           return;
         }
-        if (event.target.scrollTop + event.target.offsetHeight >= event.target.scrollHeight) {
+        if (event.target.scrollTop + event.target.offsetHeight >= event.target.scrollHeight - 1) {
           ++this.pagination.current;
           if (this.pagination.current <= this.pagination.totalPage) {
             await this.fetchResourceAttrValues(this.curOperateData, this.curKeyWord, false, true);

diff --git a/frontend/src/views/group/components/iam-add-member.vue b/frontend/src/views/group/components/iam-add-member.vue
@@ -1033,7 +1033,7 @@
           const keyword = getUsername(manualInputValue[i]);
           const params = {
             keyword,
-            is_exact: true
+            is_exact: false
           };
           try {
             if (manualInputValue.length < 10) {

diff --git a/frontend/src/views/group/components/member-table.vue b/frontend/src/views/group/components/member-table.vue
@@ -1309,8 +1309,8 @@
           if (this.curModeMap[this.curRouteMode]) {
             this.deleteDialog.subTitle = `${this.$t(`m.common['移除']`)} ${
               this.currentSelectList.length
-            } ${this.$t(`m.common['位成员']`)}${this.$t(`m.common['，']`)}${this.$t(
-              `m.info['这些成员将不再关联该用户组的权限']`
+            } ${this.$t(`m.common['个人员模板']`)}${this.$t(`m.common['，']`)}${this.$t(
+              `m.info['相关人员将不再关联该用户组的权限']`
             )}${this.$t(`m.common['。']`)}`;
           } else {
             this.deleteDialog.subTitle = `${this.$t(`m.common['移除']`)} ${

diff --git a/frontend/src/views/manage-spaces/components/add-action-side-slider.vue b/frontend/src/views/manage-spaces/components/add-action-side-slider.vue
@@ -634,9 +634,7 @@
             item.sub_groups = [];
           }
           let allChecked = true;
-          if (['myManageSpaceCreate'].includes(this.$route.name)
-            && (['gradingAdminCreate'].includes(this.$route.name) && ['staff'].includes(this.user.role.type))
-          ) {
+          if (['myManageSpaceCreate', 'authorBoundaryEditFirstLevel'].includes(this.$route.name)) {
             item.actions = item.actions.filter(v => !v.hidden);
           }
           item.actions.forEach(act => {
@@ -654,9 +652,7 @@
             this.linearAction.push(act);
           });
           item.sub_groups.forEach(act => {
-            if (['myManageSpaceCreate'].includes(this.$route.name)
-              && (['gradingAdminCreate'].includes(this.$route.name) && ['staff'].includes(this.user.role.type))
-            ) {
+            if (['myManageSpaceCreate', 'authorBoundaryEditFirstLevel'].includes(this.$route.name)) {
               act.actions = act.actions.filter(v => !v.hidden);
             }
             (act.actions || []).forEach(v => {

diff --git a/frontend/src/views/manage-spaces/components/render-instance-table.vue b/frontend/src/views/manage-spaces/components/render-instance-table.vue
@@ -442,20 +442,14 @@
       handleActionLinearData () {
         const linearActions = [];
         this.curSystemActions.forEach((item) => {
-          if (['myManageSpaceCreate'].includes(this.$route.name)
-            && (['gradingAdminCreate'].includes(this.$route.name)
-              && ['staff'].includes(this.user.role.type))
-          ) {
+          if (['myManageSpaceCreate', 'authorBoundaryEditFirstLevel'].includes(this.$route.name)) {
             item.actions = item.actions.filter(v => !v.hidden);
           }
           item.actions.forEach(act => {
             linearActions.push(act);
           });
           (item.sub_groups || []).forEach(sub => {
-            if (['myManageSpaceCreate'].includes(this.$route.name)
-              && (['gradingAdminCreate'].includes(this.$route.name)
-                && ['staff'].includes(this.user.role.type))
-            ) {
+            if (['myManageSpaceCreate', 'authorBoundaryEditFirstLevel'].includes(this.$route.name)) {
               sub.actions = sub.actions.filter(v => !v.hidden);
             }
             sub.actions.forEach(act => {

diff --git a/frontend/src/views/my-manage-space/add-member-boundary/index.vue b/frontend/src/views/my-manage-space/add-member-boundary/index.vue
@@ -932,7 +932,7 @@
         for (let i = 0; i < manualInputValue.length; i++) {
           const params = {
             keyword: manualInputValue[i],
-            is_exact: true
+            is_exact: false
           };
           try {
             if (manualInputValue.length < 10) {