7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #562 from veops/fix_ui_2.4.6 

fix(ui): some bugs
This commit is contained in:
Leo Song 2024-06-21 11:49:53 +08:00 committed by GitHub
parent f1cb8569a2 7c7b107180
commit 3401fb6ac3
7 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmdb-ui/package.json
View File

@ -59,7 +59,7 @@
"vue-template-compiler": "2.6.11",
"vuedraggable": "^2.23.0",
"vuex": "^3.1.1",
"vxe-table": "3.6.9",
"vxe-table": "3.7.10",
"vxe-table-plugin-export-xlsx": "2.0.0",
"xe-utils": "3",
"xlsx": "0.15.0",

6
cmdb-ui/src/modules/cmdb/components/httpSnmpAD/httpADCategory.vue
View File

@ -214,10 +214,10 @@ export default {
}
}
}
}
.corporate-tip {
margin-top: 20px;
}
.corporate-tip {
margin-top: 20px;
}
}
</style>

1
cmdb-ui/src/modules/cmdb/lang/en.js
View File

@ -243,6 +243,7 @@ const cmdb_en = {
relationADTip2: 'When an auto-discovered attribute matches an associated model attribute, the two instance models are automatically associated',
relationADTip3: 'If the value of the auto-discovered attribute is a list, multiple relationships are established with the association model',
deleteRelationAdTip: 'Cannot be deleted again',
cronTips: 'The format is the same as crontab, for example: 0 15 * * 1-5',
},
components: {
unselectAttributes: 'Unselected',

1
cmdb-ui/src/modules/cmdb/lang/zh.js
View File

@ -243,6 +243,7 @@ const cmdb_zh = {
relationADTip2: '当自动发现属性与关联模型属性一致时，两实例模型则自动关联',
relationADTip3: '如果自动发现的属性值是列表，则会和关联模型建立多个关系',
deleteRelationAdTip: '不可再删除',
cronTips: '格式同crontab, 例如：0 15 * * 1-5',
},
components: {
unselectAttributes: '未选属性',

2
cmdb-ui/src/modules/cmdb/views/ci_types/attrADTabpane.vue
View File

@ -98,7 +98,7 @@
<a-input
v-model="cron"
slot="reference"
:placeholder="$t('cmdb.reconciliation.cronTips')"
:placeholder="$t('cmdb.ciType.cronTips')"
/>
</el-popover>
</a-form-model-item>

4
cmdb-ui/src/modules/cmdb/views/discovery/index.vue
View File

@ -339,6 +339,10 @@ export default {
&-text {
margin-top: 20px;
}
&-img {
width: 100px;
}
}
}

11
cmdb-ui/src/modules/cmdb/views/topology_view/index.vue
View File

@ -32,8 +32,11 @@
ghost
@click="handleClickAddGroup"
class="ops-button-ghost"
><ops-icon type="veops-increase" />{{ $t('cmdb.ciType.group') }}</a-button
v-if="permissions.includes('admin') || permissions.includes('cmdb_admin')"
>
<ops-icon type="veops-increase" />
{{ $t('cmdb.ciType.group') }}
</a-button>
</div>
<draggable class="topo-left-content" :list="computedTopoGroups" @end="handleChangeGroups" filter=".undraggable">
<div v-for="group in computedTopoGroups" :key="group.id || group.name">
@ -56,16 +59,16 @@
<a-space>
<a-tooltip>
<template slot="title">{{ $t('cmdb.topo.addTopoViewInGroup') }}</template>
<a><ops-icon type="veops-increase" @click="handleCreate(group)"/></a>
<a v-if="permissions.includes('admin') || permissions.includes('cmdb_admin')"><ops-icon type="veops-increase" @click="handleCreate(group)"/></a>
</a-tooltip>
<template v-if="group.id">
<a-tooltip >
<template slot="title">{{ $t('cmdb.ciType.editGroup') }}</template>
<a><a-icon type="edit" @click="handleEditGroup(group)"/></a>
<a v-if="permissions.includes('admin') || permissions.includes('cmdb_admin')"><a-icon type="edit" @click="handleEditGroup(group)"/></a>
</a-tooltip>
<a-tooltip>
<template slot="title">{{ $t('cmdb.ciType.deleteGroup') }}</template>
<a :style="{color: 'red'}"><a-icon type="delete" @click="handleDeleteGroup(group)"/></a>
<a v-if="permissions.includes('admin') || permissions.includes('cmdb_admin')" :style="{color: 'red'}"><a-icon type="delete" @click="handleDeleteGroup(group)"/></a>
</a-tooltip>
</template>
</a-space>