vxe-table 3.9.0-rc.8 → 3.9.0
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/README.md +1 -1
- package/es/grid/src/grid.js +120 -66
- package/es/grid/style.css +0 -1
- package/es/grid/style.min.css +1 -1
- package/es/index.esm.js +22 -3
- package/es/locale/lang/en-US.js +2 -8
- package/es/locale/lang/es-ES.js +2 -1
- package/es/locale/lang/hu-HU.d.ts +2 -0
- package/es/locale/lang/hu-HU.js +497 -501
- package/es/locale/lang/ja-JP.js +2 -8
- package/es/locale/lang/ko-KR.d.ts +2 -0
- package/es/locale/lang/ko-KR.js +2 -8
- package/es/locale/lang/pt-BR.js +2 -8
- package/es/locale/lang/ru-RU.d.ts +2 -0
- package/es/locale/lang/ru-RU.js +497 -503
- package/es/locale/lang/uk-UA.d.ts +2 -0
- package/es/locale/lang/uk-UA.js +667 -0
- package/es/locale/lang/vi-VN.js +2 -8
- package/es/locale/lang/zh-CHT.d.ts +2 -0
- package/es/locale/lang/zh-CHT.js +667 -0
- package/es/locale/lang/zh-CN.js +2 -8
- package/es/locale/lang/zh-HK.js +2 -2
- package/es/locale/lang/zh-MO.js +2 -2
- package/es/locale/lang/zh-TC.js +2 -673
- package/es/locale/lang/zh-TW.js +2 -2
- package/es/style.css +1 -1
- package/es/style.min.css +1 -1
- package/es/table/module/custom/panel.js +183 -173
- package/es/table/module/edit/mixin.js +33 -24
- package/es/table/module/export/export-panel.js +32 -4
- package/es/table/module/export/import-panel.js +25 -6
- package/es/table/module/export/mixin.js +11 -11
- package/es/table/module/menu/mixin.js +2 -2
- package/es/table/module/validator/mixin.js +4 -4
- package/es/table/render/index.js +17 -11
- package/es/table/src/body.js +1 -0
- package/es/table/src/columnInfo.js +3 -3
- package/es/table/src/methods.js +54 -42
- package/es/table/src/props.js +65 -15
- package/es/table/src/table.js +175 -60
- package/es/table/src/util.js +3 -2
- package/es/table/style.css +37 -48
- package/es/table/style.min.css +1 -1
- package/es/toolbar/src/toolbar.js +21 -7
- package/es/toolbar/style.css +0 -1
- package/es/toolbar/style.min.css +1 -1
- package/es/ui/index.js +5 -3
- package/es/ui/src/log.js +1 -1
- package/es/vxe-grid/style.css +0 -1
- package/es/vxe-grid/style.min.css +1 -1
- package/es/vxe-table/style.css +37 -48
- package/es/vxe-table/style.min.css +1 -1
- package/es/vxe-toolbar/style.css +0 -1
- package/es/vxe-toolbar/style.min.css +1 -1
- package/lib/colgroup/index.js +3 -3
- package/lib/colgroup/index.min.js +1 -1
- package/lib/column/index.js +3 -3
- package/lib/column/index.min.js +1 -1
- package/lib/components.js +9 -11
- package/lib/components.min.js +1 -1
- package/lib/grid/index.js +3 -3
- package/lib/grid/index.min.js +1 -1
- package/lib/grid/src/grid.js +581 -491
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/grid/style/style.css +0 -1
- package/lib/grid/style/style.min.css +1 -1
- package/lib/index.common.js +3 -4
- package/lib/index.umd.js +9212 -17224
- package/lib/index.umd.min.js +1 -1
- package/lib/locale/lang/en-US.js +2 -8
- package/lib/locale/lang/en-US.min.js +1 -1
- package/lib/locale/lang/en-US.umd.js +2 -8
- package/lib/locale/lang/es-ES.js +2 -1
- package/lib/locale/lang/es-ES.min.js +1 -1
- package/lib/locale/lang/es-ES.umd.js +2 -1
- package/lib/locale/lang/hu-HU.d.ts +2 -0
- package/lib/locale/lang/hu-HU.js +497 -501
- package/lib/locale/lang/hu-HU.min.js +1 -1
- package/lib/locale/lang/hu-HU.umd.js +687 -0
- package/lib/locale/lang/ja-JP.js +2 -8
- package/lib/locale/lang/ja-JP.min.js +1 -1
- package/lib/locale/lang/ja-JP.umd.js +2 -8
- package/lib/locale/lang/ko-KR.d.ts +2 -0
- package/lib/locale/lang/ko-KR.js +2 -8
- package/lib/locale/lang/ko-KR.min.js +1 -1
- package/lib/locale/lang/ko-KR.umd.js +687 -0
- package/lib/locale/lang/pt-BR.js +2 -8
- package/lib/locale/lang/pt-BR.min.js +1 -1
- package/lib/locale/lang/pt-BR.umd.js +2 -8
- package/lib/locale/lang/ru-RU.d.ts +2 -0
- package/lib/locale/lang/ru-RU.js +497 -503
- package/lib/locale/lang/ru-RU.min.js +1 -1
- package/lib/locale/lang/ru-RU.umd.js +687 -0
- package/lib/locale/lang/uk-UA.d.ts +2 -0
- package/lib/locale/lang/uk-UA.js +673 -0
- package/lib/locale/lang/uk-UA.min.js +1 -0
- package/lib/locale/lang/uk-UA.umd.js +687 -0
- package/lib/locale/lang/vi-VN.js +2 -8
- package/lib/locale/lang/vi-VN.min.js +1 -1
- package/lib/locale/lang/zh-CHT.d.ts +2 -0
- package/lib/locale/lang/zh-CHT.js +673 -0
- package/lib/locale/lang/zh-CHT.min.js +1 -0
- package/lib/locale/lang/zh-CHT.umd.js +687 -0
- package/lib/locale/lang/zh-CN.js +2 -8
- package/lib/locale/lang/zh-CN.min.js +1 -1
- package/lib/locale/lang/zh-CN.umd.js +2 -8
- package/lib/locale/lang/zh-HK.js +2 -2
- package/lib/locale/lang/zh-HK.min.js +1 -1
- package/lib/locale/lang/zh-HK.umd.js +7 -677
- package/lib/locale/lang/zh-MO.js +2 -2
- package/lib/locale/lang/zh-MO.min.js +1 -1
- package/lib/locale/lang/zh-MO.umd.js +7 -677
- package/lib/locale/lang/zh-TC.js +3 -673
- package/lib/locale/lang/zh-TC.min.js +1 -1
- package/lib/locale/lang/zh-TC.umd.js +7 -677
- package/lib/locale/lang/zh-TW.js +2 -2
- package/lib/locale/lang/zh-TW.min.js +1 -1
- package/lib/locale/lang/zh-TW.umd.js +7 -677
- package/lib/style.css +1 -1
- package/lib/style.min.css +1 -1
- package/lib/table/index.js +4 -4
- package/lib/table/index.min.js +1 -1
- package/lib/table/module/custom/mixin.js +53 -44
- package/lib/table/module/custom/mixin.min.js +1 -1
- package/lib/table/module/custom/panel.js +310 -239
- package/lib/table/module/custom/panel.min.js +1 -1
- package/lib/table/module/edit/mixin.js +436 -371
- package/lib/table/module/edit/mixin.min.js +1 -1
- package/lib/table/module/export/export-panel.js +136 -106
- package/lib/table/module/export/export-panel.min.js +1 -1
- package/lib/table/module/export/import-panel.js +75 -54
- package/lib/table/module/export/import-panel.min.js +1 -1
- package/lib/table/module/export/mixin.js +592 -597
- package/lib/table/module/export/mixin.min.js +1 -1
- package/lib/table/module/export/util.js +6 -4
- package/lib/table/module/export/util.min.js +1 -1
- package/lib/table/module/filter/mixin.js +147 -118
- package/lib/table/module/filter/mixin.min.js +1 -1
- package/lib/table/module/filter/panel.js +86 -65
- package/lib/table/module/filter/panel.min.js +1 -1
- package/lib/table/module/keyboard/mixin.js +163 -151
- package/lib/table/module/keyboard/mixin.min.js +1 -1
- package/lib/table/module/menu/mixin.js +125 -114
- package/lib/table/module/menu/mixin.min.js +1 -1
- package/lib/table/module/menu/panel.js +36 -34
- package/lib/table/module/menu/panel.min.js +1 -1
- package/lib/table/module/validator/mixin.js +225 -214
- package/lib/table/module/validator/mixin.min.js +1 -1
- package/lib/table/render/index.js +401 -297
- package/lib/table/render/index.min.js +1 -1
- package/lib/table/src/body.js +411 -349
- package/lib/table/src/body.min.js +1 -1
- package/lib/table/src/cell.js +470 -344
- package/lib/table/src/cell.min.js +1 -1
- package/lib/table/src/column.js +10 -10
- package/lib/table/src/column.min.js +1 -1
- package/lib/table/src/columnInfo.js +46 -55
- package/lib/table/src/columnInfo.min.js +1 -1
- package/lib/table/src/footer.js +157 -132
- package/lib/table/src/footer.min.js +1 -1
- package/lib/table/src/group.js +1 -1
- package/lib/table/src/group.min.js +1 -1
- package/lib/table/src/header.js +170 -153
- package/lib/table/src/header.min.js +1 -1
- package/lib/table/src/methods.js +2758 -2478
- package/lib/table/src/methods.min.js +1 -1
- package/lib/table/src/props.js +33 -74
- package/lib/table/src/props.min.js +1 -1
- package/lib/table/src/table.js +519 -397
- package/lib/table/src/table.min.js +1 -1
- package/lib/table/src/util.js +143 -131
- package/lib/table/src/util.min.js +1 -1
- package/lib/table/style/style.css +37 -48
- package/lib/table/style/style.min.css +1 -1
- package/lib/toolbar/index.js +3 -3
- package/lib/toolbar/index.min.js +1 -1
- package/lib/toolbar/src/toolbar.js +332 -284
- package/lib/toolbar/src/toolbar.min.js +1 -1
- package/lib/toolbar/style/style.css +0 -1
- package/lib/toolbar/style/style.min.css +1 -1
- package/lib/ui/index.js +50 -41
- package/lib/ui/index.min.js +1 -1
- package/lib/ui/src/comp.js +2 -3
- package/lib/ui/src/comp.min.js +1 -1
- package/lib/ui/src/dom.js +29 -28
- package/lib/ui/src/dom.min.js +1 -1
- package/lib/ui/src/log.js +6 -4
- package/lib/ui/src/log.min.js +1 -1
- package/lib/ui/src/utils.js +7 -7
- package/lib/v-x-e-table/index.js +3 -4
- package/lib/v-x-e-table/index.min.js +1 -1
- package/lib/vxe-colgroup/index.js +3 -4
- package/lib/vxe-colgroup/index.min.js +1 -1
- package/lib/vxe-column/index.js +3 -4
- package/lib/vxe-column/index.min.js +1 -1
- package/lib/vxe-grid/index.js +3 -4
- package/lib/vxe-grid/index.min.js +1 -1
- package/lib/vxe-grid/style/style.css +0 -1
- package/lib/vxe-grid/style/style.min.css +1 -1
- package/lib/vxe-table/index.js +3 -4
- package/lib/vxe-table/index.min.js +1 -1
- package/lib/vxe-table/style/style.css +37 -48
- package/lib/vxe-table/style/style.min.css +1 -1
- package/lib/vxe-toolbar/index.js +3 -4
- package/lib/vxe-toolbar/index.min.js +1 -1
- package/lib/vxe-toolbar/style/style.css +0 -1
- package/lib/vxe-toolbar/style/style.min.css +1 -1
- package/lib/vxe-ui/index.js +3 -4
- package/lib/vxe-ui/index.min.js +1 -1
- package/lib/vxe-v-x-e-table/index.js +3 -4
- package/lib/vxe-v-x-e-table/index.min.js +1 -1
- package/package.json +5 -4
- package/packages/grid/src/grid.ts +127 -65
- package/packages/locale/lang/en-US.ts +2 -10
- package/packages/locale/lang/es-ES.ts +2 -1
- package/packages/locale/lang/hu-HU.ts +497 -503
- package/packages/locale/lang/ja-JP.ts +2 -10
- package/packages/locale/lang/ko-KR.ts +2 -10
- package/packages/locale/lang/pt-BR.ts +2 -10
- package/packages/locale/lang/ru-RU.ts +497 -505
- package/packages/locale/lang/uk-UA.ts +667 -0
- package/packages/locale/lang/vi-VN.ts +2 -10
- package/packages/locale/lang/zh-CHT.ts +667 -0
- package/packages/locale/lang/zh-CN.ts +2 -10
- package/packages/locale/lang/zh-HK.ts +2 -2
- package/packages/locale/lang/zh-MO.ts +2 -2
- package/packages/locale/lang/zh-TC.ts +2 -674
- package/packages/locale/lang/zh-TW.ts +2 -2
- package/packages/table/module/custom/panel.ts +186 -175
- package/packages/table/module/edit/mixin.ts +32 -23
- package/packages/table/module/export/export-panel.ts +36 -4
- package/packages/table/module/export/import-panel.ts +29 -6
- package/packages/table/module/export/mixin.ts +11 -11
- package/packages/table/module/menu/mixin.ts +2 -2
- package/packages/table/module/validator/mixin.ts +4 -4
- package/packages/table/render/index.ts +20 -11
- package/packages/table/src/body.ts +1 -0
- package/packages/table/src/columnInfo.ts +3 -3
- package/packages/table/src/methods.ts +53 -42
- package/packages/table/src/props.ts +68 -15
- package/packages/table/src/table.ts +183 -57
- package/packages/table/src/util.ts +3 -2
- package/packages/toolbar/src/toolbar.ts +21 -7
- package/packages/ui/index.ts +3 -1
- package/styles/components/table.scss +82 -17
- package/types/all.d.ts +1 -0
- /package/es/{iconfont.1726318179195.ttf → iconfont.1728348263835.ttf} +0 -0
- /package/es/{iconfont.1726318179195.woff → iconfont.1728348263835.woff} +0 -0
- /package/es/{iconfont.1726318179195.woff2 → iconfont.1728348263835.woff2} +0 -0
- /package/lib/{iconfont.1726318179195.ttf → iconfont.1728348263835.ttf} +0 -0
- /package/lib/{iconfont.1726318179195.woff → iconfont.1728348263835.woff} +0 -0
- /package/lib/{iconfont.1726318179195.woff2 → iconfont.1728348263835.woff2} +0 -0
package/lib/table/src/footer.js
CHANGED
|
@@ -8,18 +8,15 @@ var _xeUtils = _interopRequireDefault(require("xe-utils"));
|
|
|
8
8
|
var _utils = require("../../ui/src/utils");
|
|
9
9
|
var _dom = require("../../ui/src/dom");
|
|
10
10
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
11
|
-
|
|
12
|
-
function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
|
|
13
|
-
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
14
|
-
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
15
|
-
var cellType = 'footer';
|
|
11
|
+
const cellType = 'footer';
|
|
16
12
|
function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
|
|
17
|
-
for (
|
|
18
|
-
|
|
19
|
-
mergeRowIndex
|
|
20
|
-
mergeColIndex
|
|
21
|
-
mergeRowspan
|
|
22
|
-
mergeColspan
|
|
13
|
+
for (let mIndex = 0; mIndex < mergeFooterList.length; mIndex++) {
|
|
14
|
+
const {
|
|
15
|
+
row: mergeRowIndex,
|
|
16
|
+
col: mergeColIndex,
|
|
17
|
+
rowspan: mergeRowspan,
|
|
18
|
+
colspan: mergeColspan
|
|
19
|
+
} = mergeFooterList[mIndex];
|
|
23
20
|
if (mergeColIndex > -1 && mergeRowIndex > -1 && mergeRowspan && mergeColspan) {
|
|
24
21
|
if (mergeRowIndex === _rowIndex && mergeColIndex === _columnIndex) {
|
|
25
22
|
return {
|
|
@@ -45,57 +42,69 @@ var _default = exports.default = {
|
|
|
45
42
|
fixedType: String,
|
|
46
43
|
size: String
|
|
47
44
|
},
|
|
48
|
-
mounted
|
|
49
|
-
|
|
50
|
-
$
|
|
51
|
-
$
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
elemStore[
|
|
45
|
+
mounted() {
|
|
46
|
+
const {
|
|
47
|
+
$parent: $xetable,
|
|
48
|
+
$el,
|
|
49
|
+
$refs,
|
|
50
|
+
fixedType
|
|
51
|
+
} = this;
|
|
52
|
+
const {
|
|
53
|
+
elemStore
|
|
54
|
+
} = $xetable;
|
|
55
|
+
const prefix = `${fixedType || 'main'}-footer-`;
|
|
56
|
+
elemStore[`${prefix}wrapper`] = $el;
|
|
57
|
+
elemStore[`${prefix}table`] = $refs.table;
|
|
58
|
+
elemStore[`${prefix}colgroup`] = $refs.colgroup;
|
|
59
|
+
elemStore[`${prefix}list`] = $refs.tfoot;
|
|
60
|
+
elemStore[`${prefix}xSpace`] = $refs.xSpace;
|
|
60
61
|
},
|
|
61
|
-
destroyed
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
elemStore[
|
|
62
|
+
destroyed() {
|
|
63
|
+
const {
|
|
64
|
+
$parent: $xetable,
|
|
65
|
+
fixedType
|
|
66
|
+
} = this;
|
|
67
|
+
const {
|
|
68
|
+
elemStore
|
|
69
|
+
} = $xetable;
|
|
70
|
+
const prefix = `${fixedType || 'main'}-footer-`;
|
|
71
|
+
elemStore[`${prefix}wrapper`] = null;
|
|
72
|
+
elemStore[`${prefix}table`] = null;
|
|
73
|
+
elemStore[`${prefix}colgroup`] = null;
|
|
74
|
+
elemStore[`${prefix}list`] = null;
|
|
75
|
+
elemStore[`${prefix}xSpace`] = null;
|
|
71
76
|
},
|
|
72
|
-
render
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
77
|
+
render(h) {
|
|
78
|
+
let {
|
|
79
|
+
_e,
|
|
80
|
+
$parent: $xetable,
|
|
81
|
+
fixedType,
|
|
82
|
+
fixedColumn,
|
|
83
|
+
tableColumn,
|
|
84
|
+
footerTableData
|
|
85
|
+
} = this;
|
|
86
|
+
const {
|
|
87
|
+
$listeners: tableListeners,
|
|
88
|
+
tId,
|
|
89
|
+
footerRowClassName,
|
|
90
|
+
footerCellClassName,
|
|
91
|
+
footerRowStyle,
|
|
92
|
+
footerCellStyle,
|
|
93
|
+
footerAlign: allFooterAlign,
|
|
94
|
+
mergeFooterList,
|
|
95
|
+
footerSpanMethod,
|
|
96
|
+
align: allAlign,
|
|
97
|
+
scrollXLoad,
|
|
98
|
+
columnKey,
|
|
99
|
+
columnOpts,
|
|
100
|
+
showFooterOverflow: allColumnFooterOverflow,
|
|
101
|
+
currentColumn,
|
|
102
|
+
overflowX,
|
|
103
|
+
scrollbarWidth,
|
|
104
|
+
tooltipOpts,
|
|
105
|
+
visibleColumn,
|
|
106
|
+
expandColumn
|
|
107
|
+
} = $xetable;
|
|
99
108
|
// 如果是使用优化模式
|
|
100
109
|
if (fixedType) {
|
|
101
110
|
// 如果存在展开行使用全量渲染
|
|
@@ -110,7 +119,7 @@ var _default = exports.default = {
|
|
|
110
119
|
}
|
|
111
120
|
}
|
|
112
121
|
return h('div', {
|
|
113
|
-
class: ['vxe-table--footer-wrapper', fixedType ?
|
|
122
|
+
class: ['vxe-table--footer-wrapper', fixedType ? `fixed-${fixedType}--wrapper` : 'body--wrapper'],
|
|
114
123
|
attrs: {
|
|
115
124
|
xid: tId
|
|
116
125
|
},
|
|
@@ -135,7 +144,7 @@ var _default = exports.default = {
|
|
|
135
144
|
*/
|
|
136
145
|
h('colgroup', {
|
|
137
146
|
ref: 'colgroup'
|
|
138
|
-
}, tableColumn.map(
|
|
147
|
+
}, tableColumn.map((column, $columnIndex) => {
|
|
139
148
|
return h('col', {
|
|
140
149
|
attrs: {
|
|
141
150
|
name: column.id
|
|
@@ -152,52 +161,54 @@ var _default = exports.default = {
|
|
|
152
161
|
*/
|
|
153
162
|
h('tfoot', {
|
|
154
163
|
ref: 'tfoot'
|
|
155
|
-
}, footerTableData.map(
|
|
156
|
-
|
|
157
|
-
|
|
164
|
+
}, footerTableData.map((list, _rowIndex) => {
|
|
165
|
+
const $rowIndex = _rowIndex;
|
|
166
|
+
const rowParams = {
|
|
158
167
|
$table: $xetable,
|
|
159
168
|
row: list,
|
|
160
|
-
_rowIndex
|
|
161
|
-
$rowIndex
|
|
169
|
+
_rowIndex,
|
|
170
|
+
$rowIndex,
|
|
162
171
|
fixed: fixedType,
|
|
163
172
|
type: cellType
|
|
164
173
|
};
|
|
165
174
|
return h('tr', {
|
|
166
175
|
class: ['vxe-footer--row', footerRowClassName ? _xeUtils.default.isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ''],
|
|
167
176
|
style: footerRowStyle ? _xeUtils.default.isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle : null
|
|
168
|
-
}, tableColumn.map(
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
177
|
+
}, tableColumn.map((column, $columnIndex) => {
|
|
178
|
+
const {
|
|
179
|
+
type,
|
|
180
|
+
showFooterOverflow,
|
|
181
|
+
footerAlign,
|
|
182
|
+
align,
|
|
183
|
+
footerClassName
|
|
184
|
+
} = column;
|
|
185
|
+
const showAllTip = tooltipOpts.showAll || tooltipOpts.enabled;
|
|
186
|
+
const isColGroup = column.children && column.children.length;
|
|
187
|
+
const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : column.fixed && overflowX;
|
|
188
|
+
const footOverflow = _xeUtils.default.isUndefined(showFooterOverflow) || _xeUtils.default.isNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
|
|
189
|
+
const footAlign = footerAlign || align || allFooterAlign || allAlign;
|
|
190
|
+
let showEllipsis = footOverflow === 'ellipsis';
|
|
191
|
+
const showTitle = footOverflow === 'title';
|
|
192
|
+
const showTooltip = footOverflow === true || footOverflow === 'tooltip';
|
|
193
|
+
let hasEllipsis = showTitle || showTooltip || showEllipsis;
|
|
194
|
+
const attrs = {
|
|
184
195
|
colid: column.id
|
|
185
196
|
};
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
197
|
+
const tfOns = {};
|
|
198
|
+
const columnIndex = $xetable.getColumnIndex(column);
|
|
199
|
+
const _columnIndex = $xetable.getVTColumnIndex(column);
|
|
200
|
+
const itemIndex = _columnIndex;
|
|
201
|
+
const cellParams = {
|
|
191
202
|
$table: $xetable,
|
|
192
203
|
$grid: $xetable.xegrid,
|
|
193
204
|
row: list,
|
|
194
|
-
_rowIndex
|
|
195
|
-
$rowIndex
|
|
196
|
-
column
|
|
197
|
-
columnIndex
|
|
198
|
-
$columnIndex
|
|
199
|
-
_columnIndex
|
|
200
|
-
itemIndex
|
|
205
|
+
_rowIndex,
|
|
206
|
+
$rowIndex,
|
|
207
|
+
column,
|
|
208
|
+
columnIndex,
|
|
209
|
+
$columnIndex,
|
|
210
|
+
_columnIndex,
|
|
211
|
+
itemIndex,
|
|
201
212
|
items: list,
|
|
202
213
|
fixed: fixedType,
|
|
203
214
|
type: cellType,
|
|
@@ -208,7 +219,7 @@ var _default = exports.default = {
|
|
|
208
219
|
showEllipsis = hasEllipsis = true;
|
|
209
220
|
}
|
|
210
221
|
if (showTitle || showTooltip || showAllTip) {
|
|
211
|
-
tfOns.mouseenter =
|
|
222
|
+
tfOns.mouseenter = evnt => {
|
|
212
223
|
if (showTitle) {
|
|
213
224
|
(0, _dom.updateCellTitle)(evnt.currentTarget, column);
|
|
214
225
|
} else if (showTooltip || showAllTip) {
|
|
@@ -217,21 +228,21 @@ var _default = exports.default = {
|
|
|
217
228
|
};
|
|
218
229
|
}
|
|
219
230
|
if (showTooltip || showAllTip) {
|
|
220
|
-
tfOns.mouseleave =
|
|
231
|
+
tfOns.mouseleave = evnt => {
|
|
221
232
|
if (showTooltip || showAllTip) {
|
|
222
233
|
$xetable.handleTargetLeaveEvent(evnt);
|
|
223
234
|
}
|
|
224
235
|
};
|
|
225
236
|
}
|
|
226
237
|
if (tableListeners['footer-cell-click']) {
|
|
227
|
-
tfOns.click =
|
|
238
|
+
tfOns.click = evnt => {
|
|
228
239
|
$xetable.emitEvent('footer-cell-click', Object.assign({
|
|
229
240
|
cell: evnt.currentTarget
|
|
230
241
|
}, cellParams), evnt);
|
|
231
242
|
};
|
|
232
243
|
}
|
|
233
244
|
if (tableListeners['footer-cell-dblclick']) {
|
|
234
|
-
tfOns.dblclick =
|
|
245
|
+
tfOns.dblclick = evnt => {
|
|
235
246
|
$xetable.emitEvent('footer-cell-dblclick', Object.assign({
|
|
236
247
|
cell: evnt.currentTarget
|
|
237
248
|
}, cellParams), evnt);
|
|
@@ -239,10 +250,12 @@ var _default = exports.default = {
|
|
|
239
250
|
}
|
|
240
251
|
// 合并行或列
|
|
241
252
|
if (mergeFooterList.length) {
|
|
242
|
-
|
|
253
|
+
const spanRest = mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex);
|
|
243
254
|
if (spanRest) {
|
|
244
|
-
|
|
245
|
-
|
|
255
|
+
const {
|
|
256
|
+
rowspan,
|
|
257
|
+
colspan
|
|
258
|
+
} = spanRest;
|
|
246
259
|
if (!rowspan || !colspan) {
|
|
247
260
|
return null;
|
|
248
261
|
}
|
|
@@ -255,24 +268,30 @@ var _default = exports.default = {
|
|
|
255
268
|
}
|
|
256
269
|
} else if (footerSpanMethod) {
|
|
257
270
|
// 自定义合并方法
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
if (!_rowspan || !_colspan) {
|
|
271
|
+
const {
|
|
272
|
+
rowspan = 1,
|
|
273
|
+
colspan = 1
|
|
274
|
+
} = footerSpanMethod(cellParams) || {};
|
|
275
|
+
if (!rowspan || !colspan) {
|
|
264
276
|
return null;
|
|
265
277
|
}
|
|
266
|
-
if (
|
|
267
|
-
attrs.rowspan =
|
|
278
|
+
if (rowspan > 1) {
|
|
279
|
+
attrs.rowspan = rowspan;
|
|
268
280
|
}
|
|
269
|
-
if (
|
|
270
|
-
attrs.colspan =
|
|
281
|
+
if (colspan > 1) {
|
|
282
|
+
attrs.colspan = colspan;
|
|
271
283
|
}
|
|
272
284
|
}
|
|
273
285
|
return h('td', {
|
|
274
|
-
class: ['vxe-footer--column', column.id,
|
|
275
|
-
|
|
286
|
+
class: ['vxe-footer--column', column.id, {
|
|
287
|
+
[`col--${footAlign}`]: footAlign,
|
|
288
|
+
[`col--${type}`]: type,
|
|
289
|
+
'col--last': $columnIndex === tableColumn.length - 1,
|
|
290
|
+
'fixed--hidden': fixedHiddenColumn,
|
|
291
|
+
'col--ellipsis': hasEllipsis,
|
|
292
|
+
'col--current': currentColumn === column
|
|
293
|
+
}, (0, _utils.getClass)(footerClassName, cellParams), (0, _utils.getClass)(footerCellClassName, cellParams)],
|
|
294
|
+
attrs,
|
|
276
295
|
style: footerCellStyle ? _xeUtils.default.isFunction(footerCellStyle) ? footerCellStyle(cellParams) : footerCellStyle : null,
|
|
277
296
|
on: tfOns,
|
|
278
297
|
key: columnKey || columnOpts.useKey ? column.id : $columnIndex
|
|
@@ -294,22 +313,28 @@ var _default = exports.default = {
|
|
|
294
313
|
* 如果存在列固定左侧,同步更新滚动状态
|
|
295
314
|
* 如果存在列固定右侧,同步更新滚动状态
|
|
296
315
|
*/
|
|
297
|
-
scrollEvent
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
316
|
+
scrollEvent(evnt) {
|
|
317
|
+
const {
|
|
318
|
+
$parent: $xetable,
|
|
319
|
+
fixedType
|
|
320
|
+
} = this;
|
|
321
|
+
const {
|
|
322
|
+
$refs,
|
|
323
|
+
scrollXLoad,
|
|
324
|
+
triggerScrollXEvent,
|
|
325
|
+
lastScrollLeft
|
|
326
|
+
} = $xetable;
|
|
327
|
+
const {
|
|
328
|
+
tableHeader,
|
|
329
|
+
tableBody,
|
|
330
|
+
tableFooter,
|
|
331
|
+
validTip
|
|
332
|
+
} = $refs;
|
|
333
|
+
const headerElem = tableHeader ? tableHeader.$el : null;
|
|
334
|
+
const footerElem = tableFooter ? tableFooter.$el : null;
|
|
335
|
+
const bodyElem = tableBody.$el;
|
|
336
|
+
const scrollLeft = footerElem ? footerElem.scrollLeft : 0;
|
|
337
|
+
const isX = scrollLeft !== lastScrollLeft;
|
|
313
338
|
$xetable.lastScrollLeft = scrollLeft;
|
|
314
339
|
$xetable.lastScrollTime = Date.now();
|
|
315
340
|
if (headerElem) {
|
|
@@ -328,8 +353,8 @@ var _default = exports.default = {
|
|
|
328
353
|
type: cellType,
|
|
329
354
|
fixed: fixedType,
|
|
330
355
|
scrollTop: bodyElem.scrollTop,
|
|
331
|
-
scrollLeft
|
|
332
|
-
isX
|
|
356
|
+
scrollLeft,
|
|
357
|
+
isX,
|
|
333
358
|
isY: false
|
|
334
359
|
}, evnt);
|
|
335
360
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let cellType="footer";function mergeFooterMethod(l,t,o){for(let e=0;e<l.length;e++){var{row:r,col:a,rowspan:n,colspan:i}=l[e];if(-1<a&&-1<r&&n&&i){if(r===t&&a===o)return{rowspan:n,colspan:i};if(r<=t&&t<r+n&&a<=o&&o<a+i)return{rowspan:0,colspan:0}}}}var _default=exports.default={name:"VxeTableFooter",props:{footerTableData:Array,tableColumn:Array,fixedColumn:Array,fixedType:String,size:String},mounted(){var{$parent:e,$el:l,$refs:t,fixedType:o}=this,e=e.elemStore,o=`${o||"main"}-footer-`;e[o+"wrapper"]=l,e[o+"table"]=t.table,e[o+"colgroup"]=t.colgroup,e[o+"list"]=t.tfoot,e[o+"xSpace"]=t.xSpace},destroyed(){var{$parent:e,fixedType:l}=this,e=e.elemStore,l=`${l||"main"}-footer-`;e[l+"wrapper"]=null,e[l+"table"]=null,e[l+"colgroup"]=null,e[l+"list"]=null,e[l+"xSpace"]=null},render(y){let{_e:e,$parent:T,fixedType:_,fixedColumn:l,tableColumn:h,footerTableData:$}=this,{$listeners:C,tId:t,footerRowClassName:o,footerCellClassName:S,footerRowStyle:r,footerCellStyle:F,footerAlign:I,mergeFooterList:L,footerSpanMethod:k,align:E,scrollXLoad:O,columnKey:U,columnOpts:A,showFooterOverflow:q,currentColumn:D,overflowX:M,scrollbarWidth:a,tooltipOpts:X,visibleColumn:n,expandColumn:i}=T;return _&&(h=i||!O&&!q||L.length&&k?n:l),y("div",{class:["vxe-table--footer-wrapper",_?`fixed-${_}--wrapper`:"body--wrapper"],attrs:{xid:t},on:{scroll:this.scrollEvent}},[_?e():y("div",{class:"vxe-body--x-space",ref:"xSpace"}),y("table",{class:"vxe-table--footer",attrs:{xid:t,cellspacing:0,cellpadding:0,border:0},ref:"table"},[y("colgroup",{ref:"colgroup"},h.map((e,l)=>y("col",{attrs:{name:e.id},key:l})).concat(a?[y("col",{attrs:{name:"col_gutter"}})]:[])),y("tfoot",{ref:"tfoot"},$.map((v,b)=>{let w=b;var e={$table:T,row:v,_rowIndex:b,$rowIndex:w,fixed:_,type:cellType};return y("tr",{class:["vxe-footer--row",o?_xeUtils.default.isFunction(o)?o(e):o:""],style:r?_xeUtils.default.isFunction(r)?r(e):r:null},h.map((l,e)=>{var{type:t,showFooterOverflow:o,footerAlign:r,align:a,footerClassName:n}=l;let i=X.showAll||X.enabled;var s=l.children&&l.children.length,s=_?l.fixed!==_&&!s:l.fixed&&M,o=_xeUtils.default.isUndefined(o)||_xeUtils.default.isNull(o)?q:o,r=r||a||I||E;let c="ellipsis"===o,d="title"===o,u=!0===o||"tooltip"===o,p=d||u||c;var a={colid:l.id},o={},f=T.getColumnIndex(l),x=T.getVTColumnIndex(l),m=x;let g={$table:T,$grid:T.xegrid,row:v,_rowIndex:b,$rowIndex:w,column:l,columnIndex:f,$columnIndex:e,_columnIndex:x,itemIndex:m,items:v,fixed:_,type:cellType,data:$};if(O&&!p&&(c=p=!0),(d||u||i)&&(o.mouseenter=e=>{d?(0,_dom.updateCellTitle)(e.currentTarget,l):(u||i)&&T.triggerFooterTooltipEvent(e,g)}),(u||i)&&(o.mouseleave=e=>{(u||i)&&T.handleTargetLeaveEvent(e)}),C["footer-cell-click"]&&(o.click=e=>{T.emitEvent("footer-cell-click",Object.assign({cell:e.currentTarget},g),e)}),C["footer-cell-dblclick"]&&(o.dblclick=e=>{T.emitEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},g),e)}),L.length){f=mergeFooterMethod(L,b,x);if(f){var{rowspan:m,colspan:x}=f;if(!m||!x)return null;1<m&&(a.rowspan=m),1<x&&(a.colspan=x)}}else if(k){var{rowspan:f=1,colspan:m=1}=k(g)||{};if(!f||!m)return null;1<f&&(a.rowspan=f),1<m&&(a.colspan=m)}return y("td",{class:["vxe-footer--column",l.id,{["col--"+r]:r,["col--"+t]:t,"col--last":e===h.length-1,"fixed--hidden":s,"col--ellipsis":p,"col--current":D===l},(0,_utils.getClass)(n,g),(0,_utils.getClass)(S,g)],attrs:a,style:F?_xeUtils.default.isFunction(F)?F(g):F:null,on:o,key:U||A.useKey?l.id:e},[y("div",{class:["vxe-cell",{"c--title":d,"c--tooltip":u,"c--ellipsis":c}]},l.renderFooter(y,g))])}).concat(a?[y("td",{class:"vxe-footer--gutter col--gutter"})]:[]))}))])])},methods:{scrollEvent(e){var{$parent:l,fixedType:t}=this,{$refs:o,scrollXLoad:r,triggerScrollXEvent:a,lastScrollLeft:n}=l,{tableHeader:o,tableBody:i,tableFooter:s,validTip:c}=o,o=o?o.$el:null,s=s?s.$el:null,i=i.$el,s=s?s.scrollLeft:0,n=s!==n;l.lastScrollLeft=s,l.lastScrollTime=Date.now(),o&&(o.scrollLeft=s),i&&(i.scrollLeft=s),r&&n&&a(e),n&&c&&c.visible&&c.updatePlacement(),l.emitEvent("scroll",{type:cellType,fixed:t,scrollTop:i.scrollTop,scrollLeft:s,isX:n,isY:!1},e)}}};
|
package/lib/table/src/group.js
CHANGED
|
@@ -9,7 +9,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
|
|
|
9
9
|
var _default = exports.default = {
|
|
10
10
|
name: 'VxeColgroup',
|
|
11
11
|
extends: _column.default,
|
|
12
|
-
provide
|
|
12
|
+
provide() {
|
|
13
13
|
return {
|
|
14
14
|
xecolgroup: this,
|
|
15
15
|
$xegrid: null
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _column=_interopRequireDefault(require("./column"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default=exports.default={name:"VxeColgroup",extends:_column.default,provide
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _column=_interopRequireDefault(require("./column"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default=exports.default={name:"VxeColgroup",extends:_column.default,provide(){return{xecolgroup:this,$xegrid:null}}};
|