vxe-table 3.18.10 → 3.18.12

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 (58) hide show
  1. package/es/grid/style.css +4 -0
  2. package/es/grid/style.min.css +1 -1
  3. package/es/index.css +1 -1
  4. package/es/index.min.css +1 -1
  5. package/es/style.css +1 -1
  6. package/es/style.min.css +1 -1
  7. package/es/table/src/body.js +2 -2
  8. package/es/table/src/cell.js +40 -22
  9. package/es/table/src/footer.js +2 -2
  10. package/es/table/src/methods.js +27 -9
  11. package/es/table/src/props.js +4 -0
  12. package/es/table/src/table.js +10 -0
  13. package/es/ui/index.js +12 -1
  14. package/es/ui/src/log.js +1 -1
  15. package/es/vxe-grid/style.css +4 -0
  16. package/es/vxe-grid/style.min.css +1 -1
  17. package/lib/grid/style/style.css +4 -0
  18. package/lib/grid/style/style.min.css +1 -1
  19. package/lib/index.css +1 -1
  20. package/lib/index.min.css +1 -1
  21. package/lib/index.umd.js +115 -44
  22. package/lib/index.umd.min.js +1 -1
  23. package/lib/style.css +1 -1
  24. package/lib/style.min.css +1 -1
  25. package/lib/table/src/body.js +2 -2
  26. package/lib/table/src/body.min.js +1 -1
  27. package/lib/table/src/cell.js +55 -29
  28. package/lib/table/src/cell.min.js +1 -1
  29. package/lib/table/src/footer.js +2 -2
  30. package/lib/table/src/footer.min.js +1 -1
  31. package/lib/table/src/methods.js +29 -9
  32. package/lib/table/src/methods.min.js +1 -1
  33. package/lib/table/src/props.js +4 -0
  34. package/lib/table/src/props.min.js +1 -1
  35. package/lib/table/src/table.js +10 -0
  36. package/lib/table/src/table.min.js +1 -1
  37. package/lib/ui/index.js +12 -1
  38. package/lib/ui/index.min.js +1 -1
  39. package/lib/ui/src/log.js +1 -1
  40. package/lib/ui/src/log.min.js +1 -1
  41. package/lib/vxe-grid/style/style.css +4 -0
  42. package/lib/vxe-grid/style/style.min.css +1 -1
  43. package/package.json +1 -1
  44. package/packages/table/src/body.ts +2 -2
  45. package/packages/table/src/cell.ts +38 -22
  46. package/packages/table/src/footer.ts +2 -2
  47. package/packages/table/src/methods.ts +24 -9
  48. package/packages/table/src/props.ts +4 -0
  49. package/packages/table/src/table.ts +12 -0
  50. package/packages/ui/index.ts +11 -0
  51. package/styles/components/grid.scss +3 -0
  52. package/styles/theme/base.scss +3 -3
  53. /package/es/{iconfont.1757464750041.ttf → iconfont.1757987563312.ttf} +0 -0
  54. /package/es/{iconfont.1757464750041.woff → iconfont.1757987563312.woff} +0 -0
  55. /package/es/{iconfont.1757464750041.woff2 → iconfont.1757987563312.woff2} +0 -0
  56. /package/lib/{iconfont.1757464750041.ttf → iconfont.1757987563312.ttf} +0 -0
  57. /package/lib/{iconfont.1757464750041.woff → iconfont.1757987563312.woff} +0 -0
  58. /package/lib/{iconfont.1757464750041.woff2 → iconfont.1757987563312.woff2} +0 -0
@@ -171,8 +171,8 @@ function renderTitleContent(h, params, content) {
171
171
  const { showHeaderOverflow: allColumnHeaderOverflow } = tableProps;
172
172
  const { isRowGroupStatus } = tableReactData;
173
173
  const { showHeaderOverflow } = column;
174
- const tooltipOpts = $table.computeTooltipOpts;
175
- const showAllTip = tooltipOpts.showAll;
174
+ const headerTooltipOpts = $table.computeHeaderTooltipOpts;
175
+ const showAllTip = headerTooltipOpts.showAll;
176
176
  const headOverflow = XEUtils.eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
177
177
  const showTitle = headOverflow === 'title';
178
178
  const showTooltip = headOverflow === true || headOverflow === 'tooltip';
@@ -752,6 +752,8 @@ export const Cell = {
752
752
  const { treeConfig } = tableProps;
753
753
  const { updateCheckboxFlag, isRowGroupStatus } = tableReactData;
754
754
  const { selectCheckboxMaps, treeIndeterminateRowMaps } = tableInternalData;
755
+ const aggregateOpts = $table.computeAggregateOpts;
756
+ const { mapChildrenField } = aggregateOpts;
755
757
  const checkboxOpts = $table.computeCheckboxOpts;
756
758
  const { labelField, checkMethod, visibleMethod } = checkboxOpts;
757
759
  const { slots } = column;
@@ -759,23 +761,30 @@ export const Cell = {
759
761
  const checkboxSlot = slots ? slots.checkbox : null;
760
762
  let indeterminate = false;
761
763
  let isChecked = false;
762
- const isVisible = !visibleMethod || visibleMethod({ $table, row });
763
- let isDisabled = !!checkMethod;
764
+ let isVisible = true;
765
+ let isDisabled = false;
764
766
  const ons = {};
765
767
  if (!isHidden) {
766
768
  const rowid = getRowid($table, row);
767
769
  isChecked = !!updateCheckboxFlag && !!selectCheckboxMaps[rowid];
768
- ons.click = (evnt) => {
769
- if (!isDisabled && isVisible) {
770
- $table.triggerCheckRowEvent(evnt, params, !isChecked);
770
+ if (checkMethod && isRowGroupStatus && $table.isAggregateRecord(row)) {
771
+ const childList = row[mapChildrenField || ''];
772
+ if (!childList || !childList.length || childList.every(item => !checkMethod({ $table, row: item }))) {
773
+ isDisabled = true;
771
774
  }
772
- };
773
- if (checkMethod) {
774
- isDisabled = !checkMethod({ $table, row });
775
+ }
776
+ else {
777
+ isVisible = !visibleMethod || visibleMethod({ $table, row });
778
+ isDisabled = checkMethod ? !checkMethod({ $table, row }) : !!checkMethod;
775
779
  }
776
780
  if (treeConfig || isRowGroupStatus) {
777
781
  indeterminate = !!treeIndeterminateRowMaps[rowid];
778
782
  }
783
+ ons.click = (evnt) => {
784
+ if (!isDisabled && isVisible) {
785
+ $table.triggerCheckRowEvent(evnt, params, !isChecked);
786
+ }
787
+ };
779
788
  }
780
789
  const checkboxParams = Object.assign(Object.assign({}, params), { checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate });
781
790
  if (checkboxSlot) {
@@ -815,40 +824,49 @@ export const Cell = {
815
824
  const { treeConfig } = tableProps;
816
825
  const { updateCheckboxFlag, isRowGroupStatus } = tableReactData;
817
826
  const { treeIndeterminateRowMaps } = tableInternalData;
827
+ const aggregateOpts = $table.computeAggregateOpts;
828
+ const { mapChildrenField } = aggregateOpts;
818
829
  const checkboxOpts = $table.computeCheckboxOpts;
819
830
  const { labelField, checkField, checkMethod, visibleMethod } = checkboxOpts;
820
831
  const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
821
832
  const { slots } = column;
822
833
  const defaultSlot = slots ? slots.default : null;
823
834
  const checkboxSlot = slots ? slots.checkbox : null;
824
- let isIndeterminate = false;
835
+ let indeterminate = false;
825
836
  let isChecked = false;
826
- const isVisible = !visibleMethod || visibleMethod({ $table, row });
827
- let isDisabled = !!checkMethod;
837
+ let isVisible = true;
838
+ let isDisabled = false;
828
839
  const ons = {};
829
840
  if (!isHidden) {
830
841
  const rowid = getRowid($table, row);
831
842
  isChecked = !!updateCheckboxFlag && XEUtils.get(row, checkField);
843
+ if (checkMethod && isRowGroupStatus && $table.isAggregateRecord(row)) {
844
+ const childList = row[mapChildrenField || ''];
845
+ if (!childList || !childList.length || childList.every(item => !checkMethod({ $table, row: item }))) {
846
+ isDisabled = true;
847
+ }
848
+ }
849
+ else {
850
+ isVisible = !visibleMethod || visibleMethod({ $table, row });
851
+ isDisabled = checkMethod ? !checkMethod({ $table, row }) : !!checkMethod;
852
+ }
853
+ if (treeConfig || isRowGroupStatus) {
854
+ indeterminate = !!treeIndeterminateRowMaps[rowid];
855
+ }
832
856
  ons.click = (evnt) => {
833
857
  if (!isDisabled && isVisible) {
834
858
  $table.triggerCheckRowEvent(evnt, params, !isChecked);
835
859
  }
836
860
  };
837
- if (checkMethod) {
838
- isDisabled = !checkMethod({ $table, row });
839
- }
840
- if (treeConfig || isRowGroupStatus) {
841
- isIndeterminate = !!treeIndeterminateRowMaps[rowid];
842
- }
843
861
  }
844
- const checkboxParams = Object.assign(Object.assign({}, params), { checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate: isIndeterminate });
862
+ const checkboxParams = Object.assign(Object.assign({}, params), { checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate });
845
863
  if (checkboxSlot) {
846
864
  return renderCellBaseVNs(h, params, $table.callSlot(checkboxSlot, checkboxParams, h));
847
865
  }
848
866
  const checkVNs = [];
849
867
  if (isVisible) {
850
868
  checkVNs.push(h('span', {
851
- class: ['vxe-checkbox--icon', isIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : (isChecked ? getIcon().TABLE_CHECKBOX_CHECKED : (isDisabled ? getIcon().TABLE_CHECKBOX_DISABLED_UNCHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED))]
869
+ class: ['vxe-checkbox--icon', indeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : (isChecked ? getIcon().TABLE_CHECKBOX_CHECKED : (isDisabled ? getIcon().TABLE_CHECKBOX_DISABLED_UNCHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED))]
852
870
  }));
853
871
  }
854
872
  if (defaultSlot || labelField) {
@@ -861,7 +879,7 @@ export const Cell = {
861
879
  class: ['vxe-cell--checkbox', {
862
880
  'is--checked': isChecked,
863
881
  'is--disabled': isDisabled,
864
- 'is--indeterminate': indeterminateField && !isChecked ? row[indeterminateField] : isIndeterminate,
882
+ 'is--indeterminate': indeterminateField && !isChecked ? row[indeterminateField] : indeterminate,
865
883
  'is--hidden': !isVisible
866
884
  }],
867
885
  on: ons
@@ -18,7 +18,7 @@ function renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData, row, $
18
18
  const { scrollXLoad, scrollYLoad, overflowX, currentColumn, mergeFootFlag } = tableReactData;
19
19
  const { fullColumnIdData, mergeFooterList, mergeFooterCellMaps, scrollXStore } = tableInternalData;
20
20
  const virtualXOpts = $xeTable.computeVirtualXOpts;
21
- const tooltipOpts = $xeTable.computeTooltipOpts;
21
+ const footerTooltipOpts = $xeTable.computeFooterTooltipOpts;
22
22
  const resizableOpts = $xeTable.resizableOpts;
23
23
  const { isAllColumnDrag } = resizableOpts;
24
24
  const columnOpts = $xeTable.computeColumnOpts;
@@ -32,7 +32,7 @@ function renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData, row, $
32
32
  const colRest = fullColumnIdData[colid] || {};
33
33
  const renderOpts = editRender || cellRender;
34
34
  const compConf = renderOpts ? renderer.get(renderOpts.name) : null;
35
- const showAllTip = tooltipOpts.showAll;
35
+ const showAllTip = footerTooltipOpts.showAll;
36
36
  const fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed);
37
37
  const isPadding = XEUtils.isBoolean(footerCellOpts.padding) ? footerCellOpts.padding : cellOpts.padding;
38
38
  const footOverflow = XEUtils.eqNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
@@ -2704,7 +2704,7 @@ function clearRowDragData($xeTable) {
2704
2704
  * @param {Event} evnt 事件
2705
2705
  * @param {Row} row 行对象
2706
2706
  */
2707
- function handleTooltip($xeTable, evnt, type, tdEl, overflowElem, tipElem, params) {
2707
+ function handleTooltip($xeTable, evnt, tipOpts, type, tdEl, overflowElem, tipElem, params) {
2708
2708
  const reactData = $xeTable;
2709
2709
  const tipOverEl = overflowElem || tdEl;
2710
2710
  if (!tipOverEl) {
@@ -2712,9 +2712,8 @@ function handleTooltip($xeTable, evnt, type, tdEl, overflowElem, tipElem, params
2712
2712
  }
2713
2713
  params.cell = tdEl;
2714
2714
  const { tooltipStore } = reactData;
2715
- const tooltipOpts = $xeTable.computeTooltipOpts;
2716
2715
  const { column, row } = params;
2717
- const { showAll, contentMethod } = tooltipOpts;
2716
+ const { showAll, contentMethod } = tipOpts;
2718
2717
  const customContent = contentMethod ? contentMethod(params) : null;
2719
2718
  const useCustom = contentMethod && !XEUtils.eqNull(customContent);
2720
2719
  const content = useCustom ? customContent : XEUtils.toString(column.type === 'html' ? tipOverEl.innerText : tipOverEl.textContent).trim();
@@ -2727,7 +2726,7 @@ function handleTooltip($xeTable, evnt, type, tdEl, overflowElem, tipElem, params
2727
2726
  visible: true,
2728
2727
  content: tipContent,
2729
2728
  type,
2730
- currOpts: {}
2729
+ currOpts: tipOpts
2731
2730
  });
2732
2731
  $xeTable.$nextTick(() => {
2733
2732
  const $tooltip = $xeTable.$refs.refTooltip;
@@ -6880,6 +6879,7 @@ const Methods = {
6880
6879
  const $xeTable = this;
6881
6880
  const reactData = $xeTable;
6882
6881
  const { tooltipStore } = reactData;
6882
+ const headerTooltipOpts = $xeTable.computeHeaderTooltipOpts;
6883
6883
  const { column } = params;
6884
6884
  handleTargetEnterEvent($xeTable, true);
6885
6885
  const titleElem = evnt.currentTarget;
@@ -6900,7 +6900,7 @@ const Methods = {
6900
6900
  }
6901
6901
  if (tooltipStore.column !== column || !tooltipStore.visible) {
6902
6902
  const ctEl = thEl.querySelector('.vxe-cell--title');
6903
- handleTooltip($xeTable, evnt, 'header', thEl, (hasClass(thEl, 'col--ellipsis') ? ctEl : cWrapperEl) || cWrapperEl, ctEl || cellEl, params);
6903
+ handleTooltip($xeTable, evnt, headerTooltipOpts, 'header', thEl, (hasClass(thEl, 'col--ellipsis') ? ctEl : cWrapperEl) || cWrapperEl, ctEl || cellEl, params);
6904
6904
  }
6905
6905
  },
6906
6906
  /**
@@ -6913,6 +6913,7 @@ const Methods = {
6913
6913
  const { editConfig } = props;
6914
6914
  const { editStore } = reactData;
6915
6915
  const { tooltipStore } = reactData;
6916
+ const tooltipOpts = $xeTable.computeTooltipOpts;
6916
6917
  const editOpts = $xeTable.computeEditOpts;
6917
6918
  const { actived } = editStore;
6918
6919
  const { row, column } = params;
@@ -6939,7 +6940,7 @@ const Methods = {
6939
6940
  if (!tipEl) {
6940
6941
  tipEl = ctEl;
6941
6942
  }
6942
- handleTooltip($xeTable, evnt, 'body', tdEl, ovEl || ctEl, tipEl, params);
6943
+ handleTooltip($xeTable, evnt, tooltipOpts, 'body', tdEl, ovEl || ctEl, tipEl, params);
6943
6944
  }
6944
6945
  },
6945
6946
  /**
@@ -6950,6 +6951,7 @@ const Methods = {
6950
6951
  const reactData = $xeTable;
6951
6952
  const { column } = params;
6952
6953
  const { tooltipStore } = reactData;
6954
+ const footerTooltipOpts = $xeTable.computeFooterTooltipOpts;
6953
6955
  const tdEl = evnt.currentTarget;
6954
6956
  handleTargetEnterEvent($xeTable, tooltipStore.column !== column || !!tooltipStore.row);
6955
6957
  if (tooltipStore.column !== column || !tooltipStore.visible) {
@@ -6962,7 +6964,7 @@ const Methods = {
6962
6964
  if (!tipEl) {
6963
6965
  tipEl = ctEl;
6964
6966
  }
6965
- handleTooltip($xeTable, evnt, 'footer', tdEl, ovEl || ctEl, tipEl, params);
6967
+ handleTooltip($xeTable, evnt, footerTooltipOpts, 'footer', tdEl, ovEl || ctEl, tipEl, params);
6966
6968
  }
6967
6969
  },
6968
6970
  openTooltip(target, content) {
@@ -7289,7 +7291,7 @@ const Methods = {
7289
7291
  }
7290
7292
  }
7291
7293
  }
7292
- if (!checkMethod || checkMethod({ $table: $xeTable, row })) {
7294
+ if (isRowGroupStatus || !checkMethod || checkMethod({ $table: $xeTable, row })) {
7293
7295
  $xeTable.handleBatchSelectRows([row], checked);
7294
7296
  $xeTable.checkSelectionStatus();
7295
7297
  $xeTable.dispatchEvent('checkbox-change', Object.assign({
@@ -7478,6 +7480,8 @@ const Methods = {
7478
7480
  const { treeConfig } = props;
7479
7481
  const { isRowGroupStatus } = reactData;
7480
7482
  const { afterFullData, afterTreeFullData, afterGroupFullData, checkboxReserveRowMap, selectCheckboxMaps, treeIndeterminateRowMaps } = internalData;
7483
+ const aggregateOpts = $xeTable.computeAggregateOpts;
7484
+ const { mapChildrenField } = aggregateOpts;
7481
7485
  const checkboxOpts = $xeTable.computeCheckboxOpts;
7482
7486
  const { checkField, checkMethod, showReserveStatus } = checkboxOpts;
7483
7487
  const { handleGetRowId } = createHandleGetRowId($xeTable);
@@ -7491,7 +7495,21 @@ const Methods = {
7491
7495
  ? row => {
7492
7496
  const childRowid = handleGetRowId(row);
7493
7497
  const selected = checkField ? XEUtils.get(row, checkField) : selectCheckboxMaps[childRowid];
7494
- if (checkMethod({ $table: $xeTable, row })) {
7498
+ if (isRowGroupStatus && $xeTable.isAggregateRecord(row)) {
7499
+ const childList = row[mapChildrenField || ''];
7500
+ if (selected) {
7501
+ vLen++;
7502
+ sLen++;
7503
+ }
7504
+ else if (treeIndeterminateRowMaps[childRowid]) {
7505
+ vLen++;
7506
+ hLen++;
7507
+ }
7508
+ else if (childList && childList.length && childList.some(item => checkMethod({ $table: $xeTable, row: item }))) {
7509
+ vLen++;
7510
+ }
7511
+ }
7512
+ else if (checkMethod({ $table: $xeTable, row })) {
7495
7513
  if (selected) {
7496
7514
  sLen++;
7497
7515
  }
@@ -229,6 +229,10 @@ export const tableProps = {
229
229
  checkboxConfig: Object,
230
230
  // tooltip 配置项
231
231
  tooltipConfig: Object,
232
+ // 表头 tooltip 配置项
233
+ headerTooltipConfig: Object,
234
+ // 表尾 tooltip 配置项
235
+ footerTooltipConfig: Object,
232
236
  // 导出配置项
233
237
  exportConfig: [Boolean, Object],
234
238
  // 导入配置项
@@ -990,6 +990,16 @@ export default {
990
990
  tipConfig() {
991
991
  return Object.assign({}, this.tooltipOpts);
992
992
  },
993
+ computeHeaderTooltipOpts() {
994
+ const $xeTable = this;
995
+ const props = $xeTable;
996
+ return Object.assign({}, getConfig().tooltip, getConfig().table.headerTooltipConfig, props.headerTooltipConfig);
997
+ },
998
+ computeFooterTooltipOpts() {
999
+ const $xeTable = this;
1000
+ const props = $xeTable;
1001
+ return Object.assign({}, getConfig().tooltip, getConfig().table.footerTooltipConfig, props.footerTooltipConfig);
1002
+ },
993
1003
  computeTableTipConfig() {
994
1004
  const $xeTable = this;
995
1005
  const reactData = $xeTable;
package/es/ui/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { VxeUI } from '@vxe-ui/core';
2
2
  import { getFuncText } from './src/utils';
3
- export const version = "3.18.10";
3
+ export const version = "3.18.12";
4
4
  VxeUI.version = version;
5
5
  VxeUI.tableVersion = version;
6
6
  VxeUI.setConfig({
@@ -63,6 +63,12 @@ VxeUI.setConfig({
63
63
  tooltipConfig: {
64
64
  enterable: true
65
65
  },
66
+ headerTooltipConfig: {
67
+ enterable: true
68
+ },
69
+ footerTooltipConfig: {
70
+ enterable: true
71
+ },
66
72
  validConfig: {
67
73
  showMessage: true,
68
74
  autoClear: true,
@@ -72,6 +78,11 @@ VxeUI.setConfig({
72
78
  theme: 'beautify'
73
79
  },
74
80
  columnConfig: {
81
+ autoOptions: {
82
+ isCalcHeader: true,
83
+ isCalcBody: true,
84
+ isCalcFooter: true
85
+ },
75
86
  maxFixedSize: 4
76
87
  },
77
88
  cellConfig: {
package/es/ui/src/log.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { VxeUI } from '@vxe-ui/core';
2
2
  const { log } = VxeUI;
3
- const version = `table v${"3.18.10"}`;
3
+ const version = `table v${"3.18.12"}`;
4
4
  export const warnLog = log.create('warn', version);
5
5
  export const errLog = log.create('error', version);
@@ -66,6 +66,10 @@
66
66
  .vxe-grid--layout-aside-left-wrapper,
67
67
  .vxe-grid--layout-aside-left-wrapper {
68
68
  flex-shrink: 0;
69
+ }
70
+
71
+ .vxe-grid--layout-aside-left-wrapper,
72
+ .vxe-grid--layout-aside-left-wrapper {
69
73
  overflow: auto;
70
74
  }
71
75
 
@@ -1 +1 @@
1
- .vxe-grid{position:relative;overflow:auto;display:flex;flex-direction:column}.vxe-grid.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:99;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:var(--vxe-ui-loading-background-color)}.vxe-grid.is--loading>.vxe-table .vxe-loading{background-color:transparent}.vxe-grid.is--maximize{position:fixed;top:0;left:0;width:100%;height:100%;padding:.5em 1em;background-color:var(--vxe-ui-layout-background-color)}.vxe-grid .vxe-grid--bottom-wrapper,.vxe-grid .vxe-grid--form-wrapper,.vxe-grid .vxe-grid--top-wrapper{position:relative}.vxe-grid .vxe-grid--table-container{display:flex;flex-direction:row}.vxe-grid .vxe-grid--left-wrapper,.vxe-grid .vxe-grid--right-wrapper{flex-shrink:0;overflow:auto;outline:0}.vxe-grid .vxe-grid--table-wrapper{flex-grow:1;overflow:hidden}.vxe-grid--layout-body-wrapper{display:flex;flex-direction:row;overflow:auto;flex-grow:1}.vxe-grid--layout-body-content-wrapper{flex-grow:1;overflow:auto}.vxe-grid--layout-aside-left-wrapper,.vxe-grid--layout-footer-wrapper,.vxe-grid--layout-header-wrapper{flex-shrink:0;overflow:auto}.vxe-grid{font-size:var(--vxe-ui-font-size-default)}.vxe-grid.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-grid.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-grid.size--mini{font-size:var(--vxe-ui-font-size-mini)}
1
+ .vxe-grid{position:relative;overflow:auto;display:flex;flex-direction:column}.vxe-grid.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:99;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:var(--vxe-ui-loading-background-color)}.vxe-grid.is--loading>.vxe-table .vxe-loading{background-color:transparent}.vxe-grid.is--maximize{position:fixed;top:0;left:0;width:100%;height:100%;padding:.5em 1em;background-color:var(--vxe-ui-layout-background-color)}.vxe-grid .vxe-grid--bottom-wrapper,.vxe-grid .vxe-grid--form-wrapper,.vxe-grid .vxe-grid--top-wrapper{position:relative}.vxe-grid .vxe-grid--table-container{display:flex;flex-direction:row}.vxe-grid .vxe-grid--left-wrapper,.vxe-grid .vxe-grid--right-wrapper{flex-shrink:0;overflow:auto;outline:0}.vxe-grid .vxe-grid--table-wrapper{flex-grow:1;overflow:hidden}.vxe-grid--layout-body-wrapper{display:flex;flex-direction:row;overflow:auto;flex-grow:1}.vxe-grid--layout-body-content-wrapper{flex-grow:1;overflow:auto}.vxe-grid--layout-aside-left-wrapper,.vxe-grid--layout-footer-wrapper,.vxe-grid--layout-header-wrapper{flex-shrink:0}.vxe-grid--layout-aside-left-wrapper{overflow:auto}.vxe-grid{font-size:var(--vxe-ui-font-size-default)}.vxe-grid.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-grid.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-grid.size--mini{font-size:var(--vxe-ui-font-size-mini)}
@@ -66,6 +66,10 @@
66
66
  .vxe-grid--layout-aside-left-wrapper,
67
67
  .vxe-grid--layout-aside-left-wrapper {
68
68
  flex-shrink: 0;
69
+ }
70
+
71
+ .vxe-grid--layout-aside-left-wrapper,
72
+ .vxe-grid--layout-aside-left-wrapper {
69
73
  overflow: auto;
70
74
  }
71
75
 
@@ -1 +1 @@
1
- .vxe-grid{position:relative;overflow:auto;display:flex;flex-direction:column}.vxe-grid.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:99;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:var(--vxe-ui-loading-background-color)}.vxe-grid.is--loading>.vxe-table .vxe-loading{background-color:transparent}.vxe-grid.is--maximize{position:fixed;top:0;left:0;width:100%;height:100%;padding:.5em 1em;background-color:var(--vxe-ui-layout-background-color)}.vxe-grid .vxe-grid--bottom-wrapper,.vxe-grid .vxe-grid--form-wrapper,.vxe-grid .vxe-grid--top-wrapper{position:relative}.vxe-grid .vxe-grid--table-container{display:flex;flex-direction:row}.vxe-grid .vxe-grid--left-wrapper,.vxe-grid .vxe-grid--right-wrapper{flex-shrink:0;overflow:auto;outline:0}.vxe-grid .vxe-grid--table-wrapper{flex-grow:1;overflow:hidden}.vxe-grid--layout-body-wrapper{display:flex;flex-direction:row;overflow:auto;flex-grow:1}.vxe-grid--layout-body-content-wrapper{flex-grow:1;overflow:auto}.vxe-grid--layout-aside-left-wrapper,.vxe-grid--layout-footer-wrapper,.vxe-grid--layout-header-wrapper{flex-shrink:0;overflow:auto}.vxe-grid{font-size:var(--vxe-ui-font-size-default)}.vxe-grid.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-grid.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-grid.size--mini{font-size:var(--vxe-ui-font-size-mini)}
1
+ .vxe-grid{position:relative;overflow:auto;display:flex;flex-direction:column}.vxe-grid.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:99;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:var(--vxe-ui-loading-background-color)}.vxe-grid.is--loading>.vxe-table .vxe-loading{background-color:transparent}.vxe-grid.is--maximize{position:fixed;top:0;left:0;width:100%;height:100%;padding:.5em 1em;background-color:var(--vxe-ui-layout-background-color)}.vxe-grid .vxe-grid--bottom-wrapper,.vxe-grid .vxe-grid--form-wrapper,.vxe-grid .vxe-grid--top-wrapper{position:relative}.vxe-grid .vxe-grid--table-container{display:flex;flex-direction:row}.vxe-grid .vxe-grid--left-wrapper,.vxe-grid .vxe-grid--right-wrapper{flex-shrink:0;overflow:auto;outline:0}.vxe-grid .vxe-grid--table-wrapper{flex-grow:1;overflow:hidden}.vxe-grid--layout-body-wrapper{display:flex;flex-direction:row;overflow:auto;flex-grow:1}.vxe-grid--layout-body-content-wrapper{flex-grow:1;overflow:auto}.vxe-grid--layout-aside-left-wrapper,.vxe-grid--layout-footer-wrapper,.vxe-grid--layout-header-wrapper{flex-shrink:0}.vxe-grid--layout-aside-left-wrapper{overflow:auto}.vxe-grid{font-size:var(--vxe-ui-font-size-default)}.vxe-grid.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-grid.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-grid.size--mini{font-size:var(--vxe-ui-font-size-mini)}