+
+
+
+
+
+
+
+
diff --git a/frontend/src/views/user-org-perm/index.vue b/frontend/src/views/user-org-perm/index.vue
index b4cc22020..61916f4af 100644
--- a/frontend/src/views/user-org-perm/index.vue
+++ b/frontend/src/views/user-org-perm/index.vue
@@ -49,6 +49,7 @@
type="number"
v-model="formData.id"
:placeholder="$t(`m.verify['请输入']`)"
+ :precision="0"
:show-controls="false"
@enter="handleSearch"
/>
@@ -161,6 +162,7 @@
v-if="['id'].includes(tag.name)"
ref="inputRef"
type="number"
+ :precision="0"
:value="tag.value"
:placeholder="$t(`m.verify['请输入']`)"
:show-controls="false"
diff --git a/frontend/src/views/user/components/record-list.vue b/frontend/src/views/user/components/record-list.vue
index 5edd1bd80..bec77e1ec 100644
--- a/frontend/src/views/user/components/record-list.vue
+++ b/frontend/src/views/user/components/record-list.vue
@@ -53,13 +53,42 @@
+
+
+
+
+
+
+ {{ $t(`m.renewalNotice['通知方式']`) }}
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+ {{ item.label }}
+
+
+
+ {{ $t(`m.renewalNotice['通知方式为必填项']`) }}
+
+
+
+
+
+
+ {{ $t(`m.renewalNotice['通知时间']`) }}
+
+
+
+
+
+
+ {{ $t(`m.renewalNotice['通知范围']`) }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t(`m.renewalNotice['过期前']`) }}
+
+
+ {{ $t(`m.common['天']`) }}
+
+ {{ $t(`m.renewalNotice['过期后']`) }}
+
+
+ {{ $t(`m.common['天']`) }}
+
+
+
+ {{ scopeEmptyError }}
+
+
+
+ {{ $t(`m.renewalNotice['通知日']`) }}
+
+
+
+
+ {{ $t(`m.renewalNotice['${item.label}']`) }}
+
+
+
+ {{ $t(`m.renewalNotice['通知日为必填项']`) }}
+
+
+
+ {{ $t(`m.renewalNotice['发送时间']`) }}
+
+
+
+
+ {{ $t(`m.renewalNotice['过期前']`) }}
+ {{ noticeForm.expire_days_before }}
+ {{ $t(`m.common['天']`) }}
+ ~
+ {{ $t(`m.renewalNotice['过期后']`) }}
+ {{ noticeForm.expire_days_after }}
+ {{ $t(`m.renewalNotice['天内']`) }}
+ {{ $t(`m.common['，']`) }}
+ {{ $t(`m.renewalNotice['逢']`) }}
+ {{ formatDayLabel }}
+ {{ $t(`m.renewalNotice['的']`) }}
+ {{ noticeForm.send_time }}
+ {{ $t(`m.renewalNotice['发送通知']`) }}
+
+ {{ $t(`m.renewalNotice['发送时间为必填项']`) }}
+
+
+
+
+ {{ $t(`m.renewalNotice['通知模板']`) }}
+ |
+
+ ![]()
+
+ {{ noticeTempSlider.detailData.label }}
+
+
+
+
+
+
+ {{ $t(`m.common['删除']`) }}
+
+
{{ $t(`m.user['日志详情']`) }}
-
+
+
+
+
+
+ {{ $t(`m.dialog['确认删除同步记录？']`) }}
+
+
+
+
+ {{
+ $t(`m.user['删除后，可通过重新同步更新记录']`)
+ }}
+
+
-
+
- 同步操作失败，请在用户管理后台API日志中查询详情
+ {{ $t(`m.user['同步操作失败，请在用户管理后台API日志中查询详情']`) }}
| @@ -230,13 +230,16 @@ |
| + | 操作 | -+ | + 资源实例 + | +所属系统 | -+ | 到期时间 | {{ policy.action.name }} | ++ {{ policy.gen_resource_summary }} + | {{ policy.system.name }} | @@ -272,7 +278,7 @@ 用户组权限({{ groups|length }}) -
|---|
| @@ -285,10 +291,13 @@ | 用户组 | -+ | + 管理空间 + | +描述 | -+ | 到期时间 | {{ group.name }} | ++ {{ group.get_role_name }} + | {{ group.description }} | diff --git a/saas/resources/templates/user_expired_rtx.tpl b/saas/resources/templates/user_expired_rtx.tpl new file mode 100644 index 000000000..cf6fb8530 --- /dev/null +++ b/saas/resources/templates/user_expired_rtx.tpl @@ -0,0 +1,13 @@ +{% if policies %} +**自定义权限({{ policies|length }})** +{% endif %} +{% for policy in policies %} +系统: **{{ policy.system.name }}**, 操作: **{{ policy.action.name }}**, 资源实例: **{{ policy.gen_resource_summary }}**, 到期时间: **{{ policy.expired_display }}** +{% endfor %} + +{% if groups %} +**用户组权限({{ groups|length }})** +{% endif %} +{% for group in groups %} +用户组: **{{ group.name }}**, 管理空间: **{{ group.get_role_name }}**, 描述: {{ group.description }}, 过期时间: **{{ group.expired_at_display }}** +{% endfor %} diff --git a/saas/resources/version_log/change_log.md b/saas/resources/version_log/change_log.md index 3946143b7..57b74ba4b 100644 --- a/saas/resources/version_log/change_log.md +++ b/saas/resources/version_log/change_log.md @@ -1,3 +1,13 @@ + +# V1.10.28 版本更新日志 + +### 新增功能 + +* 配置权限失效提醒通知策略功能 +* 权限失效提醒通知增加企业微信 + +--- + # V1.10.27 版本更新日志 diff --git a/saas/resources/version_log/change_log_en.md b/saas/resources/version_log/change_log_en.md index 0dd7b9fa7..f2f7d4aab 100644 --- a/saas/resources/version_log/change_log_en.md +++ b/saas/resources/version_log/change_log_en.md @@ -1,3 +1,12 @@ +## V1.10.28 Version Update Log + +### New Features + +* Added configuration permission expiration reminder notification policy function +* Added enterprise WeChat to permission expiration reminder notification + +--- + # V1.10.27 Version Update Log
|---|