vxe-table 3.20.3 → 3.20.4
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/style.css +1 -1
- package/es/table/module/custom/mixin.js +3 -1
- package/es/table/module/custom/panel.js +3 -1
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +8 -4
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/module/custom/mixin.js +3 -1
- package/lib/table/module/custom/mixin.min.js +1 -1
- package/lib/table/module/custom/panel.js +3 -1
- package/lib/table/module/custom/panel.min.js +1 -1
- package/lib/ui/index.js +1 -1
- package/lib/ui/index.min.js +1 -1
- package/lib/ui/src/log.js +1 -1
- package/lib/ui/src/log.min.js +1 -1
- package/package.json +1 -1
- package/packages/table/module/custom/mixin.ts +3 -1
- package/packages/table/module/custom/panel.ts +3 -1
- /package/es/{iconfont.1773640262712.ttf → iconfont.1773644050430.ttf} +0 -0
- /package/es/{iconfont.1773640262712.woff → iconfont.1773644050430.woff} +0 -0
- /package/es/{iconfont.1773640262712.woff2 → iconfont.1773644050430.woff2} +0 -0
- /package/lib/{iconfont.1773640262712.ttf → iconfont.1773644050430.ttf} +0 -0
- /package/lib/{iconfont.1773640262712.woff → iconfont.1773644050430.woff} +0 -0
- /package/lib/{iconfont.1773640262712.woff2 → iconfont.1773644050430.woff2} +0 -0
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import XEUtils from 'xe-utils';
|
|
2
2
|
import { getColumnList } from '../../src/util';
|
|
3
3
|
function updatePopupStyle($xeTable) {
|
|
4
|
+
const $xeGrid = $xeTable.$xeGrid;
|
|
4
5
|
const $xeGantt = $xeTable.$xeGantt;
|
|
6
|
+
const $xeGGWrapper = $xeGrid || $xeGantt;
|
|
5
7
|
const reactData = $xeTable;
|
|
6
8
|
const { customStore } = reactData;
|
|
7
9
|
const customOpts = $xeTable.computeCustomOpts;
|
|
@@ -19,7 +21,7 @@ function updatePopupStyle($xeTable) {
|
|
|
19
21
|
}
|
|
20
22
|
}
|
|
21
23
|
if (showCustomSimpleOutside) {
|
|
22
|
-
if (wrapperEl) {
|
|
24
|
+
if ($xeGGWrapper && wrapperEl) {
|
|
23
25
|
popupTop = wrapperEl.offsetTop;
|
|
24
26
|
}
|
|
25
27
|
popupMaxHeight = XEUtils.eqNull(maxHeight) ? 360 : maxHeight;
|
|
@@ -811,7 +811,9 @@ export default {
|
|
|
811
811
|
});
|
|
812
812
|
const popupStys = {};
|
|
813
813
|
if (maxHeight && !['left', 'right'].includes(placement || '')) {
|
|
814
|
-
|
|
814
|
+
if (popupTop) {
|
|
815
|
+
popupStys.top = toCssUnit(popupTop);
|
|
816
|
+
}
|
|
815
817
|
popupStys.maxHeight = toCssUnit(maxHeight);
|
|
816
818
|
}
|
|
817
819
|
return h('div', {
|
package/es/ui/index.js
CHANGED
package/es/ui/src/log.js
CHANGED
package/lib/index.umd.js
CHANGED
|
@@ -2005,7 +2005,7 @@ function getClass(property, params) {
|
|
|
2005
2005
|
;// CONCATENATED MODULE: ./packages/ui/index.ts
|
|
2006
2006
|
|
|
2007
2007
|
|
|
2008
|
-
const version = "3.20.
|
|
2008
|
+
const version = "3.20.4";
|
|
2009
2009
|
core_.VxeUI.version = version;
|
|
2010
2010
|
core_.VxeUI.tableVersion = version;
|
|
2011
2011
|
core_.VxeUI.setConfig({
|
|
@@ -2746,7 +2746,7 @@ function scrollTopTo(diffNum, cb) {
|
|
|
2746
2746
|
const {
|
|
2747
2747
|
log: log_log
|
|
2748
2748
|
} = core_.VxeUI;
|
|
2749
|
-
const log_version = `table v${"3.20.
|
|
2749
|
+
const log_version = `table v${"3.20.4"}`;
|
|
2750
2750
|
const warnLog = log_log.create('warn', log_version);
|
|
2751
2751
|
const errLog = log_log.create('error', log_version);
|
|
2752
2752
|
;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
|
|
@@ -10035,7 +10035,9 @@ function panel_hideDropTip($xeTableCustomPanel) {
|
|
|
10035
10035
|
});
|
|
10036
10036
|
const popupStys = {};
|
|
10037
10037
|
if (maxHeight && !['left', 'right'].includes(placement || '')) {
|
|
10038
|
-
|
|
10038
|
+
if (popupTop) {
|
|
10039
|
+
popupStys.top = toCssUnit(popupTop);
|
|
10040
|
+
}
|
|
10039
10041
|
popupStys.maxHeight = toCssUnit(maxHeight);
|
|
10040
10042
|
}
|
|
10041
10043
|
return h('div', {
|
|
@@ -17400,7 +17402,9 @@ function beginValidate($xeTable, rows, cols, cb, isFull) {
|
|
|
17400
17402
|
|
|
17401
17403
|
|
|
17402
17404
|
function updatePopupStyle($xeTable) {
|
|
17405
|
+
const $xeGrid = $xeTable.$xeGrid;
|
|
17403
17406
|
const $xeGantt = $xeTable.$xeGantt;
|
|
17407
|
+
const $xeGGWrapper = $xeGrid || $xeGantt;
|
|
17404
17408
|
const reactData = $xeTable;
|
|
17405
17409
|
const {
|
|
17406
17410
|
customStore
|
|
@@ -17424,7 +17428,7 @@ function updatePopupStyle($xeTable) {
|
|
|
17424
17428
|
}
|
|
17425
17429
|
}
|
|
17426
17430
|
if (showCustomSimpleOutside) {
|
|
17427
|
-
if (wrapperEl) {
|
|
17431
|
+
if ($xeGGWrapper && wrapperEl) {
|
|
17428
17432
|
popupTop = wrapperEl.offsetTop;
|
|
17429
17433
|
}
|
|
17430
17434
|
popupMaxHeight = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(maxHeight) ? 360 : maxHeight;
|