vxe-table 4.2.8 → 4.3.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/button/src/button.js +14 -14
- package/es/button/style.css +1 -58
- package/es/checkbox/src/checkbox.js +7 -4
- package/es/checkbox/style.css +37 -58
- package/es/edit/src/hook.js +29 -13
- package/es/export/src/export-panel.js +10 -20
- package/es/export/src/hook.js +45 -45
- package/es/export/src/import-panel.js +2 -2
- package/es/export/src/util.js +7 -7
- package/es/export/style.css +27 -82
- package/es/filter/src/hook.js +5 -5
- package/es/filter/src/panel.js +9 -17
- package/es/filter/style.css +27 -79
- package/es/footer/src/footer.js +15 -15
- package/es/form/src/form-config-item.js +8 -7
- package/es/form/src/form-item.js +8 -7
- package/es/form/src/form.js +8 -6
- package/es/form/style.css +0 -3
- package/es/grid/src/grid.js +18 -13
- package/es/grid/style.css +1 -1
- package/es/header/src/header.js +18 -18
- package/es/header/style.css +0 -95
- package/es/icon/style.css +379 -0
- package/es/input/src/input.js +26 -26
- package/es/input/style.css +13 -4
- package/es/keyboard/src/hook.js +7 -7
- package/es/list/src/list.js +5 -5
- package/es/loading/src/loading.js +1 -1
- package/es/menu/src/hooks.js +9 -9
- package/es/menu/src/panel.js +2 -2
- package/es/modal/src/modal.js +52 -51
- package/es/modal/style.css +2 -3
- package/es/pager/src/pager.js +3 -3
- package/es/pager/style.css +4 -2
- package/es/pulldown/src/pulldown.js +7 -7
- package/es/radio/src/button.js +1 -1
- package/es/radio/src/radio.js +5 -4
- package/es/radio/style.css +32 -55
- package/es/select/src/select.js +13 -12
- package/es/select/style.css +1 -0
- package/es/style.css +1 -1
- package/es/style.min.css +1 -1
- package/es/switch/src/switch.js +1 -1
- package/es/table/src/body.js +38 -34
- package/es/table/src/cell.js +16 -28
- package/es/table/src/columnInfo.js +4 -4
- package/es/table/src/table.js +65 -60
- package/es/table/src/util.js +2 -2
- package/es/table/style.css +160 -139
- package/es/textarea/src/textarea.js +5 -5
- package/es/toolbar/src/toolbar.js +17 -24
- package/es/toolbar/style.css +28 -80
- package/es/tools/dom.js +2 -2
- package/es/tools/log.js +1 -1
- package/es/tools/vn.js +7 -0
- package/es/tooltip/src/tooltip.js +22 -10
- package/es/v-x-e-table/index.js +1 -1
- package/es/v-x-e-table/src/conf.js +43 -38
- package/es/v-x-e-table/src/interceptor.js +1 -1
- package/es/v-x-e-table/src/renderer.js +19 -15
- package/es/v-x-e-table/style.css +405 -2
- package/lib/button/src/button.js +10 -10
- package/lib/button/src/button.min.js +1 -1
- package/lib/button/style/style.css +1 -58
- package/lib/button/style/style.min.css +1 -1
- package/lib/checkbox/src/checkbox.js +5 -3
- package/lib/checkbox/src/checkbox.min.js +1 -1
- package/lib/checkbox/style/style.css +37 -58
- package/lib/checkbox/style/style.min.css +1 -1
- package/lib/edit/src/hook.js +14 -13
- package/lib/edit/src/hook.min.js +1 -1
- package/lib/export/src/export-panel.js +11 -17
- package/lib/export/src/export-panel.min.js +1 -1
- package/lib/export/src/hook.js +50 -50
- package/lib/export/src/hook.min.js +1 -1
- package/lib/export/src/import-panel.js +3 -3
- package/lib/export/src/import-panel.min.js +1 -1
- package/lib/export/src/util.js +4 -4
- package/lib/export/src/util.min.js +1 -1
- package/lib/export/style/style.css +27 -82
- package/lib/export/style/style.min.css +1 -1
- package/lib/filter/src/hook.js +5 -5
- package/lib/filter/src/hook.min.js +1 -1
- package/lib/filter/src/panel.js +11 -15
- package/lib/filter/src/panel.min.js +1 -1
- package/lib/filter/style/style.css +27 -79
- package/lib/filter/style/style.min.css +1 -1
- package/lib/footer/src/footer.js +14 -14
- package/lib/footer/src/footer.min.js +1 -1
- package/lib/form/src/form-config-item.js +9 -7
- package/lib/form/src/form-config-item.min.js +1 -1
- package/lib/form/src/form-item.js +9 -7
- package/lib/form/src/form-item.min.js +1 -1
- package/lib/form/src/form.js +9 -6
- package/lib/form/src/form.min.js +1 -1
- package/lib/form/style/style.css +0 -3
- package/lib/form/style/style.min.css +1 -1
- package/lib/grid/src/grid.js +17 -13
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/grid/style/style.css +1 -1
- package/lib/grid/style/style.min.css +1 -1
- package/lib/header/src/header.js +17 -17
- package/lib/header/src/header.min.js +1 -1
- package/lib/header/style/style.css +0 -95
- package/lib/header/style/style.min.css +0 -1
- package/lib/icon/style/style.css +379 -0
- package/lib/icon/style/style.min.css +1 -1
- package/lib/index.umd.js +163 -159
- package/lib/index.umd.min.js +1 -1
- package/lib/input/src/input.js +23 -23
- package/lib/input/src/input.min.js +1 -1
- package/lib/input/style/style.css +13 -4
- package/lib/input/style/style.min.css +1 -1
- package/lib/keyboard/src/hook.js +7 -7
- package/lib/keyboard/src/hook.min.js +1 -1
- package/lib/list/src/list.js +5 -5
- package/lib/list/src/list.min.js +1 -1
- package/lib/loading/src/loading.js +1 -1
- package/lib/loading/src/loading.min.js +1 -1
- package/lib/menu/src/hooks.js +9 -9
- package/lib/menu/src/hooks.min.js +1 -1
- package/lib/menu/src/panel.js +2 -2
- package/lib/menu/src/panel.min.js +1 -1
- package/lib/modal/src/modal.js +55 -53
- package/lib/modal/src/modal.min.js +1 -1
- package/lib/modal/style/style.css +2 -3
- package/lib/modal/style/style.min.css +1 -1
- package/lib/pager/src/pager.js +2 -2
- package/lib/pager/src/pager.min.js +1 -1
- package/lib/pager/style/style.css +4 -2
- package/lib/pager/style/style.min.css +1 -1
- package/lib/pulldown/src/pulldown.js +7 -7
- package/lib/pulldown/src/pulldown.min.js +1 -1
- package/lib/radio/src/button.js +1 -1
- package/lib/radio/src/button.min.js +1 -1
- package/lib/radio/src/radio.js +4 -4
- package/lib/radio/src/radio.min.js +1 -1
- package/lib/radio/style/style.css +32 -55
- package/lib/radio/style/style.min.css +1 -1
- package/lib/select/src/select.js +14 -12
- package/lib/select/src/select.min.js +1 -1
- package/lib/select/style/style.css +1 -0
- package/lib/select/style/style.min.css +1 -1
- package/lib/style.css +1 -1
- package/lib/style.min.css +1 -1
- package/lib/switch/src/switch.js +1 -1
- package/lib/switch/src/switch.min.js +1 -1
- package/lib/table/src/body.js +36 -34
- package/lib/table/src/body.min.js +1 -1
- package/lib/table/src/cell.js +21 -29
- package/lib/table/src/cell.min.js +1 -1
- package/lib/table/src/columnInfo.js +4 -4
- package/lib/table/src/columnInfo.min.js +1 -1
- package/lib/table/src/table.js +65 -61
- package/lib/table/src/table.min.js +1 -1
- package/lib/table/src/util.js +2 -2
- package/lib/table/src/util.min.js +1 -1
- package/lib/table/style/style.css +160 -139
- package/lib/table/style/style.min.css +1 -1
- package/lib/textarea/src/textarea.js +6 -6
- package/lib/textarea/src/textarea.min.js +1 -1
- package/lib/toolbar/src/toolbar.js +20 -22
- package/lib/toolbar/src/toolbar.min.js +1 -1
- package/lib/toolbar/style/style.css +28 -80
- package/lib/toolbar/style/style.min.css +1 -1
- package/lib/tools/dom.js +2 -2
- package/lib/tools/dom.min.js +1 -1
- package/lib/tools/log.js +1 -1
- package/lib/tools/log.min.js +1 -1
- package/lib/tools/vn.js +13 -0
- package/lib/tools/vn.min.js +1 -1
- package/lib/tooltip/src/tooltip.js +22 -8
- package/lib/tooltip/src/tooltip.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 +43 -38
- package/lib/v-x-e-table/src/conf.min.js +1 -1
- package/lib/v-x-e-table/src/interceptor.js +1 -1
- package/lib/v-x-e-table/src/interceptor.min.js +1 -1
- package/lib/v-x-e-table/src/renderer.js +18 -16
- package/lib/v-x-e-table/src/renderer.min.js +1 -1
- package/lib/v-x-e-table/style/style.css +405 -2
- package/lib/v-x-e-table/style/style.min.css +1 -1
- package/package.json +6 -6
- package/packages/checkbox/src/checkbox.ts +7 -4
- package/packages/edit/src/hook.ts +18 -6
- package/packages/export/src/export-panel.ts +9 -19
- package/packages/filter/src/panel.ts +8 -16
- package/packages/form/src/form-config-item.ts +4 -3
- package/packages/form/src/form-item.ts +4 -3
- package/packages/form/src/form.ts +6 -4
- package/packages/grid/src/grid.ts +2 -1
- package/packages/input/src/input.ts +3 -3
- package/packages/modal/src/modal.ts +5 -4
- package/packages/radio/src/radio.ts +4 -3
- package/packages/select/src/select.ts +2 -1
- package/packages/table/src/cell.ts +18 -35
- package/packages/table/src/table.ts +11 -10
- package/packages/toolbar/src/toolbar.ts +14 -21
- package/packages/tools/vn.ts +10 -0
- package/packages/tooltip/src/tooltip.ts +8 -4
- package/packages/v-x-e-table/src/conf.ts +43 -38
- package/styles/base/checked.scss +44 -148
- package/styles/button.scss +1 -43
- package/styles/checkbox.scss +6 -65
- package/styles/export.scss +2 -9
- package/styles/filter.scss +2 -6
- package/styles/form.scss +0 -3
- package/styles/header.scss +0 -134
- package/styles/icon.scss +509 -713
- package/styles/input.scss +8 -0
- package/styles/modal.scss +0 -1
- package/styles/old-icon.scss +713 -0
- package/styles/pager.scss +2 -0
- package/styles/radio.scss +9 -77
- package/styles/select.scss +1 -0
- package/styles/table.scss +144 -21
- package/styles/toolbar.scss +2 -6
- package/styles/variable.scss +5 -5
- package/types/all.d.ts +6 -0
- package/types/column.d.ts +11 -11
- package/types/component.d.ts +3 -1
- package/types/form-item.d.ts +1 -0
- package/types/form.d.ts +6 -2
- package/types/grid.d.ts +4 -4
- package/types/table.d.ts +2 -2
- package/types/v-x-e-table/renderer.d.ts +3 -2
package/es/modal/src/modal.js
CHANGED
|
@@ -19,6 +19,7 @@ import { GlobalEvent, hasEventKey, EVENT_KEYS } from '../../tools/event';
|
|
|
19
19
|
import GlobalConfig from '../../v-x-e-table/src/conf';
|
|
20
20
|
import VxeButtonConstructor from '../../button/src/button';
|
|
21
21
|
import VxeLoading from '../../loading/index';
|
|
22
|
+
import { getSlotVNs } from '../../tools/vn';
|
|
22
23
|
export var allActivedModals = [];
|
|
23
24
|
export var msgQueue = [];
|
|
24
25
|
export default defineComponent({
|
|
@@ -117,8 +118,8 @@ export default defineComponent({
|
|
|
117
118
|
var recalculate = function () {
|
|
118
119
|
var width = props.width, height = props.height;
|
|
119
120
|
var boxElem = getBox();
|
|
120
|
-
boxElem.style.width = ""
|
|
121
|
-
boxElem.style.height = ""
|
|
121
|
+
boxElem.style.width = "".concat(width ? (isNaN(width) ? width : "".concat(width, "px")) : '');
|
|
122
|
+
boxElem.style.height = "".concat(height ? (isNaN(height) ? height : "".concat(height, "px")) : '');
|
|
122
123
|
return nextTick();
|
|
123
124
|
};
|
|
124
125
|
var updateZindex = function () {
|
|
@@ -145,16 +146,16 @@ export default defineComponent({
|
|
|
145
146
|
var posTop = '';
|
|
146
147
|
var posLeft = '';
|
|
147
148
|
if (left && !leftCenter) {
|
|
148
|
-
posLeft = isNaN(left) ? left : left
|
|
149
|
+
posLeft = isNaN(left) ? left : "".concat(left, "px");
|
|
149
150
|
}
|
|
150
151
|
else {
|
|
151
|
-
posLeft = Math.max(marginSize, clientVisibleWidth / 2 - boxElem.offsetWidth / 2)
|
|
152
|
+
posLeft = "".concat(Math.max(marginSize, clientVisibleWidth / 2 - boxElem.offsetWidth / 2), "px");
|
|
152
153
|
}
|
|
153
154
|
if (top && !topCenter) {
|
|
154
|
-
posTop = isNaN(top) ? top : top
|
|
155
|
+
posTop = isNaN(top) ? top : "".concat(top, "px");
|
|
155
156
|
}
|
|
156
157
|
else {
|
|
157
|
-
posTop = Math.max(marginSize, clientVisibleHeight / 2 - boxElem.offsetHeight / 2)
|
|
158
|
+
posTop = "".concat(Math.max(marginSize, clientVisibleHeight / 2 - boxElem.offsetHeight / 2), "px");
|
|
158
159
|
}
|
|
159
160
|
boxElem.style.top = posTop;
|
|
160
161
|
boxElem.style.left = posLeft;
|
|
@@ -236,16 +237,16 @@ export default defineComponent({
|
|
|
236
237
|
var boxElem = getBox();
|
|
237
238
|
var _a = posStorage.split(','), left = _a[0], top_1 = _a[1], width = _a[2], height = _a[3], zoomLeft = _a[4], zoomTop = _a[5], zoomWidth = _a[6], zoomHeight = _a[7];
|
|
238
239
|
if (left) {
|
|
239
|
-
boxElem.style.left = left
|
|
240
|
+
boxElem.style.left = "".concat(left, "px");
|
|
240
241
|
}
|
|
241
242
|
if (top_1) {
|
|
242
|
-
boxElem.style.top = top_1
|
|
243
|
+
boxElem.style.top = "".concat(top_1, "px");
|
|
243
244
|
}
|
|
244
245
|
if (width) {
|
|
245
|
-
boxElem.style.width = width
|
|
246
|
+
boxElem.style.width = "".concat(width, "px");
|
|
246
247
|
}
|
|
247
248
|
if (height) {
|
|
248
|
-
boxElem.style.height = height
|
|
249
|
+
boxElem.style.height = "".concat(height, "px");
|
|
249
250
|
}
|
|
250
251
|
if (zoomLeft && zoomTop) {
|
|
251
252
|
reactData.zoomLocat = {
|
|
@@ -297,10 +298,10 @@ export default defineComponent({
|
|
|
297
298
|
height: boxElem.offsetHeight + (boxElem.style.height ? 0 : 1)
|
|
298
299
|
};
|
|
299
300
|
Object.assign(boxElem.style, {
|
|
300
|
-
top: marginSize
|
|
301
|
-
left: marginSize
|
|
302
|
-
width: visibleWidth - marginSize * 2
|
|
303
|
-
height: visibleHeight - marginSize * 2
|
|
301
|
+
top: "".concat(marginSize, "px"),
|
|
302
|
+
left: "".concat(marginSize, "px"),
|
|
303
|
+
width: "".concat(visibleWidth - marginSize * 2, "px"),
|
|
304
|
+
height: "".concat(visibleHeight - marginSize * 2, "px")
|
|
304
305
|
});
|
|
305
306
|
savePosStorage();
|
|
306
307
|
}
|
|
@@ -403,10 +404,10 @@ export default defineComponent({
|
|
|
403
404
|
var boxElem = getBox();
|
|
404
405
|
reactData.zoomLocat = null;
|
|
405
406
|
Object.assign(boxElem.style, {
|
|
406
|
-
top: zoomLocat.top
|
|
407
|
-
left: zoomLocat.left
|
|
408
|
-
width: zoomLocat.width
|
|
409
|
-
height: zoomLocat.height
|
|
407
|
+
top: "".concat(zoomLocat.top, "px"),
|
|
408
|
+
left: "".concat(zoomLocat.left, "px"),
|
|
409
|
+
width: "".concat(zoomLocat.width, "px"),
|
|
410
|
+
height: "".concat(zoomLocat.height, "px")
|
|
410
411
|
});
|
|
411
412
|
savePosStorage();
|
|
412
413
|
}
|
|
@@ -443,10 +444,10 @@ export default defineComponent({
|
|
|
443
444
|
if (!isMsg) {
|
|
444
445
|
var boxElem = getBox();
|
|
445
446
|
if (XEUtils.isNumber(top)) {
|
|
446
|
-
boxElem.style.top = top
|
|
447
|
+
boxElem.style.top = "".concat(top, "px");
|
|
447
448
|
}
|
|
448
449
|
if (XEUtils.isNumber(left)) {
|
|
449
|
-
boxElem.style.left = left
|
|
450
|
+
boxElem.style.left = "".concat(left, "px");
|
|
450
451
|
}
|
|
451
452
|
}
|
|
452
453
|
return nextTick();
|
|
@@ -491,8 +492,8 @@ export default defineComponent({
|
|
|
491
492
|
if (top < minY) {
|
|
492
493
|
top = minY;
|
|
493
494
|
}
|
|
494
|
-
boxElem.style.left = left
|
|
495
|
-
boxElem.style.top = top
|
|
495
|
+
boxElem.style.left = "".concat(left, "px");
|
|
496
|
+
boxElem.style.top = "".concat(top, "px");
|
|
496
497
|
boxElem.className = boxElem.className.replace(/\s?is--drag/, '') + ' is--drag';
|
|
497
498
|
};
|
|
498
499
|
document.onmouseup = function () {
|
|
@@ -542,8 +543,8 @@ export default defineComponent({
|
|
|
542
543
|
width = dragLeft + clientWidth;
|
|
543
544
|
if (offsetLeft - dragLeft > marginSize) {
|
|
544
545
|
if (width > minWidth) {
|
|
545
|
-
boxElem.style.width = (width < maxWidth ? width : maxWidth
|
|
546
|
-
boxElem.style.left = offsetLeft - dragLeft
|
|
546
|
+
boxElem.style.width = "".concat(width < maxWidth ? width : maxWidth, "px");
|
|
547
|
+
boxElem.style.left = "".concat(offsetLeft - dragLeft, "px");
|
|
547
548
|
}
|
|
548
549
|
}
|
|
549
550
|
break;
|
|
@@ -554,14 +555,14 @@ export default defineComponent({
|
|
|
554
555
|
height = dragTop + clientHeight;
|
|
555
556
|
if (offsetLeft - dragLeft > marginSize) {
|
|
556
557
|
if (width > minWidth) {
|
|
557
|
-
boxElem.style.width = (width < maxWidth ? width : maxWidth
|
|
558
|
-
boxElem.style.left = offsetLeft - dragLeft
|
|
558
|
+
boxElem.style.width = "".concat(width < maxWidth ? width : maxWidth, "px");
|
|
559
|
+
boxElem.style.left = "".concat(offsetLeft - dragLeft, "px");
|
|
559
560
|
}
|
|
560
561
|
}
|
|
561
562
|
if (offsetTop - dragTop > marginSize) {
|
|
562
563
|
if (height > minHeight) {
|
|
563
|
-
boxElem.style.height = (height < maxHeight ? height : maxHeight
|
|
564
|
-
boxElem.style.top = offsetTop - dragTop
|
|
564
|
+
boxElem.style.height = "".concat(height < maxHeight ? height : maxHeight, "px");
|
|
565
|
+
boxElem.style.top = "".concat(offsetTop - dragTop, "px");
|
|
565
566
|
}
|
|
566
567
|
}
|
|
567
568
|
break;
|
|
@@ -572,13 +573,13 @@ export default defineComponent({
|
|
|
572
573
|
height = dragTop + clientHeight;
|
|
573
574
|
if (offsetLeft - dragLeft > marginSize) {
|
|
574
575
|
if (width > minWidth) {
|
|
575
|
-
boxElem.style.width = (width < maxWidth ? width : maxWidth
|
|
576
|
-
boxElem.style.left = offsetLeft - dragLeft
|
|
576
|
+
boxElem.style.width = "".concat(width < maxWidth ? width : maxWidth, "px");
|
|
577
|
+
boxElem.style.left = "".concat(offsetLeft - dragLeft, "px");
|
|
577
578
|
}
|
|
578
579
|
}
|
|
579
580
|
if (offsetTop + height + marginSize < visibleHeight) {
|
|
580
581
|
if (height > minHeight) {
|
|
581
|
-
boxElem.style.height = (height < maxHeight ? height : maxHeight
|
|
582
|
+
boxElem.style.height = "".concat(height < maxHeight ? height : maxHeight, "px");
|
|
582
583
|
}
|
|
583
584
|
}
|
|
584
585
|
break;
|
|
@@ -587,8 +588,8 @@ export default defineComponent({
|
|
|
587
588
|
height = clientHeight + dragTop;
|
|
588
589
|
if (offsetTop - dragTop > marginSize) {
|
|
589
590
|
if (height > minHeight) {
|
|
590
|
-
boxElem.style.height = (height < maxHeight ? height : maxHeight
|
|
591
|
-
boxElem.style.top = offsetTop - dragTop
|
|
591
|
+
boxElem.style.height = "".concat(height < maxHeight ? height : maxHeight, "px");
|
|
592
|
+
boxElem.style.top = "".concat(offsetTop - dragTop, "px");
|
|
592
593
|
}
|
|
593
594
|
}
|
|
594
595
|
break;
|
|
@@ -597,7 +598,7 @@ export default defineComponent({
|
|
|
597
598
|
width = dragLeft + clientWidth;
|
|
598
599
|
if (offsetLeft + width + marginSize < visibleWidth) {
|
|
599
600
|
if (width > minWidth) {
|
|
600
|
-
boxElem.style.width = (width < maxWidth ? width : maxWidth
|
|
601
|
+
boxElem.style.width = "".concat(width < maxWidth ? width : maxWidth, "px");
|
|
601
602
|
}
|
|
602
603
|
}
|
|
603
604
|
break;
|
|
@@ -608,13 +609,13 @@ export default defineComponent({
|
|
|
608
609
|
height = dragTop + clientHeight;
|
|
609
610
|
if (offsetLeft + width + marginSize < visibleWidth) {
|
|
610
611
|
if (width > minWidth) {
|
|
611
|
-
boxElem.style.width = (width < maxWidth ? width : maxWidth
|
|
612
|
+
boxElem.style.width = "".concat(width < maxWidth ? width : maxWidth, "px");
|
|
612
613
|
}
|
|
613
614
|
}
|
|
614
615
|
if (offsetTop - dragTop > marginSize) {
|
|
615
616
|
if (height > minHeight) {
|
|
616
|
-
boxElem.style.height = (height < maxHeight ? height : maxHeight
|
|
617
|
-
boxElem.style.top = offsetTop - dragTop
|
|
617
|
+
boxElem.style.height = "".concat(height < maxHeight ? height : maxHeight, "px");
|
|
618
|
+
boxElem.style.top = "".concat(offsetTop - dragTop, "px");
|
|
618
619
|
}
|
|
619
620
|
}
|
|
620
621
|
break;
|
|
@@ -625,12 +626,12 @@ export default defineComponent({
|
|
|
625
626
|
height = dragTop + clientHeight;
|
|
626
627
|
if (offsetLeft + width + marginSize < visibleWidth) {
|
|
627
628
|
if (width > minWidth) {
|
|
628
|
-
boxElem.style.width = (width < maxWidth ? width : maxWidth
|
|
629
|
+
boxElem.style.width = "".concat(width < maxWidth ? width : maxWidth, "px");
|
|
629
630
|
}
|
|
630
631
|
}
|
|
631
632
|
if (offsetTop + height + marginSize < visibleHeight) {
|
|
632
633
|
if (height > minHeight) {
|
|
633
|
-
boxElem.style.height = (height < maxHeight ? height : maxHeight
|
|
634
|
+
boxElem.style.height = "".concat(height < maxHeight ? height : maxHeight, "px");
|
|
634
635
|
}
|
|
635
636
|
}
|
|
636
637
|
break;
|
|
@@ -639,7 +640,7 @@ export default defineComponent({
|
|
|
639
640
|
height = dragTop + clientHeight;
|
|
640
641
|
if (offsetTop + height + marginSize < visibleHeight) {
|
|
641
642
|
if (height > minHeight) {
|
|
642
|
-
boxElem.style.height = (height < maxHeight ? height : maxHeight
|
|
643
|
+
boxElem.style.height = "".concat(height < maxHeight ? height : maxHeight, "px");
|
|
643
644
|
}
|
|
644
645
|
}
|
|
645
646
|
break;
|
|
@@ -663,7 +664,7 @@ export default defineComponent({
|
|
|
663
664
|
var _a = props.slots, propSlots = _a === void 0 ? {} : _a, showClose = props.showClose, showZoom = props.showZoom, title = props.title;
|
|
664
665
|
var zoomLocat = reactData.zoomLocat;
|
|
665
666
|
var titleSlot = slots.title || propSlots.title;
|
|
666
|
-
var titVNs = titleSlot ? titleSlot({ $modal: $xemodal }) : [
|
|
667
|
+
var titVNs = titleSlot ? getSlotVNs(titleSlot({ $modal: $xemodal })) : [
|
|
667
668
|
h('span', {
|
|
668
669
|
class: 'vxe-modal--title'
|
|
669
670
|
}, title ? getFuncText(title) : GlobalConfig.i18n('vxe.alert.title'))
|
|
@@ -671,7 +672,7 @@ export default defineComponent({
|
|
|
671
672
|
if (showZoom) {
|
|
672
673
|
titVNs.push(h('i', {
|
|
673
674
|
class: ['vxe-modal--zoom-btn', 'trigger--btn', zoomLocat ? GlobalConfig.icon.MODAL_ZOOM_OUT : GlobalConfig.icon.MODAL_ZOOM_IN],
|
|
674
|
-
title: GlobalConfig.i18n("vxe.modal.zoom"
|
|
675
|
+
title: GlobalConfig.i18n("vxe.modal.zoom".concat(zoomLocat ? 'Out' : 'In')),
|
|
675
676
|
onClick: toggleZoomEvent
|
|
676
677
|
}));
|
|
677
678
|
}
|
|
@@ -700,7 +701,7 @@ export default defineComponent({
|
|
|
700
701
|
headVNs.push(h('div', __assign({ class: ['vxe-modal--header', {
|
|
701
702
|
'is--draggable': draggable,
|
|
702
703
|
'is--ellipsis': !isMsg && props.showTitleOverflow
|
|
703
|
-
}] }, headerOns), headerSlot ? (!reactData.inited || (props.destroyOnClose && !reactData.visible) ? [] : headerSlot({ $modal: $xemodal })) : renderTitles()));
|
|
704
|
+
}] }, headerOns), headerSlot ? (!reactData.inited || (props.destroyOnClose && !reactData.visible) ? [] : getSlotVNs(headerSlot({ $modal: $xemodal }))) : renderTitles()));
|
|
704
705
|
}
|
|
705
706
|
return headVNs;
|
|
706
707
|
};
|
|
@@ -715,13 +716,13 @@ export default defineComponent({
|
|
|
715
716
|
class: 'vxe-modal--status-wrapper'
|
|
716
717
|
}, [
|
|
717
718
|
h('i', {
|
|
718
|
-
class: ['vxe-modal--status-icon', props.iconStatus || GlobalConfig.icon[
|
|
719
|
+
class: ['vxe-modal--status-icon', props.iconStatus || GlobalConfig.icon["MODAL_".concat(status).toLocaleUpperCase()]]
|
|
719
720
|
})
|
|
720
721
|
]));
|
|
721
722
|
}
|
|
722
723
|
contVNs.push(h('div', {
|
|
723
724
|
class: 'vxe-modal--content'
|
|
724
|
-
}, defaultSlot ? (!reactData.inited || (props.destroyOnClose && !reactData.visible) ? [] : defaultSlot({ $modal: $xemodal })) : getFuncText(content)));
|
|
725
|
+
}, defaultSlot ? (!reactData.inited || (props.destroyOnClose && !reactData.visible) ? [] : getSlotVNs(defaultSlot({ $modal: $xemodal }))) : getFuncText(content)));
|
|
725
726
|
if (!isMsg) {
|
|
726
727
|
/**
|
|
727
728
|
* 加载中
|
|
@@ -763,14 +764,14 @@ export default defineComponent({
|
|
|
763
764
|
if (props.showFooter) {
|
|
764
765
|
footVNs.push(h('div', {
|
|
765
766
|
class: 'vxe-modal--footer'
|
|
766
|
-
}, footerSlot ? (!reactData.inited || (props.destroyOnClose && !reactData.visible) ? [] : footerSlot({ $modal: $xemodal })) : renderBtns()));
|
|
767
|
+
}, footerSlot ? (!reactData.inited || (props.destroyOnClose && !reactData.visible) ? [] : getSlotVNs(footerSlot({ $modal: $xemodal }))) : renderBtns()));
|
|
767
768
|
}
|
|
768
769
|
if (!isMsg && props.resize) {
|
|
769
770
|
footVNs.push(h('span', {
|
|
770
771
|
class: 'vxe-modal--resize'
|
|
771
772
|
}, ['wl', 'wr', 'swst', 'sest', 'st', 'swlb', 'selb', 'sb'].map(function (type) {
|
|
772
773
|
return h('span', {
|
|
773
|
-
class: type
|
|
774
|
+
class: "".concat(type, "-resize"),
|
|
774
775
|
type: type,
|
|
775
776
|
onMousedown: dragEvent
|
|
776
777
|
});
|
|
@@ -834,9 +835,9 @@ export default defineComponent({
|
|
|
834
835
|
}, [
|
|
835
836
|
h('div', {
|
|
836
837
|
ref: refElem,
|
|
837
|
-
class: ['vxe-modal--wrapper', "type--"
|
|
838
|
-
_a["size--"
|
|
839
|
-
_a["status--"
|
|
838
|
+
class: ['vxe-modal--wrapper', "type--".concat(type), className || '', (_a = {},
|
|
839
|
+
_a["size--".concat(vSize)] = vSize,
|
|
840
|
+
_a["status--".concat(status)] = status,
|
|
840
841
|
_a['is--animat'] = animat,
|
|
841
842
|
_a['lock--scroll'] = lockScroll,
|
|
842
843
|
_a['lock--view'] = lockView,
|
|
@@ -849,7 +850,7 @@ export default defineComponent({
|
|
|
849
850
|
_a)],
|
|
850
851
|
style: {
|
|
851
852
|
zIndex: reactData.modalZindex,
|
|
852
|
-
top: modalTop ? modalTop
|
|
853
|
+
top: modalTop ? "".concat(modalTop, "px") : null
|
|
853
854
|
},
|
|
854
855
|
onClick: selfClickEvent
|
|
855
856
|
}, [
|
package/es/modal/style.css
CHANGED
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
.vxe-modal--wrapper.is--loading .vxe-modal--header,
|
|
48
48
|
.vxe-modal--wrapper.is--loading .vxe-modal--footer {
|
|
49
49
|
position: relative;
|
|
50
|
-
border-bottom-color: rgba(0, 0, 0, 0.
|
|
50
|
+
border-bottom-color: rgba(0, 0, 0, 0.3); }
|
|
51
51
|
.vxe-modal--wrapper.is--loading .vxe-modal--header:before,
|
|
52
52
|
.vxe-modal--wrapper.is--loading .vxe-modal--footer:before {
|
|
53
53
|
content: "";
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
-moz-user-select: none;
|
|
62
62
|
-ms-user-select: none;
|
|
63
63
|
user-select: none;
|
|
64
|
-
background-color: rgba(0, 0, 0, 0.
|
|
64
|
+
background-color: rgba(0, 0, 0, 0.3); }
|
|
65
65
|
.vxe-modal--wrapper:not(.lock--view) {
|
|
66
66
|
pointer-events: none; }
|
|
67
67
|
.vxe-modal--wrapper:not(.type--message).lock--scroll {
|
|
@@ -195,7 +195,6 @@
|
|
|
195
195
|
.vxe-modal--wrapper .vxe-modal--close-btn {
|
|
196
196
|
position: absolute;
|
|
197
197
|
right: 14px;
|
|
198
|
-
top: 0.85em;
|
|
199
198
|
z-index: 1;
|
|
200
199
|
cursor: pointer; }
|
|
201
200
|
.vxe-modal--wrapper .vxe-modal--zoom-btn:hover,
|
package/es/pager/src/pager.js
CHANGED
|
@@ -120,7 +120,7 @@ export default defineComponent({
|
|
|
120
120
|
if (XEUtils.isNumber(item)) {
|
|
121
121
|
return {
|
|
122
122
|
value: item,
|
|
123
|
-
label: ""
|
|
123
|
+
label: "".concat(GlobalConfig.i18n('vxe.pager.pagesize', [item]))
|
|
124
124
|
};
|
|
125
125
|
}
|
|
126
126
|
return __assign({ value: '', label: '' }, item);
|
|
@@ -443,8 +443,8 @@ export default defineComponent({
|
|
|
443
443
|
return h('div', {
|
|
444
444
|
ref: refElem,
|
|
445
445
|
class: ['vxe-pager', className ? (XEUtils.isFunction(className) ? className({ $pager: $xepager }) : className) : '', (_a = {},
|
|
446
|
-
_a["size--"
|
|
447
|
-
_a["align--"
|
|
446
|
+
_a["size--".concat(vSize)] = vSize,
|
|
447
|
+
_a["align--".concat(align)] = align,
|
|
448
448
|
_a['is--border'] = props.border,
|
|
449
449
|
_a['is--background'] = props.background,
|
|
450
450
|
_a['is--perfect'] = props.perfect,
|
package/es/pager/style.css
CHANGED
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
-moz-user-select: none;
|
|
51
51
|
-ms-user-select: none;
|
|
52
52
|
user-select: none;
|
|
53
|
-
background-color: rgba(0, 0, 0, 0.
|
|
53
|
+
background-color: rgba(0, 0, 0, 0.3); }
|
|
54
54
|
.vxe-pager .vxe-pager--prev-btn,
|
|
55
55
|
.vxe-pager .vxe-pager--next-btn,
|
|
56
56
|
.vxe-pager .vxe-pager--num-btn,
|
|
@@ -58,6 +58,7 @@
|
|
|
58
58
|
.vxe-pager .vxe-pager--jump-next {
|
|
59
59
|
color: inherit;
|
|
60
60
|
outline: 0;
|
|
61
|
+
padding: 0;
|
|
61
62
|
border: 1px solid transparent; }
|
|
62
63
|
.vxe-pager .vxe-pager--prev-btn:not(.is--disabled):focus,
|
|
63
64
|
.vxe-pager .vxe-pager--next-btn:not(.is--disabled):focus,
|
|
@@ -170,7 +171,8 @@
|
|
|
170
171
|
display: inline-block; }
|
|
171
172
|
.vxe-pager .vxe-pager--jump .vxe-pager--goto,
|
|
172
173
|
.vxe-pager .vxe-pager--sizes > .vxe-input {
|
|
173
|
-
height: 2.15em;
|
|
174
|
+
height: 2.15em;
|
|
175
|
+
line-height: 2.15em; }
|
|
174
176
|
.vxe-pager .vxe-pager--sizes > .vxe-select--panel .vxe-select-option {
|
|
175
177
|
text-align: center; }
|
|
176
178
|
.vxe-pager .vxe-pager--jump-prev,
|
|
@@ -103,15 +103,15 @@ export default defineComponent({
|
|
|
103
103
|
left = marginSize;
|
|
104
104
|
}
|
|
105
105
|
Object.assign(panelStyle, {
|
|
106
|
-
left: left
|
|
107
|
-
top: top_1
|
|
108
|
-
minWidth: targetWidth
|
|
106
|
+
left: "".concat(left, "px"),
|
|
107
|
+
top: "".concat(top_1, "px"),
|
|
108
|
+
minWidth: "".concat(targetWidth, "px")
|
|
109
109
|
});
|
|
110
110
|
}
|
|
111
111
|
else {
|
|
112
112
|
if (placement === 'top') {
|
|
113
113
|
panelPlacement = 'top';
|
|
114
|
-
panelStyle.bottom = targetHeight
|
|
114
|
+
panelStyle.bottom = "".concat(targetHeight, "px");
|
|
115
115
|
}
|
|
116
116
|
else if (!placement) {
|
|
117
117
|
// 如果下面不够放,则向上
|
|
@@ -119,7 +119,7 @@ export default defineComponent({
|
|
|
119
119
|
// 如果上面不够放,则向下(优先)
|
|
120
120
|
if (boundingTop - targetHeight - panelHeight > marginSize) {
|
|
121
121
|
panelPlacement = 'top';
|
|
122
|
-
panelStyle.bottom = targetHeight
|
|
122
|
+
panelStyle.bottom = "".concat(targetHeight, "px");
|
|
123
123
|
}
|
|
124
124
|
}
|
|
125
125
|
}
|
|
@@ -258,7 +258,7 @@ export default defineComponent({
|
|
|
258
258
|
return h('div', {
|
|
259
259
|
ref: refElem,
|
|
260
260
|
class: ['vxe-pulldown', (_a = {},
|
|
261
|
-
_a["size--"
|
|
261
|
+
_a["size--".concat(vSize)] = vSize,
|
|
262
262
|
_a['is--visivle'] = visiblePanel,
|
|
263
263
|
_a['is--disabled'] = disabled,
|
|
264
264
|
_a['is--active'] = isActivated,
|
|
@@ -275,7 +275,7 @@ export default defineComponent({
|
|
|
275
275
|
h('div', {
|
|
276
276
|
ref: refPulldowPnanel,
|
|
277
277
|
class: ['vxe-table--ignore-clear vxe-pulldown--panel', (_b = {},
|
|
278
|
-
_b["size--"
|
|
278
|
+
_b["size--".concat(vSize)] = vSize,
|
|
279
279
|
_b['is--transfer'] = transfer,
|
|
280
280
|
_b['animat--leave'] = animatVisible,
|
|
281
281
|
_b['animat--enter'] = visiblePanel,
|
package/es/radio/src/button.js
CHANGED
|
@@ -86,7 +86,7 @@ export default defineComponent({
|
|
|
86
86
|
var checked = computeChecked.value;
|
|
87
87
|
return h('label', {
|
|
88
88
|
class: ['vxe-radio', 'vxe-radio-button', (_a = {},
|
|
89
|
-
_a["size--"
|
|
89
|
+
_a["size--".concat(vSize)] = vSize,
|
|
90
90
|
_a['is--disabled'] = isDisabled,
|
|
91
91
|
_a)],
|
|
92
92
|
title: props.title
|
package/es/radio/src/radio.js
CHANGED
|
@@ -84,10 +84,11 @@ export default defineComponent({
|
|
|
84
84
|
var vSize = computeSize.value;
|
|
85
85
|
var isDisabled = computeDisabled.value;
|
|
86
86
|
var name = computeName.value;
|
|
87
|
-
var
|
|
87
|
+
var isChecked = computeChecked.value;
|
|
88
88
|
return h('label', {
|
|
89
89
|
class: ['vxe-radio', (_a = {},
|
|
90
|
-
_a["size--"
|
|
90
|
+
_a["size--".concat(vSize)] = vSize,
|
|
91
|
+
_a['is--checked'] = isChecked,
|
|
91
92
|
_a['is--disabled'] = isDisabled,
|
|
92
93
|
_a)],
|
|
93
94
|
title: props.title
|
|
@@ -96,13 +97,13 @@ export default defineComponent({
|
|
|
96
97
|
class: 'vxe-radio--input',
|
|
97
98
|
type: 'radio',
|
|
98
99
|
name: name,
|
|
99
|
-
checked:
|
|
100
|
+
checked: isChecked,
|
|
100
101
|
disabled: isDisabled,
|
|
101
102
|
onChange: changeEvent,
|
|
102
103
|
onClick: clickEvent
|
|
103
104
|
}),
|
|
104
105
|
h('span', {
|
|
105
|
-
class: 'vxe-radio--icon'
|
|
106
|
+
class: ['vxe-radio--icon', isChecked ? 'vxe-icon-radio-checked' : 'vxe-icon-radio-unchecked']
|
|
106
107
|
}),
|
|
107
108
|
h('span', {
|
|
108
109
|
class: 'vxe-radio--label'
|
package/es/radio/style.css
CHANGED
|
@@ -177,6 +177,35 @@
|
|
|
177
177
|
.is--animat .vxe-radio > input:checked + span {
|
|
178
178
|
transition: background-color 0.1s ease-in-out; }
|
|
179
179
|
|
|
180
|
+
.vxe-radio {
|
|
181
|
+
cursor: pointer; }
|
|
182
|
+
.vxe-radio .vxe-radio--icon {
|
|
183
|
+
font-size: 1.34em; }
|
|
184
|
+
.vxe-radio .vxe-radio--icon {
|
|
185
|
+
color: #dcdfe6;
|
|
186
|
+
vertical-align: middle;
|
|
187
|
+
font-weight: 700;
|
|
188
|
+
-webkit-user-select: none;
|
|
189
|
+
-moz-user-select: none;
|
|
190
|
+
-ms-user-select: none;
|
|
191
|
+
user-select: none; }
|
|
192
|
+
.is--checked.vxe-radio {
|
|
193
|
+
color: #409eff; }
|
|
194
|
+
.is--checked.vxe-radio .vxe-radio--icon {
|
|
195
|
+
color: #409eff; }
|
|
196
|
+
.vxe-radio:not(.is--disabled) {
|
|
197
|
+
cursor: pointer; }
|
|
198
|
+
.vxe-radio:not(.is--disabled):hover .vxe-radio--icon {
|
|
199
|
+
color: #409eff; }
|
|
200
|
+
.is--disabled.vxe-radio {
|
|
201
|
+
color: #BFBFBF;
|
|
202
|
+
cursor: not-allowed; }
|
|
203
|
+
.is--disabled.vxe-radio .vxe-radio--icon {
|
|
204
|
+
color: #dcdfe6; }
|
|
205
|
+
.vxe-radio .vxe-radio--label {
|
|
206
|
+
padding-left: 0.5em;
|
|
207
|
+
vertical-align: middle; }
|
|
208
|
+
|
|
180
209
|
/*radio-group*/
|
|
181
210
|
.vxe-radio-group {
|
|
182
211
|
display: inline-block;
|
|
@@ -191,13 +220,7 @@
|
|
|
191
220
|
display: inline-block;
|
|
192
221
|
vertical-align: middle;
|
|
193
222
|
white-space: nowrap;
|
|
194
|
-
-
|
|
195
|
-
-moz-user-select: none;
|
|
196
|
-
-ms-user-select: none;
|
|
197
|
-
user-select: none;
|
|
198
|
-
line-height: 1;
|
|
199
|
-
cursor: pointer;
|
|
200
|
-
color: #606266; }
|
|
223
|
+
line-height: 1; }
|
|
201
224
|
.vxe-radio > input[type="radio"] {
|
|
202
225
|
position: absolute;
|
|
203
226
|
width: 0;
|
|
@@ -206,50 +229,12 @@
|
|
|
206
229
|
-webkit-appearance: none;
|
|
207
230
|
-moz-appearance: none;
|
|
208
231
|
appearance: none; }
|
|
209
|
-
.vxe-radio > input + .vxe-radio--icon {
|
|
210
|
-
position: relative;
|
|
211
|
-
display: inline-block;
|
|
212
|
-
width: 1em;
|
|
213
|
-
height: 1em;
|
|
214
|
-
border: 2px solid #dcdfe6;
|
|
215
|
-
background-color: #fff;
|
|
216
|
-
vertical-align: middle;
|
|
217
|
-
border-radius: 50%; }
|
|
218
|
-
.vxe-radio > input:checked + .vxe-radio--icon {
|
|
219
|
-
background-color: #409eff;
|
|
220
|
-
border-color: #409eff; }
|
|
221
|
-
.vxe-radio > input:checked + .vxe-radio--icon:before {
|
|
222
|
-
content: "";
|
|
223
|
-
position: absolute;
|
|
224
|
-
background-color: #fff;
|
|
225
|
-
border-radius: 50%;
|
|
226
|
-
height: 0.25em;
|
|
227
|
-
width: 0.25em;
|
|
228
|
-
top: 50%;
|
|
229
|
-
left: 50%;
|
|
230
|
-
transform: translate(-50%, -50%); }
|
|
231
|
-
.vxe-radio > input:checked + .vxe-radio--icon + .vxe-radio--label {
|
|
232
|
-
color: #409eff; }
|
|
233
|
-
.vxe-radio:not(.is--disabled) > input:focus + .vxe-radio--icon {
|
|
234
|
-
border-color: #409eff;
|
|
235
|
-
box-shadow: 0 0 0.2em 0 #409eff; }
|
|
236
|
-
.vxe-radio:not(.is--disabled):hover > input + .vxe-radio--icon {
|
|
237
|
-
border-color: #409eff; }
|
|
238
|
-
.vxe-radio.is--disabled {
|
|
239
|
-
cursor: not-allowed; }
|
|
240
|
-
.vxe-radio.is--disabled > input + .vxe-radio--icon {
|
|
241
|
-
border-color: #dcdfe6;
|
|
242
|
-
background-color: #f3f3f3; }
|
|
243
|
-
.vxe-radio.is--disabled > input + .vxe-radio--icon:before {
|
|
244
|
-
border-color: #c0c4cc;
|
|
245
|
-
background-color: #c0c4cc; }
|
|
246
|
-
.vxe-radio.is--disabled > input + .vxe-radio--icon + .vxe-radio--label {
|
|
247
|
-
color: #BFBFBF; }
|
|
248
232
|
.vxe-radio .vxe-radio--label {
|
|
249
|
-
padding-left: 0.5em;
|
|
250
233
|
vertical-align: middle;
|
|
251
234
|
display: inline-block;
|
|
252
235
|
max-width: 50em; }
|
|
236
|
+
.vxe-radio:not(.is--disabled) > input:focus + .vxe-radio--icon {
|
|
237
|
+
color: #409eff; }
|
|
253
238
|
.vxe-radio:not(.vxe-radio-button) + .vxe-radio {
|
|
254
239
|
margin-left: 10px; }
|
|
255
240
|
|
|
@@ -303,17 +288,9 @@
|
|
|
303
288
|
|
|
304
289
|
.vxe-radio {
|
|
305
290
|
font-size: 14px; }
|
|
306
|
-
.vxe-radio .vxe-radio--icon {
|
|
307
|
-
font-size: 16px; }
|
|
308
291
|
.vxe-radio.size--medium {
|
|
309
292
|
font-size: 14px; }
|
|
310
|
-
.vxe-radio.size--medium .vxe-radio--icon {
|
|
311
|
-
font-size: 15px; }
|
|
312
293
|
.vxe-radio.size--small {
|
|
313
294
|
font-size: 13px; }
|
|
314
|
-
.vxe-radio.size--small .vxe-radio--icon {
|
|
315
|
-
font-size: 14px; }
|
|
316
295
|
.vxe-radio.size--mini {
|
|
317
296
|
font-size: 12px; }
|
|
318
|
-
.vxe-radio.size--mini .vxe-radio--icon {
|
|
319
|
-
font-size: 14px; }
|