Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(ui): some bugs #562

Merged
merged 1 commit into from
Jun 21, 2024
Merged

fix(ui): some bugs #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmdb-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions cmdb-ui/src/modules/cmdb/components/httpSnmpAD/httpADCategory.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,10 @@ export default {
}
}
}
}

.corporate-tip {
margin-top: 20px;
}
.corporate-tip {
margin-top: 20px;
}
}
</style>
1 change: 1 addition & 0 deletions cmdb-ui/src/modules/cmdb/lang/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
1 change: 1 addition & 0 deletions cmdb-ui/src/modules/cmdb/lang/zh.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ const cmdb_zh = {
relationADTip2: '当自动发现属性与关联模型属性一致时，两实例模型则自动关联',
relationADTip3: '如果自动发现的属性值是列表，则会和关联模型建立多个关系',
deleteRelationAdTip: '不可再删除',
cronTips: '格式同crontab, 例如：0 15 * * 1-5',
},
components: {
unselectAttributes: '未选属性',
Expand Down
2 changes: 1 addition & 1 deletion cmdb-ui/src/modules/cmdb/views/ci_types/attrADTabpane.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions cmdb-ui/src/modules/cmdb/views/discovery/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,10 @@ export default {
&-text {
margin-top: 20px;
}

&-img {
width: 100px;
}
}
}

Expand Down
11 changes: 7 additions & 4 deletions cmdb-ui/src/modules/cmdb/views/topology_view/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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>
Expand Down
Loading