update table

This commit is contained in:
lb
2023-03-17 11:32:29 +08:00
parent f25d7f306a
commit d412057a38
37 changed files with 109 additions and 105 deletions

View File

@@ -44,12 +44,13 @@
:width="head.width || null"
:min-width="head.minWidth || null"
:fixed="head.fixed || null"
:show-overflow-tooltip="head.showOverflowTooltip || true"
:tooltip-effect="head.tooltipEffect || 'light'"
filter-placement="top"
:align="head.align || null"
v-bind="head.more"
>
:show-overflow-tooltip="head.showOverflowTooltip || !head.prop === 'operations'"
>
<!-- :show-overflow-tooltip="head.showOverflowTooltip || true" -->
<!-- 子组件 -->
<template v-if="head.prop" slot-scope="scope">
<component

View File

@@ -852,7 +852,9 @@ export default {
switch (type) {
case "delete": {
// 确认是否删除
return this.$confirm(`是否删除条目: ${data.name ?? (data.material ? data.material : data.id)}`, "提示", {
console.log('delete....', data)
const itemName = typeof data === 'object' ? (data.attrName || data.name || data.material || data.id) : data
return this.$confirm(`是否删除条目: ${itemName}`, "提示", {
confirmButtonText: "确认",
cancelButtonText: "我再想想",
type: "warning",

View File

@@ -26,6 +26,6 @@ export default {
},
render: function (h) {
// console.log('button content:', this.injectData)
return h('span', null, [h('el-button', { props: { type: 'text' }, style: { paddingLeft: 0 }, on: { click: this.emitClick } }, this.injectData.head?.buttonContent || this.defaultText)])
return h('span', null, [h('el-button', { props: { type: 'text' }, style: { padding: 0, margin: '5px 0' }, on: { click: this.emitClick } }, this.injectData.head?.buttonContent || this.defaultText)])
}
}

View File

@@ -10,7 +10,7 @@
content: "";
width: 1px;
background: #ccc;
right: -6px;
top: 15%;
height: 70%;
right: -4px;
top: 10%;
height: 80%;
}

View File

@@ -107,7 +107,7 @@ export default {
domProps: {
title: opt.label ?? opt.name,
},
style: { color: !shouldDisabled && (opt.color || this.colors[opt.name] || "#0b58ff"), padding: '5px 0' },
style: { color: !shouldDisabled && (opt.color || this.colors[opt.name] || "#0b58ff"), padding: 0, margin: '5px 9px 5px 0' },
class: ['operate--btn'],
on: { click: this.emit.bind(null, opt) },
},
@@ -126,7 +126,7 @@ export default {
domProps: {
title: opt.label ?? opt.name,
},
style: { color: this.colors[opt] || "#0b58ff", padding: 0 },
style: { color: this.colors[opt] || "#0b58ff", padding: 0, margin: '5px 9px 5px 0' },
class: ['operate--btn'],
on: { click: this.emit.bind(null, opt) },
},