Skip to content

Commit 8ecde9a

Browse files
committed
Merge branch 'main' into docs
2 parents c5e995f + c3b2da0 commit 8ecde9a

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

examples/pages/table/demo/TableOperations.vue

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<el-table-column prop="date" label="日期" min-width="180"></el-table-column>
1313
<el-table-column prop="name" label="姓名" min-width="180" fix></el-table-column>
1414
<el-table-column prop="address" label="地址" min-width="300" :show="false"></el-table-column>
15-
<fu-table-operations :ellipsis="2" :buttons="buttons" label="操作" fixed="right" />
15+
<fu-table-operations :ellipsis="2" :buttons="buttons" label="操作" fixed="right"/>
1616
</fu-table>
1717
<h4>
1818
icon 按钮
@@ -22,18 +22,19 @@
2222
<el-table-column prop="date" label="日期" min-width="180"></el-table-column>
2323
<el-table-column prop="name" label="姓名" min-width="180" fix></el-table-column>
2424
<el-table-column prop="address" label="地址" min-width="300" :show="false"></el-table-column>
25-
<fu-table-operations :ellipsis="2" type="icon" :buttons="buttons" label="操作" fixed="right" />
25+
<fu-table-operations :ellipsis="2" type="icon" :buttons="buttons" label="操作" fixed="right"/>
2626
</fu-table>
2727
</template>
2828

2929
<script setup lang="ts">
30-
import { ref } from 'vue'
30+
import {ref} from 'vue'
3131
3232
interface User {
3333
date: string
3434
name: string
3535
address: string
3636
}
37+
3738
const tableData = [{
3839
date: "2016-05-02",
3940
name: "张三",
@@ -76,7 +77,7 @@ const buttons = [
7677
}, {
7778
label: "复制", icon: "DocumentCopy", click: (row: User) => {
7879
console.log("复制:" + row.name)
79-
}
80+
}, divided: true
8081
}
8182
]
8283
@@ -85,6 +86,7 @@ function enableAll() {
8586
b.disabled = false
8687
})
8788
}
89+
8890
function showAll() {
8991
buttons.forEach(b => {
9092
b.show = true

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fit2cloud-ui-plus",
3-
"version": "1.2.1",
3+
"version": "1.2.2",
44
"private": false,
55
"main": "./lib/fit2cloud-ui-plus.es.js",
66
"files": [

src/components/table/table-operations/FuTableMoreButton.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</el-button>
1111
<template #dropdown>
1212
<el-dropdown-menu>
13-
<el-dropdown-item v-for="(btn, i) in buttons" :key="i" :icon="type === 'icon'? btn.icon: ''" :disabled="disabled(btn)"
13+
<el-dropdown-item v-for="(btn, i) in buttons" :key="i" :icon="type === 'icon'? btn.icon: ''" :disabled="disabled(btn)" :divided="btn.divided"
1414
:command="btn">
1515
{{ btn.label }}
1616
</el-dropdown-item>

0 commit comments

Comments
 (0)