Dev/develop ci renewal notice

frontend/src/App.vue

@@ -33,11 +33,14 @@
         :route-name="routeName"
         :user-group-id="userGroupId">
       </header-nav>
-      <the-header @reload-page="handleRefreshPage"
+      <the-header
+        @reload-page="handleRefreshPage"
         :route-name="routeName"
         :user-group-id="userGroupId"
       />
-      <the-nav class="nav-layout"
+      <the-nav
+        class="nav-layout"
+        :route-name="routeName"
         @reload-page="reloadCurPage"
         v-if="!externalSystemsLayout.hideIamSlider" />
     </template>
@@ -80,6 +83,7 @@
     provide () {
       return {
         reload: this.reload,
+        reloadCurPage: this.reloadCurPage,
         showNoticeAlert: this.isShowNoticeAlert
       };
     },
@@ -363,7 +367,7 @@
 
     .views-layout {
         min-height: 100%;
-        min-width: 1120px;
+        /* min-width: 1120px; */
         padding: 24px;
     }
 

frontend/src/common/router-handle.js

@@ -97,7 +97,9 @@ export const getRouterDiff = (payload) => {
       'permTransfer',
       'myManageSpaceSubDetail',
       'sensitivityLevel',
-      'resourcePermManage'
+      'resourcePermManage',
+      'renewalNotice',
+      'userOrgPerm'
     ];
   }
   if (payload === 'system_manager') {
@@ -124,12 +126,12 @@ export const getRouterDiff = (payload) => {
       'systemAccessRegistry',
       'systemAccessOptimize',
       'systemAccessComplete',
-      'resourcePermiss',
       'firstManageSpace',
       'secondaryManageSpace',
       'authorBoundary',
       'myManageSpace',
-      'sensitivityLevel'
+      'renewalNotice',
+      'userOrgPerm'
     ];
   }
   if (payload === 'rating_manager') {
@@ -161,7 +163,8 @@ export const getRouterDiff = (payload) => {
       'resourcePermiss',
       'firstManageSpace',
       'sensitivityLevel',
-      'resourcePermManage'
+      'resourcePermManage',
+      'renewalNotice'
     ];
   }
   if (payload === 'subset_manager') {
@@ -382,8 +385,7 @@ export const getNavRouterDiff = (navIndex, managerPerm = '') => {
       'userGroupSetting',
       'memberTemplate',
       'resourcePermManage',
-      'userOrgPerm',
-      'renewalNotice'
+      'userOrgPerm'
     ];
     if (['hasSystemNoSuperManager'].includes(managerPerm)) {
       // 非超管用户隐藏的路由
@@ -394,7 +396,8 @@ export const getNavRouterDiff = (navIndex, managerPerm = '') => {
         'gradingAdminCreate',
         'gradingAdminDetail',
         'gradingAdminEdit',
-        'gradingAdminUpdateTemplate'
+        'gradingAdminUpdateTemplate',
+        'renewalNotice'
       ];
       const systemManagerMenu = [
         ...menuList,

frontend/src/components/header-nav/index.vue

@@ -203,7 +203,7 @@
   ]);
 
   export default {
-    name: '',
+    inject: ['reloadCurPage'],
     components: {
       SystemLog
       // IamGuide
@@ -258,12 +258,13 @@
           { text: this.$t(`m.nav['个人工作台']`), id: 0, show: true, type: ['staff'] },
           { text: this.$t(`m.nav['管理空间']`), id: 1, show: true, type: ['all_manager'] },
           { text: this.$t(`m.nav['统计分析']`), id: 2, show: false, type: ['super_manager'] },
-          { text: this.$t(`m.nav['平台管理']`), id: 3, show: false, type: ['super_manager', 'system_manager'] }
+          { text: this.$t(`m.nav['平台管理']`), id: 3, show: false, type: ['super_manager'] }
         ],
         defaultRouteList: ['myPerm', 'userGroup', 'audit', 'user', 'addGroupPerm'],
         systemNoSuperList: ['myPerm', 'userGroup', 'audit', 'resourcePermiss', 'addGroupPerm'],
         isRatingChange: false,
         haveManager: false,
+        isSameRoute: false,
         showNavDataLength: 0,
         curHeight: 78,
         languageList: [
@@ -275,7 +276,8 @@
             label: 'English',
             value: 'en'
           }
-        ]
+        ],
+        curFromName: ''
       };
     },
     computed: {
@@ -308,6 +310,7 @@
     },
     watch: {
       $route: function (to, from) {
+        this.curFromName = from.name || '';
         this.hasPageTab = !!to.meta.hasPageTab;
         if (['permTemplateDetail', 'userGroupDetail'].includes(to.name)) {
           this.panels = this.getTabData(to.name);
@@ -349,8 +352,9 @@
       },
       routeName: {
         handler (value) {
-          const isSystemNoSuper = this.roleList.find((item) => ['system_manager'].includes(item.type) && !['super_manager'].includes(item.type));
-          const list = isSystemNoSuper ? this.systemNoSuperList : this.defaultRouteList;
+          // const isSystemNoSuper = this.roleList.find((item) => ['system_manager'].includes(item.type) && !['super_manager'].includes(item.type));
+          // const list = isSystemNoSuper ? this.systemNoSuperList : this.defaultRouteList;
+          const list = this.defaultRouteList;
           const index = list.findIndex((item) => item === value);
           if (index > -1) {
             ['addGroupPerm'].includes(value)
@@ -373,6 +377,14 @@
         },
         immediate: true,
         deep: true
+      },
+      index: {
+        handler (newValue, oldValue) {
+          if (oldValue && newValue !== oldValue && !this.curFromName) {
+            this.isSameRoute = true;
+          }
+        },
+        deep: true
       }
     },
     created () {
@@ -485,15 +497,25 @@
       async updateRouter (navIndex = 0) {
         let difference = [];
         const permResult = getManagerMenuPerm(this.roleList);
-        const list = permResult.includes('hasSystemNoSuperManager') ? this.systemNoSuperList : this.defaultRouteList;
+        // const list = permResult.includes('hasSystemNoSuperManager') ? this.systemNoSuperList : this.defaultRouteList;
+        const list = this.defaultRouteList;
         if (navIndex === 1) {
+          // 不同导航栏下相同的权限路由名称跳转增加延时时间，防止相同接口调用多次被节流
           await this.$store.dispatch('userInfo');
+          if (this.isSameRoute) {
+            this.reloadCurPage(this.$route);
+          }
           const type = this.curRole;
           difference = getRouterDiff(type);
           this.$store.commit('updataRouterDiff', type);
         } else {
           difference = getNavRouterDiff(navIndex, permResult);
           this.$store.commit('updataNavRouterDiff', navIndex);
+          // 不同导航栏下相同的权限路由名称跳转增加延时时间，防止相同接口调用多次被节流
+          if (this.isSameRoute) {
+            await this.$store.dispatch('userInfo');
+            this.reloadCurPage(this.$route);
+          }
         }
         const curRouterName = this.$route.name;
         if (difference.length) {

frontend/src/components/iam-member-template-table/index.vue

@@ -250,7 +250,7 @@
       fetchSelectedGroupCount () {
         this.$nextTick(() => {
           const selectionCount = document.getElementsByClassName('bk-page-selection-count');
-          if (this.$refs.templateTableRef && selectionCount && selectionCount.length) {
+          if (this.$refs.templateTableRef && selectionCount && selectionCount.length && selectionCount[0].children) {
             selectionCount[0].children[0].innerHTML = this.currentSelectList.length;
           }
         });

frontend/src/components/nav/index.vue

@@ -502,6 +502,7 @@
         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');

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);
       }
     }
   };

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',
@@ -1087,8 +1091,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',
@@ -1518,6 +1521,36 @@ export const m = {
         '已选择的用户组权限为不可移出的管理员组': 'The selected user group permission is an administrator group that cannot be removed',
         '已选择的用户组权限不需要续期': 'The selected user group permissions do not need to be renewed',
         '组织用户组权限': 'Organizational user group permissions'
+    },
+    renewalNotice: {
+        '邮件': 'Mail',
+        '短信': 'SMS',
+        '微信': 'WeChat',
+        '企业微信': 'WeCom',
+        '通知方式': 'Notice method',
+        '通知时间': 'Notice time',
+        '通知范围': 'Notice scope',
+        '通知日': 'Notice day',
+        '发送时间': 'Send time',
+        '整个通知范围，需要 >= 7 天': 'The entire notice scope requires>=7 days',
+        '通知方式为必填项': 'Notice method required',
+        '通知范围为必填项': 'Notice scope required',
+        '通知日为必填项': 'Notice date required',
+        '发送时间为必填项': 'Send time required',
+        '过期前': 'Before expiration',
+        '过期后': 'After expiration',
+        '天内': 'within the day',
+        '逢': 'Encounter',
+        '的': '',
+        '发送通知': 'send notice',
+        '恢复默认': 'Default',
+        '周一': 'Monday',
+        '周二': 'Tuesday',
+        '周三': 'Wednesday',
+        '周四': 'Thursday',
+        '周五': 'Friday',
+        '周六': 'Saturday',
+        '周日': 'Sunday'
     }
 }
 export default {