github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2026-01-24 22:04:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5314 from jumpserver/dev

Browse Source 
v4.10.15
This commit is contained in:
Jiangjie Bai
2026-01-22 16:34:12 +08:00
committed by GitHub
parent 0fbdb3d94e 1c527e9d77
commit a1d76b8ff0
16 changed files with 193 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/Apps/AssetTreeTable/index.vue
View File

@@ -20,7 +20,7 @@
<script>
import TreeTable from '../../Table/TreeTable/index.vue'
import { setRouterQuery, setUrlParam } from '@/utils/common/index'
import { getShowCurrentAssetValue, setRouterQuery, setUrlParam } from '@/utils/common/index'
import $ from '@/utils/jquery-vendor'
export default {
@@ -160,7 +160,7 @@ export default {
return str
},
decorateRMenu() {
const show_current_asset = this.$cookie.get('show_current_asset') || '0'
const show_current_asset = getShowCurrentAssetValue(this.$cookie)
if (show_current_asset === '1') {
$('#m_show_asset_all_children_node').css('color', '#606266')
$('#m_show_asset_only_current_node').css('color', 'green')
@@ -172,6 +172,7 @@ export default {
getAssetsUrl(treeNode) {
let url = this.treeSetting?.url || this.url
const showCurrentAsset = getShowCurrentAssetValue(this.$cookie)
const setParam = (param, value, delay) => {
setTimeout(() => {
@@ -183,10 +184,12 @@ export default {
const nodeId = treeNode.meta.data.id
setParam('node_id', nodeId)
setParam('asset_id', '')
setParam('show_current_asset', showCurrentAsset)
} else if (treeNode.meta.type === 'asset') {
const assetId = treeNode.meta.data?.id || treeNode.id
setParam('node_id', '')
setParam('asset_id', assetId)
setParam('show_current_asset', showCurrentAsset)
} else if (treeNode.meta.type === 'category') {
setParam('category', treeNode.meta.category)
} else if (treeNode.meta.type === 'type') {

36
src/components/Table/InfoCardTable/Panel.vue
View File

@@ -4,15 +4,11 @@
<div class="panel-title">
<el-avatar :src="imageUrl" shape="square" />
<div class="title-display">
<span class="name">{{ object.name }}</span>
<p class="name" :title="object.name">{{ object.name }}</p>
<span class="comment">{{ object.provider.label }}</span>
</div>
</div>
<div
v-if="iActions.length !== 0"
class="panel-actions"
@click="handleClick($event)"
>
<div v-if="iActions.length !== 0" class="panel-actions" @click="handleClick($event)">
<el-dropdown>
<el-button size="mini">
<i class="el-icon-more el-icon--right" />
@@ -64,21 +60,19 @@ export default {
},
getImage: {
type: Function,
default: (obj) => ''
default: obj => ''
},
getInfos: {
type: Function,
default: (obj) => []
default: obj => []
},
handleUpdate: {
type: Function,
default: () => {
}
default: () => {}
},
onView: {
type: Function,
default: () => {
}
default: () => {}
}
},
data() {
@@ -152,13 +146,13 @@ export default {
</script>
<style lang="scss" scoped>
div.info-panel {
display: flex;
flex-direction: column;
padding: 10px;
gap: 10px;
gap: unset;
cursor: pointer;
height: initial !important;
.panel-header {
padding: 10px 20px;
@@ -175,12 +169,23 @@ div.info-panel {
.title-display {
display: flex;
flex-basis: 225px;
flex-direction: column;
text-align: left;
justify-content: center;
align-items: start;
max-width: 225px;
min-width: 0;
overflow-x: hidden;
.name {
font-size: 1.1em;
color: #555555;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
width: 100%;
margin: unset;
text-align: start;
}
.comment {
@@ -193,6 +198,7 @@ div.info-panel {
::v-deep {
.el-avatar {
background: #fff;
flex-shrink: 0;
}
}
}

2
src/components/Table/ListTable/TableAction/RightSide.vue
View File

@@ -111,7 +111,7 @@ export default {
{
name: 'actionFilter',
icon: 'filter',
tip: this.$t('Filter'),
tip: this.$t('QuickFilter'),
has: this.hasQuickFilter,
callback: this.handleFilterClick.bind(this)
},

3
src/components/Tree/AutoDataZTree/index.vue
View File

@@ -26,6 +26,7 @@
import DataZTree from '../DataZTree/index.vue'
import Icon from '@/components/Widgets/Icon'
import $ from '@/utils/jquery-vendor'
import { getShowCurrentAssetValue } from '@/utils/common/index'
import { mapGetters } from 'vuex'
export default {
@@ -199,7 +200,7 @@ export default {
},
// Request URL: http://localhost/api/v1/assets/assets/?node_id=ID&show_current_asset=null&draw=2&limit=15&offset=0&_=1587022917769
onSelected: function(event, treeNode) {
const show_current_asset = this.$cookie.get('show_current_asset') || '0'
const show_current_asset = getShowCurrentAssetValue(this.$cookie)
if (!this.setting.url) {
return
}

27
src/utils/common/index.js
View File

@@ -150,10 +150,11 @@ export function getErrorResponseMsg(error) {
} else if (typeof data === 'string') {
return data
} else if (_.isPlainObject(data)) {
return Object.values(data)
const msg = Object.values(data)
.map(item => getErrorResponseMsg(item))
.filter(i => i)
.join('; ')
// 错误信息不要重复提示
return [...new Set(msg)].join('; ')
} else {
msg = error.toString()
}
@@ -423,6 +424,28 @@ export function getDrawerWidth() {
return '90%'
}
export function getShowCurrentAssetValue(cookie, defaultValue = '0') {
const stored = typeof window !== 'undefined'
? window.localStorage.getItem('show_current_asset')
: null
if (stored === '0' || stored === '1') {
return stored
}
if (cookie && typeof cookie.get === 'function') {
return cookie.get('show_current_asset') || defaultValue
}
return defaultValue
}
export function setShowCurrentAssetValue(cookie, value) {
if (typeof window !== 'undefined') {
window.localStorage.setItem('show_current_asset', String(value))
}
if (cookie && typeof cookie.set === 'function') {
cookie.set('show_current_asset', value, 1)
}
}
export class ObjectLocalStorage {
constructor(key, attr) {
this.key = key

2
src/utils/secure.js
View File

@@ -92,7 +92,7 @@ export function encryptPassword(password) {
rsaPublicKeyText = rsaPublicKeyText.replaceAll('"', '')
const rsaPublicKey = atob(rsaPublicKeyText)
const keyCipher = rsaEncrypt(aesKey, rsaPublicKey)
const passwordCipher = aesEncrypt(password, aesKey)
const passwordCipher = aesEncrypt(String(password), aesKey)
return `${keyCipher}:${passwordCipher}`
}

5
src/views/accounts/AccountChangeSecret/ExecutionDetail/AccountChangeSecretExecutionInfo.vue
View File

@@ -38,11 +38,6 @@ export default {
value: this.object.snapshot.node_amount
},
'trigger_display', 'date_start', 'date_finished',
{
key: this.$t('MailRecipient'),
value: this.object.recipients ? this.object.recipients.map(
i => `${i[0]}` + `${i[1] ? ': ' + this.$t('ContainAttachment') : ''}`).join(', ') : ''
},
{
key: this.$t('Comment'),
value: this.object.snapshot.common

35
src/views/accounts/AccountTemplate/Detail/Account.vue
View File

@@ -5,7 +5,12 @@
</el-alert>
<TwoCol>
<template>
<GenericListTable ref="listTable" :header-actions="headerActions" :table-config="tableConfig" />
<GenericListTable
ref="listTable"
:detail-drawer="detailDrawer"
:header-actions="headerActions"
:table-config="tableConfig"
/>
</template>
<template #right>
<QuickActions :actions="quickActions" type="primary" />
@@ -21,12 +26,13 @@
</template>
<script>
import GenericListTable from '@/layout/components/GenericListTable'
import { QuickActions } from '@/components'
import { ActionsFormatter, DetailFormatter } from '@/components/Table/TableFormatters'
import ViewSecret from '@/components/Apps/AccountListTable/ViewSecret'
import { openTaskPage } from '@/utils/jms/index'
import { GenericListTable } from '@/layout/components'
import { ActionsFormatter, DetailFormatter } from '@/components/Table/TableFormatters'
import TwoCol from '@/layout/components/Page/TwoColPage.vue'
import ViewSecret from '@/components/Apps/AccountListTable/ViewSecret'
export default {
name: 'AccountTemplateChangeSecret',
@@ -46,6 +52,7 @@ export default {
data() {
const vm = this
return {
detailDrawer: () => import('@/views/accounts/AccountDiscover/TaskDetail/index.vue'),
visible: false,
secretUrl: '',
showViewSecretDialog: false,
@@ -58,20 +65,20 @@ export default {
},
callbacks: Object.freeze({
click: () => {
this.$axios.patch(
`/api/v1/accounts/account-templates/${this.object.id}/sync-related-accounts/`
).then(res => {
openTaskPage(res['task'])
})
this.$axios
.patch(
`/api/v1/accounts/account-templates/${this.object.id}/sync-related-accounts/`
)
.then(res => {
openTaskPage(res['task'])
})
}
})
}
],
tableConfig: {
url: `/api/v1/accounts/accounts/?source_id=${this.object.id}`,
columns: [
'name', 'asset', 'secret_type', 'is_active', 'date_created'
],
columns: ['name', 'asset', 'secret_type', 'is_active', 'date_created'],
columnsMeta: {
name: {
formatter: DetailFormatter,
@@ -79,8 +86,9 @@ export default {
drawer: true,
can: vm.$hasPerm('accounts.view_account'),
getRoute: ({ row }) => {
this.detailDrawer = () => import('@/views/accounts/Account/AccountDetail/index.vue')
return {
name: 'AssetAccountDetail',
name: 'AccountDetail',
params: { id: row.id }
}
}
@@ -94,6 +102,7 @@ export default {
can: vm.$hasPerm('assets.view_asset'),
getTitle: ({ row }) => row.asset.name,
getRoute: ({ row }) => {
this.detailDrawer = () => import('@/views/assets/Asset/AssetDetail')
return {
name: 'AssetDetail',
params: { id: row.asset.id }

11
src/views/assets/Asset/AssetList/AllList.vue
View File

@@ -28,7 +28,12 @@ import { mapGetters } from 'vuex'
import TreeMenu from './components/TreeMenu'
import BaseList from './components/BaseList'
import $ from '@/utils/jquery-vendor'
import { setRouterQuery, setUrlParam } from '@/utils/common/index'
import {
getShowCurrentAssetValue,
setShowCurrentAssetValue,
setRouterQuery,
setUrlParam
} from '@/utils/common/index'
export default {
components: {
@@ -73,7 +78,7 @@ export default {
},
methods: {
decorateRMenu() {
const show_current_asset = this.$cookie.get('show_current_asset') || '0'
const show_current_asset = getShowCurrentAssetValue(this.$cookie)
if (show_current_asset === '1') {
$('#m_show_asset_all_children_node').css('color', '#606266')
$('#m_show_asset_only_current_node').css('color', 'green')
@@ -83,7 +88,7 @@ export default {
}
},
showAll({ node, showCurrentAsset }) {
this.$cookie.set('show_current_asset', showCurrentAsset, 1)
setShowCurrentAssetValue(this.$cookie, showCurrentAsset)
this.decorateRMenu()
const url = `${this.treeSetting.url}?node_id=${node.meta.data.id}&show_current_asset=${showCurrentAsset}`
this.$refs.AssetTreeTable.$refs.TreeList.handleUrlChange(url)

1
src/views/profile/index.vue
View File

@@ -96,7 +96,6 @@ export default {
{
title: this.$t('FacialFeatures'),
has: this.$store.getters.publicSettings.FACE_RECOGNITION_ENABLED &&
this.$store.getters.publicSettings.XPACK_LICENSE_EDITION_ULTIMATE &&
!store.getters.publicSettings['PRIVACY_MODE'],
attrs: {
type: 'primary',

5
src/views/settings/Feature/Chat.vue
View File

@@ -54,7 +54,6 @@ export default {
'GPT_API_KEY',
'GPT_PROXY',
'GPT_MODEL',
'IS_CUSTOM_MODEL',
'CUSTOM_GPT_MODEL',
'CUSTOM_DEEPSEEK_MODEL'
],
@@ -121,12 +120,12 @@ export default {
},
CUSTOM_GPT_MODEL: {
hidden: (formValue) => {
return formValue.CHAT_AI_METHOD !== 'api' || formValue.CHAT_AI_TYPE !== 'gpt' || !formValue.IS_CUSTOM_MODEL
return formValue.CHAT_AI_METHOD !== 'api' || formValue.CHAT_AI_TYPE !== 'gpt' || formValue.GPT_MODEL !== 'custom'
}
},
CUSTOM_DEEPSEEK_MODEL: {
hidden: (formValue) => {
return formValue.CHAT_AI_METHOD !== 'api' || formValue.CHAT_AI_TYPE !== 'deep-seek' || !formValue.IS_CUSTOM_MODEL
return formValue.CHAT_AI_METHOD !== 'api' || formValue.CHAT_AI_TYPE !== 'deep-seek' || formValue.DEEPSEEK_MODEL !== 'custom'
}
}
},

90
src/views/tickets/BaseTicketList.vue
View File

@@ -6,6 +6,7 @@
:create-drawer="createDrawer"
:detail-drawer="detailDrawer"
:header-actions="iTicketAction"
:quick-filters="quickFilters"
:table-config="ticketTableConfig"
/>
</template>
@@ -41,11 +42,77 @@ export default {
loading: true,
getDrawerTitle: () => ' ',
createDrawer: () => import('@/views/tickets/RequestAssetPerm/CreateUpdate'),
quickFilters: [
{
label: this.$t('Type'),
options: [
{
label: this.$t('ApplyAsset'),
filter: {
type: 'apply_asset'
}
},
{
label: this.$t('LoginConfirm'),
filter: {
type: 'login_confirm'
}
},
{
label: this.$t('CommandConfirm'),
filter: {
type: 'command_confirm'
}
},
{
label: this.$t('LoginAssetConfirm'),
filter: {
type: 'login_asset_confirm'
}
}
]
},
{
label: this.$t('State'),
options: [
{
label: this.$t('All'),
filter: {
state: 'all'
}
},
{
label: this.$t('Open'),
filter: {
state: 'pending'
}
},
{
label: this.$t('Cancel'),
filter: {
state: 'closed'
}
},
{
label: this.$t('Approved'),
filter: {
state: 'approved'
}
},
{
label: this.$t('Rejected'),
filter: {
state: 'rejected'
}
}
]
}
],
detailDrawer: null,
ticketTableConfig: {
url: this.url,
extraQuery: this.extraQuery,
columnsExclude: ['process_map', 'rel_snapshot'],
columnsExclude: ['process_map', 'rel_snapshot', 'status'],
columnsShow: {
min: ['title', 'serial_num', 'type', 'state', 'date_created'],
default: ['title', 'serial_num', 'type', 'state', 'date_created']
@@ -94,25 +161,8 @@ export default {
return row.type.label
}
},
status: {
align: 'center',
sortable: 'custom',
formatter: TagChoicesFormatter,
formatterArgs: {
getTagLabel({ row }) {
return row.status.label
},
getTagType({ row }) {
if (row.status.value === 'open') {
return 'primary'
} else {
return 'danger'
}
}
}
},
state: {
label: this.$t('Action'),
label: this.$t('State'),
align: 'center',
sortable: 'custom',
formatter: TagChoicesFormatter,
@@ -142,7 +192,7 @@ export default {
}
},
defaultTicketActions: {
hasExport: false,
hasImport: false,
hasMoreActions: false,
hasLeftActions: true,
canCreate: this.$hasPerm('tickets.view_ticket'),

12
src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
View File

@@ -217,12 +217,14 @@ export default {
const accounts = this.requestForm.accounts
if (this.object.approval_step.value === this.object.process_map.length) {
if (assets.length === 0 && nodes.length === 0) {
return this.$message.error(this.$tc('SelectAtLeastOneAssetOrNodeErrMsg'))
this.$message.error(this.$tc('SelectAtLeastOneAssetOrNodeErrMsg'))
return false
} else if (accounts.length === 0) {
return this.$message.error(this.$tc('RequiredSystemUserErrMsg'))
this.$message.error(this.$tc('RequiredSystemUserErrMsg'))
return false
}
}
this.$axios.patch(`/api/v1/tickets/apply-asset-tickets/${this.object.id}/approve/`, {
return this.$axios.patch(`/api/v1/tickets/apply-asset-tickets/${this.object.id}/approve/`, {
apply_nodes: nodes || [],
apply_assets: assets || [],
apply_accounts: accounts || [],
@@ -239,11 +241,11 @@ export default {
},
handleClose() {
const url = `/api/v1/tickets/apply-asset-tickets/${this.object.id}/close/`
this.$axios.put(url).then(res => this.reloadPage()).catch(err => this.$message.error(err))
return this.$axios.put(url).then(res => this.reloadPage()).catch(err => this.$message.error(err))
},
handleReject() {
const url = `/api/v1/tickets/apply-asset-tickets/${this.object.id}/reject/`
this.$axios.put(url).then(res => this.reloadPage()).catch(err => this.$message.error(err))
return this.$axios.put(url).then(res => this.reloadPage()).catch(err => this.$message.error(err))
}
}
}

11
src/views/tickets/components/Comments.vue
View File

@@ -231,7 +231,16 @@ export default {
}
if (handler) {
handler()
const result = handler()
if (result === false) {
this.isDisabled = false
return
}
if (result && typeof result.finally === 'function') {
result.finally(() => {
this.isDisabled = false
})
}
} else {
this.$message.error('No handler for action')
}

2
src/views/users/User/UserCreateUpdate.vue
View File

@@ -264,7 +264,7 @@ export default {
let mfa_level = null
// SECURITY_MFA_AUTH 0 不开启 1 全局开启 2 管理员开启
const securityMFAAuth = store.getters.publicSettings['SECURITY_MFA_AUTH']
const adminUserIsNeed = (user?.is_superuser || user?.is_org_admin) && this.$route.meta.action === 'update' &&
const adminUserIsNeed = (user?.is_superuser || user?.is_org_admin) && this.$route.params.action === 'update' &&
securityMFAAuth === MFASystemSetting.onlyAdminUsers
if (securityMFAAuth === MFASystemSetting.allUsers) {
options = [{ 'value': MFALevel.allUsers, 'label': this.$t('MFAAllUsers') }]

19
src/views/users/User/UserDetail/UserInfo.vue
View File

@@ -20,6 +20,8 @@ import { QuickActions } from '@/components'
import RelationCard from '@/components/Cards/RelationCard'
import AutoDetailCard from '@/components/Cards/DetailCard/auto'
import TwoCol from '@/layout/components/Page/TwoColPage.vue'
import store from '@/store'
import { MFASystemSetting } from '@/views/users/const'
export default {
name: 'UserInfo',
@@ -226,7 +228,22 @@ export default {
return <div>{doms}</div>
}
},
'wecom_id', 'dingtalk_id', 'feishu_id', 'mfa_level',
'wecom_id', 'dingtalk_id', 'feishu_id',
{
key: this.$t('MFA'),
formatter: (item, val) => {
const user = vm.object
const securityMFAAuth = store.getters.publicSettings['SECURITY_MFA_AUTH']
const adminUserIsNeed = (user?.is_superuser || user?.is_org_admin) && securityMFAAuth === MFASystemSetting.onlyAdminUsers
if (securityMFAAuth === MFASystemSetting.allUsers) {
return this.$t('MFAAllUsers')
}
if (securityMFAAuth === MFASystemSetting.onlyAdminUsers && adminUserIsNeed) {
return this.$t('MFAOnlyAdminUsers')
}
return user?.mfa_level.label
}
},
'source', 'labels',
'created_by', 'date_joined', 'date_expired',
'date_password_last_updated', 'last_login', 'comment'