mirror of
https://github.com/jumpserver/lina.git
synced 2026-02-21 14:13:42 +00:00
Compare commits
2 Commits
pr@dev@per
...
dependabot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c068c6a5c8 | ||
|
|
58b1f82816 |
@@ -51,7 +51,7 @@
|
||||
"less": "^3.10.3",
|
||||
"less-loader": "^5.0.0",
|
||||
"lodash": "^4.17.21",
|
||||
"markdown-it": "^13.0.2",
|
||||
"markdown-it": "^14.1.1",
|
||||
"markdown-it-link-attributes": "^4.0.1",
|
||||
"moment": "^2.29.4",
|
||||
"moment-parseformat": "^4.0.0",
|
||||
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
49
yarn.lock
49
yarn.lock
@@ -5328,11 +5328,16 @@ entities@^2.0.0:
|
||||
resolved "https://registry.npmmirror.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
|
||||
integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
|
||||
|
||||
entities@^3.0.1, entities@~3.0.1:
|
||||
entities@^3.0.1:
|
||||
version "3.0.1"
|
||||
resolved "https://registry.npmmirror.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4"
|
||||
integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==
|
||||
|
||||
entities@^4.4.0:
|
||||
version "4.5.0"
|
||||
resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
|
||||
integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
|
||||
|
||||
entities@~2.1.0:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.npmmirror.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
|
||||
@@ -8988,12 +8993,12 @@ linkify-it@^3.0.1:
|
||||
dependencies:
|
||||
uc.micro "^1.0.1"
|
||||
|
||||
linkify-it@^4.0.1:
|
||||
version "4.0.1"
|
||||
resolved "https://registry.npmmirror.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec"
|
||||
integrity sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==
|
||||
linkify-it@^5.0.0:
|
||||
version "5.0.0"
|
||||
resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-5.0.0.tgz#9ef238bfa6dc70bd8e7f9572b52d369af569b421"
|
||||
integrity sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==
|
||||
dependencies:
|
||||
uc.micro "^1.0.1"
|
||||
uc.micro "^2.0.0"
|
||||
|
||||
linkify-it@~1.2.2:
|
||||
version "1.2.4"
|
||||
@@ -9431,16 +9436,17 @@ markdown-it@^12.0.6:
|
||||
mdurl "^1.0.1"
|
||||
uc.micro "^1.0.5"
|
||||
|
||||
markdown-it@^13.0.2:
|
||||
version "13.0.2"
|
||||
resolved "https://registry.npmmirror.com/markdown-it/-/markdown-it-13.0.2.tgz#1bc22e23379a6952e5d56217fbed881e0c94d536"
|
||||
integrity sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==
|
||||
markdown-it@^14.1.1:
|
||||
version "14.1.1"
|
||||
resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-14.1.1.tgz#856f90b66fc39ae70affd25c1b18b581d7deee1f"
|
||||
integrity sha512-BuU2qnTti9YKgK5N+IeMubp14ZUKUUw7yeJbkjtosvHiP0AZ5c8IAgEMk79D0eC8F23r4Ac/q8cAIFdm2FtyoA==
|
||||
dependencies:
|
||||
argparse "^2.0.1"
|
||||
entities "~3.0.1"
|
||||
linkify-it "^4.0.1"
|
||||
mdurl "^1.0.1"
|
||||
uc.micro "^1.0.5"
|
||||
entities "^4.4.0"
|
||||
linkify-it "^5.0.0"
|
||||
mdurl "^2.0.0"
|
||||
punycode.js "^2.3.1"
|
||||
uc.micro "^2.1.0"
|
||||
|
||||
markdown-it@^6.0.1:
|
||||
version "6.1.1"
|
||||
@@ -9508,6 +9514,11 @@ mdurl@^1.0.1, mdurl@~1.0.1:
|
||||
resolved "https://registry.npmmirror.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
|
||||
integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==
|
||||
|
||||
mdurl@^2.0.0:
|
||||
version "2.0.0"
|
||||
resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-2.0.0.tgz#80676ec0433025dd3e17ee983d0fe8de5a2237e0"
|
||||
integrity sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==
|
||||
|
||||
media-typer@0.3.0:
|
||||
version "0.3.0"
|
||||
resolved "https://registry.npmmirror.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
|
||||
@@ -11750,6 +11761,11 @@ pumpify@^1.3.3:
|
||||
inherits "^2.0.3"
|
||||
pump "^2.0.0"
|
||||
|
||||
punycode.js@^2.3.1:
|
||||
version "2.3.1"
|
||||
resolved "https://registry.yarnpkg.com/punycode.js/-/punycode.js-2.3.1.tgz#6b53e56ad75588234e79f4affa90972c7dd8cdb7"
|
||||
integrity sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==
|
||||
|
||||
punycode@^1.2.4, punycode@^1.4.1:
|
||||
version "1.4.1"
|
||||
resolved "https://registry.npmmirror.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
|
||||
@@ -13951,6 +13967,11 @@ uc.micro@^1.0.1, uc.micro@^1.0.5:
|
||||
resolved "https://registry.npmmirror.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
|
||||
integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
|
||||
|
||||
uc.micro@^2.0.0, uc.micro@^2.1.0:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-2.1.0.tgz#f8d3f7d0ec4c3dea35a7e3c8efa4cb8b45c9e7ee"
|
||||
integrity sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==
|
||||
|
||||
uglify-js@3.4.x:
|
||||
version "3.4.10"
|
||||
resolved "https://registry.npmmirror.com/uglify-js/-/uglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"
|
||||
|
||||
Reference in New Issue
Block a user