vxe-table 3.14.0-beta.1 → 3.14.0-beta.2
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 +34 -62
- package/es/style.css +1 -1
- package/es/table/module/custom/panel.js +25 -27
- 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 +2 -4
- package/es/table/src/columnInfo.js +30 -32
- package/es/table/src/methods.js +121 -94
- 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 +34 -62
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/index.umd.js +323 -340
- 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/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 +2 -4
- 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 +129 -91
- 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 +34 -62
- package/packages/table/module/custom/panel.ts +25 -27
- 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 +2 -4
- package/packages/table/src/columnInfo.ts +30 -32
- package/packages/table/src/methods.ts +126 -95
- 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.1741051885975.ttf → iconfont.1741079977180.ttf} +0 -0
- /package/es/{iconfont.1741051885975.woff → iconfont.1741079977180.woff} +0 -0
- /package/es/{iconfont.1741051885975.woff2 → iconfont.1741079977180.woff2} +0 -0
- /package/lib/{iconfont.1741051885975.ttf → iconfont.1741079977180.ttf} +0 -0
- /package/lib/{iconfont.1741051885975.woff → iconfont.1741079977180.woff} +0 -0
- /package/lib/{iconfont.1741051885975.woff2 → iconfont.1741079977180.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 {
|
|
@@ -542,23 +540,21 @@ export default {
|
|
|
542
540
|
// warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])
|
|
543
541
|
// }
|
|
544
542
|
}
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
if (
|
|
551
|
-
|
|
552
|
-
errLog('vxe.error.reqComp', ['vxe-form']);
|
|
553
|
-
}
|
|
543
|
+
// 使用已安装的组件,如果未安装则不渲染
|
|
544
|
+
const VxeUIFormComponent = VxeUI.getComponent('VxeForm');
|
|
545
|
+
const VxeUIPagerComponent = VxeUI.getComponent('VxePager');
|
|
546
|
+
$xeGrid.$nextTick(() => {
|
|
547
|
+
if (props.formConfig) {
|
|
548
|
+
if (!VxeUIFormComponent) {
|
|
549
|
+
errLog('vxe.error.reqComp', ['vxe-form']);
|
|
554
550
|
}
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
551
|
+
}
|
|
552
|
+
if (props.pagerConfig) {
|
|
553
|
+
if (!VxeUIPagerComponent) {
|
|
554
|
+
errLog('vxe.error.reqComp', ['vxe-pager']);
|
|
559
555
|
}
|
|
560
|
-
}
|
|
561
|
-
}
|
|
556
|
+
}
|
|
557
|
+
});
|
|
562
558
|
this.initPages();
|
|
563
559
|
globalEvents.on(this, 'keydown', this.handleGlobalKeydownEvent);
|
|
564
560
|
},
|
|
@@ -854,9 +850,7 @@ export default {
|
|
|
854
850
|
});
|
|
855
851
|
}
|
|
856
852
|
else {
|
|
857
|
-
|
|
858
|
-
errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
|
|
859
|
-
}
|
|
853
|
+
errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
|
|
860
854
|
}
|
|
861
855
|
break;
|
|
862
856
|
}
|
|
@@ -882,10 +876,8 @@ export default {
|
|
|
882
876
|
$xeTable.setPendingRow(removeRecords, false);
|
|
883
877
|
if (isRespMsg) {
|
|
884
878
|
// 检测弹窗模块
|
|
885
|
-
if (
|
|
886
|
-
|
|
887
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
888
|
-
}
|
|
879
|
+
if (!VxeUI.modal) {
|
|
880
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
889
881
|
}
|
|
890
882
|
VxeUI.modal.message({ content: this.getRespMsg(rest, 'vxe.grid.delSuccess'), status: 'success' });
|
|
891
883
|
}
|
|
@@ -904,10 +896,8 @@ export default {
|
|
|
904
896
|
this.tableLoading = false;
|
|
905
897
|
if (isRespMsg) {
|
|
906
898
|
// 检测弹窗模块
|
|
907
|
-
if (
|
|
908
|
-
|
|
909
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
910
|
-
}
|
|
899
|
+
if (!VxeUI.modal) {
|
|
900
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
911
901
|
}
|
|
912
902
|
VxeUI.modal.message({ id: code, content: this.getRespMsg(rest, 'vxe.grid.operError'), status: 'error' });
|
|
913
903
|
}
|
|
@@ -921,19 +911,15 @@ export default {
|
|
|
921
911
|
else {
|
|
922
912
|
if (isActiveMsg) {
|
|
923
913
|
// 检测弹窗模块
|
|
924
|
-
if (
|
|
925
|
-
|
|
926
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
927
|
-
}
|
|
914
|
+
if (!VxeUI.modal) {
|
|
915
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
928
916
|
}
|
|
929
917
|
VxeUI.modal.message({ id: code, content: getI18n('vxe.grid.selectOneRecord'), status: 'warning' });
|
|
930
918
|
}
|
|
931
919
|
}
|
|
932
920
|
}
|
|
933
921
|
else {
|
|
934
|
-
|
|
935
|
-
errLog('vxe.error.notFunc', ['proxy-config.ajax.delete']);
|
|
936
|
-
}
|
|
922
|
+
errLog('vxe.error.notFunc', ['proxy-config.ajax.delete']);
|
|
937
923
|
}
|
|
938
924
|
break;
|
|
939
925
|
}
|
|
@@ -972,10 +958,8 @@ export default {
|
|
|
972
958
|
$xeTable.clearPendingRow();
|
|
973
959
|
if (isRespMsg) {
|
|
974
960
|
// 检测弹窗模块
|
|
975
|
-
if (
|
|
976
|
-
|
|
977
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
978
|
-
}
|
|
961
|
+
if (!VxeUI.modal) {
|
|
962
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
979
963
|
}
|
|
980
964
|
VxeUI.modal.message({ content: this.getRespMsg(rest, 'vxe.grid.saveSuccess'), status: 'success' });
|
|
981
965
|
}
|
|
@@ -994,10 +978,8 @@ export default {
|
|
|
994
978
|
this.tableLoading = false;
|
|
995
979
|
if (isRespMsg) {
|
|
996
980
|
// 检测弹窗模块
|
|
997
|
-
if (
|
|
998
|
-
|
|
999
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
1000
|
-
}
|
|
981
|
+
if (!VxeUI.modal) {
|
|
982
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
1001
983
|
}
|
|
1002
984
|
VxeUI.modal.message({ id: code, content: this.getRespMsg(rest, 'vxe.grid.operError'), status: 'error' });
|
|
1003
985
|
}
|
|
@@ -1010,10 +992,8 @@ export default {
|
|
|
1010
992
|
else {
|
|
1011
993
|
if (isActiveMsg) {
|
|
1012
994
|
// 检测弹窗模块
|
|
1013
|
-
if (
|
|
1014
|
-
|
|
1015
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
1016
|
-
}
|
|
995
|
+
if (!VxeUI.modal) {
|
|
996
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
1017
997
|
}
|
|
1018
998
|
VxeUI.modal.message({ id: code, content: getI18n('vxe.grid.dataUnchanged'), status: 'info' });
|
|
1019
999
|
}
|
|
@@ -1021,9 +1001,7 @@ export default {
|
|
|
1021
1001
|
});
|
|
1022
1002
|
}
|
|
1023
1003
|
else {
|
|
1024
|
-
|
|
1025
|
-
errLog('vxe.error.notFunc', ['proxy-config.ajax.save']);
|
|
1026
|
-
}
|
|
1004
|
+
errLog('vxe.error.notFunc', ['proxy-config.ajax.save']);
|
|
1027
1005
|
}
|
|
1028
1006
|
break;
|
|
1029
1007
|
}
|
|
@@ -1034,9 +1012,7 @@ export default {
|
|
|
1034
1012
|
gCommandOpts.commandMethod({ code, button, $grid: this, $table: $xeTable }, ...args);
|
|
1035
1013
|
}
|
|
1036
1014
|
else {
|
|
1037
|
-
|
|
1038
|
-
errLog('vxe.error.notCommands', [code]);
|
|
1039
|
-
}
|
|
1015
|
+
errLog('vxe.error.notCommands', [code]);
|
|
1040
1016
|
}
|
|
1041
1017
|
}
|
|
1042
1018
|
}
|
|
@@ -1064,10 +1040,8 @@ export default {
|
|
|
1064
1040
|
}
|
|
1065
1041
|
else {
|
|
1066
1042
|
// 检测弹窗模块
|
|
1067
|
-
if (
|
|
1068
|
-
|
|
1069
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
1070
|
-
}
|
|
1043
|
+
if (!VxeUI.modal) {
|
|
1044
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
1071
1045
|
}
|
|
1072
1046
|
VxeUI.modal.message({ id: `msg_${code}`, content: getI18n('vxe.grid.selectOneRecord'), status: 'warning' });
|
|
1073
1047
|
}
|
|
@@ -1117,10 +1091,8 @@ export default {
|
|
|
1117
1091
|
else {
|
|
1118
1092
|
if (isActiveMsg) {
|
|
1119
1093
|
// 检测弹窗模块
|
|
1120
|
-
if (
|
|
1121
|
-
|
|
1122
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
1123
|
-
}
|
|
1094
|
+
if (!VxeUI.modal) {
|
|
1095
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
1124
1096
|
}
|
|
1125
1097
|
VxeUI.modal.message({ id: code, content: getI18n('vxe.grid.selectOneRecord'), status: 'warning' });
|
|
1126
1098
|
}
|