@@ -137,7 +136,7 @@ function renderHeaderAddress(h) {
)
}
-function rendererCellOperate(h) {
+function rendererCellOperate() {
return (
diff --git a/examples/sites/demos/pc/app/grid/header/custom-grid-header.vue b/examples/sites/demos/pc/app/grid/header/custom-grid-header.vue
index b0a5248d4..2ea1ef04a 100644
--- a/examples/sites/demos/pc/app/grid/header/custom-grid-header.vue
+++ b/examples/sites/demos/pc/app/grid/header/custom-grid-header.vue
@@ -2,7 +2,7 @@
-
+
@@ -108,8 +108,7 @@ export default {
}
},
methods: {
- // eslint-disable-next-line
- renderHeaderDescription(h) {
+ renderHeaderDescription() {
const IconAdministrator = this.IconAdministrator
return (
@@ -120,7 +119,7 @@ export default {
)
},
- renderHeaderRelation(h) {
+ renderHeaderRelation() {
const IconVersiontree = this.IconVersiontree
return (
@@ -129,7 +128,6 @@ export default {
)
},
- // eslint-disable-next-line
renderHeaderArea(h) {
const IconMarkOn = this.IconMarkOn
@@ -140,8 +138,8 @@ export default {
)
},
- // eslint-disable-next-line
- renderHeaderAddress(h) {
+
+ renderHeaderAddress() {
const IconUser = this.IconUser
return (
@@ -151,8 +149,8 @@ export default {
)
},
- // eslint-disable-next-line
- rendererCellOperate(h) {
+
+ rendererCellOperate() {
const IconAssociation = this.IconAssociation
const IconHelpful = this.IconHelpful
diff --git a/examples/sites/demos/pc/app/grid/header/many-header-switching-composition-api.vue b/examples/sites/demos/pc/app/grid/header/many-header-switching-composition-api.vue
index f5d1ca64f..05a8f6ab9 100644
--- a/examples/sites/demos/pc/app/grid/header/many-header-switching-composition-api.vue
+++ b/examples/sites/demos/pc/app/grid/header/many-header-switching-composition-api.vue
@@ -6,7 +6,7 @@
-
+
diff --git a/examples/sites/demos/pc/app/grid/header/many-header-switching.vue b/examples/sites/demos/pc/app/grid/header/many-header-switching.vue
index aa9d315e6..b5a4589b4 100644
--- a/examples/sites/demos/pc/app/grid/header/many-header-switching.vue
+++ b/examples/sites/demos/pc/app/grid/header/many-header-switching.vue
@@ -6,7 +6,7 @@
-
+
diff --git a/examples/sites/demos/pc/app/grid/header/slot-header-composition-api.vue b/examples/sites/demos/pc/app/grid/header/slot-header-composition-api.vue
index 68a40bb2d..8348a05a8 100644
--- a/examples/sites/demos/pc/app/grid/header/slot-header-composition-api.vue
+++ b/examples/sites/demos/pc/app/grid/header/slot-header-composition-api.vue
@@ -3,7 +3,7 @@
操作
-
+
diff --git a/examples/sites/demos/pc/app/grid/header/slot-header.vue b/examples/sites/demos/pc/app/grid/header/slot-header.vue
index 99d87c190..f81d523c2 100644
--- a/examples/sites/demos/pc/app/grid/header/slot-header.vue
+++ b/examples/sites/demos/pc/app/grid/header/slot-header.vue
@@ -3,7 +3,7 @@
操作
-
+
diff --git a/examples/sites/demos/pc/app/grid/large-data/column-anchor-clear-active-composition-api.vue b/examples/sites/demos/pc/app/grid/large-data/column-anchor-clear-active-composition-api.vue
index 68f6ffa05..0b25f600f 100644
--- a/examples/sites/demos/pc/app/grid/large-data/column-anchor-clear-active-composition-api.vue
+++ b/examples/sites/demos/pc/app/grid/large-data/column-anchor-clear-active-composition-api.vue
@@ -183,7 +183,7 @@ const pagerConfig = ref({
pageSize: 3,
pageSizes: [3, 5, 10],
total: 0,
- layout: 'total, prev, pager, next, jumper, sizes'
+ layout: 'total, sizes, prev, pager, next, jumper'
}
})
const fetchData = { api: getData }
diff --git a/examples/sites/demos/pc/app/grid/large-data/column-anchor-clear-active.vue b/examples/sites/demos/pc/app/grid/large-data/column-anchor-clear-active.vue
index 50b453efc..3438e9f3c 100644
--- a/examples/sites/demos/pc/app/grid/large-data/column-anchor-clear-active.vue
+++ b/examples/sites/demos/pc/app/grid/large-data/column-anchor-clear-active.vue
@@ -171,7 +171,7 @@ export default {
pageSize: 3,
pageSizes: [3, 5, 10],
total: 0,
- layout: 'total, prev, pager, next, jumper, sizes'
+ layout: 'total, sizes, prev, pager, next, jumper'
}
},
fetchData: { api: this.getData }
diff --git a/examples/sites/demos/pc/app/grid/large-data/full-data-loading.spec.js b/examples/sites/demos/pc/app/grid/large-data/full-data-loading.spec.js
index 569b452af..796681dac 100644
--- a/examples/sites/demos/pc/app/grid/large-data/full-data-loading.spec.js
+++ b/examples/sites/demos/pc/app/grid/large-data/full-data-loading.spec.js
@@ -6,11 +6,11 @@ test('全量加载', async ({ page }) => {
await page.locator('.tiny-grid__body').hover()
// 先滚动1000px
await page.mouse.wheel(0, 1000)
- await expect(page.getByRole('cell', { name: '39' })).toBeVisible()
+ await expect(page.getByRole('cell', { name: '33' })).toBeVisible()
await page.waitForTimeout(500)
await page.locator('.tiny-grid__body').hover()
// 先滚动4000px
await page.mouse.wheel(0, 5000)
await page.waitForTimeout(200)
- await expect(page.getByRole('cell', { name: '218' })).toBeVisible()
+ await expect(page.getByRole('cell', { name: '175' })).toBeVisible()
})
diff --git a/examples/sites/demos/pc/app/grid/operation-column/clear-and-set-radio-row-composition-api.vue b/examples/sites/demos/pc/app/grid/operation-column/clear-and-set-radio-row-composition-api.vue
index f170d5a0d..878133cae 100644
--- a/examples/sites/demos/pc/app/grid/operation-column/clear-and-set-radio-row-composition-api.vue
+++ b/examples/sites/demos/pc/app/grid/operation-column/clear-and-set-radio-row-composition-api.vue
@@ -3,8 +3,7 @@
-
-
+
@@ -85,3 +84,18 @@ function toolbarButtonClickEvent({ code }) {
}
}
+
+
diff --git a/examples/sites/demos/pc/app/grid/operation-column/clear-and-set-radio-row.vue b/examples/sites/demos/pc/app/grid/operation-column/clear-and-set-radio-row.vue
index f1499c033..ce81649ad 100644
--- a/examples/sites/demos/pc/app/grid/operation-column/clear-and-set-radio-row.vue
+++ b/examples/sites/demos/pc/app/grid/operation-column/clear-and-set-radio-row.vue
@@ -3,8 +3,7 @@
-
-
+
@@ -95,3 +94,18 @@ export default {
}
}
+
+
diff --git a/examples/sites/demos/pc/app/grid/operation-column/custom-operation-column-composition-api.vue b/examples/sites/demos/pc/app/grid/operation-column/custom-operation-column-composition-api.vue
index 2890c7e57..35d7e910b 100644
--- a/examples/sites/demos/pc/app/grid/operation-column/custom-operation-column-composition-api.vue
+++ b/examples/sites/demos/pc/app/grid/operation-column/custom-operation-column-composition-api.vue
@@ -1,7 +1,6 @@
-
-
+
@@ -90,4 +89,18 @@ function clickHandler(row) {
.demo-custom-column svg:not(:last-child) {
margin-right: 8px;
}
+
+:deep(.tiny-grid) {
+ &-header__column,
+ &-body__column {
+ &.col__selection,
+ &.col__radio {
+ padding: 0 8px 0 16px;
+ & + th,
+ + td {
+ padding-left: 0;
+ }
+ }
+ }
+}
diff --git a/examples/sites/demos/pc/app/grid/operation-column/custom-operation-column.spec.js b/examples/sites/demos/pc/app/grid/operation-column/custom-operation-column.spec.js
index 3461a7459..61e312661 100644
--- a/examples/sites/demos/pc/app/grid/operation-column/custom-operation-column.spec.js
+++ b/examples/sites/demos/pc/app/grid/operation-column/custom-operation-column.spec.js
@@ -8,7 +8,7 @@ test('自定义操作列', async ({ page }) => {
await expect(
page
.getByRole('row', {
- name: '1 GFD科技YX公司 华东区 福州 公司技术和研发实力雄厚,是国家863项目的参与者,并被政府认定为“高新技术企业”。'
+ name: 'GFD科技YX公司 华东区 福州 公司技术和研发实力雄厚,是国家863项目的参与者,并被政府认定为“高新技术企业”。'
})
.getByRole('img')
.nth(1)
diff --git a/examples/sites/demos/pc/app/grid/operation-column/custom-operation-column.vue b/examples/sites/demos/pc/app/grid/operation-column/custom-operation-column.vue
index 32172337d..c79d66aaa 100644
--- a/examples/sites/demos/pc/app/grid/operation-column/custom-operation-column.vue
+++ b/examples/sites/demos/pc/app/grid/operation-column/custom-operation-column.vue
@@ -1,7 +1,6 @@
-
-
+
@@ -84,7 +83,7 @@ export default {
}
-
diff --git a/examples/sites/demos/pc/app/grid/operation-column/dropdown-composition-api.vue b/examples/sites/demos/pc/app/grid/operation-column/dropdown-composition-api.vue
index d8f90aac6..ca27ee96e 100644
--- a/examples/sites/demos/pc/app/grid/operation-column/dropdown-composition-api.vue
+++ b/examples/sites/demos/pc/app/grid/operation-column/dropdown-composition-api.vue
@@ -1,9 +1,8 @@
-
-
+
选择本页数据
@@ -89,7 +88,7 @@ function itemClick({ itemData }) {
diff --git a/examples/sites/demos/pc/app/grid/operation-column/dropdown.vue b/examples/sites/demos/pc/app/grid/operation-column/dropdown.vue
index 2ade7c190..0a47a5c17 100644
--- a/examples/sites/demos/pc/app/grid/operation-column/dropdown.vue
+++ b/examples/sites/demos/pc/app/grid/operation-column/dropdown.vue
@@ -1,9 +1,8 @@
-
-
+
选择本页数据
@@ -95,7 +94,7 @@ export default {
diff --git a/examples/sites/demos/pc/app/grid/operation-column/grid-pager-reserve-composition-api.vue b/examples/sites/demos/pc/app/grid/operation-column/grid-pager-reserve-composition-api.vue
index baadd4644..1f4eb0506 100644
--- a/examples/sites/demos/pc/app/grid/operation-column/grid-pager-reserve-composition-api.vue
+++ b/examples/sites/demos/pc/app/grid/operation-column/grid-pager-reserve-composition-api.vue
@@ -11,8 +11,7 @@
@select-change="selectedDevices"
:select-config="tableSelectConfigData"
>
-
-
+
@@ -47,7 +46,7 @@ const pagerConfig = ref({
pageSize: 5,
pageSizes: [5, 10],
total: 0,
- layout: 'total, prev, pager, next, jumper, sizes'
+ layout: 'total, sizes, prev, pager, next, jumper'
}
})
const fetchData = ref({
@@ -159,3 +158,19 @@ function selectedDevices({ $table }) {
})
}
+
+
diff --git a/examples/sites/demos/pc/app/grid/operation-column/grid-pager-reserve.spec.js b/examples/sites/demos/pc/app/grid/operation-column/grid-pager-reserve.spec.js
index b8f50b749..4aa060df4 100644
--- a/examples/sites/demos/pc/app/grid/operation-column/grid-pager-reserve.spec.js
+++ b/examples/sites/demos/pc/app/grid/operation-column/grid-pager-reserve.spec.js
@@ -5,7 +5,7 @@ test('翻页后保留选中状态', async ({ page }) => {
await page.goto('grid-operation-column#operation-column-grid-pager-reserve')
await page
.getByRole('row', {
- name: '1 GFD科技YX公司 华东区 福州 公司技术和研发实力雄厚,是国家863项目的参与者,并被政府认定为“高新技术企业”。'
+ name: 'GFD科技YX公司 华东区 福州 公司技术和研发实力雄厚,是国家863项目的参与者,并被政府认定为“高新技术企业”。'
})
.locator('path')
.first()
@@ -13,7 +13,7 @@ test('翻页后保留选中状态', async ({ page }) => {
await page.getByRole('list').getByText('2').click()
await page
.getByRole('row', {
- name: '8 西安门福德宝网络技术YX公司 华东区 厦门 公司技术和研发实力雄厚,是国家863项目的参与者,并被政府认定为“高新技术企业”。'
+ name: '西安门福德宝网络技术YX公司 华东区 厦门 公司技术和研发实力雄厚,是国家863项目的参与者,并被政府认定为“高新技术企业”。'
})
.locator('path')
.first()
diff --git a/examples/sites/demos/pc/app/grid/operation-column/grid-pager-reserve.vue b/examples/sites/demos/pc/app/grid/operation-column/grid-pager-reserve.vue
index be9c3acdd..7fa77b3e6 100644
--- a/examples/sites/demos/pc/app/grid/operation-column/grid-pager-reserve.vue
+++ b/examples/sites/demos/pc/app/grid/operation-column/grid-pager-reserve.vue
@@ -11,8 +11,7 @@
@select-change="selectedDevices"
:select-config="tableSelectConfigData"
>
-
-
+
@@ -47,7 +46,7 @@ export default {
pageSize: 5,
pageSizes: [5, 10],
total: 0,
- layout: 'total, prev, pager, next, jumper, sizes'
+ layout: 'total, sizes, prev, pager, next, jumper'
}
},
fetchData: {
@@ -158,3 +157,19 @@ export default {
}
}
+
+
diff --git a/examples/sites/demos/pc/app/grid/operation-column/header-select-disabled-composition-api.vue b/examples/sites/demos/pc/app/grid/operation-column/header-select-disabled-composition-api.vue
index 74feee238..591e934a0 100644
--- a/examples/sites/demos/pc/app/grid/operation-column/header-select-disabled-composition-api.vue
+++ b/examples/sites/demos/pc/app/grid/operation-column/header-select-disabled-composition-api.vue
@@ -1,6 +1,5 @@
-
diff --git a/examples/sites/demos/pc/app/grid/operation-column/header-select-disabled.vue b/examples/sites/demos/pc/app/grid/operation-column/header-select-disabled.vue
index 9e2e6a0e8..1abc8c67c 100644
--- a/examples/sites/demos/pc/app/grid/operation-column/header-select-disabled.vue
+++ b/examples/sites/demos/pc/app/grid/operation-column/header-select-disabled.vue
@@ -1,6 +1,5 @@
-
diff --git a/examples/sites/demos/pc/app/grid/operation-column/radio-config-composition-api.vue b/examples/sites/demos/pc/app/grid/operation-column/radio-config-composition-api.vue
index 3e458a400..7ddcd1129 100644
--- a/examples/sites/demos/pc/app/grid/operation-column/radio-config-composition-api.vue
+++ b/examples/sites/demos/pc/app/grid/operation-column/radio-config-composition-api.vue
@@ -1,6 +1,5 @@
-
diff --git a/examples/sites/demos/pc/app/grid/operation-column/radio-config.vue b/examples/sites/demos/pc/app/grid/operation-column/radio-config.vue
index fb13e1222..dfa3fb9cf 100644
--- a/examples/sites/demos/pc/app/grid/operation-column/radio-config.vue
+++ b/examples/sites/demos/pc/app/grid/operation-column/radio-config.vue
@@ -1,6 +1,5 @@
-
diff --git a/examples/sites/demos/pc/app/grid/operation-column/refresh-grid-composition-api.vue b/examples/sites/demos/pc/app/grid/operation-column/refresh-grid-composition-api.vue
index 9272547f2..0dd509790 100644
--- a/examples/sites/demos/pc/app/grid/operation-column/refresh-grid-composition-api.vue
+++ b/examples/sites/demos/pc/app/grid/operation-column/refresh-grid-composition-api.vue
@@ -5,8 +5,7 @@
-
-
+
@@ -33,7 +32,7 @@ const pagerConfig = ref({
pageSize: 5,
pageSizes: [5, 10],
total: 0,
- layout: 'total, prev, pager, next, jumper, sizes'
+ layout: 'total, sizes, prev, pager, next, jumper'
}
})
const fetchData = ref({
diff --git a/examples/sites/demos/pc/app/grid/operation-column/selection-config-composition-api.vue b/examples/sites/demos/pc/app/grid/operation-column/selection-config-composition-api.vue
index dc5edeaf7..fa7068fb2 100644
--- a/examples/sites/demos/pc/app/grid/operation-column/selection-config-composition-api.vue
+++ b/examples/sites/demos/pc/app/grid/operation-column/selection-config-composition-api.vue
@@ -8,7 +8,6 @@
border
:edit-config="{ trigger: 'click', mode: 'cell', showStatus: true }"
>
-
{
)
}
+
+
diff --git a/examples/sites/demos/pc/app/grid/operation-column/selection-config.vue b/examples/sites/demos/pc/app/grid/operation-column/selection-config.vue
index 28b79aa6f..0ac6bd0a2 100644
--- a/examples/sites/demos/pc/app/grid/operation-column/selection-config.vue
+++ b/examples/sites/demos/pc/app/grid/operation-column/selection-config.vue
@@ -5,11 +5,9 @@
ref="grid"
:select-config="selectConfig"
highlight-current-row
- border
:edit-config="{ trigger: 'click', mode: 'cell', showStatus: true }"
>
-
-
+
+
+
diff --git a/examples/sites/demos/pc/app/grid/operation-column/selection-operation-composition-api.vue b/examples/sites/demos/pc/app/grid/operation-column/selection-operation-composition-api.vue
index 12084a6b1..d01ff7b09 100644
--- a/examples/sites/demos/pc/app/grid/operation-column/selection-operation-composition-api.vue
+++ b/examples/sites/demos/pc/app/grid/operation-column/selection-operation-composition-api.vue
@@ -3,8 +3,8 @@
-
-
+
+
@@ -108,3 +108,19 @@ function toolbarButtonClickEvent({ code, $grid }) {
}
}
+
+
diff --git a/examples/sites/demos/pc/app/grid/operation-column/selection-operation.vue b/examples/sites/demos/pc/app/grid/operation-column/selection-operation.vue
index dd4c5c28e..1d1a82341 100644
--- a/examples/sites/demos/pc/app/grid/operation-column/selection-operation.vue
+++ b/examples/sites/demos/pc/app/grid/operation-column/selection-operation.vue
@@ -3,8 +3,8 @@
-
-
+
+
@@ -119,3 +119,19 @@ export default {
}
}
+
+
diff --git a/examples/sites/demos/pc/app/grid/pager/inner-default-pager-composition-api.vue b/examples/sites/demos/pc/app/grid/pager/inner-default-pager-composition-api.vue
index 93e84b6ea..ad2b9c308 100644
--- a/examples/sites/demos/pc/app/grid/pager/inner-default-pager-composition-api.vue
+++ b/examples/sites/demos/pc/app/grid/pager/inner-default-pager-composition-api.vue
@@ -21,7 +21,7 @@ const pagerConfig = ref({
pageSizes: [5, 10],
total: 0,
align: 'right', // 可选值:['left', 'center', 'right']
- layout: 'total, prev, pager, next, jumper, sizes'
+ layout: 'total, sizes, prev, pager, next, jumper'
}
})
const fetchData = ref({
diff --git a/examples/sites/demos/pc/app/grid/pager/inner-default-pager.vue b/examples/sites/demos/pc/app/grid/pager/inner-default-pager.vue
index 8259e2b16..3b304462d 100644
--- a/examples/sites/demos/pc/app/grid/pager/inner-default-pager.vue
+++ b/examples/sites/demos/pc/app/grid/pager/inner-default-pager.vue
@@ -27,7 +27,7 @@ export default {
pageSizes: [5, 10],
total: 0,
align: 'right', // 可选值:['left', 'center', 'right']
- layout: 'total, prev, pager, next, jumper, sizes'
+ layout: 'total, sizes, prev, pager, next, jumper'
}
},
fetchData: {
diff --git a/examples/sites/demos/pc/app/grid/pager/inner-pager-composition-api.vue b/examples/sites/demos/pc/app/grid/pager/inner-pager-composition-api.vue
index 4816e0b50..84e209bac 100644
--- a/examples/sites/demos/pc/app/grid/pager/inner-pager-composition-api.vue
+++ b/examples/sites/demos/pc/app/grid/pager/inner-pager-composition-api.vue
@@ -21,7 +21,7 @@ const pagerConfig = ref({
pageSize: 5,
pageSizes: [5, 10],
total: 0,
- layout: 'total, prev, pager, next, jumper, sizes'
+ layout: 'total, sizes, prev, pager, next, jumper'
}
})
const fetchData = ref({
diff --git a/examples/sites/demos/pc/app/grid/pager/inner-pager.vue b/examples/sites/demos/pc/app/grid/pager/inner-pager.vue
index 5b8d9fb48..71e7b2609 100644
--- a/examples/sites/demos/pc/app/grid/pager/inner-pager.vue
+++ b/examples/sites/demos/pc/app/grid/pager/inner-pager.vue
@@ -27,7 +27,7 @@ export default {
pageSize: 5,
pageSizes: [5, 10],
total: 0,
- layout: 'total, prev, pager, next, jumper, sizes'
+ layout: 'total, sizes, prev, pager, next, jumper'
}
},
fetchData: {
diff --git a/examples/sites/demos/pc/app/grid/pager/pager-in-grid-composition-api.vue b/examples/sites/demos/pc/app/grid/pager/pager-in-grid-composition-api.vue
index b219feae1..8984d4de9 100644
--- a/examples/sites/demos/pc/app/grid/pager/pager-in-grid-composition-api.vue
+++ b/examples/sites/demos/pc/app/grid/pager/pager-in-grid-composition-api.vue
@@ -30,7 +30,7 @@
:page-sizes="[5, 10, 20, 50]"
@current-change="currentChange"
@size-change="sizeChange"
- layout="total, prev, pager, next, jumper, sizes"
+ layout="total, sizes, prev, pager, next, jumper"
>