From 4516d83ce4e7ec9c64c7485fdca6d9ea42bcb67e 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, 20 Jan 2022 14:56:14 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A1=86=E4=B8=8D=E8=83=BD=E6=90=9C=E7=B4=A2false=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=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/components/TagSearch/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/TagSearch/index.vue b/src/components/TagSearch/index.vue
index 01b346110..f10f619d3 100644
--- a/src/components/TagSearch/index.vue
+++ b/src/components/TagSearch/index.vue
@@ -206,7 +206,7 @@ export default {
       return true
     },
     handleConfirm() {
-      if (!this.filterValue) return
+      if (this.filterValue === '') return
       if (this.filterValue && !this.filterKey) {
         this.filterKey = 'search'
       }

From 7b705dfc7546a851de92da0c13da402dc0ba57cf 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, 21 Jan 2022 18:32:15 +0800
Subject: [PATCH 2/6] =?UTF-8?q?perf:=20=E8=A1=A8=E5=8D=95=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=BB=9A=E5=8A=A8=E5=88=B0=E6=A0=A1=E9=AA=8C=E5=87=BA?=
 =?UTF-8?q?=E9=94=99=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DataForm/index.vue |  2 ++
 src/utils/index.js                | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/src/components/DataForm/index.vue b/src/components/DataForm/index.vue
index 512db93d4..f02e9c28c 100644
--- a/src/components/DataForm/index.vue
+++ b/src/components/DataForm/index.vue
@@ -23,6 +23,7 @@
 
 <script>
 import ElFormRender from './components/el-form-renderer'
+import { scrollToError } from '@/utils'
 export default {
   components: {
     ElFormRender
@@ -76,6 +77,7 @@ export default {
           this.$emit('submit', form.getFormValue(), form, addContinue)
         } else {
           this.$emit('invalid', valid)
+          scrollToError(form.$el)
           return false
         }
       })
diff --git a/src/utils/index.js b/src/utils/index.js
index ad4b79983..d6746c31a 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -110,3 +110,24 @@ export function param2Obj(url) {
 export function getDateTimeStamp(dateStr) {
   return Date.parse(dateStr.replace(/-/gi, '/'))
 }
+
+/**
+  * 自动滚动到错误位置
+  * @param {*} el 目标元素
+  * @param {Object} 滚动参数 scrollOption={
+  *   behavior: 'smooth',
+  *   block: 'center'
+  * }
+*/
+export const scrollToError = (
+  el,
+  scrollOption = {
+    behavior: 'smooth',
+    block: 'center'
+  }
+) => {
+  setTimeout(() => {
+    const isError = el.getElementsByClassName('is-error')
+    isError[0].scrollIntoView(scrollOption)
+  }, 0)
+}

From da14abc83b2c4d3d8c003ef4a1378e00071d5096 Mon Sep 17 00:00:00 2001
From: Michael Bai <baijiangjie@gmail.com>
Date: Tue, 8 Feb 2022 12:09:06 +0800
Subject: [PATCH 3/6] =?UTF-8?q?feat:=20=E5=91=BD=E4=BB=A4=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E8=A7=84=E5=88=99=E5=A2=9E=E5=8A=A0=E5=BF=BD=E7=95=A5?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/CommandFilter/CommandFilterDetail/Rules.vue    | 8 +++++++-
 .../CommandFilterDetail/RulesCreateUpdate.vue             | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/views/assets/CommandFilter/CommandFilterDetail/Rules.vue b/src/views/assets/CommandFilter/CommandFilterDetail/Rules.vue
index 2ae44dc49..25847a5de 100644
--- a/src/views/assets/CommandFilter/CommandFilterDetail/Rules.vue
+++ b/src/views/assets/CommandFilter/CommandFilterDetail/Rules.vue
@@ -20,11 +20,17 @@ export default {
     return {
       tableConfig: {
         url: `/api/v1/assets/cmd-filters/${this.object.id}/rules/`,
-        columns: ['type', 'content', 'action', 'priority', 'pattern', 'comment', 'actions'],
+        columns: ['type', 'content', 'ignore_case', 'action', 'priority', 'pattern', 'comment', 'actions'],
         columnsMeta: {
           type: {
             width: '100px'
           },
+          ignore_case: {
+            width: '100px',
+            formatterArgs: {
+              showFalse: false
+            }
+          },
           priority: {
             width: '70px'
           },
diff --git a/src/views/assets/CommandFilter/CommandFilterDetail/RulesCreateUpdate.vue b/src/views/assets/CommandFilter/CommandFilterDetail/RulesCreateUpdate.vue
index 6f2aa1003..1a8bc13fb 100644
--- a/src/views/assets/CommandFilter/CommandFilterDetail/RulesCreateUpdate.vue
+++ b/src/views/assets/CommandFilter/CommandFilterDetail/RulesCreateUpdate.vue
@@ -28,7 +28,7 @@ export default {
         action: 0
       },
       fields: [
-        [this.$t('common.Basic'), ['filter', 'type', 'content', 'priority', 'action', 'reviewers', 'comment']]
+        [this.$t('common.Basic'), ['filter', 'type', 'content', 'ignore_case', 'priority', 'action', 'reviewers', 'comment']]
       ],
       fieldsMeta: {
         filter: {

From 1d9eddb11f4722f9098a04881cf3c09b64a49eae Mon Sep 17 00:00:00 2001
From: Michael Bai <baijiangjie@gmail.com>
Date: Tue, 8 Feb 2022 17:33:55 +0800
Subject: [PATCH 4/6] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=BE=E7=BD=AE(=E5=AE=89=E5=85=A8)=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E7=AC=AC=E4=B8=89=E6=96=B9=E8=AE=A4=E8=AF=81=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=98=AF=E5=90=A6=E8=BF=9B=E8=A1=8CMFA=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/settings/Auth/index.vue     | 2 +-
 src/views/settings/Security/index.vue | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/settings/Auth/index.vue b/src/views/settings/Auth/index.vue
index fafb0c6a1..f82028bb2 100644
--- a/src/views/settings/Auth/index.vue
+++ b/src/views/settings/Auth/index.vue
@@ -84,7 +84,7 @@ export default {
         // 这个页面不去提交auth这些
         const removeFields = [
           'AUTH_CAS', 'AUTH_OPENID', 'AUTH_WECOM', 'AUTH_DINGTALK',
-          'AUTH_FEISHU', 'AUTH_RADIUS', 'AUTH_SSO'
+          'AUTH_FEISHU', 'AUTH_RADIUS', 'AUTH_SSO', 'AUTH_SAML2'
         ]
         for (const i of removeFields) {
           delete data[i]
diff --git a/src/views/settings/Security/index.vue b/src/views/settings/Security/index.vue
index fe2153116..78b9defb5 100644
--- a/src/views/settings/Security/index.vue
+++ b/src/views/settings/Security/index.vue
@@ -41,6 +41,7 @@ export default {
           [
             'SECURITY_MFA_AUTH',
             'SECURITY_MFA_IN_LOGIN_PAGE',
+            'SECURITY_MFA_AUTH_ENABLED_TO_THIRD_PARTY',
             'SECURITY_LOGIN_CHALLENGE_ENABLED',
             'SECURITY_LOGIN_CAPTCHA_ENABLED',
             'SECURITY_PASSWORD_EXPIRATION_TIME',

From f83739b496f8e3666b9aa1ac018942f4b49c8df0 Mon Sep 17 00:00:00 2001
From: Michael Bai <baijiangjie@gmail.com>
Date: Wed, 9 Feb 2022 10:33:11 +0800
Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E8=AE=A4=E8=AF=81=E7=94=A8=E6=88=B7=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?MFA=E8=AE=A4=E8=AF=81=E9=85=8D=E7=BD=AE=E9=A1=B9=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/settings/Security/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/settings/Security/index.vue b/src/views/settings/Security/index.vue
index 78b9defb5..b0c29b3f7 100644
--- a/src/views/settings/Security/index.vue
+++ b/src/views/settings/Security/index.vue
@@ -41,7 +41,7 @@ export default {
           [
             'SECURITY_MFA_AUTH',
             'SECURITY_MFA_IN_LOGIN_PAGE',
-            'SECURITY_MFA_AUTH_ENABLED_TO_THIRD_PARTY',
+            'SECURITY_MFA_AUTH_ENABLED_FOR_THIRD_PARTY',
             'SECURITY_LOGIN_CHALLENGE_ENABLED',
             'SECURITY_LOGIN_CAPTCHA_ENABLED',
             'SECURITY_PASSWORD_EXPIRATION_TIME',

From 31c86fb281b07303c2a74f19bf8ab0ad0f73129b 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, 9 Feb 2022 14:50:31 +0800
Subject: [PATCH 6/6] =?UTF-8?q?feat:=20table=E6=90=9C=E7=B4=A2=E6=A1=86?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9A=E7=BA=A7=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TagSearch/index.vue | 44 +++++++++++++++++++++++++-----
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/components/TagSearch/index.vue b/src/components/TagSearch/index.vue
index f10f619d3..f1b67a8ac 100644
--- a/src/components/TagSearch/index.vue
+++ b/src/components/TagSearch/index.vue
@@ -86,7 +86,11 @@ export default {
         if (key === '') {
           key = 'search'
         }
-        data[key] = value
+        if (key.startsWith('search')) {
+          data['search'] = (data.search ? data.search + ',' : '') + value
+        } else {
+          data[key] = value
+        }
       }
       return data
     },
@@ -109,6 +113,19 @@ export default {
       handler(val) {
         if (val && val.length > 0) {
           const routeFilter = this.checkInTableColumns()
+          const routerSearch = routeFilter.search || {}
+          const routerSearchArrs = routerSearch?.value?.split(',') || []
+          const routerSearchArrsLength = routerSearchArrs.length || 0
+          if (routerSearch && routerSearchArrsLength > 0) {
+            for (let i = 0; i < routerSearchArrsLength; i++) {
+              const cur = routerSearchArrs[i]
+              routeFilter[`search_${cur}`] = {
+                ...routerSearch,
+                value: cur
+              }
+            }
+            delete routeFilter.search
+          }
           const asFilterTags = _.cloneDeep(this.filterTags)
           this.filterTags = {
             ...asFilterTags,
@@ -130,8 +147,7 @@ export default {
       if (Object.keys(this.filterMaps).length > 0) {
         return this.$emit('tagSearch', this.filterMaps)
       }
-    }
-    , 400)
+    }, 400)
     // this.$nextTick(() => this.$emit('tagSearch', this.filterMaps))
   },
   methods: {
@@ -200,23 +216,29 @@ export default {
       this.$nextTick(() => this.$refs.Cascade.handleClear())
     },
     handleTagClose(evt) {
-      this.checkUrlFilds(evt)
       this.$delete(this.filterTags, evt)
+      this.checkUrlFilds(evt)
       this.$emit('tagSearch', this.filterMaps)
       return true
     },
     handleConfirm() {
       if (this.filterValue === '') return
       if (this.filterValue && !this.filterKey) {
-        this.filterKey = 'search'
+        this.filterKey = Object.prototype.hasOwnProperty.call(this.filterTags, 'search')
+          ? 'search' + '_' + this.filterValue : 'search'
       }
       const tag = { key: this.filterKey, label: this.keyLabel, value: this.filterValue, valueLabel: this.valueLabel }
       this.$set(this.filterTags, this.filterKey, tag)
       this.$emit('tagSearch', this.filterMaps)
 
+      // 修改查询参数时改变url中保存的参数
       if (this.getUrlQuery) {
         let newQuery = _.cloneDeep(this.$route.query)
-        newQuery = { ...newQuery, [this.filterKey]: encodeURI(this.filterValue) }
+        if (this.filterKey.startsWith('search')) {
+          newQuery = { ...newQuery, search: encodeURI(this.filterMaps.search) }
+        } else {
+          newQuery = { ...newQuery, [this.filterKey]: encodeURI(this.filterValue) }
+        }
         this.$router.replace({ query: newQuery })
       }
 
@@ -249,7 +271,15 @@ export default {
     },
     // 删除查询条件时改变url
     checkUrlFilds(evt) {
-      const newQuery = _.omit(this.$route.query, evt)
+      let newQuery = _.omit(this.$route.query, evt)
+      if (this.getUrlQuery && evt.startsWith('search')) {
+        if (newQuery.search) delete newQuery.search
+        const filterMapsSearch = this.filterMaps.search || ''
+        newQuery = {
+          ...newQuery,
+          ...(filterMapsSearch && { search: encodeURI(filterMapsSearch) })
+        }
+      }
       this.$router.replace({ query: newQuery })
     }
   }