vxe-table 4.2.0-beta.6 → 4.2.0
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/table/src/table.js +15 -3
- package/es/tools/log.js +1 -1
- package/es/v-x-e-table/index.js +1 -1
- package/es/v-x-e-table/src/conf.js +1 -1
- package/lib/index.umd.js +19 -7
- package/lib/index.umd.min.js +1 -1
- package/lib/table/src/table.js +16 -4
- package/lib/tools/log.js +1 -1
- package/lib/tools/log.min.js +1 -1
- package/lib/v-x-e-table/index.js +1 -1
- package/lib/v-x-e-table/index.min.js +1 -1
- package/lib/v-x-e-table/src/conf.js +1 -1
- package/lib/v-x-e-table/src/conf.min.js +1 -1
- package/package.json +1 -1
- package/packages/table/src/table.ts +15 -3
- package/packages/v-x-e-table/src/conf.ts +1 -1
- package/types/table.d.ts +6 -6
package/es/table/src/table.js
CHANGED
|
@@ -5729,13 +5729,13 @@ export default defineComponent({
|
|
|
5729
5729
|
var rowOpts = computeRowOpts.value;
|
|
5730
5730
|
if (process.env.NODE_ENV === 'development') {
|
|
5731
5731
|
// if (props.rowId) {
|
|
5732
|
-
// warnLog('vxe.error.delProp', ['
|
|
5732
|
+
// warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField'])
|
|
5733
5733
|
// }
|
|
5734
5734
|
// if (props.rowKey) {
|
|
5735
|
-
// warnLog('vxe.error.delProp', ['
|
|
5735
|
+
// warnLog('vxe.error.delProp', ['row-id', 'row-config.useKey'])
|
|
5736
5736
|
// }
|
|
5737
5737
|
// if (props.columnKey) {
|
|
5738
|
-
// warnLog('vxe.error.delProp', ['
|
|
5738
|
+
// warnLog('vxe.error.delProp', ['row-id', 'column-config.useKey'])
|
|
5739
5739
|
// }
|
|
5740
5740
|
if (!(props.rowId || rowOpts.keyField) && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || treeOpts.expandRowKeys)) {
|
|
5741
5741
|
warnLog('vxe.error.reqProp', ['row-config.keyField']);
|
|
@@ -5752,6 +5752,18 @@ export default defineComponent({
|
|
|
5752
5752
|
if (props.showFooter && !props.footerMethod) {
|
|
5753
5753
|
warnLog('vxe.error.reqProp', ['footer-method']);
|
|
5754
5754
|
}
|
|
5755
|
+
// if (props.highlightCurrentRow) {
|
|
5756
|
+
// warnLog('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent'])
|
|
5757
|
+
// }
|
|
5758
|
+
// if (props.highlightHoverRow) {
|
|
5759
|
+
// warnLog('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover'])
|
|
5760
|
+
// }
|
|
5761
|
+
// if (props.highlightCurrentColumn) {
|
|
5762
|
+
// warnLog('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent'])
|
|
5763
|
+
// }
|
|
5764
|
+
// if (props.highlightHoverColumn) {
|
|
5765
|
+
// warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover'])
|
|
5766
|
+
// }
|
|
5755
5767
|
// 检查导入导出类型,如果自定义导入导出方法,则不校验类型
|
|
5756
5768
|
var exportConfig = props.exportConfig, importConfig = props.importConfig;
|
|
5757
5769
|
var exportOpts = computeExportOpts.value;
|
package/es/tools/log.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import GlobalConfig from '../v-x-e-table/src/conf';
|
|
2
2
|
export function getLog(message, params) {
|
|
3
|
-
return "[vxe-table v" + "4.2.0
|
|
3
|
+
return "[vxe-table v" + "4.2.0" + "] " + GlobalConfig.i18n(message, params);
|
|
4
4
|
}
|
|
5
5
|
function outLog(type) {
|
|
6
6
|
return function (message, params) {
|
package/es/v-x-e-table/index.js
CHANGED
package/lib/index.umd.js
CHANGED
|
@@ -8477,7 +8477,7 @@ var GlobalConfig = {
|
|
|
8477
8477
|
parentField: 'parentId',
|
|
8478
8478
|
children: 'children',
|
|
8479
8479
|
hasChild: 'hasChild',
|
|
8480
|
-
mapChildren: '
|
|
8480
|
+
mapChildren: '_X_ROW_CHILD',
|
|
8481
8481
|
indent: 20,
|
|
8482
8482
|
showIcon: true
|
|
8483
8483
|
},
|
|
@@ -8754,7 +8754,7 @@ var es_array_concat = __webpack_require__("99af");
|
|
|
8754
8754
|
|
|
8755
8755
|
|
|
8756
8756
|
function getLog(message, params) {
|
|
8757
|
-
return "[vxe-table v".concat("4.2.0
|
|
8757
|
+
return "[vxe-table v".concat("4.2.0", "] ").concat(conf.i18n(message, params));
|
|
8758
8758
|
}
|
|
8759
8759
|
|
|
8760
8760
|
function outLog(type) {
|
|
@@ -10759,7 +10759,7 @@ var v_x_e_table_config = new v_x_e_table_VXETableConfig();
|
|
|
10759
10759
|
var v = 'v4';
|
|
10760
10760
|
var VXETable = {
|
|
10761
10761
|
v: v,
|
|
10762
|
-
version: "4.2.0
|
|
10762
|
+
version: "4.2.0",
|
|
10763
10763
|
setup: setup_setup,
|
|
10764
10764
|
interceptor: interceptor,
|
|
10765
10765
|
renderer: renderer,
|
|
@@ -39325,13 +39325,13 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
|
|
|
39325
39325
|
|
|
39326
39326
|
if (true) {
|
|
39327
39327
|
// if (props.rowId) {
|
|
39328
|
-
// warnLog('vxe.error.delProp', ['
|
|
39328
|
+
// warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField'])
|
|
39329
39329
|
// }
|
|
39330
39330
|
// if (props.rowKey) {
|
|
39331
|
-
// warnLog('vxe.error.delProp', ['
|
|
39331
|
+
// warnLog('vxe.error.delProp', ['row-id', 'row-config.useKey'])
|
|
39332
39332
|
// }
|
|
39333
39333
|
// if (props.columnKey) {
|
|
39334
|
-
// warnLog('vxe.error.delProp', ['
|
|
39334
|
+
// warnLog('vxe.error.delProp', ['row-id', 'column-config.useKey'])
|
|
39335
39335
|
// }
|
|
39336
39336
|
if (!(props.rowId || rowOpts.keyField) && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || treeOpts.expandRowKeys)) {
|
|
39337
39337
|
warnLog('vxe.error.reqProp', ['row-config.keyField']);
|
|
@@ -39351,7 +39351,19 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
|
|
|
39351
39351
|
|
|
39352
39352
|
if (props.showFooter && !props.footerMethod) {
|
|
39353
39353
|
warnLog('vxe.error.reqProp', ['footer-method']);
|
|
39354
|
-
} //
|
|
39354
|
+
} // if (props.highlightCurrentRow) {
|
|
39355
|
+
// warnLog('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent'])
|
|
39356
|
+
// }
|
|
39357
|
+
// if (props.highlightHoverRow) {
|
|
39358
|
+
// warnLog('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover'])
|
|
39359
|
+
// }
|
|
39360
|
+
// if (props.highlightCurrentColumn) {
|
|
39361
|
+
// warnLog('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent'])
|
|
39362
|
+
// }
|
|
39363
|
+
// if (props.highlightHoverColumn) {
|
|
39364
|
+
// warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover'])
|
|
39365
|
+
// }
|
|
39366
|
+
// 检查导入导出类型,如果自定义导入导出方法,则不校验类型
|
|
39355
39367
|
|
|
39356
39368
|
|
|
39357
39369
|
var exportConfig = props.exportConfig,
|