chore: sync 3.21.0 to dev 250208

.github/workflows/auto-all-publish.yml

@@ -17,7 +17,7 @@ jobs:
         with:
           script: |
             const tag = `${{ github.ref_name }}`
-            const branchVersion = tag.slice(1)
+            const branchVersion = tag.slice(1).split('.').slice(0, 2).join('.') + '.0'
             core.setOutput('branchVersion', branchVersion)
 
       - name: CheckOut Code

packages/theme/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opentiny/vue-theme",
   "type": "module",
-  "version": "3.21.1",
+  "version": "3.21.2",
   "description": "An enterprise-class UI component library, support both Vue.js 2 and Vue.js 3, as well as PC and mobile.",
   "author": "OpenTiny Team",
   "license": "MIT",
@@ -93,4 +93,4 @@
       ]
     }
   }
-}
+}

packages/theme/src/base/reset.less

@@ -197,9 +197,9 @@
 }
 
 // 有箭头的场景，统一规范所有样式
-.tiny-popconfirm-popover:has(.popper__arrow),
-.tiny-popper:has(.popper__arrow),
-.tiny-tooltip__popper:has(.popper__arrow) {
+.tiny-popconfirm-popover,
+.tiny-popper,
+.tiny-tooltip__popper {
   .popper__arrow {
     position: absolute;
     display: block;
@@ -243,4 +243,4 @@
       right: -3px;
     }
   }
-}
+}

packages/vue/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opentiny/vue",
   "private": true,
-  "version": "3.21.1",
+  "version": "3.21.2",
   "description": "An enterprise-class UI component library, support both Vue.js 2 and Vue.js 3, as well as PC and mobile.",
   "homepage": "https://opentiny.design/tiny-vue",
   "keywords": [
@@ -261,4 +261,4 @@
     "build": "pnpm -w build:ui",
     "postversion": "pnpm build"
   }
-}
+}

packages/vue/src/grid/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opentiny/vue-grid",
   "type": "module",
-  "version": "3.21.1",
+  "version": "3.21.2",
   "description": "",
   "license": "MIT",
   "sideEffects": false,

packages/vue/src/grid/src/body/src/body.tsx

@@ -752,11 +752,12 @@ function renderDefEmpty(h) {
 }
 
 const syncHeaderAndFooterScroll = ({ bodyElem, footerElem, headerElem, isX }) => {
+  const scrollLeft = bodyElem.scrollLeft
   if (isX && headerElem) {
-    headerElem.scrollLeft = bodyElem.scrollLeft
+    headerElem.scrollLeft = scrollLeft
   }
   if (isX && footerElem) {
-    footerElem.scrollLeft = bodyElem.scrollLeft
+    footerElem.scrollLeft = scrollLeft
   }
 }
 
@@ -871,10 +872,6 @@ export default defineComponent({
     // 空数据元素
     elemStore[`${keyPrefix}emptyBlock`] = $refs.emptyBlock
 
-    // 表体第一层div监听滚动事件
-    $el.onscroll = this.scrollEvent
-    $el._onscroll = this.scrollEvent
-
     if (dropConfig) {
       const { plugin, row = true } = dropConfig
       plugin && row && (this.rowSortable = $table.rowDrop(this.$el))
@@ -908,7 +905,10 @@ export default defineComponent({
       'div',
       {
         ref: 'body',
-        class: ['tiny-grid__body-wrapper', 'body__wrapper', { [classMap.isScrollload]: scrollLoad }]
+        class: ['tiny-grid__body-wrapper', 'body__wrapper', { [classMap.isScrollload]: scrollLoad }],
+        on: {
+          scroll: this.scrollEvent
+        }
       },
       [
         // 表格主体内容x轴方向虚拟滚动条占位元素

packages/vue/src/grid/src/table/src/methods.ts

@@ -1645,8 +1645,10 @@ const Methods = {
       // 设置新的渲染列触发Vue渲染
       this.tableColumn = ret.tableColumn
       this.visibleColumnChanged = ret.visibleColumnChanged
-
-      this.$nextTick(this.updateStyle)
+      this.$nextTick(() => {
+        this.updateFooter()
+        this.updateStyle()
+      })
     })
   },
   // 更新横向 X 可视渲染上下剩余空间大小

packages/vue/src/grid/src/table/src/utils/updateStyle.ts

@@ -44,6 +44,7 @@ function getTableWidth({ scrollXLoad, tWidth, tableColumn }) {
 }
 
 function layoutFooter({
+  elemStore,
   customHeight,
   footerHeight,
   headerHeight,
@@ -61,6 +62,11 @@ function layoutFooter({
   let tWidth = tableWidth
   // 如果是固定列与设置了超出隐藏
   let ret = getTableWidth({ scrollXLoad, tWidth, tableColumn })
+  // 为表尾设置虚拟滚动占位宽度
+  const spaceElem = elemStore['main-footer-x-space']
+  if (spaceElem) {
+    spaceElem.style.width = `${tableWidth}px`
+  }
 
   tableColumn = ret.tableColumn
   tWidth = ret.tWidth
@@ -242,6 +248,7 @@ export function handleLayout(params) {
     tableColumn = ret.tableColumn
   } else if (layout === 'footer') {
     tableColumn = layoutFooter({
+      elemStore,
       customHeight,
       fixedWrapperElem,
       footerHeight,