vxe-table 3.16.1 → 3.16.3
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/grid/src/grid.js +1 -1
- 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/table/module/filter/panel.js +5 -1
- package/es/table/src/body.js +4 -7
- package/es/table/style.css +7 -1
- package/es/table/style.min.css +1 -1
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/es/vxe-table/style.css +7 -1
- package/es/vxe-table/style.min.css +1 -1
- package/lib/grid/src/grid.js +1 -1
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/index.css +1 -1
- package/lib/index.min.css +1 -1
- package/lib/index.umd.js +12 -10
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/style.min.css +1 -1
- package/lib/table/module/filter/panel.js +5 -1
- package/lib/table/module/filter/panel.min.js +1 -1
- package/lib/table/src/body.js +4 -6
- package/lib/table/src/body.min.js +1 -1
- package/lib/table/style/style.css +7 -1
- package/lib/table/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-table/style/style.css +7 -1
- package/lib/vxe-table/style/style.min.css +1 -1
- package/package.json +1 -1
- package/packages/grid/src/grid.ts +1 -1
- package/packages/table/module/filter/panel.ts +5 -1
- package/packages/table/src/body.ts +4 -9
- package/styles/components/table.scss +7 -1
- package/styles/theme/base.scss +1 -1
- /package/es/{iconfont.1752051019367.ttf → iconfont.1752211596473.ttf} +0 -0
- /package/es/{iconfont.1752051019367.woff → iconfont.1752211596473.woff} +0 -0
- /package/es/{iconfont.1752051019367.woff2 → iconfont.1752211596473.woff2} +0 -0
- /package/lib/{iconfont.1752051019367.ttf → iconfont.1752211596473.ttf} +0 -0
- /package/lib/{iconfont.1752051019367.woff → iconfont.1752211596473.woff} +0 -0
- /package/lib/{iconfont.1752051019367.woff2 → iconfont.1752211596473.woff2} +0 -0
|
@@ -226,7 +226,7 @@ function renderTdColumn (
|
|
|
226
226
|
if (spanRest) {
|
|
227
227
|
const { rowspan, colspan } = spanRest
|
|
228
228
|
if (!rowspan || !colspan) {
|
|
229
|
-
return
|
|
229
|
+
return renderEmptyElement($xeTable)
|
|
230
230
|
}
|
|
231
231
|
if (rowspan > 1) {
|
|
232
232
|
isMergeCell = true
|
|
@@ -243,7 +243,7 @@ function renderTdColumn (
|
|
|
243
243
|
// 自定义合并行或列的方法
|
|
244
244
|
const { rowspan = 1, colspan = 1 } = spanMethod(cellParams) || {}
|
|
245
245
|
if (!rowspan || !colspan) {
|
|
246
|
-
return
|
|
246
|
+
return renderEmptyElement($xeTable)
|
|
247
247
|
}
|
|
248
248
|
if (rowspan > 1) {
|
|
249
249
|
isMergeCell = true
|
|
@@ -386,13 +386,8 @@ function renderTdColumn (
|
|
|
386
386
|
}
|
|
387
387
|
|
|
388
388
|
let showAreaRowStatus = false
|
|
389
|
-
if (mouseConfig && mouseOpts.area && selectCellToRow) {
|
|
390
|
-
|
|
391
|
-
(!_columnIndex && selectCellToRow === true) ||
|
|
392
|
-
(selectCellToRow === column.field)
|
|
393
|
-
) {
|
|
394
|
-
showAreaRowStatus = true
|
|
395
|
-
}
|
|
389
|
+
if (mouseConfig && mouseOpts.area && !_columnIndex && selectCellToRow) {
|
|
390
|
+
showAreaRowStatus = true
|
|
396
391
|
}
|
|
397
392
|
|
|
398
393
|
if (!fixedHiddenColumn && showResizable && isAllColumnDrag) {
|
|
@@ -401,7 +401,13 @@ $btnThemeList: (
|
|
|
401
401
|
}
|
|
402
402
|
.vxe-table--cell-col-status-area,
|
|
403
403
|
.vxe-table--cell-row-status-area {
|
|
404
|
-
background-color: var(--vxe-ui-table-
|
|
404
|
+
background-color: var(--vxe-ui-table-cell-area-status-background-color);
|
|
405
|
+
}
|
|
406
|
+
.vxe-table--cell-col-status-area {
|
|
407
|
+
border-bottom: var(--vxe-ui-table-cell-area-border-width) solid var(--vxe-ui-table-cell-area-border-color);
|
|
408
|
+
}
|
|
409
|
+
.vxe-table--cell-row-status-area {
|
|
410
|
+
border-right: var(--vxe-ui-table-cell-area-border-width) solid var(--vxe-ui-table-cell-area-border-color);
|
|
405
411
|
}
|
|
406
412
|
}
|
|
407
413
|
|
package/styles/theme/base.scss
CHANGED
|
@@ -65,7 +65,7 @@
|
|
|
65
65
|
--vxe-ui-table-cell-extend-area-border-color: var(--vxe-ui-table-cell-area-border-color);
|
|
66
66
|
--vxe-ui-table-cell-active-area-border-color: var(--vxe-ui-table-cell-area-border-color);
|
|
67
67
|
--vxe-ui-table-cell-area-background-color: rgba(64,158,255,0.2);
|
|
68
|
-
--vxe-ui-table-
|
|
68
|
+
--vxe-ui-table-cell-area-status-background-color: rgba(64,158,255,0.1);
|
|
69
69
|
|
|
70
70
|
--vxe-ui-table-expand-padding-default: 16px;
|
|
71
71
|
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|