vxe-table 4.14.0 → 4.14.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/README.md +18 -18
- 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/edit/hook.js +3 -10
- 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/index.css +1 -1
- package/lib/index.min.css +1 -1
- package/lib/index.umd.js +9 -21
- 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/edit/hook.js +3 -13
- package/lib/table/module/edit/hook.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/table/module/edit/hook.ts +3 -10
- 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.1751975497083.ttf → iconfont.1752196480453.ttf} +0 -0
- /package/es/{iconfont.1751975497083.woff → iconfont.1752196480453.woff} +0 -0
- /package/es/{iconfont.1751975497083.woff2 → iconfont.1752196480453.woff2} +0 -0
- /package/lib/{iconfont.1751975497083.ttf → iconfont.1752196480453.ttf} +0 -0
- /package/lib/{iconfont.1751975497083.woff → iconfont.1752196480453.woff} +0 -0
- /package/lib/{iconfont.1751975497083.woff2 → iconfont.1752196480453.woff2} +0 -0
|
@@ -243,7 +243,7 @@ export default defineVxeComponent({
|
|
|
243
243
|
if (spanRest) {
|
|
244
244
|
const { rowspan, colspan } = spanRest
|
|
245
245
|
if (!rowspan || !colspan) {
|
|
246
|
-
return
|
|
246
|
+
return renderEmptyElement($xeTable)
|
|
247
247
|
}
|
|
248
248
|
if (rowspan > 1) {
|
|
249
249
|
isMergeCell = true
|
|
@@ -260,7 +260,7 @@ export default defineVxeComponent({
|
|
|
260
260
|
// 自定义合并行或列的方法
|
|
261
261
|
const { rowspan = 1, colspan = 1 } = spanMethod(cellParams) || {}
|
|
262
262
|
if (!rowspan || !colspan) {
|
|
263
|
-
return
|
|
263
|
+
return renderEmptyElement($xeTable)
|
|
264
264
|
}
|
|
265
265
|
if (rowspan > 1) {
|
|
266
266
|
isMergeCell = true
|
|
@@ -401,13 +401,8 @@ export default defineVxeComponent({
|
|
|
401
401
|
}
|
|
402
402
|
|
|
403
403
|
let showAreaRowStatus = false
|
|
404
|
-
if (mouseConfig && mouseOpts.area && selectCellToRow) {
|
|
405
|
-
|
|
406
|
-
(!_columnIndex && selectCellToRow === true) ||
|
|
407
|
-
(selectCellToRow === column.field)
|
|
408
|
-
) {
|
|
409
|
-
showAreaRowStatus = true
|
|
410
|
-
}
|
|
404
|
+
if (mouseConfig && mouseOpts.area && !_columnIndex && selectCellToRow) {
|
|
405
|
+
showAreaRowStatus = true
|
|
411
406
|
}
|
|
412
407
|
|
|
413
408
|
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
|