vxe-table 3.17.15 → 3.17.17

package/lib/vxe-table/style/style.css

@@ -2297,12 +2297,12 @@
 }
 
 /*header*/
-.vxe-table {
-  /*排序*/
-}
 .vxe-table .vxe-table--header-wrapper {
   color: var(--vxe-ui-table-header-font-color);
 }
+.vxe-table {
+  /*排序*/
+}
 .vxe-table .vxe-cell--sort {
   text-align: center;
   position: relative;
@@ -2486,22 +2486,6 @@
   color: var(--vxe-ui-font-color);
   font-family: var(--vxe-ui-font-family);
   direction: ltr;
-  /*边框*/
-  /*列宽线*/
-  /*边框线*/
-  /*树形节点*/
-  /*行分组*/
-  /*单元格高度*/
-  /*溢出列*/
-  /*展开行*/
-  /*拖拽列*/
-  /*拖拽行*/
-  /*暂无数据*/
-  /*校验不通过*/
-  /*已废弃，旧的校验样式**/
-  /*单元格标记删除状态*/
-  /*单元格编辑状态*/
-  /*可编辑*/
 }
 .vxe-table--render-default .vxe-table--body-wrapper {
   background-color: var(--vxe-ui-layout-background-color);
@@ -2670,6 +2654,9 @@
 .vxe-table--render-default .vxe-body--row.row--hover.row--current > .vxe-body--column {
   background-color: var(--vxe-ui-table-row-hover-current-background-color);
 }
+.vxe-table--render-default {
+  /*边框*/
+}
 .vxe-table--render-default .vxe-table--footer-wrapper {
   border-top: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
 }
@@ -3076,6 +3063,9 @@
           user-select: none;
   pointer-events: none;
 }
+.vxe-table--render-default {
+  /*列宽线*/
+}
 .vxe-table--render-default .vxe-table--resizable-col-bar {
   width: 1px;
   height: 100%;
@@ -3102,6 +3092,9 @@
   top: 0;
   left: 0;
 }
+.vxe-table--render-default {
+  /*边框线*/
+}
 .vxe-table--render-default .vxe-table--border-line {
   position: absolute;
   top: 0;
@@ -3112,6 +3105,9 @@
   pointer-events: none;
   border: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
 }
+.vxe-table--render-default {
+  /*树形节点*/
+}
 .vxe-table--render-default .vxe-tree--line-wrapper {
   position: relative;
   display: block;
@@ -3158,6 +3154,9 @@
           user-select: none;
   cursor: pointer;
 }
+.vxe-table--render-default {
+  /*行分组*/
+}
 .vxe-table--render-default .vxe-row-group--node-btn:hover {
   color: var(--vxe-ui-font-color);
 }
@@ -3166,6 +3165,9 @@
   color: var(--vxe-ui-font-lighten-color);
   transition: transform 0.1s ease-in-out;
 }
+.vxe-table--render-default {
+  /*单元格高度*/
+}
 .vxe-table--render-default .vxe-body--column.col--ellipsis > .vxe-cell .vxe-row-group-cell,
 .vxe-table--render-default .vxe-body--column.col--ellipsis > .vxe-cell .vxe-tree-cell {
   overflow: hidden;
@@ -3186,6 +3188,9 @@
   flex-direction: row;
   align-items: center;
 }
+.vxe-table--render-default {
+  /*溢出列*/
+}
 .vxe-table--render-default .vxe-header--column:not(.col--active).col--ellipsis > .vxe-cell,
 .vxe-table--render-default .vxe-body--column:not(.col--active).col--ellipsis > .vxe-cell,
 .vxe-table--render-default .vxe-footer--column:not(.col--active).col--ellipsis > .vxe-cell {
@@ -3219,6 +3224,9 @@
   flex-direction: row;
   align-items: center;
 }
+.vxe-table--render-default {
+  /*展开行*/
+}
 .vxe-table--render-default .vxe-table--row-expanded-wrapper {
   position: absolute;
   top: 0;
@@ -3285,6 +3293,9 @@
   overflow: auto;
   outline: 0;
 }
+.vxe-table--render-default {
+  /*拖拽列*/
+}
 .vxe-table--render-default .vxe-table--drag-col-line {
   height: 100%;
   width: 1px;
@@ -3340,6 +3351,9 @@
   color: var(--vxe-ui-input-disabled-color);
   cursor: not-allowed;
 }
+.vxe-table--render-default {
+  /*拖拽行*/
+}
 .vxe-table--render-default .vxe-table--drag-row-line {
   width: 100%;
   height: 1px;
@@ -3457,6 +3471,9 @@
 .vxe-table--render-default.size--mini .vxe-cell--radio {
   font-size: var(--vxe-radio-font-size-mini);
 }
+.vxe-table--render-default {
+  /*暂无数据*/
+}
 .vxe-table--render-default .vxe-table--empty-placeholder,
 .vxe-table--render-default .vxe-table--empty-block {
   color: var(--vxe-ui-input-placeholder-color);
@@ -3491,6 +3508,9 @@
 .vxe-table--render-default .vxe-body--column.col--selected {
   box-shadow: inset 0px 0px 0px 2px var(--vxe-ui-font-primary-color);
 }
+.vxe-table--render-default {
+  /*校验不通过*/
+}
 .vxe-table--render-default .vxe-body--column .vxe-cell--valid-error-tip {
   width: 100%;
   position: absolute;
@@ -3541,6 +3561,9 @@
 .vxe-table--render-default.valid-msg--full .vxe-body--row:last-child .vxe-cell--valid-error-tip {
   top: calc(100% - 1.3em);
 }
+.vxe-table--render-default {
+  /*已废弃，旧的校验样式**/
+}
 .vxe-table--render-default.old-cell-valid .vxe-body--column.col--valid-error .vxe-cell--valid-error-tip {
   width: 320px;
   position: absolute;
@@ -3568,6 +3591,9 @@
   transform: translateX(0);
   text-align: left;
 }
+.vxe-table--render-default {
+  /*单元格标记删除状态*/
+}
 .vxe-table--render-default .vxe-body--row.row--pending {
   color: var(--vxe-ui-table-validate-error-color);
   text-decoration: line-through;
@@ -3586,6 +3612,9 @@
   border-bottom: 1px solid var(--vxe-ui-table-validate-error-color);
   z-index: 1;
 }
+.vxe-table--render-default {
+  /*单元格编辑状态*/
+}
 .vxe-table--render-default .vxe-body--row.row--new > .vxe-body--column {
   position: relative;
 }
@@ -3612,6 +3641,9 @@
   border-color: transparent var(--vxe-ui-table-cell-dirty-update-color) transparent transparent;
   transform: rotate(45deg);
 }
+.vxe-table--render-default {
+  /*可编辑*/
+}
 .vxe-table--render-default.vxe-editable.cell--highlight .vxe-body--column.col--active {
   box-shadow: inset 0px 0px 0px 2px var(--vxe-ui-font-primary-color);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.17.15",
+  "version": "3.17.17",
   "description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -67,7 +67,8 @@
     "vue": "~2.6.14",
     "vue-i18n": "^8.15.1",
     "vue-router": "^3.5.1",
-    "vue-template-compiler": "2.6.14"
+    "vue-template-compiler": "2.6.14",
+    "vxe-pc-ui": "3.8.17"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

package/packages/table/module/menu/mixin.ts

@@ -263,8 +263,9 @@ export default {
       if (!menu.disabled && (menu.code || !menu.children || !menu.children.length)) {
         const gMenuOpts = menus.get(menu.code)
         const params = Object.assign({ menu, $grid: $xeGrid, $table: this, $event: evnt }, this.ctxMenuStore.args)
-        if (gMenuOpts && gMenuOpts.menuMethod) {
-          gMenuOpts.menuMethod(params, evnt)
+        const tmMethod = gMenuOpts ? (gMenuOpts.tableMenuMethod || gMenuOpts.menuMethod) : null
+        if (tmMethod) {
+          tmMethod(params, evnt)
         }
         // 在 v4 中废弃事件 context-menu-click
         if (this.$listeners['context-menu-click']) {

package/packages/table/src/body.ts

@@ -883,7 +883,10 @@ export default {
         }),
         mouseConfig && mouseOpts.area
           ? h('div', {
-            class: 'vxe-table--cell-area'
+            class: 'vxe-table--cell-area',
+            attrs: {
+              xid: xID
+            }
           }, [
             h('span', {
               class: 'vxe-table--cell-main-area'

package/packages/table/src/header.ts

@@ -54,7 +54,7 @@ const renderRows = (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMode
     }
     const columnIndex = colRest.index
     const _columnIndex = colRest._index
-    const cellParams = {
+    const cellParams: any = {
       $table: $xeTable,
       $grid: $xeGrid,
       $rowIndex,
@@ -382,7 +382,10 @@ export default {
         ]),
         mouseConfig && mouseOpts.area
           ? h('div', {
-            class: 'vxe-table--cell-area'
+            class: 'vxe-table--cell-area',
+            attrs: {
+              xid: xID
+            }
           }, [
             h('span', {
               class: 'vxe-table--cell-main-area'

package/packages/table/src/methods.ts

@@ -3674,7 +3674,9 @@ const wheelScrollTopTo = (diffNum: number, cb: (progress: number) => void) => {
   let countTop = 0
   const step = (timestamp: number) => {
     let progress = (timestamp - startTime) / duration
-    if (progress > 1) {
+    if (progress < 0) {
+      progress = 0
+    } else if (progress > 1) {
       progress = 1
     }
     const easedProgress = Math.pow(progress, 2)
@@ -10463,6 +10465,10 @@ const Methods = {
     if (target && /^textarea$/i.test((target as HTMLElement).tagName)) {
       return
     }
+    // 如果滚轮未移动或者触摸板未变化位置
+    if (!deltaY && !deltaX) {
+      return
+    }
 
     const { highlightHoverRow } = tableProps
     const { scrollXLoad, scrollYLoad, expandColumn } = reactData
@@ -11066,7 +11072,7 @@ const Methods = {
     if (showFooter && footerData && footerData.length) {
       footData = footerData.slice(0)
     } else if (showFooter && footerMethod) {
-      footData = visibleColumn.length ? footerMethod({ columns: visibleColumn, data: afterFullData, $table: $xeTable, $grid: $xeGrid }) : []
+      footData = visibleColumn.length ? footerMethod({ columns: visibleColumn, data: afterFullData, $table: $xeTable, $grid: $xeGrid } as any) : []
     }
     reactData.footerTableData = footData
     $xeTable.handleUpdateFooterMerge()

package/packages/table/src/table.ts

@@ -281,7 +281,7 @@ function renderRowExpandedVNs (h: CreateElement, $xeTable: VxeTableConstructor &
         $columnIndex = colRest.$index
         _columnIndex = colRest._index
       }
-      const expandParams: VxeTableDefines.CellRenderDataParams = {
+      const expandParams: any = {
         $grid: $xeGrid,
         $table: $xeTable,
         seq,
@@ -764,7 +764,7 @@ export default {
       const { id } = props
       if (id) {
         if (XEUtils.isFunction(id)) {
-          return `${id({ $table: $xeTable, $grid: $xeGrid }) || ''}`
+          return `${id({ $table: $xeTable, $grid: $xeGrid } as any) || ''}`
         }
         return `${id}`
       }
@@ -1129,9 +1129,12 @@ export default {
       return footerOpts && footerOpts.options ? footerOpts.options : []
     },
     isCtxMenu () {
-      return this.computeIsMenu
+      return this.computeIsContentMenu
     },
     computeIsMenu () {
+      return this.computeIsContentMenu
+    },
+    computeIsContentMenu () {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
       const props = $xeTable