mirror of
https://github.com/jumpserver/lina.git
synced 2025-08-02 07:27:01 +00:00
Merge branch 'pam' of github.com:jumpserver/lina into pam
This commit is contained in:
commit
f5bd0f0533
@ -40,10 +40,9 @@ export default {
|
||||
'ssh_key', 'passphrase'
|
||||
]
|
||||
],
|
||||
[this.$t('Automations'), ['params']],
|
||||
[this.$t('Params'), ['params']],
|
||||
[this.$t('Periodic'), ['is_periodic', 'interval', 'crontab']],
|
||||
[this.$t('Notification'), ['recipients']],
|
||||
[this.$t('Other'), ['check_conn_after_change', 'is_active', 'comment']]
|
||||
[this.$t('Other'), ['check_conn_after_change', 'is_active', 'recipients', 'comment']]
|
||||
],
|
||||
fieldsMeta: {
|
||||
...getChangeSecretFields(),
|
||||
|
@ -3,7 +3,7 @@
|
||||
:create-drawer="createDrawer"
|
||||
:detail-drawer="detailDrawer"
|
||||
:header-actions="headerActions"
|
||||
:resource="$tc('AccountChangeSecret')"
|
||||
:resource="$tc('ChangeSecret')"
|
||||
:table-config="tableConfig"
|
||||
/>
|
||||
</template>
|
||||
|
@ -42,7 +42,7 @@ export default {
|
||||
]
|
||||
],
|
||||
[
|
||||
this.$t('Automations'), ['params']
|
||||
this.$t('Params'), ['params']
|
||||
],
|
||||
[this.$t('Periodic'), ['is_periodic', 'interval', 'crontab']],
|
||||
[this.$t('Other'), ['check_conn_after_change', 'is_active', 'comment']]
|
||||
|
@ -112,7 +112,7 @@ export default {
|
||||
let filteredData = []
|
||||
|
||||
// 只要有一个大于零 则展示全部的
|
||||
if (data.some(item => item.value > 0).length > 0) {
|
||||
if (data.some(item => item.value > 0)) {
|
||||
filteredData = data
|
||||
} else {
|
||||
filteredData = data.slice(0, 7)
|
||||
@ -135,7 +135,6 @@ export default {
|
||||
show: true,
|
||||
min: 0,
|
||||
max: max,
|
||||
interval: 1,
|
||||
position: 'top',
|
||||
axisLine: { show: false },
|
||||
axisTick: { show: false },
|
||||
|
@ -22,6 +22,7 @@ export default {
|
||||
currentTemplate: null,
|
||||
tableConfig: {
|
||||
url: '/api/v1/accounts/integration-applications/',
|
||||
columnsExclude: ['accounts'],
|
||||
columnsMeta: {
|
||||
id: {
|
||||
width: '300px',
|
||||
@ -37,7 +38,7 @@ export default {
|
||||
)
|
||||
}
|
||||
},
|
||||
accounts: {
|
||||
accounts_amount: {
|
||||
width: '100px',
|
||||
formatter: (row) => {
|
||||
return row.accounts_amount
|
||||
@ -74,7 +75,7 @@ export default {
|
||||
columnsExtra: ['secret'],
|
||||
columnsShow: {
|
||||
default: [
|
||||
'logo', 'name', 'id', 'secret', 'accounts', 'date_last_used', 'active'
|
||||
'logo', 'name', 'id', 'secret', 'accounts_amount', 'date_last_used', 'active'
|
||||
]
|
||||
},
|
||||
permissions: { app: 'accounts', resource: 'integrationapplication' }
|
||||
|
@ -14,13 +14,17 @@
|
||||
</two-col>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
|
||||
<div class="copy-btn">
|
||||
<i
|
||||
class="copy-btn el-icon-copy-document"
|
||||
@click="copyContent"
|
||||
/>
|
||||
<el-tooltip :content="$t('Copy')" placement="top">
|
||||
<i
|
||||
class="copy-btn el-icon-copy-document"
|
||||
@click="copyContent"
|
||||
/>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</IBox>
|
||||
</div>
|
||||
</template>
|
||||
@ -129,5 +133,6 @@ export default {
|
||||
position: absolute;
|
||||
top: 8px;
|
||||
right: 5px;
|
||||
cursor: pointer;
|
||||
}
|
||||
</style>
|
||||
|
@ -26,7 +26,7 @@ export default {
|
||||
fields: [
|
||||
[this.$t('Basic'), ['name']],
|
||||
[this.$t('Asset'), ['assets', 'nodes']],
|
||||
[this.$t('Check config'), ['engines', 'recipients']],
|
||||
[this.$t('Config'), ['engines', 'recipients']],
|
||||
[this.$t('Periodic'), ['is_periodic', 'interval', 'crontab']],
|
||||
[this.$t('Other'), ['is_active', 'comment']]
|
||||
],
|
||||
@ -65,7 +65,6 @@ export default {
|
||||
}
|
||||
},
|
||||
recipients: {
|
||||
label: i18n.t('Recipients'),
|
||||
helpText: i18n.t('OnlyMailSend'),
|
||||
el: {
|
||||
value: [],
|
||||
|
Loading…
Reference in New Issue
Block a user