vxe-table 3.4.15 → 3.5.0-beta.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/lib/button/src/button.js +19 -9
- package/lib/button/src/button.min.js +1 -1
- package/lib/checkbox/src/checkbox.js +2 -2
- package/lib/checkbox/src/checkbox.min.js +1 -1
- package/lib/edit/src/mixin.js +26 -18
- package/lib/edit/src/mixin.min.js +1 -1
- package/lib/export/src/export-panel.js +2 -2
- package/lib/export/src/export-panel.min.js +1 -1
- package/lib/export/src/import-panel.js +2 -2
- package/lib/export/src/import-panel.min.js +1 -1
- package/lib/export/src/mixin.js +26 -24
- package/lib/export/src/mixin.min.js +1 -1
- package/lib/filter/src/mixin.js +4 -4
- package/lib/filter/src/mixin.min.js +1 -1
- package/lib/filter/src/panel.js +2 -2
- package/lib/filter/src/panel.min.js +1 -1
- package/lib/footer/src/footer.js +7 -4
- package/lib/footer/src/footer.min.js +1 -1
- package/lib/form/src/form-gather.js +2 -2
- package/lib/form/src/form-gather.min.js +1 -1
- package/lib/form/src/form-item.js +3 -3
- package/lib/form/src/form-item.min.js +1 -1
- package/lib/form/src/form.js +17 -11
- package/lib/form/src/form.min.js +1 -1
- package/lib/form/src/render.js +5 -5
- package/lib/form/src/render.min.js +1 -1
- package/lib/form/src/util.js +2 -2
- package/lib/form/src/util.min.js +1 -1
- package/lib/grid/src/grid.js +44 -34
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/header/src/header.js +10 -8
- package/lib/header/src/header.min.js +1 -1
- package/lib/index.umd.js +1963 -1083
- package/lib/index.umd.min.js +1 -2
- package/lib/input/src/input.js +30 -18
- package/lib/input/src/input.min.js +1 -1
- package/lib/keyboard/src/mixin.js +12 -8
- package/lib/keyboard/src/mixin.min.js +1 -1
- package/lib/list/src/list.js +7 -5
- package/lib/list/src/list.min.js +1 -1
- package/lib/menu/src/mixin.js +24 -14
- package/lib/menu/src/mixin.min.js +1 -1
- package/lib/menu/src/panel.js +3 -3
- package/lib/menu/src/panel.min.js +1 -1
- package/lib/modal/src/modal.js +24 -12
- package/lib/modal/src/modal.min.js +1 -1
- package/lib/pulldown/src/pulldown.js +16 -12
- package/lib/pulldown/src/pulldown.min.js +1 -1
- package/lib/radio/src/button.js +2 -2
- package/lib/radio/src/button.min.js +1 -1
- package/lib/radio/src/radio.js +2 -2
- package/lib/radio/src/radio.min.js +1 -1
- package/lib/select/src/select.js +26 -16
- package/lib/select/src/select.min.js +1 -1
- package/lib/switch/src/switch.js +4 -4
- package/lib/switch/src/switch.min.js +1 -1
- package/lib/table/src/body.js +34 -33
- package/lib/table/src/body.min.js +1 -1
- package/lib/table/src/cell.js +19 -11
- package/lib/table/src/cell.min.js +1 -1
- package/lib/table/src/column.js +3 -3
- package/lib/table/src/column.min.js +1 -1
- package/lib/table/src/columnInfo.js +201 -0
- package/lib/table/src/columnInfo.min.js +1 -0
- package/lib/table/src/methods.js +85 -85
- package/lib/table/src/methods.min.js +1 -1
- package/lib/table/src/table.js +80 -62
- package/lib/table/src/table.min.js +1 -1
- package/lib/table/src/util.js +38 -3
- package/lib/table/src/util.min.js +1 -1
- package/lib/textarea/src/textarea.js +2 -2
- package/lib/textarea/src/textarea.min.js +1 -1
- package/lib/toolbar/src/toolbar.js +16 -10
- package/lib/toolbar/src/toolbar.min.js +1 -1
- package/lib/tools/{src/dom.js → dom.js} +0 -0
- package/lib/tools/{src/dom.min.js → dom.min.js} +0 -0
- package/lib/tools/{src/event.js → event.js} +3 -6
- package/lib/tools/event.min.js +1 -0
- package/lib/tools/log.js +29 -0
- package/lib/tools/log.min.js +1 -0
- package/lib/tools/{src/resize.js → resize.js} +1 -1
- package/lib/tools/resize.min.js +1 -0
- package/lib/tools/utils.js +155 -0
- package/lib/tools/utils.min.js +1 -0
- package/lib/tooltip/src/tooltip.js +8 -6
- package/lib/tooltip/src/tooltip.min.js +1 -1
- package/lib/v-x-e-table/index.js +7 -4
- package/lib/v-x-e-table/index.min.js +1 -1
- package/lib/v-x-e-table/src/conf.js +3 -1
- package/lib/v-x-e-table/src/interceptor.js +4 -4
- package/lib/v-x-e-table/src/interceptor.min.js +1 -1
- package/lib/v-x-e-table/src/renderer.js +18 -10
- package/lib/v-x-e-table/src/renderer.min.js +1 -1
- package/lib/v-x-e-table/src/store.js +3 -3
- package/lib/v-x-e-table/src/store.min.js +1 -1
- package/lib/validator/src/mixin.js +4 -4
- package/lib/validator/src/mixin.min.js +1 -1
- package/package.json +1 -1
- package/packages/button/src/button.js +4 -2
- package/packages/checkbox/src/checkbox.js +2 -2
- package/packages/edit/src/mixin.js +7 -6
- package/packages/export/src/export-panel.js +1 -1
- package/packages/export/src/import-panel.js +1 -1
- package/packages/export/src/mixin.js +20 -19
- package/packages/filter/src/mixin.js +3 -3
- package/packages/filter/src/panel.js +1 -1
- package/packages/footer/src/footer.js +4 -2
- package/packages/form/src/form-gather.js +2 -2
- package/packages/form/src/form-item.js +2 -2
- package/packages/form/src/form.js +7 -7
- package/packages/form/src/render.js +4 -4
- package/packages/form/src/util.js +2 -2
- package/packages/grid/src/grid.js +22 -20
- package/packages/header/src/header.js +3 -2
- package/packages/input/src/input.js +6 -3
- package/packages/keyboard/src/mixin.js +1 -2
- package/packages/list/src/list.js +3 -2
- package/packages/menu/src/mixin.js +5 -3
- package/packages/menu/src/panel.js +3 -3
- package/packages/modal/src/modal.js +7 -4
- package/packages/pulldown/src/pulldown.js +3 -1
- package/packages/radio/src/button.js +2 -2
- package/packages/radio/src/radio.js +2 -2
- package/packages/select/src/select.js +5 -3
- package/packages/switch/src/switch.js +4 -4
- package/packages/table/src/body.js +23 -22
- package/packages/table/src/cell.js +5 -4
- package/packages/table/src/column.js +1 -1
- package/packages/table/src/columnInfo.js +148 -0
- package/packages/table/src/methods.js +50 -50
- package/packages/table/src/table.js +56 -41
- package/packages/table/src/util.js +19 -1
- package/packages/textarea/src/textarea.js +2 -2
- package/packages/toolbar/src/toolbar.js +7 -4
- package/packages/tools/{src/dom.js → dom.js} +0 -0
- package/packages/tools/{src/event.js → event.js} +1 -3
- package/packages/tools/log.js +16 -0
- package/packages/tools/{src/resize.js → resize.js} +1 -1
- package/packages/tools/utils.js +108 -0
- package/packages/tooltip/src/tooltip.js +2 -1
- package/packages/v-x-e-table/index.js +4 -2
- package/packages/v-x-e-table/src/conf.js +3 -1
- package/packages/v-x-e-table/src/interceptor.js +3 -3
- package/packages/v-x-e-table/src/renderer.js +4 -3
- package/packages/v-x-e-table/src/store.js +2 -2
- package/packages/validator/src/mixin.js +3 -3
- package/types/v-x-e-table/index.d.ts +8 -0
- package/lib/tools/index.js +0 -76
- package/lib/tools/index.min.js +0 -1
- package/lib/tools/src/event.min.js +0 -1
- package/lib/tools/src/resize.min.js +0 -1
- package/lib/tools/src/utils.js +0 -365
- package/lib/tools/src/utils.min.js +0 -1
- package/packages/tools/index.js +0 -14
- package/packages/tools/src/utils.js +0 -272
|
@@ -0,0 +1,148 @@
|
|
|
1
|
+
import XEUtils from 'xe-utils'
|
|
2
|
+
import GlobalConfig from '../../v-x-e-table/src/conf'
|
|
3
|
+
import { formats } from '../../v-x-e-table/src/formats'
|
|
4
|
+
import { toFilters } from './util'
|
|
5
|
+
import { getFuncText } from '../../tools/utils'
|
|
6
|
+
import { warnLog, errLog } from '../../tools/log'
|
|
7
|
+
|
|
8
|
+
export class ColumnInfo {
|
|
9
|
+
/* eslint-disable @typescript-eslint/no-use-before-define */
|
|
10
|
+
constructor ($xetable, _vm, { renderHeader, renderCell, renderFooter, renderData } = {}) {
|
|
11
|
+
const $xegrid = $xetable.$xegrid
|
|
12
|
+
const proxyOpts = $xegrid ? $xegrid.proxyOpts : null
|
|
13
|
+
const formatter = _vm.formatter
|
|
14
|
+
const visible = XEUtils.isBoolean(_vm.visible) ? _vm.visible : true
|
|
15
|
+
|
|
16
|
+
if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
|
|
17
|
+
const types = ['seq', 'checkbox', 'radio', 'expand', 'html']
|
|
18
|
+
if (_vm.type && types.indexOf(_vm.type) === -1) {
|
|
19
|
+
warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')])
|
|
20
|
+
}
|
|
21
|
+
if (XEUtils.isBoolean(_vm.cellRender) || (_vm.cellRender && !XEUtils.isObject(_vm.cellRender))) {
|
|
22
|
+
warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}'])
|
|
23
|
+
}
|
|
24
|
+
if (XEUtils.isBoolean(_vm.editRender) || (_vm.editRender && !XEUtils.isObject(_vm.editRender))) {
|
|
25
|
+
warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}'])
|
|
26
|
+
}
|
|
27
|
+
if (_vm.cellRender && _vm.editRender) {
|
|
28
|
+
warnLog('vxe.error.errConflicts', ['column.cell-render', 'column.edit-render'])
|
|
29
|
+
}
|
|
30
|
+
if (_vm.type === 'expand') {
|
|
31
|
+
if ($xetable.treeConfig && $xetable.treeOpts.line) {
|
|
32
|
+
errLog('vxe.error.errConflicts', ['tree-config.line', 'column.type=expand'])
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
if (_vm.remoteSort) {
|
|
36
|
+
warnLog('vxe.error.delProp', ['column.remote-sort', 'sort-config.remote'])
|
|
37
|
+
}
|
|
38
|
+
if (_vm.sortMethod) {
|
|
39
|
+
warnLog('vxe.error.delProp', ['column.sort-method', 'sort-config.sortMethod'])
|
|
40
|
+
}
|
|
41
|
+
if (formatter) {
|
|
42
|
+
if (XEUtils.isString(formatter)) {
|
|
43
|
+
const globalFunc = formats.get(formatter) || XEUtils[formatter]
|
|
44
|
+
if (!XEUtils.isFunction(globalFunc)) {
|
|
45
|
+
errLog('vxe.error.notFunc', [formatter])
|
|
46
|
+
}
|
|
47
|
+
} else if (XEUtils.isArray(formatter)) {
|
|
48
|
+
const globalFunc = formats.get(formatter[0]) || XEUtils[formatter[0]]
|
|
49
|
+
if (!XEUtils.isFunction(globalFunc)) {
|
|
50
|
+
errLog('vxe.error.notFunc', [formatter[0]])
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
Object.assign(this, {
|
|
57
|
+
// 基本属性
|
|
58
|
+
type: _vm.type,
|
|
59
|
+
property: _vm.field,
|
|
60
|
+
field: _vm.field,
|
|
61
|
+
title: _vm.title,
|
|
62
|
+
width: _vm.width,
|
|
63
|
+
minWidth: _vm.minWidth,
|
|
64
|
+
resizable: _vm.resizable,
|
|
65
|
+
fixed: _vm.fixed,
|
|
66
|
+
align: _vm.align,
|
|
67
|
+
headerAlign: _vm.headerAlign,
|
|
68
|
+
footerAlign: _vm.footerAlign,
|
|
69
|
+
showOverflow: _vm.showOverflow,
|
|
70
|
+
showHeaderOverflow: _vm.showHeaderOverflow,
|
|
71
|
+
showFooterOverflow: _vm.showFooterOverflow,
|
|
72
|
+
className: _vm.className,
|
|
73
|
+
headerClassName: _vm.headerClassName,
|
|
74
|
+
footerClassName: _vm.footerClassName,
|
|
75
|
+
formatter: formatter,
|
|
76
|
+
sortable: _vm.sortable,
|
|
77
|
+
sortBy: _vm.sortBy,
|
|
78
|
+
sortType: _vm.sortType,
|
|
79
|
+
sortMethod: _vm.sortMethod,
|
|
80
|
+
remoteSort: _vm.remoteSort,
|
|
81
|
+
filters: toFilters(_vm.filters),
|
|
82
|
+
filterMultiple: XEUtils.isBoolean(_vm.filterMultiple) ? _vm.filterMultiple : true,
|
|
83
|
+
filterMethod: _vm.filterMethod,
|
|
84
|
+
filterResetMethod: _vm.filterResetMethod,
|
|
85
|
+
filterRecoverMethod: _vm.filterRecoverMethod,
|
|
86
|
+
filterRender: _vm.filterRender,
|
|
87
|
+
treeNode: _vm.treeNode,
|
|
88
|
+
cellType: _vm.cellType,
|
|
89
|
+
cellRender: _vm.cellRender,
|
|
90
|
+
editRender: _vm.editRender,
|
|
91
|
+
contentRender: _vm.contentRender,
|
|
92
|
+
exportMethod: _vm.exportMethod,
|
|
93
|
+
footerExportMethod: _vm.footerExportMethod,
|
|
94
|
+
titleHelp: _vm.titleHelp,
|
|
95
|
+
// 自定义参数
|
|
96
|
+
params: _vm.params,
|
|
97
|
+
// 渲染属性
|
|
98
|
+
id: _vm.colId || XEUtils.uniqueId('col_'),
|
|
99
|
+
parentId: null,
|
|
100
|
+
visible,
|
|
101
|
+
// 内部属性(一旦被使用,将导致不可升级版本)
|
|
102
|
+
halfVisible: false,
|
|
103
|
+
defaultVisible: visible,
|
|
104
|
+
checked: false,
|
|
105
|
+
halfChecked: false,
|
|
106
|
+
disabled: false,
|
|
107
|
+
level: 1,
|
|
108
|
+
rowSpan: 1,
|
|
109
|
+
colSpan: 1,
|
|
110
|
+
order: null,
|
|
111
|
+
sortTime: 0,
|
|
112
|
+
renderWidth: 0,
|
|
113
|
+
renderHeight: 0,
|
|
114
|
+
resizeWidth: 0,
|
|
115
|
+
renderLeft: 0,
|
|
116
|
+
renderArgs: [], // 渲染参数可用于扩展
|
|
117
|
+
model: {},
|
|
118
|
+
renderHeader: renderHeader || _vm.renderHeader,
|
|
119
|
+
renderCell: renderCell || _vm.renderCell,
|
|
120
|
+
renderFooter: renderFooter || _vm.renderFooter,
|
|
121
|
+
renderData: renderData,
|
|
122
|
+
// 单元格插槽,只对 grid 有效
|
|
123
|
+
slots: _vm.slots
|
|
124
|
+
})
|
|
125
|
+
if (proxyOpts && proxyOpts.beforeColumn) {
|
|
126
|
+
proxyOpts.beforeColumn({ $grid: $xegrid, column: this })
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
getTitle () {
|
|
131
|
+
return getFuncText(this.title || (this.type === 'seq' ? GlobalConfig.i18n('vxe.table.seqTitle') : ''))
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
getKey () {
|
|
135
|
+
return this.property || (this.type ? `type=${this.type}` : null)
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
update (name, value) {
|
|
139
|
+
// 不支持双向的属性
|
|
140
|
+
if (name !== 'filters') {
|
|
141
|
+
if (name === 'field') {
|
|
142
|
+
// 兼容旧属性
|
|
143
|
+
this.property = value
|
|
144
|
+
}
|
|
145
|
+
this[name] = value
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
}
|
|
@@ -2,11 +2,11 @@ import XEUtils from 'xe-utils'
|
|
|
2
2
|
import GlobalConfig from '../../v-x-e-table/src/conf'
|
|
3
3
|
import Cell from './cell'
|
|
4
4
|
import VXETable from '../../v-x-e-table'
|
|
5
|
-
import { UtilTools, DomTools } from '../../tools'
|
|
6
5
|
import { clearTableAllStatus, handleFieldOrColumn, restoreScrollLocation, restoreScrollListener, toTreePathSeq } from './util'
|
|
7
|
-
import { eqEmptyValue, isEnableConf } from '../../tools/
|
|
8
|
-
import { browse, getPaddingTopBottomSize, setScrollTop, setScrollLeft } from '../../tools/
|
|
6
|
+
import UtilTools, { eqEmptyValue, isEnableConf, getFuncText } from '../../tools/utils'
|
|
7
|
+
import DomTools, { browse, getPaddingTopBottomSize, setScrollTop, setScrollLeft } from '../../tools/dom'
|
|
9
8
|
import { formats } from '../../v-x-e-table/src/formats'
|
|
9
|
+
import { warnLog, errLog } from '../../tools/log'
|
|
10
10
|
|
|
11
11
|
const { getRowid, getRowkey, setCellValue, hasChildrenList, getColumnList } = UtilTools
|
|
12
12
|
const { calcHeight, hasClass, addClass, removeClass, getEventTargetNode, isNodeElement } = DomTools
|
|
@@ -360,23 +360,23 @@ const Methods = {
|
|
|
360
360
|
if (treeOpts.transform) {
|
|
361
361
|
if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
|
|
362
362
|
if (!treeOpts.rowField) {
|
|
363
|
-
|
|
363
|
+
errLog('vxe.error.reqProp', ['table.tree-config.rowField'])
|
|
364
364
|
}
|
|
365
365
|
if (!treeOpts.parentField) {
|
|
366
|
-
|
|
366
|
+
errLog('vxe.error.reqProp', ['table.tree-config.parentField'])
|
|
367
367
|
}
|
|
368
368
|
if (!treeOpts.children) {
|
|
369
|
-
|
|
369
|
+
errLog('vxe.error.reqProp', ['tree-config.children'])
|
|
370
370
|
}
|
|
371
371
|
if (!treeOpts.mapChildren) {
|
|
372
|
-
|
|
372
|
+
errLog('vxe.error.reqProp', ['tree-config.mapChildren'])
|
|
373
373
|
}
|
|
374
374
|
if (treeOpts.children === treeOpts.mapChildren) {
|
|
375
|
-
|
|
375
|
+
errLog('vxe.error.errConflicts', ['tree-config.children', 'tree-config.mapChildren'])
|
|
376
376
|
}
|
|
377
377
|
fullData.forEach(row => {
|
|
378
378
|
if (row[treeOpts.children] && row[treeOpts.children].length) {
|
|
379
|
-
|
|
379
|
+
warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${treeOpts.children}`])
|
|
380
380
|
}
|
|
381
381
|
})
|
|
382
382
|
}
|
|
@@ -413,13 +413,13 @@ const Methods = {
|
|
|
413
413
|
if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
|
|
414
414
|
if (sYLoad) {
|
|
415
415
|
if (!(this.height || this.maxHeight)) {
|
|
416
|
-
|
|
416
|
+
errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}'])
|
|
417
417
|
}
|
|
418
418
|
if (!this.showOverflow) {
|
|
419
|
-
|
|
419
|
+
warnLog('vxe.error.reqProp', ['table.show-overflow'])
|
|
420
420
|
}
|
|
421
421
|
if (this.spanMethod) {
|
|
422
|
-
|
|
422
|
+
warnLog('vxe.error.scrollErrProp', ['table.span-method'])
|
|
423
423
|
}
|
|
424
424
|
}
|
|
425
425
|
}
|
|
@@ -520,7 +520,7 @@ const Methods = {
|
|
|
520
520
|
this.tableData = tableData.slice(0)
|
|
521
521
|
} else {
|
|
522
522
|
if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
|
|
523
|
-
|
|
523
|
+
warnLog('vxe.error.reqProp', ['keep-source'])
|
|
524
524
|
}
|
|
525
525
|
}
|
|
526
526
|
return this.$nextTick()
|
|
@@ -560,7 +560,7 @@ const Methods = {
|
|
|
560
560
|
this.handleTableData(true)
|
|
561
561
|
if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
|
|
562
562
|
if ((this.scrollXLoad || this.scrollYLoad) && this.expandColumn) {
|
|
563
|
-
|
|
563
|
+
warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
|
|
564
564
|
}
|
|
565
565
|
}
|
|
566
566
|
return this.$nextTick().then(() => {
|
|
@@ -660,7 +660,7 @@ const Methods = {
|
|
|
660
660
|
if (property) {
|
|
661
661
|
if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
|
|
662
662
|
if (fullColumnFieldData[property]) {
|
|
663
|
-
|
|
663
|
+
warnLog('vxe.error.colRepet', ['field', property])
|
|
664
664
|
}
|
|
665
665
|
}
|
|
666
666
|
fullColumnFieldData[property] = rest
|
|
@@ -671,7 +671,7 @@ const Methods = {
|
|
|
671
671
|
if (treeNode) {
|
|
672
672
|
if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
|
|
673
673
|
if (treeNodeColumn) {
|
|
674
|
-
|
|
674
|
+
warnLog('vxe.error.colRepet', ['tree-node', treeNode])
|
|
675
675
|
}
|
|
676
676
|
}
|
|
677
677
|
if (!treeNodeColumn) {
|
|
@@ -680,7 +680,7 @@ const Methods = {
|
|
|
680
680
|
} else if (type === 'expand') {
|
|
681
681
|
if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
|
|
682
682
|
if (expandColumn) {
|
|
683
|
-
|
|
683
|
+
warnLog('vxe.error.colRepet', ['type', type])
|
|
684
684
|
}
|
|
685
685
|
}
|
|
686
686
|
if (!expandColumn) {
|
|
@@ -690,14 +690,14 @@ const Methods = {
|
|
|
690
690
|
if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
|
|
691
691
|
if (type === 'checkbox') {
|
|
692
692
|
if (checkboxColumn) {
|
|
693
|
-
|
|
693
|
+
warnLog('vxe.error.colRepet', ['type', type])
|
|
694
694
|
}
|
|
695
695
|
if (!checkboxColumn) {
|
|
696
696
|
checkboxColumn = column
|
|
697
697
|
}
|
|
698
698
|
} else if (type === 'radio') {
|
|
699
699
|
if (radioColumn) {
|
|
700
|
-
|
|
700
|
+
warnLog('vxe.error.colRepet', ['type', type])
|
|
701
701
|
}
|
|
702
702
|
if (!radioColumn) {
|
|
703
703
|
radioColumn = column
|
|
@@ -706,20 +706,20 @@ const Methods = {
|
|
|
706
706
|
}
|
|
707
707
|
if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
|
|
708
708
|
if (this.showOverflow && column.showOverflow === false) {
|
|
709
|
-
|
|
709
|
+
warnLog('vxe.error.errConflicts', [`table.show-overflow=${this.showOverflow}`, `column.show-overflow=${column.showOverflow}`])
|
|
710
710
|
}
|
|
711
711
|
if (this.showHeaderOverflow && column.showHeaderOverflow === false) {
|
|
712
|
-
|
|
712
|
+
warnLog('vxe.error.errConflicts', [`table.show-header-overflow=${this.showHeaderOverflow}`, `column.show-header-overflow=${column.showHeaderOverflow}`])
|
|
713
713
|
}
|
|
714
714
|
if (this.showFooterOverflow && column.showFooterOverflow === false) {
|
|
715
|
-
|
|
715
|
+
warnLog('vxe.error.errConflicts', [`table.show-footer-overflow=${this.showFooterOverflow}`, `column.show-footer-overflow=${column.showFooterOverflow}`])
|
|
716
716
|
}
|
|
717
717
|
}
|
|
718
718
|
if (isAllOverflow && column.showOverflow === false) {
|
|
719
719
|
isAllOverflow = false
|
|
720
720
|
}
|
|
721
721
|
if (fullColumnIdData[colid]) {
|
|
722
|
-
|
|
722
|
+
errLog('vxe.error.colRepet', ['colId', colid])
|
|
723
723
|
}
|
|
724
724
|
fullColumnIdData[colid] = rest
|
|
725
725
|
fullColumnMap.set(column, rest)
|
|
@@ -736,7 +736,7 @@ const Methods = {
|
|
|
736
736
|
|
|
737
737
|
if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
|
|
738
738
|
if (expandColumn && this.mouseOpts.area) {
|
|
739
|
-
|
|
739
|
+
errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand'])
|
|
740
740
|
}
|
|
741
741
|
}
|
|
742
742
|
|
|
@@ -807,7 +807,7 @@ const Methods = {
|
|
|
807
807
|
// 在 v3 中废弃
|
|
808
808
|
_getRowIndex (row) {
|
|
809
809
|
if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
|
|
810
|
-
|
|
810
|
+
warnLog('vxe.error.delFunc', ['_getRowIndex', 'getVTRowIndex'])
|
|
811
811
|
}
|
|
812
812
|
return this.getVTRowIndex(row)
|
|
813
813
|
},
|
|
@@ -821,7 +821,7 @@ const Methods = {
|
|
|
821
821
|
// 在 v3 中废弃
|
|
822
822
|
$getRowIndex (row) {
|
|
823
823
|
if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
|
|
824
|
-
|
|
824
|
+
warnLog('vxe.error.delFunc', ['$getRowIndex', 'getVMRowIndex'])
|
|
825
825
|
}
|
|
826
826
|
return this.getVMRowIndex(row)
|
|
827
827
|
},
|
|
@@ -842,7 +842,7 @@ const Methods = {
|
|
|
842
842
|
// 在 v3 中废弃
|
|
843
843
|
_getColumnIndex (column) {
|
|
844
844
|
if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
|
|
845
|
-
|
|
845
|
+
warnLog('vxe.error.delFunc', ['_getColumnIndex', 'getVTColumnIndex'])
|
|
846
846
|
}
|
|
847
847
|
return this.getVTColumnIndex(column)
|
|
848
848
|
},
|
|
@@ -856,7 +856,7 @@ const Methods = {
|
|
|
856
856
|
// 在 v3 中废弃
|
|
857
857
|
$getColumnIndex (column) {
|
|
858
858
|
if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
|
|
859
|
-
|
|
859
|
+
warnLog('vxe.error.delFunc', ['$getColumnIndex', 'getVMColumnIndex'])
|
|
860
860
|
}
|
|
861
861
|
return this.getVMColumnIndex(column)
|
|
862
862
|
},
|
|
@@ -938,7 +938,7 @@ const Methods = {
|
|
|
938
938
|
const { keepSource, tableSourceData, treeConfig } = this
|
|
939
939
|
if (!keepSource) {
|
|
940
940
|
if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
|
|
941
|
-
|
|
941
|
+
warnLog('vxe.error.reqProp', ['keep-source'])
|
|
942
942
|
}
|
|
943
943
|
return this.$nextTick()
|
|
944
944
|
}
|
|
@@ -1430,7 +1430,7 @@ const Methods = {
|
|
|
1430
1430
|
if (customConfig && (isResizable || isVisible)) {
|
|
1431
1431
|
const customMap = {}
|
|
1432
1432
|
if (!id) {
|
|
1433
|
-
|
|
1433
|
+
errLog('vxe.error.reqProp', ['id'])
|
|
1434
1434
|
return
|
|
1435
1435
|
}
|
|
1436
1436
|
if (isResizable) {
|
|
@@ -1493,7 +1493,7 @@ const Methods = {
|
|
|
1493
1493
|
const colHides = []
|
|
1494
1494
|
const colShows = []
|
|
1495
1495
|
if (!id) {
|
|
1496
|
-
|
|
1496
|
+
errLog('vxe.error.reqProp', ['id'])
|
|
1497
1497
|
return
|
|
1498
1498
|
}
|
|
1499
1499
|
XEUtils.eachTree(collectColumn, column => {
|
|
@@ -1524,7 +1524,7 @@ const Methods = {
|
|
|
1524
1524
|
const columnWidthStorageMap = getCustomStorageMap(resizableStorageKey)
|
|
1525
1525
|
let columnWidthStorage
|
|
1526
1526
|
if (!id) {
|
|
1527
|
-
|
|
1527
|
+
errLog('vxe.error.reqProp', ['id'])
|
|
1528
1528
|
return
|
|
1529
1529
|
}
|
|
1530
1530
|
if (!isReset) {
|
|
@@ -1573,7 +1573,7 @@ const Methods = {
|
|
|
1573
1573
|
column.fixed = parent.fixed
|
|
1574
1574
|
}
|
|
1575
1575
|
if (parent && column.fixed !== parent.fixed) {
|
|
1576
|
-
|
|
1576
|
+
errLog('vxe.error.groupFixed')
|
|
1577
1577
|
}
|
|
1578
1578
|
if (isColGroup) {
|
|
1579
1579
|
column.visible = !!XEUtils.findTree(column.children, subColumn => hasChildrenList(subColumn) ? null : subColumn.visible)
|
|
@@ -1620,22 +1620,22 @@ const Methods = {
|
|
|
1620
1620
|
if (scrollXLoad && isGroup) {
|
|
1621
1621
|
scrollXLoad = false
|
|
1622
1622
|
if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
|
|
1623
|
-
|
|
1623
|
+
warnLog('vxe.error.scrollXNotGroup')
|
|
1624
1624
|
}
|
|
1625
1625
|
}
|
|
1626
1626
|
if (scrollXLoad) {
|
|
1627
1627
|
if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
|
|
1628
1628
|
if (this.showHeader && !this.showHeaderOverflow) {
|
|
1629
|
-
|
|
1629
|
+
warnLog('vxe.error.reqProp', ['show-header-overflow'])
|
|
1630
1630
|
}
|
|
1631
1631
|
if (this.showFooter && !this.showFooterOverflow) {
|
|
1632
|
-
|
|
1632
|
+
warnLog('vxe.error.reqProp', ['show-footer-overflow'])
|
|
1633
1633
|
}
|
|
1634
1634
|
if (this.spanMethod) {
|
|
1635
|
-
|
|
1635
|
+
warnLog('vxe.error.scrollErrProp', ['span-method'])
|
|
1636
1636
|
}
|
|
1637
1637
|
if (this.footerSpanMethod) {
|
|
1638
|
-
|
|
1638
|
+
warnLog('vxe.error.scrollErrProp', ['footer-span-method'])
|
|
1639
1639
|
}
|
|
1640
1640
|
}
|
|
1641
1641
|
const { visibleSize } = computeVirtualX(this)
|
|
@@ -2594,7 +2594,7 @@ const Methods = {
|
|
|
2594
2594
|
if (titleHelp.content || titleHelp.message) {
|
|
2595
2595
|
const { $refs, tooltipStore } = this
|
|
2596
2596
|
const $tooltip = $refs.tooltip
|
|
2597
|
-
const content =
|
|
2597
|
+
const content = getFuncText(titleHelp.content || titleHelp.message)
|
|
2598
2598
|
this.handleTargetEnterEvent(true)
|
|
2599
2599
|
tooltipStore.visible = true
|
|
2600
2600
|
if ($tooltip) {
|
|
@@ -2726,7 +2726,7 @@ const Methods = {
|
|
|
2726
2726
|
return !this.isAllSelected && this.isIndeterminate
|
|
2727
2727
|
},
|
|
2728
2728
|
isCheckboxIndeterminate () {
|
|
2729
|
-
|
|
2729
|
+
warnLog('vxe.error.delFunc', ['isCheckboxIndeterminate', 'isAllCheckboxIndeterminate'])
|
|
2730
2730
|
return this.isAllCheckboxIndeterminate()
|
|
2731
2731
|
},
|
|
2732
2732
|
/**
|
|
@@ -3634,7 +3634,7 @@ const Methods = {
|
|
|
3634
3634
|
// 在 v3 中废弃
|
|
3635
3635
|
getSortColumn () {
|
|
3636
3636
|
if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
|
|
3637
|
-
|
|
3637
|
+
warnLog('vxe.error.delFunc', ['getSortColumn', 'getSortColumns'])
|
|
3638
3638
|
}
|
|
3639
3639
|
return XEUtils.find(this.tableFullColumn, column => (column.sortable || column.remoteSort) && column.order)
|
|
3640
3640
|
},
|
|
@@ -3717,7 +3717,7 @@ const Methods = {
|
|
|
3717
3717
|
},
|
|
3718
3718
|
reloadExpandContent (row) {
|
|
3719
3719
|
if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
|
|
3720
|
-
|
|
3720
|
+
warnLog('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand'])
|
|
3721
3721
|
}
|
|
3722
3722
|
// 即将废弃
|
|
3723
3723
|
return this.reloadRowExpand(row)
|
|
@@ -3928,7 +3928,7 @@ const Methods = {
|
|
|
3928
3928
|
},
|
|
3929
3929
|
reloadTreeChilds (row) {
|
|
3930
3930
|
if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
|
|
3931
|
-
|
|
3931
|
+
warnLog('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand'])
|
|
3932
3932
|
}
|
|
3933
3933
|
// 即将废弃
|
|
3934
3934
|
return this.reloadTreeExpand(row)
|
|
@@ -4489,7 +4489,7 @@ const Methods = {
|
|
|
4489
4489
|
*/
|
|
4490
4490
|
setMergeCells (merges) {
|
|
4491
4491
|
if (this.spanMethod) {
|
|
4492
|
-
|
|
4492
|
+
errLog('vxe.error.errConflicts', ['merge-cells', 'span-method'])
|
|
4493
4493
|
}
|
|
4494
4494
|
setMerges(this, merges, this.mergeList, this.afterFullData)
|
|
4495
4495
|
return this.$nextTick().then(() => this.updateCellAreas())
|
|
@@ -4500,7 +4500,7 @@ const Methods = {
|
|
|
4500
4500
|
*/
|
|
4501
4501
|
removeMergeCells (merges) {
|
|
4502
4502
|
if (this.spanMethod) {
|
|
4503
|
-
|
|
4503
|
+
errLog('vxe.error.errConflicts', ['merge-cells', 'span-method'])
|
|
4504
4504
|
}
|
|
4505
4505
|
const rest = removeMerges(this, merges, this.mergeList, this.afterFullData)
|
|
4506
4506
|
return this.$nextTick().then(() => {
|
|
@@ -4526,14 +4526,14 @@ const Methods = {
|
|
|
4526
4526
|
},
|
|
4527
4527
|
setMergeFooterItems (merges) {
|
|
4528
4528
|
if (this.footerSpanMethod) {
|
|
4529
|
-
|
|
4529
|
+
errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method'])
|
|
4530
4530
|
}
|
|
4531
4531
|
setMerges(this, merges, this.mergeFooterList, null)
|
|
4532
4532
|
return this.$nextTick().then(() => this.updateCellAreas())
|
|
4533
4533
|
},
|
|
4534
4534
|
removeMergeFooterItems (merges) {
|
|
4535
4535
|
if (this.footerSpanMethod) {
|
|
4536
|
-
|
|
4536
|
+
errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method'])
|
|
4537
4537
|
}
|
|
4538
4538
|
const rest = removeMerges(this, merges, this.mergeFooterList, null)
|
|
4539
4539
|
return this.$nextTick().then(() => {
|
|
@@ -4583,7 +4583,7 @@ const Methods = {
|
|
|
4583
4583
|
$toolbar.syncUpdate({ collectColumn: this.collectColumn, $table: this })
|
|
4584
4584
|
this.$toolbar = $toolbar
|
|
4585
4585
|
} else {
|
|
4586
|
-
|
|
4586
|
+
errLog('vxe.error.barUnableLink')
|
|
4587
4587
|
}
|
|
4588
4588
|
return this.$nextTick()
|
|
4589
4589
|
},
|
|
@@ -4654,9 +4654,9 @@ funcs.forEach(name => {
|
|
|
4654
4654
|
if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
|
|
4655
4655
|
if (!this[`_${name}`]) {
|
|
4656
4656
|
if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
|
|
4657
|
-
|
|
4657
|
+
errLog('vxe.error.reqModule', ['Export'])
|
|
4658
4658
|
} else if ('clearValidate,fullValidate,validate'.split(',').includes(name)) {
|
|
4659
|
-
|
|
4659
|
+
errLog('vxe.error.reqModule', ['Validator'])
|
|
4660
4660
|
}
|
|
4661
4661
|
}
|
|
4662
4662
|
}
|