vxe-table 4.5.9 → 4.5.10
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/button/style.css +2 -3
- package/es/export/src/hook.js +5 -5
- package/es/form/src/form-config-item.js +4 -2
- package/es/form/src/form-item.js +8 -2
- package/es/form/src/form.js +4 -0
- package/es/form/style.css +12 -0
- package/es/icon/style.css +1 -1
- package/es/style.css +1 -1
- package/es/style.min.css +1 -1
- package/es/table/src/body.js +2 -5
- package/es/table/src/cell.js +6 -3
- package/es/table/src/table.js +53 -46
- package/es/tools/log.js +1 -1
- package/es/v-x-e-table/index.js +7 -5
- package/es/v-x-e-table/src/{setup.js → config.js} +1 -1
- package/es/vxe-button/style.css +2 -3
- package/es/vxe-form/style.css +12 -0
- package/lib/button/style/style.css +2 -3
- package/lib/button/style/style.min.css +1 -1
- package/lib/export/src/hook.js +5 -5
- package/lib/export/src/hook.min.js +1 -1
- package/lib/form/src/form-config-item.js +5 -1
- package/lib/form/src/form-config-item.min.js +1 -1
- package/lib/form/src/form-item.js +9 -1
- package/lib/form/src/form-item.min.js +1 -1
- package/lib/form/src/form.js +4 -0
- package/lib/form/src/form.min.js +1 -1
- package/lib/form/style/style.css +12 -0
- package/lib/form/style/style.min.css +1 -1
- package/lib/icon/style/style.css +1 -1
- package/lib/icon/style/style.min.css +1 -1
- package/lib/index.umd.js +93 -56
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/style.min.css +1 -1
- package/lib/table/src/body.js +2 -5
- package/lib/table/src/body.min.js +1 -1
- package/lib/table/src/cell.js +6 -3
- package/lib/table/src/cell.min.js +1 -1
- package/lib/table/src/table.js +55 -50
- package/lib/table/src/table.min.js +1 -1
- package/lib/tools/log.js +1 -1
- package/lib/tools/log.min.js +1 -1
- package/lib/v-x-e-table/index.js +15 -11
- package/lib/v-x-e-table/index.min.js +1 -1
- package/lib/v-x-e-table/src/{setup.js → config.js} +3 -3
- package/lib/v-x-e-table/src/config.min.js +1 -0
- package/lib/vxe-button/style/style.css +2 -3
- package/lib/vxe-button/style/style.min.css +1 -1
- package/lib/vxe-form/style/style.css +12 -0
- package/lib/vxe-form/style/style.min.css +1 -1
- package/package.json +1 -1
- package/packages/export/src/hook.ts +5 -5
- package/packages/form/src/form-config-item.ts +4 -2
- package/packages/form/src/form-item.ts +8 -2
- package/packages/form/src/form.ts +4 -0
- package/packages/table/src/body.ts +2 -5
- package/packages/table/src/cell.ts +6 -3
- package/packages/table/src/table.ts +31 -24
- package/packages/v-x-e-table/index.ts +8 -4
- package/packages/v-x-e-table/src/{setup.ts → config.ts} +1 -1
- package/styles/button.scss +5 -3
- package/styles/form.scss +14 -0
- package/types/form-item.d.ts +5 -0
- package/types/form.d.ts +3 -0
- package/types/table.d.ts +5 -5
- package/types/v-x-e-table/index.d.ts +31 -14
- package/lib/v-x-e-table/src/setup.min.js +0 -1
- /package/es/icon/style/{iconfont.1693442246739.ttf → iconfont.1694565686263.ttf} +0 -0
- /package/es/icon/style/{iconfont.1693442246739.woff → iconfont.1694565686263.woff} +0 -0
- /package/es/icon/style/{iconfont.1693442246739.woff2 → iconfont.1694565686263.woff2} +0 -0
- /package/es/{iconfont.1693442246739.ttf → iconfont.1694565686263.ttf} +0 -0
- /package/es/{iconfont.1693442246739.woff → iconfont.1694565686263.woff} +0 -0
- /package/es/{iconfont.1693442246739.woff2 → iconfont.1694565686263.woff2} +0 -0
- /package/lib/icon/style/{iconfont.1693442246739.ttf → iconfont.1694565686263.ttf} +0 -0
- /package/lib/icon/style/{iconfont.1693442246739.woff → iconfont.1694565686263.woff} +0 -0
- /package/lib/icon/style/{iconfont.1693442246739.woff2 → iconfont.1694565686263.woff2} +0 -0
- /package/lib/{iconfont.1693442246739.ttf → iconfont.1694565686263.ttf} +0 -0
- /package/lib/{iconfont.1693442246739.woff → iconfont.1694565686263.woff} +0 -0
- /package/lib/{iconfont.1693442246739.woff2 → iconfont.1694565686263.woff2} +0 -0
- /package/types/v-x-e-table/{setup.d.ts → config.d.ts} +0 -0
package/es/table/src/body.js
CHANGED
|
@@ -422,11 +422,8 @@ export default defineComponent({
|
|
|
422
422
|
]));
|
|
423
423
|
}
|
|
424
424
|
// 如果是树形表格
|
|
425
|
-
if (
|
|
426
|
-
|
|
427
|
-
if (rowChildren_1 && rowChildren_1.length && treeExpandedMaps[rowid]) {
|
|
428
|
-
rows.push.apply(rows, renderRows(fixedType, rowChildren_1, tableColumn));
|
|
429
|
-
}
|
|
425
|
+
if (isExpandTree) {
|
|
426
|
+
rows.push.apply(rows, renderRows(fixedType, rowChildren, tableColumn));
|
|
430
427
|
}
|
|
431
428
|
});
|
|
432
429
|
return rows;
|
package/es/table/src/cell.js
CHANGED
|
@@ -431,9 +431,9 @@ export var Cell = {
|
|
|
431
431
|
var isChecked = false;
|
|
432
432
|
var isVisible = !visibleMethod || visibleMethod({ row: row });
|
|
433
433
|
var isDisabled = !!checkMethod;
|
|
434
|
-
var rowid = getRowid($table, row);
|
|
435
434
|
var ons;
|
|
436
435
|
if (!isHidden) {
|
|
436
|
+
var rowid = getRowid($table, row);
|
|
437
437
|
isChecked = !!selectCheckboxMaps[rowid];
|
|
438
438
|
ons = {
|
|
439
439
|
onClick: function (evnt) {
|
|
@@ -494,6 +494,7 @@ export var Cell = {
|
|
|
494
494
|
var isDisabled = !!checkMethod;
|
|
495
495
|
var ons;
|
|
496
496
|
if (!isHidden) {
|
|
497
|
+
var rowid = getRowid($table, row);
|
|
497
498
|
isChecked = XEUtils.get(row, checkField);
|
|
498
499
|
ons = {
|
|
499
500
|
onClick: function (evnt) {
|
|
@@ -507,7 +508,7 @@ export var Cell = {
|
|
|
507
508
|
isDisabled = !checkMethod({ row: row });
|
|
508
509
|
}
|
|
509
510
|
if (treeConfig) {
|
|
510
|
-
isIndeterminate = !!treeIndeterminateMaps[
|
|
511
|
+
isIndeterminate = !!treeIndeterminateMaps[rowid];
|
|
511
512
|
}
|
|
512
513
|
}
|
|
513
514
|
var checkboxParams = __assign(__assign({}, params), { checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate: isIndeterminate });
|
|
@@ -685,7 +686,9 @@ export var Cell = {
|
|
|
685
686
|
class: ['vxe-filter--btn', hasFilter ? (iconMatch || GlobalConfig.icon.TABLE_FILTER_MATCH) : (iconNone || GlobalConfig.icon.TABLE_FILTER_NONE)],
|
|
686
687
|
title: GlobalConfig.i18n('vxe.table.filter'),
|
|
687
688
|
onClick: function (evnt) {
|
|
688
|
-
$table.triggerFilterEvent
|
|
689
|
+
if ($table.triggerFilterEvent) {
|
|
690
|
+
$table.triggerFilterEvent(evnt, params.column, params);
|
|
691
|
+
}
|
|
689
692
|
}
|
|
690
693
|
})
|
|
691
694
|
])
|
package/es/table/src/table.js
CHANGED
|
@@ -1991,29 +1991,30 @@ export default defineComponent({
|
|
|
1991
1991
|
}
|
|
1992
1992
|
};
|
|
1993
1993
|
var handleAsyncTreeExpandChilds = function (row) {
|
|
1994
|
-
var treeExpandedMaps = reactData.treeExpandedMaps, treeExpandLazyLoadedMaps = reactData.treeExpandLazyLoadedMaps;
|
|
1995
|
-
var fullAllDataRowIdData = internalData.fullAllDataRowIdData;
|
|
1996
1994
|
var treeOpts = computeTreeOpts.value;
|
|
1997
1995
|
var checkboxOpts = computeCheckboxOpts.value;
|
|
1998
1996
|
var transform = treeOpts.transform, loadMethod = treeOpts.loadMethod;
|
|
1999
1997
|
var checkStrictly = checkboxOpts.checkStrictly;
|
|
2000
|
-
var rowid = getRowid($xetable, row);
|
|
2001
|
-
var rest = fullAllDataRowIdData[rowid];
|
|
2002
1998
|
return new Promise(function (resolve) {
|
|
2003
1999
|
if (loadMethod) {
|
|
2004
|
-
|
|
2000
|
+
var treeExpandLazyLoadedMaps_1 = reactData.treeExpandLazyLoadedMaps;
|
|
2001
|
+
var fullAllDataRowIdData = internalData.fullAllDataRowIdData;
|
|
2002
|
+
var rowid_1 = getRowid($xetable, row);
|
|
2003
|
+
var rest_1 = fullAllDataRowIdData[rowid_1];
|
|
2004
|
+
treeExpandLazyLoadedMaps_1[rowid_1] = row;
|
|
2005
2005
|
loadMethod({ $table: $xetable, row: row }).then(function (childRecords) {
|
|
2006
|
-
|
|
2007
|
-
if (
|
|
2008
|
-
delete
|
|
2006
|
+
rest_1.treeLoaded = true;
|
|
2007
|
+
if (treeExpandLazyLoadedMaps_1[rowid_1]) {
|
|
2008
|
+
delete treeExpandLazyLoadedMaps_1[rowid_1];
|
|
2009
2009
|
}
|
|
2010
2010
|
if (!XEUtils.isArray(childRecords)) {
|
|
2011
2011
|
childRecords = [];
|
|
2012
2012
|
}
|
|
2013
2013
|
if (childRecords) {
|
|
2014
2014
|
return tableMethods.loadTreeChildren(row, childRecords).then(function (childRows) {
|
|
2015
|
-
|
|
2016
|
-
|
|
2015
|
+
var treeExpandedMaps = reactData.treeExpandedMaps;
|
|
2016
|
+
if (childRows.length && !treeExpandedMaps[rowid_1]) {
|
|
2017
|
+
treeExpandedMaps[rowid_1] = row;
|
|
2017
2018
|
}
|
|
2018
2019
|
// 如果当前节点已选中,则展开后子节点也被选中
|
|
2019
2020
|
if (!checkStrictly && tableMethods.isCheckedByCheckboxRow(row)) {
|
|
@@ -2027,9 +2028,10 @@ export default defineComponent({
|
|
|
2027
2028
|
});
|
|
2028
2029
|
}
|
|
2029
2030
|
}).catch(function () {
|
|
2030
|
-
|
|
2031
|
-
|
|
2032
|
-
|
|
2031
|
+
var treeExpandLazyLoadedMaps = reactData.treeExpandLazyLoadedMaps;
|
|
2032
|
+
rest_1.treeLoaded = false;
|
|
2033
|
+
if (treeExpandLazyLoadedMaps[rowid_1]) {
|
|
2034
|
+
delete treeExpandLazyLoadedMaps[rowid_1];
|
|
2033
2035
|
}
|
|
2034
2036
|
}).finally(function () {
|
|
2035
2037
|
nextTick().then(function () { return tableMethods.recalculate(); }).then(function () { return resolve(); });
|
|
@@ -2054,23 +2056,25 @@ export default defineComponent({
|
|
|
2054
2056
|
}
|
|
2055
2057
|
};
|
|
2056
2058
|
var handleAsyncRowExpand = function (row) {
|
|
2057
|
-
var fullAllDataRowIdData = internalData.fullAllDataRowIdData;
|
|
2058
|
-
var rowExpandLazyLoadedMaps = reactData.rowExpandLazyLoadedMaps, rowExpandedMaps = reactData.rowExpandedMaps;
|
|
2059
2059
|
return new Promise(function (resolve) {
|
|
2060
2060
|
var expandOpts = computeExpandOpts.value;
|
|
2061
2061
|
var loadMethod = expandOpts.loadMethod;
|
|
2062
2062
|
if (loadMethod) {
|
|
2063
|
-
var
|
|
2064
|
-
var
|
|
2065
|
-
|
|
2063
|
+
var fullAllDataRowIdData = internalData.fullAllDataRowIdData;
|
|
2064
|
+
var rowExpandLazyLoadedMaps = reactData.rowExpandLazyLoadedMaps;
|
|
2065
|
+
var rowid_2 = getRowid($xetable, row);
|
|
2066
|
+
var rest_2 = fullAllDataRowIdData[rowid_2];
|
|
2067
|
+
rowExpandLazyLoadedMaps[rowid_2] = row;
|
|
2066
2068
|
loadMethod({ $table: $xetable, row: row, rowIndex: tableMethods.getRowIndex(row), $rowIndex: tableMethods.getVMRowIndex(row) }).then(function () {
|
|
2067
|
-
|
|
2068
|
-
|
|
2069
|
+
var rowExpandedMaps = reactData.rowExpandedMaps;
|
|
2070
|
+
rest_2.expandLoaded = true;
|
|
2071
|
+
rowExpandedMaps[rowid_2] = row;
|
|
2069
2072
|
}).catch(function () {
|
|
2070
|
-
|
|
2073
|
+
rest_2.expandLoaded = false;
|
|
2071
2074
|
}).finally(function () {
|
|
2072
|
-
|
|
2073
|
-
|
|
2075
|
+
var rowExpandLazyLoadedMaps = reactData.rowExpandLazyLoadedMaps;
|
|
2076
|
+
if (rowExpandLazyLoadedMaps[rowid_2]) {
|
|
2077
|
+
delete rowExpandLazyLoadedMaps[rowid_2];
|
|
2074
2078
|
}
|
|
2075
2079
|
nextTick().then(function () { return tableMethods.recalculate(); }).then(function () { return resolve(); });
|
|
2076
2080
|
});
|
|
@@ -2491,6 +2495,7 @@ export default defineComponent({
|
|
|
2491
2495
|
*/
|
|
2492
2496
|
var handleBaseTreeExpand = function (rows, expanded) {
|
|
2493
2497
|
var treeExpandedMaps = reactData.treeExpandedMaps, treeExpandLazyLoadedMaps = reactData.treeExpandLazyLoadedMaps, treeNodeColumn = reactData.treeNodeColumn;
|
|
2498
|
+
var treeTempExpandedMaps = __assign({}, treeExpandedMaps);
|
|
2494
2499
|
var fullAllDataRowIdData = internalData.fullAllDataRowIdData, tableFullData = internalData.tableFullData;
|
|
2495
2500
|
var treeOpts = computeTreeOpts.value;
|
|
2496
2501
|
var reserve = treeOpts.reserve, lazy = treeOpts.lazy, accordion = treeOpts.accordion, toggleMethod = treeOpts.toggleMethod;
|
|
@@ -2507,8 +2512,8 @@ export default defineComponent({
|
|
|
2507
2512
|
if (matchObj) {
|
|
2508
2513
|
matchObj.items.forEach(function (item) {
|
|
2509
2514
|
var rowid = getRowid($xetable, item);
|
|
2510
|
-
if (
|
|
2511
|
-
delete
|
|
2515
|
+
if (treeTempExpandedMaps[rowid]) {
|
|
2516
|
+
delete treeTempExpandedMaps[rowid];
|
|
2512
2517
|
}
|
|
2513
2518
|
});
|
|
2514
2519
|
}
|
|
@@ -2516,7 +2521,7 @@ export default defineComponent({
|
|
|
2516
2521
|
if (expanded) {
|
|
2517
2522
|
validRows.forEach(function (row) {
|
|
2518
2523
|
var rowid = getRowid($xetable, row);
|
|
2519
|
-
if (!
|
|
2524
|
+
if (!treeTempExpandedMaps[rowid]) {
|
|
2520
2525
|
var rest = fullAllDataRowIdData[rowid];
|
|
2521
2526
|
var isLoad = lazy && row[hasChildField] && !rest.treeLoaded && !treeExpandLazyLoadedMaps[rowid];
|
|
2522
2527
|
// 是否使用懒加载
|
|
@@ -2525,7 +2530,7 @@ export default defineComponent({
|
|
|
2525
2530
|
}
|
|
2526
2531
|
else {
|
|
2527
2532
|
if (row[childrenField] && row[childrenField].length) {
|
|
2528
|
-
|
|
2533
|
+
treeTempExpandedMaps[rowid] = row;
|
|
2529
2534
|
}
|
|
2530
2535
|
}
|
|
2531
2536
|
}
|
|
@@ -2534,14 +2539,15 @@ export default defineComponent({
|
|
|
2534
2539
|
else {
|
|
2535
2540
|
validRows.forEach(function (item) {
|
|
2536
2541
|
var rowid = getRowid($xetable, item);
|
|
2537
|
-
if (
|
|
2538
|
-
delete
|
|
2542
|
+
if (treeTempExpandedMaps[rowid]) {
|
|
2543
|
+
delete treeTempExpandedMaps[rowid];
|
|
2539
2544
|
}
|
|
2540
2545
|
});
|
|
2541
2546
|
}
|
|
2542
2547
|
if (reserve) {
|
|
2543
2548
|
validRows.forEach(function (row) { return handleTreeExpandReserve(row, expanded); });
|
|
2544
2549
|
}
|
|
2550
|
+
reactData.treeExpandedMaps = treeTempExpandedMaps;
|
|
2545
2551
|
return Promise.all(result).then(function () {
|
|
2546
2552
|
return tableMethods.recalculate();
|
|
2547
2553
|
});
|
|
@@ -2745,8 +2751,8 @@ export default defineComponent({
|
|
|
2745
2751
|
var parentLevel = parentRest ? parentRest.level : 0;
|
|
2746
2752
|
return tableMethods.createData(childRecords).then(function (rows) {
|
|
2747
2753
|
if (keepSource) {
|
|
2748
|
-
var
|
|
2749
|
-
var matchObj = XEUtils.findTree(tableSourceData, function (item) { return
|
|
2754
|
+
var rowid_3 = getRowid($xetable, row);
|
|
2755
|
+
var matchObj = XEUtils.findTree(tableSourceData, function (item) { return rowid_3 === getRowid($xetable, item); }, { children: childrenField });
|
|
2750
2756
|
if (matchObj) {
|
|
2751
2757
|
matchObj.item[childrenField] = XEUtils.clone(rows, true);
|
|
2752
2758
|
}
|
|
@@ -3388,7 +3394,7 @@ export default defineComponent({
|
|
|
3388
3394
|
},
|
|
3389
3395
|
isIndeterminateByCheckboxRow: function (row) {
|
|
3390
3396
|
var treeIndeterminateMaps = reactData.treeIndeterminateMaps;
|
|
3391
|
-
return treeIndeterminateMaps[getRowid($xetable, row)] && !tableMethods.isCheckedByCheckboxRow(row);
|
|
3397
|
+
return !!treeIndeterminateMaps[getRowid($xetable, row)] && !tableMethods.isCheckedByCheckboxRow(row);
|
|
3392
3398
|
},
|
|
3393
3399
|
/**
|
|
3394
3400
|
* 多选,切换某一行的选中状态
|
|
@@ -3418,22 +3424,22 @@ export default defineComponent({
|
|
|
3418
3424
|
var treeOpts = computeTreeOpts.value;
|
|
3419
3425
|
var childrenField = treeOpts.children || treeOpts.childrenField;
|
|
3420
3426
|
if (radioOpts.reserve && radioReserveRow) {
|
|
3421
|
-
var
|
|
3427
|
+
var rowid_4 = getRowid($xetable, radioReserveRow);
|
|
3422
3428
|
if (isFull) {
|
|
3423
|
-
if (!fullDataRowIdData[
|
|
3429
|
+
if (!fullDataRowIdData[rowid_4]) {
|
|
3424
3430
|
return radioReserveRow;
|
|
3425
3431
|
}
|
|
3426
3432
|
}
|
|
3427
3433
|
else {
|
|
3428
3434
|
var rowkey_2 = getRowkey($xetable);
|
|
3429
3435
|
if (treeConfig) {
|
|
3430
|
-
var matchObj = XEUtils.findTree(afterFullData, function (row) { return
|
|
3436
|
+
var matchObj = XEUtils.findTree(afterFullData, function (row) { return rowid_4 === XEUtils.get(row, rowkey_2); }, { children: childrenField });
|
|
3431
3437
|
if (matchObj) {
|
|
3432
3438
|
return radioReserveRow;
|
|
3433
3439
|
}
|
|
3434
3440
|
}
|
|
3435
3441
|
else {
|
|
3436
|
-
if (!afterFullData.some(function (row) { return
|
|
3442
|
+
if (!afterFullData.some(function (row) { return rowid_4 === XEUtils.get(row, rowkey_2); })) {
|
|
3437
3443
|
return radioReserveRow;
|
|
3438
3444
|
}
|
|
3439
3445
|
}
|
|
@@ -3826,6 +3832,7 @@ export default defineComponent({
|
|
|
3826
3832
|
setRowExpand: function (rows, expanded) {
|
|
3827
3833
|
var rowExpandedMaps = reactData.rowExpandedMaps, rowExpandLazyLoadedMaps = reactData.rowExpandLazyLoadedMaps, column = reactData.expandColumn;
|
|
3828
3834
|
var fullAllDataRowIdData = internalData.fullAllDataRowIdData;
|
|
3835
|
+
var rExpandedMaps = __assign({}, rowExpandedMaps);
|
|
3829
3836
|
var expandOpts = computeExpandOpts.value;
|
|
3830
3837
|
var reserve = expandOpts.reserve, lazy = expandOpts.lazy, accordion = expandOpts.accordion, toggleMethod = expandOpts.toggleMethod;
|
|
3831
3838
|
var lazyRests = [];
|
|
@@ -3837,21 +3844,21 @@ export default defineComponent({
|
|
|
3837
3844
|
}
|
|
3838
3845
|
if (accordion) {
|
|
3839
3846
|
// 只能同时展开一个
|
|
3840
|
-
|
|
3847
|
+
rExpandedMaps = {};
|
|
3841
3848
|
rows = rows.slice(rows.length - 1, rows.length);
|
|
3842
3849
|
}
|
|
3843
3850
|
var validRows = toggleMethod ? rows.filter(function (row) { return toggleMethod({ $table: $xetable, expanded: expanded, column: column, columnIndex: columnIndex, $columnIndex: $columnIndex, row: row, rowIndex: tableMethods.getRowIndex(row), $rowIndex: tableMethods.getVMRowIndex(row) }); }) : rows;
|
|
3844
3851
|
if (expanded) {
|
|
3845
3852
|
validRows.forEach(function (row) {
|
|
3846
3853
|
var rowid = getRowid($xetable, row);
|
|
3847
|
-
if (!
|
|
3854
|
+
if (!rExpandedMaps[rowid]) {
|
|
3848
3855
|
var rest = fullAllDataRowIdData[rowid];
|
|
3849
3856
|
var isLoad = lazy && !rest.expandLoaded && !rowExpandLazyLoadedMaps[rowid];
|
|
3850
3857
|
if (isLoad) {
|
|
3851
3858
|
lazyRests.push(handleAsyncRowExpand(row));
|
|
3852
3859
|
}
|
|
3853
3860
|
else {
|
|
3854
|
-
|
|
3861
|
+
rExpandedMaps[rowid] = row;
|
|
3855
3862
|
}
|
|
3856
3863
|
}
|
|
3857
3864
|
});
|
|
@@ -3859,8 +3866,8 @@ export default defineComponent({
|
|
|
3859
3866
|
else {
|
|
3860
3867
|
validRows.forEach(function (item) {
|
|
3861
3868
|
var rowid = getRowid($xetable, item);
|
|
3862
|
-
if (
|
|
3863
|
-
delete
|
|
3869
|
+
if (rExpandedMaps[rowid]) {
|
|
3870
|
+
delete rExpandedMaps[rowid];
|
|
3864
3871
|
}
|
|
3865
3872
|
});
|
|
3866
3873
|
}
|
|
@@ -3868,7 +3875,7 @@ export default defineComponent({
|
|
|
3868
3875
|
validRows.forEach(function (row) { return handleRowExpandReserve(row, expanded); });
|
|
3869
3876
|
}
|
|
3870
3877
|
}
|
|
3871
|
-
reactData.rowExpandedMaps =
|
|
3878
|
+
reactData.rowExpandedMaps = rExpandedMaps;
|
|
3872
3879
|
return Promise.all(lazyRests).then(function () { return tableMethods.recalculate(); });
|
|
3873
3880
|
},
|
|
3874
3881
|
/**
|
|
@@ -6341,11 +6348,11 @@ export default defineComponent({
|
|
|
6341
6348
|
var exportConfig = props.exportConfig, importConfig = props.importConfig;
|
|
6342
6349
|
var exportOpts = computeExportOpts.value;
|
|
6343
6350
|
var importOpts = computeImportOpts.value;
|
|
6344
|
-
if (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(VXETable.
|
|
6345
|
-
warnLog('vxe.error.errProp', ["export-config.types=".concat(importOpts.types.join(',')), importOpts.types.filter(function (type) { return XEUtils.includes(VXETable.
|
|
6351
|
+
if (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(VXETable.globalConfs.importTypes, importOpts.types)) {
|
|
6352
|
+
warnLog('vxe.error.errProp', ["export-config.types=".concat(importOpts.types.join(',')), importOpts.types.filter(function (type) { return XEUtils.includes(VXETable.globalConfs.importTypes, type); }).join(',') || VXETable.globalConfs.importTypes.join(',')]);
|
|
6346
6353
|
}
|
|
6347
|
-
if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !XEUtils.includeArrays(VXETable.
|
|
6348
|
-
warnLog('vxe.error.errProp', ["export-config.types=".concat(exportOpts.types.join(',')), exportOpts.types.filter(function (type) { return XEUtils.includes(VXETable.
|
|
6354
|
+
if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !XEUtils.includeArrays(VXETable.globalConfs.exportTypes, exportOpts.types)) {
|
|
6355
|
+
warnLog('vxe.error.errProp', ["export-config.types=".concat(exportOpts.types.join(',')), exportOpts.types.filter(function (type) { return XEUtils.includes(VXETable.globalConfs.exportTypes, type); }).join(',') || VXETable.globalConfs.exportTypes.join(',')]);
|
|
6349
6356
|
}
|
|
6350
6357
|
}
|
|
6351
6358
|
if (process.env.NODE_ENV === 'development') {
|
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".concat("4.5.
|
|
3
|
+
return "[vxe-table v".concat("4.5.10", "] ").concat(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
|
@@ -7,7 +7,7 @@ import { menus } from './src/menus';
|
|
|
7
7
|
import { formats } from './src/formats';
|
|
8
8
|
import { validators } from './src/validators';
|
|
9
9
|
import { hooks } from './src/hooks';
|
|
10
|
-
import {
|
|
10
|
+
import { config } from './src/config';
|
|
11
11
|
import { getLastZIndex, nextZIndex } from '../tools/utils';
|
|
12
12
|
function getExportOrImpotType(types, flag) {
|
|
13
13
|
var rest = [];
|
|
@@ -80,12 +80,15 @@ var VXETableConfig = /** @class */ (function () {
|
|
|
80
80
|
});
|
|
81
81
|
return VXETableConfig;
|
|
82
82
|
}());
|
|
83
|
-
|
|
83
|
+
// 已废弃
|
|
84
|
+
export var globalConfs = new VXETableConfig();
|
|
84
85
|
export var v = 'v4';
|
|
86
|
+
export var setup = config;
|
|
85
87
|
export var VXETable = {
|
|
86
88
|
v: v,
|
|
87
|
-
version: "4.5.
|
|
89
|
+
version: "4.5.10",
|
|
88
90
|
setup: setup,
|
|
91
|
+
config: config,
|
|
89
92
|
interceptor: interceptor,
|
|
90
93
|
renderer: renderer,
|
|
91
94
|
commands: commands,
|
|
@@ -93,7 +96,6 @@ export var VXETable = {
|
|
|
93
96
|
validators: validators,
|
|
94
97
|
menus: menus,
|
|
95
98
|
hooks: hooks,
|
|
96
|
-
config: config,
|
|
97
99
|
use: use,
|
|
98
100
|
t: t,
|
|
99
101
|
_t: _t
|
|
@@ -105,5 +107,5 @@ export * from './src/menus';
|
|
|
105
107
|
export * from './src/formats';
|
|
106
108
|
export * from './src/validators';
|
|
107
109
|
export * from './src/hooks';
|
|
108
|
-
export * from './src/
|
|
110
|
+
export * from './src/config';
|
|
109
111
|
export default VXETable;
|
package/es/vxe-button/style.css
CHANGED
|
@@ -517,12 +517,11 @@
|
|
|
517
517
|
border: 1px solid var(--vxe-input-border-color);
|
|
518
518
|
box-shadow: 0 1px 6px rgba(0, 0, 0, 0.2);
|
|
519
519
|
}
|
|
520
|
-
.vxe-button--dropdown-wrapper > .vxe-button {
|
|
521
|
-
margin-left: 0;
|
|
522
|
-
margin-top: 0.4em;
|
|
520
|
+
.vxe-button--dropdown-wrapper > .vxe-button.type--text, .vxe-button--dropdown-wrapper > .vxe-button.type--button {
|
|
523
521
|
display: block;
|
|
524
522
|
width: 100%;
|
|
525
523
|
border: 0;
|
|
524
|
+
margin: 0.4em 0 0 0;
|
|
526
525
|
}
|
|
527
526
|
.vxe-button--dropdown-wrapper > .vxe-button.type--text {
|
|
528
527
|
padding: 2px 8px;
|
package/es/vxe-form/style.css
CHANGED
|
@@ -148,6 +148,18 @@
|
|
|
148
148
|
font-weight: normal;
|
|
149
149
|
vertical-align: middle;
|
|
150
150
|
}
|
|
151
|
+
.vxe-form--item.is--vertical .vxe-form--item-inner {
|
|
152
|
+
flex-direction: column;
|
|
153
|
+
align-items: initial;
|
|
154
|
+
}
|
|
155
|
+
.vxe-form--item.is--vertical .vxe-form--item-inner .vxe-form--item-title {
|
|
156
|
+
height: 2em;
|
|
157
|
+
line-height: 2em;
|
|
158
|
+
padding-right: 0;
|
|
159
|
+
}
|
|
160
|
+
.vxe-form--item.is--vertical .vxe-form--item-inner .vxe-form--item-title-content {
|
|
161
|
+
flex-grow: initial;
|
|
162
|
+
}
|
|
151
163
|
.vxe-form--item.is--span .vxe-default-input:not([type=submit]):not([type=reset]),
|
|
152
164
|
.vxe-form--item.is--span .vxe-default-textarea,
|
|
153
165
|
.vxe-form--item.is--span .vxe-default-select,
|
|
@@ -517,12 +517,11 @@
|
|
|
517
517
|
border: 1px solid var(--vxe-input-border-color);
|
|
518
518
|
box-shadow: 0 1px 6px rgba(0, 0, 0, 0.2);
|
|
519
519
|
}
|
|
520
|
-
.vxe-button--dropdown-wrapper > .vxe-button {
|
|
521
|
-
margin-left: 0;
|
|
522
|
-
margin-top: 0.4em;
|
|
520
|
+
.vxe-button--dropdown-wrapper > .vxe-button.type--text, .vxe-button--dropdown-wrapper > .vxe-button.type--button {
|
|
523
521
|
display: block;
|
|
524
522
|
width: 100%;
|
|
525
523
|
border: 0;
|
|
524
|
+
margin: 0.4em 0 0 0;
|
|
526
525
|
}
|
|
527
526
|
.vxe-button--dropdown-wrapper > .vxe-button.type--text {
|
|
528
527
|
padding: 2px 8px;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
.vxe-button{position:relative;text-align:center;background-color:var(--vxe-button-default-background-color);outline:0;font-size:var(--vxe-font-size);max-width:var(--vxe-button-max-width);line-height:1.5;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;white-space:nowrap;-webkit-user-select:none;-moz-user-select:none;user-select:none;-webkit-appearance:none;-moz-appearance:none;appearance:none;transition:border .2s ease-in-out}.vxe-button:not(.is--disabled){color:var(--vxe-font-color);cursor:pointer}.vxe-button.is--loading{cursor:progress}.vxe-button.is--loading:before{content:"";position:absolute;left:-1px;top:-1px;right:-1px;bottom:-1px;border-radius:inherit;background-color:hsla(0deg,0%,100%,.35);pointer-events:none}.vxe-button.is--disabled{color:var(--vxe-font-disabled-color)}.vxe-button.is--disabled:not(.is--loading){cursor:no-drop}.vxe-button.type--text{text-decoration:none;border:0;padding:.1em .5em;background-color:transparent}.vxe-button.type--text:not(.is--disabled):focus{color:var(--vxe-font-darken-color)}.vxe-button.type--text:not(.is--disabled):hover{color:var(--vxe-primary-lighten-color)}.vxe-button.type--text.theme--primary{color:var(--vxe-primary-color)}.vxe-button.type--text.theme--primary:not(.is--disabled):focus{color:var(--vxe-primary-darken-color)}.vxe-button.type--text.theme--primary:not(.is--disabled):hover{color:var(--vxe-primary-lighten-color)}.vxe-button.type--text.theme--primary.is--disabled{color:var(--vxe-primary-disabled-color)}.vxe-button.type--text.theme--success{color:var(--vxe-success-color)}.vxe-button.type--text.theme--success:not(.is--disabled):focus{color:var(--vxe-success-darken-color)}.vxe-button.type--text.theme--success:not(.is--disabled):hover{color:var(--vxe-success-lighten-color)}.vxe-button.type--text.theme--success.is--disabled{color:var(--vxe-success-disabled-color)}.vxe-button.type--text.theme--info{color:var(--vxe-info-color)}.vxe-button.type--text.theme--info:not(.is--disabled):focus{color:var(--vxe-info-darken-color)}.vxe-button.type--text.theme--info:not(.is--disabled):hover{color:var(--vxe-info-lighten-color)}.vxe-button.type--text.theme--info.is--disabled{color:var(--vxe-info-disabled-color)}.vxe-button.type--text.theme--warning{color:var(--vxe-warning-color)}.vxe-button.type--text.theme--warning:not(.is--disabled):focus{color:var(--vxe-warning-darken-color)}.vxe-button.type--text.theme--warning:not(.is--disabled):hover{color:var(--vxe-warning-lighten-color)}.vxe-button.type--text.theme--warning.is--disabled{color:var(--vxe-warning-disabled-color)}.vxe-button.type--text.theme--danger{color:var(--vxe-danger-color)}.vxe-button.type--text.theme--danger:not(.is--disabled):focus{color:var(--vxe-danger-darken-color)}.vxe-button.type--text.theme--danger:not(.is--disabled):hover{color:var(--vxe-danger-lighten-color)}.vxe-button.type--text.theme--danger.is--disabled{color:var(--vxe-danger-disabled-color)}.vxe-button.type--text.theme--perfect{color:var(--vxe-table-header-background-color)}.vxe-button.type--text.theme--perfect:not(.is--disabled):focus{color:var(--vxe-table-header-background-color)}.vxe-button.type--text.theme--perfect:not(.is--disabled):hover{color:var(--vxe-table-header-background-color)}.vxe-button.type--text.theme--perfect.is--disabled{color:var(--vxe-table-header-background-color)}.vxe-button.type--button{font-family:inherit;height:var(--vxe-button-height-default);line-height:1;border:1px solid var(--vxe-input-border-color)}.vxe-button.type--button.is--round{border-radius:var(--vxe-button-round-border-radius-default)}.vxe-button.type--button:not(.is--round){border-radius:var(--vxe-border-radius)}.vxe-button.type--button.is--circle{padding:0 .5em;min-width:var(--vxe-button-height-default);border-radius:50%}.vxe-button.type--button:not(.is--circle){padding:0 1em}.vxe-button.type--button:not(.is--disabled):hover{color:var(--vxe-primary-lighten-color)}.vxe-button.type--button:not(.is--disabled):focus{border-color:var(--vxe-primary-color)}.vxe-button.type--button:not(.is--disabled):active{color:var(--vxe-primary-darken-color);border-color:var(--vxe-primary-darken-color);background-color:var(--vxe-button-default-background-color)}.vxe-button.type--button.theme--primary{color:#fff}.vxe-button.type--button.theme--primary:not(.is--disabled){border-color:var(--vxe-primary-color);background-color:var(--vxe-primary-color)}.vxe-button.type--button.theme--primary:not(.is--disabled):hover{color:#fff;background-color:var(--vxe-primary-lighten-color);border-color:var(--vxe-primary-lighten-color)}.vxe-button.type--button.theme--primary:not(.is--disabled):active{color:#fff;background-color:var(--vxe-primary-darken-color);border-color:var(--vxe-primary-darken-color)}.vxe-button.type--button.theme--primary.is--disabled{border-color:var(--vxe-primary-disabled-color);background-color:var(--vxe-primary-disabled-color)}.vxe-button.type--button.theme--primary.is--loading{border-color:var(--vxe-primary-color);background-color:var(--vxe-primary-color)}.vxe-button.type--button.theme--success{color:#fff}.vxe-button.type--button.theme--success:not(.is--disabled){border-color:var(--vxe-success-color);background-color:var(--vxe-success-color)}.vxe-button.type--button.theme--success:not(.is--disabled):hover{color:#fff;background-color:var(--vxe-success-lighten-color);border-color:var(--vxe-success-lighten-color)}.vxe-button.type--button.theme--success:not(.is--disabled):active{color:#fff;background-color:var(--vxe-success-darken-color);border-color:var(--vxe-success-darken-color)}.vxe-button.type--button.theme--success.is--disabled{border-color:var(--vxe-success-disabled-color);background-color:var(--vxe-success-disabled-color)}.vxe-button.type--button.theme--success.is--loading{border-color:var(--vxe-success-color);background-color:var(--vxe-success-color)}.vxe-button.type--button.theme--info{color:#fff}.vxe-button.type--button.theme--info:not(.is--disabled){border-color:var(--vxe-info-color);background-color:var(--vxe-info-color)}.vxe-button.type--button.theme--info:not(.is--disabled):hover{color:#fff;background-color:var(--vxe-info-lighten-color);border-color:var(--vxe-info-lighten-color)}.vxe-button.type--button.theme--info:not(.is--disabled):active{color:#fff;background-color:var(--vxe-info-darken-color);border-color:var(--vxe-info-darken-color)}.vxe-button.type--button.theme--info.is--disabled{border-color:var(--vxe-info-disabled-color);background-color:var(--vxe-info-disabled-color)}.vxe-button.type--button.theme--info.is--loading{border-color:var(--vxe-info-color);background-color:var(--vxe-info-color)}.vxe-button.type--button.theme--warning{color:#fff}.vxe-button.type--button.theme--warning:not(.is--disabled){border-color:var(--vxe-warning-color);background-color:var(--vxe-warning-color)}.vxe-button.type--button.theme--warning:not(.is--disabled):hover{color:#fff;background-color:var(--vxe-warning-lighten-color);border-color:var(--vxe-warning-lighten-color)}.vxe-button.type--button.theme--warning:not(.is--disabled):active{color:#fff;background-color:var(--vxe-warning-darken-color);border-color:var(--vxe-warning-darken-color)}.vxe-button.type--button.theme--warning.is--disabled{border-color:var(--vxe-warning-disabled-color);background-color:var(--vxe-warning-disabled-color)}.vxe-button.type--button.theme--warning.is--loading{border-color:var(--vxe-warning-color);background-color:var(--vxe-warning-color)}.vxe-button.type--button.theme--danger{color:#fff}.vxe-button.type--button.theme--danger:not(.is--disabled){border-color:var(--vxe-danger-color);background-color:var(--vxe-danger-color)}.vxe-button.type--button.theme--danger:not(.is--disabled):hover{color:#fff;background-color:var(--vxe-danger-lighten-color);border-color:var(--vxe-danger-lighten-color)}.vxe-button.type--button.theme--danger:not(.is--disabled):active{color:#fff;background-color:var(--vxe-danger-darken-color);border-color:var(--vxe-danger-darken-color)}.vxe-button.type--button.theme--danger.is--disabled{border-color:var(--vxe-danger-disabled-color);background-color:var(--vxe-danger-disabled-color)}.vxe-button.type--button.theme--danger.is--loading{border-color:var(--vxe-danger-color);background-color:var(--vxe-danger-color)}.vxe-button.type--button.theme--perfect{color:var(--vxe-font-color)}.vxe-button.type--button.theme--perfect:not(.is--disabled){border-color:var(--vxe-table-header-background-color);background-color:var(--vxe-table-header-background-color)}.vxe-button.type--button.theme--perfect:not(.is--disabled):hover{color:var(--vxe-font-color);background-color:var(--vxe-table-header-background-color);border-color:var(--vxe-table-header-background-color)}.vxe-button.type--button.theme--perfect:not(.is--disabled):active{color:var(--vxe-font-color);background-color:var(--vxe-table-header-background-color);border-color:var(--vxe-table-header-background-color)}.vxe-button.type--button.theme--perfect.is--disabled{border-color:var(--vxe-table-header-background-color);background-color:var(--vxe-table-header-background-color)}.vxe-button.type--button.theme--perfect.is--loading{border-color:var(--vxe-table-header-background-color);background-color:var(--vxe-table-header-background-color)}.vxe-button.size--medium{font-size:var(--vxe-font-size-medium)}.vxe-button.size--medium.type--button{height:var(--vxe-button-height-medium)}.vxe-button.size--medium.type--button.is--circle{min-width:var(--vxe-button-height-medium)}.vxe-button.size--medium.type--button.is--round{border-radius:var(--vxe-button-round-border-radius-medium)}.vxe-button.size--medium .vxe-button--icon,.vxe-button.size--medium .vxe-button--loading-icon{min-width:var(--vxe-font-size-medium)}.vxe-button.size--small{font-size:var(--vxe-font-size-small)}.vxe-button.size--small.type--button{height:var(--vxe-button-height-small)}.vxe-button.size--small.type--button.is--circle{min-width:var(--vxe-button-height-small)}.vxe-button.size--small.type--button.is--round{border-radius:var(--vxe-button-round-border-radius-small)}.vxe-button.size--small .vxe-button--icon,.vxe-button.size--small .vxe-button--loading-icon{min-width:var(--vxe-font-size-small)}.vxe-button.size--mini{font-size:var(--vxe-font-size-mini)}.vxe-button.size--mini.type--button{height:var(--vxe-button-height-mini)}.vxe-button.size--mini.type--button.is--circle{min-width:var(--vxe-button-height-mini)}.vxe-button.size--mini.type--button.is--round{border-radius:var(--vxe-button-round-border-radius-mini)}.vxe-button.size--mini .vxe-button--icon,.vxe-button.size--mini .vxe-button--loading-icon{min-width:var(--vxe-font-size-mini)}.vxe-button+.vxe-button--dropdown,.vxe-button+.vxe-button.type--button,.vxe-input+.vxe-button--dropdown,.vxe-input+.vxe-button.type--button{margin-left:12px}.vxe-button--icon,.vxe-button--loading-icon{min-width:var(--vxe-font-size)}.vxe-button--icon+.vxe-button--content,.vxe-button--loading-icon+.vxe-button--content{margin-left:4px}.vxe-button--dropdown,.vxe-button--wrapper{display:inline-block}.vxe-button--dropdown{position:relative}.vxe-button--dropdown+.vxe-button--dropdown,.vxe-button--dropdown+.vxe-button.type--button{margin-left:12px}.vxe-button--dropdown>.vxe-button.type--button.theme--primary{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--success{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--info{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--warning{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--danger{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--perfect{color:var(--vxe-font-color)}.vxe-button--dropdown.is--active>.vxe-button:not(.is--disabled){color:var(--vxe-primary-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--primary{color:var(--vxe-primary-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--success{color:var(--vxe-success-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--info{color:var(--vxe-info-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--warning{color:var(--vxe-warning-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--danger{color:var(--vxe-danger-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--perfect{color:var(--vxe-table-header-background-color)}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--primary{color:#fff;background-color:var(--vxe-primary-lighten-color);border-color:var(--vxe-primary-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--success{color:#fff;background-color:var(--vxe-success-lighten-color);border-color:var(--vxe-success-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--info{color:#fff;background-color:var(--vxe-info-lighten-color);border-color:var(--vxe-info-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--warning{color:#fff;background-color:var(--vxe-warning-lighten-color);border-color:var(--vxe-warning-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--danger{color:#fff;background-color:var(--vxe-danger-lighten-color);border-color:var(--vxe-danger-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--perfect{color:var(--vxe-font-color);background-color:var(--vxe-table-header-background-color);border-color:var(--vxe-table-header-background-color)}.vxe-button--dropdown.is--active .vxe-button--dropdown-arrow{transform:rotate(180deg)}.vxe-button--dropdown-arrow{display:inline-block;font-size:12px;margin-left:4px;transition:transform .2s ease-in-out}.vxe-button--dropdown-panel{display:none;position:absolute;right:0;padding:4px 0}.vxe-button--dropdown-panel.animat--leave{display:block;opacity:0;transform:scaleY(.5);transition:transform .3s cubic-bezier(.23,1,.32,1),opacity .3s cubic-bezier(.23,1,.32,1);transform-origin:center top;backface-visibility:hidden;transform-style:preserve-3d}.vxe-button--dropdown-panel.animat--leave[placement=top]{transform-origin:center bottom}.vxe-button--dropdown-panel.animat--enter{opacity:1;transform:scaleY(1)}.vxe-button--dropdown-wrapper{padding:5px;background-color:var(--vxe-button-dropdown-panel-background-color);border-radius:var(--vxe-border-radius);border:1px solid var(--vxe-input-border-color);box-shadow:0 1px 6px rgba(0,0,0,.2)}.vxe-button--dropdown-wrapper>.vxe-button{margin-left:0;margin-top:.4em;display:block;width:100%;border:0}.vxe-button--dropdown-wrapper>.vxe-button.type--text{padding:2px 8px}.vxe-button--dropdown-wrapper>.vxe-button:first-child{margin-top:0}.vxe-button--dropdown-wrapper>.vxe-button:last-child{margin-bottom:0}
|
|
1
|
+
.vxe-button{position:relative;text-align:center;background-color:var(--vxe-button-default-background-color);outline:0;font-size:var(--vxe-font-size);max-width:var(--vxe-button-max-width);line-height:1.5;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;white-space:nowrap;-webkit-user-select:none;-moz-user-select:none;user-select:none;-webkit-appearance:none;-moz-appearance:none;appearance:none;transition:border .2s ease-in-out}.vxe-button:not(.is--disabled){color:var(--vxe-font-color);cursor:pointer}.vxe-button.is--loading{cursor:progress}.vxe-button.is--loading:before{content:"";position:absolute;left:-1px;top:-1px;right:-1px;bottom:-1px;border-radius:inherit;background-color:hsla(0deg,0%,100%,.35);pointer-events:none}.vxe-button.is--disabled{color:var(--vxe-font-disabled-color)}.vxe-button.is--disabled:not(.is--loading){cursor:no-drop}.vxe-button.type--text{text-decoration:none;border:0;padding:.1em .5em;background-color:transparent}.vxe-button.type--text:not(.is--disabled):focus{color:var(--vxe-font-darken-color)}.vxe-button.type--text:not(.is--disabled):hover{color:var(--vxe-primary-lighten-color)}.vxe-button.type--text.theme--primary{color:var(--vxe-primary-color)}.vxe-button.type--text.theme--primary:not(.is--disabled):focus{color:var(--vxe-primary-darken-color)}.vxe-button.type--text.theme--primary:not(.is--disabled):hover{color:var(--vxe-primary-lighten-color)}.vxe-button.type--text.theme--primary.is--disabled{color:var(--vxe-primary-disabled-color)}.vxe-button.type--text.theme--success{color:var(--vxe-success-color)}.vxe-button.type--text.theme--success:not(.is--disabled):focus{color:var(--vxe-success-darken-color)}.vxe-button.type--text.theme--success:not(.is--disabled):hover{color:var(--vxe-success-lighten-color)}.vxe-button.type--text.theme--success.is--disabled{color:var(--vxe-success-disabled-color)}.vxe-button.type--text.theme--info{color:var(--vxe-info-color)}.vxe-button.type--text.theme--info:not(.is--disabled):focus{color:var(--vxe-info-darken-color)}.vxe-button.type--text.theme--info:not(.is--disabled):hover{color:var(--vxe-info-lighten-color)}.vxe-button.type--text.theme--info.is--disabled{color:var(--vxe-info-disabled-color)}.vxe-button.type--text.theme--warning{color:var(--vxe-warning-color)}.vxe-button.type--text.theme--warning:not(.is--disabled):focus{color:var(--vxe-warning-darken-color)}.vxe-button.type--text.theme--warning:not(.is--disabled):hover{color:var(--vxe-warning-lighten-color)}.vxe-button.type--text.theme--warning.is--disabled{color:var(--vxe-warning-disabled-color)}.vxe-button.type--text.theme--danger{color:var(--vxe-danger-color)}.vxe-button.type--text.theme--danger:not(.is--disabled):focus{color:var(--vxe-danger-darken-color)}.vxe-button.type--text.theme--danger:not(.is--disabled):hover{color:var(--vxe-danger-lighten-color)}.vxe-button.type--text.theme--danger.is--disabled{color:var(--vxe-danger-disabled-color)}.vxe-button.type--text.theme--perfect{color:var(--vxe-table-header-background-color)}.vxe-button.type--text.theme--perfect:not(.is--disabled):focus{color:var(--vxe-table-header-background-color)}.vxe-button.type--text.theme--perfect:not(.is--disabled):hover{color:var(--vxe-table-header-background-color)}.vxe-button.type--text.theme--perfect.is--disabled{color:var(--vxe-table-header-background-color)}.vxe-button.type--button{font-family:inherit;height:var(--vxe-button-height-default);line-height:1;border:1px solid var(--vxe-input-border-color)}.vxe-button.type--button.is--round{border-radius:var(--vxe-button-round-border-radius-default)}.vxe-button.type--button:not(.is--round){border-radius:var(--vxe-border-radius)}.vxe-button.type--button.is--circle{padding:0 .5em;min-width:var(--vxe-button-height-default);border-radius:50%}.vxe-button.type--button:not(.is--circle){padding:0 1em}.vxe-button.type--button:not(.is--disabled):hover{color:var(--vxe-primary-lighten-color)}.vxe-button.type--button:not(.is--disabled):focus{border-color:var(--vxe-primary-color)}.vxe-button.type--button:not(.is--disabled):active{color:var(--vxe-primary-darken-color);border-color:var(--vxe-primary-darken-color);background-color:var(--vxe-button-default-background-color)}.vxe-button.type--button.theme--primary{color:#fff}.vxe-button.type--button.theme--primary:not(.is--disabled){border-color:var(--vxe-primary-color);background-color:var(--vxe-primary-color)}.vxe-button.type--button.theme--primary:not(.is--disabled):hover{color:#fff;background-color:var(--vxe-primary-lighten-color);border-color:var(--vxe-primary-lighten-color)}.vxe-button.type--button.theme--primary:not(.is--disabled):active{color:#fff;background-color:var(--vxe-primary-darken-color);border-color:var(--vxe-primary-darken-color)}.vxe-button.type--button.theme--primary.is--disabled{border-color:var(--vxe-primary-disabled-color);background-color:var(--vxe-primary-disabled-color)}.vxe-button.type--button.theme--primary.is--loading{border-color:var(--vxe-primary-color);background-color:var(--vxe-primary-color)}.vxe-button.type--button.theme--success{color:#fff}.vxe-button.type--button.theme--success:not(.is--disabled){border-color:var(--vxe-success-color);background-color:var(--vxe-success-color)}.vxe-button.type--button.theme--success:not(.is--disabled):hover{color:#fff;background-color:var(--vxe-success-lighten-color);border-color:var(--vxe-success-lighten-color)}.vxe-button.type--button.theme--success:not(.is--disabled):active{color:#fff;background-color:var(--vxe-success-darken-color);border-color:var(--vxe-success-darken-color)}.vxe-button.type--button.theme--success.is--disabled{border-color:var(--vxe-success-disabled-color);background-color:var(--vxe-success-disabled-color)}.vxe-button.type--button.theme--success.is--loading{border-color:var(--vxe-success-color);background-color:var(--vxe-success-color)}.vxe-button.type--button.theme--info{color:#fff}.vxe-button.type--button.theme--info:not(.is--disabled){border-color:var(--vxe-info-color);background-color:var(--vxe-info-color)}.vxe-button.type--button.theme--info:not(.is--disabled):hover{color:#fff;background-color:var(--vxe-info-lighten-color);border-color:var(--vxe-info-lighten-color)}.vxe-button.type--button.theme--info:not(.is--disabled):active{color:#fff;background-color:var(--vxe-info-darken-color);border-color:var(--vxe-info-darken-color)}.vxe-button.type--button.theme--info.is--disabled{border-color:var(--vxe-info-disabled-color);background-color:var(--vxe-info-disabled-color)}.vxe-button.type--button.theme--info.is--loading{border-color:var(--vxe-info-color);background-color:var(--vxe-info-color)}.vxe-button.type--button.theme--warning{color:#fff}.vxe-button.type--button.theme--warning:not(.is--disabled){border-color:var(--vxe-warning-color);background-color:var(--vxe-warning-color)}.vxe-button.type--button.theme--warning:not(.is--disabled):hover{color:#fff;background-color:var(--vxe-warning-lighten-color);border-color:var(--vxe-warning-lighten-color)}.vxe-button.type--button.theme--warning:not(.is--disabled):active{color:#fff;background-color:var(--vxe-warning-darken-color);border-color:var(--vxe-warning-darken-color)}.vxe-button.type--button.theme--warning.is--disabled{border-color:var(--vxe-warning-disabled-color);background-color:var(--vxe-warning-disabled-color)}.vxe-button.type--button.theme--warning.is--loading{border-color:var(--vxe-warning-color);background-color:var(--vxe-warning-color)}.vxe-button.type--button.theme--danger{color:#fff}.vxe-button.type--button.theme--danger:not(.is--disabled){border-color:var(--vxe-danger-color);background-color:var(--vxe-danger-color)}.vxe-button.type--button.theme--danger:not(.is--disabled):hover{color:#fff;background-color:var(--vxe-danger-lighten-color);border-color:var(--vxe-danger-lighten-color)}.vxe-button.type--button.theme--danger:not(.is--disabled):active{color:#fff;background-color:var(--vxe-danger-darken-color);border-color:var(--vxe-danger-darken-color)}.vxe-button.type--button.theme--danger.is--disabled{border-color:var(--vxe-danger-disabled-color);background-color:var(--vxe-danger-disabled-color)}.vxe-button.type--button.theme--danger.is--loading{border-color:var(--vxe-danger-color);background-color:var(--vxe-danger-color)}.vxe-button.type--button.theme--perfect{color:var(--vxe-font-color)}.vxe-button.type--button.theme--perfect:not(.is--disabled){border-color:var(--vxe-table-header-background-color);background-color:var(--vxe-table-header-background-color)}.vxe-button.type--button.theme--perfect:not(.is--disabled):hover{color:var(--vxe-font-color);background-color:var(--vxe-table-header-background-color);border-color:var(--vxe-table-header-background-color)}.vxe-button.type--button.theme--perfect:not(.is--disabled):active{color:var(--vxe-font-color);background-color:var(--vxe-table-header-background-color);border-color:var(--vxe-table-header-background-color)}.vxe-button.type--button.theme--perfect.is--disabled{border-color:var(--vxe-table-header-background-color);background-color:var(--vxe-table-header-background-color)}.vxe-button.type--button.theme--perfect.is--loading{border-color:var(--vxe-table-header-background-color);background-color:var(--vxe-table-header-background-color)}.vxe-button.size--medium{font-size:var(--vxe-font-size-medium)}.vxe-button.size--medium.type--button{height:var(--vxe-button-height-medium)}.vxe-button.size--medium.type--button.is--circle{min-width:var(--vxe-button-height-medium)}.vxe-button.size--medium.type--button.is--round{border-radius:var(--vxe-button-round-border-radius-medium)}.vxe-button.size--medium .vxe-button--icon,.vxe-button.size--medium .vxe-button--loading-icon{min-width:var(--vxe-font-size-medium)}.vxe-button.size--small{font-size:var(--vxe-font-size-small)}.vxe-button.size--small.type--button{height:var(--vxe-button-height-small)}.vxe-button.size--small.type--button.is--circle{min-width:var(--vxe-button-height-small)}.vxe-button.size--small.type--button.is--round{border-radius:var(--vxe-button-round-border-radius-small)}.vxe-button.size--small .vxe-button--icon,.vxe-button.size--small .vxe-button--loading-icon{min-width:var(--vxe-font-size-small)}.vxe-button.size--mini{font-size:var(--vxe-font-size-mini)}.vxe-button.size--mini.type--button{height:var(--vxe-button-height-mini)}.vxe-button.size--mini.type--button.is--circle{min-width:var(--vxe-button-height-mini)}.vxe-button.size--mini.type--button.is--round{border-radius:var(--vxe-button-round-border-radius-mini)}.vxe-button.size--mini .vxe-button--icon,.vxe-button.size--mini .vxe-button--loading-icon{min-width:var(--vxe-font-size-mini)}.vxe-button+.vxe-button--dropdown,.vxe-button+.vxe-button.type--button,.vxe-input+.vxe-button--dropdown,.vxe-input+.vxe-button.type--button{margin-left:12px}.vxe-button--icon,.vxe-button--loading-icon{min-width:var(--vxe-font-size)}.vxe-button--icon+.vxe-button--content,.vxe-button--loading-icon+.vxe-button--content{margin-left:4px}.vxe-button--dropdown,.vxe-button--wrapper{display:inline-block}.vxe-button--dropdown{position:relative}.vxe-button--dropdown+.vxe-button--dropdown,.vxe-button--dropdown+.vxe-button.type--button{margin-left:12px}.vxe-button--dropdown>.vxe-button.type--button.theme--primary{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--success{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--info{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--warning{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--danger{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--perfect{color:var(--vxe-font-color)}.vxe-button--dropdown.is--active>.vxe-button:not(.is--disabled){color:var(--vxe-primary-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--primary{color:var(--vxe-primary-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--success{color:var(--vxe-success-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--info{color:var(--vxe-info-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--warning{color:var(--vxe-warning-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--danger{color:var(--vxe-danger-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--perfect{color:var(--vxe-table-header-background-color)}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--primary{color:#fff;background-color:var(--vxe-primary-lighten-color);border-color:var(--vxe-primary-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--success{color:#fff;background-color:var(--vxe-success-lighten-color);border-color:var(--vxe-success-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--info{color:#fff;background-color:var(--vxe-info-lighten-color);border-color:var(--vxe-info-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--warning{color:#fff;background-color:var(--vxe-warning-lighten-color);border-color:var(--vxe-warning-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--danger{color:#fff;background-color:var(--vxe-danger-lighten-color);border-color:var(--vxe-danger-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--perfect{color:var(--vxe-font-color);background-color:var(--vxe-table-header-background-color);border-color:var(--vxe-table-header-background-color)}.vxe-button--dropdown.is--active .vxe-button--dropdown-arrow{transform:rotate(180deg)}.vxe-button--dropdown-arrow{display:inline-block;font-size:12px;margin-left:4px;transition:transform .2s ease-in-out}.vxe-button--dropdown-panel{display:none;position:absolute;right:0;padding:4px 0}.vxe-button--dropdown-panel.animat--leave{display:block;opacity:0;transform:scaleY(.5);transition:transform .3s cubic-bezier(.23,1,.32,1),opacity .3s cubic-bezier(.23,1,.32,1);transform-origin:center top;backface-visibility:hidden;transform-style:preserve-3d}.vxe-button--dropdown-panel.animat--leave[placement=top]{transform-origin:center bottom}.vxe-button--dropdown-panel.animat--enter{opacity:1;transform:scaleY(1)}.vxe-button--dropdown-wrapper{padding:5px;background-color:var(--vxe-button-dropdown-panel-background-color);border-radius:var(--vxe-border-radius);border:1px solid var(--vxe-input-border-color);box-shadow:0 1px 6px rgba(0,0,0,.2)}.vxe-button--dropdown-wrapper>.vxe-button.type--button,.vxe-button--dropdown-wrapper>.vxe-button.type--text{display:block;width:100%;border:0;margin:.4em 0 0 0}.vxe-button--dropdown-wrapper>.vxe-button.type--text{padding:2px 8px}.vxe-button--dropdown-wrapper>.vxe-button:first-child{margin-top:0}.vxe-button--dropdown-wrapper>.vxe-button:last-child{margin-bottom:0}
|
package/lib/export/src/hook.js
CHANGED
|
@@ -959,7 +959,7 @@ var tableExportHook = {
|
|
|
959
959
|
type = _a.type,
|
|
960
960
|
filename = _a.filename;
|
|
961
961
|
// 检查类型,如果为自定义导出,则不需要校验类型
|
|
962
|
-
if (!importMethod && !_xeUtils.default.includes(_vXETable.VXETable.
|
|
962
|
+
if (!importMethod && !_xeUtils.default.includes(_vXETable.VXETable.globalConfs.importTypes, type)) {
|
|
963
963
|
if (opts.message !== false) {
|
|
964
964
|
// 检测弹窗模块
|
|
965
965
|
if (process.env.NODE_ENV === 'development') {
|
|
@@ -1087,7 +1087,7 @@ var tableExportHook = {
|
|
|
1087
1087
|
isHeader: showHeader,
|
|
1088
1088
|
isFooter: showFooter
|
|
1089
1089
|
}, options);
|
|
1090
|
-
var types = defOpts.types || _vXETable.VXETable.
|
|
1090
|
+
var types = defOpts.types || _vXETable.VXETable.globalConfs.exportTypes;
|
|
1091
1091
|
var modes = defOpts.modes;
|
|
1092
1092
|
var checkMethod = customOpts.checkMethod;
|
|
1093
1093
|
var exportColumns = collectColumn.slice(0);
|
|
@@ -1292,7 +1292,7 @@ var tableExportHook = {
|
|
|
1292
1292
|
opts.sheetName = document.title;
|
|
1293
1293
|
}
|
|
1294
1294
|
// 检查类型,如果为自定义导出,则不需要校验类型
|
|
1295
|
-
if (!opts.exportMethod && !_xeUtils.default.includes(_vXETable.VXETable.
|
|
1295
|
+
if (!opts.exportMethod && !_xeUtils.default.includes(_vXETable.VXETable.globalConfs.exportTypes, type)) {
|
|
1296
1296
|
if (process.env.NODE_ENV === 'development') {
|
|
1297
1297
|
(0, _log.errLog)('vxe.error.notType', [type]);
|
|
1298
1298
|
}
|
|
@@ -1384,7 +1384,7 @@ var tableExportHook = {
|
|
|
1384
1384
|
importData: function (options) {
|
|
1385
1385
|
var importOpts = computeImportOpts.value;
|
|
1386
1386
|
var opts = Object.assign({
|
|
1387
|
-
types: _vXETable.VXETable.
|
|
1387
|
+
types: _vXETable.VXETable.globalConfs.importTypes
|
|
1388
1388
|
// beforeImportMethod: null,
|
|
1389
1389
|
// afterImportMethod: null
|
|
1390
1390
|
}, importOpts, options);
|
|
@@ -1451,7 +1451,7 @@ var tableExportHook = {
|
|
|
1451
1451
|
var defOpts = Object.assign({
|
|
1452
1452
|
mode: 'insert',
|
|
1453
1453
|
message: true,
|
|
1454
|
-
types: _vXETable.VXETable.
|
|
1454
|
+
types: _vXETable.VXETable.globalConfs.importTypes
|
|
1455
1455
|
}, options, importOpts);
|
|
1456
1456
|
var types = defOpts.types;
|
|
1457
1457
|
var isTree = !!treeConfig;
|