vxe-table 4.18.3 → 4.18.5

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 (44) 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/module/custom/hook.js +3 -1
  8. package/es/table/module/custom/panel.js +3 -1
  9. package/es/table/src/table.js +31 -22
  10. package/es/ui/index.js +1 -1
  11. package/es/ui/src/log.js +1 -1
  12. package/es/vxe-grid/style.css +4 -0
  13. package/es/vxe-grid/style.min.css +1 -1
  14. package/lib/grid/style/style.css +4 -0
  15. package/lib/grid/style/style.min.css +1 -1
  16. package/lib/index.css +1 -1
  17. package/lib/index.min.css +1 -1
  18. package/lib/index.umd.js +10 -6
  19. package/lib/index.umd.min.js +1 -1
  20. package/lib/style.css +1 -1
  21. package/lib/style.min.css +1 -1
  22. package/lib/table/module/custom/hook.js +3 -1
  23. package/lib/table/module/custom/hook.min.js +1 -1
  24. package/lib/table/module/custom/panel.js +3 -1
  25. package/lib/table/module/custom/panel.min.js +1 -1
  26. package/lib/table/src/table.js +2 -2
  27. package/lib/table/src/table.min.js +1 -1
  28. package/lib/ui/index.js +1 -1
  29. package/lib/ui/index.min.js +1 -1
  30. package/lib/ui/src/log.js +1 -1
  31. package/lib/ui/src/log.min.js +1 -1
  32. package/lib/vxe-grid/style/style.css +4 -0
  33. package/lib/vxe-grid/style/style.min.css +1 -1
  34. package/package.json +1 -1
  35. package/packages/table/module/custom/hook.ts +3 -1
  36. package/packages/table/module/custom/panel.ts +3 -1
  37. package/packages/table/src/table.ts +31 -23
  38. package/styles/components/grid.scss +4 -0
  39. /package/es/{iconfont.1773640299992.ttf → iconfont.1773710736571.ttf} +0 -0
  40. /package/es/{iconfont.1773640299992.woff → iconfont.1773710736571.woff} +0 -0
  41. /package/es/{iconfont.1773640299992.woff2 → iconfont.1773710736571.woff2} +0 -0
  42. /package/lib/{iconfont.1773640299992.ttf → iconfont.1773710736571.ttf} +0 -0
  43. /package/lib/{iconfont.1773640299992.woff → iconfont.1773710736571.woff} +0 -0
  44. /package/lib/{iconfont.1773640299992.woff2 → iconfont.1773710736571.woff2} +0 -0
package/es/table/module/custom/hook.js CHANGED
@@ -8,7 +8,9 @@ VxeUI.hooks.add('tableCustomModule', {
8
8
  const { reactData, internalData } = $xeTable;
9
9
  const { computeCustomOpts, computeRowGroupFields, computeCustomSimpleMode } = $xeTable.getComputeMaps();
10
10
  const { refElem } = $xeTable.getRefMaps();
11
+ const $xeGrid = $xeTable.xeGrid;
11
12
  const $xeGantt = $xeTable.xeGantt;
13
+ const $xeGGWrapper = $xeGrid || $xeGantt;
12
14
  const updatePopupStyle = () => {
13
15
  const { customStore } = reactData;
14
16
  const customOpts = computeCustomOpts.value;
@@ -27,7 +29,7 @@ VxeUI.hooks.add('tableCustomModule', {
27
29
  }
28
30
  }
29
31
  if (showCustomSimpleOutside) {
30
- if (wrapperEl) {
32
+ if ($xeGGWrapper && wrapperEl) {
31
33
  popupTop = wrapperEl.offsetTop;
32
34
  }
33
35
  popupMaxHeight = XEUtils.eqNull(maxHeight) ? 360 : maxHeight;
package/es/table/module/custom/panel.js CHANGED
@@ -706,7 +706,9 @@ export default defineVxeComponent({
706
706
  });
707
707
  const popupStys = {};
708
708
  if (maxHeight && !['left', 'right'].includes(placement || '')) {
709
- popupStys.top = toCssUnit(popupTop);
709
+ if (popupTop) {
710
+ popupStys.top = toCssUnit(popupTop);
711
+ }
710
712
  popupStys.maxHeight = toCssUnit(maxHeight);
711
713
  }
712
714
  return h('div', {
package/es/table/src/table.js CHANGED
@@ -10131,19 +10131,24 @@ export default defineVxeComponent({
10131
10131
  if (!checkMethod || checkMethod({ $table: $xeTable, row })) {
10132
10132
  let newValue = row;
10133
10133
  let isChange = oldValue !== newValue;
10134
- const selected = !isChange;
10135
- if (isChange) {
10134
+ if (strict) {
10136
10135
  handleCheckedRadioRow(newValue);
10137
10136
  }
10138
- else if (!strict) {
10139
- isChange = oldValue === newValue;
10140
- if (isChange) {
10137
+ else {
10138
+ if (oldValue === newValue) {
10139
+ newValue = null;
10140
+ }
10141
+ isChange = oldValue !== newValue;
10142
+ if (isChange && newValue) {
10143
+ handleCheckedRadioRow(newValue);
10144
+ }
10145
+ else {
10141
10146
  newValue = null;
10142
10147
  $xeTable.clearRadioRow();
10143
10148
  }
10144
10149
  }
10145
10150
  if (isChange) {
10146
- dispatchEvent('radio-change', Object.assign({ oldValue, newValue, selected }, params), evnt);
10151
+ dispatchEvent('radio-change', Object.assign({ oldValue, newValue, selected: !!newValue }, params), evnt);
10147
10152
  }
10148
10153
  }
10149
10154
  },
@@ -10152,29 +10157,31 @@ export default defineVxeComponent({
10152
10157
  const columnOpts = computeColumnOpts.value;
10153
10158
  const currentColumnOpts = computeCurrentColumnOpts.value;
10154
10159
  const beforeRowMethod = currentColumnOpts.beforeSelectMethod || columnOpts.currentMethod;
10155
- let { column: newValue } = params;
10160
+ let newValue = params.column;
10156
10161
  const { trigger, strict } = currentColumnOpts;
10157
10162
  if (trigger === 'manual') {
10158
10163
  return;
10159
10164
  }
10160
10165
  let isChange = oldValue !== newValue;
10161
- const selected = !isChange;
10162
- if (!beforeRowMethod || beforeRowMethod({ column: newValue, selected, $table: $xeTable })) {
10166
+ if (!beforeRowMethod || beforeRowMethod({ column: newValue, $table: $xeTable })) {
10163
10167
  if (strict) {
10164
10168
  $xeTable.setCurrentColumn(newValue);
10165
10169
  }
10166
10170
  else {
10167
- isChange = oldValue === newValue;
10168
- if (isChange) {
10171
+ if (oldValue === newValue) {
10169
10172
  newValue = null;
10170
- $xeTable.clearCurrentColumn();
10171
10173
  }
10172
- else {
10174
+ isChange = oldValue !== newValue;
10175
+ if (isChange && newValue) {
10173
10176
  $xeTable.setCurrentColumn(newValue);
10174
10177
  }
10178
+ else {
10179
+ newValue = null;
10180
+ $xeTable.clearCurrentColumn();
10181
+ }
10175
10182
  }
10176
10183
  if (isChange) {
10177
- dispatchEvent('current-column-change', Object.assign({ oldValue, newValue, selected }, params), evnt);
10184
+ dispatchEvent('current-column-change', Object.assign({ oldValue, newValue, selected: !!newValue }, params), evnt);
10178
10185
  }
10179
10186
  }
10180
10187
  else {
@@ -10192,25 +10199,27 @@ export default defineVxeComponent({
10192
10199
  return;
10193
10200
  }
10194
10201
  let isChange = oldValue !== newValue;
10195
- const selected = !isChange;
10196
- if (!beforeRowMethod || beforeRowMethod({ row: newValue, selected, $table: $xeTable })) {
10202
+ if (!beforeRowMethod || beforeRowMethod({ row: newValue, $table: $xeTable })) {
10197
10203
  if (strict) {
10198
10204
  $xeTable.setCurrentRow(newValue);
10199
10205
  }
10200
10206
  else {
10201
- isChange = oldValue === newValue;
10202
- if (isChange) {
10207
+ if (oldValue === newValue) {
10203
10208
  newValue = null;
10204
- $xeTable.clearCurrentRow();
10205
10209
  }
10206
- else {
10210
+ isChange = oldValue !== newValue;
10211
+ if (isChange && newValue) {
10207
10212
  $xeTable.setCurrentRow(newValue);
10208
10213
  }
10214
+ else {
10215
+ newValue = null;
10216
+ $xeTable.clearCurrentRow();
10217
+ }
10209
10218
  }
10210
10219
  if (isChange) {
10211
- dispatchEvent('current-row-change', Object.assign({ oldValue, newValue, selected }, params), evnt);
10220
+ dispatchEvent('current-row-change', Object.assign({ oldValue, newValue, selected: !!newValue }, params), evnt);
10212
10221
  // 已废弃
10213
- dispatchEvent('current-change', Object.assign({ oldValue, newValue, selected }, params), evnt);
10222
+ dispatchEvent('current-change', Object.assign({ oldValue, newValue }, params), evnt);
10214
10223
  }
10215
10224
  }
10216
10225
  else {
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 = "4.18.3";
3
+ export const version = "4.18.5";
4
4
  VxeUI.version = version;
5
5
  VxeUI.tableVersion = version;
6
6
  VxeUI.setConfig({
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${"4.18.3"}`;
3
+ const version = `table v${"4.18.5"}`;
4
4
  export const warnLog = log.create('warn', version);
5
5
  export const errLog = log.create('error', version);
package/es/vxe-grid/style.css CHANGED
@@ -36,6 +36,8 @@
36
36
  .vxe-grid .vxe-grid--table-container {
37
37
  display: flex;
38
38
  flex-direction: row;
39
+ flex-grow: 1;
40
+ overflow: hidden;
39
41
  }
40
42
  .vxe-grid .vxe-grid--left-wrapper,
41
43
  .vxe-grid .vxe-grid--right-wrapper {
@@ -56,6 +58,8 @@
56
58
  }
57
59
 
58
60
  .vxe-grid--layout-body-content-wrapper {
61
+ display: flex;
62
+ flex-direction: column;
59
63
  flex-grow: 1;
60
64
  overflow: auto;
61
65
  }
package/es/vxe-grid/style.min.css CHANGED
@@ -1 +1 @@
1
- .vxe-grid{position:relative;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)}
1
+ .vxe-grid{position:relative;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;flex-grow:1;overflow:hidden}.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{display:flex;flex-direction:column;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)}
package/lib/grid/style/style.css CHANGED
@@ -36,6 +36,8 @@
36
36
  .vxe-grid .vxe-grid--table-container {
37
37
  display: flex;
38
38
  flex-direction: row;
39
+ flex-grow: 1;
40
+ overflow: hidden;
39
41
  }
40
42
  .vxe-grid .vxe-grid--left-wrapper,
41
43
  .vxe-grid .vxe-grid--right-wrapper {
@@ -56,6 +58,8 @@
56
58
  }
57
59
 
58
60
  .vxe-grid--layout-body-content-wrapper {
61
+ display: flex;
62
+ flex-direction: column;
59
63
  flex-grow: 1;
60
64
  overflow: auto;
61
65
  }
package/lib/grid/style/style.min.css CHANGED
@@ -1 +1 @@
1
- .vxe-grid{position:relative;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)}
1
+ .vxe-grid{position:relative;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;flex-grow:1;overflow:hidden}.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{display:flex;flex-direction:column;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)}