vxe-table 3.13.17 → 3.13.19
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/es/grid/src/grid.js +42 -72
- package/es/style.css +1 -1
- package/es/table/module/custom/panel.js +25 -27
- package/es/table/module/edit/mixin.js +3 -5
- package/es/table/module/export/export-panel.js +22 -24
- package/es/table/module/export/import-panel.js +14 -16
- package/es/table/module/export/mixin.js +15 -31
- package/es/table/module/validator/mixin.js +1 -3
- package/es/table/render/index.js +90 -61
- package/es/table/src/columnInfo.js +30 -32
- package/es/table/src/methods.js +141 -80
- package/es/table/src/table.js +16 -18
- package/es/table/src/util.js +5 -7
- package/es/toolbar/src/toolbar.js +18 -26
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/grid/src/grid.js +42 -72
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/index.umd.js +447 -411
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/module/custom/panel.js +31 -33
- package/lib/table/module/custom/panel.min.js +1 -1
- package/lib/table/module/edit/mixin.js +3 -5
- package/lib/table/module/edit/mixin.min.js +1 -1
- package/lib/table/module/export/export-panel.js +22 -24
- package/lib/table/module/export/export-panel.min.js +1 -1
- package/lib/table/module/export/import-panel.js +14 -16
- package/lib/table/module/export/import-panel.min.js +1 -1
- package/lib/table/module/export/mixin.js +15 -31
- package/lib/table/module/export/mixin.min.js +1 -1
- package/lib/table/module/validator/mixin.js +1 -3
- package/lib/table/module/validator/mixin.min.js +1 -1
- package/lib/table/render/index.js +98 -66
- package/lib/table/render/index.min.js +1 -1
- package/lib/table/src/columnInfo.js +32 -34
- package/lib/table/src/columnInfo.min.js +1 -1
- package/lib/table/src/methods.js +148 -78
- package/lib/table/src/methods.min.js +1 -1
- package/lib/table/src/table.js +13 -15
- package/lib/table/src/table.min.js +1 -1
- package/lib/table/src/util.js +4 -6
- package/lib/table/src/util.min.js +1 -1
- package/lib/toolbar/src/toolbar.js +18 -26
- package/lib/toolbar/src/toolbar.min.js +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/package.json +2 -2
- package/packages/grid/src/grid.ts +42 -72
- package/packages/table/module/custom/panel.ts +25 -27
- package/packages/table/module/edit/mixin.ts +3 -5
- package/packages/table/module/export/export-panel.ts +22 -24
- package/packages/table/module/export/import-panel.ts +14 -16
- package/packages/table/module/export/mixin.ts +15 -31
- package/packages/table/module/validator/mixin.ts +1 -3
- package/packages/table/render/index.ts +89 -59
- package/packages/table/src/columnInfo.ts +30 -32
- package/packages/table/src/methods.ts +143 -78
- package/packages/table/src/table.ts +13 -15
- package/packages/table/src/util.ts +4 -6
- package/packages/toolbar/src/toolbar.ts +18 -26
- /package/es/{iconfont.1741051533862.ttf → iconfont.1741224103306.ttf} +0 -0
- /package/es/{iconfont.1741051533862.woff → iconfont.1741224103306.woff} +0 -0
- /package/es/{iconfont.1741051533862.woff2 → iconfont.1741224103306.woff2} +0 -0
- /package/lib/{iconfont.1741051533862.ttf → iconfont.1741224103306.ttf} +0 -0
- /package/lib/{iconfont.1741051533862.woff → iconfont.1741224103306.woff} +0 -0
- /package/lib/{iconfont.1741051533862.woff2 → iconfont.1741224103306.woff2} +0 -0
package/es/grid/src/grid.js
CHANGED
|
@@ -66,9 +66,7 @@ function getFuncSlot($xeGrid, optSlots, slotKey) {
|
|
|
66
66
|
return slots[funcSlot];
|
|
67
67
|
}
|
|
68
68
|
else {
|
|
69
|
-
|
|
70
|
-
errLog('vxe.error.notSlot', [funcSlot]);
|
|
71
|
-
}
|
|
69
|
+
errLog('vxe.error.notSlot', [funcSlot]);
|
|
72
70
|
}
|
|
73
71
|
}
|
|
74
72
|
else {
|
|
@@ -529,34 +527,30 @@ export default {
|
|
|
529
527
|
// if (proxyConfig && (data || (proxyOpts.form && formOpts.data))) {
|
|
530
528
|
// errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config'])
|
|
531
529
|
// }
|
|
532
|
-
if (
|
|
533
|
-
|
|
534
|
-
warnLog('vxe.error.delProp', ['grid.toolbar', 'grid.toolbar-config']);
|
|
535
|
-
}
|
|
536
|
-
if (this.toolbarConfig && !XEUtils.isObject(this.toolbarConfig)) {
|
|
537
|
-
warnLog('vxe.error.errProp', [`grid.toolbar-config=${this.toolbarConfig}`, 'grid.toolbar-config={}']);
|
|
538
|
-
}
|
|
539
|
-
// if (proxyOpts.props) {
|
|
540
|
-
// warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])
|
|
541
|
-
// }
|
|
530
|
+
if (this.toolbar) {
|
|
531
|
+
warnLog('vxe.error.delProp', ['grid.toolbar', 'grid.toolbar-config']);
|
|
542
532
|
}
|
|
543
|
-
if (
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
533
|
+
if (this.toolbarConfig && !XEUtils.isObject(this.toolbarConfig)) {
|
|
534
|
+
warnLog('vxe.error.errProp', [`grid.toolbar-config=${this.toolbarConfig}`, 'grid.toolbar-config={}']);
|
|
535
|
+
}
|
|
536
|
+
// if (proxyOpts.props) {
|
|
537
|
+
// warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])
|
|
538
|
+
// }
|
|
539
|
+
// 使用已安装的组件,如果未安装则不渲染
|
|
540
|
+
const VxeUIFormComponent = VxeUI.getComponent('VxeForm');
|
|
541
|
+
const VxeUIPagerComponent = VxeUI.getComponent('VxePager');
|
|
542
|
+
$xeGrid.$nextTick(() => {
|
|
543
|
+
if (props.formConfig) {
|
|
544
|
+
if (!VxeUIFormComponent) {
|
|
545
|
+
errLog('vxe.error.reqComp', ['vxe-form']);
|
|
552
546
|
}
|
|
553
|
-
|
|
554
|
-
|
|
555
|
-
|
|
556
|
-
|
|
547
|
+
}
|
|
548
|
+
if (props.pagerConfig) {
|
|
549
|
+
if (!VxeUIPagerComponent) {
|
|
550
|
+
errLog('vxe.error.reqComp', ['vxe-pager']);
|
|
557
551
|
}
|
|
558
|
-
}
|
|
559
|
-
}
|
|
552
|
+
}
|
|
553
|
+
});
|
|
560
554
|
this.initPages();
|
|
561
555
|
globalEvents.on(this, 'keydown', this.handleGlobalKeydownEvent);
|
|
562
556
|
},
|
|
@@ -844,9 +838,7 @@ export default {
|
|
|
844
838
|
});
|
|
845
839
|
}
|
|
846
840
|
else {
|
|
847
|
-
|
|
848
|
-
errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
|
|
849
|
-
}
|
|
841
|
+
errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
|
|
850
842
|
}
|
|
851
843
|
break;
|
|
852
844
|
}
|
|
@@ -872,10 +864,8 @@ export default {
|
|
|
872
864
|
$xetable.setPendingRow(removeRecords, false);
|
|
873
865
|
if (isRespMsg) {
|
|
874
866
|
// 检测弹窗模块
|
|
875
|
-
if (
|
|
876
|
-
|
|
877
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
878
|
-
}
|
|
867
|
+
if (!VxeUI.modal) {
|
|
868
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
879
869
|
}
|
|
880
870
|
VxeUI.modal.message({ content: this.getRespMsg(rest, 'vxe.grid.delSuccess'), status: 'success' });
|
|
881
871
|
}
|
|
@@ -894,10 +884,8 @@ export default {
|
|
|
894
884
|
this.tableLoading = false;
|
|
895
885
|
if (isRespMsg) {
|
|
896
886
|
// 检测弹窗模块
|
|
897
|
-
if (
|
|
898
|
-
|
|
899
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
900
|
-
}
|
|
887
|
+
if (!VxeUI.modal) {
|
|
888
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
901
889
|
}
|
|
902
890
|
VxeUI.modal.message({ id: code, content: this.getRespMsg(rest, 'vxe.grid.operError'), status: 'error' });
|
|
903
891
|
}
|
|
@@ -911,19 +899,15 @@ export default {
|
|
|
911
899
|
else {
|
|
912
900
|
if (isActiveMsg) {
|
|
913
901
|
// 检测弹窗模块
|
|
914
|
-
if (
|
|
915
|
-
|
|
916
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
917
|
-
}
|
|
902
|
+
if (!VxeUI.modal) {
|
|
903
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
918
904
|
}
|
|
919
905
|
VxeUI.modal.message({ id: code, content: getI18n('vxe.grid.selectOneRecord'), status: 'warning' });
|
|
920
906
|
}
|
|
921
907
|
}
|
|
922
908
|
}
|
|
923
909
|
else {
|
|
924
|
-
|
|
925
|
-
errLog('vxe.error.notFunc', ['proxy-config.ajax.delete']);
|
|
926
|
-
}
|
|
910
|
+
errLog('vxe.error.notFunc', ['proxy-config.ajax.delete']);
|
|
927
911
|
}
|
|
928
912
|
break;
|
|
929
913
|
}
|
|
@@ -962,10 +946,8 @@ export default {
|
|
|
962
946
|
$xetable.clearPendingRow();
|
|
963
947
|
if (isRespMsg) {
|
|
964
948
|
// 检测弹窗模块
|
|
965
|
-
if (
|
|
966
|
-
|
|
967
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
968
|
-
}
|
|
949
|
+
if (!VxeUI.modal) {
|
|
950
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
969
951
|
}
|
|
970
952
|
VxeUI.modal.message({ content: this.getRespMsg(rest, 'vxe.grid.saveSuccess'), status: 'success' });
|
|
971
953
|
}
|
|
@@ -984,10 +966,8 @@ export default {
|
|
|
984
966
|
this.tableLoading = false;
|
|
985
967
|
if (isRespMsg) {
|
|
986
968
|
// 检测弹窗模块
|
|
987
|
-
if (
|
|
988
|
-
|
|
989
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
990
|
-
}
|
|
969
|
+
if (!VxeUI.modal) {
|
|
970
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
991
971
|
}
|
|
992
972
|
VxeUI.modal.message({ id: code, content: this.getRespMsg(rest, 'vxe.grid.operError'), status: 'error' });
|
|
993
973
|
}
|
|
@@ -1000,10 +980,8 @@ export default {
|
|
|
1000
980
|
else {
|
|
1001
981
|
if (isActiveMsg) {
|
|
1002
982
|
// 检测弹窗模块
|
|
1003
|
-
if (
|
|
1004
|
-
|
|
1005
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
1006
|
-
}
|
|
983
|
+
if (!VxeUI.modal) {
|
|
984
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
1007
985
|
}
|
|
1008
986
|
VxeUI.modal.message({ id: code, content: getI18n('vxe.grid.dataUnchanged'), status: 'info' });
|
|
1009
987
|
}
|
|
@@ -1011,9 +989,7 @@ export default {
|
|
|
1011
989
|
});
|
|
1012
990
|
}
|
|
1013
991
|
else {
|
|
1014
|
-
|
|
1015
|
-
errLog('vxe.error.notFunc', ['proxy-config.ajax.save']);
|
|
1016
|
-
}
|
|
992
|
+
errLog('vxe.error.notFunc', ['proxy-config.ajax.save']);
|
|
1017
993
|
}
|
|
1018
994
|
break;
|
|
1019
995
|
}
|
|
@@ -1024,9 +1000,7 @@ export default {
|
|
|
1024
1000
|
gCommandOpts.commandMethod({ code, button, $grid: this, $table: $xetable }, ...args);
|
|
1025
1001
|
}
|
|
1026
1002
|
else {
|
|
1027
|
-
|
|
1028
|
-
errLog('vxe.error.notCommands', [code]);
|
|
1029
|
-
}
|
|
1003
|
+
errLog('vxe.error.notCommands', [code]);
|
|
1030
1004
|
}
|
|
1031
1005
|
}
|
|
1032
1006
|
}
|
|
@@ -1054,10 +1028,8 @@ export default {
|
|
|
1054
1028
|
}
|
|
1055
1029
|
else {
|
|
1056
1030
|
// 检测弹窗模块
|
|
1057
|
-
if (
|
|
1058
|
-
|
|
1059
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
1060
|
-
}
|
|
1031
|
+
if (!VxeUI.modal) {
|
|
1032
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
1061
1033
|
}
|
|
1062
1034
|
VxeUI.modal.message({ id: `msg_${code}`, content: getI18n('vxe.grid.selectOneRecord'), status: 'warning' });
|
|
1063
1035
|
}
|
|
@@ -1107,10 +1079,8 @@ export default {
|
|
|
1107
1079
|
else {
|
|
1108
1080
|
if (isActiveMsg) {
|
|
1109
1081
|
// 检测弹窗模块
|
|
1110
|
-
if (
|
|
1111
|
-
|
|
1112
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
1113
|
-
}
|
|
1082
|
+
if (!VxeUI.modal) {
|
|
1083
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
1114
1084
|
}
|
|
1115
1085
|
VxeUI.modal.message({ id: code, content: getI18n('vxe.grid.selectOneRecord'), status: 'warning' });
|
|
1116
1086
|
}
|