vxe-table 4.12.0-beta.4 → 4.12.0-beta.6

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 (21) hide show
  1. package/es/style.css +1 -1
  2. package/es/table/src/table.js +29 -20
  3. package/es/ui/index.js +1 -1
  4. package/es/ui/src/log.js +1 -1
  5. package/lib/index.umd.js +29 -20
  6. package/lib/index.umd.min.js +1 -1
  7. package/lib/style.css +1 -1
  8. package/lib/table/src/table.js +27 -18
  9. package/lib/table/src/table.min.js +1 -1
  10. package/lib/ui/index.js +1 -1
  11. package/lib/ui/index.min.js +1 -1
  12. package/lib/ui/src/log.js +1 -1
  13. package/lib/ui/src/log.min.js +1 -1
  14. package/package.json +2 -2
  15. package/packages/table/src/table.ts +27 -19
  16. /package/es/{iconfont.1741162350010.ttf → iconfont.1741224140308.ttf} +0 -0
  17. /package/es/{iconfont.1741162350010.woff → iconfont.1741224140308.woff} +0 -0
  18. /package/es/{iconfont.1741162350010.woff2 → iconfont.1741224140308.woff2} +0 -0
  19. /package/lib/{iconfont.1741162350010.ttf → iconfont.1741224140308.ttf} +0 -0
  20. /package/lib/{iconfont.1741162350010.woff → iconfont.1741224140308.woff} +0 -0
  21. /package/lib/{iconfont.1741162350010.woff2 → iconfont.1741224140308.woff2} +0 -0
package/es/table/src/table.js CHANGED
@@ -3740,12 +3740,12 @@ export default defineComponent({
3740
3740
  */
3741
3741
  revertData(rows, field) {
3742
3742
  const { keepSource, treeConfig } = props;
3743
- const { fullAllDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData } = internalData;
3743
+ const { fullAllDataRowIdData, fullDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData } = internalData;
3744
3744
  const treeOpts = computeTreeOpts.value;
3745
3745
  const { transform } = treeOpts;
3746
3746
  if (!keepSource) {
3747
3747
  if (process.env.NODE_ENV === 'development') {
3748
- warnLog('vxe.error.reqProp', ['keep-source']);
3748
+ errLog('vxe.error.reqProp', ['keep-source']);
3749
3749
  }
3750
3750
  return nextTick();
3751
3751
  }
@@ -3760,23 +3760,23 @@ export default defineComponent({
3760
3760
  }
3761
3761
  let reDelFlag = false;
3762
3762
  if (targetRows.length) {
3763
- targetRows.forEach((row) => {
3764
- if (!$xeTable.isInsertByRow(row)) {
3765
- const rowid = getRowid($xeTable, row);
3766
- const oRow = sourceDataRowIdData[rowid];
3767
- if (oRow && row) {
3768
- if (field) {
3769
- XEUtils.set(row, field, XEUtils.clone(XEUtils.get(oRow, field), true));
3770
- }
3771
- else {
3772
- XEUtils.destructuring(row, XEUtils.clone(oRow, true));
3773
- }
3774
- if ($xeTable.isRemoveByRow(row)) {
3775
- const rowRest = fullAllDataRowIdData[rowid];
3776
- if (rowRest) {
3777
- const reRow = rowRest.row;
3778
- tableFullData.unshift(reRow);
3779
- afterFullData.unshift(reRow);
3763
+ targetRows.forEach((item) => {
3764
+ const rowid = getRowid($xeTable, item);
3765
+ const rowRest = fullAllDataRowIdData[rowid];
3766
+ if (rowRest) {
3767
+ const row = rowRest.row;
3768
+ if (!$xeTable.isInsertByRow(row)) {
3769
+ const oRow = sourceDataRowIdData[rowid];
3770
+ if (oRow && row) {
3771
+ if (field) {
3772
+ XEUtils.set(row, field, XEUtils.clone(XEUtils.get(oRow, field), true));
3773
+ }
3774
+ else {
3775
+ XEUtils.destructuring(row, XEUtils.clone(oRow, true));
3776
+ }
3777
+ if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
3778
+ tableFullData.unshift(row);
3779
+ afterFullData.unshift(row);
3780
3780
  reDelFlag = true;
3781
3781
  }
3782
3782
  }
@@ -6649,7 +6649,16 @@ export default defineComponent({
6649
6649
  if (el) {
6650
6650
  const parentElem = el.parentNode;
6651
6651
  const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
6652
- return Math.floor($xeGrid ? $xeGrid.getParentHeight() : XEUtils.toNumber(getComputedStyle(parentElem).height) - parentPaddingSize);
6652
+ let parentWrapperHeight = 0;
6653
+ if (parentElem) {
6654
+ if ($xeGrid && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
6655
+ parentWrapperHeight = $xeGrid.getParentHeight();
6656
+ }
6657
+ else {
6658
+ parentWrapperHeight = parentElem.clientHeight;
6659
+ }
6660
+ }
6661
+ return Math.floor(parentWrapperHeight - parentPaddingSize);
6653
6662
  }
6654
6663
  return 0;
6655
6664
  },
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.12.0-beta.4";
3
+ export const version = "4.12.0-beta.6";
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.12.0-beta.4"}`;
3
+ const version = `table v${"4.12.0-beta.6"}`;
4
4
  export const warnLog = log.create('warn', version);
5
5
  export const errLog = log.create('error', version);
package/lib/index.umd.js CHANGED
@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
3138
3138
  ;// ./packages/ui/index.ts
3139
3139
 
3140
3140
 
3141
- const version = "4.12.0-beta.4";
3141
+ const version = "4.12.0-beta.6";
3142
3142
  core_.VxeUI.version = version;
3143
3143
  core_.VxeUI.tableVersion = version;
3144
3144
  core_.VxeUI.setConfig({
@@ -3586,7 +3586,7 @@ var esnext_iterator_some = __webpack_require__(7550);
3586
3586
  const {
3587
3587
  log: log_log
3588
3588
  } = core_.VxeUI;
3589
- const log_version = `table v${"4.12.0-beta.4"}`;
3589
+ const log_version = `table v${"4.12.0-beta.6"}`;
3590
3590
  const warnLog = log_log.create('warn', log_version);
3591
3591
  const errLog = log_log.create('error', log_version);
3592
3592
  ;// ./packages/table/src/columnInfo.ts
@@ -14676,6 +14676,7 @@ const maxXWidth = 5e6;
14676
14676
  } = props;
14677
14677
  const {
14678
14678
  fullAllDataRowIdData,
14679
+ fullDataRowIdData,
14679
14680
  tableSourceData,
14680
14681
  sourceDataRowIdData,
14681
14682
  tableFullData,
@@ -14687,7 +14688,7 @@ const maxXWidth = 5e6;
14687
14688
  } = treeOpts;
14688
14689
  if (!keepSource) {
14689
14690
  if (true) {
14690
- warnLog('vxe.error.reqProp', ['keep-source']);
14691
+ errLog('vxe.error.reqProp', ['keep-source']);
14691
14692
  }
14692
14693
  return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
14693
14694
  }
@@ -14701,22 +14702,22 @@ const maxXWidth = 5e6;
14701
14702
  }
14702
14703
  let reDelFlag = false;
14703
14704
  if (targetRows.length) {
14704
- targetRows.forEach(row => {
14705
- if (!$xeTable.isInsertByRow(row)) {
14706
- const rowid = getRowid($xeTable, row);
14707
- const oRow = sourceDataRowIdData[rowid];
14708
- if (oRow && row) {
14709
- if (field) {
14710
- external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, field, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(oRow, field), true));
14711
- } else {
14712
- external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().destructuring(row, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(oRow, true));
14713
- }
14714
- if ($xeTable.isRemoveByRow(row)) {
14715
- const rowRest = fullAllDataRowIdData[rowid];
14716
- if (rowRest) {
14717
- const reRow = rowRest.row;
14718
- tableFullData.unshift(reRow);
14719
- afterFullData.unshift(reRow);
14705
+ targetRows.forEach(item => {
14706
+ const rowid = getRowid($xeTable, item);
14707
+ const rowRest = fullAllDataRowIdData[rowid];
14708
+ if (rowRest) {
14709
+ const row = rowRest.row;
14710
+ if (!$xeTable.isInsertByRow(row)) {
14711
+ const oRow = sourceDataRowIdData[rowid];
14712
+ if (oRow && row) {
14713
+ if (field) {
14714
+ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, field, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(oRow, field), true));
14715
+ } else {
14716
+ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().destructuring(row, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(oRow, true));
14717
+ }
14718
+ if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
14719
+ tableFullData.unshift(row);
14720
+ afterFullData.unshift(row);
14720
14721
  reDelFlag = true;
14721
14722
  }
14722
14723
  }
@@ -17966,7 +17967,15 @@ const maxXWidth = 5e6;
17966
17967
  if (el) {
17967
17968
  const parentElem = el.parentNode;
17968
17969
  const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
17969
- return Math.floor($xeGrid ? $xeGrid.getParentHeight() : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(parentElem).height) - parentPaddingSize);
17970
+ let parentWrapperHeight = 0;
17971
+ if (parentElem) {
17972
+ if ($xeGrid && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
17973
+ parentWrapperHeight = $xeGrid.getParentHeight();
17974
+ } else {
17975
+ parentWrapperHeight = parentElem.clientHeight;
17976
+ }
17977
+ }
17978
+ return Math.floor(parentWrapperHeight - parentPaddingSize);
17970
17979
  }
17971
17980
  return 0;
17972
17981
  },