From 6fe221a5b71deaf6b4cb9b5c1050d2a80010494a Mon Sep 17 00:00:00 2001
From: ikaluo <lyzqs@lyzqs.top>
Date: Mon, 5 Aug 2024 11:24:08 +0800
Subject: [PATCH 1/3] fix: fixed issues in admin42

---
 .../templates/admin42/accountmgr/user_profile_list.html     | 6 +++---
 .../templates/admin42/applications/list_applications.html   | 2 +-
 .../templates/admin42/platformmgr/builtin_config_vars.html  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apiserver/paasng/paasng/plat_admin/admin42/templates/admin42/accountmgr/user_profile_list.html b/apiserver/paasng/paasng/plat_admin/admin42/templates/admin42/accountmgr/user_profile_list.html
index 22fc3d7cd8..395518da82 100644
--- a/apiserver/paasng/paasng/plat_admin/admin42/templates/admin42/accountmgr/user_profile_list.html
+++ b/apiserver/paasng/paasng/plat_admin/admin42/templates/admin42/accountmgr/user_profile_list.html
@@ -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"
@@ -231,7 +231,7 @@
                     this.$bkInfo({
                         title: `确认要${action}？`,
                         confirmLoading: true,
-                        theme: 'danger',
+                        theme: action === '恢复访问' ? 'primary' : 'danger',
                         confirmFn: async () => {
                             try {
                                 await confirmAction()
@@ -266,7 +266,7 @@
                     this.$bkInfo({
                         title: '确定要修改吗？',
                         confirmLoading: true,
-                        theme: 'danger',
+                        theme: 'primary',
                         confirmFn: async () => {
                             try {
                                 if (this.form.enable_regions.length === 0) {
diff --git a/apiserver/paasng/paasng/plat_admin/admin42/templates/admin42/applications/list_applications.html b/apiserver/paasng/paasng/plat_admin/admin42/templates/admin42/applications/list_applications.html
index c301aa366e..8becdd4f13 100644
--- a/apiserver/paasng/paasng/plat_admin/admin42/templates/admin42/applications/list_applications.html
+++ b/apiserver/paasng/paasng/plat_admin/admin42/templates/admin42/applications/list_applications.html
@@ -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"
diff --git a/apiserver/paasng/paasng/plat_admin/admin42/templates/admin42/platformmgr/builtin_config_vars.html b/apiserver/paasng/paasng/plat_admin/admin42/templates/admin42/platformmgr/builtin_config_vars.html
index 3d2a9f43a6..5634680ab8 100644
--- a/apiserver/paasng/paasng/plat_admin/admin42/templates/admin42/platformmgr/builtin_config_vars.html
+++ b/apiserver/paasng/paasng/plat_admin/admin42/templates/admin42/platformmgr/builtin_config_vars.html
@@ -166,7 +166,7 @@
             },
             handleDelete: function (row) {
                 this.$bkInfo({
-                    title: '确认要删除？',
+                    title: `确定要删除 BKPAAS_${row.key}？`,
                     confirmLoading: true,
                     theme: 'danger',
                     confirmFn: async () => {

From a420b8c035a06de2c1821bb6a7192ffce5976324 Mon Sep 17 00:00:00 2001
From: ikaluo <lyzqs@lyzqs.top>
Date: Mon, 5 Aug 2024 11:25:36 +0800
Subject: [PATCH 2/3] fix: fixed

---
 .../templates/admin42/platformmgr/builtin_config_vars.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apiserver/paasng/paasng/plat_admin/admin42/templates/admin42/platformmgr/builtin_config_vars.html b/apiserver/paasng/paasng/plat_admin/admin42/templates/admin42/platformmgr/builtin_config_vars.html
index 5634680ab8..4541d54658 100644
--- a/apiserver/paasng/paasng/plat_admin/admin42/templates/admin42/platformmgr/builtin_config_vars.html
+++ b/apiserver/paasng/paasng/plat_admin/admin42/templates/admin42/platformmgr/builtin_config_vars.html
@@ -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">
         新建

From fe19d67c803c8808415da656548896275148ac6d Mon Sep 17 00:00:00 2001
From: ikaluo <lyzqs@lyzqs.top>
Date: Mon, 5 Aug 2024 11:59:05 +0800
Subject: [PATCH 3/3] fix: fixed

---
 .../templates/admin42/platformmgr/builtin_config_vars.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apiserver/paasng/paasng/plat_admin/admin42/templates/admin42/platformmgr/builtin_config_vars.html b/apiserver/paasng/paasng/plat_admin/admin42/templates/admin42/platformmgr/builtin_config_vars.html
index 4541d54658..f9f4257b84 100644
--- a/apiserver/paasng/paasng/plat_admin/admin42/templates/admin42/platformmgr/builtin_config_vars.html
+++ b/apiserver/paasng/paasng/plat_admin/admin42/templates/admin42/platformmgr/builtin_config_vars.html
@@ -166,7 +166,7 @@
             },
             handleDelete: function (row) {
                 this.$bkInfo({
-                    title: `确定要删除 BKPAAS_${row.key}？`,
+                    title: `确定要删除 ${system_prefix}${row.key}？`,
                     confirmLoading: true,
                     theme: 'danger',
                     confirmFn: async () => {