From 3230c37318fd15626c106d5cf20ca300f005a2e9 Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Wed, 16 Dec 2020 14:11:00 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=AE=BE=E7=BD=AE,=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GenericCreateUpdateForm/index.vue         | 42 +++++++++++--------
 .../components/Page/PasswordExpireTip.vue     |  4 ++
 .../PersonalInformationImprovement.vue        |  5 +++
 src/views/assets/Label/LabelCreateUpdate.vue  |  2 +-
 src/views/sessions/TerminalList.vue           |  8 ++--
 src/views/settings/Basic.vue                  |  1 +
 src/views/settings/Email.vue                  |  1 +
 src/views/settings/EmailContent.vue           |  1 +
 src/views/settings/Ldap.vue                   |  1 +
 src/views/settings/Security.vue               |  1 +
 src/views/settings/Terminal.vue               |  1 +
 .../xpack/GatheredUser/TaskCreateUpdate.vue   |  1 +
 src/views/xpack/InterfaceSettings.vue         |  2 +
 13 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/src/layout/components/GenericCreateUpdateForm/index.vue b/src/layout/components/GenericCreateUpdateForm/index.vue
index decdedd9a..d6410303f 100644
--- a/src/layout/components/GenericCreateUpdateForm/index.vue
+++ b/src/layout/components/GenericCreateUpdateForm/index.vue
@@ -147,23 +147,27 @@ export default {
         this.$emit('submitSuccess', res)
         const h = this.$createElement
         this.$log.debug('router is: ', detailRoute)
-        this.$message({
-          message: h('p', null, [
-            h('el-link', {
-              on: {
-                click: () => this.$router.push(detailRoute)
-              },
-              style: { 'vertical-align': 'top' }
-            }, msgLinkName),
-            h('span', { style: {
-              'padding-left': '5px',
-              'height': '18px',
-              'line-height': '18px',
-              'font-size': '13.5px',
-              'font-weight': ' 400' }}, msg)
-          ]),
-          type: 'success'
-        })
+        if (this.hasDetailInMsg) {
+          this.$message({
+            message: h('p', null, [
+              h('el-link', {
+                on: {
+                  click: () => this.$router.push(detailRoute)
+                },
+                style: { 'vertical-align': 'top' }
+              }, msgLinkName),
+              h('span', { style: {
+                'padding-left': '5px',
+                'height': '18px',
+                'line-height': '18px',
+                'font-size': '13.5px',
+                'font-weight': ' 400' }}, msg)
+            ]),
+            type: 'success'
+          })
+        } else {
+          this.$message.success(msg)
+        }
         if (!addContinue) {
           setTimeout(() => this.$router.push(route), 100)
         }
@@ -189,6 +193,10 @@ export default {
     hasSaveContinue: {
       type: Boolean,
       default: null
+    },
+    hasDetailInMsg: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
diff --git a/src/layout/components/Page/PasswordExpireTip.vue b/src/layout/components/Page/PasswordExpireTip.vue
index 376428a28..8b4623edb 100644
--- a/src/layout/components/Page/PasswordExpireTip.vue
+++ b/src/layout/components/Page/PasswordExpireTip.vue
@@ -24,6 +24,10 @@ export default {
       'currentUser'
     ]),
     isExpire() {
+      // 用户来源不是Local时不显示密码过期提示
+      if (this.currentUser.source !== 'local') {
+        return false
+      }
       const intervalTime = this.getIntervalDays(this.currentUser.date_password_last_updated)
       const securityPasswordExpirationTime = this.publicSettings.SECURITY_PASSWORD_EXPIRATION_TIME
       if (intervalTime >= securityPasswordExpirationTime) {
diff --git a/src/userviews/users/UserFirstLogin/PersonalInformationImprovement/PersonalInformationImprovement.vue b/src/userviews/users/UserFirstLogin/PersonalInformationImprovement/PersonalInformationImprovement.vue
index e3a036a25..2e484758a 100644
--- a/src/userviews/users/UserFirstLogin/PersonalInformationImprovement/PersonalInformationImprovement.vue
+++ b/src/userviews/users/UserFirstLogin/PersonalInformationImprovement/PersonalInformationImprovement.vue
@@ -8,6 +8,7 @@
       :update-success-next-route="updateSuccessNextRoute"
       :clean-form-value="cleanFormValue"
       :get-method="getMethod"
+      :on-perform-success="onPerformSuccess"
     />
   </IBox>
 </template>
@@ -86,6 +87,10 @@ export default {
   methods: {
     getMethod() {
       return 'put'
+    },
+    onPerformSuccess() {
+      this.$message.success(this.$t('common.updateSuccessMsg'))
+      setTimeout(() => this.$router.push({ name: 'UserGuide' }), 100)
     }
   }
 }
diff --git a/src/views/assets/Label/LabelCreateUpdate.vue b/src/views/assets/Label/LabelCreateUpdate.vue
index 32e88b750..41db1c363 100644
--- a/src/views/assets/Label/LabelCreateUpdate.vue
+++ b/src/views/assets/Label/LabelCreateUpdate.vue
@@ -1,5 +1,5 @@
 <template>
-  <GenericCreateUpdatePage :fields="fields" :initial="initial" :fields-meta="fieldsMeta" :url="url" />
+  <GenericCreateUpdatePage :fields="fields" :initial="initial" :fields-meta="fieldsMeta" :url="url" :has-detail-in-msg="false" />
 </template>
 
 <script>
diff --git a/src/views/sessions/TerminalList.vue b/src/views/sessions/TerminalList.vue
index 5021b117d..36b06f2ff 100644
--- a/src/views/sessions/TerminalList.vue
+++ b/src/views/sessions/TerminalList.vue
@@ -107,19 +107,19 @@ export default {
           },
           'state.session_active_count': {
             label: this.$t('sessions.sessionActiveCount'),
-            width: '160px'
+            width: '120px'
           },
           'state.system_cpu_load_1': {
             label: this.$t('sessions.systemCpuLoad'),
-            width: '160px'
+            width: '120px'
           },
           'state.system_disk_used_percent': {
             label: this.$t('sessions.systemDiskUsedPercent'),
-            width: '160px'
+            width: '120px'
           },
           'state.system_memory_used_percent': {
             label: this.$t('sessions.systemMemoryUsedPercent'),
-            width: '160px'
+            width: '120px'
           },
           'status_display': {
             label: this.$t('xpack.LoadStatus'),
diff --git a/src/views/settings/Basic.vue b/src/views/settings/Basic.vue
index 3d0e1d230..85207928f 100644
--- a/src/views/settings/Basic.vue
+++ b/src/views/settings/Basic.vue
@@ -10,6 +10,7 @@
       :object="object"
       :fields-meta="fieldsMeta"
       :get-method="getMethod"
+      :has-detail-in-msg="false"
     />
   </IBox>
 </template>
diff --git a/src/views/settings/Email.vue b/src/views/settings/Email.vue
index 94c0d85ac..1a5206f6a 100644
--- a/src/views/settings/Email.vue
+++ b/src/views/settings/Email.vue
@@ -10,6 +10,7 @@
       :fields-meta="fieldsMeta"
       :get-method="getMethod"
       :more-buttons="moreButtons"
+      :has-detail-in-msg="false"
     />
   </IBox>
 </template>
diff --git a/src/views/settings/EmailContent.vue b/src/views/settings/EmailContent.vue
index 855312206..5a29c5a49 100644
--- a/src/views/settings/EmailContent.vue
+++ b/src/views/settings/EmailContent.vue
@@ -9,6 +9,7 @@
       :object="object"
       :fields-meta="fieldsMeta"
       :get-method="getMethod"
+      :has-detail-in-msg="false"
     />
   </IBox>
 </template>
diff --git a/src/views/settings/Ldap.vue b/src/views/settings/Ldap.vue
index 4cbd86335..92525c4d8 100644
--- a/src/views/settings/Ldap.vue
+++ b/src/views/settings/Ldap.vue
@@ -11,6 +11,7 @@
         :fields-meta="fieldsMeta"
         :get-method="getMethod"
         :more-buttons="moreButtons"
+        :has-detail-in-msg="false"
       />
     </IBox>
     <Dialog
diff --git a/src/views/settings/Security.vue b/src/views/settings/Security.vue
index fc7d428a1..3c2a29b67 100644
--- a/src/views/settings/Security.vue
+++ b/src/views/settings/Security.vue
@@ -10,6 +10,7 @@
       :fields-meta="fieldsMeta"
       :get-method="getMethod"
       :on-perform-success="onPerformSuccess"
+      :has-detail-in-msg="false"
     />
   </IBox>
 </template>
diff --git a/src/views/settings/Terminal.vue b/src/views/settings/Terminal.vue
index 5e6d82c1a..83899a0b5 100644
--- a/src/views/settings/Terminal.vue
+++ b/src/views/settings/Terminal.vue
@@ -9,6 +9,7 @@
       :object="object"
       :fields-meta="fieldsMeta"
       :get-method="getMethod"
+      :has-detail-in-msg="false"
     />
   </IBox>
 </template>
diff --git a/src/views/xpack/GatheredUser/TaskCreateUpdate.vue b/src/views/xpack/GatheredUser/TaskCreateUpdate.vue
index 1dd1b59df..a058f8b8a 100644
--- a/src/views/xpack/GatheredUser/TaskCreateUpdate.vue
+++ b/src/views/xpack/GatheredUser/TaskCreateUpdate.vue
@@ -21,6 +21,7 @@ export default {
         is_periodic: true,
         interval: 24
       },
+      hasDetailInMsg: false,
       fieldsMeta: {
         crontab: {
           hidden: (formValue) => {
diff --git a/src/views/xpack/InterfaceSettings.vue b/src/views/xpack/InterfaceSettings.vue
index 9a4339d58..612fc8257 100644
--- a/src/views/xpack/InterfaceSettings.vue
+++ b/src/views/xpack/InterfaceSettings.vue
@@ -9,6 +9,7 @@
         :fields-meta="fieldsMeta"
         :on-submit="submitForm"
         :more-buttons="moreButtons"
+        :has-save-continue="hasSaveContinue"
       />
     </IBox>
   </Page>
@@ -32,6 +33,7 @@ export default {
       loading: true,
       files: {},
       interfaceInfo: {},
+      hasSaveContinue: false,
       successUrl: { name: 'Settings' },
       fields: [
         ['', ['login_title']],

From fb398ca3e4fade2ba95f4fbbdd0a8aacfd376198 Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Wed, 16 Dec 2020 16:43:36 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2errorMe?=
 =?UTF-8?q?ssage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AutoDataForm/index.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/AutoDataForm/index.vue b/src/components/AutoDataForm/index.vue
index 9a9cb7b6e..5e7c7e843 100644
--- a/src/components/AutoDataForm/index.vue
+++ b/src/components/AutoDataForm/index.vue
@@ -192,6 +192,9 @@ export default {
       if (!field) {
         return
       }
+      if (typeof error === 'object') {
+        error = JSON.stringify(error)
+      }
       if (field.attrs.error === error) {
         error += '.'
       }

From 2699d5e8ebdb049506e5d20e730eb44e9965fdd4 Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Wed, 16 Dec 2020 16:46:43 +0800
Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=E7=A6=81=E7=94=A8=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E6=96=87=E6=A1=A3=E7=B1=BB=E5=9E=8B=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/views/sessions/CommandStorageCreateUpdate.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/sessions/CommandStorageCreateUpdate.vue b/src/views/sessions/CommandStorageCreateUpdate.vue
index e5bb307a9..1e8234dd7 100644
--- a/src/views/sessions/CommandStorageCreateUpdate.vue
+++ b/src/views/sessions/CommandStorageCreateUpdate.vue
@@ -59,6 +59,9 @@ export default {
         doc_type: {
           label: this.$t('sessions.docType'),
           rules: [Required],
+          el: {
+            disabled: true
+          },
           helpText: this.$t('sessions.helpText.esDocType')
         }
       },
@@ -73,7 +76,7 @@ export default {
       return this.fieldsMap[this.currentType]
     },
     initial() {
-      return { type: this.currentType }
+      return { type: this.currentType, doc_type: 'command' }
     },
     currentType() {
       const params = this.$route.params

From f07a8578136750734cbc276defd59e2c7b7ce668 Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Wed, 16 Dec 2020 17:01:33 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E6=B7=BB=E5=8A=A0=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CommandFilterDetail/Detail.vue              | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/views/assets/CommandFilter/CommandFilterDetail/Detail.vue b/src/views/assets/CommandFilter/CommandFilterDetail/Detail.vue
index ff9603837..53f8ab644 100644
--- a/src/views/assets/CommandFilter/CommandFilterDetail/Detail.vue
+++ b/src/views/assets/CommandFilter/CommandFilterDetail/Detail.vue
@@ -32,14 +32,17 @@ export default {
         title: this.$t('perms.addSystemUserToThisPermission'),
         objectsAjax: {
           url: '/api/v1/assets/system-users/',
-          processResults: (data) => {
-            let results = data.results
-            results = results.filter((item) => item.protocol === 'ssh' || item.protocol === 'telnet').map((item) => {
-              return { label: item.name + '(' + item.username + ')', value: item.id }
-            })
-            const more = !!data.next
-            return { results: results, pagination: more, total: data.count }
+          transformOption: (item) => {
+            return { label: item.name + '(' + item.username + ')', value: item.id }
           }
+          // processResults: (data) => {
+          //   let results = data.results
+          //   results = results.filter((item) => item.protocol === 'ssh' || item.protocol === 'telnet').map((item) => {
+          //     return { label: item.name + '(' + item.username + ')', value: item.id }
+          //   })
+          //   const more = !!data.next
+          //   return { results: results, pagination: more, total: data.count }
+          // }
         },
         hasObjectsId: this.object.system_users,
         performAdd: (items) => {

From 62d520e6259afe9df51451a92aa843245d1ef133 Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Wed, 16 Dec 2020 17:41:52 +0800
Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AutoDataForm/index.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/AutoDataForm/index.vue b/src/components/AutoDataForm/index.vue
index 5e7c7e843..444a2c33a 100644
--- a/src/components/AutoDataForm/index.vue
+++ b/src/components/AutoDataForm/index.vue
@@ -193,7 +193,11 @@ export default {
         return
       }
       if (typeof error === 'object') {
-        error = JSON.stringify(error)
+        const str = error
+        error = ''
+        Object.keys(str).forEach(key => {
+          error += `${str[key][0]} | `
+        })
       }
       if (field.attrs.error === error) {
         error += '.'

From 09ef15cff0572e03d046f58d34254c3528ecf2e3 Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Wed, 16 Dec 2020 17:50:40 +0800
Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AutoDataForm/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AutoDataForm/index.vue b/src/components/AutoDataForm/index.vue
index 444a2c33a..5448b7577 100644
--- a/src/components/AutoDataForm/index.vue
+++ b/src/components/AutoDataForm/index.vue
@@ -196,7 +196,7 @@ export default {
         const str = error
         error = ''
         Object.keys(str).forEach(key => {
-          error += `${str[key][0]} | `
+          error += `${parseInt(key) + 1}.${str[key][0]}  `
         })
       }
       if (field.attrs.error === error) {