Skip to content

前端更新 #160

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

Merged
wang-liang0615 merged 2 commits into from
Aug 25, 2023
Merged

前端更新 #160

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c86fcb4
fix 新增类型回车键发送两次请求
wang-liang0615 Aug 25, 2023
a07b2d3
fix 新增类型回车键发送两次请求
wang-liang0615 Aug 25, 2023
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
11 changes: 5 additions & 6 deletions cmdb-ui/src/modules/cmdb/views/relation_type/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<a-card :bordered="false">
<div class="action-btn">
<a-button @click="handleCreate" type="primary" style="margin-bottom: 15px">新增关系类型</a-button>
<a-button @click="handleCreate" type="primary" style="margin-bottom: 15px;">新增关系类型</a-button>
</div>
<vxe-table
ref="relationTypeTable"
Expand All @@ -20,17 +20,17 @@
:edit-render="{ name: 'input', attrs: { type: 'text' }, events: { keyup: customCloseEdit } }"
></vxe-table-column>
<vxe-table-column field="updateTime" title="更新时间">
<template #default="{ row }">
<template #default="{row}">
{{ row.updated_at || row.created_at }}
</template>
</vxe-table-column>
<vxe-table-column field="operation" title="操作" align="center">
<template #default="{ row }">
<template #default="{row}">
<template>
<a><a-icon type="edit" @click="handleEdit(row)" /></a>
<a><a-icon type="edit" @click="handleEdit(row)"/></a>
<a-divider type="vertical" />
<a-popconfirm title="确认删除吗?" @confirm="handleDelete(row)" okText="是" cancelText="否">
<a :style="{ color: 'red' }"><a-icon type="delete" /></a>
<a :style="{ color: 'red' }"><a-icon type="delete"/></a>
</a-popconfirm>
</template>
</template>
Expand Down Expand Up @@ -122,7 +122,6 @@ export default {
if ($event.keyCode === 13) {
const $table = this.$refs.relationTypeTable
$table.clearActived()
this.handleEditClose({ row: value.row })
}
},
},
Expand Down