diff --git a/README.md b/README.md
index 65e13619f..1c2a60559 100644
--- a/README.md
+++ b/README.md
@@ -46,12 +46,4 @@ server {
## License & Copyright
-Copyright (c) 2014-2021 飞致云 FIT2CLOUD, All rights reserved.
-
-Licensed under The GNU General Public License version 2 (GPLv2) (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
-
-https://github.com/jumpserver/lina/blob/dev/LICENSE
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-
-
+Be consistent with [jumpserver](https://github.com/jumpserver/jumpserver)
diff --git a/src/components/AccountListTable/UpdateSecretInfo.vue b/src/components/AccountListTable/UpdateSecretInfo.vue
index b05ac51ab..6e52ed4a7 100644
--- a/src/components/AccountListTable/UpdateSecretInfo.vue
+++ b/src/components/AccountListTable/UpdateSecretInfo.vue
@@ -21,6 +21,9 @@
+
+
+
@@ -42,7 +45,8 @@ export default {
return {
authInfo: {
password: '',
- private_key: ''
+ private_key: '',
+ passphrase: ''
}
}
},
@@ -54,6 +58,7 @@ export default {
}
if (this.authInfo.private_key !== '') {
data.private_key = this.authInfo.private_key
+ data.passphrase = this.authInfo.passphrase
}
this.$axios.patch(
`/api/v1/assets/accounts/${this.account.id}/`,
diff --git a/src/components/AutoDataForm/utils.js b/src/components/AutoDataForm/utils.js
index b8b467487..b8dbfeb09 100644
--- a/src/components/AutoDataForm/utils.js
+++ b/src/components/AutoDataForm/utils.js
@@ -18,6 +18,9 @@ export class FormFieldGenerator {
})
}
break
+ case 'multiple choice':
+ field.el.choices = fieldRemoteMeta['choices']
+ break
case 'datetime':
type = 'date-picker'
field.el = {
diff --git a/src/components/DataActions/index.vue b/src/components/DataActions/index.vue
index c09fda5fa..1d88919d6 100644
--- a/src/components/DataActions/index.vue
+++ b/src/components/DataActions/index.vue
@@ -15,7 +15,7 @@
-