diff --git a/src/components/AssetSelect/index.vue b/src/components/AssetSelect/index.vue index 3bcc3f015..3b890f96f 100644 --- a/src/components/AssetSelect/index.vue +++ b/src/components/AssetSelect/index.vue @@ -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'), diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json index b5bf49e3f..ca2b78193 100644 --- a/src/i18n/langs/zh.json +++ b/src/i18n/langs/zh.json @@ -683,6 +683,7 @@ "Weekly": "按周" }, "ops": { + "CommandNotBeNone": "命令内容不能为空", "OpenCommand": "打开命令", "SaveCommand": "保存命令 ", "Log": "日志", diff --git a/src/views/accounts/AssetAccount/AssetAccountList.vue b/src/views/accounts/AssetAccount/AssetAccountList.vue index a456b156f..239bd9ac5 100644 --- a/src/views/accounts/AssetAccount/AssetAccountList.vue +++ b/src/views/accounts/AssetAccount/AssetAccountList.vue @@ -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) } diff --git a/src/views/accounts/ChangeSecreAtutomation/fields.js b/src/views/accounts/ChangeSecreAtutomation/fields.js index 76d4a2ccc..1a79ad646 100644 --- a/src/views/accounts/ChangeSecreAtutomation/fields.js +++ b/src/views/accounts/ChangeSecreAtutomation/fields.js @@ -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: { diff --git a/src/views/assets/Domain/DomainCreateUpdate.vue b/src/views/assets/Domain/DomainCreateUpdate.vue index 3a460763b..4a3fac94e 100644 --- a/src/views/assets/Domain/DomainCreateUpdate.vue +++ b/src/views/assets/Domain/DomainCreateUpdate.vue @@ -23,7 +23,10 @@ export default { component: AssetSelect, label: this.$t('assets.Assets'), el: { - value: [] + value: [], + canSelect: (row) => { + return row.enabled_info.domain_enabled + } } } }, diff --git a/src/views/ops/Job/AdhocOpenDialog.vue b/src/views/ops/Job/AdhocOpenDialog.vue index 1a647d183..320cc1911 100644 --- a/src/views/ops/Job/AdhocOpenDialog.vue +++ b/src/views/ops/Job/AdhocOpenDialog.vue @@ -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 }) => { diff --git a/src/views/ops/Job/JobCodeEditor.vue b/src/views/ops/Job/JobCodeEditor.vue index 9e2f76dce..320aafd64 100644 --- a/src/views/ops/Job/JobCodeEditor.vue +++ b/src/views/ops/Job/JobCodeEditor.vue @@ -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) {