mirror of
https://github.com/jumpserver/lina.git
synced 2025-09-18 08:12:33 +00:00
Merge branch 'v3' of github.com:jumpserver/lina into v3
This commit is contained in:
@@ -102,15 +102,8 @@ export default {
|
||||
tableConfig: {
|
||||
url: this.baseUrl,
|
||||
hasTree: true,
|
||||
hasSelection: false,
|
||||
canSelect: this.canSelect,
|
||||
columns: [
|
||||
{
|
||||
type: 'selection',
|
||||
selectable(row) {
|
||||
return row.automation_enabled_info.change_secret_enabled
|
||||
}
|
||||
},
|
||||
{
|
||||
prop: 'name',
|
||||
label: this.$t('assets.Name'),
|
||||
|
@@ -683,6 +683,7 @@
|
||||
"Weekly": "按周"
|
||||
},
|
||||
"ops": {
|
||||
"CommandNotBeNone": "命令内容不能为空",
|
||||
"OpenCommand": "打开命令",
|
||||
"SaveCommand": "保存命令 ",
|
||||
"Log": "日志",
|
||||
|
@@ -45,7 +45,7 @@ export default {
|
||||
url = setUrlParam(url, 'asset', '')
|
||||
url = setUrlParam(url, 'node', nodeId)
|
||||
} else if (treeNode.meta.type === 'asset') {
|
||||
const assetId = treeNode.meta.data.id
|
||||
const assetId = treeNode.meta.data?.id || treeNode?.id
|
||||
url = setUrlParam(url, 'node', '')
|
||||
url = setUrlParam(url, 'asset', assetId)
|
||||
}
|
||||
|
@@ -52,6 +52,11 @@ export const getFields = () => {
|
||||
rules: [
|
||||
{ required: false }
|
||||
],
|
||||
el: {
|
||||
canSelect: (row) => {
|
||||
return row.enabled_info.change_secret_enabled
|
||||
}
|
||||
},
|
||||
label: i18n.t('xpack.Asset')
|
||||
},
|
||||
passphrase: {
|
||||
|
@@ -23,7 +23,10 @@ export default {
|
||||
component: AssetSelect,
|
||||
label: this.$t('assets.Assets'),
|
||||
el: {
|
||||
value: []
|
||||
value: [],
|
||||
canSelect: (row) => {
|
||||
return row.enabled_info.domain_enabled
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
@@ -31,8 +31,9 @@ export default {
|
||||
visible: false,
|
||||
width: '60%',
|
||||
tableConfig: {
|
||||
hasSelection: false,
|
||||
url: `/api/v1/ops/adhocs/`,
|
||||
columns: ['name', 'module', 'args', 'actions'],
|
||||
columns: ['name', 'module', 'args', 'comment', 'actions'],
|
||||
columnsMeta: {
|
||||
actions: {
|
||||
formatter: ActionsFormatter,
|
||||
@@ -42,7 +43,7 @@ export default {
|
||||
hasDelete: false,
|
||||
extraActions: [
|
||||
{
|
||||
title: '选择',
|
||||
title: this.$tc('common.Select'),
|
||||
name: 'select',
|
||||
can: true,
|
||||
callback: ({ row }) => {
|
||||
|
@@ -65,6 +65,10 @@ export default {
|
||||
this.showOpenAdhocDialog = true
|
||||
},
|
||||
openAdhocSaveDialog() {
|
||||
if (!this.iValue.length > 0) {
|
||||
this.$message.error(this.$tc('ops.CommandNotBeNone'))
|
||||
return
|
||||
}
|
||||
this.showOpenAdhocSaveDialog = true
|
||||
},
|
||||
onSelectAdhoc(adhoc) {
|
||||
|
Reference in New Issue
Block a user