n20-common-lib 2.4.13 → 2.4.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/assets/css/el-table.scss +6 -6
- package/src/components/TablePro/index.vue +23 -10
- package/style/index.css +1 -1
- package/style/index.css.map +1 -1
- package/theme/blue.css +1 -1
- package/theme/cctcRed.css +1 -1
- package/theme/green.css +1 -1
- package/theme/lightBlue.css +1 -1
- package/theme/orange.css +1 -1
- package/theme/purple.css +1 -1
- package/theme/red.css +1 -1
- package/theme/yellow.css +1 -1
package/package.json
CHANGED
|
@@ -103,18 +103,18 @@
|
|
|
103
103
|
}
|
|
104
104
|
|
|
105
105
|
.vxe-table .vxe-cell--sort {
|
|
106
|
-
display: inline-flex;
|
|
107
|
-
flex-direction: row-reverse;
|
|
108
|
-
align-items: center;
|
|
106
|
+
display: inline-flex !important;
|
|
107
|
+
flex-direction: row-reverse !important;
|
|
108
|
+
align-items: center !important;
|
|
109
109
|
width: 16px !important;
|
|
110
110
|
height: 16px !important;
|
|
111
111
|
line-height: 16px !important;
|
|
112
|
-
vertical-align: middle;
|
|
112
|
+
vertical-align: middle !important;
|
|
113
113
|
cursor: pointer;
|
|
114
114
|
.vxe-sort--asc-btn,
|
|
115
115
|
.vxe-sort--desc-btn {
|
|
116
116
|
width: 6px;
|
|
117
|
-
height:
|
|
117
|
+
height: 10px;
|
|
118
118
|
color: #333;
|
|
119
119
|
border: none;
|
|
120
120
|
font-style: normal;
|
|
@@ -141,7 +141,7 @@
|
|
|
141
141
|
.vxe-table--render-default.size--mini .vxe-footer--column.col--ellipsis,
|
|
142
142
|
.vxe-table--render-default.size--mini .vxe-header--column.col--ellipsis,
|
|
143
143
|
.vxe-table--render-default.vxe-editable.size--mini .vxe-body--column {
|
|
144
|
-
height:
|
|
144
|
+
height: 32px !important;
|
|
145
145
|
}
|
|
146
146
|
.cell-default-set-- .vxe-table--body-wrapper .vxe-body--row .vxe-body--column .vxe-cell .vxe-cell--label:empty::before {
|
|
147
147
|
content: '--';
|
|
@@ -3,41 +3,44 @@
|
|
|
3
3
|
<vxe-table
|
|
4
4
|
ref="vxeTable"
|
|
5
5
|
:key="colsKey"
|
|
6
|
+
row-key
|
|
6
7
|
:align="'center'"
|
|
7
8
|
:data="data"
|
|
8
9
|
:height="height"
|
|
9
10
|
:class="{ 'cell-default-set--': cellDefault }"
|
|
10
|
-
:checkbox-config="{ checkField: 'checked' }"
|
|
11
|
+
:checkbox-config="{ checkField: 'checked', checkMethod: forbidSelect }"
|
|
11
12
|
v-bind="Object.assign({ size: size }, $attrs, sizeBind)"
|
|
12
13
|
show-overflow
|
|
13
14
|
show-header-overflow
|
|
14
15
|
:row-config="{ isHover: true, useKey: true }"
|
|
15
16
|
:column-config="{ resizable: true, useKey: true }"
|
|
16
17
|
:sort-config="{
|
|
17
|
-
multiple:
|
|
18
|
+
multiple: false,
|
|
18
19
|
remote: true,
|
|
19
20
|
trigger: 'cell',
|
|
20
|
-
iconAsc: 'n20-icon-
|
|
21
|
-
iconDesc: 'n20-icon-
|
|
21
|
+
iconAsc: 'n20-icon-daoxu',
|
|
22
|
+
iconDesc: 'n20-icon-shunxu'
|
|
22
23
|
}"
|
|
23
24
|
:filter-config="{ remote: true, iconNone: 'n20-icon-xiala-moren', iconMatch: 'n20-icon-xiala-moren' }"
|
|
24
|
-
:scroll-x="{ gt: -1 }"
|
|
25
|
-
:scroll-y="{ mode: 'default', gt: 10 }"
|
|
26
25
|
v-on="$listeners"
|
|
27
26
|
@sort-change="(val) => customSortMethod(val)"
|
|
28
27
|
@filter-change="filterChange"
|
|
29
28
|
@checkbox-change="handleSelectionChange"
|
|
29
|
+
@checkbox-all="handleSelectionChange"
|
|
30
30
|
>
|
|
31
31
|
<template v-for="(item, i) in columns">
|
|
32
32
|
<slot v-if="item.slotName" :name="item.slotName" :column="item"></slot>
|
|
33
33
|
<vxe-column
|
|
34
34
|
v-else-if="item.type === 'checkbox'"
|
|
35
35
|
:key="'vxe-table-' + i"
|
|
36
|
+
v-bind="item"
|
|
37
|
+
:title="item.label"
|
|
38
|
+
:field="item.prop"
|
|
36
39
|
type="checkbox"
|
|
37
|
-
width="
|
|
40
|
+
width="50"
|
|
38
41
|
fixed="left"
|
|
39
42
|
>
|
|
40
|
-
<template #header="{ $table, checked, indeterminate }">
|
|
43
|
+
<!-- <template #header="{ $table, checked, indeterminate }">
|
|
41
44
|
<span class="custom-checkbox" @click.stop="toggleAll($table)">
|
|
42
45
|
<el-checkbox v-if="indeterminate" :key="key" :indeterminate="indeterminate" />
|
|
43
46
|
<el-checkbox v-else-if="checked" :key="key" :value="checked" />
|
|
@@ -50,7 +53,7 @@
|
|
|
50
53
|
<el-checkbox v-else-if="checked" :key="key" :value="checked" />
|
|
51
54
|
<el-checkbox v-else :key="key" :value="checked" />
|
|
52
55
|
</span>
|
|
53
|
-
</template>
|
|
56
|
+
</template> -->
|
|
54
57
|
</vxe-column>
|
|
55
58
|
<vxe-column
|
|
56
59
|
v-else
|
|
@@ -100,6 +103,16 @@ export default {
|
|
|
100
103
|
cellDefault: {
|
|
101
104
|
type: Boolean,
|
|
102
105
|
default: true
|
|
106
|
+
},
|
|
107
|
+
// 禁止选择
|
|
108
|
+
forbidSelect: {
|
|
109
|
+
type: Function,
|
|
110
|
+
default: () => {
|
|
111
|
+
const forbidSelect = function ({ row }) {
|
|
112
|
+
return row
|
|
113
|
+
}
|
|
114
|
+
return forbidSelect
|
|
115
|
+
}
|
|
103
116
|
}
|
|
104
117
|
},
|
|
105
118
|
data() {
|
|
@@ -135,7 +148,7 @@ export default {
|
|
|
135
148
|
const orders = sortList.map((item) => {
|
|
136
149
|
return {
|
|
137
150
|
column: item.field,
|
|
138
|
-
asc: item.order === '
|
|
151
|
+
asc: item.order === 'asc'
|
|
139
152
|
}
|
|
140
153
|
})
|
|
141
154
|
this.$emit('sort-change-method', orders)
|