Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 修复 admin42 用户列表/环境变量管理页面体验问题 #1515

Merged
merged 3 commits into from
Aug 6, 2024
Merged

fix: 修复 admin42 用户列表/环境变量管理页面体验问题 #1515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6fe221a
fix: fixed issues in admin42
lyzqs Aug 5, 2024
a420b8c
fix: fixed
lyzqs Aug 5, 2024
fe19d67
fix: fixed
lyzqs Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...rver/paasng/paasng/plat_admin/admin42/templates/admin42/accountmgr/user_profile_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<bk-checkbox v-model="displayRegularUsers" @change="refreshPage">显示所有普通用户</bk-checkbox>
<div class="paas-search">
<bk-input
placeholder="输入用户名，按Enter搜索"
placeholder="输入用户名，按 Enter 搜索"
:clearable="true"
:right-icon="'bk-icon icon-search'"
v-model="filterKey"
Expand Down Expand Up @@ -231,7 +231,7 @@
this.$bkInfo({
title: `确认要${action}？`,
confirmLoading: true,
theme: 'danger',
theme: action === '恢复访问' ? 'primary' : 'danger',
confirmFn: async () => {
try {
await confirmAction()
Expand Down Expand Up @@ -266,7 +266,7 @@
this.$bkInfo({
title: '确定要修改吗？',
confirmLoading: true,
theme: 'danger',
theme: 'primary',
confirmFn: async () => {
try {
if (this.form.enable_regions.length === 0) {
Expand Down
2 changes: 1 addition & 1 deletion ...er/paasng/paasng/plat_admin/admin42/templates/admin42/applications/list_applications.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div class="mb15 filter-box">
<div class="paas-search">
<bk-input
placeholder="输入应用名称、ID，按Enter搜索"
placeholder="输入应用名称、ID，按 Enter 搜索"
:clearable="true"
:right-icon="'bk-icon icon-search'"
v-model="filterKey"
Expand Down
4 changes: 2 additions & 2 deletions ...r/paasng/paasng/plat_admin/admin42/templates/admin42/platformmgr/builtin_config_vars.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% load admin_utils %}
{% block main_content %}
<div id="builtin-config-var-list" class="p20">
<bk-alert type="warning" title="此处定义的环境变量会覆盖系统内置环境变量。环境变量优先级（由高到低）：平台管理自定义环境变量 > 系统内置环境变量 > 单个应用中自定义环境变量"></bk-alert>
<bk-alert type="warning" title="此处定义的环境变量会覆盖系统内置环境变量。云原生应用环境变量优先级（由高到低）：平台管理自定义环境变量 > 系统内置环境变量 > 单个应用中自定义环境变量"></bk-alert>

<bk-button theme="primary" class="mb20" @click="handleCreate">
新建
Expand Down Expand Up @@ -166,7 +166,7 @@
},
handleDelete: function (row) {
this.$bkInfo({
title: '确认要删除？',
title: `确定要删除 ${system_prefix}${row.key}？`,
confirmLoading: true,
theme: 'danger',
confirmFn: async () => {
Expand Down