mirror of
https://github.com/jumpserver/lina.git
synced 2026-02-12 12:08:11 +00:00
Compare commits
1 Commits
pr@dev@per
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
58b1f82816 |
@@ -1,53 +0,0 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-checkbox v-model="iValue">
|
||||
{{ $t('ReadAgreeTo') }}
|
||||
<a href="/core/auth/user-agreement/" target="_blank" style="color: #409eff">
|
||||
{{ $t('TermsOfService') }}
|
||||
</a>
|
||||
{{ $t('and') }}
|
||||
<a href="/core/auth/privacy-policy/" target="_blank" style="color: #409eff">
|
||||
{{ $t('PrivacyPolicy') }}
|
||||
</a>
|
||||
</el-checkbox>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
props: {
|
||||
value: {
|
||||
type: Boolean,
|
||||
default: () => false
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
iValue: false
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
iValue: {
|
||||
get() {
|
||||
return this.value
|
||||
},
|
||||
set(v) {
|
||||
this.$emit('update:value', v)
|
||||
}
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
iValue: {
|
||||
handler(v) {
|
||||
this.$emit('input', v)
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.iValue = this.value
|
||||
},
|
||||
methods: {}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped></style>
|
||||
@@ -303,7 +303,7 @@ export default {
|
||||
return
|
||||
}
|
||||
this.currentNode = treeNode
|
||||
this.currentNodeId = treeNode.meta.data.id
|
||||
this.currentNodeId = treeNode.meta?.data?.id || treeNode.id
|
||||
// 屏蔽收藏资产
|
||||
if (treeNode?.id === '-12') {
|
||||
return
|
||||
@@ -313,9 +313,7 @@ export default {
|
||||
this.showRMenu('root', event.clientX, event.clientY)
|
||||
} else if (treeNode && !treeNode.noR) {
|
||||
this.zTree.selectNode(treeNode)
|
||||
if (treeNode.meta?.data?.id) {
|
||||
this.currentNodeId = treeNode.meta.data.id
|
||||
}
|
||||
this.currentNodeId = treeNode.meta?.data?.id || treeNode.id
|
||||
this.showRMenu('node', event.clientX, event.clientY)
|
||||
}
|
||||
},
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<div>
|
||||
<NewNodeDialog v-if="createDialogVisible" :visible.sync="createDialogVisible" @confirm="doCreate" />
|
||||
<TreeTable ref="TreeTable" :tree-setting="treeSetting">
|
||||
<TreeTable ref="TreeTable" :tree-setting="treeSetting" :table-config="{}">
|
||||
<template v-if="!disableEdit" slot="rMenu">
|
||||
<li id="m_create_file" class="rmenu" tabindex="-1" @click="onCreate('file')">
|
||||
{{ $tc('NewFile') }}
|
||||
|
||||
@@ -6,14 +6,12 @@
|
||||
import { GenericCreateUpdatePage } from '@/layout/components'
|
||||
import { Required } from '@/components/Form/DataForm/rules'
|
||||
import { PhoneInput } from '@/components/Form/FormFields'
|
||||
import Agreement from '@/components/Form/FormFields/agreement.vue'
|
||||
import store from '@/store'
|
||||
|
||||
export default {
|
||||
name: 'Improvement',
|
||||
components: {
|
||||
GenericCreateUpdatePage,
|
||||
Agreement
|
||||
GenericCreateUpdatePage
|
||||
},
|
||||
props: {
|
||||
object: {
|
||||
@@ -28,7 +26,7 @@ export default {
|
||||
[this.$t('Account'), ['username', 'name', 'email']],
|
||||
[this.$t('Authentication'), ['mfa_level', 'public_key']],
|
||||
[this.$t('Other'), ['phone']],
|
||||
[this.$t('TermsOfService'), ['terms']]
|
||||
[this.$t('TermsAndConditions'), ['terms']]
|
||||
],
|
||||
fieldsMeta: {
|
||||
username: {
|
||||
@@ -55,14 +53,15 @@ export default {
|
||||
type: 'textarea',
|
||||
placeholder: 'ssh-rsa AAAA...'
|
||||
},
|
||||
hidden: formValue => {
|
||||
hidden: (formValue) => {
|
||||
return formValue.source !== 'local'
|
||||
},
|
||||
helpText: this.$t('SSHKeyOfProfileSSHUpdatePage')
|
||||
},
|
||||
terms: {
|
||||
label: '',
|
||||
component: Agreement,
|
||||
label: this.$t('IAgree'),
|
||||
type: 'checkbox',
|
||||
checked: false,
|
||||
rules: [Required],
|
||||
helpText: this.$t('MFAOfUserFirstLoginUserGuidePage')
|
||||
}
|
||||
@@ -94,14 +93,9 @@ export default {
|
||||
},
|
||||
methods: {
|
||||
disableMFAFieldIfNeed(user) {
|
||||
const adminUserIsNeed =
|
||||
(user?.is_superuser || user?.is_org_admin) &&
|
||||
const adminUserIsNeed = (user?.is_superuser || user?.is_org_admin) &&
|
||||
store.getters.publicSettings['SECURITY_MFA_AUTH'] === 2
|
||||
if (
|
||||
store.getters.publicSettings['SECURITY_MFA_AUTH'] === 1 ||
|
||||
adminUserIsNeed ||
|
||||
user?.mfa_level.value === 2
|
||||
) {
|
||||
if (store.getters.publicSettings['SECURITY_MFA_AUTH'] === 1 || adminUserIsNeed || user?.mfa_level.value === 2) {
|
||||
this.fieldsMeta['mfa_level'].disabled = true
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user