vxe-table 4.16.0-beta.2 → 4.16.0-beta.4
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/es/style.css +1 -1
- package/es/table/module/custom/hook.js +10 -3
- package/es/table/module/custom/panel.js +139 -126
- package/es/table/module/keyboard/hook.js +2 -2
- package/es/table/src/table.js +50 -13
- package/es/table/src/util.js +1 -0
- package/es/toolbar/src/toolbar.js +26 -24
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +81 -46
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/module/custom/hook.js +12 -3
- package/lib/table/module/custom/hook.min.js +1 -1
- package/lib/table/module/custom/panel.js +23 -9
- package/lib/table/module/custom/panel.min.js +1 -1
- package/lib/table/module/keyboard/hook.js +2 -2
- package/lib/table/module/keyboard/hook.min.js +1 -1
- package/lib/table/src/table.js +15 -13
- package/lib/table/src/table.min.js +1 -1
- package/lib/table/src/util.js +1 -0
- package/lib/table/src/util.min.js +1 -1
- package/lib/toolbar/src/toolbar.js +27 -17
- package/lib/toolbar/src/toolbar.min.js +1 -1
- package/lib/ui/index.js +1 -1
- package/lib/ui/index.min.js +1 -1
- package/lib/ui/src/log.js +1 -1
- package/lib/ui/src/log.min.js +1 -1
- package/package.json +1 -1
- package/packages/table/module/custom/hook.ts +10 -3
- package/packages/table/module/custom/panel.ts +150 -135
- package/packages/table/module/keyboard/hook.ts +2 -2
- package/packages/table/src/table.ts +50 -13
- package/packages/table/src/util.ts +2 -0
- package/packages/toolbar/src/toolbar.ts +27 -25
- /package/es/{iconfont.1755245648660.ttf → iconfont.1755566168906.ttf} +0 -0
- /package/es/{iconfont.1755245648660.woff → iconfont.1755566168906.woff} +0 -0
- /package/es/{iconfont.1755245648660.woff2 → iconfont.1755566168906.woff2} +0 -0
- /package/lib/{iconfont.1755245648660.ttf → iconfont.1755566168906.ttf} +0 -0
- /package/lib/{iconfont.1755245648660.woff → iconfont.1755566168906.woff} +0 -0
- /package/lib/{iconfont.1755245648660.woff2 → iconfont.1755566168906.woff2} +0 -0
|
@@ -12,11 +12,18 @@ VxeUI.hooks.add('tableCustomModule', {
|
|
|
12
12
|
const $xeGantt = $xeTable.xeGantt;
|
|
13
13
|
const calcMaxHeight = () => {
|
|
14
14
|
const { customStore } = reactData;
|
|
15
|
-
|
|
15
|
+
let wrapperEl = refElem.value;
|
|
16
16
|
// 判断面板不能大于表格高度
|
|
17
17
|
let tableHeight = 0;
|
|
18
|
-
if (
|
|
19
|
-
|
|
18
|
+
if ($xeGantt) {
|
|
19
|
+
const { refGanttContainerElem } = $xeGantt.getRefMaps();
|
|
20
|
+
const ganttContainerElem = refGanttContainerElem.value;
|
|
21
|
+
if (ganttContainerElem) {
|
|
22
|
+
wrapperEl = ganttContainerElem;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
if (wrapperEl) {
|
|
26
|
+
tableHeight = wrapperEl.clientHeight - 28;
|
|
20
27
|
}
|
|
21
28
|
customStore.maxHeight = Math.max(88, tableHeight);
|
|
22
29
|
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { h, inject, ref, provide, nextTick, TransitionGroup, createCommentVNode, reactive } from 'vue';
|
|
1
|
+
import { h, inject, ref, provide, nextTick, TransitionGroup, createCommentVNode, reactive, Teleport, onUnmounted } from 'vue';
|
|
2
2
|
import { defineVxeComponent } from '../../../ui/src/comp';
|
|
3
3
|
import { VxeUI } from '../../../ui';
|
|
4
4
|
import { formatText } from '../../../ui/src/utils';
|
|
@@ -6,6 +6,16 @@ import { getTpImg, addClass, removeClass, hasControlKey } from '../../../ui/src/
|
|
|
6
6
|
import { errLog } from '../../../ui/src/log';
|
|
7
7
|
import XEUtils from 'xe-utils';
|
|
8
8
|
const { getI18n, getIcon, renderEmptyElement } = VxeUI;
|
|
9
|
+
export function createInternalData() {
|
|
10
|
+
return {
|
|
11
|
+
// teleportTo: undefined,
|
|
12
|
+
// prevDragCol: undefined,
|
|
13
|
+
// prevDragGroupField: undefined,
|
|
14
|
+
// prevDragAggFnColid: undefined,
|
|
15
|
+
// prevDragToChild: false,
|
|
16
|
+
// prevDragPos: null
|
|
17
|
+
};
|
|
18
|
+
}
|
|
9
19
|
export default defineVxeComponent({
|
|
10
20
|
name: 'TableCustomPanel',
|
|
11
21
|
props: {
|
|
@@ -35,13 +45,7 @@ export default defineVxeComponent({
|
|
|
35
45
|
dragAggFnCol: null,
|
|
36
46
|
dragTipText: ''
|
|
37
47
|
});
|
|
38
|
-
|
|
39
|
-
// prevDragCol: undefined,
|
|
40
|
-
// prevDragGroupField: undefined,
|
|
41
|
-
// prevDragAggFnColid: undefined,
|
|
42
|
-
// prevDragToChild: false,
|
|
43
|
-
// prevDragPos: null
|
|
44
|
-
};
|
|
48
|
+
let customPanelInternalData = createInternalData();
|
|
45
49
|
const refMaps = {
|
|
46
50
|
refElem,
|
|
47
51
|
refBodyWrapperElem,
|
|
@@ -561,6 +565,7 @@ export default defineVxeComponent({
|
|
|
561
565
|
const { customStore } = props;
|
|
562
566
|
const { treeConfig, rowGroupConfig, aggregateConfig } = tableProps;
|
|
563
567
|
const { isCustomStatus, customColumnList } = tableReactData;
|
|
568
|
+
const { teleportToWrapperElem } = tableInternalData;
|
|
564
569
|
const customOpts = computeCustomOpts.value;
|
|
565
570
|
const { immediate } = customOpts;
|
|
566
571
|
const columnDragOpts = computeColumnDragOpts.value;
|
|
@@ -696,136 +701,141 @@ export default defineVxeComponent({
|
|
|
696
701
|
]));
|
|
697
702
|
}
|
|
698
703
|
});
|
|
699
|
-
return h(
|
|
700
|
-
|
|
701
|
-
|
|
702
|
-
|
|
703
|
-
|
|
704
|
-
|
|
705
|
-
|
|
706
|
-
|
|
707
|
-
|
|
708
|
-
|
|
709
|
-
:
|
|
710
|
-
|
|
711
|
-
|
|
712
|
-
|
|
713
|
-
|
|
714
|
-
|
|
715
|
-
|
|
716
|
-
!treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregateSimplePanel
|
|
717
|
-
? h($xeTable.getPivotTableAggregateSimplePanel(), {
|
|
718
|
-
customStore
|
|
719
|
-
})
|
|
720
|
-
: renderEmptyElement($xeTable),
|
|
704
|
+
return h(Teleport, {
|
|
705
|
+
to: teleportToWrapperElem,
|
|
706
|
+
disabled: !($xeGantt && teleportToWrapperElem)
|
|
707
|
+
}, [
|
|
708
|
+
h('div', {
|
|
709
|
+
ref: refElem,
|
|
710
|
+
key: 'simple',
|
|
711
|
+
class: ['vxe-table-custom-wrapper', `placement--${placement}`, {
|
|
712
|
+
'is--active': customStore.visible
|
|
713
|
+
}],
|
|
714
|
+
style: maxHeight && !['left', 'right'].includes(placement || '')
|
|
715
|
+
? {
|
|
716
|
+
maxHeight: `${maxHeight}px`
|
|
717
|
+
}
|
|
718
|
+
: {}
|
|
719
|
+
}, customStore.visible
|
|
720
|
+
? [
|
|
721
721
|
h('div', {
|
|
722
|
-
ref:
|
|
723
|
-
class: 'vxe-table-custom--
|
|
722
|
+
ref: refBodyWrapperElem,
|
|
723
|
+
class: 'vxe-table-custom-simple--body-wrapper'
|
|
724
724
|
}, [
|
|
725
|
+
!treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregateSimplePanel
|
|
726
|
+
? h($xeTable.getPivotTableAggregateSimplePanel(), {
|
|
727
|
+
customStore
|
|
728
|
+
})
|
|
729
|
+
: renderEmptyElement($xeTable),
|
|
725
730
|
h('div', {
|
|
726
|
-
|
|
727
|
-
|
|
728
|
-
|
|
729
|
-
|
|
730
|
-
|
|
731
|
-
|
|
732
|
-
|
|
733
|
-
|
|
734
|
-
|
|
731
|
+
ref: refCustomBodyElem,
|
|
732
|
+
class: 'vxe-table-custom--handle-wrapper'
|
|
733
|
+
}, [
|
|
734
|
+
h('div', {
|
|
735
|
+
class: 'vxe-table-custom--header'
|
|
736
|
+
}, headerSlot
|
|
737
|
+
? $xeTable.callSlot(headerSlot, params)
|
|
738
|
+
: [
|
|
739
|
+
h('ul', {
|
|
740
|
+
class: 'vxe-table-custom--panel-list'
|
|
735
741
|
}, [
|
|
736
|
-
|
|
737
|
-
|
|
738
|
-
|
|
739
|
-
|
|
740
|
-
|
|
741
|
-
|
|
742
|
-
|
|
743
|
-
|
|
744
|
-
|
|
745
|
-
|
|
746
|
-
|
|
747
|
-
}
|
|
748
|
-
|
|
742
|
+
h('li', {
|
|
743
|
+
class: 'vxe-table-custom--option'
|
|
744
|
+
}, [
|
|
745
|
+
allowVisible
|
|
746
|
+
? h('div', {
|
|
747
|
+
class: ['vxe-table-custom--checkbox-option', {
|
|
748
|
+
'is--checked': isAllChecked,
|
|
749
|
+
'is--indeterminate': isAllIndeterminate
|
|
750
|
+
}],
|
|
751
|
+
title: getI18n('vxe.table.allTitle'),
|
|
752
|
+
onClick: allOptionEvent
|
|
753
|
+
}, [
|
|
754
|
+
h('span', {
|
|
755
|
+
class: ['vxe-checkbox--icon', isAllIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : (isAllChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED)]
|
|
756
|
+
}),
|
|
757
|
+
h('span', {
|
|
758
|
+
class: 'vxe-checkbox--label'
|
|
759
|
+
}, getI18n('vxe.toolbar.customAll'))
|
|
760
|
+
])
|
|
761
|
+
: h('span', {
|
|
749
762
|
class: 'vxe-checkbox--label'
|
|
750
|
-
}, getI18n('vxe.
|
|
751
|
-
|
|
752
|
-
: h('span', {
|
|
753
|
-
class: 'vxe-checkbox--label'
|
|
754
|
-
}, getI18n('vxe.table.customTitle'))
|
|
763
|
+
}, getI18n('vxe.table.customTitle'))
|
|
764
|
+
])
|
|
755
765
|
])
|
|
756
|
-
])
|
|
766
|
+
]),
|
|
767
|
+
h('div', {
|
|
768
|
+
class: 'vxe-table-custom--body'
|
|
769
|
+
}, [
|
|
770
|
+
topSlot
|
|
771
|
+
? h('div', {
|
|
772
|
+
class: 'vxe-table-custom--panel-top'
|
|
773
|
+
}, $xeTable.callSlot(topSlot, params))
|
|
774
|
+
: renderEmptyElement($xeTable),
|
|
775
|
+
defaultSlot
|
|
776
|
+
? h('div', {
|
|
777
|
+
class: 'vxe-table-custom--panel-body'
|
|
778
|
+
}, $xeTable.callSlot(defaultSlot, params))
|
|
779
|
+
: h(TransitionGroup, Object.assign({ class: 'vxe-table-custom--panel-list', name: 'vxe-table-custom--list', tag: 'ul' }, customWrapperOns), {
|
|
780
|
+
default: () => colVNs
|
|
781
|
+
}),
|
|
782
|
+
bottomSlot
|
|
783
|
+
? h('div', {
|
|
784
|
+
class: 'vxe-table-custom--panel-bottom'
|
|
785
|
+
}, $xeTable.callSlot(bottomSlot, params))
|
|
786
|
+
: renderEmptyElement($xeTable)
|
|
757
787
|
]),
|
|
758
|
-
|
|
759
|
-
class: 'vxe-table-custom--body'
|
|
760
|
-
}, [
|
|
761
|
-
topSlot
|
|
762
|
-
? h('div', {
|
|
763
|
-
class: 'vxe-table-custom--panel-top'
|
|
764
|
-
}, $xeTable.callSlot(topSlot, params))
|
|
765
|
-
: renderEmptyElement($xeTable),
|
|
766
|
-
defaultSlot
|
|
767
|
-
? h('div', {
|
|
768
|
-
class: 'vxe-table-custom--panel-body'
|
|
769
|
-
}, $xeTable.callSlot(defaultSlot, params))
|
|
770
|
-
: h(TransitionGroup, Object.assign({ class: 'vxe-table-custom--panel-list', name: 'vxe-table-custom--list', tag: 'ul' }, customWrapperOns), {
|
|
771
|
-
default: () => colVNs
|
|
772
|
-
}),
|
|
773
|
-
bottomSlot
|
|
788
|
+
customOpts.showFooter
|
|
774
789
|
? h('div', {
|
|
775
|
-
class: 'vxe-table-custom--
|
|
776
|
-
},
|
|
777
|
-
|
|
778
|
-
|
|
779
|
-
|
|
780
|
-
|
|
781
|
-
|
|
782
|
-
|
|
783
|
-
? $xeTable.callSlot(footerSlot, params)
|
|
784
|
-
: [
|
|
785
|
-
h('div', {
|
|
786
|
-
class: 'vxe-table-custom--footer-buttons'
|
|
787
|
-
}, [
|
|
788
|
-
VxeUIButtonComponent
|
|
789
|
-
? h(VxeUIButtonComponent, {
|
|
790
|
-
mode: 'text',
|
|
791
|
-
content: customOpts.resetButtonText || getI18n('vxe.table.customRestore'),
|
|
792
|
-
disabled: !isCustomStatus,
|
|
793
|
-
onClick: resetCustomEvent
|
|
794
|
-
})
|
|
795
|
-
: createCommentVNode(),
|
|
796
|
-
immediate
|
|
797
|
-
? (VxeUIButtonComponent
|
|
790
|
+
class: 'vxe-table-custom--footer'
|
|
791
|
+
}, footerSlot
|
|
792
|
+
? $xeTable.callSlot(footerSlot, params)
|
|
793
|
+
: [
|
|
794
|
+
h('div', {
|
|
795
|
+
class: 'vxe-table-custom--footer-buttons'
|
|
796
|
+
}, [
|
|
797
|
+
VxeUIButtonComponent
|
|
798
798
|
? h(VxeUIButtonComponent, {
|
|
799
799
|
mode: 'text',
|
|
800
|
-
content: customOpts.
|
|
801
|
-
|
|
800
|
+
content: customOpts.resetButtonText || getI18n('vxe.table.customRestore'),
|
|
801
|
+
disabled: !isCustomStatus,
|
|
802
|
+
onClick: resetCustomEvent
|
|
802
803
|
})
|
|
803
|
-
: createCommentVNode()
|
|
804
|
-
|
|
805
|
-
?
|
|
806
|
-
|
|
807
|
-
|
|
808
|
-
|
|
809
|
-
|
|
810
|
-
|
|
811
|
-
|
|
812
|
-
|
|
813
|
-
|
|
814
|
-
|
|
815
|
-
|
|
816
|
-
|
|
817
|
-
|
|
818
|
-
|
|
819
|
-
|
|
820
|
-
|
|
804
|
+
: createCommentVNode(),
|
|
805
|
+
immediate
|
|
806
|
+
? (VxeUIButtonComponent
|
|
807
|
+
? h(VxeUIButtonComponent, {
|
|
808
|
+
mode: 'text',
|
|
809
|
+
content: customOpts.closeButtonText || getI18n('vxe.table.customClose'),
|
|
810
|
+
onClick: cancelCloseEvent
|
|
811
|
+
})
|
|
812
|
+
: createCommentVNode())
|
|
813
|
+
: (VxeUIButtonComponent
|
|
814
|
+
? h(VxeUIButtonComponent, {
|
|
815
|
+
mode: 'text',
|
|
816
|
+
content: customOpts.cancelButtonText || getI18n('vxe.table.customCancel'),
|
|
817
|
+
onClick: cancelCustomEvent
|
|
818
|
+
})
|
|
819
|
+
: createCommentVNode()),
|
|
820
|
+
immediate
|
|
821
|
+
? createCommentVNode()
|
|
822
|
+
: (VxeUIButtonComponent
|
|
823
|
+
? h(VxeUIButtonComponent, {
|
|
824
|
+
mode: 'text',
|
|
825
|
+
status: 'primary',
|
|
826
|
+
content: customOpts.confirmButtonText || getI18n('vxe.table.customConfirm'),
|
|
827
|
+
onClick: confirmCustomEvent
|
|
828
|
+
})
|
|
829
|
+
: createCommentVNode())
|
|
830
|
+
])
|
|
821
831
|
])
|
|
822
|
-
|
|
823
|
-
|
|
824
|
-
|
|
825
|
-
|
|
826
|
-
]
|
|
827
|
-
|
|
828
|
-
|
|
832
|
+
: null
|
|
833
|
+
]),
|
|
834
|
+
renderDragTip()
|
|
835
|
+
])
|
|
836
|
+
]
|
|
837
|
+
: [])
|
|
838
|
+
]);
|
|
829
839
|
};
|
|
830
840
|
const renderPopupPanel = () => {
|
|
831
841
|
const $xeGrid = $xeTable.xeGrid;
|
|
@@ -1232,6 +1242,9 @@ export default defineVxeComponent({
|
|
|
1232
1242
|
getComputeMaps: () => computeMaps,
|
|
1233
1243
|
renderVN
|
|
1234
1244
|
};
|
|
1245
|
+
onUnmounted(() => {
|
|
1246
|
+
customPanelInternalData = createInternalData();
|
|
1247
|
+
});
|
|
1235
1248
|
provide('$xeTableCustomPanel', $xeTableCustomPanel);
|
|
1236
1249
|
return $xeTableCustomPanel;
|
|
1237
1250
|
},
|
|
@@ -272,8 +272,8 @@ hooks.add('tableKeyboardModule', {
|
|
|
272
272
|
const checkboxOpts = computeCheckboxOpts.value;
|
|
273
273
|
const mouseOpts = computeMouseOpts.value;
|
|
274
274
|
const editOpts = computeEditOpts.value;
|
|
275
|
-
if (mouseConfig && mouseOpts.area && $xeTable.
|
|
276
|
-
return $xeTable.
|
|
275
|
+
if (mouseConfig && mouseOpts.area && $xeTable.triggerCellAreaModnEvent) {
|
|
276
|
+
return $xeTable.triggerCellAreaModnEvent(evnt, params);
|
|
277
277
|
}
|
|
278
278
|
else {
|
|
279
279
|
if (checkboxConfig && checkboxOpts.range) {
|
package/es/table/src/table.js
CHANGED
|
@@ -2440,7 +2440,7 @@ export default defineVxeComponent({
|
|
|
2440
2440
|
if (mouseConfig && mouseOpts.selected && editStore.selected.row && editStore.selected.column) {
|
|
2441
2441
|
$xeTable.addCellSelectedClass();
|
|
2442
2442
|
}
|
|
2443
|
-
if ($xeGanttView) {
|
|
2443
|
+
if ($xeGanttView && $xeGanttView.handleUpdateStyle) {
|
|
2444
2444
|
$xeGanttView.handleUpdateStyle();
|
|
2445
2445
|
}
|
|
2446
2446
|
return nextTick();
|
|
@@ -3100,7 +3100,7 @@ export default defineVxeComponent({
|
|
|
3100
3100
|
else {
|
|
3101
3101
|
resolve(handleRecalculateStyle(reFull, reWidth, reHeight));
|
|
3102
3102
|
}
|
|
3103
|
-
if ($xeGanttView) {
|
|
3103
|
+
if ($xeGanttView && $xeGanttView.handleLazyRecalculate) {
|
|
3104
3104
|
$xeGanttView.handleLazyRecalculate();
|
|
3105
3105
|
}
|
|
3106
3106
|
internalData.rceTimeout = setTimeout(() => {
|
|
@@ -3705,8 +3705,8 @@ export default defineVxeComponent({
|
|
|
3705
3705
|
// 如果gt为0,则总是启用
|
|
3706
3706
|
const scrollYLoad = (transform || !treeConfig) && !!virtualYOpts.enabled && virtualYOpts.gt > -1 && (virtualYOpts.gt === 0 || virtualYOpts.gt < allList.length);
|
|
3707
3707
|
reactData.scrollYLoad = scrollYLoad;
|
|
3708
|
-
if ($xeGanttView) {
|
|
3709
|
-
$xeGanttView.
|
|
3708
|
+
if ($xeGanttView && $xeGanttView.handleUpdateSYStatus) {
|
|
3709
|
+
$xeGanttView.handleUpdateSYStatus(scrollYLoad);
|
|
3710
3710
|
}
|
|
3711
3711
|
return scrollYLoad;
|
|
3712
3712
|
};
|
|
@@ -4967,6 +4967,29 @@ export default defineVxeComponent({
|
|
|
4967
4967
|
}
|
|
4968
4968
|
return [];
|
|
4969
4969
|
},
|
|
4970
|
+
/**
|
|
4971
|
+
* 只对 tree-config 有效,用于树形结构,获取指定行的层级
|
|
4972
|
+
*/
|
|
4973
|
+
getTreeRowLevel(rowOrRowid) {
|
|
4974
|
+
const { treeConfig } = props;
|
|
4975
|
+
const { fullAllDataRowIdData } = internalData;
|
|
4976
|
+
if (rowOrRowid && treeConfig) {
|
|
4977
|
+
let rowid;
|
|
4978
|
+
if (XEUtils.isString(rowOrRowid)) {
|
|
4979
|
+
rowid = rowOrRowid;
|
|
4980
|
+
}
|
|
4981
|
+
else {
|
|
4982
|
+
rowid = getRowid($xeTable, rowOrRowid);
|
|
4983
|
+
}
|
|
4984
|
+
if (rowid) {
|
|
4985
|
+
const rest = fullAllDataRowIdData[rowid];
|
|
4986
|
+
if (rest) {
|
|
4987
|
+
return rest.level;
|
|
4988
|
+
}
|
|
4989
|
+
}
|
|
4990
|
+
}
|
|
4991
|
+
return -1;
|
|
4992
|
+
},
|
|
4970
4993
|
/**
|
|
4971
4994
|
* 只对 tree-config 有效,获取行的父级
|
|
4972
4995
|
*/
|
|
@@ -4983,7 +5006,9 @@ export default defineVxeComponent({
|
|
|
4983
5006
|
}
|
|
4984
5007
|
if (rowid) {
|
|
4985
5008
|
const rest = fullAllDataRowIdData[rowid];
|
|
4986
|
-
|
|
5009
|
+
if (rest) {
|
|
5010
|
+
return rest.parent;
|
|
5011
|
+
}
|
|
4987
5012
|
}
|
|
4988
5013
|
}
|
|
4989
5014
|
return null;
|
|
@@ -5649,7 +5674,7 @@ export default defineVxeComponent({
|
|
|
5649
5674
|
XEUtils.arrayEach(el.querySelectorAll(`[rowid="${getRowid($xeTable, row)}"]`), elem => addClass(elem, 'row--current'));
|
|
5650
5675
|
}
|
|
5651
5676
|
}
|
|
5652
|
-
if ($xeGanttView) {
|
|
5677
|
+
if ($xeGanttView && $xeGanttView.handleUpdateCurrentRow) {
|
|
5653
5678
|
$xeGanttView.handleUpdateCurrentRow(row);
|
|
5654
5679
|
}
|
|
5655
5680
|
return nextTick();
|
|
@@ -5698,7 +5723,7 @@ export default defineVxeComponent({
|
|
|
5698
5723
|
if (el) {
|
|
5699
5724
|
XEUtils.arrayEach(el.querySelectorAll('.row--current'), elem => removeClass(elem, 'row--current'));
|
|
5700
5725
|
}
|
|
5701
|
-
if ($xeGanttView) {
|
|
5726
|
+
if ($xeGanttView && $xeGanttView.handleUpdateCurrentRow) {
|
|
5702
5727
|
$xeGanttView.handleUpdateCurrentRow();
|
|
5703
5728
|
}
|
|
5704
5729
|
return nextTick();
|
|
@@ -7945,7 +7970,7 @@ export default defineVxeComponent({
|
|
|
7945
7970
|
});
|
|
7946
7971
|
reactData.tableData = tableData;
|
|
7947
7972
|
internalData.visibleDataRowIdData = visibleDataRowIdMaps;
|
|
7948
|
-
if ($xeGanttView) {
|
|
7973
|
+
if ($xeGanttView && $xeGanttView.updateViewData) {
|
|
7949
7974
|
$xeGanttView.updateViewData();
|
|
7950
7975
|
}
|
|
7951
7976
|
return nextTick();
|
|
@@ -10785,6 +10810,7 @@ export default defineVxeComponent({
|
|
|
10785
10810
|
updateScrollXSpace() {
|
|
10786
10811
|
const { scrollXLoad, overflowX, scrollXWidth } = reactData;
|
|
10787
10812
|
const { visibleColumn, scrollXStore, elemStore, fullColumnIdData } = internalData;
|
|
10813
|
+
const $xeGanttView = internalData.xeGanttView;
|
|
10788
10814
|
const mouseOpts = computeMouseOpts.value;
|
|
10789
10815
|
const tableBody = refTableBody.value;
|
|
10790
10816
|
const tableBodyElem = tableBody ? tableBody.$el : null;
|
|
@@ -10850,6 +10876,9 @@ export default defineVxeComponent({
|
|
|
10850
10876
|
if (isScrollXBig && mouseOpts.area) {
|
|
10851
10877
|
errLog('vxe.error.notProp', ['mouse-config.area']);
|
|
10852
10878
|
}
|
|
10879
|
+
if ($xeGanttView && $xeGanttView.handleUpdateSXSpace) {
|
|
10880
|
+
$xeGanttView.handleUpdateSXSpace();
|
|
10881
|
+
}
|
|
10853
10882
|
return nextTick().then(() => {
|
|
10854
10883
|
updateStyle();
|
|
10855
10884
|
});
|
|
@@ -10959,8 +10988,8 @@ export default defineVxeComponent({
|
|
|
10959
10988
|
if (isScrollYBig && mouseOpts.area) {
|
|
10960
10989
|
errLog('vxe.error.notProp', ['mouse-config.area']);
|
|
10961
10990
|
}
|
|
10962
|
-
if ($xeGanttView) {
|
|
10963
|
-
$xeGanttView.
|
|
10991
|
+
if ($xeGanttView && $xeGanttView.handleUpdateSYSpace) {
|
|
10992
|
+
$xeGanttView.handleUpdateSYSpace();
|
|
10964
10993
|
}
|
|
10965
10994
|
return nextTick().then(() => {
|
|
10966
10995
|
updateStyle();
|
|
@@ -11042,7 +11071,7 @@ export default defineVxeComponent({
|
|
|
11042
11071
|
XEUtils.arrayEach(el.querySelectorAll(`.vxe-body--row[rowid="${rowid}"]`), elem => addClass(elem, 'row--hover'));
|
|
11043
11072
|
}
|
|
11044
11073
|
internalData.hoverRow = row;
|
|
11045
|
-
if ($xeGanttView) {
|
|
11074
|
+
if ($xeGanttView && $xeGanttView.handleUpdateHoverRow) {
|
|
11046
11075
|
$xeGanttView.handleUpdateHoverRow(row);
|
|
11047
11076
|
}
|
|
11048
11077
|
},
|
|
@@ -11053,7 +11082,7 @@ export default defineVxeComponent({
|
|
|
11053
11082
|
XEUtils.arrayEach(el.querySelectorAll('.vxe-body--row.row--hover'), elem => removeClass(elem, 'row--hover'));
|
|
11054
11083
|
}
|
|
11055
11084
|
internalData.hoverRow = null;
|
|
11056
|
-
if ($xeGanttView) {
|
|
11085
|
+
if ($xeGanttView && $xeGanttView.handleUpdateHoverRow) {
|
|
11057
11086
|
$xeGanttView.handleUpdateHoverRow();
|
|
11058
11087
|
}
|
|
11059
11088
|
},
|
|
@@ -11887,12 +11916,20 @@ export default defineVxeComponent({
|
|
|
11887
11916
|
tablePrivateMethods.preventEvent(null, 'deactivated', { $table: $xeTable });
|
|
11888
11917
|
});
|
|
11889
11918
|
onMounted(() => {
|
|
11919
|
+
const $xeGantt = $xeTable.xeGantt;
|
|
11890
11920
|
const columnOpts = computeColumnOpts.value;
|
|
11891
11921
|
const rowOpts = computeRowOpts.value;
|
|
11892
11922
|
const customOpts = computeCustomOpts.value;
|
|
11893
11923
|
const aggregateOpts = computeAggregateOpts.value;
|
|
11894
11924
|
const virtualYOpts = computeVirtualYOpts.value;
|
|
11895
11925
|
const { groupFields } = aggregateOpts;
|
|
11926
|
+
if ($xeGantt) {
|
|
11927
|
+
const { refClassifyWrapperElem } = $xeGantt.getRefMaps();
|
|
11928
|
+
const classifyWrapperEl = refClassifyWrapperElem.value;
|
|
11929
|
+
if (classifyWrapperEl) {
|
|
11930
|
+
internalData.teleportToWrapperElem = classifyWrapperEl;
|
|
11931
|
+
}
|
|
11932
|
+
}
|
|
11896
11933
|
if (columnOpts.drag || rowOpts.drag || customOpts.allowSort) {
|
|
11897
11934
|
initTpImg();
|
|
11898
11935
|
}
|
|
@@ -11980,7 +12017,7 @@ export default defineVxeComponent({
|
|
|
11980
12017
|
if (rowOpts.height && !props.showOverflow) {
|
|
11981
12018
|
warnLog('vxe.error.notProp', ['table.show-overflow']);
|
|
11982
12019
|
}
|
|
11983
|
-
if (!$xeTable.
|
|
12020
|
+
if (!$xeTable.triggerCellAreaModnEvent) {
|
|
11984
12021
|
if (props.areaConfig) {
|
|
11985
12022
|
warnLog('vxe.error.notProp', ['area-config']);
|
|
11986
12023
|
}
|