vxe-table 3.19.0 → 3.19.1
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/README.md +2 -2
- package/es/grid/src/grid.js +27 -31
- package/es/index.css +1 -1
- package/es/index.min.css +1 -1
- package/es/locale/lang/en-US.js +22 -22
- package/es/style.css +1 -1
- package/es/style.min.css +1 -1
- package/es/table/src/methods.js +52 -15
- package/es/table/src/table.js +18 -5
- package/es/table/src/util.js +29 -23
- package/es/table/style.css +29 -2
- package/es/table/style.min.css +1 -1
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/es/vxe-table/style.css +29 -2
- package/es/vxe-table/style.min.css +1 -1
- package/lib/grid/src/grid.js +48 -52
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/index.css +1 -1
- package/lib/index.min.css +1 -1
- package/lib/index.umd.js +136 -95
- package/lib/index.umd.min.js +1 -1
- package/lib/locale/lang/en-US.js +22 -22
- package/lib/locale/lang/en-US.min.js +1 -1
- package/lib/locale/lang/en-US.umd.js +22 -22
- package/lib/style.css +1 -1
- package/lib/style.min.css +1 -1
- package/lib/table/src/methods.js +55 -15
- package/lib/table/src/methods.min.js +1 -1
- package/lib/table/src/table.js +14 -3
- package/lib/table/src/table.min.js +1 -1
- package/lib/table/src/util.js +17 -23
- package/lib/table/src/util.min.js +1 -1
- package/lib/table/style/style.css +29 -2
- package/lib/table/style/style.min.css +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/lib/vxe-table/style/style.css +29 -2
- package/lib/vxe-table/style/style.min.css +1 -1
- package/package.json +2 -2
- package/packages/grid/src/grid.ts +64 -68
- package/packages/locale/lang/en-US.ts +22 -22
- package/packages/table/src/methods.ts +55 -15
- package/packages/table/src/table.ts +19 -5
- package/packages/table/src/util.ts +37 -23
- package/styles/components/table.scss +52 -2
- /package/es/{iconfont.1760925668508.ttf → iconfont.1761181583983.ttf} +0 -0
- /package/es/{iconfont.1760925668508.woff → iconfont.1761181583983.woff} +0 -0
- /package/es/{iconfont.1760925668508.woff2 → iconfont.1761181583983.woff2} +0 -0
- /package/lib/{iconfont.1760925668508.ttf → iconfont.1761181583983.ttf} +0 -0
- /package/lib/{iconfont.1760925668508.woff → iconfont.1761181583983.woff} +0 -0
- /package/lib/{iconfont.1760925668508.woff2 → iconfont.1761181583983.woff2} +0 -0
package/README.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# vxe-table
|
|
2
2
|
|
|
3
|
-
[](https://github.com/x-extends/vxe-table/stargazers)
|
|
4
4
|
[](https://www.npmjs.com/package/vxe-table)
|
|
5
5
|
[](https://github.com/x-extends/vxe-table/actions/workflows/webpack.yml)
|
|
6
6
|
[](https://npm-stat.com/charts.html?package=vxe-table)
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
[](https://github.com/x-extends/vxe-table/pulls?q=is%3Apr+is%3Aclosed)
|
|
11
11
|
[](LICENSE)
|
|
12
12
|
|
|
13
|
-
一个基于 [Vxe UI](https://github.com/x-extends/vxe-pc-ui) 的 PC
|
|
13
|
+
一个基于 [Vxe UI](https://github.com/x-extends/vxe-pc-ui) 的 PC 端表格组件，支持增删改查的可编辑表格，支持 Excel 复制粘贴、数据透视表、虚拟列表高性能的表格解决方案
|
|
14
14
|
|
|
15
15
|
## 浏览器支持
|
|
16
16
|
|
package/es/grid/src/grid.js
CHANGED
|
@@ -359,7 +359,9 @@ export default {
|
|
|
359
359
|
*/
|
|
360
360
|
getExcludeHeight() {
|
|
361
361
|
const $xeGrid = this;
|
|
362
|
+
const props = $xeGrid;
|
|
362
363
|
const reactData = $xeGrid.reactData;
|
|
364
|
+
const { height } = props;
|
|
363
365
|
const { isZMax } = reactData;
|
|
364
366
|
const el = $xeGrid.$refs.refElem;
|
|
365
367
|
if (el) {
|
|
@@ -369,7 +371,10 @@ export default {
|
|
|
369
371
|
const bottomWrapper = $xeGrid.$refs.refBottomWrapper;
|
|
370
372
|
const pagerWrapper = $xeGrid.$refs.refPagerWrapper;
|
|
371
373
|
const parentEl = el.parentElement;
|
|
372
|
-
|
|
374
|
+
let parentPaddingSize = 0;
|
|
375
|
+
if (parentEl && (height === '100%' || height === 'auto')) {
|
|
376
|
+
parentPaddingSize = isZMax ? 0 : getPaddingTopBottomSize(parentEl);
|
|
377
|
+
}
|
|
373
378
|
return parentPaddingSize + getPaddingTopBottomSize(el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper);
|
|
374
379
|
}
|
|
375
380
|
return 0;
|
|
@@ -586,6 +591,7 @@ export default {
|
|
|
586
591
|
if (!isInited && reactData.tableLoading) {
|
|
587
592
|
return $xeGrid.$nextTick();
|
|
588
593
|
}
|
|
594
|
+
let operPromise = null;
|
|
589
595
|
let sortList = [];
|
|
590
596
|
let filterList = [];
|
|
591
597
|
let pageParams = {};
|
|
@@ -638,7 +644,7 @@ export default {
|
|
|
638
644
|
else {
|
|
639
645
|
if ($xeTable) {
|
|
640
646
|
if (isReload) {
|
|
641
|
-
$xeTable.clearAll();
|
|
647
|
+
operPromise = $xeTable.clearAll();
|
|
642
648
|
}
|
|
643
649
|
else {
|
|
644
650
|
sortList = $xeTable.getSortColumns();
|
|
@@ -664,9 +670,10 @@ export default {
|
|
|
664
670
|
reactData.sortData = sortList;
|
|
665
671
|
reactData.filterData = filterList;
|
|
666
672
|
reactData.tableLoading = true;
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
673
|
+
return Promise.all([
|
|
674
|
+
Promise.resolve((beforeQuery || ajaxMethods)(commitParams, ...args)),
|
|
675
|
+
operPromise
|
|
676
|
+
]).then(([rest]) => {
|
|
670
677
|
let tableData = [];
|
|
671
678
|
reactData.tableLoading = false;
|
|
672
679
|
if (rest) {
|
|
@@ -691,14 +698,15 @@ export default {
|
|
|
691
698
|
$xeTable.loadData(tableData);
|
|
692
699
|
}
|
|
693
700
|
else {
|
|
694
|
-
$
|
|
701
|
+
$xeGrid.$nextTick(() => {
|
|
702
|
+
const $xeTable = $xeGrid.$refs.refTable;
|
|
695
703
|
if ($xeTable) {
|
|
696
704
|
$xeTable.loadData(tableData);
|
|
697
705
|
}
|
|
698
706
|
});
|
|
699
707
|
}
|
|
700
708
|
if (afterQuery) {
|
|
701
|
-
afterQuery(...
|
|
709
|
+
afterQuery(commitParams, ...args);
|
|
702
710
|
}
|
|
703
711
|
if (querySuccessMethods) {
|
|
704
712
|
querySuccessMethods(Object.assign(Object.assign({}, commitParams), { response: rest }));
|
|
@@ -747,11 +755,9 @@ export default {
|
|
|
747
755
|
reactData.tableLoading = false;
|
|
748
756
|
$xeTable.setPendingRow(removeRecords, false);
|
|
749
757
|
if (isRespMsg) {
|
|
750
|
-
|
|
751
|
-
|
|
752
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
758
|
+
if (VxeUI.modal) {
|
|
759
|
+
VxeUI.modal.message({ content: $xeGrid.getRespMsg(rest, 'vxe.grid.delSuccess'), status: 'success' });
|
|
753
760
|
}
|
|
754
|
-
VxeUI.modal.message({ content: $xeGrid.getRespMsg(rest, 'vxe.grid.delSuccess'), status: 'success' });
|
|
755
761
|
}
|
|
756
762
|
if (afterDelete) {
|
|
757
763
|
afterDelete(...applyArgs);
|
|
@@ -767,11 +773,9 @@ export default {
|
|
|
767
773
|
.catch(rest => {
|
|
768
774
|
reactData.tableLoading = false;
|
|
769
775
|
if (isRespMsg) {
|
|
770
|
-
|
|
771
|
-
|
|
772
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
776
|
+
if (VxeUI.modal) {
|
|
777
|
+
VxeUI.modal.message({ id: code, content: $xeGrid.getRespMsg(rest, 'vxe.grid.operError'), status: 'error' });
|
|
773
778
|
}
|
|
774
|
-
VxeUI.modal.message({ id: code, content: $xeGrid.getRespMsg(rest, 'vxe.grid.operError'), status: 'error' });
|
|
775
779
|
}
|
|
776
780
|
if (deleteErrorMethods) {
|
|
777
781
|
deleteErrorMethods(Object.assign(Object.assign({}, commitParams), { response: rest }));
|
|
@@ -782,11 +786,9 @@ export default {
|
|
|
782
786
|
}
|
|
783
787
|
else {
|
|
784
788
|
if (isActiveMsg) {
|
|
785
|
-
|
|
786
|
-
|
|
787
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
789
|
+
if (VxeUI.modal) {
|
|
790
|
+
VxeUI.modal.message({ id: code, content: getI18n('vxe.grid.selectOneRecord'), status: 'warning' });
|
|
788
791
|
}
|
|
789
|
-
VxeUI.modal.message({ id: code, content: getI18n('vxe.grid.selectOneRecord'), status: 'warning' });
|
|
790
792
|
}
|
|
791
793
|
}
|
|
792
794
|
}
|
|
@@ -838,11 +840,9 @@ export default {
|
|
|
838
840
|
reactData.tableLoading = false;
|
|
839
841
|
$xeTable.clearPendingRow();
|
|
840
842
|
if (isRespMsg) {
|
|
841
|
-
|
|
842
|
-
|
|
843
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
843
|
+
if (VxeUI.modal) {
|
|
844
|
+
VxeUI.modal.message({ content: $xeGrid.getRespMsg(rest, 'vxe.grid.saveSuccess'), status: 'success' });
|
|
844
845
|
}
|
|
845
|
-
VxeUI.modal.message({ content: $xeGrid.getRespMsg(rest, 'vxe.grid.saveSuccess'), status: 'success' });
|
|
846
846
|
}
|
|
847
847
|
if (afterSave) {
|
|
848
848
|
afterSave(...applyArgs);
|
|
@@ -858,11 +858,9 @@ export default {
|
|
|
858
858
|
.catch(rest => {
|
|
859
859
|
reactData.tableLoading = false;
|
|
860
860
|
if (isRespMsg) {
|
|
861
|
-
|
|
862
|
-
|
|
863
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
861
|
+
if (VxeUI.modal) {
|
|
862
|
+
VxeUI.modal.message({ id: code, content: $xeGrid.getRespMsg(rest, 'vxe.grid.operError'), status: 'error' });
|
|
864
863
|
}
|
|
865
|
-
VxeUI.modal.message({ id: code, content: $xeGrid.getRespMsg(rest, 'vxe.grid.operError'), status: 'error' });
|
|
866
864
|
}
|
|
867
865
|
if (saveErrorMethods) {
|
|
868
866
|
saveErrorMethods(Object.assign(Object.assign({}, commitParams), { response: rest }));
|
|
@@ -872,11 +870,9 @@ export default {
|
|
|
872
870
|
}
|
|
873
871
|
else {
|
|
874
872
|
if (isActiveMsg) {
|
|
875
|
-
|
|
876
|
-
|
|
877
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
873
|
+
if (VxeUI.modal) {
|
|
874
|
+
VxeUI.modal.message({ id: code, content: getI18n('vxe.grid.dataUnchanged'), status: 'info' });
|
|
878
875
|
}
|
|
879
|
-
VxeUI.modal.message({ id: code, content: getI18n('vxe.grid.dataUnchanged'), status: 'info' });
|
|
880
876
|
}
|
|
881
877
|
}
|
|
882
878
|
});
|