From 1e2b6caf9335568ab5cef839c8621ceefcebf179 Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Fri, 12 Nov 2021 14:10:35 +0800
Subject: [PATCH 01/20] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tickets/LoginAssetConfirm/Detail/TicketDetail.vue     | 2 +-
 src/views/tickets/components/Details.vue                  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/tickets/LoginAssetConfirm/Detail/TicketDetail.vue b/src/views/tickets/LoginAssetConfirm/Detail/TicketDetail.vue
index 7b4045b16..035ab097c 100644
--- a/src/views/tickets/LoginAssetConfirm/Detail/TicketDetail.vue
+++ b/src/views/tickets/LoginAssetConfirm/Detail/TicketDetail.vue
@@ -53,7 +53,7 @@ export default {
       ]
     },
     specialCardItems() {
-      return [
+      return this.object.type === 'login_confirm' ? [] : [
         // apply_login_asset: "114.118.2.76(114.118.2.76)"
         // apply_login_system_user: "root()"
         // apply_login_user: "Administrator(admin)"
diff --git a/src/views/tickets/components/Details.vue b/src/views/tickets/components/Details.vue
index 07615b46e..0394bf613 100644
--- a/src/views/tickets/components/Details.vue
+++ b/src/views/tickets/components/Details.vue
@@ -7,12 +7,12 @@
       <el-row :gutter="10">
         <el-col v-for="item in detailCardItems" :key="'card-' + item.key" :span="12">
           <el-row class="item">
-            <el-col :span="4">
+            <el-col :span="6">
               <div :style="{ 'text-align': 'align' }" class="item-label">
                 <label>{{ item.key }}: </label>
               </div>
             </el-col>
-            <el-col :span="20">
+            <el-col :span="18">
               <div class="item-text">
                 <ItemValue v-bind="item" />
               </div>
@@ -24,12 +24,12 @@
       <el-row :gutter="10">
         <el-col v-for="item in specialCardItems" :key="'card-' + item.key" :span="12">
           <el-row class="item">
-            <el-col :span="4">
+            <el-col :span="6">
               <div :style="{ 'text-align': 'align' }" class="item-label">
                 <label>{{ item.key }}: </label>
               </div>
             </el-col>
-            <el-col :span="20">
+            <el-col :span="18">
               <div class="item-text">
                 <ItemValue v-bind="item" />
               </div>

From 39b84e9a8f1a794176b49121700cb83f31b97a87 Mon Sep 17 00:00:00 2001
From: Michael Bai <baijiangjie@gmail.com>
Date: Fri, 12 Nov 2021 11:05:25 +0800
Subject: [PATCH 02/20] =?UTF-8?q?fix:=20=E7=A7=BB=E5=8A=A8=E3=80=90?=
 =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E8=AE=BE=E7=BD=AE=E4=BF=9D=E7=95=99=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E3=80=91=E8=87=B3=E5=AE=9A=E6=9C=9F=E6=B8=85=E7=90=86?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/settings/Clean.vue    | 2 +-
 src/views/settings/Terminal.vue | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/views/settings/Clean.vue b/src/views/settings/Clean.vue
index 85a62422d..f12c26806 100644
--- a/src/views/settings/Clean.vue
+++ b/src/views/settings/Clean.vue
@@ -23,7 +23,7 @@ export default {
           this.$t('common.Logging'),
           [
             'LOGIN_LOG_KEEP_DAYS', 'TASK_LOG_KEEP_DAYS', 'OPERATE_LOG_KEEP_DAYS',
-            'FTP_LOG_KEEP_DAYS'
+            'FTP_LOG_KEEP_DAYS', 'TERMINAL_SESSION_KEEP_DURATION'
           ]
         ],
         [
diff --git a/src/views/settings/Terminal.vue b/src/views/settings/Terminal.vue
index 62ff4d53d..9ab980622 100644
--- a/src/views/settings/Terminal.vue
+++ b/src/views/settings/Terminal.vue
@@ -28,12 +28,6 @@ export default {
           [
             'XRDP_ENABLED', 'TERMINAL_RDP_ADDR'
           ]
-        ],
-        [
-          this.$t('common.Other'),
-          [
-            'TERMINAL_SESSION_KEEP_DURATION'
-          ]
         ]
       ],
       fieldsMeta: {

From cceca0e1ab978d44512d193353506b2a28d6a1cd Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Thu, 11 Nov 2021 19:03:47 +0800
Subject: [PATCH 03/20] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80ip=E9=BB=91=E5=90=8D=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/settings/Security/AuthLimit.vue | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/views/settings/Security/AuthLimit.vue b/src/views/settings/Security/AuthLimit.vue
index 24f7d02cb..79c47d285 100644
--- a/src/views/settings/Security/AuthLimit.vue
+++ b/src/views/settings/Security/AuthLimit.vue
@@ -14,6 +14,7 @@
       @confirm="onConfirm()"
     >
       <GenericCreateUpdateForm
+        v-bind="$data"
         :fields="fields"
         :url="url"
         :fields-meta="fieldsMeta"
@@ -37,15 +38,29 @@ export default {
   },
   data() {
     return {
+      initial: {
+        SECURITY_LOGIN_IP_BLACK_LIST: []
+      },
       visible: false,
       fields: [
-        'SECURITY_LOGIN_LIMIT_COUNT', 'SECURITY_LOGIN_LIMIT_TIME',
+        'SECURITY_LOGIN_LIMIT_COUNT', 'SECURITY_LOGIN_LIMIT_TIME', 'SECURITY_LOGIN_IP_BLACK_LIST',
         'USER_LOGIN_SINGLE_MACHINE_ENABLED', 'ONLY_ALLOW_EXIST_USER_AUTH',
         'ONLY_ALLOW_AUTH_FROM_SOURCE'
       ],
       successUrl: { name: 'Settings', params: { activeMenu: 'EmailContent' }},
       fieldsMeta: {
       },
+      afterGetFormValue(validValues) {
+        validValues.SECURITY_LOGIN_IP_BLACK_LIST = validValues.SECURITY_LOGIN_IP_BLACK_LIST.toString()
+        return validValues
+      },
+      cleanFormValue(value) {
+        const ipBlackList = value.SECURITY_LOGIN_IP_BLACK_LIST
+        if (!Array.isArray(ipBlackList)) {
+          value.SECURITY_LOGIN_IP_BLACK_LIST = ipBlackList ? ipBlackList.split(',') : []
+        }
+        return value
+      },
       url: '/api/v1/settings/setting/?category=security'
     }
   },

From 902364fdc32054eb924ae9ee3d403b276cfa0991 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: Fri, 12 Nov 2021 11:04:57 +0800
Subject: [PATCH 04/20] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=91=BD?=
 =?UTF-8?q?=E4=BB=A4=E8=AE=B0=E5=BD=95=EF=BC=8C=E5=91=BD=E4=BB=A4=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8tree=E6=90=9C=E7=B4=A2=E6=97=B6=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sessions/CommandList.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/sessions/CommandList.vue b/src/views/sessions/CommandList.vue
index d96c6c1ed..bc17d8c34 100644
--- a/src/views/sessions/CommandList.vue
+++ b/src/views/sessions/CommandList.vue
@@ -203,7 +203,6 @@ export default {
       const queryStr = (url.indexOf('?') > -1 ? '&' : '?') + queryUtil.stringify(_query, '=', '&')
       const treeUrl = url + queryStr
       this.$set(this.treeSetting, 'treeUrl', treeUrl)
-      this.treeTable.forceRerenderTree()
     },
     handleFilterChange(query) {
       const _query = this.cleanUrl(query)

From 63cde369fae04742338b12a8f0c7dfa9301bfe14 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: Thu, 11 Nov 2021 18:29:56 +0800
Subject: [PATCH 05/20] =?UTF-8?q?fix:=20=E5=AF=86=E7=A0=81=E6=A1=86?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=20updatetoken=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../applications/RemoteApp/RemoteAppCreateUpdate.vue      | 4 ++++
 src/views/sessions/ReplayStorageCreateUpdate.vue          | 8 +++++++-
 src/views/settings/SMS/SMSTencent.vue                     | 4 ++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/views/applications/RemoteApp/RemoteAppCreateUpdate.vue b/src/views/applications/RemoteApp/RemoteAppCreateUpdate.vue
index 04e038eca..f6af90b78 100644
--- a/src/views/applications/RemoteApp/RemoteAppCreateUpdate.vue
+++ b/src/views/applications/RemoteApp/RemoteAppCreateUpdate.vue
@@ -6,6 +6,7 @@
 import { GenericCreateUpdatePage } from '@/layout/components'
 import { REMOTE_APP_TYPE_FIELDS_MAP, REMOTE_APP_TYPE_META_MAP, REMOTE_APP_PATH_DEFAULT_MAP } from './const'
 import rules from '@/components/DataForm/rules'
+import { UpdateToken } from '@/components/FormFields'
 
 export default {
   components: {
@@ -52,6 +53,9 @@ export default {
                   }
                 }
               }
+            },
+            [`${appType === 'vmware_client' ? 'vmware' : appType}_password`]: {
+              component: UpdateToken
             }
           }
         }
diff --git a/src/views/sessions/ReplayStorageCreateUpdate.vue b/src/views/sessions/ReplayStorageCreateUpdate.vue
index cb25f1937..0e1ede399 100644
--- a/src/views/sessions/ReplayStorageCreateUpdate.vue
+++ b/src/views/sessions/ReplayStorageCreateUpdate.vue
@@ -10,6 +10,7 @@
 <script>
 import GenericCreateUpdatePage from '@/layout/components/GenericCreateUpdatePage'
 import { STORAGE_TYPE_META_MAP } from './const'
+import { UpdateToken } from '@/components/FormFields'
 
 export default {
   name: 'ReplayStorageUpdate',
@@ -45,7 +46,12 @@ export default {
           disabled: true
         },
         meta: {
-          fields: storageTypeMeta.meta
+          fields: storageTypeMeta.meta,
+          fieldsMeta: {
+            ACCESS_KEY: {
+              component: UpdateToken
+            }
+          }
         },
         is_default: {
           helpText: this.$t('sessions.SetToDefaultStorage')
diff --git a/src/views/settings/SMS/SMSTencent.vue b/src/views/settings/SMS/SMSTencent.vue
index fef16ce85..87434328a 100644
--- a/src/views/settings/SMS/SMSTencent.vue
+++ b/src/views/settings/SMS/SMSTencent.vue
@@ -4,6 +4,7 @@
 
 <script>
 import BaseSMS from './Base'
+import { UpdateToken } from '@/components/FormFields'
 
 export default {
   name: 'SMSTencent',
@@ -56,6 +57,9 @@ export default {
           fields: ['SIGN_NAME', 'TEMPLATE_CODE'],
           fieldsMeta: {
           }
+        },
+        TENCENT_SECRET_KEY: {
+          component: UpdateToken
         }
       },
       submitMethod() {

From df088cc1b65bc98807bf6209ce089224d2d6b507 Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Fri, 12 Nov 2021 17:51:01 +0800
Subject: [PATCH 06/20] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=85=B3?=
 =?UTF-8?q?=E9=97=ADssh=E5=90=8E=20=E4=BB=8D=E7=84=B6=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E9=92=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/users/User/UserDetail/UserInfo.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/users/User/UserDetail/UserInfo.vue b/src/views/users/User/UserDetail/UserInfo.vue
index 45d81f7ed..89aab5345 100644
--- a/src/views/users/User/UserDetail/UserInfo.vue
+++ b/src/views/users/User/UserDetail/UserInfo.vue
@@ -121,6 +121,7 @@ export default {
           title: this.$t('users.quickUpdate.resetSSHKey'),
           attrs: {
             type: 'primary',
+            disabled: !this.$store.state.users.profile.can_public_key_auth,
             label: this.$t('users.quickUpdate.send')
           },
           callbacks: {

From e9bab6a6232d2fd514def89dca48e39173f0deb1 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: Fri, 12 Nov 2021 18:44:19 +0800
Subject: [PATCH 07/20] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E5=B7=A5=E5=8D=95=E6=97=B6=E5=BF=85=E5=A1=AB=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=A0=A1=E9=AA=8C=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tickets/RequestApplicationPerm/CreateUpdate.vue   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/views/tickets/RequestApplicationPerm/CreateUpdate.vue b/src/views/tickets/RequestApplicationPerm/CreateUpdate.vue
index bcc0cc397..ff9589629 100644
--- a/src/views/tickets/RequestApplicationPerm/CreateUpdate.vue
+++ b/src/views/tickets/RequestApplicationPerm/CreateUpdate.vue
@@ -199,6 +199,17 @@ export default {
       url: '/api/v1/tickets/tickets/?type=apply_application&action=open',
       createSuccessNextRoute: {
         name: 'TicketList'
+      },
+      cleanFormValue(value) {
+        const applications = value.meta.apply_applications
+        const systemUsers = value.meta.apply_system_users
+        if (applications && Array.isArray(applications) && applications.length < 1) {
+          delete value.meta.apply_applications
+        }
+        if (systemUsers && Array.isArray(systemUsers) && systemUsers.length < 1) {
+          delete value.meta.apply_system_users
+        }
+        return value
       }
     }
   },

From cf8b0970e35200d07c91e563d20ef2ca0671258a 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: Fri, 12 Nov 2021 15:45:48 +0800
Subject: [PATCH 08/20] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95-=E7=99=BB=E5=BD=95=E5=A4=8D=E6=A0=B8=EF=BC=9A?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=BF=94=E5=9B=9E=E8=B7=AF=E7=94=B1=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E8=BF=94=E5=9B=9E=E5=88=97=E8=A1=A8=E9=A1=B5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tickets/TicketListTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/tickets/TicketListTable.vue b/src/views/tickets/TicketListTable.vue
index 91548aeb8..0a3ee447e 100644
--- a/src/views/tickets/TicketListTable.vue
+++ b/src/views/tickets/TicketListTable.vue
@@ -36,7 +36,7 @@ export default {
                   return 'AssetsTicketDetail'
                 } else if (row.type === 'apply_application') {
                   return 'AppsTicketDetail'
-                } else if (row.type === 'login_asset_confirm') {
+                } else if (row.type === 'login_asset_confirm' || row.type === 'login_confirm') {
                   return 'LoginAssetTicketDetail'
                 } else if (row.type === 'command_confirm') {
                   return 'CommandConfirmDetail'

From bdb38362ff660afe893911ee655c81b52d082e4d Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Mon, 15 Nov 2021 11:12:22 +0800
Subject: [PATCH 09/20] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E8=B5=84=E4=BA=A7=E5=A4=8D=E5=90=88=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tickets/TicketDetail/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/tickets/TicketDetail/index.vue b/src/views/tickets/TicketDetail/index.vue
index d1924ae7b..1fb9a980f 100644
--- a/src/views/tickets/TicketDetail/index.vue
+++ b/src/views/tickets/TicketDetail/index.vue
@@ -52,7 +52,8 @@ export default {
         'apply_asset': 'AssetsTicketDetail',
         'apply_application': 'AppsTicketDetail',
         'login_confirm': 'LoginAssetTicketDetail',
-        'login_asset_confirm': 'CommandConfirmDetail'
+        'login_asset_confirm': 'LoginAssetTicketDetail',
+        'command_confirm': 'CommandConfirmDetail'
       }
       const routeName = ticketRouteMapper[ticket.type]
       setTimeout(() => {

From 9a1263f9af3d29bcb134f8d20bc7575564b8bec5 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: Mon, 15 Nov 2021 11:20:24 +0800
Subject: [PATCH 10/20] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dselect2=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E9=80=89=E9=A1=B9=E8=BF=87=E9=95=BF=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E6=BA=A2=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FormFields/Select2.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/FormFields/Select2.vue b/src/components/FormFields/Select2.vue
index 0da00f5fb..a014719f1 100644
--- a/src/components/FormFields/Select2.vue
+++ b/src/components/FormFields/Select2.vue
@@ -320,4 +320,8 @@ export default {
   .select2 {
     width: 100%;
   }
+  .select2 >>> .el-tag.el-tag--info {
+    height: auto;
+    white-space: normal;
+  }
 </style>

From 64b3be5d45e3afe3784e143ae1a09ca314e77446 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 15 Nov 2021 14:26:35 +0800
Subject: [PATCH 11/20] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AEmfa=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/users/User/UserDetail/UserInfo.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/users/User/UserDetail/UserInfo.vue b/src/views/users/User/UserDetail/UserInfo.vue
index 89aab5345..1455dd354 100644
--- a/src/views/users/User/UserDetail/UserInfo.vue
+++ b/src/views/users/User/UserDetail/UserInfo.vue
@@ -57,14 +57,14 @@ export default {
           title: this.$t('users.quickUpdate.resetMFA'),
           attrs: {
             type: 'primary',
-            disabled: !this.object.mfa_enabled || this.object.id === this.$store.state.users.profile.id,
+            // disabled: !this.object.mfa_enabled || this.object.id === this.$store.state.users.profile.id,
             label: this.$t('common.Reset')
           },
           callbacks: {
             click: function() {
               const warnMsg = vm.$t('users.quickUpdate.resetMFAWarningMsg')
               const warnTitle = vm.$t('common.Info')
-              const url = `/api/v1/users/users/${vm.object.id}/otp/reset/`
+              const url = `/api/v1/users/users/${vm.object.id}/mfa/reset/`
               const successMsg = vm.$t('users.quickUpdate.resetMFAdSuccessMsg')
               vm.$confirm(warnMsg, warnTitle, {
                 type: 'warning',

From 4ed40f763ce75d6074009931c7ca2351b24052b5 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: Mon, 15 Nov 2021 17:04:31 +0800
Subject: [PATCH 12/20] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=99=BB=E5=BD=95=E8=A7=84=E5=88=99=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=8C=E4=B9=8B=E5=90=8E=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?=E5=87=BBmessage=E8=B7=B3=E8=BD=AC=E8=AF=A6=E6=83=85=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/acl/UserLoginACL/UserLoginACLCreateUpdate.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/acl/UserLoginACL/UserLoginACLCreateUpdate.vue b/src/views/acl/UserLoginACL/UserLoginACLCreateUpdate.vue
index 68762d94f..c30d19dbc 100644
--- a/src/views/acl/UserLoginACL/UserLoginACLCreateUpdate.vue
+++ b/src/views/acl/UserLoginACL/UserLoginACLCreateUpdate.vue
@@ -27,6 +27,7 @@ export default {
         }
       },
       url: '/api/v1/acls/login-acls/',
+      hasDetailInMsg: false,
       fields: [
         [this.$t('common.Basic'), ['name', 'priority']],
         [this.$t('acl.users'), ['user']],

From 788745823935e79282306e7bbea161aa36a97c90 Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Wed, 17 Nov 2021 11:36:18 +0800
Subject: [PATCH 13/20] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E6=B5=81=E4=BF=AE=E6=94=B9=E4=B8=8D=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tickets/TicketFlow/FlowRuleField.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/tickets/TicketFlow/FlowRuleField.vue b/src/views/tickets/TicketFlow/FlowRuleField.vue
index 5a5ae7c4b..7572ed941 100644
--- a/src/views/tickets/TicketFlow/FlowRuleField.vue
+++ b/src/views/tickets/TicketFlow/FlowRuleField.vue
@@ -68,7 +68,9 @@ export default {
           delete rule.assignees_read_only
         }
       })
-      return rules.sort((a, b) => a.level - b.level)
+      rules = rules.sort((a, b) => a.level - b.level)
+      this.$emit('input', rules)
+      return rules
     }
   },
   mounted() {

From adf5b51a63576a495652966a18eb89919e5d7de3 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, 16 Nov 2021 16:03:42 +0800
Subject: [PATCH 14/20] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E6=8E=88=E6=9D=83=E8=AF=A6=E6=83=85=EF=BC=8C=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=BB=84=E4=B8=8D=E8=83=BD=E5=88=A0=E9=99=A4=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ApplicationPermissionUser.vue                            | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/perms/ApplicationPermission/ApplicationPermissionDetail/ApplicationPermissionUser.vue b/src/views/perms/ApplicationPermission/ApplicationPermissionDetail/ApplicationPermissionUser.vue
index 42992ed81..35d0da149 100644
--- a/src/views/perms/ApplicationPermission/ApplicationPermissionDetail/ApplicationPermissionUser.vue
+++ b/src/views/perms/ApplicationPermission/ApplicationPermissionDetail/ApplicationPermissionUser.vue
@@ -112,9 +112,8 @@ export default {
         performDelete: (item) => {
           const objectId = this.object.id
           const relationUrl = `/api/v1/perms/application-permissions/${objectId}/`
-          const objectOldRelationUserGroups = this.object.user_groups
-          const objectNewRelationUserGroups = objectOldRelationUserGroups.filter(v => v !== item.value)
-          const data = { user_groups: objectNewRelationUserGroups }
+          this.object.user_groups = this.object.user_groups.filter(v => v !== item.value)
+          const data = { user_groups: this.object.user_groups }
           return this.$axios.patch(relationUrl, data)
         },
         onDeleteSuccess: (obj, that) => {

From 526578a5209a4f3a7dd1b04d112b40848b227e6d Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 17 Nov 2021 14:13:36 +0800
Subject: [PATCH 15/20] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=85=AC?=
 =?UTF-8?q?=E5=91=8A=E4=B8=AD=E7=9A=84=E9=87=8D=E7=BD=AE=E6=97=A0=E5=8F=8D?=
 =?UTF-8?q?=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/GenericCreateUpdateForm/index.vue | 4 ++++
 src/views/settings/Basic/announcement.vue               | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/layout/components/GenericCreateUpdateForm/index.vue b/src/layout/components/GenericCreateUpdateForm/index.vue
index 2604e142f..19dddfe6a 100644
--- a/src/layout/components/GenericCreateUpdateForm/index.vue
+++ b/src/layout/components/GenericCreateUpdateForm/index.vue
@@ -51,6 +51,10 @@ export default {
       type: Function,
       default: null
     },
+    hasReset: {
+      type: Boolean,
+      default: null
+    },
     // 如何提交数据
     performSubmit: {
       type: Function,
diff --git a/src/views/settings/Basic/announcement.vue b/src/views/settings/Basic/announcement.vue
index 6b78438e2..6d77a7fd2 100644
--- a/src/views/settings/Basic/announcement.vue
+++ b/src/views/settings/Basic/announcement.vue
@@ -56,6 +56,7 @@ export default {
         },
         successUrl: { name: 'Settings', params: { activeMenu: 'Basic' }},
         url: '/api/v1/settings/setting/?category=basic',
+        hasReset: false,
         submitMethod() {
           return 'patch'
         }

From b1eef7d2f3b2f1bed731413483d14068434f0fbb 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, 17 Nov 2021 14:33:57 +0800
Subject: [PATCH 16/20] =?UTF-8?q?perf:=20=E6=90=9C=E7=B4=A2=E6=A1=86?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=9A=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=80=89=E9=A1=B9=E4=B8=8D=E8=83=BD=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TagSearch/index.vue | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/TagSearch/index.vue b/src/components/TagSearch/index.vue
index 7b4ff291f..7f12806a9 100644
--- a/src/components/TagSearch/index.vue
+++ b/src/components/TagSearch/index.vue
@@ -1,7 +1,13 @@
 <template>
 
   <div class="filter-field">
-    <el-cascader ref="Cascade" :options="options" :props="config" @change="handleMenuItemChange" />
+    <el-cascader
+      v-show="options.length > 0"
+      ref="Cascade"
+      :options="options"
+      :props="config"
+      @change="handleMenuItemChange"
+    />
     <el-tag
       v-for="(v, k) in filterTags"
       :key="k"
@@ -24,6 +30,7 @@
       v-model="filterValue"
       :placeholder="placeholder"
       class="search-input"
+      :class="options.length < 1 ? 'search-input2': ''"
       @blur="focus = false"
       @focus="focus = true"
       @change="handleConfirm"
@@ -182,10 +189,14 @@ export default {
   .filter-field {
     display: flex;
     align-items:  center;
+    min-width: 198px;
     border: 1px solid #dcdee2;
     border-radius: 3px;
     background-color:#fff;
   }
+  .search-input2 >>> .el-input__inner {
+    text-indent: 5px;
+  }
   .search-input >>> .el-input__inner {
     /*max-width:inherit !important;*/
     max-width: 200px;

From c6988578cb81145c62f5aa00cfef8de6d0f0f5a2 Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Wed, 17 Nov 2021 15:40:45 +0800
Subject: [PATCH 17/20] =?UTF-8?q?perf:=20help=E4=BF=A1=E6=81=AF=E8=BF=81?=
 =?UTF-8?q?=E7=A7=BB=E5=88=B0public=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/NavHeader/Help.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/layout/components/NavHeader/Help.vue b/src/layout/components/NavHeader/Help.vue
index 6107a179e..23893c903 100644
--- a/src/layout/components/NavHeader/Help.vue
+++ b/src/layout/components/NavHeader/Help.vue
@@ -32,11 +32,8 @@ export default {
   },
   methods: {
     initHelpURL() {
-      const url = '/api/v1/settings/setting/?category=other'
-      this.$axios.get(url).then(resp => {
-        this.URLSite.HELP_DOCUMENT_URL = resp.HELP_DOCUMENT_URL
-        this.URLSite.HELP_SUPPORT_URL = resp.HELP_SUPPORT_URL
-      })
+      this.URLSite.HELP_DOCUMENT_URL = this.$store.getters.publicSettings.HELP_DOCUMENT_URL
+      this.URLSite.HELP_SUPPORT_URL = this.$store.getters.publicSettings.HELP_SUPPORT_URL
     },
     handleCommand(command) {
       switch (command) {

From 133dd02de7ce56e635f07a864476f5ce0b2c824f 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, 17 Nov 2021 19:05:53 +0800
Subject: [PATCH 18/20] =?UTF-8?q?feat:=20=E7=BB=88=E7=AB=AF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=95=B0=E5=AD=97=E6=98=BE=E7=A4=BA=E5=B0=8F=E6=95=B0?=
 =?UTF-8?q?=E4=BF=9D=E7=95=991=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sessions/TerminalList.vue | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/views/sessions/TerminalList.vue b/src/views/sessions/TerminalList.vue
index 0db3ec3c5..60518b7c2 100644
--- a/src/views/sessions/TerminalList.vue
+++ b/src/views/sessions/TerminalList.vue
@@ -17,6 +17,12 @@
 import { GenericListPage, GenericCreateUpdateForm } from '@/layout/components'
 import Dialog from '@/components/Dialog'
 import Select2 from '@/components/FormFields/Select2'
+
+const numTotFixed = (row) => {
+  if (row && row.stat) {
+    return row.stat?.memory_used.toFixed(1)
+  }
+}
 export default {
   components: {
     GenericListPage,
@@ -102,15 +108,18 @@ export default {
           },
           'stat.cpu_load': {
             label: this.$t('sessions.systemCpuLoad'),
-            width: '120px'
+            width: '120px',
+            formatter: numTotFixed
           },
           'stat.disk_used': {
             label: this.$t('sessions.systemDiskUsedPercent'),
-            width: '120px'
+            width: '120px',
+            formatter: numTotFixed
           },
           'stat.memory_used': {
             label: this.$t('sessions.systemMemoryUsedPercent'),
-            width: '120px'
+            width: '120px',
+            formatter: numTotFixed
           },
           status: {
             label: this.$t('xpack.LoadStatus'),

From 520abd783abb808b4a9a99bb39e0422278d9ebfd Mon Sep 17 00:00:00 2001
From: Michael Bai <baijiangjie@gmail.com>
Date: Wed, 17 Nov 2021 19:15:09 +0800
Subject: [PATCH 19/20] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=B5=84=E4=BA=A7=E6=9B=B4=E5=A4=9A=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=90=8E=EF=BC=8C=E7=82=B9=E5=87=BB=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E8=B7=B3=E8=BD=AC=E5=88=B0=E7=BC=96=E8=BE=91=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/Asset/AssetMoreInformationEdit.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/assets/Asset/AssetMoreInformationEdit.vue b/src/views/assets/Asset/AssetMoreInformationEdit.vue
index db1448831..b894b7cb8 100644
--- a/src/views/assets/Asset/AssetMoreInformationEdit.vue
+++ b/src/views/assets/Asset/AssetMoreInformationEdit.vue
@@ -97,7 +97,8 @@ export default {
       },
       url: '/api/v1/assets/assets/',
       updateSuccessNextRoute: { name: 'AssetList' },
-      createSuccessNextRoute: { name: 'AssetList' }
+      createSuccessNextRoute: { name: 'AssetList' },
+      objectDetailRoute: { name: 'AssetDetail' }
     }
   },
   methods: {

From 6fb9234583117d0861f18465a4796e394bcd0d9c Mon Sep 17 00:00:00 2001
From: Michael Bai <baijiangjie@gmail.com>
Date: Wed, 17 Nov 2021 19:00:07 +0800
Subject: [PATCH 20/20] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E5=88=97=E8=A1=A8=E8=B5=84=E4=BA=A7=E6=A0=91=E5=8F=B3?=
 =?UTF-8?q?=E5=87=BB=E8=8F=9C=E5=8D=95=E6=B7=BB=E5=8A=A0/=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E8=B5=84=E4=BA=A7=E5=88=B0=E8=8A=82=E7=82=B9=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4/=E5=8F=96=E6=B6=88=E5=90=8E=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/Asset/NodeAssetsUpdateDialog.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/assets/Asset/NodeAssetsUpdateDialog.vue b/src/views/assets/Asset/NodeAssetsUpdateDialog.vue
index ee52737c6..402734a14 100644
--- a/src/views/assets/Asset/NodeAssetsUpdateDialog.vue
+++ b/src/views/assets/Asset/NodeAssetsUpdateDialog.vue
@@ -128,7 +128,7 @@ export default {
       this.$axios.put(
         url, { assets: assetsSelected }
       ).then(res => {
-        this.dialogVisible = false
+        this.iVisible = false
         this.assetsSelected = []
         $('#tree-refresh').trigger('click')
         this.$message.success(this.$t('common.updateSuccessMsg'))
@@ -137,7 +137,7 @@ export default {
       })
     },
     assetTreeTableDialogHandleCancel() {
-      this.dialogVisible = false
+      this.iVisible = false
       this.assetsSelected = []
     }
   }