vxe-table 4.17.24 → 4.17.26
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/index.css +1 -1
- package/es/index.min.css +1 -1
- package/es/style.css +1 -1
- package/es/style.min.css +1 -1
- package/es/toolbar/src/toolbar.js +26 -20
- package/es/toolbar/style.css +20 -4
- package/es/toolbar/style.min.css +1 -1
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/es/vxe-toolbar/style.css +20 -4
- package/es/vxe-toolbar/style.min.css +1 -1
- package/lib/index.css +1 -1
- package/lib/index.min.css +1 -1
- package/lib/index.umd.js +50 -52
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/style.min.css +1 -1
- package/lib/toolbar/src/toolbar.js +48 -50
- package/lib/toolbar/src/toolbar.min.js +1 -1
- package/lib/toolbar/style/style.css +20 -4
- package/lib/toolbar/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-toolbar/style/style.css +20 -4
- package/lib/vxe-toolbar/style/style.min.css +1 -1
- package/package.json +2 -3
- package/packages/table/src/table.ts +1 -1
- package/packages/toolbar/src/toolbar.ts +26 -20
- package/styles/components/toolbar.scss +20 -4
- /package/es/{iconfont.1764729060815.ttf → iconfont.1764834414498.ttf} +0 -0
- /package/es/{iconfont.1764729060815.woff → iconfont.1764834414498.woff} +0 -0
- /package/es/{iconfont.1764729060815.woff2 → iconfont.1764834414498.woff2} +0 -0
- /package/lib/{iconfont.1764729060815.ttf → iconfont.1764834414498.ttf} +0 -0
- /package/lib/{iconfont.1764729060815.woff → iconfont.1764834414498.woff} +0 -0
- /package/lib/{iconfont.1764729060815.woff2 → iconfont.1764834414498.woff2} +0 -0
|
@@ -357,12 +357,10 @@ export default defineVxeComponent({
|
|
|
357
357
|
const { buttons } = props;
|
|
358
358
|
const { connectTable } = internalData;
|
|
359
359
|
const $table = connectTable;
|
|
360
|
+
const buttonsSlot = slots.buttons;
|
|
360
361
|
const buttonPrefixSlot = slots.buttonPrefix || slots['button-prefix'];
|
|
361
362
|
const buttonSuffixSlot = slots.buttonSuffix || slots['button-suffix'];
|
|
362
363
|
const btnVNs = [];
|
|
363
|
-
if (buttonPrefixSlot) {
|
|
364
|
-
btnVNs.push(...getSlotVNs(buttonPrefixSlot({ buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })));
|
|
365
|
-
}
|
|
366
364
|
if (buttons) {
|
|
367
365
|
buttons.forEach((item, index) => {
|
|
368
366
|
const { dropdowns, buttonRender } = item;
|
|
@@ -391,10 +389,17 @@ export default defineVxeComponent({
|
|
|
391
389
|
}
|
|
392
390
|
});
|
|
393
391
|
}
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
392
|
+
return [
|
|
393
|
+
h('div', {
|
|
394
|
+
class: 'vxe-button--prefix-wrapper'
|
|
395
|
+
}, buttonPrefixSlot ? getSlotVNs(buttonPrefixSlot({ buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })) : []),
|
|
396
|
+
h('div', {
|
|
397
|
+
class: 'vxe-button--item-wrapper'
|
|
398
|
+
}, buttonsSlot ? getSlotVNs(buttonsSlot({ buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })) : btnVNs),
|
|
399
|
+
h('div', {
|
|
400
|
+
class: 'vxe-button--suffix-wrapper'
|
|
401
|
+
}, buttonSuffixSlot ? getSlotVNs(buttonSuffixSlot({ buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })) : [])
|
|
402
|
+
];
|
|
398
403
|
};
|
|
399
404
|
/**
|
|
400
405
|
* 渲染右侧工具
|
|
@@ -403,12 +408,10 @@ export default defineVxeComponent({
|
|
|
403
408
|
const { tools } = props;
|
|
404
409
|
const { connectTable } = internalData;
|
|
405
410
|
const $table = connectTable;
|
|
411
|
+
const toolsSlot = slots.tools;
|
|
406
412
|
const toolPrefixSlot = slots.toolPrefix || slots['tool-prefix'];
|
|
407
413
|
const toolSuffixSlot = slots.toolSuffix || slots['tool-suffix'];
|
|
408
414
|
const btnVNs = [];
|
|
409
|
-
if (toolPrefixSlot) {
|
|
410
|
-
btnVNs.push(...getSlotVNs(toolPrefixSlot({ tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })));
|
|
411
|
-
}
|
|
412
415
|
if (tools) {
|
|
413
416
|
tools.forEach((item, tIndex) => {
|
|
414
417
|
const { dropdowns, toolRender } = item;
|
|
@@ -438,10 +441,17 @@ export default defineVxeComponent({
|
|
|
438
441
|
}
|
|
439
442
|
});
|
|
440
443
|
}
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
444
|
+
return [
|
|
445
|
+
h('div', {
|
|
446
|
+
class: 'vxe-tool--prefix-wrapper'
|
|
447
|
+
}, toolPrefixSlot ? getSlotVNs(toolPrefixSlot({ tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })) : []),
|
|
448
|
+
h('div', {
|
|
449
|
+
class: 'vxe-tool--item-wrapper'
|
|
450
|
+
}, toolsSlot ? getSlotVNs(toolsSlot({ tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })) : btnVNs),
|
|
451
|
+
h('div', {
|
|
452
|
+
class: 'vxe-tool--suffix-wrapper'
|
|
453
|
+
}, toolSuffixSlot ? getSlotVNs(toolSuffixSlot({ tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })) : [])
|
|
454
|
+
];
|
|
445
455
|
};
|
|
446
456
|
const renderToolImport = () => {
|
|
447
457
|
const importOpts = computeImportOpts.value;
|
|
@@ -525,11 +535,7 @@ export default defineVxeComponent({
|
|
|
525
535
|
};
|
|
526
536
|
const renderVN = () => {
|
|
527
537
|
const { perfect, loading, refresh, zoom, custom, className } = props;
|
|
528
|
-
const { connectTable } = internalData;
|
|
529
538
|
const vSize = computeSize.value;
|
|
530
|
-
const toolsSlot = slots.tools;
|
|
531
|
-
const buttonsSlot = slots.buttons;
|
|
532
|
-
const $table = connectTable;
|
|
533
539
|
return h('div', {
|
|
534
540
|
ref: refElem,
|
|
535
541
|
class: ['vxe-toolbar', className ? (XEUtils.isFunction(className) ? className({ $toolbar: $xeToolbar }) : className) : '', {
|
|
@@ -540,10 +546,10 @@ export default defineVxeComponent({
|
|
|
540
546
|
}, [
|
|
541
547
|
h('div', {
|
|
542
548
|
class: 'vxe-buttons--wrapper'
|
|
543
|
-
},
|
|
549
|
+
}, renderLeftBtns()),
|
|
544
550
|
h('div', {
|
|
545
551
|
class: 'vxe-tools--wrapper'
|
|
546
|
-
},
|
|
552
|
+
}, renderRightTools()),
|
|
547
553
|
h('div', {
|
|
548
554
|
class: 'vxe-tools--operate'
|
|
549
555
|
}, [
|
package/es/toolbar/style.css
CHANGED
|
@@ -61,10 +61,6 @@
|
|
|
61
61
|
display: flex;
|
|
62
62
|
align-items: center;
|
|
63
63
|
}
|
|
64
|
-
.vxe-toolbar .vxe-buttons--wrapper,
|
|
65
|
-
.vxe-toolbar .vxe-tools--wrapper {
|
|
66
|
-
flex-wrap: wrap;
|
|
67
|
-
}
|
|
68
64
|
.vxe-toolbar .vxe-tools--operate {
|
|
69
65
|
flex-shrink: 0;
|
|
70
66
|
}
|
|
@@ -75,6 +71,26 @@
|
|
|
75
71
|
background-color: var(--vxe-ui-toolbar-custom-active-background-color);
|
|
76
72
|
border-radius: 50%;
|
|
77
73
|
}
|
|
74
|
+
.vxe-toolbar .vxe-button--item-wrapper,
|
|
75
|
+
.vxe-toolbar .vxe-tool--item-wrapper {
|
|
76
|
+
flex-grow: 1;
|
|
77
|
+
}
|
|
78
|
+
.vxe-toolbar .vxe-button--prefix-wrapper,
|
|
79
|
+
.vxe-toolbar .vxe-button--suffix-wrapper,
|
|
80
|
+
.vxe-toolbar .vxe-tool--prefix-wrapper,
|
|
81
|
+
.vxe-toolbar .vxe-tool--suffix-wrapper {
|
|
82
|
+
flex-shrink: 0;
|
|
83
|
+
}
|
|
84
|
+
.vxe-toolbar .vxe-button--item-wrapper,
|
|
85
|
+
.vxe-toolbar .vxe-tool--item-wrapper,
|
|
86
|
+
.vxe-toolbar .vxe-button--prefix-wrapper,
|
|
87
|
+
.vxe-toolbar .vxe-button--suffix-wrapper,
|
|
88
|
+
.vxe-toolbar .vxe-tool--prefix-wrapper,
|
|
89
|
+
.vxe-toolbar .vxe-tool--suffix-wrapper {
|
|
90
|
+
display: flex;
|
|
91
|
+
align-items: center;
|
|
92
|
+
flex-wrap: wrap;
|
|
93
|
+
}
|
|
78
94
|
|
|
79
95
|
.vxe-toolbar {
|
|
80
96
|
font-size: var(--vxe-ui-font-size-default);
|
package/es/toolbar/style.min.css
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
.vxe-toolbar{position:relative;display:flex;flex-direction:row;align-items:center;padding:.6em 0;color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);background-color:var(--vxe-ui-layout-background-color)}.vxe-toolbar:after{content:"";display:block;clear:both;height:0;overflow:hidden;visibility:hidden}.vxe-toolbar.is--perfect{border:1px solid var(--vxe-ui-table-border-color);border-bottom-width:0;background-color:var(--vxe-ui-table-header-background-color)}.vxe-toolbar.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:999;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:var(--vxe-ui-loading-background-color)}.vxe-toolbar .vxe-buttons--wrapper{flex-grow:1}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button+.vxe-button--item,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button--item{margin-left:.8em}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button+.vxe-tool--item,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-button,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-tool--item{margin-left:.8em}.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button{display:flex;align-items:center;justify-content:center}.vxe-toolbar .vxe-buttons--wrapper,.vxe-toolbar .vxe-tools--operate,.vxe-toolbar .vxe-tools--wrapper{display:flex;align-items:center}.vxe-toolbar .vxe-
|
|
1
|
+
.vxe-toolbar{position:relative;display:flex;flex-direction:row;align-items:center;padding:.6em 0;color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);background-color:var(--vxe-ui-layout-background-color)}.vxe-toolbar:after{content:"";display:block;clear:both;height:0;overflow:hidden;visibility:hidden}.vxe-toolbar.is--perfect{border:1px solid var(--vxe-ui-table-border-color);border-bottom-width:0;background-color:var(--vxe-ui-table-header-background-color)}.vxe-toolbar.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:999;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:var(--vxe-ui-loading-background-color)}.vxe-toolbar .vxe-buttons--wrapper{flex-grow:1}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button+.vxe-button--item,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button--item{margin-left:.8em}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button+.vxe-tool--item,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-button,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-tool--item{margin-left:.8em}.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button{display:flex;align-items:center;justify-content:center}.vxe-toolbar .vxe-buttons--wrapper,.vxe-toolbar .vxe-tools--operate,.vxe-toolbar .vxe-tools--wrapper{display:flex;align-items:center}.vxe-toolbar .vxe-tools--operate{flex-shrink:0}.vxe-toolbar .vxe-custom--wrapper{position:relative}.vxe-toolbar .vxe-custom--wrapper.is--active>.vxe-button{background-color:var(--vxe-ui-toolbar-custom-active-background-color);border-radius:50%}.vxe-toolbar .vxe-button--item-wrapper,.vxe-toolbar .vxe-tool--item-wrapper{flex-grow:1}.vxe-toolbar .vxe-button--prefix-wrapper,.vxe-toolbar .vxe-button--suffix-wrapper,.vxe-toolbar .vxe-tool--prefix-wrapper,.vxe-toolbar .vxe-tool--suffix-wrapper{flex-shrink:0}.vxe-toolbar .vxe-button--item-wrapper,.vxe-toolbar .vxe-button--prefix-wrapper,.vxe-toolbar .vxe-button--suffix-wrapper,.vxe-toolbar .vxe-tool--item-wrapper,.vxe-toolbar .vxe-tool--prefix-wrapper,.vxe-toolbar .vxe-tool--suffix-wrapper{display:flex;align-items:center;flex-wrap:wrap}.vxe-toolbar{font-size:var(--vxe-ui-font-size-default)}.vxe-toolbar.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-toolbar.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-toolbar.size--mini{font-size:var(--vxe-ui-font-size-mini)}
|
package/es/ui/index.js
CHANGED
package/es/ui/src/log.js
CHANGED
package/es/vxe-toolbar/style.css
CHANGED
|
@@ -61,10 +61,6 @@
|
|
|
61
61
|
display: flex;
|
|
62
62
|
align-items: center;
|
|
63
63
|
}
|
|
64
|
-
.vxe-toolbar .vxe-buttons--wrapper,
|
|
65
|
-
.vxe-toolbar .vxe-tools--wrapper {
|
|
66
|
-
flex-wrap: wrap;
|
|
67
|
-
}
|
|
68
64
|
.vxe-toolbar .vxe-tools--operate {
|
|
69
65
|
flex-shrink: 0;
|
|
70
66
|
}
|
|
@@ -75,6 +71,26 @@
|
|
|
75
71
|
background-color: var(--vxe-ui-toolbar-custom-active-background-color);
|
|
76
72
|
border-radius: 50%;
|
|
77
73
|
}
|
|
74
|
+
.vxe-toolbar .vxe-button--item-wrapper,
|
|
75
|
+
.vxe-toolbar .vxe-tool--item-wrapper {
|
|
76
|
+
flex-grow: 1;
|
|
77
|
+
}
|
|
78
|
+
.vxe-toolbar .vxe-button--prefix-wrapper,
|
|
79
|
+
.vxe-toolbar .vxe-button--suffix-wrapper,
|
|
80
|
+
.vxe-toolbar .vxe-tool--prefix-wrapper,
|
|
81
|
+
.vxe-toolbar .vxe-tool--suffix-wrapper {
|
|
82
|
+
flex-shrink: 0;
|
|
83
|
+
}
|
|
84
|
+
.vxe-toolbar .vxe-button--item-wrapper,
|
|
85
|
+
.vxe-toolbar .vxe-tool--item-wrapper,
|
|
86
|
+
.vxe-toolbar .vxe-button--prefix-wrapper,
|
|
87
|
+
.vxe-toolbar .vxe-button--suffix-wrapper,
|
|
88
|
+
.vxe-toolbar .vxe-tool--prefix-wrapper,
|
|
89
|
+
.vxe-toolbar .vxe-tool--suffix-wrapper {
|
|
90
|
+
display: flex;
|
|
91
|
+
align-items: center;
|
|
92
|
+
flex-wrap: wrap;
|
|
93
|
+
}
|
|
78
94
|
|
|
79
95
|
.vxe-toolbar {
|
|
80
96
|
font-size: var(--vxe-ui-font-size-default);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
.vxe-toolbar{position:relative;display:flex;flex-direction:row;align-items:center;padding:.6em 0;color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);background-color:var(--vxe-ui-layout-background-color)}.vxe-toolbar:after{content:"";display:block;clear:both;height:0;overflow:hidden;visibility:hidden}.vxe-toolbar.is--perfect{border:1px solid var(--vxe-ui-table-border-color);border-bottom-width:0;background-color:var(--vxe-ui-table-header-background-color)}.vxe-toolbar.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:999;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:var(--vxe-ui-loading-background-color)}.vxe-toolbar .vxe-buttons--wrapper{flex-grow:1}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button+.vxe-button--item,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button--item{margin-left:.8em}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button+.vxe-tool--item,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-button,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-tool--item{margin-left:.8em}.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button{display:flex;align-items:center;justify-content:center}.vxe-toolbar .vxe-buttons--wrapper,.vxe-toolbar .vxe-tools--operate,.vxe-toolbar .vxe-tools--wrapper{display:flex;align-items:center}.vxe-toolbar .vxe-
|
|
1
|
+
.vxe-toolbar{position:relative;display:flex;flex-direction:row;align-items:center;padding:.6em 0;color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);background-color:var(--vxe-ui-layout-background-color)}.vxe-toolbar:after{content:"";display:block;clear:both;height:0;overflow:hidden;visibility:hidden}.vxe-toolbar.is--perfect{border:1px solid var(--vxe-ui-table-border-color);border-bottom-width:0;background-color:var(--vxe-ui-table-header-background-color)}.vxe-toolbar.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:999;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:var(--vxe-ui-loading-background-color)}.vxe-toolbar .vxe-buttons--wrapper{flex-grow:1}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button+.vxe-button--item,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button--item{margin-left:.8em}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button+.vxe-tool--item,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-button,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-tool--item{margin-left:.8em}.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button{display:flex;align-items:center;justify-content:center}.vxe-toolbar .vxe-buttons--wrapper,.vxe-toolbar .vxe-tools--operate,.vxe-toolbar .vxe-tools--wrapper{display:flex;align-items:center}.vxe-toolbar .vxe-tools--operate{flex-shrink:0}.vxe-toolbar .vxe-custom--wrapper{position:relative}.vxe-toolbar .vxe-custom--wrapper.is--active>.vxe-button{background-color:var(--vxe-ui-toolbar-custom-active-background-color);border-radius:50%}.vxe-toolbar .vxe-button--item-wrapper,.vxe-toolbar .vxe-tool--item-wrapper{flex-grow:1}.vxe-toolbar .vxe-button--prefix-wrapper,.vxe-toolbar .vxe-button--suffix-wrapper,.vxe-toolbar .vxe-tool--prefix-wrapper,.vxe-toolbar .vxe-tool--suffix-wrapper{flex-shrink:0}.vxe-toolbar .vxe-button--item-wrapper,.vxe-toolbar .vxe-button--prefix-wrapper,.vxe-toolbar .vxe-button--suffix-wrapper,.vxe-toolbar .vxe-tool--item-wrapper,.vxe-toolbar .vxe-tool--prefix-wrapper,.vxe-toolbar .vxe-tool--suffix-wrapper{display:flex;align-items:center;flex-wrap:wrap}.vxe-toolbar{font-size:var(--vxe-ui-font-size-default)}.vxe-toolbar.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-toolbar.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-toolbar.size--mini{font-size:var(--vxe-ui-font-size-mini)}
|