diff --git a/packages/theme-saas/src/grid/table.less b/packages/theme-saas/src/grid/table.less index e00a94778a..7ccd7497ea 100644 --- a/packages/theme-saas/src/grid/table.less +++ b/packages/theme-saas/src/grid/table.less @@ -321,7 +321,7 @@ ); @apply bg-no-repeat; background-size: 1px 100%, 100% 1px; - background-position: 100% 0, 100% 99%; + background-position: 100% 0, 100% 100%; } &.is__row-span .@{grid-prefix-cls}-body__column { @@ -330,7 +330,7 @@ .@{grid-prefix-cls}-body__row:last-child { .@{grid-prefix-cls}-body__column { - background-position: 100% 0, 100% 97%; + background-position: 100% 0, 100% 100%; } } @@ -870,6 +870,7 @@ @apply flex-auto; @apply items-center; @apply justify-center; + @apply text-center; @apply sticky; @apply left-0; } diff --git a/packages/theme/src/grid/table.less b/packages/theme/src/grid/table.less index 2ee12af0a3..71e2a1197c 100644 --- a/packages/theme/src/grid/table.less +++ b/packages/theme/src/grid/table.less @@ -725,6 +725,7 @@ display: flex; align-items: center; justify-content: center; + text-align: center; position: sticky; left: 0; flex: auto; diff --git a/packages/vue/src/grid/src/keyboard/src/methods.ts b/packages/vue/src/grid/src/keyboard/src/methods.ts index 2630ffe6a5..a428f6e7a7 100644 --- a/packages/vue/src/grid/src/keyboard/src/methods.ts +++ b/packages/vue/src/grid/src/keyboard/src/methods.ts @@ -508,10 +508,13 @@ export default { this.editStore.indexs.rowNodes = rowNodes }, _clearIndexChecked() { - let indexCheckeds = this.elemStore['main-body-list'].querySelectorAll('.col__index-checked') - let eachHandler = (colNode) => removeClass(colNode, 'col__index-checked') + const tbody = this.elemStore['main-body-list'] + if (tbody) { + const indexCheckeds = tbody.querySelectorAll('.col__index-checked') + const eachHandler = (colNode) => removeClass(colNode, 'col__index-checked') - arrayEach(indexCheckeds, eachHandler) + arrayEach(indexCheckeds, eachHandler) + } Object.assign(this.editStore.indexs, { rowNodes: [] }) diff --git a/packages/vue/src/grid/src/table/src/methods.ts b/packages/vue/src/grid/src/table/src/methods.ts index 643dcc24e9..22698bea5f 100644 --- a/packages/vue/src/grid/src/table/src/methods.ts +++ b/packages/vue/src/grid/src/table/src/methods.ts @@ -407,15 +407,15 @@ const Methods = { } }, // 更新列的 Map - cacheColumnMap() { - let { fullColumnMap, tableFullColumn: fullColumn } = this - let fullColumnIdData = {} + cacheColumnMap(options) { + const { fullColumnMap } = this + const fullColumnIdData = {} this.fullColumnIdData = fullColumnIdData - Map.prototype.clear.apply(fullColumnMap) - fullColumn.forEach((column, index) => { - let colCache = { colid: column.id, column, index } - fullColumnIdData[column.id] = colCache - fullColumnMap.set(column, colCache) + fullColumnMap.clear() + + options.columnCaches.forEach((cache) => { + fullColumnIdData[cache.colid] = cache + fullColumnMap.set(cache.column, cache) }) }, // 通过tr的dom元素获取行数据等相关信息