From eda66cab417e2fa3fd736a7fd00b6ce05eac0caf Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Tue, 14 Dec 2021 22:45:13 +0800
Subject: [PATCH 1/9] =?UTF-8?q?perf:=20=E7=BF=BB=E8=AF=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.json                            |  3 +++
 src/i18n/langs/en.json                            | 11 ++++++++---
 src/views/tickets/TicketFlow/FlowCreateUpdate.vue |  2 +-
 src/views/tickets/TicketFlow/FlowRuleField.vue    |  2 +-
 src/views/tickets/TicketList.vue                  |  2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 5fd857906..c4406a959 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -1046,6 +1046,9 @@
     "PermissionName": "授权规则名称",
     "Accept": "同意",
     "AssignedMe": "待我审批",
+    "FlowSetUp": "流程设置",
+    "ApprovalProcess": "审批流程",
+    "LevelApproval": "级审批",
     "Assignee": "处理人",
     "Assignees": "待处理人",
     "Close": "关闭",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 43336dce6..1dcf4072e 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -18,9 +18,9 @@
     "username_group":"Username group",
     "hostname_group":"Hostname group",
     "asset_ip_group": "Asset ip group",
-    "system_users_name_group": "Systemusers name group",
-    "system_users_protocol_group": "Systemusers protocol group",
-    "system_users_username_group": "systemusers username group",
+    "system_users_name_group": "Systemuser name",
+    "system_users_protocol_group": "Systemuser protocol",
+    "system_users_username_group": "systemuser username",
     "apply_login_asset": "Apply login asset",
     "apply_login_system_user": "Apply login system user",
     "apply_login_user": "Apply login user",
@@ -1008,6 +1008,9 @@
     "PermissionName": "Permission name",
     "Accept": "Accept",
     "AssignedMe": "Assigned me",
+    "FlowSetUp": "Flow set up",
+    "ApprovalProcess": "Approval process",
+    "LevelApproval": "Level approval",
     "Assignee": "Assignee",
     "RequestPerm":"Request Perm",
     "AssignedInfo":"Assigned Info",
@@ -1252,6 +1255,7 @@
       "NodeAmount": "Node",
       "PasswordLength": "Password length",
       "PasswordStrategy": "Password strategy",
+      "SecretKeyStrategy": "Secret key strategy",
       "RegularlyPerform": "Regularly perform",
       "Result": "Result",
       "Retry": "Retry",
@@ -1259,6 +1263,7 @@
       "TaskList": "Task list",
       "TimeDelta": "Time delta",
       "Timer": "Timer",
+      "TimerPeriod": "Timer period",
       "Username": "Username"
     },
     "Cloud": {
diff --git a/src/views/tickets/TicketFlow/FlowCreateUpdate.vue b/src/views/tickets/TicketFlow/FlowCreateUpdate.vue
index 6889d8347..bf1242fd0 100644
--- a/src/views/tickets/TicketFlow/FlowCreateUpdate.vue
+++ b/src/views/tickets/TicketFlow/FlowCreateUpdate.vue
@@ -22,7 +22,7 @@ export default {
           disabled: true
         },
         rules: {
-          label: '审批流程',
+          label: this.$t('tickets.ApprovalProcess'),
           component: FlowRuleField,
           el: {
             level: 1
diff --git a/src/views/tickets/TicketFlow/FlowRuleField.vue b/src/views/tickets/TicketFlow/FlowRuleField.vue
index 7572ed941..25f5261f0 100644
--- a/src/views/tickets/TicketFlow/FlowRuleField.vue
+++ b/src/views/tickets/TicketFlow/FlowRuleField.vue
@@ -4,7 +4,7 @@
     <div v-for="(item, i) of approveData" :key="i" style="margin-bottom: 10px">
       <el-card class="box-card">
         <div slot="header" class="clearfix">
-          <span>{{ i + 1 + '级审批' }}</span>
+          <span>{{ i + 1 + ' ' + vm.$t('tickets.LevelApproval') }}</span>
         </div>
         <el-radio-group v-model="item.strategy" @change="onChange()">
           <el-radio label="super_admin">{{ vm.$t('tickets.SuperAdmin') }}</el-radio>
diff --git a/src/views/tickets/TicketList.vue b/src/views/tickets/TicketList.vue
index db82bb1d4..83aa9e86e 100644
--- a/src/views/tickets/TicketList.vue
+++ b/src/views/tickets/TicketList.vue
@@ -46,7 +46,7 @@ export default {
             name: 'AssignedTicketList'
           },
           {
-            title: '流程设置',
+            title: this.$t('tickets.FlowSetUp'),
             icon: 'fa-gear',
             name: 'TicketFlow',
             hidden: () => {

From d36802e7bb0ac1ea0ffe78a0dbbe53a90706adee Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Wed, 15 Dec 2021 14:24:08 +0800
Subject: [PATCH 2/9] perf: ticket filter perf

---
 src/views/tickets/TicketListTable.vue | 31 +++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/views/tickets/TicketListTable.vue b/src/views/tickets/TicketListTable.vue
index 0a3ee447e..65e98dfdf 100644
--- a/src/views/tickets/TicketListTable.vue
+++ b/src/views/tickets/TicketListTable.vue
@@ -5,6 +5,7 @@
 import ListTable from '@/components/ListTable'
 import { DetailFormatter } from '@/components/TableFormatters'
 import { toSafeLocalDateStr } from '@/utils/common'
+import { APPROVE, REJECT, CLOSED } from './const'
 export default {
   name: 'TicketListTable',
   components: {
@@ -105,14 +106,32 @@ export default {
         hasCreate: false,
         hasBulkDelete: false,
         searchConfig: {
-          default: {
-            status: {
-              key: 'status',
+          exclude: ['state'],
+          options: [
+            {
+              value: 'state',
               label: this.$t('tickets.action'),
-              value: 'open',
-              valueLabel: this.$t('tickets.Pending')
+              children: [
+                {
+                  default: true,
+                  value: 'open',
+                  label: this.$t('tickets.Pending')
+                },
+                {
+                  value: APPROVE,
+                  label: this.$t('tickets.Approved')
+                },
+                {
+                  value: REJECT,
+                  label: this.$t('tickets.Rejected')
+                },
+                {
+                  value: CLOSED,
+                  label: this.$t('tickets.Closed')
+                }
+              ]
             }
-          }
+          ]
         },
         createTitle: this.$t('common.RequestTickets'),
         hasMoreActions: false,

From f416cfa435b4e6eefa41685f7ec9f19259e4e11b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C=E6=80=80=E7=A3=8A=E2=80=9D?= <2280131253@qq.com>
Date: Tue, 14 Dec 2021 11:30:42 +0800
Subject: [PATCH 3/9] =?UTF-8?q?feat:=20=E5=B0=81=E8=A3=85json=20editor?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                             |  1 +
 src/components/FormFields/JsonEditor.vue | 73 ++++++++++++++++++++++++
 src/components/FormFields/index.js       |  7 ++-
 src/i18n/langs/cn.json                   |  1 +
 src/i18n/langs/en.json                   |  1 +
 src/views/settings/Auth/CAS.vue          |  7 +--
 src/views/settings/Auth/SAML2.vue        | 13 ++---
 src/views/settings/Ldap/index.vue        |  7 +--
 8 files changed, 90 insertions(+), 20 deletions(-)
 create mode 100644 src/components/FormFields/JsonEditor.vue

diff --git a/package.json b/package.json
index 617ce96ed..bb5f32208 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,7 @@
     "vue-cookie": "^1.1.4",
     "vue-echarts": "^5.0.0-beta.0",
     "vue-i18n": "^8.15.5",
+    "vue-json-editor": "^1.4.3",
     "vue-moment": "^4.1.0",
     "vue-password-strength-meter": "^1.7.2",
     "vue-router": "3.0.6",
diff --git a/src/components/FormFields/JsonEditor.vue b/src/components/FormFields/JsonEditor.vue
new file mode 100644
index 000000000..c6fa8d167
--- /dev/null
+++ b/src/components/FormFields/JsonEditor.vue
@@ -0,0 +1,73 @@
+<template>
+  <div class="json-editor">
+    <JsonEditor
+      v-model="resultInfo"
+      :show-btns="false"
+      :mode="'code'"
+      @json-change="onJsonChange"
+      @json-save="onJsonSave"
+      @has-error="onError"
+    />
+  </div>
+</template>
+
+<script>
+import JsonEditor from 'vue-json-editor'
+
+export default {
+  components: { JsonEditor },
+  props: {
+    value: {
+      type: String,
+      default: () => ''
+    }
+  },
+  data() {
+    return {
+      hasJsonFlag: true, // json是否验证通过
+      resultInfo: {}
+    }
+  },
+  created() {
+    this.resultInfo = JSON.parse(this.value)
+  },
+  methods: {
+    // 数据改变
+    onJsonChange(value) {
+      this.onJsonSave(value)
+    },
+    // 保存
+    onJsonSave(value) {
+      this.resultInfo = value
+      this.hasJsonFlag = true
+      setTimeout(() => {
+        this.$emit('change', JSON.stringify(this.resultInfo))
+      }, 500)
+    },
+    onError: _.debounce(function(value) {
+      this.$message.error(this.$t('common.FormatError'))
+    }, 1100)
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .json-editor {
+    &>>> .jsoneditor {
+      border: 1px solid #e5e6e7;
+    }
+    &>>> .jsoneditor-compact {
+      display: none;
+    }
+    &>>> .jsoneditor-modes {
+      display: none;
+    }
+    &>>> .jsoneditor-poweredBy {
+      display: none;
+    }
+    &>>> .jsoneditor-menu {
+      background: #1ab394;
+      border-bottom: 1px solid #1ab394;
+    }
+  }
+</style>
diff --git a/src/components/FormFields/index.js b/src/components/FormFields/index.js
index d7b0744be..fa49bde31 100644
--- a/src/components/FormFields/index.js
+++ b/src/components/FormFields/index.js
@@ -8,6 +8,7 @@ import UploadKey from './UploadKey'
 import UserPassword from './UserPassword'
 import WeekCronSelect from './WeekCronSelect'
 import UpdateToken from './UpdateToken'
+import JsonEditor from './JsonEditor'
 
 export default {
   DatetimeRangePicker,
@@ -19,7 +20,8 @@ export default {
   UploadField,
   UserPassword,
   WeekCronSelect,
-  UpdateToken
+  UpdateToken,
+  JsonEditor
 }
 
 export {
@@ -32,5 +34,6 @@ export {
   UploadField,
   UserPassword,
   WeekCronSelect,
-  UpdateToken
+  UpdateToken,
+  JsonEditor
 }
diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index c4406a959..c4e174f46 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -445,6 +445,7 @@
     "lastCannotBeDeleteMsg": "最后一项，不能被删除",
     "InvalidJson": "不是合法 JSON",
     "time_period": "时段",
+    "FormatError": "格式错误",
     "WeekCronSelect": {
       "Monday": "星期一",
       "Tuesday": "星期二",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 1dcf4072e..b50a2c49c 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -468,6 +468,7 @@
       "failedConditions": "cron expression error"
     },
     "Cycle": "Cycle",
+    "FormatError": "Format error",
     "WeekCronSelect": {
       "Monday": "Monday",
       "Tuesday": "Tuesday",
diff --git a/src/views/settings/Auth/CAS.vue b/src/views/settings/Auth/CAS.vue
index 07c4cd260..3d99d0501 100644
--- a/src/views/settings/Auth/CAS.vue
+++ b/src/views/settings/Auth/CAS.vue
@@ -11,6 +11,8 @@
 <script>
 import BaseAuth from './Base'
 import { JsonRequired } from '@/components/DataForm/rules'
+import { JsonEditor } from '@/components/FormFields'
+
 export default {
   name: 'Cas',
   components: {
@@ -36,10 +38,7 @@ export default {
         ],
         fieldsMeta: {
           CAS_RENAME_ATTRIBUTES: {
-            component: 'el-input',
-            el: {
-              type: 'textarea'
-            },
+            component: JsonEditor,
             label: this.$t('setting.authUserAttrMap'),
             rules: [JsonRequired]
           }
diff --git a/src/views/settings/Auth/SAML2.vue b/src/views/settings/Auth/SAML2.vue
index a3f5f9334..7df33edd2 100644
--- a/src/views/settings/Auth/SAML2.vue
+++ b/src/views/settings/Auth/SAML2.vue
@@ -12,6 +12,8 @@
 import BaseAuth from './Base'
 import { JsonRequired } from '@/components/DataForm/rules'
 import { UploadKey } from '@/components'
+import { JsonEditor } from '@/components/FormFields'
+
 export default {
   name: 'SAML2',
   components: {
@@ -54,11 +56,7 @@ export default {
             label: this.$t('setting.authSAML2Xml')
           },
           SAML2_SP_ADVANCED_SETTINGS: {
-            component: 'el-input',
-            el: {
-              type: 'textarea',
-              rows: 3
-            },
+            component: JsonEditor,
             label: this.$t('setting.authSAML2AdvancedSettings'),
             rules: [JsonRequired]
           },
@@ -69,10 +67,7 @@ export default {
             component: UploadKey
           },
           SAML2_RENAME_ATTRIBUTES: {
-            component: 'el-input',
-            el: {
-              type: 'textarea'
-            },
+            component: JsonEditor,
             label: this.$t('setting.authUserAttrMap'),
             rules: [JsonRequired],
             helpText: this.$t('setting.authUserAttrMapHelpText')
diff --git a/src/views/settings/Ldap/index.vue b/src/views/settings/Ldap/index.vue
index 2ac70b483..aa887a478 100644
--- a/src/views/settings/Ldap/index.vue
+++ b/src/views/settings/Ldap/index.vue
@@ -13,7 +13,7 @@ import TestLoginDialog from './TestLoginDialog'
 import { IBox } from '@/components'
 import rules from '@/components/DataForm/rules'
 import { JsonRequired } from '@/components/DataForm/rules'
-import { UpdateToken } from '@/components/FormFields'
+import { UpdateToken, JsonEditor } from '@/components/FormFields'
 
 export default {
   name: 'Ldap',
@@ -62,10 +62,7 @@ export default {
           ]
         },
         AUTH_LDAP_USER_ATTR_MAP: {
-          component: 'el-input',
-          el: {
-            type: 'textarea'
-          },
+          component: JsonEditor,
           label: this.$t('setting.authLdapUserAttrMap'),
           rules: [JsonRequired]
         }

From 44e899e271ba9b51b91240b0687888a562f6243d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C=E6=80=80=E7=A3=8A=E2=80=9D?= <2280131253@qq.com>
Date: Wed, 15 Dec 2021 16:13:52 +0800
Subject: [PATCH 4/9] =?UTF-8?q?fix:=20=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=87=8D=E5=A4=8D=E7=9A=84=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/SystemUser/SystemUserList/CommonUserList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/assets/SystemUser/SystemUserList/CommonUserList.vue b/src/views/assets/SystemUser/SystemUserList/CommonUserList.vue
index 2ae076c30..8fd7a8acd 100644
--- a/src/views/assets/SystemUser/SystemUserList/CommonUserList.vue
+++ b/src/views/assets/SystemUser/SystemUserList/CommonUserList.vue
@@ -68,7 +68,7 @@ export default {
         hasCreate: false,
         createRoute: 'SystemUserCreate',
         searchConfig: {
-          exclude: ['type']
+          exclude: ['type', 'protocol']
         },
         moreCreates: {
           callback: (option) => {

From 33368cb901a4f8d559eea4fab1cd5a97a586cf98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C=E6=80=80=E7=A3=8A=E2=80=9D?= <2280131253@qq.com>
Date: Wed, 15 Dec 2021 16:08:06 +0800
Subject: [PATCH 5/9] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/applications/DatabaseApp/DatabaseAppList.vue     | 3 +++
 src/views/applications/KubernetesApp/KubernetesAppList.vue | 5 ++++-
 src/views/applications/RemoteApp/RemoteAppList.vue         | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/views/applications/DatabaseApp/DatabaseAppList.vue b/src/views/applications/DatabaseApp/DatabaseAppList.vue
index 62802486a..ac3cf04f3 100644
--- a/src/views/applications/DatabaseApp/DatabaseAppList.vue
+++ b/src/views/applications/DatabaseApp/DatabaseAppList.vue
@@ -68,6 +68,9 @@ export default {
         hasImport: false,
         hasBulkDelete: true,
         createRoute: 'DatabaseAppCreate',
+        searchConfig: {
+          exclude: ['category', 'type']
+        },
         moreCreates: {
           callback: (item) => {
             vm.$router.push({ name: 'DatabaseAppCreate', query: { type: item.name.toLowerCase() }})
diff --git a/src/views/applications/KubernetesApp/KubernetesAppList.vue b/src/views/applications/KubernetesApp/KubernetesAppList.vue
index 671fef7bb..628ba7ded 100644
--- a/src/views/applications/KubernetesApp/KubernetesAppList.vue
+++ b/src/views/applications/KubernetesApp/KubernetesAppList.vue
@@ -56,7 +56,10 @@ export default {
         hasExport: false,
         hasImport: false,
         hasBulkDelete: true,
-        createRoute: 'KubernetesAppCreate'
+        createRoute: 'KubernetesAppCreate',
+        searchConfig: {
+          exclude: ['category', 'type']
+        }
       }
     }
   }
diff --git a/src/views/applications/RemoteApp/RemoteAppList.vue b/src/views/applications/RemoteApp/RemoteAppList.vue
index 6710bce19..ede2da147 100644
--- a/src/views/applications/RemoteApp/RemoteAppList.vue
+++ b/src/views/applications/RemoteApp/RemoteAppList.vue
@@ -66,6 +66,9 @@ export default {
         hasExport: false,
         hasImport: false,
         // createRoute: 'RemoteAppCreate',
+        searchConfig: {
+          exclude: ['category', 'type']
+        },
         moreCreates: {
           dropdown: this.getCreateAppType(),
           callback: (app) => {

From b9cdac08501fc19e94d4fcfb0ed99c9bea2c168e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C=E6=80=80=E7=A3=8A=E2=80=9D?= <2280131253@qq.com>
Date: Wed, 15 Dec 2021 15:46:06 +0800
Subject: [PATCH 6/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=85=B3=E8=81=94=E8=8A=82=E7=82=B9=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/SystemUser/SystemUserDetail/AssetList.vue      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue b/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
index ae76fdd89..2274e3bfd 100644
--- a/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
+++ b/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
@@ -7,7 +7,7 @@
       <el-col :span="8">
         <QuickActions type="primary" :actions="quickActions" />
         <AssetRelationCard ref="assetSelect" type="primary" style="margin-top: 15px" v-bind="assetRelationConfig" />
-        <RelationCard type="info" style="margin-top: 15px" v-bind="nodeRelationConfig" />
+        <RelationCard ref="nodeRelation" type="info" style="margin-top: 15px" v-bind="nodeRelationConfig" />
       </el-col>
     </el-row>
   </div>
@@ -182,6 +182,12 @@ export default {
           const objectId = this.object.id
           const relationUrl = `/api/v1/assets/system-users-nodes-relations/?systemuser=${objectId}&node=${itemId}`
           return this.$axios.delete(relationUrl)
+        },
+        onAddSuccess: (objects, that) => {
+          that.iHasObjects = [...that.iHasObjects, ...objects]
+          vm.$refs.nodeRelation.$refs.select2.clearSelected()
+          this.$message.success(this.$t('common.updateSuccessMsg'))
+          vm.$refs.ListTable.reloadTable()
         }
       },
       assetRelationConfig: {

From e54c9cbd3b622b7bebb3b2fd455c1d1d1a739e2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C=E6=80=80=E7=A3=8A=E2=80=9D?= <2280131253@qq.com>
Date: Wed, 15 Dec 2021 11:25:56 +0800
Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD=EF=BC=8C?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E8=AE=BE=E7=BD=AE=E4=BA=86AD=E5=9F=9F?=
 =?UTF-8?q?=E5=90=8D=E4=B8=8D=E8=83=BD=E8=AE=BE=E7=BD=AE=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.json                                       | 1 +
 src/i18n/langs/en.json                                       | 1 +
 src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js | 5 +++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index c4e174f46..de65754a6 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -138,6 +138,7 @@
     "Disk": "硬盘",
     "AdDomain": "AD域名",
     "AdDomainHelpText": "提供给域用户登录的AD域名",
+    "SetAdDomainNoDisabled": "如果设置了AD域名不能修改",
     "Domain": "网域",
     "DomainDetail": "网域详情",
     "DomainHelpMessage": "网域功能是为了解决部分环境（如：混合云）无法直接连接而新增的功能，原理是通过网关服务器进行跳转登录。JMS => 网域网关 => 目标资产",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index b50a2c49c..ed429e4e7 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -136,6 +136,7 @@
     "Disk": "Disk",
     "AdDomain": "AD Domain",
     "AdDomainHelpText": "AD domain provided to domain users for login",
+    "SetAdDomainNoDisabled": "If AD domain is set, it cannot be modified",
     "Domain": "Domain",
     "DomainDetail": "Domain detail",
     "DomainHelpMessage": "The domain function is added to address the fact that some environments (such as the hybrid cloud) cannot be connected directly by jumping on the gateway server.\nJMS => Domain gateway => Target assets",
diff --git a/src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js b/src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js
index 7443dbc19..fbf5cb0b8 100644
--- a/src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js
+++ b/src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js
@@ -121,7 +121,7 @@ function getFields() {
       disabled: false
     },
     hidden: form => {
-      if (form.login_mode === 'manual' || form.type === 'admin') {
+      if (form.login_mode === 'manual' || form.type === 'admin' || (form.ad_domain && form.ad_domain !== '')) {
         this.fieldsMeta.auto_push.el.disabled = true
       } else {
         this.fieldsMeta.auto_push.el.disabled = false
@@ -133,7 +133,8 @@ function getFields() {
           updateForm({ auto_generate_key: value })
         }
       }
-    }
+    },
+    helpText: this.$t('assets.SetAdDomainNoDisabled')
   }
 
   const update_password = {

From f11dc2f7a32f793d0b46dc3af786699307473e65 Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Wed, 15 Dec 2021 17:59:46 +0800
Subject: [PATCH 8/9] =?UTF-8?q?fix:=20ansible=20=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AF=BB=E5=8F=96=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/jms.js                                              | 4 ++--
 .../HistoryExecutionDetail/HistoryExecutionDetail.vue         | 2 +-
 src/views/ops/TaskDetail/TaskDetail.vue                       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/utils/jms.js b/src/utils/jms.js
index f3b67b60e..c499f0fa4 100644
--- a/src/utils/jms.js
+++ b/src/utils/jms.js
@@ -1,3 +1,3 @@
-export function openTaskPage(taskId) {
-  window.open(`/#/ops/celery/task/${taskId}/log/`, '', 'width=900,height=600')
+export function openTaskPage(taskId, type = '') {
+  window.open(`/#/ops/celery/task/${taskId}/log/?type=${type}`, '', 'width=900,height=600')
 }
diff --git a/src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue b/src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue
index b1439344c..a716d88ba 100644
--- a/src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue
+++ b/src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue
@@ -78,7 +78,7 @@ export default {
           value: this.object.id,
           formatter: function(row, value) {
             const onClick = function() {
-              openTaskPage(value)
+              openTaskPage(value, 'ansible')
             }
             const title = this.$t('common.View')
             return <a onClick={onClick} >{ title }</a>
diff --git a/src/views/ops/TaskDetail/TaskDetail.vue b/src/views/ops/TaskDetail/TaskDetail.vue
index 8662e412b..15917f1ac 100644
--- a/src/views/ops/TaskDetail/TaskDetail.vue
+++ b/src/views/ops/TaskDetail/TaskDetail.vue
@@ -102,7 +102,7 @@ export default {
           value: this.object.latest_execution.id,
           formatter: function(row, value) {
             const onClick = function() {
-              openTaskPage(value)
+              openTaskPage(value, 'ansible')
             }
             const title = this.$t('common.View')
             return <a onClick={onClick} >{ title }</a>

From 66ecf89d357344b88b69b59c14d0a57a8bee40a8 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 15 Dec 2021 20:53:11 +0800
Subject: [PATCH 9/9] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=20saml2=20?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.json            |  3 +++
 src/i18n/langs/en.json            |  3 +++
 src/views/settings/Auth/SAML2.vue | 27 ++++++++++++++++++---------
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index de65754a6..65725b943 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -918,6 +918,9 @@
     "authSAML2MetadataUrl": "IDP metadata URL",
     "authSAML2AdvancedSettings": "高级配置",
     "IdpMetadataHelpText": "IDP metadata URL 和 IDP metadata XML参数二选一即可，IDP metadata URL的优先级高",
+    "IdpMetadataUrlHelpText": "从远端地址中加载 IDP Metadata",
+    "authSAMLKeyHelpText": "SP 证书和密钥 是用来和 IDP 加密通信的",
+    "authSAMLCertHelpText": "上传证书密钥后保存, 然后查看 SP Metadata",
     "authCASAttrMap": "用户属性映射",
     "SignaturesAndTemplates": "Signatures and Templates",
     "unselectedUser": "没有选择用户",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index ed429e4e7..a006e75fe 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -895,6 +895,9 @@
     "authSAML2Xml": "IDP metadata XML",
     "authSAML2MetadataUrl": "IDP metadata URL",
     "IdpMetadataHelpText": "Choose one of IDP metadata URL and IDP metadata XML parameters. IDP metadata URL has high priority",
+    "IdpMetadataUrlHelpText": "Load IDP Metadata from remote url",
+    "authSAMLKeyHelpText": "SP cert and private key, using communicate with IDP",
+    "authSAMLCertHelpText": "After upload cert and private key, View SP Metadata",
     "authSAML2AdvancedSettings": "Advanced Settings",
     "unselectedUser": "Unselected user",
     "auto": "Auto",
diff --git a/src/views/settings/Auth/SAML2.vue b/src/views/settings/Auth/SAML2.vue
index 7df33edd2..97693cc80 100644
--- a/src/views/settings/Auth/SAML2.vue
+++ b/src/views/settings/Auth/SAML2.vue
@@ -31,8 +31,14 @@ export default {
         url: '/api/v1/settings/setting/?category=saml2',
         fields: [
           [this.$t('common.Basic'), ['AUTH_SAML2']],
-          [this.$t('common.Params'), ['SAML2_IDP_METADATA_URL', 'SAML2_IDP_METADATA_XML', 'SAML2_SP_ADVANCED_SETTINGS']],
-          [this.$t('common.Certificate'), ['SAML2_SP_CERT_CONTENT', 'SAML2_SP_KEY_CONTENT']],
+          [this.$t('common.Certificate'), [
+            'SAML2_SP_KEY_CONTENT',
+            'SAML2_SP_CERT_CONTENT'
+          ]],
+          [this.$t('common.Params'), [
+            'SAML2_IDP_METADATA_URL', 'SAML2_IDP_METADATA_XML',
+            'SAML2_SP_ADVANCED_SETTINGS'
+          ]],
           [this.$t('common.Other'), [
             'SAML2_LOGOUT_COMPLETELY', 'AUTH_SAML2_ALWAYS_UPDATE_USER',
             'SAML2_RENAME_ATTRIBUTES'
@@ -45,26 +51,29 @@ export default {
           SAML2_IDP_METADATA_URL: {
             component: 'el-input',
             label: this.$t('setting.authSAML2MetadataUrl'),
-            helpText: this.$t('setting.IdpMetadataHelpText')
+            helpText: this.$t('setting.IdpMetadataUrlHelpText')
           },
           SAML2_IDP_METADATA_XML: {
             component: 'el-input',
             el: {
               type: 'textarea',
-              rows: 8
+              rows: 4
             },
-            label: this.$t('setting.authSAML2Xml')
+            label: this.$t('setting.authSAML2Xml'),
+            helpText: this.$t('setting.IdpMetadataHelpText')
           },
           SAML2_SP_ADVANCED_SETTINGS: {
             component: JsonEditor,
             label: this.$t('setting.authSAML2AdvancedSettings'),
             rules: [JsonRequired]
           },
-          SAML2_SP_CERT_CONTENT: {
-            component: UploadKey
-          },
           SAML2_SP_KEY_CONTENT: {
-            component: UploadKey
+            component: UploadKey,
+            helpText: this.$t('setting.authSAMLKeyHelpText')
+          },
+          SAML2_SP_CERT_CONTENT: {
+            component: UploadKey,
+            helpText: this.$t('setting.authSAMLCertHelpText') + ' <a href="/core/auth/saml2/metadata/" target="_blank">查看</a>'
           },
           SAML2_RENAME_ATTRIBUTES: {
             component: JsonEditor,