From 1b312b2ded7c5ef552bf4d01f21f40c8cf1d032c Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 10 Jun 2020 17:04:31 +0800
Subject: [PATCH 1/8] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9select2=20value?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/Select2/index.vue b/src/components/Select2/index.vue
index 3d161ccee..c5b19d62c 100644
--- a/src/components/Select2/index.vue
+++ b/src/components/Select2/index.vue
@@ -150,6 +150,9 @@ export default {
     iAjax(newValue, oldValue) {
       this.$log.debug('Select url changed: ', oldValue, ' => ', newValue)
       this.refresh()
+    },
+    value(iNew) {
+      this.iValue = iNew
     }
   },
   mounted() {

From df3050b6f6cd07e89543e8a4a841c629f1a7e040 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 10 Jun 2020 18:13:05 +0800
Subject: [PATCH 2/8] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9Upload=20key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UploadKey/index.vue | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/components/UploadKey/index.vue b/src/components/UploadKey/index.vue
index c75b8a250..4004a4e41 100644
--- a/src/components/UploadKey/index.vue
+++ b/src/components/UploadKey/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <input type="file" @change="Onchange">
+  <div class="upload-key">
+    <input type="file" @change="onChange">
     <div v-if="tip !== ''">{{ tip }}</div>
   </div>
 </template>
@@ -19,8 +19,10 @@ export default {
     }
   },
   methods: {
-    Onchange(e) {
-      // TODO 校验文件类型
+    onChange(e) {
+      if (e.target.files.length === 0) {
+        return
+      }
       const vm = this
       const reader = new FileReader()
       reader.onload = function() {
@@ -35,5 +37,8 @@ export default {
 </script>
 
 <style scoped>
-
+ .upload-key input {
+    opacity: 70;
+    cursor: pointer
+  }
 </style>

From ae39f2c61c3ae7295e37d0423fb5b209ed5004fe Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 10 Jun 2020 18:16:58 +0800
Subject: [PATCH 3/8] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AAcss?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UploadKey/index.vue | 4 ----
 src/styles/index.scss              | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/UploadKey/index.vue b/src/components/UploadKey/index.vue
index 4004a4e41..04803931d 100644
--- a/src/components/UploadKey/index.vue
+++ b/src/components/UploadKey/index.vue
@@ -37,8 +37,4 @@ export default {
 </script>
 
 <style scoped>
- .upload-key input {
-    opacity: 70;
-    cursor: pointer
-  }
 </style>
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 28cf15555..09eb2350d 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -143,3 +143,8 @@ h4 {
   color: #737373;
   font-size: 13px
 }
+
+input[type=file] {
+  font-size: 12px;
+  opacity: 80;
+}

From 2f7e817282c4185e37f713982af5d15bd8dda62b Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 10 Jun 2020 18:20:22 +0800
Subject: [PATCH 4/8] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=AF=BC=E5=87=BAdialog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ListTable/TableAction/ExportDialog.vue | 2 +-
 src/components/ListTable/TableAction/ImportDialog.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ListTable/TableAction/ExportDialog.vue b/src/components/ListTable/TableAction/ExportDialog.vue
index ef2da2efe..fa0262bc6 100644
--- a/src/components/ListTable/TableAction/ExportDialog.vue
+++ b/src/components/ListTable/TableAction/ExportDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="$t('common.Export')" :visible.sync="showExportDialog" @confirm="handleExportConfirm()" @cancel="handleExportCancel()">
+  <Dialog :title="$t('common.Export')" :visible.sync="showExportDialog" :destroy-on-close="true" @confirm="handleExportConfirm()" @cancel="handleExportCancel()">
     <el-form label-position="left" style="padding-left: 50px">
       <el-form-item :label="this.$t('common.imExport.ExportRange')" :label-width="'100px'">
         <el-radio v-model="exportOption" class="export-item" label="1">{{ this.$t('common.imExport.ExportAll') }}</el-radio>
diff --git a/src/components/ListTable/TableAction/ImportDialog.vue b/src/components/ListTable/TableAction/ImportDialog.vue
index 2b9cb6ed2..a52f023b4 100644
--- a/src/components/ListTable/TableAction/ImportDialog.vue
+++ b/src/components/ListTable/TableAction/ImportDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="$t('common.Import')" :visible.sync="showImportDialog" @confirm="handleImportConfirm" @cancel="handleImportCancel()">
+  <Dialog :title="$t('common.Import')" :visible.sync="showImportDialog" :destroy-on-close="true" @confirm="handleImportConfirm" @cancel="handleImportCancel()">
     <el-form label-position="left" style="padding-left: 50px">
       <el-form-item :label="$t('common.Import' )" :label-width="'100px'">
         <el-radio v-model="importOption" class="export-item" label="1">{{ this.$t('common.Create') }}</el-radio>

From ffbd8ce88def82e244519fda25d3e7b29dbaf679 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 10 Jun 2020 18:47:28 +0800
Subject: [PATCH 5/8] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9dialog=E5=92=8Csel?=
 =?UTF-8?q?ect2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AssetUserTable/index.vue               | 1 -
 src/components/ListTable/TableAction/ImportDialog.vue | 2 +-
 src/components/Select2/index.vue                      | 6 ++++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/AssetUserTable/index.vue b/src/components/AssetUserTable/index.vue
index cd7014b8a..c5e1362d2 100644
--- a/src/components/AssetUserTable/index.vue
+++ b/src/components/AssetUserTable/index.vue
@@ -245,7 +245,6 @@ export default {
     if (this.handleImport) {
       this.headerActions.handleImport = this.handleImport
     }
-    console.log(this.headerActions)
   },
   methods: {
     MFAConfirm() {
diff --git a/src/components/ListTable/TableAction/ImportDialog.vue b/src/components/ListTable/TableAction/ImportDialog.vue
index a52f023b4..b443fd7c9 100644
--- a/src/components/ListTable/TableAction/ImportDialog.vue
+++ b/src/components/ListTable/TableAction/ImportDialog.vue
@@ -19,8 +19,8 @@
         <el-upload
           ref="upload"
           action="string"
-          :http-request="handleImport"
           list-type="text/csv"
+          :http-request="handleImport"
           :limit="1"
           :auto-upload="false"
           :before-upload="beforeUpload"
diff --git a/src/components/Select2/index.vue b/src/components/Select2/index.vue
index c5b19d62c..fb5102148 100644
--- a/src/components/Select2/index.vue
+++ b/src/components/Select2/index.vue
@@ -162,8 +162,10 @@ export default {
       this.initialized = true
     }
     this.$nextTick(() => {
-      if (this.$refs.select.elFormItem) {
-        this.$refs.select.elFormItem.clearValidate()
+      // 因为elform存在问题，这个来清楚验证
+      const elFormItem = this.$refs.select.elFormItem
+      if (elFormItem && elFormItem.clearValidate) {
+        elFormItem.clearValidate()
       }
     })
   },

From 058400724d7a8c4338aea46ff4312f036a51942e Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Wed, 10 Jun 2020 19:01:02 +0800
Subject: [PATCH 6/8] =?UTF-8?q?[Fix]=20=E7=94=A8=E6=88=B7=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E5=A4=8D=E6=A0=B8=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/users/User/UserDetail/UserInfo.vue b/src/views/users/User/UserDetail/UserInfo.vue
index af0c605ee..4be982127 100644
--- a/src/views/users/User/UserDetail/UserInfo.vue
+++ b/src/views/users/User/UserDetail/UserInfo.vue
@@ -204,7 +204,7 @@ export default {
           const objectId = this.object.id
           const relationUrl = `/api/v1/authentication/login-confirm-settings/${objectId}/`
           const data = {
-            reviewers: [...this.object.login_confirm_settings, ...items.map(v => {
+            reviewers: [...this.object.login_confirm_settings || [], ...items.map(v => {
               return v.value
             })]
           }

From 8270767076210cda3826cdedc44e869a239a58d4 Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Wed, 10 Jun 2020 19:09:16 +0800
Subject: [PATCH 7/8] =?UTF-8?q?[Update]=20=20=E7=94=A8=E6=88=B7=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85/=E7=99=BB=E5=BD=95=E5=A4=8D=E6=A0=B8=20=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/users/User/UserDetail/UserInfo.vue b/src/views/users/User/UserDetail/UserInfo.vue
index 4be982127..9a799f256 100644
--- a/src/views/users/User/UserDetail/UserInfo.vue
+++ b/src/views/users/User/UserDetail/UserInfo.vue
@@ -6,7 +6,7 @@
     <el-col :md="10" :sm="24">
       <QuickActions :actions="quickActions" type="primary" />
       <RelationCard v-bind="relationConfig" type="info" style="margin-top: 15px" />
-      <RelationCard v-if="this.$store.getters.publicSettings.LOGIN_CONFIRM_ENABLE" v-bind="loginConfirmSetting" type="info" style="margin-top: 15px" />
+      <RelationCard v-if="this.$store.getters.publicSettings.LOGIN_CONFIRM_ENABLE" v-bind="loginConfirmSetting" type="danger" style="margin-top: 15px" />
     </el-col>
   </el-row>
 </template>

From e3e57141eeb2f2f19644d3ef9da2283ac169e2af Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Wed, 10 Jun 2020 20:25:37 +0800
Subject: [PATCH 8/8] =?UTF-8?q?[Update]=20=E5=8E=BB=E6=8E=89=20=E4=BC=9A?=
 =?UTF-8?q?=E8=AF=9D=E7=AE=A1=E7=90=86/=E5=8E=86=E5=8F=B2=E4=BC=9A?=
 =?UTF-8?q?=E8=AF=9D=20=E5=AF=BC=E5=87=BA=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sessions/SessionList/BaseList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/sessions/SessionList/BaseList.vue b/src/views/sessions/SessionList/BaseList.vue
index 44d01dadb..3b7c8b9b7 100644
--- a/src/views/sessions/SessionList/BaseList.vue
+++ b/src/views/sessions/SessionList/BaseList.vue
@@ -82,6 +82,7 @@ export default {
       headerActions: {
         hasLeftActions: false,
         hasImport: false,
+        hasExport: false,
         hasDatePicker: true,
         datePicker: {
           dateStart: dateTo,