vxe-table 4.19.11 → 4.19.13

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.
Files changed (53) hide show
  1. package/dist/all.esm.js +227 -220
  2. package/dist/style.css +1 -1
  3. package/dist/style.min.css +1 -1
  4. package/es/index.css +1 -1
  5. package/es/index.min.css +1 -1
  6. package/es/style.css +1 -1
  7. package/es/style.min.css +1 -1
  8. package/es/table/module/menu/panel.js +7 -7
  9. package/es/table/src/cell.js +16 -12
  10. package/es/table/src/columnInfo.js +77 -77
  11. package/es/table/src/table.js +7 -3
  12. package/es/table/style.css +29 -13
  13. package/es/table/style.min.css +1 -1
  14. package/es/ui/index.js +1 -1
  15. package/es/ui/src/log.js +1 -1
  16. package/es/vxe-table/style.css +29 -13
  17. package/es/vxe-table/style.min.css +1 -1
  18. package/lib/index.css +1 -1
  19. package/lib/index.min.css +1 -1
  20. package/lib/index.umd.js +259 -249
  21. package/lib/index.umd.min.js +1 -1
  22. package/lib/style.css +1 -1
  23. package/lib/style.min.css +1 -1
  24. package/lib/table/module/menu/panel.js +8 -8
  25. package/lib/table/module/menu/panel.min.js +1 -1
  26. package/lib/table/src/cell.js +6 -4
  27. package/lib/table/src/cell.min.js +1 -1
  28. package/lib/table/src/columnInfo.js +85 -77
  29. package/lib/table/src/columnInfo.min.js +1 -1
  30. package/lib/table/src/table.js +3 -3
  31. package/lib/table/src/table.min.js +1 -1
  32. package/lib/table/style/style.css +29 -13
  33. package/lib/table/style/style.min.css +1 -1
  34. package/lib/ui/index.js +1 -1
  35. package/lib/ui/index.min.js +1 -1
  36. package/lib/ui/src/log.js +1 -1
  37. package/lib/ui/src/log.min.js +1 -1
  38. package/lib/vxe-table/style/style.css +29 -13
  39. package/lib/vxe-table/style/style.min.css +1 -1
  40. package/package.json +2 -2
  41. package/packages/table/module/menu/panel.ts +7 -7
  42. package/packages/table/src/cell.ts +16 -12
  43. package/packages/table/src/columnInfo.ts +80 -80
  44. package/packages/table/src/table.ts +7 -3
  45. package/packages/table/src/util.ts +1 -1
  46. package/styles/components/table-module/menu.scss +5 -2
  47. package/styles/components/table.scss +24 -6
  48. /package/es/{iconfont.1781074420923.ttf → iconfont.1781229243647.ttf} +0 -0
  49. /package/es/{iconfont.1781074420923.woff → iconfont.1781229243647.woff} +0 -0
  50. /package/es/{iconfont.1781074420923.woff2 → iconfont.1781229243647.woff2} +0 -0
  51. /package/lib/{iconfont.1781074420923.ttf → iconfont.1781229243647.ttf} +0 -0
  52. /package/lib/{iconfont.1781074420923.woff → iconfont.1781229243647.woff} +0 -0
  53. /package/lib/{iconfont.1781074420923.woff2 → iconfont.1781229243647.woff2} +0 -0
package/dist/all.esm.js CHANGED
@@ -44,7 +44,7 @@ function eqEmptyValue(cellValue) {
44
44
  return cellValue === '' || XEUtils.eqNull(cellValue);
45
45
  }
46
46
 
47
- const version$1 = "4.19.11";
47
+ const version$1 = "4.19.13";
48
48
  VxeUI.version = version$1;
49
49
  VxeUI.tableVersion = version$1;
50
50
  VxeUI.setConfig({
@@ -555,203 +555,6 @@ const modal = {
555
555
 
556
556
  const defineVxeComponent = defineComponent;
557
557
 
558
- const { log } = VxeUI;
559
- const version = `table v${"4.19.11"}`;
560
- const warnLog = log.create('warn', version);
561
- const errLog = log.create('error', version);
562
-
563
- const { getI18n: getI18n$d, formats: formats$1, renderer: renderer$b } = VxeUI;
564
- class ColumnInfo {
565
- /* eslint-disable @typescript-eslint/no-use-before-define */
566
- constructor($xeTable, _vm, { renderHeader, renderCell, renderFooter, renderData } = {}) {
567
- const tableProps = $xeTable.props;
568
- const $xeGrid = $xeTable.xeGrid;
569
- const $xeGantt = $xeTable.xeGantt;
570
- const $xeGGWrapper = $xeGrid || $xeGantt;
571
- const { field, editRender, filterRender } = _vm;
572
- const colId = _vm.colId || XEUtils.uniqueId('col_');
573
- const formatter = _vm.formatter;
574
- const visible = XEUtils.isBoolean(_vm.visible) ? _vm.visible : true;
575
- const flCompConf = isEnableConf(filterRender) ? renderer$b.get(filterRender.name) : null;
576
- const ctFilterOptions = flCompConf ? flCompConf.createTableFilterOptions : null;
577
- const filters = toFilters(_vm.filters, colId);
578
- const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
579
- if (_vm.type && types.indexOf(_vm.type) === -1) {
580
- warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')]);
581
- }
582
- if (XEUtils.isBoolean(_vm.cellRender) || (_vm.cellRender && !XEUtils.isObject(_vm.cellRender))) {
583
- warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}']);
584
- }
585
- if (XEUtils.isBoolean(_vm.editRender) || (_vm.editRender && !XEUtils.isObject(_vm.editRender))) {
586
- warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}']);
587
- }
588
- if (_vm.type === 'expand') {
589
- const { treeConfig } = tableProps;
590
- const { computeTreeOpts } = $xeTable.getComputeMaps();
591
- const treeOpts = computeTreeOpts.value;
592
- if (treeConfig && (treeOpts.showLine || treeOpts.line)) {
593
- errLog('vxe.error.errConflicts', ['tree-config.showLine', 'column.type=expand']);
594
- }
595
- }
596
- if (formatter) {
597
- if (XEUtils.isString(formatter)) {
598
- const gFormatOpts = formats$1.get(formatter) || XEUtils[formatter];
599
- if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
600
- errLog('vxe.error.notFormats', [formatter]);
601
- }
602
- }
603
- else if (XEUtils.isArray(formatter)) {
604
- const gFormatOpts = formats$1.get(formatter[0]) || XEUtils[formatter[0]];
605
- if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
606
- errLog('vxe.error.notFormats', [formatter[0]]);
607
- }
608
- }
609
- }
610
- if (_vm.aggFunc) {
611
- if (!$xeTable.handlePivotTableAggData && _vm.aggFunc !== true) {
612
- errLog('vxe.error.errProp', [`column.agg-func=${_vm.aggFunc}`, 'column.agg-func=true']);
613
- }
614
- }
615
- if (field && editRender) {
616
- if (editRender.startField && `${editRender.startField}`.indexOf(field) >= 0) {
617
- errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.startField=${editRender.startField}`]);
618
- }
619
- if (editRender.endField && `${editRender.endField}`.indexOf(field) >= 0) {
620
- errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.endField=${editRender.endField}`]);
621
- }
622
- }
623
- Object.assign(this, {
624
- // 基本属性
625
- type: _vm.type,
626
- property: _vm.field,
627
- field: field,
628
- title: _vm.title,
629
- width: _vm.width,
630
- minWidth: _vm.minWidth,
631
- maxWidth: _vm.maxWidth,
632
- resizable: _vm.resizable,
633
- fixed: _vm.fixed,
634
- align: _vm.align,
635
- headerAlign: _vm.headerAlign,
636
- footerAlign: _vm.footerAlign,
637
- showOverflow: _vm.showOverflow,
638
- showHeaderOverflow: _vm.showHeaderOverflow,
639
- showFooterOverflow: _vm.showFooterOverflow,
640
- className: _vm.className,
641
- headerClassName: _vm.headerClassName,
642
- footerClassName: _vm.footerClassName,
643
- formatter: formatter,
644
- headerFormatter: _vm.headerFormatter,
645
- footerFormatter: _vm.footerFormatter,
646
- padding: _vm.padding,
647
- verticalAlign: _vm.verticalAlign,
648
- sortable: _vm.sortable,
649
- sortBy: _vm.sortBy,
650
- sortType: _vm.sortType,
651
- filters: filters,
652
- filterMultiple: XEUtils.isBoolean(_vm.filterMultiple) ? _vm.filterMultiple : true,
653
- filterMethod: _vm.filterMethod,
654
- filterResetMethod: _vm.filterResetMethod,
655
- filterRecoverMethod: _vm.filterRecoverMethod,
656
- filterRender: filterRender,
657
- floatingFilters: _vm.floatingFilters,
658
- rules: _vm.rules,
659
- rowGroupNode: _vm.rowGroupNode,
660
- treeNode: _vm.treeNode,
661
- dragSort: _vm.dragSort,
662
- rowResize: _vm.rowResize,
663
- cellType: _vm.cellType,
664
- cellRender: _vm.cellRender,
665
- editRender: editRender,
666
- contentRender: _vm.contentRender,
667
- headerExportMethod: _vm.headerExportMethod,
668
- exportMethod: _vm.exportMethod,
669
- footerExportMethod: _vm.footerExportMethod,
670
- titleHelp: _vm.titleHelp,
671
- titlePrefix: _vm.titlePrefix,
672
- titleSuffix: _vm.titleSuffix,
673
- aggFunc: _vm.aggFunc,
674
- copyMethod: _vm.copyMethod,
675
- cutMethod: _vm.cutMethod,
676
- pasteMethod: _vm.pasteMethod,
677
- // 自定义参数
678
- params: _vm.params,
679
- // 渲染属性
680
- id: colId,
681
- parentId: null,
682
- visible,
683
- // 内部属性(一旦被使用,将导致不可升级版本)
684
- defaultParentId: null,
685
- halfVisible: false,
686
- defaultVisible: visible,
687
- defaultFixed: _vm.fixed,
688
- defaultAggGroup: _vm.aggGroup,
689
- defaultAggFunc: _vm.aggFunc,
690
- checked: false,
691
- halfChecked: false,
692
- disabled: false,
693
- // 分组层级
694
- level: 1,
695
- // 跨行
696
- rowSpan: 1,
697
- // 跨列
698
- colSpan: 1,
699
- // 数据排序
700
- order: null,
701
- sortTime: 0,
702
- // 列排序
703
- sortNumber: 0,
704
- renderSortNumber: 0,
705
- renderAggFn: '',
706
- renderAggDigits: null,
707
- renderAggFormat: null,
708
- renderFixed: '',
709
- renderVisible: false,
710
- renderWidth: 0,
711
- renderHeight: 0,
712
- renderResizeWidth: 0,
713
- renderAutoWidth: 0,
714
- resizeWidth: 0,
715
- renderLeft: 0,
716
- renderArgs: [],
717
- model: {},
718
- renderHeader: renderHeader || _vm.renderHeader,
719
- renderCell: renderCell || _vm.renderCell,
720
- renderFooter: renderFooter || _vm.renderFooter,
721
- renderData: renderData,
722
- // 单元格插槽,只对 grid 有效
723
- slots: _vm.slots
724
- });
725
- if (ctFilterOptions && (!filters || !filters.length)) {
726
- this.filters = toFilters(ctFilterOptions({ $table: $xeTable, column: this }), colId);
727
- }
728
- if ($xeGGWrapper) {
729
- const { computeProxyOpts } = $xeGGWrapper.getComputeMaps();
730
- const proxyOpts = computeProxyOpts.value;
731
- if (proxyOpts.beforeColumn) {
732
- proxyOpts.beforeColumn({ $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, column: this });
733
- }
734
- }
735
- }
736
- getTitle() {
737
- return getFuncText(this.title || (this.type === 'seq' ? getI18n$d('vxe.table.seqTitle') : ''));
738
- }
739
- getKey() {
740
- const { type } = this;
741
- return this.field || (type ? `type=${type}` : null);
742
- }
743
- update(name, value) {
744
- // 不支持直接修改的属性
745
- if (name !== 'filters') {
746
- if (name === 'field') {
747
- // 兼容旧属性
748
- this.property = value;
749
- }
750
- this[name] = value;
751
- }
752
- }
753
- }
754
-
755
558
  const reClsMap = {};
756
559
  let tpImgEl;
757
560
  function initTpImg() {
@@ -939,6 +742,202 @@ function wheelScrollTopTo(diffNum, cb) {
939
742
  });
940
743
  }
941
744
 
745
+ const { log } = VxeUI;
746
+ const version = `table v${"4.19.13"}`;
747
+ const warnLog = log.create('warn', version);
748
+ const errLog = log.create('error', version);
749
+
750
+ const { getI18n: getI18n$d, formats: formats$1, renderer: renderer$b } = VxeUI;
751
+ class ColumnInfo {
752
+ /* eslint-disable @typescript-eslint/no-use-before-define */
753
+ constructor($xeTable, colConfs, { renderHeader, renderCell, renderFooter, renderData } = {}) {
754
+ const tableProps = $xeTable.props;
755
+ const $xeGrid = $xeTable.xeGrid;
756
+ const $xeGantt = $xeTable.xeGantt;
757
+ const $xeGGWrapper = $xeGrid || $xeGantt;
758
+ const { type, field, width, visible, aggFunc, formatter, filterMultiple, cellRender, editRender, filterRender } = colConfs;
759
+ const colId = colConfs.colId || XEUtils.uniqueId('col_');
760
+ const defaultVisible = XEUtils.isBoolean(visible) ? visible : true;
761
+ const defaultRenderWidth = width && isPx(width) && width !== 'auto' ? Math.max(0, XEUtils.toInteger(width)) : 0;
762
+ const flCompConf = filterRender && isEnableConf(filterRender) ? renderer$b.get(filterRender.name) : null;
763
+ const ctFilterOptions = flCompConf ? flCompConf.createTableFilterOptions : null;
764
+ const filters = toFilters(colConfs.filters, colId);
765
+ const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
766
+ if (type && types.indexOf(type) === -1) {
767
+ warnLog('vxe.error.errProp', [`type=${type}`, types.join(', ')]);
768
+ }
769
+ if (XEUtils.isBoolean(cellRender) || (cellRender && !XEUtils.isObject(cellRender))) {
770
+ warnLog('vxe.error.errProp', [`column.cell-render=${cellRender}`, 'column.cell-render={}']);
771
+ }
772
+ if (XEUtils.isBoolean(editRender) || (editRender && !XEUtils.isObject(editRender))) {
773
+ warnLog('vxe.error.errProp', [`column.edit-render=${editRender}`, 'column.edit-render={}']);
774
+ }
775
+ if (type === 'expand') {
776
+ const { treeConfig } = tableProps;
777
+ const { computeTreeOpts } = $xeTable.getComputeMaps();
778
+ const treeOpts = computeTreeOpts.value;
779
+ if (treeConfig && (treeOpts.showLine || treeOpts.line)) {
780
+ errLog('vxe.error.errConflicts', ['tree-config.showLine', 'column.type=expand']);
781
+ }
782
+ }
783
+ if (formatter) {
784
+ if (XEUtils.isString(formatter)) {
785
+ const gFormatOpts = formats$1.get(formatter) || XEUtils[formatter];
786
+ if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
787
+ errLog('vxe.error.notFormats', [formatter]);
788
+ }
789
+ }
790
+ else if (XEUtils.isArray(formatter)) {
791
+ const gFormatOpts = formats$1.get(formatter[0]) || XEUtils[formatter[0]];
792
+ if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
793
+ errLog('vxe.error.notFormats', [formatter[0]]);
794
+ }
795
+ }
796
+ }
797
+ if (aggFunc) {
798
+ if (!$xeTable.handlePivotTableAggData && aggFunc !== true) {
799
+ errLog('vxe.error.errProp', [`column.agg-func=${aggFunc}`, 'column.agg-func=true']);
800
+ }
801
+ }
802
+ if (field && editRender) {
803
+ if (editRender.startField && `${editRender.startField}`.indexOf(field) >= 0) {
804
+ errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.startField=${editRender.startField}`]);
805
+ }
806
+ if (editRender.endField && `${editRender.endField}`.indexOf(field) >= 0) {
807
+ errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.endField=${editRender.endField}`]);
808
+ }
809
+ }
810
+ Object.assign(this, {
811
+ // 基本属性
812
+ type: colConfs.type,
813
+ property: colConfs.field,
814
+ field: field,
815
+ title: colConfs.title,
816
+ width: colConfs.width,
817
+ minWidth: colConfs.minWidth,
818
+ maxWidth: colConfs.maxWidth,
819
+ resizable: colConfs.resizable,
820
+ fixed: colConfs.fixed,
821
+ align: colConfs.align,
822
+ headerAlign: colConfs.headerAlign,
823
+ footerAlign: colConfs.footerAlign,
824
+ showOverflow: colConfs.showOverflow,
825
+ showHeaderOverflow: colConfs.showHeaderOverflow,
826
+ showFooterOverflow: colConfs.showFooterOverflow,
827
+ className: colConfs.className,
828
+ headerClassName: colConfs.headerClassName,
829
+ footerClassName: colConfs.footerClassName,
830
+ formatter: formatter,
831
+ headerFormatter: colConfs.headerFormatter,
832
+ footerFormatter: colConfs.footerFormatter,
833
+ padding: colConfs.padding,
834
+ verticalAlign: colConfs.verticalAlign,
835
+ sortable: colConfs.sortable,
836
+ sortBy: colConfs.sortBy,
837
+ sortType: colConfs.sortType,
838
+ filters: filters,
839
+ filterMultiple: XEUtils.isBoolean(filterMultiple) ? filterMultiple : true,
840
+ filterMethod: colConfs.filterMethod,
841
+ filterResetMethod: colConfs.filterResetMethod,
842
+ filterRecoverMethod: colConfs.filterRecoverMethod,
843
+ filterRender: filterRender,
844
+ floatingFilters: colConfs.floatingFilters,
845
+ rules: colConfs.rules,
846
+ rowGroupNode: colConfs.rowGroupNode,
847
+ treeNode: colConfs.treeNode,
848
+ dragSort: colConfs.dragSort,
849
+ rowResize: colConfs.rowResize,
850
+ cellType: colConfs.cellType,
851
+ cellRender: cellRender,
852
+ editRender: editRender,
853
+ contentRender: colConfs.contentRender,
854
+ headerExportMethod: colConfs.headerExportMethod,
855
+ exportMethod: colConfs.exportMethod,
856
+ footerExportMethod: colConfs.footerExportMethod,
857
+ titleHelp: colConfs.titleHelp,
858
+ titlePrefix: colConfs.titlePrefix,
859
+ titleSuffix: colConfs.titleSuffix,
860
+ aggFunc: colConfs.aggFunc,
861
+ copyMethod: colConfs.copyMethod,
862
+ cutMethod: colConfs.cutMethod,
863
+ pasteMethod: colConfs.pasteMethod,
864
+ // 自定义参数
865
+ params: colConfs.params,
866
+ // 渲染属性
867
+ id: colId,
868
+ parentId: null,
869
+ visible: defaultVisible,
870
+ // 内部属性(一旦被使用,将导致不可升级版本)
871
+ defaultParentId: null,
872
+ halfVisible: false,
873
+ defaultVisible: defaultVisible,
874
+ defaultFixed: colConfs.fixed,
875
+ defaultAggFunc: colConfs.aggFunc,
876
+ checked: false,
877
+ halfChecked: false,
878
+ disabled: false,
879
+ // 分组层级
880
+ level: 1,
881
+ // 跨行
882
+ rowSpan: 1,
883
+ // 跨列
884
+ colSpan: 1,
885
+ // 数据排序
886
+ order: null,
887
+ sortTime: 0,
888
+ // 列排序
889
+ sortNumber: 0,
890
+ renderSortNumber: 0,
891
+ renderAggFn: '',
892
+ renderAggDigits: null,
893
+ renderAggFormat: null,
894
+ renderFixed: '',
895
+ renderVisible: false,
896
+ renderWidth: defaultRenderWidth,
897
+ renderHeight: 0,
898
+ renderResizeWidth: 0,
899
+ renderAutoWidth: 0,
900
+ resizeWidth: 0,
901
+ renderLeft: 0,
902
+ renderArgs: [],
903
+ model: {},
904
+ renderHeader: renderHeader || colConfs.renderHeader,
905
+ renderCell: renderCell || colConfs.renderCell,
906
+ renderFooter: renderFooter || colConfs.renderFooter,
907
+ renderData: renderData,
908
+ // 单元格插槽,只对 grid 有效
909
+ slots: colConfs.slots
910
+ });
911
+ if (ctFilterOptions && (!filters || !filters.length)) {
912
+ this.filters = toFilters(ctFilterOptions({ $table: $xeTable, column: this }), colId);
913
+ }
914
+ if ($xeGGWrapper) {
915
+ const { computeProxyOpts } = $xeGGWrapper.getComputeMaps();
916
+ const proxyOpts = computeProxyOpts.value;
917
+ if (proxyOpts.beforeColumn) {
918
+ proxyOpts.beforeColumn({ $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, column: this });
919
+ }
920
+ }
921
+ }
922
+ getTitle() {
923
+ return getFuncText(this.title || (this.type === 'seq' ? getI18n$d('vxe.table.seqTitle') : ''));
924
+ }
925
+ getKey() {
926
+ const { type, field } = this;
927
+ return field || (type ? `type=${type}` : null);
928
+ }
929
+ update(name, value) {
930
+ // 不支持直接修改的属性
931
+ if (name !== 'filters') {
932
+ if (name === 'field') {
933
+ // 兼容旧属性
934
+ this.property = value;
935
+ }
936
+ this[name] = value;
937
+ }
938
+ }
939
+ }
940
+
942
941
  function createInternalData$3() {
943
942
  return {
944
943
  tZindex: 0,
@@ -2930,24 +2929,28 @@ const Cell = {
2930
2929
  }
2931
2930
  return renderCellBaseVNs(params, [
2932
2931
  showIcon && (!visibleMethod || visibleMethod(params))
2933
- ? h('span', {
2932
+ ? h('div', {
2934
2933
  class: ['vxe-table--expanded', {
2935
2934
  'is--active': isActive
2936
- }],
2937
- onMousedown(evnt) {
2938
- evnt.stopPropagation();
2939
- },
2940
- onClick(evnt) {
2941
- $table.triggerRowExpandEvent(evnt, params);
2942
- }
2935
+ }]
2943
2936
  }, [
2944
- h('i', {
2945
- class: ['vxe-table--expand-btn', isLazyLoading ? (iconLoaded || getIcon$7().TABLE_EXPAND_LOADED) : (isActive ? (iconOpen || getIcon$7().TABLE_EXPAND_OPEN) : (iconClose || getIcon$7().TABLE_EXPAND_CLOSE))]
2946
- })
2937
+ h('span', {
2938
+ class: 'vxe-table--expand-btn',
2939
+ onMousedown(evnt) {
2940
+ evnt.stopPropagation();
2941
+ },
2942
+ onClick(evnt) {
2943
+ $table.triggerRowExpandEvent(evnt, params);
2944
+ }
2945
+ }, [
2946
+ h('i', {
2947
+ class: isLazyLoading ? (iconLoaded || getIcon$7().TABLE_EXPAND_LOADED) : (isActive ? (iconOpen || getIcon$7().TABLE_EXPAND_OPEN) : (iconClose || getIcon$7().TABLE_EXPAND_CLOSE))
2948
+ })
2949
+ ])
2947
2950
  ])
2948
2951
  : renderEmptyElement$a($table),
2949
2952
  defaultSlot || labelField
2950
- ? h('span', {
2953
+ ? h('div', {
2951
2954
  class: 'vxe-table--expand-label'
2952
2955
  }, defaultSlot ? $table.callSlot(defaultSlot, params) : XEUtils.get(row, labelField))
2953
2956
  : renderEmptyElement$a($table)
@@ -8186,8 +8189,8 @@ var TableMenuPanelComponent = defineVxeComponent({
8186
8189
  const { ctxMenuStore } = tableReactData;
8187
8190
  const { computeMenuOpts } = $xeTable.getComputeMaps();
8188
8191
  const menuOpts = computeMenuOpts.value;
8189
- const { transfer, destroyOnClose } = menuOpts;
8190
- const { visible, list, className } = ctxMenuStore;
8192
+ const { transfer, destroyOnClose, className } = menuOpts;
8193
+ const { visible, list } = ctxMenuStore;
8191
8194
  return h(Teleport, {
8192
8195
  to: 'body',
8193
8196
  disabled: !transfer
@@ -8203,7 +8206,7 @@ var TableMenuPanelComponent = defineVxeComponent({
8203
8206
  return options.every(item => item.visible === false)
8204
8207
  ? renderEmptyElement$2($xeTable)
8205
8208
  : h('ul', {
8206
- class: 'vxe-context-menu--option-wrapper',
8209
+ class: 'vxe-table--context-menu-group-wrapper',
8207
8210
  key: gIndex
8208
8211
  }, options.map((item, index) => {
8209
8212
  const { children, loading } = item;
@@ -8216,7 +8219,7 @@ var TableMenuPanelComponent = defineVxeComponent({
8216
8219
  return item.visible === false
8217
8220
  ? renderEmptyElement$2($xeTable)
8218
8221
  : h('li', {
8219
- class: [item.className, {
8222
+ class: ['vxe-table--context-menu--option', item.className, {
8220
8223
  'link--loading': loading,
8221
8224
  'link--disabled': item.disabled,
8222
8225
  'link--active': item === ctxMenuStore.selected
@@ -8266,12 +8269,12 @@ var TableMenuPanelComponent = defineVxeComponent({
8266
8269
  suffixOpts.content ? h('span', `${suffixOpts.content}`) : renderEmptyElement$2($xeTable)
8267
8270
  ])
8268
8271
  ]),
8269
- hasChildMenus && item.children
8272
+ hasChildMenus && children
8270
8273
  ? h('ul', {
8271
8274
  class: ['vxe-table--context-menu-clild-wrapper', {
8272
8275
  'is--show': item === ctxMenuStore.selected && ctxMenuStore.showChild
8273
8276
  }]
8274
- }, item.children.map((child, cIndex) => {
8277
+ }, children.map((child, cIndex) => {
8275
8278
  const { loading: childLoading } = child;
8276
8279
  const childPrefixOpts = Object.assign({}, child.prefixConfig);
8277
8280
  const childPrefixIcon = childPrefixOpts.icon || child.prefixIcon;
@@ -8281,7 +8284,7 @@ var TableMenuPanelComponent = defineVxeComponent({
8281
8284
  return child.visible === false
8282
8285
  ? null
8283
8286
  : h('li', {
8284
- class: [child.className, {
8287
+ class: ['vxe-table--context-menu--option', child.className, {
8285
8288
  'link--loading': childLoading,
8286
8289
  'link--disabled': child.disabled,
8287
8290
  'link--active': child === ctxMenuStore.selectChild
@@ -18989,7 +18992,11 @@ var VxeTableComponent = defineVxeComponent({
18989
18992
  const { transform } = treeOpts;
18990
18993
  const allList = fullData || internalData.tableFullData;
18991
18994
  // 如果gt为0,则总是启用
18992
- const scrollYLoad = (transform || !treeConfig) && !!virtualYOpts.enabled && virtualYOpts.gt > -1 && (virtualYOpts.gt === 0 || virtualYOpts.gt < allList.length);
18995
+ let scrollYLoad = !!virtualYOpts.enabled && virtualYOpts.gt > -1 && (virtualYOpts.gt === 0 || virtualYOpts.gt < allList.length);
18996
+ if (scrollYLoad && (treeConfig && !transform)) {
18997
+ errLog('vxe.error.notSupportProp', ['[table] virtual-y-config.enabled=true', 'tree-config.transform=false', 'tree-config.transform=true']);
18998
+ scrollYLoad = false;
18999
+ }
18993
19000
  reactData.scrollYLoad = scrollYLoad;
18994
19001
  syncGanttScrollYStatus();
18995
19002
  return scrollYLoad;
@@ -24235,7 +24242,7 @@ var VxeTableComponent = defineVxeComponent({
24235
24242
  const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
24236
24243
  XEUtils.eachTree(tableFullTreeData, (row, index, items, path, parentRow, nodes) => {
24237
24244
  const rowid = handleUpdateRowId(row);
24238
- if (treeConfig && lazy) {
24245
+ if (lazy) {
24239
24246
  if (row[hasChildField] && row[childrenField] === undefined) {
24240
24247
  row[childrenField] = null;
24241
24248
  }
@@ -29038,7 +29045,7 @@ var VxeTableComponent = defineVxeComponent({
29038
29045
  warnLog('vxe.error.delProp', ['edit-config.activeMethod', 'edit-config.beforeEditMethod']);
29039
29046
  }
29040
29047
  if (props.treeConfig && checkboxOpts.isShiftKey) {
29041
- errLog('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey']);
29048
+ errLog('vxe.error.reqSupportProp', ['tree-config', 'checkbox-config.isShiftKey=false']);
29042
29049
  }
29043
29050
  if (checkboxOpts.halfField) {
29044
29051
  warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);