vxe-table 3.6.0-beta.0 → 3.6.0-beta.11
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 +2 -2
- package/helper/vetur/attributes.json +17 -5
- package/helper/vetur/tags.json +10 -2
- package/lib/button/style/style.css +15 -63
- package/lib/button/style/style.min.css +1 -1
- package/lib/checkbox/src/checkbox.js +22 -9
- package/lib/checkbox/src/checkbox.min.js +1 -1
- package/lib/checkbox/src/group.js +13 -0
- package/lib/checkbox/src/group.min.js +1 -1
- package/lib/checkbox/style/style.css +37 -60
- package/lib/checkbox/style/style.min.css +1 -1
- package/lib/edit/src/mixin.js +10 -10
- package/lib/edit/src/mixin.min.js +1 -1
- package/lib/export/src/export-panel.js +10 -16
- package/lib/export/src/export-panel.min.js +1 -1
- package/lib/export/style/style.css +23 -92
- package/lib/export/style/style.min.css +1 -1
- package/lib/filter/src/panel.js +11 -15
- package/lib/filter/src/panel.min.js +1 -1
- package/lib/filter/style/style.css +24 -90
- package/lib/filter/style/style.min.css +1 -1
- package/lib/form/src/form.js +2 -2
- package/lib/form/src/form.min.js +1 -1
- package/lib/form/style/style.css +0 -3
- package/lib/form/style/style.min.css +1 -1
- package/lib/grid/style/style.css +1 -1
- package/lib/grid/style/style.min.css +1 -1
- package/lib/icon/index.js +10 -4
- package/lib/icon/index.min.js +1 -1
- package/lib/icon/src/icon.js +29 -0
- package/lib/icon/src/icon.min.js +1 -0
- package/lib/icon/style/style.css +453 -518
- package/lib/icon/style/style.min.css +1 -1
- package/lib/index.css +1 -1
- package/lib/index.umd.js +261 -167
- package/lib/index.umd.min.js +1 -1
- package/lib/input/src/input.js +3 -3
- package/lib/input/src/input.min.js +1 -1
- package/lib/input/style/style.css +18 -9
- package/lib/input/style/style.min.css +1 -1
- package/lib/list/src/list.js +1 -1
- package/lib/list/src/list.min.js +1 -1
- package/lib/loading/src/loading.js +19 -9
- package/lib/loading/src/loading.min.js +1 -1
- package/lib/locale/lang/en-US.js +1 -1
- package/lib/locale/lang/en-US.min.js +1 -1
- package/lib/locale/lang/en-US.umd.js +1 -1
- package/lib/locale/lang/ja-JP.js +1 -1
- package/lib/locale/lang/ja-JP.min.js +1 -1
- package/lib/locale/lang/ja-JP.umd.js +1 -1
- package/lib/locale/lang/zh-CN.js +1 -1
- package/lib/locale/lang/zh-CN.min.js +1 -1
- package/lib/locale/lang/zh-CN.umd.js +1 -1
- package/lib/locale/lang/zh-HK.min.js +1 -1
- package/lib/locale/lang/zh-HK.umd.js +1 -1
- package/lib/locale/lang/zh-MO.min.js +1 -1
- package/lib/locale/lang/zh-MO.umd.js +1 -1
- package/lib/locale/lang/zh-TC.js +1 -1
- package/lib/locale/lang/zh-TC.min.js +1 -1
- package/lib/locale/lang/zh-TC.umd.js +1 -1
- package/lib/locale/lang/zh-TW.min.js +1 -1
- package/lib/locale/lang/zh-TW.umd.js +1 -1
- package/lib/modal/src/modal.js +13 -6
- package/lib/modal/src/modal.min.js +1 -1
- package/lib/modal/style/style.css +22 -14
- package/lib/modal/style/style.min.css +1 -1
- package/lib/pager/style/style.css +4 -2
- package/lib/pager/style/style.min.css +1 -1
- package/lib/radio/src/radio.js +7 -5
- package/lib/radio/src/radio.min.js +1 -1
- package/lib/radio/style/style.css +32 -57
- package/lib/radio/style/style.min.css +1 -1
- package/lib/select/src/select.js +32 -3
- package/lib/select/src/select.min.js +1 -1
- package/lib/select/style/style.css +1 -0
- package/lib/select/style/style.min.css +1 -1
- package/lib/style.css +1 -1
- package/lib/style.min.css +1 -1
- package/lib/table/src/body.js +15 -7
- package/lib/table/src/body.min.js +1 -1
- package/lib/table/src/cell.js +4 -18
- package/lib/table/src/cell.min.js +1 -1
- package/lib/table/src/table.js +10 -2
- package/lib/table/src/table.min.js +1 -1
- package/lib/table/style/style.css +69 -146
- package/lib/table/style/style.min.css +1 -1
- package/lib/toolbar/src/toolbar.js +11 -15
- package/lib/toolbar/src/toolbar.min.js +1 -1
- package/lib/toolbar/style/style.css +24 -86
- package/lib/toolbar/style/style.min.css +1 -1
- package/lib/tools/log.js +1 -1
- package/lib/tools/log.min.js +1 -1
- package/lib/v-x-e-table/index.js +1 -1
- package/lib/v-x-e-table/index.min.js +1 -1
- package/lib/v-x-e-table/src/conf.js +43 -39
- package/lib/v-x-e-table/src/conf.min.js +1 -1
- package/lib/v-x-e-table/style/style.css +443 -484
- package/lib/v-x-e-table/style/style.min.css +1 -1
- package/package.json +5 -5
- package/packages/checkbox/src/checkbox.js +19 -5
- package/packages/checkbox/src/group.js +9 -0
- package/packages/edit/src/mixin.js +10 -10
- package/packages/export/src/export-panel.js +9 -19
- package/packages/filter/src/panel.js +9 -17
- package/packages/form/src/form.js +2 -2
- package/packages/icon/index.js +7 -4
- package/packages/icon/src/icon.js +20 -0
- package/packages/input/src/input.js +3 -3
- package/packages/list/src/list.js +1 -1
- package/packages/loading/src/loading.js +18 -9
- package/packages/locale/lang/en-US.js +1 -1
- package/packages/locale/lang/ja-JP.js +1 -1
- package/packages/locale/lang/zh-CN.js +1 -1
- package/packages/locale/lang/zh-TC.js +1 -1
- package/packages/modal/src/modal.js +30 -22
- package/packages/radio/src/radio.js +7 -3
- package/packages/select/src/select.js +25 -3
- package/packages/table/src/body.js +14 -7
- package/packages/table/src/cell.js +4 -25
- package/packages/table/src/table.js +10 -2
- package/packages/toolbar/src/toolbar.js +11 -19
- package/packages/v-x-e-table/src/conf.js +43 -38
- package/styles/base/checked.scss +44 -148
- package/styles/button.scss +5 -45
- package/styles/checkbox.scss +6 -65
- package/styles/export.scss +2 -38
- package/styles/filter.scss +3 -36
- package/styles/form.scss +0 -3
- package/styles/icon.scss +509 -616
- package/styles/input.scss +8 -0
- package/styles/loading.scss +2 -2
- package/styles/modal.scss +19 -17
- package/styles/old-icon.scss +713 -0
- package/styles/pager.scss +2 -0
- package/styles/radio.scss +9 -77
- package/styles/select.scss +1 -0
- package/styles/table.scss +17 -28
- package/styles/toolbar.scss +2 -26
- package/styles/variable.scss +11 -10
- package/types/table.d.ts +57 -18
- package/types/v-x-e-table/index.d.ts +1 -1
|
@@ -127,6 +127,7 @@ export default {
|
|
|
127
127
|
const footerSlot = $scopedSlots.footer || slots.footer
|
|
128
128
|
const headerSlot = $scopedSlots.header || slots.header
|
|
129
129
|
const titleSlot = $scopedSlots.title || slots.title
|
|
130
|
+
const cornerSlot = $scopedSlots.corner || slots.corner
|
|
130
131
|
const headerOns = {}
|
|
131
132
|
if (draggable) {
|
|
132
133
|
headerOns.mousedown = this.mousedownEvent
|
|
@@ -170,27 +171,34 @@ export default {
|
|
|
170
171
|
}],
|
|
171
172
|
on: headerOns
|
|
172
173
|
}, headerSlot ? (!inited || (destroyOnClose && !visible) ? [] : getSlotVNs(headerSlot.call(this, { $modal: this }, h))) : [
|
|
173
|
-
|
|
174
|
-
class: 'vxe-modal--title'
|
|
175
|
-
}, title ? getFuncText(title) : GlobalConfig.i18n('vxe.alert.title')),
|
|
176
|
-
|
|
177
|
-
class:
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
174
|
+
h('div', {
|
|
175
|
+
class: 'vxe-modal--header-title'
|
|
176
|
+
}, titleSlot ? getSlotVNs(titleSlot.call(this, { $modal: this }, h)) : (title ? getFuncText(title) : GlobalConfig.i18n('vxe.alert.title'))),
|
|
177
|
+
h('div', {
|
|
178
|
+
class: 'vxe-modal--header-right'
|
|
179
|
+
}, [
|
|
180
|
+
cornerSlot ? h('span', {
|
|
181
|
+
class: 'vxe-modal--corner-warpper'
|
|
182
|
+
}, getSlotVNs(cornerSlot({ $modal: this }))) : _e(),
|
|
183
|
+
showZoom ? h('i', {
|
|
184
|
+
class: ['vxe-modal--zoom-btn', 'trigger--btn', zoomLocat ? GlobalConfig.icon.MODAL_ZOOM_OUT : GlobalConfig.icon.MODAL_ZOOM_IN],
|
|
185
|
+
attrs: {
|
|
186
|
+
title: GlobalConfig.i18n(`vxe.modal.zoom${zoomLocat ? 'Out' : 'In'}`)
|
|
187
|
+
},
|
|
188
|
+
on: {
|
|
189
|
+
click: this.toggleZoomEvent
|
|
190
|
+
}
|
|
191
|
+
}) : _e(),
|
|
192
|
+
showClose ? h('i', {
|
|
193
|
+
class: ['vxe-modal--close-btn', 'trigger--btn', GlobalConfig.icon.MODAL_CLOSE],
|
|
194
|
+
attrs: {
|
|
195
|
+
title: GlobalConfig.i18n('vxe.modal.close')
|
|
196
|
+
},
|
|
197
|
+
on: {
|
|
198
|
+
click: this.closeEvent
|
|
199
|
+
}
|
|
200
|
+
}) : _e()
|
|
201
|
+
])
|
|
194
202
|
]) : null,
|
|
195
203
|
h('div', {
|
|
196
204
|
class: 'vxe-modal--body'
|
|
@@ -211,7 +219,7 @@ export default {
|
|
|
211
219
|
!isMsg ? h(VxeLoading, {
|
|
212
220
|
class: 'vxe-modal--loading',
|
|
213
221
|
props: {
|
|
214
|
-
loading
|
|
222
|
+
value: loading
|
|
215
223
|
}
|
|
216
224
|
}) : null
|
|
217
225
|
]),
|
|
@@ -34,10 +34,13 @@ export default {
|
|
|
34
34
|
isStrict () {
|
|
35
35
|
const { $xeradiogroup } = this
|
|
36
36
|
return $xeradiogroup ? $xeradiogroup.strict : this.strict
|
|
37
|
+
},
|
|
38
|
+
isChecked () {
|
|
39
|
+
return this.$xeradiogroup ? this.$xeradiogroup.value === this.label : this.value === this.label
|
|
37
40
|
}
|
|
38
41
|
},
|
|
39
42
|
render (h) {
|
|
40
|
-
const { $scopedSlots, $xeradiogroup, isDisabled, title, vSize,
|
|
43
|
+
const { $scopedSlots, $xeradiogroup, isDisabled, isChecked, title, vSize, name, content } = this
|
|
41
44
|
const attrs = {}
|
|
42
45
|
if (title) {
|
|
43
46
|
attrs.title = title
|
|
@@ -45,6 +48,7 @@ export default {
|
|
|
45
48
|
return h('label', {
|
|
46
49
|
class: ['vxe-radio', {
|
|
47
50
|
[`size--${vSize}`]: vSize,
|
|
51
|
+
'is--checked': isChecked,
|
|
48
52
|
'is--disabled': isDisabled
|
|
49
53
|
}],
|
|
50
54
|
attrs
|
|
@@ -57,7 +61,7 @@ export default {
|
|
|
57
61
|
disabled: isDisabled
|
|
58
62
|
},
|
|
59
63
|
domProps: {
|
|
60
|
-
checked:
|
|
64
|
+
checked: isChecked
|
|
61
65
|
},
|
|
62
66
|
on: {
|
|
63
67
|
change: this.changeEvent,
|
|
@@ -65,7 +69,7 @@ export default {
|
|
|
65
69
|
}
|
|
66
70
|
}),
|
|
67
71
|
h('span', {
|
|
68
|
-
class: 'vxe-radio--icon'
|
|
72
|
+
class: ['vxe-radio--icon', isChecked ? 'vxe-icon-radio-checked' : 'vxe-icon-radio-unchecked']
|
|
69
73
|
}),
|
|
70
74
|
h('span', {
|
|
71
75
|
class: 'vxe-radio--label'
|
|
@@ -125,21 +125,35 @@ function getSelectLabel (_vm, value) {
|
|
|
125
125
|
return XEUtils.toValueString(item ? item[_vm.labelField] : value)
|
|
126
126
|
}
|
|
127
127
|
|
|
128
|
+
function checkOptionDisabled (_vm, isSelected, option, group) {
|
|
129
|
+
if (option.disabled) {
|
|
130
|
+
return true
|
|
131
|
+
}
|
|
132
|
+
if (group && group.disabled) {
|
|
133
|
+
return true
|
|
134
|
+
}
|
|
135
|
+
if (_vm.isMaximize && !isSelected) {
|
|
136
|
+
return true
|
|
137
|
+
}
|
|
138
|
+
return false
|
|
139
|
+
}
|
|
140
|
+
|
|
128
141
|
export function renderOption (h, _vm, list, group) {
|
|
129
142
|
const { isGroup, labelField, valueField, optionKey, value, multiple, currentValue, optionOpts } = _vm
|
|
130
143
|
const { useKey } = optionOpts
|
|
131
144
|
return list.map((option, cIndex) => {
|
|
132
145
|
const { slots } = option
|
|
133
|
-
const isVisible = !isGroup || isOptionVisible(option)
|
|
134
|
-
const isDisabled = (group && group.disabled) || option.disabled
|
|
135
146
|
const optionValue = option[valueField]
|
|
147
|
+
const isSelected = multiple ? (value && value.indexOf(optionValue) > -1) : value === optionValue
|
|
148
|
+
const isVisible = !isGroup || isOptionVisible(option)
|
|
149
|
+
const isDisabled = checkOptionDisabled(_vm, isSelected, option, group)
|
|
136
150
|
const optid = getOptid(_vm, option)
|
|
137
151
|
const defaultSlot = slots ? slots.default : null
|
|
138
152
|
return isVisible ? h('div', {
|
|
139
153
|
key: useKey || optionKey ? optid : cIndex,
|
|
140
154
|
class: ['vxe-select-option', option.className, {
|
|
141
155
|
'is--disabled': isDisabled,
|
|
142
|
-
'is--selected':
|
|
156
|
+
'is--selected': isSelected,
|
|
143
157
|
'is--hover': currentValue === optionValue
|
|
144
158
|
}],
|
|
145
159
|
attrs: {
|
|
@@ -240,6 +254,7 @@ export default {
|
|
|
240
254
|
optionGroupProps: Object,
|
|
241
255
|
optionConfig: Object,
|
|
242
256
|
className: [String, Function],
|
|
257
|
+
max: [String, Number],
|
|
243
258
|
size: { type: String, default: () => GlobalConfig.select.size || GlobalConfig.size },
|
|
244
259
|
filterable: Boolean,
|
|
245
260
|
filterMethod: Function,
|
|
@@ -336,6 +351,13 @@ export default {
|
|
|
336
351
|
return getRemoteSelectLabel(this, value)
|
|
337
352
|
}
|
|
338
353
|
return getSelectLabel(this, value)
|
|
354
|
+
},
|
|
355
|
+
isMaximize () {
|
|
356
|
+
const { value, multiple, max } = this
|
|
357
|
+
if (multiple && max) {
|
|
358
|
+
return (value ? value.length : 0) >= XEUtils.toNumber(max)
|
|
359
|
+
}
|
|
360
|
+
return false
|
|
339
361
|
}
|
|
340
362
|
},
|
|
341
363
|
watch: {
|
|
@@ -298,6 +298,7 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
|
|
|
298
298
|
showOverflow: allColumnOverflow,
|
|
299
299
|
treeConfig,
|
|
300
300
|
treeOpts,
|
|
301
|
+
expandOpts,
|
|
301
302
|
editOpts,
|
|
302
303
|
treeExpandeds,
|
|
303
304
|
scrollYLoad,
|
|
@@ -379,11 +380,13 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
|
|
|
379
380
|
)
|
|
380
381
|
// 如果行被展开了
|
|
381
382
|
if (isExpandRow) {
|
|
382
|
-
|
|
383
|
+
const { height: expandHeight } = expandOpts
|
|
384
|
+
const cellStyle = {}
|
|
385
|
+
if (expandHeight) {
|
|
386
|
+
cellStyle.height = `${expandHeight}px`
|
|
387
|
+
}
|
|
383
388
|
if (treeConfig) {
|
|
384
|
-
cellStyle = {
|
|
385
|
-
paddingLeft: `${(rowLevel * treeOpts.indent) + 30}px`
|
|
386
|
-
}
|
|
389
|
+
cellStyle.paddingLeft = `${(rowLevel * treeOpts.indent) + 30}px`
|
|
387
390
|
}
|
|
388
391
|
const { showOverflow } = expandColumn
|
|
389
392
|
const hasEllipsis = (XEUtils.isUndefined(showOverflow) || XEUtils.isNull(showOverflow)) ? allColumnOverflow : showOverflow
|
|
@@ -396,16 +399,20 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
|
|
|
396
399
|
on: trOn
|
|
397
400
|
}, [
|
|
398
401
|
h('td', {
|
|
399
|
-
class:
|
|
402
|
+
class: {
|
|
403
|
+
'vxe-body--expanded-column': 1,
|
|
400
404
|
'fixed--hidden': fixedType && !hasFixedColumn,
|
|
401
405
|
'col--ellipsis': hasEllipsis
|
|
402
|
-
}
|
|
406
|
+
},
|
|
403
407
|
attrs: {
|
|
404
408
|
colspan: tableColumn.length
|
|
405
409
|
}
|
|
406
410
|
}, [
|
|
407
411
|
h('div', {
|
|
408
|
-
class:
|
|
412
|
+
class: {
|
|
413
|
+
'vxe-body--expanded-cell': 1,
|
|
414
|
+
'is--ellipsis': expandHeight
|
|
415
|
+
},
|
|
409
416
|
style: cellStyle
|
|
410
417
|
}, [
|
|
411
418
|
expandColumn.renderData(h, expandParams)
|
|
@@ -321,10 +321,7 @@ export const Cell = {
|
|
|
321
321
|
if (isVisible) {
|
|
322
322
|
radioVNs.push(
|
|
323
323
|
h('span', {
|
|
324
|
-
class: 'vxe-radio--icon
|
|
325
|
-
}),
|
|
326
|
-
h('span', {
|
|
327
|
-
class: 'vxe-radio--icon vxe-radio--unchecked-icon'
|
|
324
|
+
class: ['vxe-radio--icon', isChecked ? GlobalConfig.icon.TABLE_RADIO_CHECKED : GlobalConfig.icon.TABLE_RADIO_UNCHECKED]
|
|
328
325
|
})
|
|
329
326
|
)
|
|
330
327
|
}
|
|
@@ -394,13 +391,7 @@ export const Cell = {
|
|
|
394
391
|
on
|
|
395
392
|
}, [
|
|
396
393
|
h('span', {
|
|
397
|
-
class: 'vxe-checkbox--icon
|
|
398
|
-
}),
|
|
399
|
-
h('span', {
|
|
400
|
-
class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
|
|
401
|
-
}),
|
|
402
|
-
h('span', {
|
|
403
|
-
class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
|
|
394
|
+
class: ['vxe-checkbox--icon', isAllCheckboxIndeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isAllCheckboxSelected ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
|
|
404
395
|
})
|
|
405
396
|
].concat(titleSlot || headerTitle ? [
|
|
406
397
|
h('span', {
|
|
@@ -445,13 +436,7 @@ export const Cell = {
|
|
|
445
436
|
if (isVisible) {
|
|
446
437
|
checkVNs.push(
|
|
447
438
|
h('span', {
|
|
448
|
-
class: 'vxe-checkbox--icon
|
|
449
|
-
}),
|
|
450
|
-
h('span', {
|
|
451
|
-
class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
|
|
452
|
-
}),
|
|
453
|
-
h('span', {
|
|
454
|
-
class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
|
|
439
|
+
class: ['vxe-checkbox--icon', indeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
|
|
455
440
|
})
|
|
456
441
|
)
|
|
457
442
|
}
|
|
@@ -512,13 +497,7 @@ export const Cell = {
|
|
|
512
497
|
if (isVisible) {
|
|
513
498
|
checkVNs.push(
|
|
514
499
|
h('span', {
|
|
515
|
-
class: 'vxe-checkbox--icon
|
|
516
|
-
}),
|
|
517
|
-
h('span', {
|
|
518
|
-
class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
|
|
519
|
-
}),
|
|
520
|
-
h('span', {
|
|
521
|
-
class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
|
|
500
|
+
class: ['vxe-checkbox--icon', indeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
|
|
522
501
|
})
|
|
523
502
|
)
|
|
524
503
|
}
|
|
@@ -234,6 +234,8 @@ export default {
|
|
|
234
234
|
validConfig: Object,
|
|
235
235
|
// 校验规则配置项
|
|
236
236
|
editRules: Object,
|
|
237
|
+
// 加载中配置项
|
|
238
|
+
loadingConfig: Object,
|
|
237
239
|
// 空内容渲染配置项
|
|
238
240
|
emptyRender: [Boolean, Object],
|
|
239
241
|
// 自定义列配置项
|
|
@@ -569,6 +571,9 @@ export default {
|
|
|
569
571
|
emptyOpts () {
|
|
570
572
|
return Object.assign({}, GlobalConfig.table.emptyRender, this.emptyRender)
|
|
571
573
|
},
|
|
574
|
+
loadingOpts () {
|
|
575
|
+
return Object.assign({}, GlobalConfig.table.loadingConfig, this.loadingConfig)
|
|
576
|
+
},
|
|
572
577
|
cellOffsetWidth () {
|
|
573
578
|
return this.border ? Math.max(2, Math.ceil(this.scrollbarWidth / this.tableColumn.length)) : 1
|
|
574
579
|
},
|
|
@@ -965,7 +970,8 @@ export default {
|
|
|
965
970
|
footerTableData,
|
|
966
971
|
hasTip,
|
|
967
972
|
columnOpts,
|
|
968
|
-
rowOpts
|
|
973
|
+
rowOpts,
|
|
974
|
+
loadingOpts
|
|
969
975
|
} = this
|
|
970
976
|
const { leftList, rightList } = columnStore
|
|
971
977
|
return h('div', {
|
|
@@ -1090,7 +1096,9 @@ export default {
|
|
|
1090
1096
|
h(VxeLoading, {
|
|
1091
1097
|
class: 'vxe-table--loading',
|
|
1092
1098
|
props: {
|
|
1093
|
-
loading
|
|
1099
|
+
value: loading,
|
|
1100
|
+
icon: loadingOpts.icon,
|
|
1101
|
+
text: loadingOpts.text
|
|
1094
1102
|
}
|
|
1095
1103
|
}),
|
|
1096
1104
|
/**
|
|
@@ -150,12 +150,14 @@ function renderCustoms (h, _vm) {
|
|
|
150
150
|
const isColGroup = column.children && column.children.length
|
|
151
151
|
const isDisabled = checkMethod ? !checkMethod({ column }) : false
|
|
152
152
|
if (isColGroup || colKey) {
|
|
153
|
+
const isChecked = column.visible
|
|
154
|
+
const isIndeterminate = column.halfVisible
|
|
153
155
|
cols.push(
|
|
154
156
|
h('li', {
|
|
155
157
|
class: ['vxe-custom--option', `level--${column.level}`, {
|
|
156
158
|
'is--group': isColGroup,
|
|
157
|
-
'is--checked':
|
|
158
|
-
'is--indeterminate':
|
|
159
|
+
'is--checked': isChecked,
|
|
160
|
+
'is--indeterminate': isIndeterminate,
|
|
159
161
|
'is--disabled': isDisabled
|
|
160
162
|
}],
|
|
161
163
|
attrs: {
|
|
@@ -170,13 +172,7 @@ function renderCustoms (h, _vm) {
|
|
|
170
172
|
}
|
|
171
173
|
}, [
|
|
172
174
|
h('span', {
|
|
173
|
-
class: 'vxe-checkbox--icon
|
|
174
|
-
}),
|
|
175
|
-
h('span', {
|
|
176
|
-
class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
|
|
177
|
-
}),
|
|
178
|
-
h('span', {
|
|
179
|
-
class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
|
|
175
|
+
class: ['vxe-checkbox--icon', isIndeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
|
|
180
176
|
}),
|
|
181
177
|
h('span', {
|
|
182
178
|
class: 'vxe-checkbox--label'
|
|
@@ -185,6 +181,8 @@ function renderCustoms (h, _vm) {
|
|
|
185
181
|
)
|
|
186
182
|
}
|
|
187
183
|
})
|
|
184
|
+
const isAllChecked = customStore.isAll
|
|
185
|
+
const isAllIndeterminate = customStore.isIndeterminate
|
|
188
186
|
return h('div', {
|
|
189
187
|
class: ['vxe-custom--wrapper', {
|
|
190
188
|
'is--active': customStore.visible
|
|
@@ -209,8 +207,8 @@ function renderCustoms (h, _vm) {
|
|
|
209
207
|
}, [
|
|
210
208
|
h('li', {
|
|
211
209
|
class: ['vxe-custom--option', {
|
|
212
|
-
'is--checked':
|
|
213
|
-
'is--indeterminate':
|
|
210
|
+
'is--checked': isAllChecked,
|
|
211
|
+
'is--indeterminate': isAllIndeterminate
|
|
214
212
|
}],
|
|
215
213
|
attrs: {
|
|
216
214
|
title: GlobalConfig.i18n('vxe.table.allTitle')
|
|
@@ -220,13 +218,7 @@ function renderCustoms (h, _vm) {
|
|
|
220
218
|
}
|
|
221
219
|
}, [
|
|
222
220
|
h('span', {
|
|
223
|
-
class: 'vxe-checkbox--icon
|
|
224
|
-
}),
|
|
225
|
-
h('span', {
|
|
226
|
-
class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
|
|
227
|
-
}),
|
|
228
|
-
h('span', {
|
|
229
|
-
class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
|
|
221
|
+
class: ['vxe-checkbox--icon', isAllIndeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isAllChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
|
|
230
222
|
}),
|
|
231
223
|
h('span', {
|
|
232
224
|
class: 'vxe-checkbox--label'
|
|
@@ -409,7 +401,7 @@ export default {
|
|
|
409
401
|
zoom && $xegrid ? h('vxe-button', {
|
|
410
402
|
props: {
|
|
411
403
|
circle: true,
|
|
412
|
-
icon: $xegrid.isMaximized() ? (zoomOpts.iconOut || GlobalConfig.icon.
|
|
404
|
+
icon: $xegrid.isMaximized() ? (zoomOpts.iconOut || GlobalConfig.icon.TOOLBAR_TOOLS_MINIMIZE) : (zoomOpts.iconIn || GlobalConfig.icon.TOOLBAR_TOOLS_FULLSCREEN)
|
|
413
405
|
},
|
|
414
406
|
attrs: {
|
|
415
407
|
title: GlobalConfig.i18n(`vxe.toolbar.zoom${$xegrid.isMaximized() ? 'Out' : 'In'}`)
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
const iconPrefix = 'vxe-icon
|
|
1
|
+
const iconPrefix = 'vxe-icon-'
|
|
2
2
|
|
|
3
3
|
export default {
|
|
4
4
|
size: null, // 全局尺寸
|
|
@@ -6,7 +6,7 @@ export default {
|
|
|
6
6
|
version: 0, // 版本号,对于某些带数据缓存的功能有用到,上升版本号可以用于重置数据
|
|
7
7
|
// resizeInterval: 500,
|
|
8
8
|
emptyCell: ' ',
|
|
9
|
-
loadingText: null, // 自定义loading提示内容,如果为null则不显示文本
|
|
9
|
+
// loadingText: null, // 自定义loading提示内容,如果为null则不显示文本
|
|
10
10
|
table: {
|
|
11
11
|
fit: true,
|
|
12
12
|
showHeader: true,
|
|
@@ -125,73 +125,78 @@ export default {
|
|
|
125
125
|
},
|
|
126
126
|
icon: {
|
|
127
127
|
// loading
|
|
128
|
-
|
|
128
|
+
LOADING: iconPrefix + 'spinner roll vxe-loading--default-icon',
|
|
129
129
|
|
|
130
130
|
// table
|
|
131
|
-
TABLE_SORT_ASC: iconPrefix + 'caret-
|
|
132
|
-
TABLE_SORT_DESC: iconPrefix + 'caret-
|
|
131
|
+
TABLE_SORT_ASC: iconPrefix + 'caret-up',
|
|
132
|
+
TABLE_SORT_DESC: iconPrefix + 'caret-down',
|
|
133
133
|
TABLE_FILTER_NONE: iconPrefix + 'funnel',
|
|
134
134
|
TABLE_FILTER_MATCH: iconPrefix + 'funnel',
|
|
135
|
-
TABLE_EDIT: iconPrefix + 'edit
|
|
136
|
-
TABLE_HELP: iconPrefix + 'question',
|
|
137
|
-
TABLE_TREE_LOADED: iconPrefix + '
|
|
135
|
+
TABLE_EDIT: iconPrefix + 'edit',
|
|
136
|
+
TABLE_HELP: iconPrefix + 'question-circle-fill',
|
|
137
|
+
TABLE_TREE_LOADED: iconPrefix + 'spinner roll',
|
|
138
138
|
TABLE_TREE_OPEN: iconPrefix + 'caret-right rotate90',
|
|
139
139
|
TABLE_TREE_CLOSE: iconPrefix + 'caret-right',
|
|
140
|
-
TABLE_EXPAND_LOADED: iconPrefix + '
|
|
140
|
+
TABLE_EXPAND_LOADED: iconPrefix + 'spinner roll',
|
|
141
141
|
TABLE_EXPAND_OPEN: iconPrefix + 'arrow-right rotate90',
|
|
142
142
|
TABLE_EXPAND_CLOSE: iconPrefix + 'arrow-right',
|
|
143
|
+
TABLE_CHECKBOX_CHECKED: iconPrefix + 'checkbox-checked',
|
|
144
|
+
TABLE_CHECKBOX_UNCHECKED: iconPrefix + 'checkbox-unchecked',
|
|
145
|
+
TABLE_CHECKBOX_INDETERMINATE: iconPrefix + 'checkbox-indeterminate',
|
|
146
|
+
TABLE_RADIO_CHECKED: iconPrefix + 'radio-checked',
|
|
147
|
+
TABLE_RADIO_UNCHECKED: iconPrefix + 'radio-unchecked',
|
|
143
148
|
|
|
144
149
|
// button
|
|
145
|
-
BUTTON_DROPDOWN: iconPrefix + 'arrow-
|
|
146
|
-
BUTTON_LOADING: iconPrefix + '
|
|
150
|
+
BUTTON_DROPDOWN: iconPrefix + 'arrow-down',
|
|
151
|
+
BUTTON_LOADING: iconPrefix + 'spinner roll',
|
|
147
152
|
|
|
148
153
|
// select
|
|
149
|
-
SELECT_LOADED: iconPrefix + '
|
|
150
|
-
SELECT_OPEN: iconPrefix + 'caret-
|
|
151
|
-
SELECT_CLOSE: iconPrefix + 'caret-
|
|
154
|
+
SELECT_LOADED: iconPrefix + 'spinner roll',
|
|
155
|
+
SELECT_OPEN: iconPrefix + 'caret-down rotate180',
|
|
156
|
+
SELECT_CLOSE: iconPrefix + 'caret-down',
|
|
152
157
|
|
|
153
158
|
// pager
|
|
154
|
-
PAGER_JUMP_PREV: iconPrefix + '
|
|
155
|
-
PAGER_JUMP_NEXT: iconPrefix + '
|
|
159
|
+
PAGER_JUMP_PREV: iconPrefix + 'arrow-double-left',
|
|
160
|
+
PAGER_JUMP_NEXT: iconPrefix + 'arrow-double-right',
|
|
156
161
|
PAGER_PREV_PAGE: iconPrefix + 'arrow-left',
|
|
157
162
|
PAGER_NEXT_PAGE: iconPrefix + 'arrow-right',
|
|
158
|
-
PAGER_JUMP_MORE: iconPrefix + '
|
|
163
|
+
PAGER_JUMP_MORE: iconPrefix + 'ellipsis-h',
|
|
159
164
|
|
|
160
165
|
// input
|
|
161
|
-
INPUT_CLEAR: iconPrefix + '
|
|
162
|
-
INPUT_PWD: iconPrefix + 'eye-
|
|
163
|
-
INPUT_SHOW_PWD: iconPrefix + 'eye',
|
|
164
|
-
INPUT_PREV_NUM: iconPrefix + 'caret-
|
|
165
|
-
INPUT_NEXT_NUM: iconPrefix + 'caret-
|
|
166
|
+
INPUT_CLEAR: iconPrefix + 'error-circle-fill',
|
|
167
|
+
INPUT_PWD: iconPrefix + 'eye-fill',
|
|
168
|
+
INPUT_SHOW_PWD: iconPrefix + 'eye-fill-close',
|
|
169
|
+
INPUT_PREV_NUM: iconPrefix + 'caret-up',
|
|
170
|
+
INPUT_NEXT_NUM: iconPrefix + 'caret-down',
|
|
166
171
|
INPUT_DATE: iconPrefix + 'calendar',
|
|
167
172
|
INPUT_SEARCH: iconPrefix + 'search',
|
|
168
173
|
|
|
169
174
|
// modal
|
|
170
175
|
MODAL_ZOOM_IN: iconPrefix + 'square',
|
|
171
|
-
MODAL_ZOOM_OUT: iconPrefix + '
|
|
176
|
+
MODAL_ZOOM_OUT: iconPrefix + 'maximize',
|
|
172
177
|
MODAL_CLOSE: iconPrefix + 'close',
|
|
173
|
-
MODAL_INFO: iconPrefix + 'info',
|
|
174
|
-
MODAL_SUCCESS: iconPrefix + 'success',
|
|
175
|
-
MODAL_WARNING: iconPrefix + '
|
|
176
|
-
MODAL_ERROR: iconPrefix + 'error',
|
|
177
|
-
MODAL_QUESTION: iconPrefix + 'question',
|
|
178
|
-
MODAL_LOADING: iconPrefix + '
|
|
178
|
+
MODAL_INFO: iconPrefix + 'info-circle-fill',
|
|
179
|
+
MODAL_SUCCESS: iconPrefix + 'success-circle-fill',
|
|
180
|
+
MODAL_WARNING: iconPrefix + 'warnion-circle-fill',
|
|
181
|
+
MODAL_ERROR: iconPrefix + 'error-circle-fill',
|
|
182
|
+
MODAL_QUESTION: iconPrefix + 'question-circle-fill',
|
|
183
|
+
MODAL_LOADING: iconPrefix + 'spinner roll',
|
|
179
184
|
|
|
180
185
|
// toolbar
|
|
181
|
-
TOOLBAR_TOOLS_REFRESH: iconPrefix + '
|
|
182
|
-
TOOLBAR_TOOLS_REFRESH_LOADING: iconPrefix + '
|
|
186
|
+
TOOLBAR_TOOLS_REFRESH: iconPrefix + 'repeat',
|
|
187
|
+
TOOLBAR_TOOLS_REFRESH_LOADING: iconPrefix + 'repeat roll',
|
|
183
188
|
TOOLBAR_TOOLS_IMPORT: iconPrefix + 'upload',
|
|
184
189
|
TOOLBAR_TOOLS_EXPORT: iconPrefix + 'download',
|
|
185
190
|
TOOLBAR_TOOLS_PRINT: iconPrefix + 'print',
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
TOOLBAR_TOOLS_CUSTOM: iconPrefix + '
|
|
191
|
+
TOOLBAR_TOOLS_FULLSCREEN: iconPrefix + 'fullscreen',
|
|
192
|
+
TOOLBAR_TOOLS_MINIMIZE: iconPrefix + 'minimize',
|
|
193
|
+
TOOLBAR_TOOLS_CUSTOM: iconPrefix + 'custom-column',
|
|
189
194
|
|
|
190
195
|
// form
|
|
191
|
-
FORM_PREFIX: iconPrefix + 'question',
|
|
192
|
-
FORM_SUFFIX: iconPrefix + 'question',
|
|
193
|
-
FORM_FOLDING: iconPrefix + 'arrow-
|
|
194
|
-
FORM_UNFOLDING: iconPrefix + 'arrow-
|
|
196
|
+
FORM_PREFIX: iconPrefix + 'question-circle-fill',
|
|
197
|
+
FORM_SUFFIX: iconPrefix + 'question-circle-fill',
|
|
198
|
+
FORM_FOLDING: iconPrefix + 'arrow-up rotate180',
|
|
199
|
+
FORM_UNFOLDING: iconPrefix + 'arrow-up'
|
|
195
200
|
},
|
|
196
201
|
grid: {
|
|
197
202
|
// size: null,
|